新增身份，用户管理添加入学登记审核列表

src/utils/compressImg.js

@@ -48,7 +48,7 @@ function compressImg(file) {
         }
         // 回调函数返回file的值（将base64编码转成file）
         files = dataURLtoFile(base64); //如果后台接收类型为base64的话这一步可以省略
-        console.log(files, "压缩的文件");
+        // console.log(files, "压缩的文件");
 
         resolve(files);
       };

src/views/energy/energy.vue

@@ -27,7 +27,7 @@
                   <el-statistic title="" :value="getElcTj" />
                 </el-col> -->
                 <span class="unit">{{ getWaterTj }}</span>
-                <div class="units">L</div>
+                <div class="units">吨</div>
               </div>
             </div>
           </div>
@@ -95,7 +95,7 @@
                 label="序号"
               />
               <el-table-column align="center" prop="eNum" label="电（kw/h）" />
-              <el-table-column align="center" prop="wNum" label="水（L）" />
+              <el-table-column align="center" prop="wNum" label="水（吨）" />
               <el-table-column align="center" prop="name" label="楼栋" />
               <el-table-column align="center" prop="date" label="月份" />
             </el-table>

src/views/identity/identity.vue

@@ -103,7 +103,10 @@
                       v-if="
                         scope.row.id != 1 &&
                         scope.row.id != 2 &&
-                        scope.row.id != 3
+                        scope.row.id != 3 &&
+                        scope.row.id != 18 &&
+                        scope.row.id != 19 &&
+                        scope.row.id != 20 
                       "
                       class="del"
                     >
@@ -156,7 +159,10 @@
               v-if="
                 editRuleForm.id != 1 &&
                 editRuleForm.id != 2 &&
-                editRuleForm.id != 3
+                editRuleForm.id != 3 &&
+                editRuleForm.id != 18 &&
+                editRuleForm.id != 19 &&
+                editRuleForm.id != 20
               "
               v-model="editRuleForm.identity"
               placeholder="请输入身份"

src/views/roles/roles.vue

@@ -253,11 +253,29 @@
               <div class="rolesSel">
                 <el-tag
                   class="tag"
-                  v-for="(item, index) in row.departmentViewJson"
+                  v-for="(item, index) in row.departmentManageArr"
                   :key="item.id"
                 >
                   {{ item.name }}
                 </el-tag>
+                <el-tooltip
+                  class="box-item"
+                  effect="light"
+                  content=""
+                  placement="bottom"
+                  v-if="row.departmentManageNum"
+                >
+                  <template #content>
+                    <el-tag
+                      class="tag"
+                      v-for="(item, index) in row.departmentManageJson"
+                      :key="item.id"
+                    >
+                      {{ item.name }}
+                    </el-tag>
+                  </template>
+                  <el-tag type="primary">+{{ row.departmentManageNum }}</el-tag>
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -273,11 +291,29 @@
               <div class="rolesSel">
                 <el-tag
                   class="tag"
-                  v-for="(item, index) in row.departmentManageJson"
+                  v-for="(item, index) in row.departmentViewArr"
                   :key="item.id"
                 >
                   {{ item.name }}
                 </el-tag>
+                <el-tooltip
+                  class="box-item"
+                  effect="light"
+                  content=""
+                  placement="bottom"
+                  v-if="row.departmentViewNum"
+                >
+                  <template #content>
+                    <el-tag
+                      class="tag"
+                      v-for="(item, index) in row.departmentViewJson"
+                      :key="item.id"
+                    >
+                      {{ item.name }}
+                    </el-tag>
+                  </template>
+                  <el-tag type="primary">+{{ row.departmentViewNum }}</el-tag>
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -795,7 +831,21 @@ const getUserAuthList = async () => {
     });
     tagList.value = res.data.data;
     managementData.list = JSON.parse(JSON.stringify(tagList.value)); // 编辑权限组中修改部门权限刷新所在界面表格数据
-    // console.log(data,"当前管理员所有数据");
+    console.log(managementData.list,"管理组权限编辑数据");
+    managementData.list.forEach(i=>{
+      if(i.departmentManageJson){
+        if(i.departmentManageJson.length>2){
+          i.departmentManageArr=[i.departmentManageJson[0],i.departmentManageJson[1]]
+          i.departmentManageNum=i.departmentManageJson.length-2
+        }
+      }
+      if(i.departmentViewJson){
+        if(i.departmentViewJson.length>2){
+          i.departmentViewArr=[i.departmentViewJson[0],i.departmentViewJson[1]]
+          i.departmentViewNum=i.departmentViewJson.length-2
+        }
+      }
+    })
   } else {
     ElMessage({
       type: "error",