Merge branch 'main' of http://124.70.43.205:3000/xufenqi/PowerAnalysis into main

# Conflicts:
#	src/pages/dataAnalysis/tempAnalysis/index.vue

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

@@ -110,11 +110,11 @@ export default {
         //     : "rgba(255,255,255,0.5)",
         //工具箱
         color: [
-            "rgb(255,0,0)",
-            "#FF8700",
-            "#e6b600d9",
             "#0098d9",
-            "#3D54BE",
+            "rgb(255,0,0)",
+            "#0a4468",
+            "#a9e3f199",
+            "#a9e3f199",
             "#005eaa",
             "#cda819",
             "#32a487"

src/pages/dataAnalysis/agcAnalysis/index.vue

@@ -144,20 +144,20 @@ const funSubmit = async (params) => {
 	const llgl = []
 	const pcsx = []
 	const pcxx = []
-	res[0].values.map((o, index) => {
+	res['有功设定限值'].values.map((o, index) => {
 		tsArr.push(dayjs(o.ts).format('YYYY-MM-DD HH:mm:ss'))
 		ygsdxz.push(Number(o.value).toFixed(2))
-		sfyg.push(Number(res[1].values[index].value).toFixed(2))
-		llgl.push(Number(res[2].values[index].value).toFixed(2))
-		pcsx.push(Number(res[3].values[index].value).toFixed(2))
-		pcxx.push(Number(res[4].values[index].value).toFixed(2))
+		sfyg.push(Number(res['实发有功'].values[index].value).toFixed(2))
+		llgl.push(Number(res['理论功率'].values[index].value).toFixed(2))
+		pcsx.push(Number(res['偏差上限'].values[index].value).toFixed(2))
+		pcxx.push(Number(res['偏差下限'].values[index].value).toFixed(2))
 		tableArr.push({
 			ts: dayjs(o.ts).format('YYYY-MM-DD HH:mm:ss'),
 			ygsdxz: Number(o.value).toFixed(2),
-			sfyg: Number(res[1].values[index].value).toFixed(2),
-			llgl: Number(res[2].values[index].value).toFixed(2),
-			pcsx: Number(res[3].values[index].value).toFixed(2),
-			pcxx: Number(res[4].values[index].value).toFixed(2),
+			sfyg: Number(res['实发有功'].values[index].value).toFixed(2),
+			llgl: Number(res['理论功率'].values[index].value).toFixed(2),
+			pcsx: Number(res['偏差上限'].values[index].value).toFixed(2),
+			pcxx: Number(res['偏差下限'].values[index].value).toFixed(2),
 		})
 	})
 	xAxisData.value = tableArr.map(o => o.ts)
@@ -167,7 +167,7 @@ const funSubmit = async (params) => {
 			type: "line",
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
-			smooth: true, //这个是把线变成曲线
+			smooth: false, //这个是把线变成曲线
 			data: ygsdxz,
 			xAxisIndex: 0,
 		},
@@ -176,7 +176,7 @@ const funSubmit = async (params) => {
 			type: "line",
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
-			smooth: true, //这个是把线变成曲线
+			smooth: false, //这个是把线变成曲线
 			data: sfyg,
 			xAxisIndex: 0,
 		},
@@ -185,7 +185,7 @@ const funSubmit = async (params) => {
 			type: "line",
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
-			smooth: true, //这个是把线变成曲线
+			smooth: false, //这个是把线变成曲线
 			data: llgl,
 			xAxisIndex: 0,
 		},
@@ -194,18 +194,33 @@ const funSubmit = async (params) => {
 			type: "line",
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
-			smooth: true, //这个是把线变成曲线
+			smooth: false, //这个是把线变成曲线
 			data: pcsx,
 			xAxisIndex: 0,
+			lineStyle: {
+            opacity: 0
+			},
+			areaStyle: {
+				color: '#ccc',
+			},
+			symbol: 'none'
 		},
 		{
 			name: "偏差下限",
 			type: "line",
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
-			smooth: true, //这个是把线变成曲线
+			smooth: false, //这个是把线变成曲线
 			data: pcxx,
 			xAxisIndex: 0,
+			lineStyle: {
+            opacity: 0
+			},
+			areaStyle: {
+				color: '#fff',
+				opacity: 1
+			},
+			symbol: 'none'
 		},
 	]
 	tableData.value = tableArr
@@ -246,7 +261,7 @@ onMounted(() => {
 })
 /**activated */
 onActivated(() => {
-	funGetTree()
+	// funGetTree()
 })
 </script>
 <template>
@@ -256,14 +271,14 @@ onActivated(() => {
 		<div class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]">
 			<div class="text-[14px] absolute top-[-7px] text-[#B3B3B3] left-[20px]">数据展示</div>
 			<el-row :gutter="10">
-				<el-col :span="5">
+				<!-- <el-col :span="5">
 					<tree-cop :data="treeData" :height="treeHeight" @currentChange="funCurrentChange" @refresh="funGetTree">
 					</tree-cop>
 				</el-col>
 				<el-col :span="3">
 					<excel-cop :data="excelList" :height="excelHeight" @excelChange="funExcelChange"></excel-cop>
-				</el-col>
-				<el-col :span="16">
+				</el-col> -->
+				<el-col :span="24">
 					<div class="px-[10px] shadow rounded-[6px] shadow-blue-500 ">
 						<el-tabs v-model="activeTab">
 							<el-tab-pane label="表格数据" name="1">

src/pages/dataAnalysis/tempAnalysis/index.vue

@@ -183,6 +183,9 @@ const linexAxis = reactive({
 	},
 	axisTick: {
 		show: true
+	},
+	axisLine: {
+		onZero: false
 	}
 })
 const lineyAxis = reactive([
@@ -194,6 +197,9 @@ const lineyAxis = reactive([
 	},
 	axisTick: {
 		show: true
+	},
+	axisLine: {
+		onZero: false
 	}
 	}
 ])
@@ -263,9 +269,9 @@ const barxAxis = reactive({
 	axisTick: {
 		show: true
 	},
-	axisLine:{
-      onZero: false,
-     },
+	axisLine: {
+		onZero: false
+	}
 })
 const baryAxis = reactive({
 		type: 'value',
@@ -275,6 +281,9 @@ const baryAxis = reactive({
 	},
 	axisTick: {
 		show: true
+	},
+	axisLine: {
+		onZero: false
 	}
 })
 const barSeries = reactive([{
@@ -517,14 +526,14 @@ onActivated(() => {
 				<el-col :span="16">
 					<div :style="{ height: tableHeight }"
 						class="flex flex-wrap justify-center items-center overflow-x-hidden overflow-y-auto ">
-						<div class="mb-[10px] mr-[10px] w-[49%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500">
+						<div class="mb-[10px] w-[100%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500">
 							<el-icon class="mr-[10px] mt-[10px] cursor-pointer" size="18"
 								@click="funActCop({xAxis:barxAxis, yAxis:baryAxis, series: barSeries}, 'barChartCop')">
 								<ZoomIn />
 							</el-icon>
 							<bar-chart-cop width="100%" height="100%" subtext="平均功率-额定功率" :xAxis="barxAxis" :yAxis="baryAxis" :series="barSeries"></bar-chart-cop>
 						</div>
-						<div class="mb-[10px] w-[49%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500">
+						<div class="w-[100%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500">
 							<el-icon class="mr-[10px] mt-[10px] cursor-pointer" size="18"
 								@click="funActCop({xAxis:linexAxis, yAxis:lineyAxis, series: lineSeries}, 'lineChartCop')">
 								<ZoomIn />
@@ -532,22 +541,22 @@ onActivated(() => {
 							<line-chart-cop class="" height="100%" width="100%" :xAxis="linexAxis" :yAxis="lineyAxis"
 								:series="lineSeries" subtext="额定功率温度分析" :dataset="lineDataSet"></line-chart-cop>
 						</div>
-						<div class="mr-[10px] w-[49%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500" v-if="!!lineSeries.length">
+						<!-- <div class="mr-[10px] w-[49%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500" v-if="!!lineSeries.length"> -->
 							<!-- <el-icon class="mr-[10px] mt-[10px] cursor-pointer" size="18"
 								@click="funActCop({ xAxis: linexAxis, yAxis: lineyAxis, series: lineSeries, dataset: lineDataSet }, 'lineChartCop')">
 								<ZoomIn />
 							</el-icon> -->
 							<!-- <current-scatter-chart-cop class="" height="100%" width="100%" :xAxis="linexAxis" :yAxis="lineyAxis"
 								:series="lineSeries" subtext="风速功率-温度分析" :dataset="lineDataSet"></current-scatter-chart-cop> -->
-						</div>
-						<div class="w-[49%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500" v-if="!!lineSeries.length">
+						<!-- </div> -->
+						<!-- <div class="w-[49%] h-[49%] flex flex-col items-end shadow rounded-[6px] shadow-blue-500" v-if="!!lineSeries.length"> -->
 							<!-- <el-icon class="mr-[10px] mt-[10px] cursor-pointer" size="18"
 								@click="funActCop({ xAxis: xAxisData, yAxis: { splitLine: { show: false } }, series: seriesData, dataSet: dataSet }, 'CurrentScatterChartCop')">
 								<ZoomIn />
 							</el-icon> -->
 							<!-- <current-scatter-chart-cop class="" height="100%" width="100%" :xAxis="linexAxis" :yAxis="lineyAxis"
 								:series="lineSeries" subtext="对风偏差分析图" :dataset="lineDataSet"></current-scatter-chart-cop> -->
-						</div>
+						<!-- </div> -->
 					</div>
 				</el-col>
 			</el-row>