xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:38ebb7e79b3e3dab2d27a3e4f9bf938ec40d6b66
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1
..
compare: xiaomeng:c4ab78acc02836fe670de9c02fbe10feffc90a93
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "38ebb7e79b3e3dab2d27a3e4f9bf938ec40d6b66" and "c4ab78acc02836fe670de9c02fbe10feffc90a93" have entirely different histories.
38ebb7e79b ... c4ab78acc0

14 changed files with 20 additions and 103 deletions
Show Stats Expand all files Collapse all files

8
src/components/setParamsControl.vue
View File

@ -107,7 +107,7 @@ export default {
var list = [
{ name: "目标温度", list: [], router: "targetTemperature", isRouter: true, index: 1 },
{ name: "目标湿度", list: [], router: "targetHumidity", isRouter: true, index: 2 },
{ name: "目标CO2", list: [], router: "targetCo2", isRouter: true, index: 3 }
{ name: "目标CO3", list: [], router: "targetCo2", isRouter: true, index: 3 }
]
let newList
if (el.child.length) {
@ -326,7 +326,7 @@ if (el.child.length) {
} else if (el.id == 22) {
this.routerList.push({ name: el.nickName, list: [], router: "parameterSet", isRouter: true });
} else if (el.id == 8) {
this.routerList.push(
{ id: el.id, sort: el.sort, name: "加热水泵", list: [], router: "waterPump", isRouter: true },
{
@ -473,7 +473,7 @@ if (el.child.length) {
if (item.router == this.routerNow && item.index == this.$route.query.id) {
return
}
this.$router.push({ path: `/${item.router}`,query:{id:item.index,name:item.name} })
this.$router.push({ path: `/${item.router}?id=${item.index}` })
return
}
@ -481,7 +481,7 @@ if (el.child.length) {
if (item.router == this.routerNow) {
return
}
this.$router.push({ name: item.router,query:{name:item.name} });
this.$router.push({ name: item.router });
}
}
},

9
src/views/page/LED.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="wetFan">
<div class="table-title">
<img src="../../assets/img/LED.png" alt="">{{pageName}}
<img src="../../assets/img/LED.png" alt="">补光灯
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -296,16 +296,12 @@ export default {
actList3: [],
startList:[21408,21413,21418,21423],
loading:null,
pageName:'补光灯'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -326,9 +322,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/circulationCan.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="circulationCan">
<div class="table-title">
<img src="../../assets/img/circulationCan.png" alt="">{{ pageName }}
<img src="../../assets/img/circulationCan.png" alt="">环流风扇{{ indexs }}
</div>
<div class="title-tips">工作方式选择
@ -144,16 +144,12 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'环流风扇'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -174,9 +170,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/coercionMist.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="coercionMist">
<div class="table-title">
<img src="../../assets/img/coercionMist.png" alt="">{{ pageName }}
<img src="../../assets/img/coercionMist.png" alt="">高压微雾{{ indexs }}
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -83,16 +83,12 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'高压微雾'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -113,9 +109,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

10
src/views/page/electromagneticControl.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="electromagneticControl">
<div class="table-title">
<img src="../../assets/img/electromagneticControl.png" alt="">{{ pageName }}
<img src="../../assets/img/electromagneticControl.png" alt="">{{ indexs }}#电磁阀
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -178,7 +178,6 @@ export default {
inputData: [],
typeList: [{ label: '间隔模式启动', value: 1, },
{ label: '土壤湿度传感器启动', value: 2, },],
pageName:'电磁阀',
loading:null,
}
@ -187,9 +186,7 @@ export default {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.dataInit();
}, 0);
@ -210,9 +207,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//二进制转换后的补全

9
src/views/page/facadeInsulation.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="internalInsulation">
<div class="table-title">
<img src="../../assets/img/internalInsulation.png" alt="">{{ pageName }}
<img src="../../assets/img/internalInsulation.png" alt="">立面保温{{ indexs }}
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -79,16 +79,12 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'立面保温'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -109,9 +105,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/insizeSunshade.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="insizeSunshade">
<div class="table-title">
<img src="../../assets/img/insizeSunshade.png" alt="">{{ pageName }}
<img src="../../assets/img/insizeSunshade.png" alt="">内遮阳{{ indexs }}
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -163,16 +163,12 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'内遮阳'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -193,9 +189,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/internalInsulation.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="internalInsulation">
<div class="table-title">
<img src="../../assets/img/internalInsulation.png" alt="">{{ pageName }}
<img src="../../assets/img/internalInsulation.png" alt="">内保温{{ indexs }}
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -110,16 +110,12 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'内保温'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -140,9 +136,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/outsizeSunshade.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="outsizeSunshade">
<div class="table-title">
<img src="../../assets/img/outsizeSunshade.png" alt="">{{pageName}}
<img src="../../assets/img/outsizeSunshade.png" alt="">外遮阳{{ indexs }}
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -133,16 +133,12 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'外遮阳',
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
@ -163,9 +159,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

12
src/views/page/sunroofControl.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="sunroofControl">
<div class="table-title">
<img src="../../assets/img/sunroofControl.png" alt="">{{pageName}}
<img src="../../assets/img/sunroofControl.png" alt="">通风窗{{indexs}}
</div>
<div class="title-tips">工作方式选择
<div class="input-btn">
@ -204,24 +204,19 @@ export default {
indexs: 1,
actList1: [],
loading:null,
pageName:'通风窗'
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
setTimeout(() => {
that.getActive1();
}, 0);
},
'$store.state.equipmentIndex'(newVal, oldVal) {
this.dataInit();
},
},
},
mounted() {
const that = this;
@ -235,9 +230,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

6
src/views/page/targetCo2.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="targetCo2">
<div class="table-title">
<img src="../../assets/img/targetCo2.png" alt="">{{ pageName }}
<img src="../../assets/img/targetCo2.png" alt="">目标CO2
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
@ -104,7 +104,6 @@
return {
inputData:[],
loading:null,
pageName:'目标CO2'
}
},
@ -124,9 +123,6 @@
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

6
src/views/page/targetHumidity.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="targetHumidity">
<div class="table-title">
<img src="../../assets/img/targetHumidity.png" alt="">{{pageName}}
<img src="../../assets/img/targetHumidity.png" alt="">目标湿度
</div>
<div class="title-tips-bold">
1#目标湿度参数配置
@ -202,7 +202,6 @@
return {
inputData:[],
loading:null,
pageName:'目标湿度'
}
},
@ -222,9 +221,6 @@
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/targetTemperature.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="targetTemperature">
<div class="table-title">
<img src="../../assets/img/targetTemperature.png" alt="">{{pageName}}
<img src="../../assets/img/targetTemperature.png" alt="">目标温度
</div>
<div class="title-tips-bold">
1#目标温度参数配置
@ -203,7 +203,6 @@ export default {
timer: null,
inputData: [],
loading:null,
pageName:'目标温度'
}
},
watch: {
@ -215,7 +214,7 @@ export default {
mounted() {
const that = this;
setTimeout(() => {
that.dataInit();
}, 0);
@ -224,10 +223,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
//失去焦点 计算公式 x/10

9
src/views/page/wetFan.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="wetFan">
<div class="table-title">
<img src="../../assets/img/wetFan.png" alt="">{{pageName}}
<img src="../../assets/img/wetFan.png" alt="">{{getName()}}
</div>
<template v-if="indexs==1">
@ -388,16 +388,12 @@ export default {
actList5: [],
indexs: 1,
loading:null,
pageName:'湿帘风机',
}
},
watch: {
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
'$store.state.equipmentIndex'(newVal, oldVal) {
this.dataInit();
@ -415,9 +411,6 @@ export default {
for (let index = 0; index < inputList.length; index++) {
inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
}
if(this.$route.query.name){
this.pageName=this.$route.query.name
}
},
methods: {
getName(){