fix something

src/components/notificationMsg.vue

@@ -8,8 +8,8 @@
             <div class="notifation-wrap">
                 <!-- 防止tabs在popover前渲染,会导致tab选中状态不正确 -->
                 <el-tabs v-model="activeName" v-if="visible" @tab-click="getMsgList">
-                    <el-tab-pane :label="`${$t('AprrovalPage.research_approval_btn')}(${UnreadTotal})`" name="first"></el-tab-pane>
-                    <el-tab-pane :label="`资产数据`" name="second"></el-tab-pane>
+                    <el-tab-pane :label="`${$t('AprrovalPage.research_approval_btn')}${activeName==='first'?'('+UnreadTotal+')':''}`" name="first"></el-tab-pane>
+                    <el-tab-pane :label="`${$t('SystemManage.OperateAuth.label_notice_title')}${activeName==='second'?'('+UnreadTotal+')':''}`" name="second"></el-tab-pane>
                 </el-tabs>
                 <div class="massage-list" v-if="visible">
                     <div class="message-item" :class="{'IsRead':item.IsRead}" v-for="item in msgList" :key="item.Id" @click="readMsg(item)">

src/lang/modules/systemManage/OperateAuth.js

@@ -54,11 +54,14 @@ export const OperateAuthEn = {
     tab_sub_sheet3:'Mixed Table ',
     label_count: 'Quantity',
     label_checked:'Selected',
+    ph_see_user:'Please select visible users',
+    label_notice_title: 'Asset Data',
 
     /* 转移弹窗 */
     transfer_title1:'Full Asset Transfer',
     transfer_title2:'Bulk Asset Transfer Setup',
     transfer_title3:'Set Asset Transfer',
+    ph_assets:'Please select the asset module you wish to transfer',
 
     /* 分类加密弹窗 */
     label_open:'Public',
@@ -122,11 +125,14 @@ export const OperateAuthZh = {
     tab_sub_sheet3:'混合表格',
     label_count: '数量',
     label_checked:'已选',
+    ph_see_user:'请选择可见用户',
+    label_notice_title: '资产数据',
 
     /* 转移弹窗 */
     transfer_title1:'全量资产转移',
     transfer_title2:'批量设置资产转移',
     transfer_title3:'设置资产转移',
+    ph_assets:'请选择要转移资产模块',
 
     /* 分类加密弹窗 */
     label_open:'公开',

src/views/dataEntry_manage/chartSetting.vue

@@ -788,7 +788,7 @@
                         <span class="text_oneLine" :style="{'padding-left':chart.IsEnChart?'24px':''}">{{ currentLang === 'en' ? (chart.ChartNameEn||chart.ChartName) : chart.ChartName }}</span>
                     </div>
                     <div class="chart-item-img" @click="detailShowHandle(chart)"
-                    :style="chart.ChartImage?{background: `no-repeat top/cover url('${chart.ChartImage}')`}:{}"></div>
+                    :style="chart.ChartImage?{background: `no-repeat top/cover url('${!chart.HaveOperaAuth ? $icons.lock_big : chart.ChartImage}')`}:{}"></div>
                     <div class="chart-item-bottom">
                         <span><!-- 创建时间 -->{{$t('Chart.list_chart_time')}}: {{ chart.CreateTime.slice(0,10) }}</span>
                         <span v-permission="permissionBtn.chartLibPermission.chartLib_addMy"

src/views/dataEntry_manage/databaseList.vue

@@ -235,8 +235,7 @@
 								<span v-show="currentLang=='en'">{{ item.EdbNameEn || item.EdbName }}</span>
 							</div>
 							<div class="image" @click="detailShowHandle(item)"
-								:style="item.ChartImage?{background: `no-repeat top/cover url('${item.ChartImage}')`}:{}">
-								<!-- <img :src="item.ChartImage"/> -->
+								:style="item.ChartImage?{background: `no-repeat top/cover url('${!item.HaveOperaAuth ? $icons.lock_big : item.ChartImage}')`}:{}">
 							</div>
 							<div class="info">
 								{{$t('EtaBasePage.time_show')}}：{{item.CreateTime.substring(0,10)}}

src/views/datasheet_manage/components/sheetListWrap.vue

@@ -13,7 +13,7 @@
             <span class="text_oneLine">{{ cell.ExcelName }}</span>
           </div>
           <img
-            :src="cell.ExcelImage"
+            :src="([2,3].includes(cell.Source)&&!cell.HaveOperaAuth)?$icons.lock_big:cell.ExcelImage"
             alt=""
             class="chart-img"
             :height="imgHeight"
@@ -23,7 +23,7 @@
             <span>{{$t('OnlineExcelPage.creation_time_tle')}}: {{ cell.CreateTime.slice(0, 10) }}</span>
             <div>
               <span
-                v-if="$parent.isSheetBtnShow('download')"
+                v-if="$parent.isSheetBtnShow('download')&&cell.HaveOperaAuth"
                 class="editsty"
                 style="margin-right: 10px"
                 @click="$emit('downloadExcel',cell)"

src/views/datasheet_manage/mixins/classifyMixin.js

@@ -323,6 +323,8 @@ export default {
 
     /* 判断节点是否能被拖拽 */
     canDragHandle(node) {
+      if(!node.data.HaveOperaAuth) return
+
       let canMove = true;
       return canMove;
     },

src/views/datasheet_manage/sheetList.vue

@@ -108,7 +108,7 @@
               </span>
               <span
                 style="display: flex; align-items: center"
-                v-if="select_node === data.UniqueCode"
+                v-if="select_node === data.UniqueCode && data.HaveOperaAuth"
               >
                 <img
                   src="~@/assets/img/data_m/move_ico.png"
@@ -902,10 +902,10 @@ export default {
             //sheet组件Mounted已经init一次,再次调用会导致工具栏样式错乱
             //this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
 
-            this.sheetDetailInfo.Source === 2 &&
+            this.sheetDetailInfo.Source === 2 && this.$refs.customTableRef &&
               this.$refs.customTableRef.initSheetData(res.Data.TableData);
 
-            this.sheetDetailInfo.Source === 3 &&
+            this.sheetDetailInfo.Source === 3 && this.$refs.mixedTableRef &&
               this.$refs.mixedTableRef.initData(res.Data.TableData);
           });
         });

