2023-03-21 update

1. 调整浆对角分析页  图表展示接口对接

src/pages/dataAnalysis/angleAnalysis/index.vue

@@ -16,24 +16,7 @@ const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
 /**excel 开始 */
 const excelList = ref([])
 const funExcelChange = async (obj) => { //点击excel项时
-	activeTab.value = '1'
-	tableShowId.value = obj.id
-	tableName.value = obj.name
-	tableLoading.value = true
-	const res = await request.get('/power/prepare/show', { params: { id: obj.id } })
-	if(res.code === 200){
-		tableColumn.value = res.data.title.map(o => {
-			return {
-				prop: o.key,
-				label: o.des,
-				width: o.des==='时间'? 100: 80,
-			}
-		})
-		tableData.value = res.data.data
-		tableLoading.value = false
-	}else{
-		tableLoading.value = false
-	}
+	funSubmit({ids: obj.id})
 }
 /**tree 开始 */
 const treeData = ref([])
@@ -114,31 +97,19 @@ const funChartSelect = async (batch) => {
 }
 /**submit */
 const funSubmit = async (params) => {
-	const res = await request.get('/agc/deviate', { params: params })
-	const tableArr = []
-	const tsArr = []
-	const ygsdxz = []
-	const sfyg = []
-	const llgl = []
-	const pcsx = []
-	const pcxx = []
-	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['实发有功'].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['实发有功'].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)
+	// const res = await request.get('/agc/deviate', { params: params })
+	const res = await request.get('/blade/angle', { params: params })
+	if(res.code !== 200){
+		return false
+	}
+	const tsArr = res.data.time
+	let yp1 = [], yp2 = [], yp3 = []
+	res.data.angle.forEach(val => {
+		yp1 = val.yp1
+		yp2 = val.yp2
+		yp3 = val.yp3
+	});
+	xAxisData.value = tsArr
 	seriesData.value = [
 		{
 			name: "有功设定限值",
@@ -146,7 +117,7 @@ const funSubmit = async (params) => {
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
 			smooth: false, //这个是把线变成曲线
-			data: ygsdxz,
+			data: yp1,
 			xAxisIndex: 0,
 		},
 		{
@@ -155,7 +126,7 @@ const funSubmit = async (params) => {
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
 			smooth: false, //这个是把线变成曲线
-			data: sfyg,
+			data: yp2,
 			xAxisIndex: 0,
 		},
 		{
@@ -164,41 +135,8 @@ const funSubmit = async (params) => {
 			symbol: "line", //设定为实心点
 			symbolSize: 0, //设定实心点的大小
 			smooth: false, //这个是把线变成曲线
-			data: llgl,
-			xAxisIndex: 0,
-		},
-		{
-			name: "偏差上限",
-			type: "line",
-			symbol: "line", //设定为实心点
-			symbolSize: 0, //设定实心点的大小
-			smooth: false, //这个是把线变成曲线
-			data: pcsx,
-			xAxisIndex: 0,
-			lineStyle: {
-            opacity: 0
-			},
-			areaStyle: {
-				color: '#ccc',
-			},
-			symbol: 'none'
-		},
-		{
-			name: "偏差下限",
-			type: "line",
-			symbol: "line", //设定为实心点
-			symbolSize: 0, //设定实心点的大小
-			smooth: false, //这个是把线变成曲线
-			data: pcxx,
+			data: yp3,
 			xAxisIndex: 0,
-			lineStyle: {
-            opacity: 0
-			},
-			areaStyle: {
-				color: '#fff',
-				opacity: 1
-			},
-			symbol: 'none'
 		},
 	]
 }
@@ -223,8 +161,8 @@ onActivated(() => {
 </script>
 <template>
 	<div class="bg-white py-[10px] px-[10px] relative">
-		<search-cop v-show="false" class="mb-[20px] shadow rounded-[6px] shadow-blue-500" @submit="funSubmit">
-		</search-cop>
+		<!-- <search-cop v-show="false" class="mb-[20px] shadow rounded-[6px] shadow-blue-500" @submit="funSubmit">
+		</search-cop> -->
 		<div class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]">
 			<div class="text-[14px] absolute top-[-7px] text-[#838383] left-[20px]">数据展示</div>
 			<el-row :gutter="10">