fixbug-2957,2958,2959

src/views/chartETA/List.vue

@@ -11,9 +11,11 @@ import TreeSelectPop from './components/TreeSelectPop.vue';
 import apiChart from '@/api/chart'
 
 import {useCatalogList} from './hooks/useCatalogList';
+import {useUserInfo} from '@/hooks/common'
 
 const { width } = useWindowSize()
 const router=useRouter()
+const UserInfo = useUserInfo()
 
 const {
     optArrChart,//图表操作列表
@@ -357,7 +359,7 @@ getChartList()
                         <div class="title">{{currentLang==='EN'?(item.ChartNameEn||item.ChartName):item.ChartName}}</div>
                         <img class="img" :src="item.ChartImage" alt="">   
                         <div class="time">
-                            <span>创建时间：{{item.CreateTime.slice(0,10)}}</span>
+                            <span>{{item.CreateTime.slice(0,10)}}</span>
                             <span class="tool-icon" @click.stop="showFileOpt({node:item,optArr:optArrChart})">
                                 <img class="icon" src="@/assets/imgs/ppt/ppt_icon_menu.png" alt="">
                             </span>
@@ -380,7 +382,7 @@ getChartList()
                         @handleCatalogItemClick="catalogItemClick"
                     />
                 </div>
-                <div class="bottom sticky-part">
+                <div class="bottom sticky-part" v-if="['rai_admin', 'ficc_admin','admin'].includes(UserInfo.RoleTypeCode)">
                     <span @click.stop="openEditNameDialog({},{id:'addNew',label:'添加图表分类'})">添加图表分类</span>
                 </div>
             </div>

src/views/chartETA/components/OptionPopup.vue

@@ -1,6 +1,7 @@
 <script setup>
 //目录,图表操作栏
 import {ref,watch} from 'vue'
+import {useUserInfo} from '@/hooks/common'
 const props = defineProps({
     showPopup:{//是否展示操作栏
         type:Boolean,
@@ -31,17 +32,31 @@ function fileOptClick(opt){
     showPop.value = false
     props.showFileOptClick({node:props.node,opt})
 }
+//判断是否展示该项
+function showOpt(opt){
+    const {authRole} = opt
+    const UserInfo = useUserInfo()||{}
+    const {AdminId,RoleTypeCode} = UserInfo.value
+    const roleType = ['rai_admin', 'ficc_admin','admin'].includes(RoleTypeCode)?'admin':RoleTypeCode
+    if(opt.id==='moveTo'||opt.id==='moveChart'){
+        return props.node.SysUserId===AdminId||roleType==='admin'
+    }
+    return authRole===roleType
+}
 
 </script>
 
 <template>
     <van-popup v-model:show="showPop" round position="bottom" >
         <div class="catalog-file-opt-box">
-            <div class="opt-item" v-for="opt in optArr" :key="opt.label" @click="fileOptClick(opt)">
-                <span>{{opt.label}}</span>
-            </div>
+            <template v-for="opt in optArr" :key="opt.label">
+                <div class="opt-item" @click="fileOptClick(opt)" v-if="showOpt(opt)">
+                    <span>{{opt.label}}</span>
+                </div>
+            </template>
+            
             <div class="opt-item last" @click="fileOptClick({id:'cancel'})">
-                <span>确定</span>
+                <span>取消</span>
             </div>
         </div>
     </van-popup>

src/views/chartETA/hooks/useCatalogList.js

@@ -15,17 +15,20 @@ export function useCatalogList(){
         {
             label:'添加子分类',
             icon:iconSrc.addNext,//图标地址
-            id:'addNext'
+            id:'addNext',
+            authRole:'admin',
         },
         {
             label:'重命名',
             icon:iconSrc.reName,
-            id:'reName'
+            id:'reName',
+            authRole:'admin',
         },
         {
             label:'删除',
             icon:iconSrc.delete,
-            id:'delete'
+            id:'delete',
+            authRole:'admin',
         },
         /* {id:'addNew',label:'添加图表分类'} */
     ]
@@ -38,12 +41,14 @@ export function useCatalogList(){
         {
             label:'重命名',
             icon:iconSrc.reName,
-            id:'reName'
+            id:'reName',
+            authRole:'admin',
         },
         {
             label:'删除',
             icon:iconSrc.delete,
-            id:'delete'
+            id:'delete',
+            authRole:'admin',
         }
     ]
     const optArrChart=[
@@ -55,7 +60,7 @@ export function useCatalogList(){
         {
             label:'移动至',
             icon:iconSrc.moveTo,
-            id:'moveChart'
+            id:'moveChart',
         },
     ]
     //目录列表