@@ -283,6 +311,7 @@ export default {
active: 0,
tableData: [],
tableData1: [],
+ tableData2: [],
addModel: false,
addModel1: false,
changeName: false,
@@ -298,12 +327,15 @@ export default {
this.api.selUserbyid(user.userid).then(res => {
this.tableData = []
this.tableData1 = []
+ this.tableData2 = []
if (res.data.code == 200) {
res.data.data.devices.forEach((el, index) => {
if (el.deviceName == 10) {
this.tableData1.push(el)
} else if (el.deviceName == 1) {
this.tableData.push(el)
+ } else if (el.deviceName == 20) {
+ this.tableData2.push(el)
}
})
}
diff --git a/src/views/manage/deviceManage.vue b/src/views/manage/deviceManage.vue
index 0c213f2..a7c0621 100644
--- a/src/views/manage/deviceManage.vue
+++ b/src/views/manage/deviceManage.vue
@@ -154,7 +154,10 @@ export default {
},
deviceType:'',
- deviceSel: [{ label: '控制器', value: 10, }, { label: '施肥机', value: 1, }, { label: '气象站', value:30, }],
+ deviceSel: [{ label: '控制器', value: 10, },
+ { label: '施肥机', value: 1, },
+ { label: '气象站', value:30, },
+ { label: '智能灌溉控制器', value:20, }],
}
},
mounted() { this.dataInit() },
diff --git a/src/views/manage/userInfoControl.vue b/src/views/manage/userInfoControl.vue
index e349653..b401ed8 100644
--- a/src/views/manage/userInfoControl.vue
+++ b/src/views/manage/userInfoControl.vue
@@ -225,7 +225,10 @@ export default {
typeSelList: [{ label: '管理员', value: 1, }, { label: '用户', value: 2, }],
deviceType:'',
- deviceSel: [{ label: '控制器', value: 10, }, { label: '施肥机', value: 1, }, { label: '气象站', value:30, }],
+ deviceSel: [{ label: '控制器', value: 10, },
+ { label: '施肥机', value: 1, },
+ { label: '气象站', value:30, },
+ { label: '智能灌溉控制器', value:20, }],
}
},
mounted() { this.dataInit() },
diff --git a/src/views/manage/weatherData.vue b/src/views/manage/weatherData.vue
index b2cef3f..e446fd8 100644
--- a/src/views/manage/weatherData.vue
+++ b/src/views/manage/weatherData.vue
@@ -99,7 +99,7 @@ export default {
this.tableData = res.data.data.equipments
this.typeSelList=[]
res.data.data.devices.forEach((el,index)=>{
- if(el.deviceName==10){
+ if(el.deviceName!=30){
this.typeSelList.push(el)
}
})