From 32148fb89c6cbedc24aaf9cb93a215a6cc665f2b Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 09 七月 2024 16:56:14 +0800
Subject: [PATCH] 修改了一些报错,完善了用户管理配偶的选择模块

---
 ruoyi-ui/src/views/collection/index.vue |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 6be8625..063c56e 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -126,7 +126,7 @@
 <!--      line-height: 21px;-->
 <!--      ">鏀惰棌鍜岃崳瑾�</div>-->
 
-      <el-row :gutter="10" class="mb8">
+      <el-row :gutter="10" class="mb8" v-if="userId != 2">
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -242,7 +242,7 @@
             ></div>
         </template>
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+      <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <div class="button-container">
             <el-button
@@ -403,7 +403,7 @@
           ></video>
           <img v-else
                class="el-upload-list__item-thumbnail"
-               :src="file.url"
+               src="../../assets/images/deviceLis.png"
                alt=""
                style="width: 100%; height: 100%"
                fit="cover"></img>
@@ -459,7 +459,7 @@
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
 
 
 //瀵煎叆鎺ュ彛鍑芥暟
@@ -473,6 +473,7 @@
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      userId: undefined,
       // 閬僵灞�
       disabled: false,
 
@@ -607,8 +608,16 @@
   created() {
     this.getList();
     this.getTypeOptions();
+    this.getInfo()
   },
   methods: {
+    getInfo(){
+          console.log('-----------------')
+          getInfo().then(response=>{
+            console.log(response.user.roles[0].roleId,'roleID')
+            this.userId = response.user.roles[0].roleId
+          })
+        },
     // 鍙栨秷鎸夐挳
     cancelData() {
       this.open = false;
@@ -758,7 +767,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {

--
Gitblit v1.9.1