From a3d4c5d62a032d83ae5e8d2cc4e7bf902a8d3361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 8 Apr 2024 10:34:00 +0800 Subject: [PATCH 1/4] 1 --- src/views/page/wetFan.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 46540c1..4667112 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -219,6 +219,9 @@ 湿帘水泵1:
+
+ 无效 +
自动运行
@@ -228,6 +231,7 @@
手动关闭
+
@@ -244,6 +248,9 @@ 湿帘水泵2:
+
+ 无效 +
自动运行
From da8d754fed1280f2ac8c6542abb5d01d57c32add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Wed, 10 Apr 2024 14:39:28 +0800 Subject: [PATCH 2/4] 1 --- src/views/page/intrinsicParameter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue index 4528ffc..1786026 100644 --- a/src/views/page/intrinsicParameter.vue +++ b/src/views/page/intrinsicParameter.vue @@ -514,7 +514,7 @@ type="text" placeholder="0">
-
请输入密码
From 986a261270663976dbc71e6d37601769e0cfc3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Thu, 11 Apr 2024 08:54:13 +0800 Subject: [PATCH 3/4] 1 --- src/components/setParamsControl.vue | 16 ++++++++++------ src/views/page/targetTemperature.vue | 20 ++++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/components/setParamsControl.vue b/src/components/setParamsControl.vue index 14754cc..f4e3b10 100644 --- a/src/components/setParamsControl.vue +++ b/src/components/setParamsControl.vue @@ -54,12 +54,7 @@ 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(); } }, @@ -86,6 +81,12 @@ export default { } }, 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 = store.equipmentList[store.equipmentIndex - 1].deviceId; this.api.getcontrol_cpermission(data).then((res) => { @@ -338,6 +339,9 @@ export default { if (router.token && router.userid) { return } + if(this.$route.name==this.routerList[0].router){ + return + } this.$router.push({ path: `/${this.routerList[0].router}` }); diff --git a/src/views/page/targetTemperature.vue b/src/views/page/targetTemperature.vue index fe41193..086775d 100644 --- a/src/views/page/targetTemperature.vue +++ b/src/views/page/targetTemperature.vue @@ -205,14 +205,16 @@ export default { loading:null, } }, + watch: { + + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); + }, + }, + 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); @@ -292,6 +294,12 @@ 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, From de7602f17c5f2ee89cf9b2eb8f116e402cd98b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Thu, 11 Apr 2024 09:04:03 +0800 Subject: [PATCH 4/4] 1 --- src/views/page/LED.vue | 16 ++++++++++------ src/views/page/alarmSettings.vue | 18 ++++++++++++------ src/views/page/circulationCan.vue | 16 ++++++++++------ src/views/page/coercionMist.vue | 16 ++++++++++------ src/views/page/electromagneticControl.vue | 23 +++++++++++------------ src/views/page/forceOutput.vue | 19 +++++++++++++------ src/views/page/insizeSunshade.vue | 16 ++++++++++------ src/views/page/internalInsulation.vue | 16 ++++++++++------ src/views/page/intrinsicParameter.vue | 19 +++++++++++++------ src/views/page/outsizeSunshade.vue | 16 ++++++++++------ src/views/page/parameterSet.vue | 19 +++++++++++++------ src/views/page/sunroofControl.vue | 16 ++++++++++------ src/views/page/synthesis-con.vue | 18 ++++++++++++------ src/views/page/systemSet-con.vue | 19 +++++++++++++------ src/views/page/upload-con.vue | 18 ++++++++++++------ src/views/page/wetFan.vue | 16 ++++++++++------ 16 files changed, 179 insertions(+), 102 deletions(-) diff --git a/src/views/page/LED.vue b/src/views/page/LED.vue index a626fd0..99f8a4f 100644 --- a/src/views/page/LED.vue +++ b/src/views/page/LED.vue @@ -306,16 +306,14 @@ export default { that.getActive1(); }, 0); }, +'$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -565,6 +563,12 @@ export default { this.changeBtn(21400, dataNum); }, 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, diff --git a/src/views/page/alarmSettings.vue b/src/views/page/alarmSettings.vue index fc98cd0..803749f 100644 --- a/src/views/page/alarmSettings.vue +++ b/src/views/page/alarmSettings.vue @@ -319,14 +319,14 @@ export default { loading:null, } }, + watch:{ + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, + }, 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); @@ -489,6 +489,12 @@ export default { this.changeBtn(code, dataNum); }, 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, diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index c067daa..b9f456a 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -154,16 +154,14 @@ export default { that.getActive1(); }, 0); }, +'$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -280,6 +278,12 @@ export default { this.changeBtn(this.startList[this.indexs - 1], dataNum); }, 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, diff --git a/src/views/page/coercionMist.vue b/src/views/page/coercionMist.vue index 0fc9b01..df4e9fd 100644 --- a/src/views/page/coercionMist.vue +++ b/src/views/page/coercionMist.vue @@ -93,16 +93,14 @@ export default { that.getActive1(); }, 0); }, + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -219,6 +217,12 @@ export default { this.changeBtn(this.startList[this.indexs - 1], dataNum); }, 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, diff --git a/src/views/page/electromagneticControl.vue b/src/views/page/electromagneticControl.vue index a8e1bda..8040c2f 100644 --- a/src/views/page/electromagneticControl.vue +++ b/src/views/page/electromagneticControl.vue @@ -186,26 +186,19 @@ 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); }, + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -296,6 +289,12 @@ export default { this.changeBtn(this.startList[this.indexs - 1], dataNum); }, 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, diff --git a/src/views/page/forceOutput.vue b/src/views/page/forceOutput.vue index 52106d7..396978e 100644 --- a/src/views/page/forceOutput.vue +++ b/src/views/page/forceOutput.vue @@ -38,13 +38,14 @@ loading:null, } }, + watch: { + + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, + }, mounted(){ - this.loading = this.$loading({ - lock: true, - text: '加载中', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + this.dataInit() }, methods:{ @@ -73,6 +74,12 @@ return list }, 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, diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index fd5631e..64f2f6e 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -173,16 +173,14 @@ export default { that.getActive1(); }, 0); }, + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -299,6 +297,12 @@ export default { this.changeBtn(this.startList[this.indexs - 1], dataNum); }, 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, diff --git a/src/views/page/internalInsulation.vue b/src/views/page/internalInsulation.vue index 0d2585e..7e531c8 100644 --- a/src/views/page/internalInsulation.vue +++ b/src/views/page/internalInsulation.vue @@ -120,17 +120,15 @@ export default { that.getActive1(); }, 0); }, + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, mounted() { 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获取焦点后全选 @@ -246,6 +244,12 @@ export default { this.changeBtn(this.startList[this.indexs - 1], dataNum); }, 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, diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue index 1786026..37a3802 100644 --- a/src/views/page/intrinsicParameter.vue +++ b/src/views/page/intrinsicParameter.vue @@ -567,13 +567,14 @@ export default { loading:null, } }, + watch: { + + '$store.state.equipmentIndex'(newVal, oldVal) { +this.dataInit(); +}, +}, 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'); @@ -655,6 +656,12 @@ modelConfirm(){ return name }, 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, diff --git a/src/views/page/outsizeSunshade.vue b/src/views/page/outsizeSunshade.vue index cbc8207..3dfa407 100644 --- a/src/views/page/outsizeSunshade.vue +++ b/src/views/page/outsizeSunshade.vue @@ -143,16 +143,14 @@ export default { that.getActive1(); }, 0); }, + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -269,6 +267,12 @@ export default { this.changeBtn(this.startList[this.indexs - 1], dataNum); }, 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, diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue index 15c165b..add23b7 100644 --- a/src/views/page/parameterSet.vue +++ b/src/views/page/parameterSet.vue @@ -686,13 +686,14 @@ export default { loading:null, } }, + watch: { + + '$store.state.equipmentIndex'(newVal, oldVal) { +this.dataInit(); +}, + }, 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'); @@ -739,6 +740,12 @@ export default { return name }, 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, diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index 2229c34..7686cbb 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -214,16 +214,14 @@ export default { that.getActive1(); }, 0); }, +'$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -341,6 +339,12 @@ export default { }, dataInit() { var store = this.$store.state + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); var data = { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; diff --git a/src/views/page/synthesis-con.vue b/src/views/page/synthesis-con.vue index 837e93c..72a8bfe 100644 --- a/src/views/page/synthesis-con.vue +++ b/src/views/page/synthesis-con.vue @@ -53,13 +53,13 @@ export default { } }, + watch:{ + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, + }, mounted() { - this.loading = this.$loading({ - lock: true, - text: '加载中', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + this.dataInit() }, methods: { @@ -81,6 +81,12 @@ export default { return list }, 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, diff --git a/src/views/page/systemSet-con.vue b/src/views/page/systemSet-con.vue index 724328d..3438797 100644 --- a/src/views/page/systemSet-con.vue +++ b/src/views/page/systemSet-con.vue @@ -98,13 +98,14 @@ export default { loading:null, } }, + watch: { + + '$store.state.equipmentIndex'(newVal, oldVal) { +this.dataInit(); +}, +}, 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'); @@ -132,6 +133,12 @@ export default { return data }, 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, diff --git a/src/views/page/upload-con.vue b/src/views/page/upload-con.vue index 8767060..bd59ef6 100644 --- a/src/views/page/upload-con.vue +++ b/src/views/page/upload-con.vue @@ -193,13 +193,13 @@ export default { } }, + watch:{ + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, + }, 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'); @@ -279,6 +279,12 @@ export default { }) }, dataInit() { + this.loading = this.$loading({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.actList1New = [] this.list1.forEach((el, index) => { this.actList1New.push('0') diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 4667112..8bb8afd 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -395,16 +395,14 @@ export default { const that = this; this.indexs = this.$route.query.id ? this.$route.query.id : 1; }, + '$store.state.equipmentIndex'(newVal, oldVal) { + this.dataInit(); +}, }, 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); @@ -635,6 +633,12 @@ export default { this.changeBtn(code, dataNum); }, 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,