From 1c6aa4735d39ae4b36bcb9b4ace96d1fc2239ef5 Mon Sep 17 00:00:00 2001
From: whyczyk <525500596@qq.com>
Date: 星期一, 24 五月 2021 10:07:40 +0800
Subject: [PATCH] 试验点状态列表接口对接
---
src/pages/test/noLoadTest.vue | 83 ++++++++++++++-------------
src/pages/test/dialog/testStepConfirmKz.vue | 34 ++++------
src/pages/test/js/api.js | 18 +++++
3 files changed, 73 insertions(+), 62 deletions(-)
diff --git a/src/pages/test/dialog/testStepConfirmKz.vue b/src/pages/test/dialog/testStepConfirmKz.vue
index d78b823..054b0f8 100644
--- a/src/pages/test/dialog/testStepConfirmKz.vue
+++ b/src/pages/test/dialog/testStepConfirmKz.vue
@@ -60,43 +60,37 @@
span: 8,
},
params: {
- speed: '',
- noise: '',
+ speed: 120,
+ noise: 80,
point: [{
- duration: "", // 璐熻浇鏃堕暱
- experimentId: "", // 瀵瑰簲璇曢獙
+ duration: 20, // 璐熻浇鏃堕暱
name: '璐熻浇鐐�1', // 璐熻浇鐐瑰悕绉�
- percentage: "", // 璐熻浇鐧惧垎鏁�
+ percentage: 150, // 璐熻浇鐧惧垎鏁�
},
{
- duration: "", // 璐熻浇鏃堕暱
- experimentId: "", // 瀵瑰簲璇曢獙
+ duration: 20, // 璐熻浇鏃堕暱
name: '璐熻浇鐐�2', // 璐熻浇鐐瑰悕绉�
- percentage: "", // 璐熻浇鐧惧垎鏁�
+ percentage: 120, // 璐熻浇鐧惧垎鏁�
},
{
- duration: "", // 璐熻浇鏃堕暱
- experimentId: "", // 瀵瑰簲璇曢獙
+ duration: 20, // 璐熻浇鏃堕暱
name: '璐熻浇鐐�3', // 璐熻浇鐐瑰悕绉�
- percentage: "", // 璐熻浇鐧惧垎鏁�
+ percentage: 100, // 璐熻浇鐧惧垎鏁�
},
{
- duration: "", // 璐熻浇鏃堕暱
- experimentId: "", // 瀵瑰簲璇曢獙
+ duration: 20, // 璐熻浇鏃堕暱
name: '璐熻浇鐐�4', // 璐熻浇鐐瑰悕绉�
- percentage: "", // 璐熻浇鐧惧垎鏁�
+ percentage: 80, // 璐熻浇鐧惧垎鏁�
},
{
- duration: "", // 璐熻浇鏃堕暱
- experimentId: "", // 瀵瑰簲璇曢獙
+ duration: 20, // 璐熻浇鏃堕暱
name: '璐熻浇鐐�5', // 璐熻浇鐐瑰悕绉�
- percentage: "", // 璐熻浇鐧惧垎鏁�
+ percentage: 70, // 璐熻浇鐧惧垎鏁�
},
{
- duration: "", // 璐熻浇鏃堕暱
- experimentId: "", // 瀵瑰簲璇曢獙
+ duration: 20, // 璐熻浇鏃堕暱
name: '璐熻浇鐐�6', // 璐熻浇鐐瑰悕绉�
- percentage: "", // 璐熻浇鐧惧垎鏁�
+ percentage: 50, // 璐熻浇鐧惧垎鏁�
},
]
},
diff --git a/src/pages/test/js/api.js b/src/pages/test/js/api.js
index 960de89..e63e342 100644
--- a/src/pages/test/js/api.js
+++ b/src/pages/test/js/api.js
@@ -90,7 +90,7 @@
/**
* 鏌ヨ瀹為獙缂栧彿
*/
-export const searchTestNumber = (type)=>{
+export const searchTestNumber = (type) => {
return axios({
method: "GET",
url: "/experiment/experimentId",
@@ -105,11 +105,25 @@
* @param data
* @returns {AxiosPromise}
*/
-export const addKzFzTest = (data)=>{
+export const addKzFzTest = (data) => {
return axios({
method: "POST",
url: "/experiment/kzfz",
data,
});
+}
+
+/**
+ * 鏌ヨ娴嬭瘯鐐瑰垪琛�
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const experimentPoint = (params) => {
+ return axios({
+ method: "GET",
+ url: "/experiment/point",
+ params: params,
+ });
+
}
\ No newline at end of file
diff --git a/src/pages/test/noLoadTest.vue b/src/pages/test/noLoadTest.vue
index 59675c1..e93ab07 100644
--- a/src/pages/test/noLoadTest.vue
+++ b/src/pages/test/noLoadTest.vue
@@ -189,7 +189,7 @@
</div>
</div>
</div>
- <load-test-dialog type="kz"></load-test-dialog>
+ <load-test-dialog type="kz" :visible="dialogVisible"></load-test-dialog>
</div>
</template>
@@ -205,6 +205,10 @@
import MwSectionProcess from '@/components/smallModule/mwSectionProcess.vue';
import MwThermometer from '@/components/smallModule/mwThermometer.vue';
import LoadTestDialog from "@/pages/test/dialog/LoadTestDialog";
+ import {
+ getExitTest,
+ experimentPoint
+ } from "@/pages/test/js/api";
let diagram;
export default {
components: {
@@ -221,6 +225,7 @@
},
data() {
return {
+ dialogVisible: false,
dcBox: [{
label: '鐢靛帇锛�',
value: 0,
@@ -299,45 +304,7 @@
color: '#666ee8',
status: true
}],
- list: [{
- name: '璐熻浇鐐逛竴',
- status: 2,
- start: '寮�濮嬫椂闂碶n10:30',
- end: '瀹屾垚鏃堕棿\n10:30',
- endText: '骞冲潎鍔熺巼\n100kW'
- },
- {
- name: '璐熻浇鐐逛簩',
- status: 2,
- start: '寮�濮嬫椂闂碶n10:30',
- end: '瀹屾垚鏃堕棿\n10:30',
- endText: '骞冲潎鍔熺巼\n100kW'
- },
- {
- name: '璐熻浇鐐逛笁',
- status: 2,
- start: '寮�濮嬫椂闂碶n10:30',
- end: '瀹屾垚鏃堕棿\n10:30'
- },
- {
- name: '璐熻浇鐐瑰洓',
- status: 1,
- start: '寮�濮嬫椂闂碶n10:30',
- end: ''
- },
- {
- name: '璐熻浇鐐逛簲',
- status: 0,
- start: '寮�濮嬫椂闂碶n10:30',
- end: ''
- },
- {
- name: '璐熻浇鐐瑰叚',
- status: 0,
- start: '寮�濮嬫椂闂碶n10:30',
- end: ''
- },
- ]
+ list: []
}
},
watch: {
@@ -357,8 +324,44 @@
mounted() {
this.initChart();
diagram = gridCircuitDiagram(this.$refs.static, this.$refs.flush);
+ this.checkIsTesting();
},
methods: {
+ experimentPoint(id) {
+ let postData = {
+ experimentId: id
+ }
+ experimentPoint(postData).then((res) => {
+ let rsData = res.data;
+ console.log(res.data)
+ if (rsData.code == 1) {
+ rsData.data.map(item => {
+ this.list.push({
+ name: item.name,
+ status: item.status,
+ start: item.startTime ? `寮�濮嬫椂闂碶n${item.startTime}` : '',
+ end: item.endTime ? `瀹屾垚鏃堕棿\n${item.endTime}` : '',
+ endText: item.averagePower ? `骞冲潎鍔熺巼\n${item.averagePower}kW` : '',
+ })
+ })
+ }
+ }).catch((err) => {
+ console.log(err)
+ });
+ },
+ checkIsTesting() {
+ getExitTest().then(res => {
+ let rs = res.data;
+ if (rs.code == 1) {
+ this.$layer.msg('宸插瓨鍦ㄨ瘯楠�');
+ this.experimentPoint(rs.data.id)
+ } else {
+ this.dialogVisible = true;
+ }
+ }).catch(error => {
+
+ });
+ },
changeSpeed(type) {
if (type == 'add') {
this.speedValue += 1
--
Gitblit v1.9.1