Merge branch 'v1.5_chartETA' of http://8.136.199.33:3000/jwyu/hongze_ETA_mobile into v1.5_chartETA

src/api/chart.js

@@ -228,6 +228,14 @@ export default{
      */
     chartInfoEditEn(params){
         return post('/datamanage/chart_info/en/edit',params)
+    },
+    /*
+     * 图切换上一张下一张
+     * @param KeyWord
+     * @param ChartClassifyId
+     * @param IsShowMe
+     */
+    chartLocate(params){
+        return get('/my_chart/chart/locate',params)
     }
-
 } 

src/views/chartETA/ChartDetail.vue

@@ -22,6 +22,12 @@ const cachedViewsStore=useCachedViewsStore()
 const route=useRoute()
 const router=useRouter()
 
+let routeQueryData=reactive({
+    chartType:route.query.chartType,
+    id:route.query.id,
+    chartClassifyId:route.query.chartClassifyId,
+})
+
 //获取图详情
 let chartInfoData=null
 let chartInfo=ref(null)
@@ -29,13 +35,13 @@ let chartInfo=ref(null)
 let highChart = ref(null)
 let edbList=ref([])//指标数据
 async function getChartDetail(e){
-    const params=sameOptionType.includes(Number(route.query.chartType))?{
-        ChartInfoId:Number(route.query.id),
+    const params=sameOptionType.includes(Number(routeQueryData.chartType))?{
+        ChartInfoId:Number(routeQueryData.id),
         DateType: chartState.yearVal,
         StartDate: chartState.startTime,
         EndDate: chartState.endTime,
     }:{
-        ChartInfoId:Number(route.query.id),
+        ChartInfoId:Number(routeQueryData.id),
         Calendar: chartState.calendarType,//this.calendar_type
         SeasonStartDate: chartState.startTime,
         SeasonEndDate:chartState.endTime ,
@@ -387,8 +393,8 @@ function deleteChart(){
         showCancelButton:true
     }).then(() => {
         apiChart.deleteClassify({
-            ChartClassifyId:Number(route.query.chartClassifyId),
-            ChartInfoId:Number(route.query.id),
+            ChartClassifyId:Number(routeQueryData.chartClassifyId),
+            ChartInfoId:Number(routeQueryData.id),
         }).then(res=>{
             if(res.Ret===200){
                 cachedViewsStore.removeCaches('ChartETAList')
@@ -404,6 +410,35 @@ function deleteChart(){
     })
 }
 
+//获取图排序列表数据
+const chartSortListData=ref([])
+async function getChartSortList(){
+    const res=await apiChart.chartLocate({
+        KeyWord:route.query.keyword||'',
+        ChartClassifyId:Number(route.query.chartClassifyId),
+        IsShowMe:route.query.IsShowMe=='true'?true:false
+    })
+    if(res.Ret===200){
+        chartSortListData.value=res.Data||[]
+    }
+}
+getChartSortList()
+
+// 切换图
+async function handleSwitchChart(type){
+    const index=chartSortListData.value.findIndex((item)=>item.ChartInfoId==routeQueryData.id)
+    let item=null
+    if(type==='prev'){
+        item=index===0?chartSortListData.value[chartSortListData.value.length-1]:chartSortListData.value[index-1]
+    }else{
+        item=index===chartSortListData.value.length-1?chartSortListData.value[0]:chartSortListData.value[index+1]
+    }
+    routeQueryData.id=item.ChartInfoId
+    routeQueryData.chartType=item.ChartType
+    routeQueryData.chartClassifyId=item.ChartClassifyId
+    getChartDetail('init')
+}
+
 
 </script>
 
@@ -489,11 +524,11 @@ function deleteChart(){
         </div>
         <!-- 底部悬浮操作模块 -->
         <div class="fix-bot-action-box">
-            <div class="item" @click="">
+            <div class="item" @click="handleSwitchChart('prev')" v-if="chartSortListData.length>0">
                 <img class="icon" src="@/assets/imgs/icon_arrow.png" alt="">
                 <div>上一张</div>
             </div>
-            <div class="item" @click="">
+            <div class="item" @click="handleSwitchChart('next')" v-if="chartSortListData.length>0">
                 <img class="icon" style="transform: rotate(180deg);" src="@/assets/imgs/icon_arrow.png" alt="">
                 <div>下一张</div>
             </div>

src/views/chartETA/List.vue

@@ -29,7 +29,8 @@ const goChartDetail = (item)=>{
         query:{
             id:item.ChartInfoId,
             chartType:item.ChartType,
-            chartClassifyId:listState.cid
+            chartClassifyId:listState.cid,
+            IsShowMe:listState.IsShowMe
         }
     })
 }

src/views/chartETA/Search.vue

@@ -58,7 +58,8 @@ function goDetail(item){
         query:{
             id:item.ChartInfoId,
             chartType:item.ChartType,
-            chartClassifyId:0
+            chartClassifyId:0,
+            keyword:keyword.value
         }
     })
 }

src/views/chartETA/SetChartENName.vue

@@ -0,0 +1,86 @@
+<script setup>
+//设置图表英文名称
+import {ref,onMounted, initCustomFormatter} from 'vue'
+import { useRoute } from 'vue-router'
+import {sameOptionType} from '@/hooks/chart/config'
+import apiChart from '@/api/chart'
+const route=useRoute()
+const chartInfo = ref(null)
+async function getChartDetail(){
+    const params=sameOptionType.includes(Number(route.query.chartType))?{
+        ChartInfoId:Number(route.query.id),
+        DateType: '',
+        StartDate: '',
+        EndDate: '',
+    }:{
+        ChartInfoId:Number(route.query.id),
+        Calendar: '公历',
+        SeasonStartDate: '',
+        SeasonEndDate:'' ,
+    }
+    const res=await apiChart.chartInfoById(params)
+    if(res.Ret!==200) return
+    chartInfo.value = res.Data
+    initForm()
+}
+//表格组,第一项固定为图表名称
+const formGroup = ref([
+    /* {
+        groupName:'图表名称',//分组名称
+        formList:[{
+            label:'图表名称',
+            cnValue:'测试截面散点图',//中文值
+            enValue:'',//英文值
+        }],//需要填写的项
+    } */
+])
+
+const ExtraConfig = ref({})
+function initForm(){
+    const {EdbInfoList} = chartInfo.value
+    const {ChartName,ChartNameEn,ExtraConfig} = chartInfo.value.ChartInfo
+    //第一项固定为图表名称
+    formGroup.value.push({
+        groupName:'图表名称',
+        formList:[{
+            label:'图表名称',
+            cnValue:ChartName,
+            enValue:ChartNameEn,
+        }]
+    })
+    //截面散点图 chartType===10 与其他图格式不一样 保存一下额外数据
+    if(Number(route.query.chartType)===10){
+        ExtraConfig.value = JSON.parse(ExtraConfig)
+        const {SeriesList} = ExtraConfig
+        const seriesEdbInfoList = SeriesList[0].EdbInfoList //每一项的EdbInfoList是一样的,取第一项就行
+        let formSeriesList = []
+        let formEdbInfoList = []
+        formGroup.value.push({
+            groupName:'标签，系列名称',
+
+        })
+    }
+
+    
+    for(const edb in EdbInfoList){
+
+    }
+    
+
+}
+onMounted(() => {
+    getChartDetail()
+})
+</script>
+
+<template>
+    <div class="set-name-pop-wrap">
+        
+    </div>
+</template>
+
+<style scoped lang="scss">
+.set-name-pop-wrap{
+
+}
+</style>