jwyu преди 1 година
родител
ревизия
d19c60a799

+ 4 - 4
src/views/myETA/ChartDetail.vue

@@ -480,8 +480,8 @@ let showSaveChartOther=ref(false)
         <!-- 图渲染区域 -->
         <div class="chart-render-wrap">
             <!-- pad 切换上一张\下一张 -->
-            <img class="pad-change-chart-btn" src="@/assets/imgs/icon_arrow2.png" alt="" @click="handleSwitchChart('prev')">
-            <img class="pad-change-chart-btn pad-change-chart-next-btn" src="@/assets/imgs/icon_arrow2.png" alt="" @click="handleSwitchChart('next')">
+            <img class="pad-change-chart-btn" src="@/assets/imgs/icon_arrow2.png" alt="" @click="handleSwitchChart('prev')" v-if="allChartList.length>0">
+            <img class="pad-change-chart-btn pad-change-chart-next-btn" src="@/assets/imgs/icon_arrow2.png" alt="" @click="handleSwitchChart('next')" v-if="allChartList.length>0">
             <div class="chart-box" id="chart-box"></div>
         </div>
 
@@ -525,11 +525,11 @@ let showSaveChartOther=ref(false)
 
         <!-- 底部悬浮操作模块 -->
         <div class="fix-bot-action-box">
-            <div class="item" @click="handleSwitchChart('prev')">
+            <div class="item" @click="handleSwitchChart('prev')" v-if="allChartList.length>0">
                 <img class="icon" src="@/assets/imgs/icon_arrow.png" alt="">
                 <div>上一张</div>
             </div>
-            <div class="item" @click="handleSwitchChart('next')">
+            <div class="item" @click="handleSwitchChart('next')" v-if="allChartList.length>0">
                 <img class="icon" style="transform: rotate(180deg);" src="@/assets/imgs/icon_arrow.png" alt="">
                 <div>下一张</div>
             </div>

+ 1 - 1
src/views/myETA/components/EDBInfo.vue

@@ -216,7 +216,7 @@ function handleLeadUnitChange(e){
                         ></v3-color-picker>
                         <span id="select-color-box"></span>
                     </div>
-                    <div class="item-box">
+                    <div class="item-box" v-if="chartInfo.ChartType === 1||(chartInfo.ChartType === 6 && props.data.ChartStyle==='spline')">
                         <span style="margin-right:20px">线条粗细</span>
                         <div class="step-box">
                             <van-stepper input-width="40px" v-model.number="temData.ChartWidth" />

+ 15 - 0
src/views/myETA/components/PadClasssifyWrap.vue

@@ -72,6 +72,7 @@ async function getList(){
         listState.loading=false
         if(!res.Data){
             listState.finished=true
+            listState.total=0
             return
         }
         
@@ -219,6 +220,10 @@ function goChooseChart(){
                 <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"
@@ -315,6 +320,11 @@ function goChooseChart(){
             }
             .list-box{
                 padding-top: 30px;
+                height: 80vh;
+                overflow-y: auto;
+                &::-webkit-scrollbar{
+                    width: 0;
+                }
                 .item{
                     padding: 10px 0;
                     display: flex;
@@ -373,6 +383,11 @@ function goChooseChart(){
                     position: absolute;
                     bottom: 10px;
                 }
+                .list-share-people{
+                    position: absolute;
+                    right: 30px;
+                    bottom: 10px;
+                }
             }
             .chart-list{
                 padding: 0 30px;

+ 4 - 1
src/views/myETA/hooks/useClassify.js

@@ -79,7 +79,10 @@ export function useClassify(){
                 MyChartClassifyId:classifyState.activeClassifyVal.MyChartClassifyId
             })
         }
-        getMyClassify()
+        if(res.Ret===200){
+            getMyClassify()
+            classifyState.showEidtClassifyName=false
+        }
     }
 
     // 显示分类操作弹窗