@@ -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)
}
})
diff --git a/src/views/page/formula.vue b/src/views/page/formula.vue
index 8e39b45..8b48c1a 100644
--- a/src/views/page/formula.vue
+++ b/src/views/page/formula.vue
@@ -40,7 +40,7 @@
-
+
+
+
+
设备固有参数
+
+
+
+
+
+ 请输入密码
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/page/irrigateSet-soil.vue b/src/views/page/irrigateSet-soil.vue
new file mode 100644
index 0000000..b43eab8
--- /dev/null
+++ b/src/views/page/irrigateSet-soil.vue
@@ -0,0 +1,985 @@
+
+
+
+
+ {{ this.indexs }}#智能灌溉组
+
+
+
+
+
+
+
+
+
+
+
+
+ 轮灌模式
+
+
+
+
+
+
+ {{ indexs }}#灌溉组控制参数配置
+
+
+
时间点启动
+
+
+ 每次灌溉时长
+
+ 分
+
+
+
+
+
+
返回
+
+
+
+
+
+ {{ indexs }}#灌溉组控制参数配置
+
+
+
间隔启动
+
+
+ 每次灌溉时长
+
+ 分
+
+
+
+
+
+
返回
+
+
+
+
+
+ {{ indexs }}#灌溉组控制参数配置
+
+
+
+
+
返回
+
+
+
+
+
+ {{ indexs }}#灌溉组控制参数配置
+
+
+
+
+
返回
+
+
+
+
+ {{ indexs }}#灌溉组控制参数配置
+
+
+
外控模式
+
+
+
+
+
+
+
+ {{ model4Sel == 1 ? '有效' : '无效' }}
+
+
外部数字量控制方式:
+
+
+
+
+
+
+
+ {{ model4Sel == 2 ? '有效' : '无效' }}
+
+
液位传感器控制方式:
+
+
+
+
+
+
+
返回
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index 89ce596..0f714a0 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -1170,7 +1170,7 @@ export default {
} else if (this.deviceName == 30) {
this.api.getControlRtDatastation(formData).then(res => {
this.controlList = []
- this.list = []
+ this.list = []
this.updateTime=res.data.data[0].updateTime
if (res.data.code == 200) {
res.data.data.forEach((el, index) => {
@@ -1211,6 +1211,72 @@ export default {
}
})
+ }else if(this.deviceName==20){
+ this.api.getFi_rtdata(formData).then(res=>{
+ if (res.data.code == 200) {
+ this.inputData = res.data.data;
+ this.list = []
+
+ this.updateTime=res.data.data[0].updateTime
+
+ this.inputData.forEach((el, index) => {
+ list.forEach((el1, index1) => {
+ if (el.formula == el1.value) {
+ var num = 0
+ var name = ''
+ if (el.equipmentStart == 0) {
+ num = '故障'
+ } else {
+ num = el.environmentData + el1.unit
+ }
+
+ if (el.targetValue == 1) {
+ if (el.equipmentNumber == 0) {
+ name = '目标' + el.environmentDataId
+ } else {
+ name = '目标' + el.equipmentNumber + '#' + el.environmentDataId
+ }
+ } else {
+ if (el.equipmentNumber == 0) {
+ name = '1#平均' + el.environmentDataId
+ } else if (el.equipmentNumber == 15) {
+ name = '2#平均' + el.environmentDataId
+ } else {
+ name = el.equipmentNumber + '#' + el.environmentDataId
+ }
+ }
+
+
+ this.list.push({
+ ...el,
+ name: name,
+ num: num,
+ img: require(`../../assets/image/real-time-${el.formula}.png`)
+
+ })
+
+ }
+ })
+ })
+ } else {
+ // this.$message.error(res.data.msg);
+ }
+ })
+ var nowDevice = store.equipmentList[this.indexs - 1]
+ // var data2 = {
+ // cameraid: nowDevice.cameraSerialNumber,
+ // channelid: nowDevice.cameraChannelNumber
+ // }
+ this.imgUrl = nowDevice.hls
+
+ this.api.chart_fidata(equipmentId).then(res=>{
+ if (res.data.code == 200) {
+ var chartsData = res.data.data
+ realTimeLine('realTime-line', chartsData, data1)
+ } else {
+ // this.$message.error(res.data.msg);
+ }
+ })
}
},
diff --git a/src/views/page/sensorSet-soil.vue b/src/views/page/sensorSet-soil.vue
new file mode 100644
index 0000000..28fdd09
--- /dev/null
+++ b/src/views/page/sensorSet-soil.vue
@@ -0,0 +1,498 @@
+
+
+
+
传感器配置界面
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/page/status-soil.vue b/src/views/page/status-soil.vue
new file mode 100644
index 0000000..63886e1
--- /dev/null
+++ b/src/views/page/status-soil.vue
@@ -0,0 +1,249 @@
+
+
+
+
{{
+ $store.state.equipmentList[$store.state.equipmentIndex - 1].deviceTypeName }}状态显示
+
+
+
+
+ {{ item.title }}
+
+ {{ item.unit }}
+
+
+
+
+
+
+
+ 进水泵
+
+
+
+
+
+ 土壤温湿度传感器数据
+
+
+
+
+
+ {{ index + 1 }}#土壤温度传感器
+
+
+
+
+
+
+
+ {{ index + 1 }}#土壤湿度传感器
+
+
+
+
+
+
+
+
+
diff --git a/src/views/page/systemSet-soil.vue b/src/views/page/systemSet-soil.vue
new file mode 100644
index 0000000..a902187
--- /dev/null
+++ b/src/views/page/systemSet-soil.vue
@@ -0,0 +1,308 @@
+
+
+
+
+
系统参数设置
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/page/upload-soil.vue b/src/views/page/upload-soil.vue
new file mode 100644
index 0000000..b5ef0f7
--- /dev/null
+++ b/src/views/page/upload-soil.vue
@@ -0,0 +1,288 @@
+
+
+
+
数据上传
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/soil.vue b/src/views/soil.vue
new file mode 100644
index 0000000..89d8c31
--- /dev/null
+++ b/src/views/soil.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file