comit

src/components/SetChartEnName.vue

@@ -21,6 +21,9 @@ const props = defineProps({
         default:0
     }
 })
+const emits = defineEmits(['cancel','success'])
+
+
 //折叠面板的展开项
 const activeGroup = ref([])
 //表格组
@@ -385,7 +388,7 @@ function handleSave(){
     }
     saveChartEn(params)
 }
-const emits = defineEmits(['close',])
+
 async function saveChartEn(params){
     console.log(params);
     let res=null
@@ -420,7 +423,7 @@ async function saveChartEn(params){
     
     if(res.Ret!==200) return 
     showToast({message:'设置英文名称成功',type:'success'})
-    emits('close','save')
+    emits('success')
 }
 </script>
 
@@ -446,7 +449,7 @@ async function saveChartEn(params){
             </van-collapse-item>
         </van-collapse>
         <div class="tool-box">
-            <div class="btn cancel" @click="emits('close','cancel')">取消</div>
+            <div class="btn cancel" @click="emits('cancel')">取消</div>
             <div class="btn" @click="handleSave">保存</div>
         </div>
         <van-dialog 

src/router/myETA.js

@@ -13,22 +13,13 @@
             keepAlive:true
         },
     },
-    {
-        path:"/myETA/chartlist",
-        name:"MyETAChartList",
-        component: () => import("@/views/myETA/ChartList.vue"),
-        meta: { 
-            title: "My ETA",
-            keepAlive:false
-        },
-    },
     {
         path:"/myETA/searchlist",
         name:"MyETASearchList",
         component: () => import("@/views/myETA/SearchList.vue"),
         meta: { 
             title: "My ETA",
-            keepAlive:false
+            keepAlive:true
         },
     },
     {

src/views/myETA/ChartDetail.vue

@@ -445,6 +445,7 @@ function handleChartSavePicture(){
             height: chartHeight,
         }
     })
+    console.log(chartWidth,chartHeight);
     const canvas = document.createElement('canvas')
     const ctx = canvas.getContext('2d')
     canvas.width = chartWidth*2
@@ -463,6 +464,9 @@ let showEidtEnName=ref(false)
 function handleShowEditEnName(){
     showEidtEnName.value=true
 }
+function handleEditEnNameSuccess(){
+    reloadChartInfo()
+}
 
 </script>
 
