jwyu 2 ani în urmă
părinte
comite
b49402035e

+ 7 - 0
src/api/lineEquationChart.js

@@ -42,4 +42,11 @@ export default {
     chartSaveOther(params){
         return post('/line_equation/chart_info/copy',params)
     },
+    /**
+     * 拟合方程曲线图列表
+     */
+    chartList(params){
+        return get('/line_equation/chart_info/list',params)
+    }
+
 }

+ 6 - 0
src/api/statisticFeatureChart.js

@@ -32,4 +32,10 @@ export default {
     chartSaveOther(params){
         return post('/line_feature/chart_info/copy',params)
     },
+    /**
+     * 拟合方程曲线图列表
+     */
+    chartList(params){
+        return get('/line_feature/chart_info/list',params)
+    }
 }

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

@@ -782,9 +782,9 @@ function handleEditEnNameSuccess(){
                         @click="item.select=!item.select"
                     >{{item.MyChartClassifyName}}</li>
                 </ul>
-                <div v-if="copyToOpt.length===0" style="padding:50px 0;text-align:center">无数据</div>
+                <div v-if="copyToOpt.length===0" style="padding:50px 0;text-align:center">暂无分类,快去创建我的分类吧~</div>
             </div>
-            <div class="bot-btn-box" @click="handleConfirmCopy">确定</div>
+            <div class="bot-btn-box" @click="handleConfirmCopy" v-if="copyToOpt.length>0">确定</div>
         </div>
     </van-popup>
 

+ 23 - 1
src/views/myETA/ChooseChart.vue

@@ -3,6 +3,8 @@ import {reactive, ref} from 'vue'
 import apiChart from '@/api/chart'
 import apiFuture from '@/api/futureChart'
 import apiCorrelation from '@/api/correlationChart'
+import apiLineEquationChart from '@/api/lineEquationChart'
+import apiStatisticFeatureChart from '@/api/statisticFeatureChart'
 import {apiMyClassifyList,apiMyChartAdd,apiAddClassify} from '@/api/myETA'
 import { showToast } from 'vant';
 import { useWindowSize } from '@vueuse/core'
@@ -22,7 +24,16 @@ const typeOpt=[
     {
         name:"相关性图表",
         type:3,
+    },
+    {
+        name:"拟合方程曲线",
+        type:4,
+    },
+    {
+        name:"统计特征",
+        type:5,
     }
+
 ]
 let type=ref(1)
 const isShowMe=ref(false)
@@ -50,6 +61,10 @@ async function getChartList(){
         res=await apiFuture.searchChartList(params)
     }else if(type.value==3){
         res=await apiCorrelation.chartList(params)
+    }else if(type.value==4){
+        res=await apiLineEquationChart.chartList(params)
+    }else if(type.value==5){
+        res=await apiStatisticFeatureChart.chartList(params)
     }
     
     if(res.Ret==200){
@@ -215,7 +230,7 @@ async function handleConfirmEditClassify(){
                 />
                 <div>
                     <span class="time">{{item.ModifyTime.substr(0,10)}}</span>
-                    <img class="add-icon" src="@/assets/imgs/icon01.png" alt="" @click="handleAdd(item)">
+                    <img class="add-icon" src="@/assets/imgs/myETA/icon_add.png" alt="" @click="handleAdd(item)">
                     <div class="pad-add-box" @click="handleAdd(item)">
                         <img src="@/assets/imgs/myETA/icon_add.png" alt="">
                         <span>加入我的图库</span>
@@ -279,10 +294,17 @@ async function handleConfirmEditClassify(){
 .type-box{
     padding: 60px 40px 26px 40px;
     box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
+    overflow-x: auto;
+    display: flex;
+    flex-wrap: nowrap;
+    &::-webkit-scrollbar{
+        display: none;
+    }
     .opt{
         display: inline-block;
         margin-right: 40px;
         color: $font-grey_999;
+        flex-shrink: 0;
         &.active{
             color: #333;
             position: relative;

+ 1 - 1
src/views/myETA/Index.vue

@@ -175,7 +175,7 @@ async function 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">
             </div>
-            <p style="margin-top:10px;font-weight:bold">{{listState.ctype}}/{{listState.cname}}</p>
+            <p style="margin-top:10px;font-weight:bold">{{listState.ctype}}{{listState.cname?'/'+listState.cname:''}}</p>
             <p class="des">共{{listState.total}}张图表</p>
         </div>
         <van-list