From d03c0c366862d917bdac6ba9cab8d338e722da10 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 11 六月 2024 14:12:38 +0800
Subject: [PATCH] 修改

---
 ruoyi-ui/src/views/travel/index.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index e867df7..7e0221e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -59,7 +59,7 @@
       </el-form-item>
     </el-form>
 
-    <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"
@@ -120,22 +120,22 @@
                     alt=""
                     style="width: 35px; height: 35px;"
                     fit="cover"
-                    v-if="scope.row.url"
+                    v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                   >
                   <img
+                    v-else
                     class="el-upload-list__item-thumbnail"
                     src="../../assets/images/deviceA.png"
                     alt=""
                     style="width: 35px; height: 35px;"
                     fit="cover"
-                    v-if="!scope.row.url"
                   >
                 </template>
               </el-table-column>
 <!--              <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
 
 
-              <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+              <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
                 <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                   <el-button
                     size="mini"
@@ -184,7 +184,7 @@
 
 
 
-      <el-table-column  label="鎿嶄綔" align="center" sortable width="180" >
+      <el-table-column  label="鎿嶄綔" align="center" sortable width="180" v-if="userId != 2">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
@@ -236,7 +236,7 @@
             <el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="100px" />
             <el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="100px" />
 
-            <el-table-column label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width">
+            <el-table-column label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
               <template slot-scope="scope" v-if="scope.row.roleId !== 1">
 
                 <el-button
@@ -445,7 +445,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>
@@ -518,7 +518,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";
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
@@ -541,6 +541,7 @@
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      userId: undefined,
       // 閬僵灞�
       disabled: false,
       loading: true,
@@ -783,8 +784,16 @@
   },
   created() {
     this.getList();
+    this.getInfo()
   },
   methods: {
+    getInfo(){
+          console.log('-----------------')
+          getInfo().then(response=>{
+            console.log(response.user.roles[0].roleId,'roleID')
+            this.userId = response.user.roles[0].roleId
+          })
+        },
     //灞曞紑琛�
     expandRowClassName({ row, rowIndex }) {
       // 杩斿洖瀵瑰簲琛岀殑鏍峰紡閰嶇疆瀵硅薄
@@ -899,7 +908,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {

--
Gitblit v1.9.1