From 158e2ba44b22a774e0bffa8bf019ade7612a56da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 18 Mar 2024 18:02:13 +0800 Subject: [PATCH 1/2] 1 --- src/views/page/irrigateSet.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/page/irrigateSet.vue b/src/views/page/irrigateSet.vue index 33a5c91..6b6a7bb 100644 --- a/src/views/page/irrigateSet.vue +++ b/src/views/page/irrigateSet.vue @@ -441,16 +441,16 @@
有效时间： + @input="change(10 + (indexs - 1) + '67', $event)" type="number" placeholder="0" min="0" max="23" /> : + @input="change(10 + (indexs - 1) + '68', $event)" type="number" placeholder="0" min="0" max="59" /> -- + @input="change(10 + (indexs - 1) + '69', $event)" type="number" placeholder="0" min="0" max="23" /> : + @input="change(10 + (indexs - 1) + '70', $event)" type="number" placeholder="0" min="0" max="59" />
From 15c8fc8a909a472072771cdd20db923f4f32ad4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Tue, 26 Mar 2024 15:14:56 +0800 Subject: [PATCH 2/2] 1 --- src/components/setParamsControl.vue | 16 ++++++++++++++++ src/views/page/LED.vue | 8 ++++++++ src/views/page/PIDSet.vue | 11 ++++++++++- src/views/page/alarmSettings.vue | 8 ++++++++ src/views/page/circulationCan.vue | 8 ++++++++ src/views/page/coercionMist.vue | 8 ++++++++ src/views/page/electromagneticControl.vue | 17 ++++++++++++++++- src/views/page/exitSettings.vue | 8 ++++++++ src/views/page/fan.vue | 8 ++++++++ src/views/page/forceOutput.vue | 10 +++++++++- src/views/page/formula.vue | 14 ++++++++++++++ src/views/page/insizeSunshade.vue | 8 ++++++++ src/views/page/internalInsulation.vue | 8 ++++++++ src/views/page/intrinsicParameter.vue | 8 ++++++++ src/views/page/irrigateSet.vue | 20 ++++++++++++++++++++ src/views/page/outsizeSunshade.vue | 8 ++++++++ src/views/page/parameterSet.vue | 8 ++++++++ src/views/page/sensorSet-con.vue | 10 +++++++++- src/views/page/sensorSet.vue | 10 +++++++++- src/views/page/skylight.vue | 14 ++++++++++++++ src/views/page/sunroofControl.vue | 9 +++++++++ src/views/page/synthesis-con.vue | 8 ++++++++ src/views/page/systemSet-con.vue | 10 +++++++++- src/views/page/systemSet.vue | 13 +++++++++++-- src/views/page/targetCo2.vue | 8 ++++++++ src/views/page/targetHumidity.vue | 10 +++++++++- src/views/page/targetTemperature.vue | 8 ++++++++ src/views/page/upload-con.vue | 8 ++++++++ src/views/page/upload.vue | 10 +++++++++- src/views/page/wetFan.vue | 8 ++++++++ 30 files changed, 292 insertions(+), 10 deletions(-) diff --git a/src/components/setParamsControl.vue b/src/components/setParamsControl.vue index 7635802..14754cc 100644 --- a/src/components/setParamsControl.vue +++ b/src/components/setParamsControl.vue @@ -43,6 +43,7 @@ export default { routerNow: "skylight", routerIndex: 1, purview: [], //权限数组 + loading:null, }; }, watch: { @@ -53,12 +54,19 @@ export default { var store = this.$store.state; var item = store.equipmentList[store.equipmentIndex - 1] if(item.deviceName == 10 || item.deviceName == 30){ + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit(); } }, }, mounted() { this.gerRouter(); + this.dataInit(); }, methods: { @@ -81,6 +89,7 @@ export default { var store = this.$store.state; var data = store.equipmentList[store.equipmentIndex - 1].deviceId; this.api.getcontrol_cpermission(data).then((res) => { + this.routerList = []; this.purview = res.data.data; this.purview.forEach((el, index) => { @@ -251,12 +260,19 @@ export default { this.routerNow != "/rollByRoll" && this.routerNow != "/snowRemoval" ) { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); //调取数据 var store = this.$store.state; var data = { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.readControl_fiveControl(data).then((res) => { + this.loading.close() store.ControlData = res.data.data //加热水泵数据处理waterPump store.ControlData['21521'] = this.countData(store.ControlData['21521']) diff --git a/src/views/page/LED.vue b/src/views/page/LED.vue index 929912d..a626fd0 100644 --- a/src/views/page/LED.vue +++ b/src/views/page/LED.vue @@ -295,6 +295,7 @@ export default { actList2: [], actList3: [], startList:[21408,21413,21418,21423], + loading:null, } }, watch: { @@ -309,6 +310,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -563,6 +570,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.readfilllight(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.getActive1() diff --git a/src/views/page/PIDSet.vue b/src/views/page/PIDSet.vue index 5105aaf..18d68ca 100644 --- a/src/views/page/PIDSet.vue +++ b/src/views/page/PIDSet.vue @@ -133,10 +133,18 @@ export default { }, data() { return { - inputData: [] + inputData: [], + loading:null, } }, + mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -153,6 +161,7 @@ export default { regNum: 16, }; this.api.postReg(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; } else { diff --git a/src/views/page/alarmSettings.vue b/src/views/page/alarmSettings.vue index da19e08..fc98cd0 100644 --- a/src/views/page/alarmSettings.vue +++ b/src/views/page/alarmSettings.vue @@ -316,10 +316,17 @@ export default { { label: '13#湿度传感器', value: 14 }, { label: '14#湿度传感器', value: 15 }, { label: '15#湿度传感器', value: 16 },], + loading:null, } }, mounted() { const that = this; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -487,6 +494,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.targetValue(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputDataNew = JSON.parse(JSON.stringify(res.data.data)) diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index 6e190b4..c067daa 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -143,6 +143,7 @@ export default { startList: [21450, 21470],//每个阀门的起始参数 indexs: 1, actList1: [], + loading:null, } }, watch: { @@ -157,6 +158,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -278,6 +285,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.readcirculationfan(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { diff --git a/src/views/page/coercionMist.vue b/src/views/page/coercionMist.vue index 4ed4b0a..0fc9b01 100644 --- a/src/views/page/coercionMist.vue +++ b/src/views/page/coercionMist.vue @@ -82,6 +82,7 @@ export default { startList: [21800, 21808],//每个阀门的起始参数 indexs: 1, actList1: [], + loading:null, } }, watch: { @@ -96,6 +97,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -217,6 +224,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.highpressuremist(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { diff --git a/src/views/page/electromagneticControl.vue b/src/views/page/electromagneticControl.vue index c31e6b9..a8e1bda 100644 --- a/src/views/page/electromagneticControl.vue +++ b/src/views/page/electromagneticControl.vue @@ -177,13 +177,21 @@ export default { actList1: [],//周几数组 inputData: [], typeList: [{ label: '间隔模式启动', value: 1, }, - { label: '土壤湿度传感器启动', value: 2, },] + { label: '土壤湿度传感器启动', value: 2, },], + + loading:null, } }, watch: { $route(newVal, oldVal) { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -192,6 +200,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -287,6 +301,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api['solenoidValve' + this.indexs](data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.sensorType = '' diff --git a/src/views/page/exitSettings.vue b/src/views/page/exitSettings.vue index 731e696..872adf6 100644 --- a/src/views/page/exitSettings.vue +++ b/src/views/page/exitSettings.vue @@ -74,6 +74,7 @@ export default { data() { return { inputData: [], + loading:null, } }, mounted() { @@ -157,11 +158,18 @@ export default { this.change(code, sendData) }, dataInit() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); var store = this.$store.state var data = { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.readalarmSetting(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; diff --git a/src/views/page/fan.vue b/src/views/page/fan.vue index 3c1183e..c54f771 100644 --- a/src/views/page/fan.vue +++ b/src/views/page/fan.vue @@ -143,6 +143,7 @@ export default { //有效性设置 openIndex: 0, actList1:[], + loading:null, } }, watch: { @@ -158,6 +159,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -285,6 +292,7 @@ export default { }; this.api.getReadControlliShuiControl(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.openIndex = this.inputData[21600] diff --git a/src/views/page/forceOutput.vue b/src/views/page/forceOutput.vue index bd8cd87..52106d7 100644 --- a/src/views/page/forceOutput.vue +++ b/src/views/page/forceOutput.vue @@ -34,10 +34,17 @@ index: -1, value: 0, }, - pageList:[[],[],[],[]] + pageList:[[],[],[],[]], + loading:null, } }, mounted(){ + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() }, methods:{ @@ -71,6 +78,7 @@ deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.forceChannelOutput(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.pageList.forEach((el, index) => { diff --git a/src/views/page/formula.vue b/src/views/page/formula.vue index 437646a..6723ee0 100644 --- a/src/views/page/formula.vue +++ b/src/views/page/formula.vue @@ -221,6 +221,7 @@ export default { inputData: [], dataSel: '', store: this.$store.state, + loading:null, } }, watch: { @@ -229,6 +230,12 @@ export default { var store = this.$store.state this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.titleName = store.equipmentName['fertilization' + store.nameList[this.indexs - 1]] + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -239,6 +246,12 @@ export default { var store = this.$store.state this.indexs = this.$route.query.id ? Number(this.$route.query.id) : 1; this.titleName = store.equipmentName['fertilization' + store.nameList[this.indexs - 1]] + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -317,6 +330,7 @@ export default { regNum: 29, }; this.api.postReg(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.inputData[store.formulaNum[this.indexs - 1]] = this.countData1(this.inputData[store.formulaNum[this.indexs - 1]]) diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index b8d9ea8..fd5631e 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -162,6 +162,7 @@ export default { startList: [21840, 21858],//每个阀门的起始参数 indexs: 1, actList1: [], + loading:null, } }, watch: { @@ -176,6 +177,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -297,6 +304,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.innercurtain(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { diff --git a/src/views/page/internalInsulation.vue b/src/views/page/internalInsulation.vue index 3e2f852..0d2585e 100644 --- a/src/views/page/internalInsulation.vue +++ b/src/views/page/internalInsulation.vue @@ -109,6 +109,7 @@ export default { startList: [22000, 22012],//每个阀门的起始参数 indexs: 1, actList1: [], + loading:null, } }, watch: { @@ -124,6 +125,12 @@ export default { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; setTimeout(() => { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); that.dataInit(); }, 0); //input获取焦点后全选 @@ -244,6 +251,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.interiorthermalinsulation(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue index fe2e281..4528ffc 100644 --- a/src/views/page/intrinsicParameter.vue +++ b/src/views/page/intrinsicParameter.vue @@ -564,9 +564,16 @@ export default { { label: '制冷模式', value: 2 },], inputData:[], inputDataNew:[], + loading:null, } }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -653,6 +660,7 @@ modelConfirm(){ deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.intrinsicParameter(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData =JSON.parse(JSON.stringify(res.data.data)); this.inputDataNew=JSON.parse(JSON.stringify(res.data.data)) diff --git a/src/views/page/irrigateSet.vue b/src/views/page/irrigateSet.vue index 6b6a7bb..db78754 100644 --- a/src/views/page/irrigateSet.vue +++ b/src/views/page/irrigateSet.vue @@ -483,11 +483,18 @@ export default { indexs: 2, data53: "", inputData: {}, + loading:null, }; }, watch: { '$store.state.equipmentIndex': function (newValue, oldValue) { const that = this; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -495,6 +502,12 @@ export default { $route(newVal, oldVal) { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -503,6 +516,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -675,6 +694,7 @@ export default { regNum: 71, }; this.api.postReg(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.getType(); diff --git a/src/views/page/outsizeSunshade.vue b/src/views/page/outsizeSunshade.vue index ffe0afb..cbc8207 100644 --- a/src/views/page/outsizeSunshade.vue +++ b/src/views/page/outsizeSunshade.vue @@ -132,6 +132,7 @@ export default { startList: [21900,21915],//每个阀门的起始参数 indexs: 1, actList1: [], + loading:null, } }, watch: { @@ -146,6 +147,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -267,6 +274,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.externalsunshade(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue index 375c78c..15c165b 100644 --- a/src/views/page/parameterSet.vue +++ b/src/views/page/parameterSet.vue @@ -683,9 +683,16 @@ export default { list4: [21735, 21739, 21751, 21755, 21759, 21763, 21767, 21771], inputData: [], inputDataNew: [], + loading:null, } }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -737,6 +744,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.manufacturerparameter(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputDataNew = JSON.parse(JSON.stringify(res.data.data)) diff --git a/src/views/page/sensorSet-con.vue b/src/views/page/sensorSet-con.vue index ab868a1..e9bd9db 100644 --- a/src/views/page/sensorSet-con.vue +++ b/src/views/page/sensorSet-con.vue @@ -133,7 +133,8 @@ export default { openList2: [],//当前有效的传感器 openList3: [],//当前有效的传感器 openTypeList: [],//八个通道输入信号的类型 - typeList: this.$store.state.typeList + typeList: this.$store.state.typeList, + loading:null, } }, watch: { @@ -142,6 +143,12 @@ export default { }, }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -403,6 +410,7 @@ return num }; this.api.getReadControlSensorChannel(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputDataNew = res.data.data; diff --git a/src/views/page/sensorSet.vue b/src/views/page/sensorSet.vue index c982da1..b3f524d 100644 --- a/src/views/page/sensorSet.vue +++ b/src/views/page/sensorSet.vue @@ -102,7 +102,8 @@ export default { inputDataNew:[], sensorType:'',//当前传感器类型 openList: [],//当前有效的传感器 - typeList:this.$store.state.typeList + typeList:this.$store.state.typeList, + loading:null, } }, watch:{ @@ -112,6 +113,12 @@ export default { }, }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -283,6 +290,7 @@ return num regNum: 31,//从pattern取多少个数据 }; this.api.postReg(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputDataNew = res.data.data; diff --git a/src/views/page/skylight.vue b/src/views/page/skylight.vue index c0c4447..ee15fa7 100644 --- a/src/views/page/skylight.vue +++ b/src/views/page/skylight.vue @@ -172,6 +172,7 @@ export default { openIndex: 0, openTrue: [], + loading:null, } }, watch: { @@ -183,6 +184,12 @@ export default { }, 0); }, '$route.query.change'(newVal, oldVal) { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit(); }, }, @@ -190,6 +197,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -325,6 +338,7 @@ export default { }; this.api.getReadControlliShuiControl(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.getNowData() diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index e7c69d6..2229c34 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -203,6 +203,7 @@ export default { startList: [21250, 21273, 21296, 21319],//每个阀门的起始参数 indexs: 1, actList1: [], + loading:null, } }, watch: { @@ -217,6 +218,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -339,6 +346,8 @@ export default { }; var equipmentId = store.equipmentList[store.equipmentIndex - 1].deviceId this.api.readskylight(data).then(res => { + + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { diff --git a/src/views/page/synthesis-con.vue b/src/views/page/synthesis-con.vue index 2a2b964..837e93c 100644 --- a/src/views/page/synthesis-con.vue +++ b/src/views/page/synthesis-con.vue @@ -49,10 +49,17 @@ export default { '水温', ], rightList: ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'], + loading:null, } }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() }, methods: { @@ -79,6 +86,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.getReadControlSensorInputSynthesis(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.leftList.forEach((el, index) => { diff --git a/src/views/page/systemSet-con.vue b/src/views/page/systemSet-con.vue index 8122a24..724328d 100644 --- a/src/views/page/systemSet-con.vue +++ b/src/views/page/systemSet-con.vue @@ -94,10 +94,17 @@ export default { }, data() { return { - inputData: [] + inputData: [], + loading:null, } }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -130,6 +137,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.getControlGetState(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.inputData['1051'] = this.fliter2(this.inputData['1051'].toString(16)) diff --git a/src/views/page/systemSet.vue b/src/views/page/systemSet.vue index 5881924..32d53ce 100644 --- a/src/views/page/systemSet.vue +++ b/src/views/page/systemSet.vue @@ -78,10 +78,18 @@ export default { }, data() { return { - inputData: [] + inputData: [], + loading:null, } }, + mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -116,7 +124,8 @@ export default { regNum: 72, }; this.api.postState(data).then((res) => { - console.log(res, 11); + + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.inputData['55']= this.fliter2(this.inputData['55'].toString(16)) diff --git a/src/views/page/targetCo2.vue b/src/views/page/targetCo2.vue index 918bbf3..9744a61 100644 --- a/src/views/page/targetCo2.vue +++ b/src/views/page/targetCo2.vue @@ -103,11 +103,18 @@ data(){ return { inputData:[], + loading:null, } }, mounted() { const that = this; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -192,6 +199,7 @@ deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.targetValue(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; diff --git a/src/views/page/targetHumidity.vue b/src/views/page/targetHumidity.vue index 2fe93dc..b78ea57 100644 --- a/src/views/page/targetHumidity.vue +++ b/src/views/page/targetHumidity.vue @@ -200,12 +200,19 @@ export default { data(){ return { - inputData:[] + inputData:[], + loading:null, } }, mounted() { const that = this; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -290,6 +297,7 @@ deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.targetValue(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.inputData[20034] =this.countData10(this.inputData[20034]); diff --git a/src/views/page/targetTemperature.vue b/src/views/page/targetTemperature.vue index 8ae129a..fe41193 100644 --- a/src/views/page/targetTemperature.vue +++ b/src/views/page/targetTemperature.vue @@ -202,10 +202,17 @@ export default { return { timer: null, inputData: [], + loading:null, } }, mounted() { const that = this; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -290,6 +297,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.targetValue(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.inputData[20002] =this.countData(this.inputData[20002]); diff --git a/src/views/page/upload-con.vue b/src/views/page/upload-con.vue index 5459640..8767060 100644 --- a/src/views/page/upload-con.vue +++ b/src/views/page/upload-con.vue @@ -189,10 +189,17 @@ export default { '通道传感器47', '通道传感器48',], inputData: [], + loading:null, } }, mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -286,6 +293,7 @@ export default { }; this.api.getControldataUpload(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; diff --git a/src/views/page/upload.vue b/src/views/page/upload.vue index 9e1ed04..6bdc457 100644 --- a/src/views/page/upload.vue +++ b/src/views/page/upload.vue @@ -83,10 +83,17 @@ export default { '5#通道传感器数据', '6#通道传感器数据'], inputData: [], + loading:null, } }, - mounted() { + mounted() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.dataInit() //input获取焦点后全选 let inputList = document.querySelectorAll('input'); @@ -137,6 +144,7 @@ export default { regNum: 3, }; this.api.postReg(data).then((res) => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 1076a68..46540c1 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -380,6 +380,7 @@ export default { actList4: [], actList5: [], indexs: 1, + loading:null, } }, watch: { @@ -391,6 +392,12 @@ export default { mounted() { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); setTimeout(() => { that.dataInit(); }, 0); @@ -626,6 +633,7 @@ export default { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; this.api.fanwetcurtain(data).then(res => { + this.loading.close() if (res.data.code == 200) { this.inputData = res.data.data; this.inputData[21958]=this.countData(this.inputData[21958])