From 49a4938ad5b8feb2065d9e9ef74967cda23cc220 Mon Sep 17 00:00:00 2001
From: whyczyk <525500596@qq.com>
Date: 星期一, 09 五月 2022 09:45:43 +0800
Subject: [PATCH] 接口还原到老平台该项目跟老平台保持一致
---
src/pages/alarmMager/batteryrTimequery.vue | 92 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/src/pages/alarmMager/batteryrTimequery.vue b/src/pages/alarmMager/batteryrTimequery.vue
index 5ce3e3c..5ed6883 100644
--- a/src/pages/alarmMager/batteryrTimequery.vue
+++ b/src/pages/alarmMager/batteryrTimequery.vue
@@ -114,7 +114,7 @@
<van-picker show-toolbar :columns="newRoms" value-key="label" @confirm="storageBatterys" @cancel="showPicker2 = false" title="鏈烘埧绔欑偣" />
</van-popup>
<van-popup v-model="showPicker3" round position="bottom">
- <van-picker show-toolbar :columns="options" value-key="battGroupName" @confirm="selectBatter" @cancel="showPicker3 = false" title="钃勭數姹犵粍" />
+ <van-picker show-toolbar :columns="options" value-key="BattGroupName" @confirm="selectBatter" @cancel="showPicker3 = false" title="钃勭數姹犵粍" />
</van-popup>
<div class="refBtn" @click="onRefresh">
<van-icon name="replay" />
@@ -124,9 +124,9 @@
<script>
import {
- searchProvince /* 缁存姢鍖� */,
+ dataType /* 缁存姢鍖� */,
roomsStation /* 鏈烘埧绔欑偣 */,
- batterySearch /* 钃勭數姹犵粍 */,
+ batterySeach /* 钃勭數姹犵粍 */,
newsAlarm /*鍛婅淇℃伅 */,
deletionRecord /* 鍒犻櫎 */,
reporTemergency /* 纭鍛婅 */,
@@ -261,8 +261,8 @@
methods: {
/* 缁存姢鍖� */
async vindicateData() {
- const resType = await searchProvince();
- let typeList = resType.data.data.map((item) => {
+ const resType = await dataType();
+ let typeList = JSON.parse(resType.data.result).data.map((item) => {
return {
label: item,
value: item,
@@ -276,11 +276,10 @@
/* 鏈烘埧绔欑偣 */
async computerSite() {
const roomsSeation = await roomsStation({
- stationName1: this.selectValue1,
+ UNote: this.selectValue1,
});
- let res = roomsSeation.data;
- if (res.code) {
- let newRoms = res.data.map((item) => {
+ if (roomsSeation.data.result) {
+ let newRoms = JSON.parse(roomsSeation.data.result).data.map((item) => {
return {
label: item,
value: item,
@@ -299,14 +298,13 @@
this.selectLable3 = "";
this.showPicker2 = false
// 鏋勯�犳煡璇㈡潯浠�
- const batteryss = await batterySearch({
- stationName1: this.selectValue1,
- stationName: this.selectValue2,
+ const batteryss = await batterySeach({
+ UNote: this.selectValue1,
+ UName: this.selectValue2,
});
- let res = batteryss.data;
- if (res.code) {
- let options = res.data.map((item) => {
- item.battGroupName = `${item.battGroupName}-${item.monCount}鑺俙;
+ if (batteryss.data.result) {
+ let options = JSON.parse(batteryss.data.result).data.map((item) => {
+ item.BattGroupName = `${item.BattGroupName}-${item.MonCount}鑺俙;
return item;
});
this.options = options;
@@ -326,8 +324,8 @@
//閫夋嫨鐢垫睜缁�
selectBatter(value) {
if (value) {
- this.selectValue3 = value.battGroupId
- this.selectLable3 = value.battGroupName
+ this.selectValue3 = value.BattGroupId
+ this.selectLable3 = value.BattGroupName
}
this.showPicker3 = false
@@ -361,33 +359,45 @@
});
// 涓�绾у拰浜岀骇鍛婅
params.num = this.checkbox.Level_one_warn.bol ? 1 : 0;
- params.battGroupId = this.checkbox.Level_two_warn.bol ? 2 : 0;
+ params.BattGroupId = this.checkbox.Level_two_warn.bol ? 2 : 0;
// 涓婇檺鍜屼笅闄愬憡璀�
params.alm_id = this.checkbox.alm_id.bol ? 1 : 100;
params.alm_signal_id = this.checkbox.alm_signal_id.bol ? 0 : 100;
let postData = {
- almIdOne: params.usr_id,
- almIdTwo: params.fault_type_id,
- almIdThree: params.uname,
- almIdFour: params.fault_level,
- almIdFive: params.record_uid,
- almIdSix: params.maint_type_id,
- almIdSeven: params.maint_close,
- almIdEight: params.maint_done,
- almIsConfirmed: 0,
- almLevelFour: params.appoint_uid,
- almLevelOne: params.Level_one_warn,
- almLevelThree: params.master_audit,
- almLevelTwo: params.Level_two_warn,
- almSignalIdOne: params.alm_id,
- almSignalIdTwo: params.alm_signal_id,
- battGroupId: this.selectValue3 ? this.selectValue3 : 0,
- page: {
- pageSize: tab.page.pageSize,
- pageCurr: tab.page.pageCurr,
+ bmd: {
+ page: {
+ pageSize: tab.page.pageSize,
+ pageCurr: tab.page.pageCurr,
+ },
+ binf: {
+ StationName1: this.selectValue1,
+ stationName: this.selectValue2,
+ BattGroupId: this.selectValue3 ? this.selectValue3 : 0,
+ },
+ mainf: {
+ usr_id: params.usr_id,
+ fault_type_id: params.fault_type_id,
+ uname: params.uname,
+ fault_level: params.fault_level,
+ record_uid: params.record_uid,
+ maint_type_id: params.maint_type_id,
+ maint_close: params.maint_close,
+ master_id: "0",
+ maint_done: params.maint_done,
+ num: params.num,
+ BattGroupId: params.BattGroupId,
+ master_audit: params.master_audit,
+ appoint_uid: params.appoint_uid,
+ fault_type: params.fault_type,
+ },
+ adata: {
+ MonNum: "0",
+ Record_Id: "0",
+ alm_id: params.alm_id,
+ alm_signal_id: params.alm_signal_id,
+ alm_is_confirmed: this.active,
+ },
},
- stationname: this.selectValue2,
- stationname1: this.selectValue1,
}
newsAlarm(postData).then((res) => {
const resData = JSON.parse(res.data.result);
@@ -399,7 +409,7 @@
item.battery1 =
item.binf && item.binf.StationName ? item.binf.StationName : "";
item.tes1 =
- item.binf && item.binf.battGroupName ? item.binf.battGroupName : "";
+ item.binf && item.binf.BattGroupName ? item.binf.BattGroupName : "";
item.tester1 =
item.binf && item.binf.StationName8 ? item.binf.StationName8 : "";
item.current1 =
--
Gitblit v1.9.1