2023-02-09 update

1. 修复process 进入时 excelList为空的问题
2. 调整温度曲线分析页  chart图标tooltip的显示

src/api/config.js

@@ -1,6 +1,6 @@
 const config = {
-    baseURL: 'http://192.168.0.6:9002',
-    socketURL: 'ws://192.168.0.6:9002'
+    baseURL: 'http://120.46.148.180:9002',
+    socketURL: 'ws://120.46.148.180:9002'
 }
 
 export default config;

src/components/excel.vue

@@ -31,13 +31,13 @@ const funCheckChange = (checkArr) => {
 		<el-empty v-if="!props.data.length" description="暂无数据" />
 		<el-checkbox-group size="small" v-model="excelCheckIds" v-if="props.showCheckbox" @change="funCheckChange">
 			<el-checkbox :class="{'!bg-[rgb(236,245,255)]': currentId === item.id}" size="small" class="hover:bg-[rgb(245,247,250)] !mr-0 py-[3px]" :label="item.id" v-for="item in props.data" :key="item.name">
-				<span class="whitespace-nowrap cursor-pointer text-[12px] align-middle inline-flex items-center"
+				<span class="whitespace-nowrap cursor-pointer font-bold text-[12px] align-middle inline-flex items-center"
 					@click.stop="funExcelChange(item)"><el-icon class="mr-[4px] !text-[rgb(71,179,71)]"><Document /></el-icon>{{ item.name }}</span>
 			</el-checkbox>
 		</el-checkbox-group>
 		<div v-else>
 			<div
-				class="hover:bg-[rgb(245,247,250)] whitespace-nowrap text-[#606266] px-[8px] py-[3px] w-full cursor-pointer leading-[10px] inline-flex items-center h-[24px] text-[12px]"
+				class="hover:bg-[rgb(245,247,250)] font-bold whitespace-nowrap text-[#606266] px-[8px] py-[3px] w-full cursor-pointer leading-[10px] inline-flex items-center h-[24px] text-[12px]"
 				v-for="item in props.data" :key="item.name" :class="{'!bg-[rgb(236,245,255)]': currentId === item.id}" @click="funExcelChange(item)"><el-icon class="mr-[4px] !text-[rgb(71,179,71)]"><Document /></el-icon>{{ item.name }}</div>
 		</div>
 	</div>

src/pages/dataAnalysis/combine/components/current-scatter-chart.vue

@@ -151,7 +151,7 @@ export default {
           },
           formatter(params) {
             return params.value?.x
-              ? `${params.seriesName}<br />风速：${params.value.x}m/s<br />功率：${params.value.y}kW`
+              ? `${params.seriesName}<br />风速：${params.value.x} m/s<br />功率：${params.value.y} kW`
               : `${params.name}`;
           },
         },

src/pages/dataAnalysis/hotAnalysis/components/current-scatter-chart.vue

@@ -150,25 +150,25 @@ export default {
             color: "#fff",
           },
           formatter(params) {
-            return params.value?.x
-              ? `${params.seriesName}<br />风速：${params.value.x}m/s<br />功率：${params.value.y}kW`
+            return params.value.length
+              ? `${params.seriesName}<br />风速：${params.value[0]} m/s<br />功率：${params.value[1]} kW<br />温度：${params.value[2]} ℃`
               : `${params.name}`;
           },
         },
-        brush: {
-          seriesIndex: [2,3],
-          yAxisIndex: 0,
-          transformable: true,
-          throttleType: "debounce",
-          throttleDelay: 1000,
-          removeOnClick: true,
-          brushType: "polygon",
-          brushMode: "multiple",
-          brushStyle: {
-            borderWidth: 1,
-            borderColor: "#ff2424",
-          },
-        },
+        // brush: {
+        //   seriesIndex: [2,3],
+        //   yAxisIndex: 0,
+        //   transformable: true,
+        //   throttleType: "debounce",
+        //   throttleDelay: 1000,
+        //   removeOnClick: true,
+        //   brushType: "polygon",
+        //   brushMode: "multiple",
+        //   brushStyle: {
+        //     borderWidth: 1,
+        //     borderColor: "#ff2424",
+        //   },
+        // },
         dataZoom: [
           {
             type: "inside", //图表下方的伸缩条
@@ -315,22 +315,22 @@ export default {
       myChart.on("brushSelected", (params) => {
         that.$emit("getSelected", params.batch || []);
       });
-      myChart.off('click')
-      myChart.on('click', params => {
-          console.log(params)
-          if(params.componentType === 'markArea'){
-            myChart.dispatchAction({
-              type: 'brush',
-              areas: [
-                {
-                  xAxisIndex: 0,
-                  brushType: 'lineX',
-                  coordRange: [params.data.coord[0][0], params.data.coord[1][0]]
-                },
-              ]
-            });
-          }
-        })
+      // myChart.off('click')
+      // myChart.on('click', params => {
+      //     console.log(params)
+      //     if(params.componentType === 'markArea'){
+      //       myChart.dispatchAction({
+      //         type: 'brush',
+      //         areas: [
+      //           {
+      //             xAxisIndex: 0,
+      //             brushType: 'lineX',
+      //             coordRange: [params.data.coord[0][0], params.data.coord[1][0]]
+      //           },
+      //         ]
+      //       });
+      //     }
+      //   })
     },
   },
   created() {

src/pages/dataAnalysis/hotAnalysis/index.vue

@@ -102,7 +102,7 @@ const funExcelChange = async (obj) => { //点击excel项时
 				rippleEffect: {
 					scale: 1
 				},
-				name: '有用点',
+				name: '数据散点',
 				// symbolSize: (data) => {
 				// 	return data.s ? data.s > 10 ? 10 : data.s : 4
 				// },
@@ -505,7 +505,7 @@ onActivated(() => {
 				</el-col>
 				<el-col :span="16">
 					<div class="px-[10px] shadow rounded-[6px] shadow-blue-500 ">
-						<SubmitBtn class="absolute right-[16px] top-[6px] z-10" desc="区域划分" v-if="activeTab === '2' && excelType === 'fitting'" @click="funChartArea"></SubmitBtn>
+						<!-- <SubmitBtn class="absolute right-[16px] top-[6px] z-10" desc="区域划分" v-if="activeTab === '2' && excelType === 'fitting'" @click="funChartArea"></SubmitBtn> -->
 						<el-tabs v-model="activeTab">
 							<el-tab-pane label="表格数据" name="1">
 							</el-tab-pane>

src/pages/dataFilter/process/index.vue

@@ -192,8 +192,8 @@ onMounted(() => {
 	})
 })
 /**activated */
-onActivated(() => {
-	funGetTree()
+onActivated(async () => {
+	await funGetTree()
 	funGetProcessTree()
 })
 </script>