Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'B66468F48B5847DE8A5A5CFB0F79022A';
+      config.headers['token'] = '9606E40DDB704396AB532B2AE771048E';
 
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{

src/views/yqrange/checkBlackList.vue

@@ -52,15 +52,19 @@
         tooltip-effect="dark"
         @select-all="selectAllOrganization"
         @select="selectOrganization"
+        @cell-mouse-enter="showItemToast"
       >
-        <!-- @cell-mouse-enter="showItemToast"
-        @cell-mouse-leave="itemMouseOver=false"-->
+        <!-- @cell-mouse-enter="showItemToast"-->
         <el-table-column type="selection" :selectable="selectableTableList">
-          <template >
+          <!-- <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
-              <p>{{ "哇米诺" }}</p>
+              <p>姓名: {{ scope.row.name }}</p>
+              <p>科室: {{ scope.row.department }}</p>
+              <div slot="reference">
+                <p size="medium">{{ "t" }}</p>
+              </div>
             </el-popover>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="name" label="人员名称" align="center"></el-table-column>
         <el-table-column prop="department" label="所属科室" align="center"></el-table-column>
@@ -167,7 +171,7 @@ export default {
         pageSize: 10,
       },
       allSelect: [],
-      itemMouseOver: false,
+      lastHoverAdminId: 0,
     };
   },
   created() {
@@ -499,13 +503,10 @@ export default {
         });
     },
     selectableTableList(row, index) {
-      // if (this.status4Flag == 1) {
       if (row.status == 2 || !(row.roleId == null || row.roleId == 0)) {
         return false;
       }
       return true;
-      // }
-      // return true;
     },
     // 通过check改变展示的已选中的数据列表
     checkToList(type, item) {
@@ -583,11 +584,21 @@ export default {
       this.$emit("handleClose");
     },
     showItemToast(row) {
-      console.log("showItemToast() : " + row.status + ", 管理员不可加入黑名单");
-      if (row.roleId != null && row.roleId != 0) {
-        vm.$message.info("管理员不可加入黑名单");
+      console.log("showItemToast() : row.id = " + row.id + ", row.status = " + row.status);
+      let role;
+      if (this.lastHoverAdminId != row.id && row.roleId != null && row.roleId != 0) {
+        if (row.roleId == 1) {
+          role = "管理员";
+        } else if (row.roleId == 2) {
+          role = "主管理员";
+        } else if (row.roleId == 3) {
+          role = "内部管理员";
+        } else if (row.roleId == 4) {
+          role = "高级主管理员";
+        }
+        vm.$message.info(`该人员为[`+ role +`身份]，无法加入黑名单`);
       }
-      this.itemMouseOver = true;
+      this.lastHoverAdminId = row.id;
     },
   },
 };