合并

src/views/home/components/Menu.vue

@@ -122,7 +122,7 @@ export default {
       routerList: [
         {
           id: 1,
-          path: "cockpitManage",
+          path: "/home/cockpitManage",
           name: "首页",
           iconName: "gps",
           meta: {
@@ -421,7 +421,7 @@ export default {
   display: block !important;
 }
 
-.el-menu-item{
-margin-left: 18px;
+.el-menu-item {
+  margin-left: 18px;
 }
 </style>

src/views/home/components/mockData.js

@@ -137,7 +137,6 @@ export const orgList = [
             /*webpackChunkName:'performance'*/ "@/views/performance/editAssets.vue"
           ),
       },
-   
     ],
   },
   {

src/views/system/menuMag/components/editDialog.vue

@@ -32,6 +32,14 @@
           placeholder="请输入菜单标识"
         ></el-input>
       </el-form-item>
+      <el-form-item label="显示排序:" prop="psort">
+        <el-input
+          type="number"
+          :min="0"
+          v-model="menuForm.psort"
+          placeholder="请输入菜单标识"
+        ></el-input>
+      </el-form-item>
       <el-form-item
         label="菜单图标"
         prop="piconUrl"
@@ -126,6 +134,7 @@ export default {
     return {
       name: "",
       menuForm: {
+        psort: 0,
         parentId: null,
         pname: null,
         purl: null,
@@ -140,6 +149,7 @@ export default {
           message: "请选择",
           trigger: "change",
         },
+        psort: [{ required: true, message: "请填写显示排序", trigger: "blur" }],
         pcode: [{ required: true, message: "请填写菜单标识", trigger: "blur" }],
         pname: [{ required: true, message: "请填写菜单名称", trigger: "blur" }],
         purl: [{ required: true, message: "请填写路由地址", trigger: "blur" }],
@@ -202,6 +212,7 @@ export default {
           purl: this.row.permissionUrl,
           pstat: this.row.permissionState,
           pcode: this.row.permissionCode,
+          psort: this.row.permissionSort,
           permissionShow: this.row.permissionShow,
         };
       } else if (this.title === "新增" && this.activeName === "2") {
@@ -219,6 +230,7 @@ export default {
           pstat: this.row.permissionState,
           pcode: this.row.permissionCode,
           permissionShow: this.row.permissionShow,
+          psort: this.row.permissionSort,
           piconUrl: this.row.permissionIconUrl,
         };
         if (this.activeName === "1") {
@@ -229,6 +241,7 @@ export default {
               parentId: 0,
               pcode: this.row.permissionCode,
               permissionShow: this.row.permissionShow,
+              psort: this.row.permissionSort,
               piconUrl: this.row.permissionIconUrl,
             };
           });
@@ -311,6 +324,7 @@ export default {
         purl: null,
         pstat: null,
         pcode: null,
+        psort: 0,
         permissionShow: null,
       };
     },

src/views/system/menuMag/components/editDialogBtn.vue

@@ -32,6 +32,14 @@
           placeholder="请输入权限标识"
         ></el-input>
       </el-form-item>
+      <el-form-item label="显示排序:" prop="psort">
+        <el-input
+          type="number"
+          :min="0"
+          v-model="menuForm.psort"
+          placeholder="请输入菜单标识"
+        ></el-input>
+      </el-form-item>
       <el-form-item label="状态:" prop="pstat">
         <el-select
           v-model="menuForm.pstat"
@@ -83,6 +91,7 @@ export default {
         pcode: null,
         permissionShow: 2,
         piconUrl: "",
+        psort: 0,
       },
       addMenuRules: {
         // permissionShow: {
@@ -90,6 +99,7 @@ export default {
         //   message: "请选择",
         //   trigger: "change",
         // },
+        psort: [{ required: true, message: "请填写显示排序", trigger: "blur" }],
         pcode: [{ required: true, message: "请填写权限标识", trigger: "blur" }],
         pname: [{ required: true, message: "请填写菜单名称", trigger: "blur" }],
         // purl: [{ required: true, message: "请填写路由地址", trigger: "blur" }],
@@ -151,6 +161,7 @@ export default {
           purl: this.row.permissionUrl,
           pstat: this.row.permissionState,
           pcode: this.row.permissionCode,
+          psort: this.row.permissionSort,
           permissionShow: 2,
         };
       } else if (this.title === "新增") {
@@ -230,6 +241,7 @@ export default {
         pstat: null,
         pcode: null,
         permissionShow: 2,
+        psort: 0,
       };
     },
   },

src/views/system/menuMag/index.vue

@@ -197,7 +197,7 @@ export default {
       activeName: "1",
       title: "",
       loadingView: false,
-      defaultExpandAll: true,
+      defaultExpandAll: false,
       row: {},
       rules: {
         roleId: { permissionName: "change" },