2023-02-06 update

1. fix Kwh -> kWh
2. fix charts axis color

src/components/chart/bar/multiple-bar-chart.vue

@@ -140,7 +140,7 @@ export default {
     // 单位
     units: {
       type: Array,
-      default: () => ["(万KWh)", "(风速)"],
+      default: () => ["(万kWh)", "(风速)"],
     },
     // 显示 legend
     showLegend: {

src/components/chart/bar/multiple-hover-bar-chart.vue

@@ -184,7 +184,7 @@ export default {
     // 单位
     units: {
       type: Array,
-      default: () => ["(万KWh)", "(风速)"],
+      default: () => ["(万kWh)", "(风速)"],
     },
     // 自定义tooltip 显示内容
     customerTooltip: {

src/components/chart/combination/bar-line-chart.vue

@@ -67,7 +67,7 @@ export default {
     // 单位
     units: {
       type: Array,
-      default: () => ["(万KWh)", "(风速)"],
+      default: () => ["(万kWh)", "(风速)"],
     },
     // 显示 legend
     showLegend: {

src/components/chart/combination/multiple-bar-line-chart.vue

@@ -174,7 +174,7 @@ export default {
     // 单位
     units: {
       type: Array,
-      default: () => ["(万KWh)", "(风速)"],
+      default: () => ["(万kWh)", "(风速)"],
     },
     // 显示 legend
     showLegend: {

src/components/chart/other/Dashboard2.vue

@@ -21,7 +21,7 @@ export default {
     },
     name: {
       type: String,
-      default: "万KWH",
+      default: "万kWh",
     },
     value: {
       type: Number,
@@ -101,7 +101,7 @@ export default {
             },
             data: [
               {
-                name: "万KWh",
+                name: "万kWh",
                 value: value,
               },
             ],

src/components/chart/scatter/current-scatter-chart.vue

@@ -147,8 +147,8 @@ export default {
           },
           formatter(params) {
             return params.name
-              ? `${params.seriesName}<br />风速：${params.name}米/s<br />功率：${params.value}KW`
-              : `${params.seriesName}<br />风速：${params.data[0]}米/s<br />功率：${params.data[1]}KW`;
+              ? `${params.seriesName}<br />风速：${params.name}米/s<br />功率：${params.value}kW`
+              : `${params.seriesName}<br />风速：${params.data[0]}米/s<br />功率：${params.data[1]}kW`;
           },
         },
         brush: {

src/pages/dataAnalysis/agcAnalysis/components/current-scatter-chart.json

@@ -168,24 +168,24 @@
 			"axisLine": {
 					"show": true,
 					"lineStyle": {
-							"color": "#333"
+							"color": "#B3B3B3"
 					}
 			},
 			"axisTick": {
 					"show": true,
 					"lineStyle": {
-							"color": "#333"
+							"color": "#B3B3B3"
 					}
 			},
 			"axisLabel": {
 					"show": true,
-					"color": "#333"
+					"color": "#B3B3B3"
 			},
 			"splitLine": {
 					"show": false,
 					"lineStyle": {
 							"color": [
-									"#ccc"
+									"#B3B3B3"
 							]
 					}
 			},
@@ -273,24 +273,24 @@
 			"axisLine": {
 					"show": true,
 					"lineStyle": {
-							"color": "#333"
+							"color": "#B3B3B3"
 					}
 			},
 			"axisTick": {
 					"show": true,
 					"lineStyle": {
-							"color": "#333"
+							"color": "#B3B3B3"
 					}
 			},
 			"axisLabel": {
 					"show": true,
-					"color": "#333"
+					"color": "#B3B3B3"
 			},
 			"splitLine": {
 					"show": true,
 					"lineStyle": {
 							"color": [
-									"#ccc"
+									"#B3B3B3"
 							]
 					}
 			},

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

@@ -225,7 +225,7 @@ export default {
               color: '#B3B3B3'
             },
             type: "category",
-            boundaryGap: false,
+            boundaryGap: true,
             data: that.xAxisData || [],
             axisLabel: {
               formatter: "{value}",
@@ -247,10 +247,10 @@ export default {
           splitLine: { show: false },
           position: 'left',
           min: 0,
-          name: '',
+          name: 'Mw',
           nameTextStyle: {
             color: '#B3B3B3'
-          }
+          },
         }],
         animation: true,
         dataset: that.dataSet.length? JSON.parse(that.dataSet) : [],

src/pages/dataAnalysis/agcAnalysis/components/search.vue

@@ -19,6 +19,8 @@ const funGetStation = async () => {
 	if (stationList.value.length) {
 		queryForm.station = stationList.value[0].id
 	}
+
+	funSubmit()
 }
 /**导出 */
 const emits = defineEmits(['submit'])

src/pages/dataAnalysis/agcAnalysis/index.vue

@@ -262,6 +262,7 @@ onMounted(() => {
 /**activated */
 onActivated(() => {
 	// funGetTree()
+	// funSubmit()
 })
 </script>
 <template>

src/pages/dataAnalysis/combine/index.vue

@@ -507,7 +507,7 @@ onActivated(() => {
 						<el-table-column property="wtId" align="center" label="风机" />
 						<el-table-column property="time" sortable :width="160" align="center" label="时间" />
 						<el-table-column property="speed" sortable align="center" label="风速(m/s)" />
-						<el-table-column property="power" sortable align="center" label="功率(kw)" />
+						<el-table-column property="power" sortable align="center" label="功率(kW)" />
 						<el-table-column property="rr" sortable align="center" label="转速" />
 						<el-table-column property="filter" sortable align="center" label="是否有用点" />
 					</el-table>

src/pages/dataAnalysis/rateAnalysis/index.vue

@@ -689,7 +689,7 @@ onActivated(() => {
 						<el-table-column property="wtId" align="center" label="风机" />
 						<el-table-column property="time" sortable :width="160" align="center" label="时间" />
 						<el-table-column property="speed" sortable align="center" label="风速(m/s)" />
-						<el-table-column property="power" sortable align="center" label="功率(kw)" />
+						<el-table-column property="power" sortable align="center" label="功率(kW)" />
 						<el-table-column property="rr" sortable align="center" label="转速" />
 						<el-table-column property="filter" sortable align="center" label="是否有用点" />
 					</el-table>