@@ -499,21 +503,13 @@ function handleShowEditEnName(){
                 >{{chartState.startTime?chartState.startTime+'~'+chartState.endTime:'请选择时间段'}}</span>
             </div>
             <div class="right-action-box">
-                <div class="item red" @click.stop="handleRemoveChart" v-if="$route.query.iscommon!='true'">
-                    <img src="@/assets/imgs/myETA/icon_remove2.png" alt="">
-                    <span>移出</span>
-                </div>
-                <div class="item" @click.stop="handleShowCopyTo" v-if="$route.query.iscommon!='true'">
-                    <img src="@/assets/imgs/myETA/icon_copy2.png" alt="">
-                    <span>复制到</span>
+                <div class="item" @click="handleShowAxisLimitOpt" v-if="chartInfo.Source!=3&&chartInfo.ChartType!=8">
+                    <img src="@/assets/imgs/myETA/icon_limit2.png" alt="">
+                    <span>上下限设置</span>
                 </div>
-                <div class="item" @click.stop="showSaveChartOther=true">
-                    <img src="@/assets/imgs/myETA/icon_save2.png" alt="">
-                    <span>另存为</span>
-                </div>
-                <div class="item red" @click.stop="handleDeleteChart" v-if="chartInfo.IsEdit">
-                    <img src="@/assets/imgs/icon_del.png" alt="">
-                    <span>删除</span>
+                <div class="item" @click="showMoreAction=true">
+                    <img src="@/assets/imgs/chartETA/more-icon.png" alt="">
+                    <span>更多设置</span>
                 </div>
             </div>
         </div>
@@ -550,10 +546,7 @@ function handleShowEditEnName(){
 
         <!-- 指标模块 -->
         <div class="edb-list-box">
-            <!-- pad 设置上下限按钮 -->
-            <span class="pad-limit-set-btn" @click="handleShowAxisLimitOpt" v-if="chartInfo.Source!=3&&chartInfo.ChartType!=8">设置上下限</span>
-            <!-- <div class="list-lable">指标信息</div> -->
-            <div class="list-box">
+           <div class="list-box">
                 <div class="list-item" v-for="item in edbList" :key="item.EdbInfoId" @click="handleShowEDBInfo(item)">
                     <span class="date">{{item.LatestDate}}</span>
                     <span class="edb-name van-ellipsis" :style="{color:item.ChartColor}">{{item.EdbName}}</span>
@@ -616,7 +609,7 @@ function handleShowEditEnName(){
     <van-popup 
         v-model:show="showEDB"
         :position="width>650?'right':'bottom'"
-        round
+        :round="width>650?false:true"
         closeable
         :style="width>650?{ width: '400px', height: '100%' }:''"
     >
@@ -809,7 +802,8 @@ function handleShowEditEnName(){
         <set-chart-en-name
             :isShow="showEidtEnName"
             :chartInfo="chartInfoData"
-            @close="showEidtEnName=false"
+            @cancel="showEidtEnName=false"
+            @success="handleEditEnNameSuccess"
         />
     </van-popup>
 </template>
@@ -920,15 +914,6 @@ function handleShowEditEnName(){
 
     .edb-list-box{
         margin-top: 20px;
-        .pad-limit-set-btn{
-            display: none;
-        }
-        .list-lable{
-            font-size: 36px;
-            color: #000;
-            margin-bottom: 20px;
-            margin-top: 40px;
-        }
         .list-item{
             padding:18px;
             display: flex;
@@ -1030,11 +1015,6 @@ function handleShowEditEnName(){
         padding: 32px 34px;
         border-top: 1px solid $border-color;
         font-size: 32px;
-        // img{
-        //     width: 48px;
-        //     height: 48px;
-        //     margin-right: 20px;
-        // }
     }
 }
 
@@ -1140,24 +1120,10 @@ function handleShowEditEnName(){
         }
 
         .edb-list-box{
-            position: relative;
-            left: -30px;
-            border-top: 1px solid $border-color;
-            width: 100vw;
-            padding: 0 30px;
-            .pad-limit-set-btn{
-                display: block;
-                position: absolute;
-                right: 30px;
-                top: 20px;
-                color: $theme-color;
-            }
-            .list-lable{
-                margin-top: 20px;
-                font-size: 16px;
-                margin-bottom: 14px;
+            margin-top: 30px;
+            .list-item{
+                padding: 10px 0;
             }
-            
         }
         .fix-bot-action-box{
             display: none;
@@ -1180,6 +1146,7 @@ function handleShowEditEnName(){
                     border: 1px solid $theme-color;
                     margin-right: 10px;
                     border-radius: 3px;
+                    color: $theme-color;
                     &.active{
                         color: #fff;
                         background-color: $theme-color;
@@ -1246,6 +1213,17 @@ function handleShowEditEnName(){
             }
         }
     }
+    .more-action-wrap{
+        .title-box{
+            font-size: 18px;
+            padding: 20px $page-padding;
+        }
+        .item{
+            padding: 20px $page-padding;
+            font-size: 16px;
+        }
+    }
+
     .chart-copyto-wrap{
         width: 375px;
         .head-box{
@@ -1276,5 +1254,9 @@ function handleShowEditEnName(){
             }
         }
     }
+
+    .chart-picture-box{
+        width: 500PX;
+    }
 }
 </style>

src/views/myETA/ChartList.vue

@@ -1,149 +0,0 @@
-<script setup>
-import {ref,reactive} from 'vue'
-import {apiMyChartList,apiMyChartRemove} from '@/api/myETA'
-import { useRoute, useRouter } from "vue-router";
-import { showConfirmDialog, showToast } from 'vant';
-
-
-const router=useRouter()
-const route=useRoute()
-document.title=route.query.cname
-
-const isCommon=ref(route.query.iscommon=='true'?true:false)
-const cid=ref(route.query.cid||0)
-const listState = reactive({
-    list:[],
-    page:0,
-    pageSize:20,
-    finished:false,
-    loading:false
-})
-async function getList(){
-    const res=await apiMyChartList({
-        CurrentIndex:listState.page,
-        PageSize:listState.pageSize,
-        MyChartClassifyId:Number(cid.value)
-    })
-    if(res.Ret===200){
-        listState.loading=false
-        if(!res.Data){
-            listState.finished=true
-            return
-        }
-        
-        listState.finished=res.Data.Paging.IsEnd
-        const arr=res.Data.List||[]
-        listState.list=[...listState.list,...arr]
-    }
-}
-function onLoad(){
-    listState.page++
-    getList()
-}
-
-// 移除图表
-function handleRemove(item,index){
-    showConfirmDialog({
-        title: '提示',
-        message:'是否确认移出？',
-    }).then(()=>{
-        apiMyChartRemove({
-            MyChartClassifyId:Number(cid.value),
-            MyChartId:item.MyChartId
-        }).then(res=>{
-            if(res.Ret===200){
-                setTimeout(() => {
-                    showToast('移出成功')
-                }, 100);
-                listState.list.splice(index,1)
-            }
-        })
-    }).catch(()=>{})
-}
-
-// 跳转图详情
-function goChartDetail(item){
-    router.push({
-        path:"/myETA/chartdetail",
-        query:{
-            code:item.UniqueCode,
-            cid:cid.value,
-            iscommon:isCommon.value
-        }
-    })
-}
-
-</script>
-
-<template>
-    <div class="chart-list-page">
-        <van-list
-            v-model:loading="listState.loading"
-            :finished="listState.finished"
-            :finished-text="listState.list.length>0?'没有更多了':'暂无图表'"
-            @load="onLoad"
-        >
-            <img v-if="listState.list.length==0&&listState.finished" class="list-empty-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/empty_img.png" alt="">
-            <template v-for="item,index in listState.list" :key="item.ChartInfoId">
-                <van-swipe-cell :disabled="isCommon">
-                    <div class="list-item" @click="goChartDetail(item)">
-                        <img class="img" :src="item.ChartImage" alt="">
-                        <div class="con-box">
-                            <div class="van-ellipsis name">{{item.ChartName}}</div>
-                            <div class="time">创建时间：{{item.CreateTime.slice(0,10)}}</div>
-                        </div>
-                    </div>
-                    <template #right>
-                        <div class="del-btn" @click="handleRemove(item,index)">移除</div>
-                    </template>
-                </van-swipe-cell>
-            </template>
-        </van-list>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.search-box{
-    position: sticky;
-    top: 0;
-    background-color: #fff;
-    z-index: 99;
-}
-.list-item{
-    display: flex;
-    padding-top: 20px;
-    padding-left: $page-padding;
-    .img{
-        width: 160px;
-        height: 108px;
-        object-fit: contain;
-        margin-right: 20px;
-        border: 1px solid $border-color;
-        border-radius: 4px;
-        overflow: hidden;
-    }
-    .con-box{
-        padding-bottom: 20px;
-        padding-right: $page-padding;
-        flex: 1;
-        // display: flex;
-        // flex-direction: column;
-        // justify-content: space-between;
-        border-bottom: 1px solid $border-color;
-        overflow: hidden;
-        .time{
-            color: $font-grey_999;
-            margin-top: 30px;
-        }
-    }
-}
-.del-btn{
-        width: 137px;
-        height: 100%;
-        background-color: $theme-red;
-        color: #fff;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-}
-</style>

src/views/myETA/Index.vue

@@ -6,7 +6,9 @@ import apiMyETA  from '@/api/myETA'
 import { showConfirmDialog, showToast } from 'vant';
 import { useWindowSize } from '@vueuse/core'
 import draggable from 'vuedraggable'
+import {useCachedViewsStore} from '@/store/modules/cachedViews'
 
+const cachedViewsStore=useCachedViewsStore()
 const { width, height } = useWindowSize()
 
 const router=useRouter()
@@ -106,7 +108,7 @@ function handleSwitchClassify(item){
     listState.cname=item.MyChartClassifyName
     listState.list=[]
     listState.page=1
-    listState.finished=0
+    listState.finished=false
     listState.total=0
     getChartList()
     showClassifyPop.value=false
@@ -151,6 +153,12 @@ function goDetail(item){
     })
 }
 
+async function goSearch(){
+    // 删除报告搜索页的缓存
+    await cachedViewsStore.removeCaches('MyETASearchList')
+    router.push('/myETA/searchlist')
+}
+
 
 </script>
 
@@ -162,7 +170,7 @@ function goDetail(item){
                     shape="round" 
                     readonly 
                     placeholder="请输入图表名称"
-                    @click="$router.push('/myETA/searchlist')"
+                    @click="goSearch"
                 />
                 <img @click="goChooseChart" class="icon" src="@/assets/imgs/myETA/icon_select.png" alt="icon">
                 <img @click="showClassifyPop=true" class="icon" src="@/assets/imgs/myETA/icon_menu2.png" alt="icon">

src/views/myETA/SearchList.vue

@@ -1,4 +1,4 @@
-<script setup>
+<script setup name="MyETASearchList">
 import {ref,reactive} from 'vue'
 import {apiMyETAChartSearch} from '@/api/myETA'
 import { showToast } from 'vant'
@@ -50,15 +50,13 @@ function handleSearch(){
 }
 
 function goDetail(item){
-
-    const routerEl=router.resolve({
+    router.push({
         path:"/myETA/chartdetail",
         query:{
             code:item.UniqueCode,
             iscommon:true
         }
     })
-    window.open(routerEl.href,'_blank')
 }
 
 </script>
@@ -131,10 +129,6 @@ function goDetail(item){
     }
 }
 @media screen and (min-width:$media-width){
-
-    .chart-search-list-page{
-        padding-top: 10px;
-    }
     .search-box{
         top: 60px;
     }

src/views/myETA/components/EDBInfo.vue

@@ -90,8 +90,8 @@ const showYOptionsHandle=computed(()=>{
     if([3,4].includes(props.chartInfo.ChartType) && index !== 0) {
         isShowOptions = false
     } else if(props.chartInfo.ChartType ===6 
-        && ['areaspline','column'].includes(item.ChartStyle) 
-        && index !== props.tableData.findIndex(_ => _.ChartStyle === item.ChartStyle)) {
+        && ['areaspline','column'].includes(props.data.ChartStyle) 
+        && index !== props.tableData.findIndex(_ => _.ChartStyle === props.data.ChartStyle)) {
         isShowOptions = false
     }
 

src/views/myETA/components/MobileClassifyWrap.vue

@@ -1,290 +0,0 @@
-<script setup>
-import { useRouter } from 'vue-router'
-import {useClassify} from '../hooks/useClassify'
-
-const router=useRouter()
-
-const {
-    classifyTypeOpt,
-    classifyState,
-    getMyClassify,
-    getPubClassify,
-    classifyTypeChange,
-    handleAddClassify,
-    handleConfirmEditClassify,
-
-    handleShowOpt,
-    handleClassifyShare,
-    handleCopyClassify,
-    handleClassifyDel,
-    handleAddClassifyBeforeClose
-}=useClassify()
-
-getMyClassify()
-getPubClassify()
-
-function goMobileSearch() {
-    router.push({
-        path:'/myETA/searchlist'
-    })
-}
-
-
-function goChartList(item){
-    router.push({
-        path:"/myETA/chartlist",
-        query:{
-            cid:item.MyChartClassifyId,
-            cname:item.MyChartClassifyName,
-            iscommon:classifyState.classifyTypeAct==1?false:true
-        }
-    })
-}
-
-function goChooseChart(){
-    router.push({
-        path:'/myETA/choosechart'
-    })
-}
-</script>
-
-<template>
-    <div class="myETA-mobile-classify-wrap">
-        <div class="sticky-top">
-        <div class="search-box">
-            <van-search 
-                shape="round" 
-                readonly 
-                placeholder="请输入图表名称" 
-                @click="goMobileSearch"
-            />
-        </div>
-        <div class="classify-type-box">
-            <span
-                :class="['item',item.type===classifyState.classifyTypeAct?'active':'']"
-                v-for="item in classifyTypeOpt" 
-                :key="item.id"
-                @click="classifyTypeChange(item)"
-            >{{item.name}}</span>
-        </div>
-        </div>
-        <ul class="list-box">
-            <li 
-                class="item"
-                v-for="item in classifyState.classifyTypeAct==1?classifyState.myClassifyList:classifyState.pubClassifyList"
-                :key="item.MyChartClassifyId"
-                @click="goChartList(item)"
-            >
-                <img class="left-icon" src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
-                <div style="flex:1">
-                    <div class="van-ellipsis name">{{item.MyChartClassifyName}}</div>
-                    <div class="share-user" v-if="classifyState.classifyTypeAct==2">分享人： {{item.RealName}}</div>
-                </div>
-                <img class="right-icon" src="@/assets/imgs/ppt/ppt_icon_menu.png" alt="" @click.stop="handleShowOpt(item)">
-            </li>
-        </ul>
-        <!-- 底部操作栏 -->
-        <div class="fix-bot-box">
-            <div class="item" @click="handleAddClassify('')">
-                <img class="icon" src="@/assets/imgs/icon_file.png" alt="">
-                <span>添加分类</span>
-            </div>
-            <div class="item" @click="goChooseChart">
-                <img class="icon" src="@/assets/imgs/icon_select.png" alt="">
-                <span>选择图表</span>
-            </div>
-        </div>
-    </div>
-    <!-- 添加我的分类弹窗 -->
-    <van-dialog 
-        v-model:show="classifyState.showEidtClassifyName" 
-        :title="classifyState.isAddClassifyName?'添加分类':'重命名'" 
-        show-cancel-button
-        confirmButtonText="确定"
-        @confirm="handleConfirmEditClassify"
-        :before-close="handleAddClassifyBeforeClose"
-    >
-        <div class="rename-wrap">
-            <input type="text" placeholder="请输入分类名称！" v-model="classifyState.classifyNameVal">
-        </div>
-    </van-dialog>
-
-    <!-- 分类操作弹窗 -->
-    <van-popup 
-        v-model:show="classifyState.showClassifyOpt" 
-        round
-        position="bottom"
-    >
-        <div class="classify-opt-wrap">
-            <div class="item border">
-                <img src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
-                <span>{{classifyState.activeClassifyVal.MyChartClassifyName}}</span>
-            </div>
-            <!-- 我的图库分类操作 -->
-            <template v-if="classifyState.classifyTypeAct==1">
-            <div class="item border blue" @click="handleAddClassify(classifyState.activeClassifyVal)">
-                <img src="@/assets/imgs/ppt/ppt_icon_write.png" alt="">
-                <span>重命名</span>
-            </div>
-            <div class="item border blue">
-                <img src="@/assets/imgs/icon_user.png" alt="">
-                <span>所有人可见</span>
-                <van-switch
-                    class="switch-box"
-                    size="22px" 
-                    :model-value="classifyState.activeClassifyVal.IsPublic?true:false"
-                    @update:model-value="handleClassifyShare"
-                />
-            </div>
-            <div class="item border red" @click="handleClassifyDel(classifyState.activeClassifyVal)">
-                <img src="@/assets/imgs/icon_del.png" alt="">
-                <span>删除</span>
-            </div>
-            </template>
-            <!-- 公共图库分类操作 -->
-            <template v-if="classifyState.classifyTypeAct==2">
-            <div class="item border blue" @click="handleCopyClassify(classifyState.activeClassifyVal)">
-                <img src="@/assets/imgs/ppt/ppt_icon_copy.png" alt="">
-                <span>复制</span>
-            </div>
-            </template>
-        </div>
-
-    </van-popup>
-</template>
-
-<style lang="scss" scoped>
-.sticky-top{
-    position: sticky;
-    top: 0;
-    z-index: 99;
-    background-color: #fff;
-}
-.classify-type-box{
-    padding: $page-padding;
-    box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
-    .item{
-        display: inline-block;
-        font-size: 32px;
-        color: $font-grey_999;
-        margin-right: 40px;
-        position: relative;
-    }
-    .active{
-        color: #333;
-        &::after{
-            content: '';
-            position: absolute;
-            bottom: -$page-padding;
-            left: 50%;
-            transform: translateX(-50%);
-            display: block;
-            width: 50px;
-            height: 6px;
-            background-color: $theme-color;
-            border-radius: 3px;
-        }
-    }
-}
-.list-box{
-    padding: $page-padding;
-    padding-bottom: 130px;
-    .item{
-        padding: 20px 0;
-        display: flex;
-        .left-icon{
-            width: 32px;
-            height: 32px;
-            margin-right: 20px;
-            flex-shrink: 0;
-        }
-        .right-icon{
-            flex-shrink: 0;
-            width: 4px;
-            height: 20px;
-            margin-left: 20px;
-        }
-        .name{
-            flex: 1;
-        }
-        .share-user{
-            color: $font-grey_999;
-            margin-top: 15px;
-        }
-    }
-}
-.fix-bot-box{
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    height: 120px;
-    background-color: #fff;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    z-index: 99;
-    .item{
-        width: 304px;
-        height: 80px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        font-size: 32px;
-        box-shadow: 0px 3px 14px 2px rgba(0, 0, 0, 0.05), 0px 8px 10px 1px rgba(0, 0, 0, 0.06), 0px 5px 5px -3px rgba(0, 0, 0, 0.1);
-        border-radius: 12px;
-        background-color: $theme-color;
-        .icon{
-            width: 40px;
-            height: 40px;
-            margin-right: 10px;
-        }
-    }
-}
-.rename-wrap{
-    display: flex;
-    align-items: center;
-    padding: 50px 30px;
-    span{
-        flex-shrink: 0;
-        margin-right: 20px;
-    }
-    input{
-        flex: 1;
-        line-height: 70px;
-        padding: 0 30px;
-        border-radius: 70px;
-        border: 1px solid $border-color;
-        width: 150px;
-    }
-}
-.classify-opt-wrap{
-    .item{
-        padding: 42px;
-        display: flex;
-        align-items: center;
-        position: relative;
-        img{
-            width: 36px;
-            height: 36px;
-            margin-right: 20px;
-        }
-        .switch-box{
-            position: absolute;
-            right: 42px;
-            top: 50%;
-            transform: translateY(-50%);
-        }
-    }
-    .border{
-        border-bottom: 1px solid $border-color;
-    }
-    .blue{
-        color: $theme-color;
-    }
-    .red{
-        color: $theme-red;
-    }
-}
-</style>

src/views/myETA/components/PadClasssifyWrap.vue

@@ -1,448 +0,0 @@
-<script setup>
-import {ref,reactive} from 'vue'
-import { useRouter } from 'vue-router'
-import {useClassify} from '../hooks/useClassify'
-import openShareIcon from '@/assets/imgs/ppt/ppt_icon_user1.png'
-import closeShareIcon from '@/assets/imgs/ppt/ppt_icon_user2.png'
-import {apiMyChartList,apiMyChartRemove} from '@/api/myETA'
-import { showConfirmDialog, showToast } from 'vant';
-
-const router=useRouter()
-
-const {
-    classifyTypeOpt,
-    classifyState,
-    getMyClassify,
-    getPubClassify,
-    classifyTypeChange,
-    handleAddClassify,
-    handleConfirmEditClassify,
-
-    handleShowOpt,
-    handleClassifyShare,
-    handleCopyClassify,
-    handleClassifyDel,
-    handleAddClassifyBeforeClose
-}=useClassify()
-
-
-async function initPage(){
-    getPubClassify()
-    await getMyClassify()
-    listState.cid=classifyState.myClassifyList[0]?.MyChartClassifyId
-    if(!listState.cid){
-        listState.finished=true
-        return
-    }
-    getList()
-}
-initPage()
-
-const activeType=ref('my')//my 我的 pub公共的
-
-// 设置共享
-function handleChangeShareStatus(type,item){
-    if(type==1&&!item.IsPublic) return
-    if(type==2&&item.IsPublic) return
-    handleClassifyShare()
-}
-
-function goMobileSearch() {
-
-    router.push({
-        path:'/myETA/searchlist'
-    })
-}
-
-const listState = reactive({
-    cid:0,
-    list:[],
-    page:1,
-    pageSize:20,
-    finished:false,
-    loading:false,
-    total:0,
-})
-async function getList(){
-    const res=await apiMyChartList({
-        CurrentIndex:listState.page,
-        PageSize:listState.pageSize,
-        MyChartClassifyId:listState.cid
-    })
-    if(res.Ret===200){
-        listState.loading=false
-        if(!res.Data){
-            listState.finished=true
-            listState.total=0
-            return
-        }
-        
-        listState.finished=res.Data.Paging.IsEnd
-        const arr=res.Data.List||[]
-        listState.list=[...listState.list,...arr]
-        listState.total=res.Data.Paging.Totals
-    }
-}
-function onLoad(){
-    listState.page++
-    getList()
-}
-
-// 点击分类获取列表
-function goChartList(item){
-    listState.cid=item.MyChartClassifyId
-    listState.page=1
-    listState.list=[]
-    listState.finished=false
-    getList()
-}
-
-//移除图表
-function handleRemoveChart(item,index){
-    showConfirmDialog({
-        title: '提示',
-        message:'是否确认移出？',
-    }).then(()=>{
-        apiMyChartRemove({
-            MyChartClassifyId:Number(listState.cid),
-            MyChartId:item.MyChartId
-        }).then(res=>{
-            if(res.Ret===200){
-                setTimeout(() => {
-                    showToast('移出成功')
-                }, 100);
-                listState.list.splice(index,1)
-            }
-        })
-    }).catch(()=>{})
-}
-
-// 跳转详情
-function goDetail(item){
-    router.push({
-        path:"/myETA/chartdetail",
-        query:{
-            code:item.UniqueCode,
-            cid:listState.cid,
-            iscommon:classifyState.classifyTypeAct==1?false:true
-        }
-    })
-}
-
-function goChooseChart(){
-    router.push({
-        path:'/myETA/choosechart'
-    })
-}
-
-</script>
-
-<template>
-    <div class="pad-myETA-classify-wrap">
-        <div class="left-classify-wrap">
-            <div class="sticky-box">
-                <div class="classify-type-box">
-                    <span
-                        :class="['item',item.type===classifyState.classifyTypeAct?'active':'']"
-                        v-for="item in classifyTypeOpt" 
-                        :key="item.id"
-                        @click="classifyTypeChange(item)"
-                    >{{item.name}}</span>
-                </div>
-                <ul class="list-box">
-                    <li 
-                        class="item"
-                        v-for="item in classifyState.classifyTypeAct==1?classifyState.myClassifyList:classifyState.pubClassifyList"
-                        :key="item.MyChartClassifyId"
-                        @click="goChartList(item)"
-                    >
-                        <img class="left-icon" src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
-                        <div style="flex:1">
-                            <div class="van-ellipsis name">{{item.MyChartClassifyName}}</div>
-                            <div class="share-user" v-if="classifyState.classifyTypeAct==2">分享人： {{item.RealName}}</div>
-                        </div>
-                        <div @click.stop="handleShowOpt(item)" v-if="classifyState.classifyTypeAct!=2">
-                            <van-popover position="bottom-start">
-                                <template #reference>
-                                    <img 
-                                        class="share-icon" 
-                                        :src="item.IsPublic?openShareIcon:closeShareIcon" alt=""
-                                    >
-                                </template>
-                                <div class="pad-classify-file-opt-box">
-                                    <div class="item" @click="handleChangeShareStatus(1,item)">
-                                        <img :src="closeShareIcon" alt="">
-                                        <span>仅自己可见</span>
-                                    </div>
-                                    <div class="item" @click="handleChangeShareStatus(2,item)">
-                                        <img :src="openShareIcon" alt="">
-                                        <span>所有人可见</span>
-                                    </div>
-                                </div>
-                            </van-popover>
-                        </div>
-                        <div @click.stop="handleShowOpt(item)">
-                            <van-popover position="bottom-start">
-                                <template #reference>
-                                    <div class="menu-icon">
-                                        <img class="icon" src="@/assets/imgs/ppt/ppt_icon_menu.png" alt="">
-                                    </div>
-                                </template>
-                                <div class="pad-classify-file-opt-box">
-                                    <div class="item" v-if="classifyState.classifyTypeAct!=2" @click="handleAddClassify(item)">
-                                        <img src="@/assets/imgs/ppt/icon_action_copy.png" alt="">
-                                        <span>重命名</span>
-                                    </div>
-                                    <div class="item del" v-if="classifyState.classifyTypeAct!=2" @click="handleClassifyDel(item)">
-                                        <img src="@/assets/imgs/icon_del.png" alt="">
-                                        <span>删除</span>
-                                    </div>
-                                    <div class="item" v-if="classifyState.classifyTypeAct==2" @click="handleCopyClassify(classifyState.activeClassifyVal)">
-                                        <img src="@/assets/imgs/ppt/ppt_icon_copy.png" alt="">
-                                        <span>复制</span>
-                                    </div>
-                                </div>
-                            </van-popover>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="right-list-wrap">
-            <div class="top-search-box">
-                <van-search 
-                    shape="round" 
-                    readonly 
-                    placeholder="请输入图表名称"
-                    style="flex:1"
-                    @click-input="goMobileSearch"
-                />
-                <div class="btn" @click="goChooseChart">选择图表</div>
-                <div class="btn" @click="handleAddClassify('')">添加分类</div>
-                <div class="list-total">共{{listState.total}}张图表</div>
-                <div 
-                    v-if="classifyState.classifyTypeAct!=1"
-                    class="list-share-people"
-                >分享人: {{ classifyState.pubClassifyList.find(item => item.MyChartClassifyId === listState.cid)?.RealName}}</div>
-            </div>
-            <van-list
-                v-model:loading="listState.loading"
-                :finished="listState.finished"
-                :finished-text="listState.list.length>0?'没有更多了':'暂无图表'"
-                :immediate-check="false"
-                @load="onLoad"
-            >
-                <img v-if="listState.list.length==0&&listState.finished" class="list-empty-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/empty_img.png" alt="">
-                <ul class="chart-list">
-                    <li 
-                        class="chart-list-item" 
-                        v-for="item,index in listState.list" 
-                        :key="item.ChartInfoId"
-                        @click="goDetail(item)"
-                    >
-                        <div class="van-ellipsis name">{{item.ChartName}}</div>
-                        <img class="img" :src="item.ChartImage" alt="">   
-                        <div class="time">
-                            <span>{{item.CreateTime.slice(0,10)}}</span>
-                            <img  @click.stop="handleRemoveChart(item,index)" class="remove-box" src="@/assets/imgs/myETA/icon_remove2.png" alt="">
-                        </div>
-                    </li>
-                </ul>
-            </van-list>
-        </div>
-    </div>
-
-    <!-- 添加我的分类弹窗 -->
-    <van-dialog 
-        v-model:show="classifyState.showEidtClassifyName" 
-        :title="classifyState.isAddClassifyName?'添加分类':'重命名'" 
-        show-cancel-button
-        confirmButtonText="确定"
-        @confirm="handleConfirmEditClassify"
-        :before-close="handleAddClassifyBeforeClose"
-    >
-        <div class="rename-wrap">
-            <input type="text" placeholder="请输入分类名称！" v-model="classifyState.classifyNameVal">
-        </div>
-    </van-dialog>
-</template>
-
-<style lang="scss">
-@media screen and (min-width:$media-width){
-    .pad-classify-file-opt-box{
-        border: 1px solid $border-color;
-        padding: 10px 0;
-        .item{
-            padding: 10px 20px;
-            display: flex;
-            align-items: center;
-            img{
-                width: 20px;
-                margin-right: 8px;
-            }
-        }
-        .del{
-            color: $theme-red;
-        }
-    }
-            
-}
-</style>
-
-<style lang="scss" scoped>
-@media screen and (min-width:$media-width){
-    .pad-myETA-classify-wrap{
-        display: flex;
-        .left-classify-wrap{
-            width: 300px;
-            min-height: 100vh;
-            border-right: 1px solid $border-color;
-            padding: 30px;
-            .sticky-box{
-                position: sticky;
-                top: 90px;
-            }
-            .classify-type-box{
-                span{
-                    display: inline-block;
-                    padding-bottom: 5px;
-                    margin-right: 30px;
-                    color: $font-grey_999;
-                }
-                .active{
-                    color: $theme-color;
-                    font-weight: bold;
-                    border-bottom: 2px solid $theme-color;
-                }
-            }
-            .list-box{
-                padding-top: 30px;
-                height: 80vh;
-                overflow-y: auto;
-                &::-webkit-scrollbar{
-                    width: 0;
-                }
-                .item{
-                    padding: 10px 0;
-                    display: flex;
-                    position: relative;
-                    .left-icon{
-                        width: 20px;
-                        height: 20px;
-                        margin-right: 8px;
-                        flex-shrink: 0;
-                        position: relative;
-                        top: -2px;
-                    }
-                    .name{
-                        flex: 1;
-                    }
-                    .share-user{
-                        font-size: 12px;
-                        color: $font-grey_999;
-                        margin-top: 10px;
-                    }
-                    .menu-icon{
-                        margin-left: 20px;
-                        width: 15px;
-                        text-align: center;
-                        .icon{
-                            width: 3px;
-                        }
-                    }
-                    .share-icon{
-                        width: 16px;
-                        height: 16px;
-                    }
-                }
-            }
-        }
-        .right-list-wrap{
-            flex: 1;
-            .top-search-box{
-                display: flex;
-                align-items: center;
-                position: sticky;
-                top: 60px;
-                background-color: #fff;
-                padding: 30px;
-                .btn{
-                    width: 112px;
-                    height: 40px;
-                    background-color: $theme-color;
-                    color: #fff;
-                    text-align: center;
-                    line-height: 40px;
-                    border-radius: 3px;
-                    margin-left: 20px;
-                }
-                .list-total{
-                    position: absolute;
-                    bottom: 10px;
-                }
-                .list-share-people{
-                    position: absolute;
-                    right: 30px;
-                    bottom: 10px;
-                }
-            }
-            .chart-list{
-                padding: 0 30px;
-                display: flex;
-                flex-wrap: wrap;
-                box-sizing: border-box;
-                .chart-list-item{
-                    box-sizing: border-box;
-                    width: 250px;
-                    padding: 10px 14px;
-                    border: 1px solid $border-color;
-                    margin-bottom: 20px;
-                    margin-left: 10px;
-                    margin-right: 10px;
-                    .img{
-                        width: 100%;
-                        height: 150px;
-                        display: block;
-                        margin: 10px 0;
-                    }
-                    .time{
-                        font-size: 14px;
-                        color: $font-grey_999;
-                        position: relative;
-                        .remove-box{
-                            position: absolute;
-                            top: 0;
-                            right: 0;
-                            color: $theme-red;
-                            display: flex;
-                            align-items: center;
-                            img{
-                                width: 18px;
-                                height: 18px;
-                                margin-right: 5px;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    .rename-wrap{
-        display: flex;
-        align-items: center;
-        padding: 50px 30px;
-        span{
-            flex-shrink: 0;
-            margin-right: 20px;
-        }
-        input{
-            flex: 1;
-            line-height: 35px;
-            padding: 0 30px;
-            border-radius: 35px;
-            border: 1px solid $border-color;
-            width: 150px;
-        }
-    }
-}
-</style>