Browse Source

2022-11-28 fix

1. 去除测试数据调用
2. 曲线偏差率页  数据散点图表数据暂为测试数据
moccus 2 years ago
parent
commit
5b63c3f5bd

+ 9 - 9
src/pages/curveDeviation/rateAnalysis/index.vue

@@ -8,8 +8,8 @@ import scatterSingleChartCop from './components/scatterSingleChart.vue'
 import { ElMessage } from 'element-plus';
 import { onMounted, ref, onActivated } from 'vue'
 import request from '@/api/axios.js'
-import flowerRes from '@/data/flower.json'
-import lineChartRes from '@/data/lineNew.json'
+// import flowerRes from '@/data/flower.json'
+// import lineChartRes from '@/data/lineNew.json'
 /**配置参数 */
 const treeHeight = ref('81vh') //tree高度
 const excelHeight = ref('81vh') //excel高度
@@ -122,13 +122,13 @@ const chartData = ref([]) //roses的chartList
 let chartId = 1
 /**submit */
 const funSubmit = async (params) => {
-	// const rosesRes = await request.get('/wind/roses', {
-	// 	params: {
-	// 		ids: excelCheckIds.value.join(','),
-	// 		mode: params.mode
-	// 	}
-	// })
-	const rosesRes = flowerRes
+	const rosesRes = await request.get('/wind/roses', {
+		params: {
+			ids: excelCheckIds.value.join(','),
+			mode: params.mode
+		}
+	})
+	// const rosesRes = flowerRes
 	const lineRes = lineChartRes
 	if (rosesRes.code === 200) {
 		if (rosesRes.data?.length) {

+ 9 - 9
src/pages/dataFilter/combine/index.vue

@@ -9,9 +9,9 @@ import request from '@/api/axios.js'
 import { ElMessage } from 'element-plus'
 import util from "@tools/util";
 import CurrentScatterChart from './components/current-scatter-chart.vue'
-import dotRes from '@/data/dot.json'
-import tableRes from '@/data/table.json'
-import areaDataRes from '@/data/areaData.json'
+// import dotRes from '@/data/dot.json'
+// import tableRes from '@/data/table.json'
+// import areaDataRes from '@/data/areaData.json'
 /**配置参数 */
 const treeHeight = ref('40vh') //tree高度
 const excelHeight = ref('40vh') //excel高度
@@ -43,12 +43,12 @@ const funExcelChange = async (obj) => { //点击excel项时
 		res = await request.get('/power/process/show', { params: { id: obj.id } })
 	} else if (obj.type === 'fitting') {
 		activeTab.value = '2'
-		// res = await request.get('/power/fitting/show', { params: { id: obj.id } })
-		res = tableRes
-		chartResponse = dotRes
-		// chartResponse = await request.get('/power/fitting/curve', { params: { id: obj.id, p: 1 } })
-		// poiRes = await request.get('/power/fitting/curve/ratio', {params: {id: obj.id}})
-		poiRes = areaDataRes
+		res = await request.get('/power/fitting/show', { params: { id: obj.id } })
+		// res = tableRes
+		// chartResponse = dotRes
+		chartResponse = await request.get('/power/fitting/curve', { params: { id: obj.id, p: 1 } })
+		poiRes = await request.get('/power/fitting/curve/ratio', {params: {id: obj.id}})
+		// poiRes = areaDataRes
 	}
 	tableColumn.value = res.data.title.map(o => {
 		return {