2023-03-07 combine

1. fix router conflicts

src/pages/dataAnalysis/lineAnalysis/index.vue

@@ -518,10 +518,10 @@ onActivated(() => {
 				</el-tab-pane>
 				<el-tab-pane label="不运行时间" name="2"></el-tab-pane>
 				<div  v-if="activeTab === '1'">
-					<bar-chart-cop height="700px" width="100%" :xAxis="barxAxis" :yAxis="baryAxis" :series="barSeries"></bar-chart-cop>
+					<bar-chart-cop height="600px" width="100%" :xAxis="barxAxis" :yAxis="baryAxis" :series="barSeries"></bar-chart-cop>
 				</div>
 				<div v-if="activeTab === '2'">
-					<bar-chart-cop height="700px" :colors='["rgb(222,132,82)","rgb(105,188,80)","rgb(197,78,82)","rgb(129,114,181)"]' width="100%" :xAxis="barxAxis" :yAxis="baryAxis" :series="barUnWorkSeries"></bar-chart-cop>
+					<bar-chart-cop height="600px" :colors='["rgb(222,132,82)","rgb(105,188,80)","rgb(197,78,82)","rgb(129,114,181)"]' width="100%" :xAxis="barxAxis" :yAxis="baryAxis" :series="barUnWorkSeries"></bar-chart-cop>
 				</div>
 			</el-tabs>
 		</el-dialog>
@@ -529,7 +529,7 @@ onActivated(() => {
 			<bar-chart-cop height="700px" :colors='[]' width="100%" :xAxis="powerxAxis" :yAxis="poweryAxis" :series="powerSeries"></bar-chart-cop>
 		</el-dialog>
     <el-dialog draggable v-model="wtDialog" title="曲线偏差率">
-			<el-table :data="wtData" row-key="id" :max-height="550">
+			<el-table :data="wtData" row-key="id" :max-height="600">
 				<el-table-column property="windturbine" align="center" label="风机" />
 				<el-table-column
 					property="pc5ratio"

src/pages/dataAnalysis/windAnalysis/components/barLineChart.vue

@@ -125,9 +125,9 @@ export default {
         },
         tooltip: {
           trigger: "axis",
-          backgroundColor: this.themeName === "dark"
-              ? "rgba(0,0,0,0.4)"
-              : "rgba(255,255,255,0.5)",
+          backgroundColor: true
+              ? "rgba(255,255,255,0.9)"
+              : "rgba(255,255,255,0.9)",
           borderColor: this.themeName === "dark"
               ? partten.getColor("gray")
               : "#838383",
@@ -294,6 +294,7 @@ export default {
         });
       }
       chart.setOption(option);
+      chart.resize()
     },
   },
   created() {

src/pages/dataAnalysis/windAnalysis/index.vue

@@ -14,7 +14,7 @@ const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
 const tableHeight = ref(window.innerHeight - 214 + 'px')
 /**table 开始 */
 const tableShowId = ref('')
-const tableName = ref('风机绩效榜')
+const tableName = ref('损失电量分析')
 const tableColumn = ref([])
 const tableLoading = ref(false)
 const tableData = ref([])
@@ -295,9 +295,9 @@ onActivated(() => {
 							<div v-show="activeTab === '2'"
 								:style="{ height: typeof tableHeight === 'string' ? tableHeight : tableHeight + 'px' }"
 								class="p-[10px]">
-								<bar-line-chart-cop v-if="lineData.length" :height="tableHeight" :bardata="barData" :lineData="lineData"
+								<bar-line-chart-cop v-show="lineData.length" :height="tableHeight" :bardata="barData" :lineData="lineData"
 										:color="barColor" lineName="理论发电量"></bar-line-chart-cop>
-								<el-empty v-else description="请选择条件"></el-empty>
+								<el-empty v-show="!lineData.length" description="请选择条件"></el-empty>
 							</div>
 						</el-tabs>
 					</div>