src/views/predictEdb_manage/predictEdb.vue

@@ -304,7 +304,7 @@
 									<span class="text_oneLine">{{ currentLang === 'en' ? (item.EdbNameEn||item.EdbName) : item.EdbName }}</span>
 								</div>
 								<div class="chart-img" @click="detailShowHandle(item)"
-								:style="item.ChartImage?{background: `no-repeat top/cover url('${item.ChartImage}')`}:{}"></div>
+								:style="item.ChartImage?{background: `no-repeat top/cover url('${!item.HaveOperaAuth ? $icons.lock_big : item.ChartImage}')`}:{}"></div>
 								<div class="item-bottom">
 									<span>{{$t('Common.create_time')}}: {{ item.CreateTime.slice(0,10) }}</span>
 								</div>

src/views/system_manage/components/opearAuthSetDia.vue

@@ -32,7 +32,7 @@
           clearable
           @change="checkUser"
           filterable
-          :placeholder="this.$t('SystemManage.OperateAuth.placeholder04')" 
+          :placeholder="this.$t('SystemManage.OperateAuth.ph_see_user')" 
           style="width:300px"
         />
 

src/views/system_manage/dataOperaAuth.vue

@@ -120,7 +120,7 @@
         </div>
 
         <div>
-          <!-- <span>{{$t('SystemManage.OperateAuth.label_checked')}}：{{ searchForm.checkAll ? total : checkedList.length }}</span> -->
+          <span>{{$t('SystemManage.OperateAuth.label_checked')}}：{{ isSelectAll ? (total-checkedList.length) : checkedList.length }}</span>
           <el-checkbox 
             v-model="searchForm.checkAll"
             :indeterminate="searchForm.checkSome"
@@ -312,7 +312,7 @@ export default {
         { label: /* '混合表格' */this.$t('SystemManage.OperateAuth.tab_sub_sheet3'), key: 3 },
       ]
 
-      return subTabs
+      return this.currAuthSet===1 ? subTabs : subTabs.filter(_ => _.key!==4)
     },
     tableColums() {
       const clomusMap = {
@@ -419,6 +419,7 @@ export default {
   mounted(){
     this.getClassifyList()
     this.getUserList();
+    this.getTableData()
   },
   methods:{
 
@@ -536,7 +537,7 @@ export default {
     /* 切换模块 */
     changeTab({key}) {
       this.default_tab = key;
-      this.default_sub_tab = '4';
+      this.default_sub_tab = String(this.subTabs[0].key);
       this.searchForm.classifys=[]
       this.searchForm.key_word=''
       this.searchForm.checkAll = false
@@ -688,6 +689,8 @@ export default {
     /* 全量转移 */
     async transferAllHandle() {
       if(!this.transferForm.creatorIds.length) return this.$message.warning(/* '请选择原创建人' */this.$t('SystemManage.OperateAuth.old_creator_msg'))
+      
+      if(!this.transferForm.assetTypes.length) return this.$message.warning(/* '请选择要转移资产模块' */)
 
       const res = await operateAuthInterface.transferAllData({
         Source: this.transferForm.assetTypes,