111

src/components/HeaderElement.vue

@@ -31,7 +31,7 @@
             </div>
           </div>
           <el-divider direction="vertical"></el-divider>
-          <div class="user" style="width: 80px;">
+          <div class="user" style="width: 100px;">
             <div>
               <i class="el-icon-user-solid" style="font-size: 28px"></i>
             </div>
@@ -96,7 +96,7 @@
 
 <script>
 import { mapState, mapActions } from 'vuex'
-import { findUpdate, getFarmId } from '../utils/api';
+import { findUpdate } from '../utils/api';
 import { Chrome } from 'vue-color';
 import { Debounce } from "../utils";
 
@@ -178,12 +178,6 @@ export default {
     },
     // 拿到farmid
     init() {
-      getFarmId().then(res => {
-        if(res.code === 10000) {
-          this.setFarmIdAsync(res.data);
-          localStorage.setItem('lastFarmId', res.data);
-        }
-      })
     },
     // 选择牧场
     onChange(val) {

src/views/Login/Login.vue

@@ -43,8 +43,8 @@
 </template>
 
 <script>
-import { Login } from '../../utils/api';
-import { mapState } from 'vuex'
+import {getFarmId, Login} from '../../utils/api';
+import { mapState, mapActions } from 'vuex'
 export default {
   name: "Login",
   data() {
@@ -58,6 +58,7 @@ export default {
     ...mapState(['ip'])
   },
   methods: {
+    ...mapActions(['setFarmIdAsync']),
     onSubmit() {
       let params = {
         accountName: this.userName,
@@ -70,12 +71,18 @@ export default {
           localStorage.setItem('UserName', res.data.accountName);
           localStorage.setItem('UserId', res.data.id);
           this.$message.success('登录成功');
-          let url = this.$route.query.redirect;
-          if(url) {
-            this.$router.replace(url);
-          } else {
-            this.$router.replace('/');
-          }
+          getFarmId().then(res => {
+            if(res.code === 10000) {
+              this.setFarmIdAsync(res.data);
+              localStorage.setItem('lastFarmId', res.data);
+              let url = this.$route.query.redirect;
+              if(url) {
+                this.$router.replace(url);
+              } else {
+                this.$router.replace('/');
+              }
+            }
+          })
         } else {
           this.$message.error(res.message);
           this.refset();

src/views/SystemAdmin/AuthAdmin.vue

@@ -109,28 +109,6 @@
           @check="onCheck"
       />
     </a-modal>
-<!--    <el-dialog-->
-<!--        title="权限分配"-->
-<!--        :visible.sync="dialogLimits"-->
-<!--        width="50%">-->
-<!--      <div>-->
-<!--        <el-tree-->
-<!--            v-if="dialogLimits"-->
-<!--            :data="limitList"-->
-<!--            show-checkbox-->
-<!--            node-key="id"-->
-<!--            default-expand-all-->
-<!--            :default-checked-keys="defaultList"-->
-<!--            :props="defaultProps"-->
-<!--            @check-change="handleCheckChange"-->
-<!--            ref="tree">-->
-<!--        </el-tree>-->
-<!--      </div>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--                <el-button @click="dialogLimits = false">取 消</el-button>-->
-<!--                <el-button type="primary" @click="limitSave">保存</el-button>-->
-<!--              </span>-->
-<!--    </el-dialog>-->
     <el-dialog
         title="用户分配"
         :visible.sync="dialogUsers"
@@ -318,7 +296,6 @@ export default {
     onCheck(checkedKeys, info) {
       this.checkedKeys = checkedKeys;
       this.commitKeys = checkedKeys.concat(info.halfCheckedKeys)
-      console.log(this.commitKeys);
     },
     pickCheckedKeys(data) {
       for (let i = 0; i < data.length; i++) {
@@ -338,14 +315,18 @@ export default {
       getMenuByGroup({groupId: data.id})
           .then(res => {
             let arr;
-            if(res.code === 10005) {
-              arr = [];
-            } else {
+            if(res.code === 10000) {
               arr = res.data.split(',');
+              this.defaultList = arr.map(Number);
+              this.pickCheckedKeys(this.defaultList);
+              this.selectList = this.defaultList;
+            } else {
+              arr = [];
+              this.defaultList = [];
+              this.selectList = [];
+              this.selectedKeys = [];
+              this.checkedKeys = [];
             }
-            this.defaultList = arr.map(Number);
-            this.pickCheckedKeys(this.defaultList);
-            this.selectList = this.defaultList;
           })
     },
     // 权限分配保存