Merge branch 'master' into v1.3_report

src/views/myETA/ChartDetail.vue

@@ -455,7 +455,7 @@ let showSaveChartOther=ref(false)
                     class="time-box" 
                     v-if="sameOptionType.includes(chartInfo.ChartType)||chartInfo.ChartType===2"
                     @click="chartState.showTimePop=true"
-                >请选择时间段</span>
+                >{{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'">
@@ -470,7 +470,7 @@ let showSaveChartOther=ref(false)
                     <img src="@/assets/imgs/myETA/icon_save2.png" alt="">
                     <span>另存为</span>
                 </div>
-                <div class="item red" @click.stop="handleDeleteChart">
+                <div class="item red" @click.stop="handleDeleteChart" v-if="chartInfo.IsEdit">
                     <img src="@/assets/imgs/icon_del.png" alt="">
                     <span>删除</span>
                 </div>
@@ -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>
@@ -699,7 +699,7 @@ let showSaveChartOther=ref(false)
                 <img src="@/assets/imgs/myETA/icon_remove.png" alt="">
                 <span>移出</span>
             </div>
-            <div class="item" @click.stop="handleDeleteChart">
+            <div class="item" @click.stop="handleDeleteChart" v-if="chartInfo.IsEdit">
                 <img src="@/assets/imgs/myETA/icon_del.png" alt="">
                 <span>删除</span>
             </div>
@@ -1038,7 +1038,7 @@ let showSaveChartOther=ref(false)
             margin: 20px auto;
             border-radius: 4px;
             span{
-                width: 110px;
+                width: 111px;
                 height: 38px;
                 line-height: 38px;
             }

src/views/myETA/SearchList.vue

@@ -50,13 +50,15 @@ function handleSearch(){
 }
 
 function goDetail(item){
-    router.push({
+
+    const routerEl=router.resolve({
         path:"/myETA/chartdetail",
         query:{
             code:item.UniqueCode,
             iscommon:true
         }
     })
+    window.open(routerEl.href,'_blank')
 }
 
 </script>

src/views/myETA/components/EDBInfo.vue

@@ -58,11 +58,11 @@ const list=[
     },
     {
         name:"起始时间",
-        key:""
+        key:"StartDate"
     },
     {
         name:"最新日期",
-        key:"StartDate"
+        key:"LatestDate"
     },
     {
         name:"最新值",
@@ -97,6 +97,7 @@ const showYOptionsHandle=computed(()=>{
 })
 
 let isMounted=ref(false)
+const selectColorIns=ref(null)
 onMounted(()=>{
     isMounted.value=true
 })
@@ -207,16 +208,16 @@ function handleLeadUnitChange(e){
                     <div class="item-box">
                         <span style="margin-right:20px">线条颜色</span>
                         <v3-color-picker
-                            v-if="isMounted"
+                            v-if="isMounted&&selectColorIns"
                             :btn="true" 
                             v-model:value="temData.ChartColor" 
                             size="medium"
                             theme="light"
                             teleport='#select-color-box'
                         ></v3-color-picker>
-                        <span id="select-color-box"></span>
+                        <span id="select-color-box" ref="selectColorIns"></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" />

src/views/myETA/components/MobileClassifyWrap.vue

@@ -16,7 +16,8 @@ const {
     handleShowOpt,
     handleClassifyShare,
     handleCopyClassify,
-    handleClassifyDel
+    handleClassifyDel,
+    handleAddClassifyBeforeClose
 }=useClassify()
 
 getMyClassify()
@@ -101,6 +102,7 @@ function goChooseChart(){
         show-cancel-button
         confirmButtonText="确定"
         @confirm="handleConfirmEditClassify"
+        :before-close="handleAddClassifyBeforeClose"
     >
         <div class="rename-wrap">
             <input type="text" placeholder="请输入分类名称！" v-model="classifyState.classifyNameVal">

src/views/myETA/components/PadClasssifyWrap.vue

@@ -21,7 +21,8 @@ const {
     handleShowOpt,
     handleClassifyShare,
     handleCopyClassify,
-    handleClassifyDel
+    handleClassifyDel,
+    handleAddClassifyBeforeClose
 }=useClassify()
 
 
@@ -58,7 +59,8 @@ const listState = reactive({
     page:1,
     pageSize:20,
     finished:false,
-    loading:false
+    loading:false,
+    total:0,
 })
 async function getList(){
     const res=await apiMyChartList({
@@ -70,12 +72,14 @@ async function getList(){
         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(){
@@ -114,7 +118,7 @@ function handleRemoveChart(item,index){
 
 // 跳转详情
 function goDetail(item){
-    router.push({
+    const routerEl=router.resolve({
         path:"/myETA/chartdetail",
         query:{
             code:item.UniqueCode,
@@ -122,6 +126,7 @@ function goDetail(item){
             iscommon:classifyState.classifyTypeAct==1?false:true
         }
     })
+    window.open(routerEl.href,'_blank')
 }
 
 function goChooseChart(){
@@ -214,6 +219,11 @@ 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"
@@ -252,6 +262,7 @@ function goChooseChart(){
         show-cancel-button
         confirmButtonText="确定"
         @confirm="handleConfirmEditClassify"
+        :before-close="handleAddClassifyBeforeClose"
     >
         <div class="rename-wrap">
             <input type="text" placeholder="请输入分类名称！" v-model="classifyState.classifyNameVal">
@@ -309,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;
@@ -363,6 +379,15 @@ function goChooseChart(){
                     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;

src/views/myETA/hooks/useClassify.js

@@ -71,15 +71,19 @@ export function useClassify(){
             return
         }
         // 新增
+        let res
         if(classifyState.isAddClassifyName){
-            const res=await apiAddClassify({MyChartClassifyName:classifyState.classifyNameVal})
+            res=await apiAddClassify({MyChartClassifyName:classifyState.classifyNameVal})
         }else{
-            const res=await apiEidtClassify({
+            res=await apiEidtClassify({
                 MyChartClassifyName:classifyState.classifyNameVal,
                 MyChartClassifyId:classifyState.activeClassifyVal.MyChartClassifyId
             })
         }
-        getMyClassify()
+        if(res.Ret===200){
+            getMyClassify()
+            classifyState.showEidtClassifyName=false
+        }
     }
 
     // 显示分类操作弹窗
@@ -98,6 +102,7 @@ export function useClassify(){
         if(res.Ret===200){
             classifyState.activeClassifyVal.IsPublic=params.IsPublic
             getMyClassify()
+            showToast('设置成功')
         }
     }
 
@@ -135,6 +140,14 @@ export function useClassify(){
         }).catch(()=>{})
     }
 
+    const handleAddClassifyBeforeClose=(action)=>{
+        if(action==='confirm'&&classifyState.isAddClassifyName){
+            return false
+        }else{
+            return true
+        }
+    }
+
     return {
         classifyTypeOpt,
         classifyState,
@@ -146,6 +159,7 @@ export function useClassify(){
         handleShowOpt,
         handleClassifyShare,
         handleCopyClassify,
-        handleClassifyDel
+        handleClassifyDel,
+        handleAddClassifyBeforeClose
     }
 }