Merge branch 'debug' of http://8.136.199.33:3000/eta_front/eta_mobile_front into debug

src/views/sheetList/Index.vue

@@ -122,9 +122,4 @@ function goPage(item){
         }
     }
 }
-@media screen and (min-width:$media-width){
-    .tabbar-box{
-        display: none;
-    }
-}
 </style>

src/views/sheetList/balanceDetail.vue

@@ -23,7 +23,7 @@ let showVersionPicker = ref(false)
 const chartList = ref([])
 const sheetActions = computed(() => {
     const list = [
-        { label: globalProperties.$t('shared_table.refresh'), types:'flushed', src: getStaticImg('table/flushed.png'), isAuth: etaTablePermission.etaTable_customize_balance_refresh},
+        // { label: globalProperties.$t('shared_table.refresh'), types:'flushed', src: getStaticImg('table/flushed.png'), isAuth: etaTablePermission.etaTable_customize_balance_refresh},
         { label: globalProperties.$t('shared_table.download'), types:'download', src: getStaticImg('table/download.png'), isAuth:etaTablePermission.etaTable_customize_balance_download},
         { label: globalProperties.$t('shared_table.delete'), types:'delete', src: getStaticImg('table/delete.png'), isAuth: etaTablePermission.etaTable_customize_balance_del},
     ]
@@ -301,12 +301,12 @@ function goChart () {
             <iframe :src="link + '/sheetshow?code=' + queryData.UniqueCode" frameborder="0" width="100%" height="100%"></iframe>
         </div>
         <div class="bottom">
-            <div v-for="item in sheetActions" :key="item.types">
+            <template v-for="item in sheetActions" :key="item.types">
                 <div class="bottom-item" @click="handleActionClick(item)" v-if="item.isAuth">
                     <img :src="item.src" alt="">
                     <div>{{item.label}}</div>
                 </div>
-            </div>
+            </template>
         </div>
         <!-- 更多设置弹窗 -->
         <van-popup
@@ -422,7 +422,7 @@ function goChart () {
     }
     .sheet-box{
         width: 100%;
-        height: calc(100% - 300px);
+        height: calc(100% - 320px);
     }
     .sheet-more-action-wrap{
         .head-box{
@@ -447,7 +447,12 @@ function goChart () {
         }
     }
     .bottom {
+        position: fixed;
+        bottom: 0;
+        right: 0;
+        z-index: 99;
         display: flex;
+        background-color: #fff;
         justify-content: space-around;
         .bottom-item {
             color: rgba(51, 51, 51, 1);
@@ -461,6 +466,11 @@ function goChart () {
             }
         }
     }
+    @media screen and (max-width: 650px) {
+        .bottom {
+            left: 0;
+        }
+    }
     @media screen and (min-width: 650px) {
         .filter-box {
             width: 50%;
@@ -519,13 +529,17 @@ function goChart () {
         .sheet-box{
             margin-top: 10px;
             width: 100%;
-            height: calc(100% - 125px);
+            height: calc(100% - 135px);
         }
         .bottom {
             width: 30%;
-            position: absolute;
-            right: 12px;
+            // position: absolute;
+            // right: 12px;
+            // bottom: 12px;
+            position: fixed;
             bottom: 12px;
+            right: 12px;
+            z-index: 99;
             display: flex;
             justify-content: space-around;
             .bottom-item {

src/views/sheetList/balanceList.vue

@@ -5,6 +5,8 @@ import { useRouter } from "vue-router";
 import useLocaleStore from "@/store/modules/i18n";
 import CatalogTree from './components/CatalogTree.vue';
 import CatalogItem from './components/CatalogItem.vue';
+import { showToast } from "vant";
+import { useNoAuth } from '@/hooks/useNoAuth'
 //激活的目录路径
 const catalogMenu = ref('')
 const router = useRouter()
@@ -100,7 +102,6 @@ async function getCatalogList(){
         IsShowMe: IsShowMe
     })
     if(res.Ret!==200) return 
-    console.log(res);
     dataNodes.value = res.Data?res.Data.AllNodes:[]||[]
     catalogNodes.value = dataNodes.value.map(node=>{
         if(node.Children){
@@ -124,6 +125,7 @@ function showFileOpt(item){
 }
 //跳转至图表详情页
 const goSheetDetail = (item)=>{
+    if(!item.HaveOperaAuth) return showToast(useNoAuth().sheet)
     router.push({
         path:'/balance/detail',
         query:{
@@ -180,7 +182,7 @@ function goSheetSearch(){
                   @click="goSheetDetail(item)"
               >
                   <div class="title">{{item.ExcelName}}</div>
-                  <img class="img" :src="item.ExcelImage" alt="">   
+                  <img class="img" :src="!item.HaveOperaAuth?useNoAuth().noAuthImg:item.ExcelImage" alt="">  
                   <div class="time">
                       <span>{{item.CreateTime.slice(0,10)}}</span>
                   </div>

src/views/sheetList/components/CatalogItem.vue

@@ -1,5 +1,6 @@
 <script setup>
 import {ref} from 'vue'
+import { useNoAuth } from '@/hooks/useNoAuth'
 const props = defineProps({
     showFileImg:{
         type:Boolean,
@@ -14,6 +15,8 @@ const props = defineProps({
         default:0
     }
 })
+console.log(props.node);
+
 
 const emits=defineEmits(['showFileOptClick','showPopup'])
 function showPopup(){
@@ -23,6 +26,7 @@ function showPopup(){
 
 <template>
     <div class="catalog-item" :class="{'leaf-padding':!showFileImg}">
+        <img :src="useNoAuth().noAuthIco" width="18" height="18" v-if="!props.node.HaveOperaAuth">
         <span class="van-ellipsis" :class="{'leaf-padding':!showFileImg,'choosed':activeId===node.ExcelClassifyId}">{{node.ExcelClassifyName||''}}</span>
         <!-- <div @click.stop="showPopup">
             <div class="menu-icon"  v-if="node.HaveOperaAuth">

src/views/sheetList/components/CatalogTree.vue

@@ -39,6 +39,9 @@ function handleCatalogItemClick(item,type,node){
                     :node="node" 
                     @showPopup="showFileOpt"/>
             </template>
+            <template #right-icon v-if="!node.Children">
+                <div></div>
+            </template>
             <div 
                 class="list-item"
                 v-for="item in node.Children" 

src/views/sheetList/mixedList.vue

@@ -5,6 +5,8 @@ import { useRouter } from "vue-router";
 import useLocaleStore from "@/store/modules/i18n";
 import CatalogTree from './components/CatalogTree.vue';
 import CatalogItem from './components/CatalogItem.vue';
+import { showToast } from "vant";
+import { useNoAuth } from '@/hooks/useNoAuth'
 //激活的目录路径
 const catalogMenu = ref('')
 const router = useRouter()
@@ -124,6 +126,7 @@ function showFileOpt(item){
 }
 //跳转至图表详情页
 const goSheetDetail = (item)=>{
+    if(!item.HaveOperaAuth) return showToast(useNoAuth().sheet)
     router.push({
         path:'/shared/detail',
         query:{
@@ -180,7 +183,7 @@ function goSheetSearch(){
                   @click="goSheetDetail(item)"
               >
                   <div class="title">{{item.ExcelName}}</div>
-                  <img class="img" :src="item.ExcelImage" alt="">   
+                  <img class="img" :src="!item.HaveOperaAuth?useNoAuth().noAuthImg:item.ExcelImage" alt="">
                   <div class="time">
                       <span>{{item.CreateTime.slice(0,10)}}</span>
                   </div>

src/views/sheetList/sharedDetail.vue

@@ -26,7 +26,7 @@ const sheetActions = computed(() => {
     else if (Source === 2) authList = [ etaTablePermission.etaTable_customize_data_refresh, etaTablePermission.etaTable_customize_data_download, etaTablePermission.etaTable_customize_data_del]
     else authList = [ etaTablePermission.etaTable_customize_mix_refresh, etaTablePermission.etaTable_excel_download, etaTablePermission.etaTable_excel_del]
     return [
-        { label: globalProperties.$t('shared_table.refresh'), types:'flushed', src: getStaticImg('table/flushed.png'), isAuth: Source === 2 ? true : checkAuthBtn(authList[0]) }, /* 因为pc端时间序列表格没有刷新这个权限，所以暂时直接给true */
+        // { label: globalProperties.$t('shared_table.refresh'), types:'flushed', src: getStaticImg('table/flushed.png'), isAuth: Source === 2 ? true : checkAuthBtn(authList[0]) }, /* 因为pc端时间序列表格没有刷新这个权限，所以暂时直接给true */
         { label: globalProperties.$t('shared_table.download'), types:'download', src: getStaticImg('table/download.png'), isAuth: checkAuthBtn(authList[1])},
         { label: globalProperties.$t('shared_table.delete'), types:'delete', src: getStaticImg('table/delete.png'), isAuth: checkAuthBtn(authList[2])},
     ]
@@ -210,15 +210,15 @@ function Base64() {
             </div>
         </div>
         <div class="sheet-box" v-if="queryData.UniqueCode">
-            <iframe :src="link + '/sheetshow?code=' + queryData.UniqueCode" frameborder="0" width="100%" height="100%"></iframe>
+            <iframe v-if="link" :src="link + '/sheetshow?code=' + queryData.UniqueCode" frameborder="0" width="100%" height="100%"></iframe>
         </div>
         <div class="bottom">
-            <div v-for="item in sheetActions" :key="item.types">
+            <template v-for="item in sheetActions" :key="item.types">
                 <div class="bottom-item" @click="handleActionClick(item)" v-if="item.isAuth">
                     <img :src="item.src" alt="">
                     <div>{{item.label}}</div>
                 </div>
-            </div>
+            </template>
         </div>
         <!-- 更多设置弹窗 -->
         <van-popup
@@ -274,7 +274,7 @@ function Base64() {
     }
     .sheet-box{
         width: 100%;
-        height: calc(100% - 200px);
+        height: calc(100% - 220px);
         // background-color: pink;
     }
     .sheet-more-action-wrap{
@@ -300,7 +300,16 @@ function Base64() {
         }
     }
     .bottom {
+        padding-top: 20px;
+        height: 120px;
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        z-index: 99;
+        margin-top: 10px;
         display: flex;
+        background-color: #fff;
         justify-content: space-around;
         .bottom-item {
             color: rgba(51, 51, 51, 1);
@@ -355,7 +364,7 @@ function Base64() {
         .bottom {
             margin: 10px 0;
             display: flex;
-            justify-content: space-between;
+            justify-content: space-around;
             .bottom-item {
                 color: rgba(51, 51, 51, 1);
                 font-size: 10px;

src/views/sheetList/sharedList.vue

@@ -5,6 +5,8 @@ import { useRouter } from "vue-router";
 import useLocaleStore from "@/store/modules/i18n";
 import CatalogTree from './components/CatalogTree.vue';
 import CatalogItem from './components/CatalogItem.vue';
+import { useNoAuth } from '@/hooks/useNoAuth'
+import { showToast } from "vant";
 //激活的目录路径
 const catalogMenu = ref('')
 const router = useRouter()
@@ -124,6 +126,7 @@ function showFileOpt(item){
 }
 //跳转至详情页
 const goSheetDetail = (item)=>{
+    if(!item.HaveOperaAuth) return showToast(useNoAuth().sheet)
     router.push({
         path:'/shared/detail',
         query:{
@@ -181,7 +184,7 @@ function goSheetSearch(){
                   @click="goSheetDetail(item)"
               >
                   <div class="title">{{item.ExcelName}}</div>
-                  <img class="img" :src="item.ExcelImage" alt="">   
+                  <img class="img" :src="!item.HaveOperaAuth?useNoAuth().noAuthImg:item.ExcelImage" alt="">
                   <div class="time">
                       <span>{{item.CreateTime.slice(0,10)}}</span>
                   </div>

src/views/sheetList/sharedSearch.vue

@@ -53,6 +53,7 @@ function handleSearch(){
 }
 
 function goDetail(item){
+    if(!item.HaveOperaAuth) return showToast(useNoAuth().sheet)
     let path = '/shared/detail'
     if(item.Source === 5) path = '/balance/detail'
     router.push({
@@ -86,7 +87,7 @@ function goDetail(item){
             <ul class="list-wrap">
                 <li class="item" v-for="item in listState.list" :key="item.ChartInfoId" @click="goDetail(item)">
                     <div class="van-ellipsis name">{{item.ExcelName}}</div>
-                    <img class="img" :src="item.ExcelImage" alt="">
+                    <img class="img" :src="!item.HaveOperaAuth?useNoAuth().noAuthImg:item.ExcelImage" alt="">
                     <div class="time">
                         <span>{{moment(item.CreateTime).format('YYYY-MM-DD')}}</span>
                         <span>{{item.SysUserRealName}}</span>

src/views/sheetList/timelineList.vue

@@ -5,6 +5,8 @@ import { useRouter } from "vue-router";
 import useLocaleStore from "@/store/modules/i18n";
 import CatalogTree from './components/CatalogTree.vue';
 import CatalogItem from './components/CatalogItem.vue';
+import { useNoAuth } from '@/hooks/useNoAuth'
+import { showToast } from "vant";
 //激活的目录路径
 const catalogMenu = ref('')
 const router = useRouter()
@@ -124,6 +126,7 @@ function showFileOpt(item){
 }
 //跳转至图表详情页
 const goSheetDetail = (item)=>{
+    if(!item.HaveOperaAuth) return showToast(useNoAuth().sheet)
     router.push({
         path:'/shared/detail',
         query:{
@@ -180,7 +183,7 @@ function goSheetSearch(){
                   @click="goSheetDetail(item)"
               >
                   <div class="title">{{item.ExcelName}}</div>
-                  <img class="img" :src="item.ExcelImage" alt="">   
+                  <img class="img" :src="!item.HaveOperaAuth?useNoAuth().noAuthImg:item.ExcelImage" alt="">
                   <div class="time">
                       <span>{{item.CreateTime.slice(0,10)}}</span>
                   </div>