zuixin

.eslintrc.js

@@ -5,7 +5,8 @@ module.exports = {
   },
   extends: ['plugin:vue/essential'],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    // 'no-console': process.env.NODE_ENV === 'production',
+    'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {

src/views/Home/Home.vue

@@ -54,7 +54,7 @@
                         text-color="#fff"
                         active-text-color="#ffd04b"
                     >
-                        <div v-for="(item, index1) in menuData " :key="index1">
+                        <div v-for="(item, index1) in menu " :key="index1">
                             <el-submenu
                                 v-if="item.children && item.children.length > 0"
                                 :index="`${index1}`"
@@ -97,16 +97,16 @@
 </template>
 
 <script>
-import { menuData } from "./mencCofig.js";
+// import { menuData } from "./mencCofig.js";
 import { mapState } from 'vuex';
 
 export default {
     data() {
         return {
             // 菜单配置
-            menuData: menuData,
+            menuData: [],
             menuCollapse: false, //是否水平折叠收起菜单
-            defaultUnfoldedMenu: [menuData[0], 1], // 默认展开第一项
+            defaultUnfoldedMenu: '', // 默认展开第一项
             mainTitle: ''
         };
     },
@@ -130,9 +130,9 @@ export default {
     },
     computed: {
         ...mapState(['typeCode',]),
-        // menu() {
-        //     return this.menuData;
-        // }
+        menu() {
+            return this.menuData;
+        }
     },
     methods: {
         // 收取菜单按钮
@@ -177,7 +177,7 @@ export default {
         }
     },
     mounted() {
-        // this.init();
+        this.init();
     }
 };
 </script>

src/views/Login/Login.vue

@@ -64,25 +64,28 @@ export default {
                 spinner: "el-icon-loading",
                 background: "rgba(0, 0, 0, 0.7)"
             });
-            reqLogin(this.form)
-                .then(res => {
-                    loading.close();
-                    localStorage.setItem("token", res.token);
-                    this.$router.replace ("/home/dashboard");
-                    // this.doOrganizationChoose();
-                })
-                .catch(err => {
-                    console.log("登录失败", err);
-                });
-            // this.$axios.post(`http://121.37.169.186:8081/my/login?accountName=${this.form.userName}&password=${this.form.userPwd}`)
-            //         .then(res => {
-            //             loading.close();
-            //             if(res.data.code === 10000) {
-            //                 localStorage.setItem('accountName', res.data.accountName);
-            //             } else {
-            //                 this.$message.error(res.data.message);
-            //             }
-            //         })
+            // reqLogin(this.form)
+            //     .then(res => {
+            //         loading.close();
+            //         localStorage.setItem("token", res.token);
+            //         this.$router.replace ("/home/dashboard");
+            //         // this.doOrganizationChoose();
+            //     })
+            //     .catch(err => {
+            //         console.log("登录失败", err);
+            //     });
+            this.$axios.post(`http://121.37.169.186:8081/my/login?accountName=${this.form.userName}&password=${this.form.userPwd}`)
+                    .then(res => {
+                        loading.close();
+                        if(res.data.code === 10000) {
+                            localStorage.setItem("token", res.data.token);
+
+                            localStorage.setItem('accountName', res.data.accountName);
+                            this.$router.replace ("/home/dashboard");
+                        } else {
+                            this.$message.error(res.data.message);
+                        }
+                    })
         },
         handleSet: function() {
             if (!this.orgSelected) {

src/views/slaughterManagment/firmBuy.vue

@@ -22,7 +22,7 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="sheepId" label="养只编号"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊只编号"></el-table-column>
                     <el-table-column prop="acquisitionTime" label="收购时间"></el-table-column>
                     <el-table-column prop="origin" label="来源牧场"></el-table-column>
                     <el-table-column prop="acquisitionWeight" label="收购重量(kg)"></el-table-column>

src/views/storeTransportation/transportation.vue

@@ -62,7 +62,7 @@ export default {
     created() {},
     methods: {
         searchByHand() {
-            console.log("666");
+            // console.log("666");
         }
     }
 };
@@ -106,4 +106,4 @@ export default {
         }
     }
 }
-</style>
+</style>

src/views/systemAdmin/authAdmin.vue

@@ -98,9 +98,9 @@
                 show-checkbox
                 node-key="id"
                 default-expand-all
-                :default-checked-keys="selectList"
+                :default-checked-keys="defaultList"
                 :props="defaultProps"
-                @check="selectTable"
+                @check-change="handleCheckChange"
                 ref="tree">
         </el-tree>
       </div>
@@ -168,8 +168,8 @@
           children: 'children',
           label: 'menuName'
         },
-        // 选择得参数
-        selectList: [],
+        // 默认选择的参数
+        defaultList: [],
         keyword: '',
         total: 0,
         size: 20,
@@ -209,14 +209,13 @@
       handleLimits(data) {
         this.dialogLimits = true;
         this.selectId = data.id;
-        this.selectList = [];
+        this.defaultList = [];
         this.$axios.post(`http://121.37.169.186:8081/auth/getMenuByGroup?groupId=${data.id}`)
         .then(res => {
           if(res.data.code === 10005) {
-            this.selectList = [];
+            this.defaultList = [];
           } else {
-            this.selectList = res.data.data.split(',');
-            this.$forceUpdate();
+            this.defaultList = res.data.data.split(',');
           }
         })
       },
@@ -235,6 +234,7 @@
           } else {
             let arr = res.data.data.split(',');
             this.$nextTick(() => {
+              this.$refs.multipleTable.clearSelection();
               for (let key in this.userList) {
                 for(let i in arr) {
                   if(this.userList[key]['id'] == arr[i]) {
@@ -267,9 +267,6 @@
         });
         this.dialogUsers = false;
       },
-      selectTable(data, checked, ) {
-        this.selectList = checked.checkedKeys.concat(checked.halfCheckedKeys);
-      },
       // 新增角色
       onSubmit() {
         this.$axios.post(`http://121.37.169.186:8081/group/add?groupName=${this.form.groupName}&remark=${this.form.remark}`)
@@ -282,8 +279,14 @@
           this.reset();
         })
       },
+      handleCheckChange() {
+        this.selectList = [];
+        this.selectList = this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys());
+      },
       // 权限分配
       limitSave() {
+        // console.log(this.$refs.tree.getCheckedKeys());
+        // this.selectList = this.$refs.tree.getCheckedKeys();
         let menuIds = this.selectList.join(',');
         menuIds += ',136';
         this.$axios.post(`http://121.37.169.186:8081/auth/saveGroupMenu?groupId=${this.selectId}&menuIds=${menuIds}`)