diff --git a/FlowerGully/src/views/Equipment/components/interone.vue b/FlowerGully/src/views/Equipment/components/interone.vue
index 269b5cd52ce295ee3ba23a83b8cc258ec4bf697a..caa091d8f5d6bb16757492cb89998723dafb383f 100644
--- a/FlowerGully/src/views/Equipment/components/interone.vue
+++ b/FlowerGully/src/views/Equipment/components/interone.vue
@@ -2,7 +2,7 @@
同步
-
分配
+
添加
正常设备：342个
异常设备：21个
归属基地
@@ -11,8 +11,8 @@
设备状态
-
-
+
+
设备名称
@@ -31,9 +31,9 @@
- 编辑
+ 编辑
|
- 设备预警
+ 设备预警
@@ -42,29 +42,66 @@
@current-change="handleCurrentChange" :current-page="page.currentPage" :page-size="100"
layout="total, prev, pager, next, jumper" :total="page.total">
-
-
+
+
-
-
-
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+
+
+ 取消
+ 确认
+
@@ -73,6 +110,14 @@
export default {
data() {
return {
+ type: [{
+ value: 1,
+ label: '在线'
+ }, {
+ value: 2,
+ label: '离线'
+ }],
+ // 归属基地
options: [{
value: '选项1',
label: '黄金糕'
@@ -89,8 +134,27 @@ export default {
value: '选项5',
label: '北京烤鸭'
}],
+ // 归属大棚
+ options2: [{
+ value: '选项1',
+ label: '黄金糕'
+ }, {
+ value: '选项2',
+ label: '双皮奶'
+ }, {
+ value: '选项3',
+ label: '蚵仔煎'
+ }, {
+ value: '选项4',
+ label: '龙须面'
+ }, {
+ value: '选项5',
+ label: '北京烤鸭'
+ }],
value: '',
+ value2: '',
dialogRecording: false,
+ dialogRecording2: false,
tableData: [{
Productname: '监控',
lotnumber: '武功山智慧大棚',
@@ -98,13 +162,36 @@ export default {
manufactureDate: '1号',
printstate: 1,//打印状态
}],
+ formData: [{
+ type: '电导率',//属性
+ early: 0,//是否预警
+ unit: 'us/cm',//参数单位
+ range: '最大值：123 最小值：28.9',//预警范围
+ },
+ {
+ type: 'PH',//属性
+ early: 1,//是否预警
+ unit: 'PH',//参数单位
+ range: '最大值：13 最小值：0',//预警范围
+ },
+ {
+ type: '水质溶解氧',//属性
+ early: 1,//是否预警
+ unit: 'mg/L',//参数单位
+ range: '最大值：80 最小值：20',//预警范围
+ },
+ {
+ type: '水温',//属性
+ early: 1,//是否预警
+ unit: '℃',//参数单位
+ range: '最大值：40 最小值：0',//预警范围
+ }],
form: {
- Sourcecode: '16566611291258518',
- Scanaddress: '江西南昌',
- IPaddress: '172.16.123.221',
- terminal: '手机ios',
- Creationtime: '2022-06-30 14:46:09',
- Updatetime: '2022-06-30 14:46:09'
+ Productname: '监控', //设备名称
+ lotnumber: '武功山智慧大棚', //归属基地
+ Sourcecode: '大棚1号', //归属大棚
+ manufactureDate: '1号', //设备编号
+ printstate:1, //设备状态
},
page: {
currentPage: 1,
@@ -114,7 +201,16 @@ export default {
}
},
methods: {
- handleClick() {
+ changeEarly(scope) {
+ if (scope.row.early == 1) {
+ this.formData[scope.$index].early = 0
+ } else {
+ this.formData[scope.$index].early = 1
+ }
+ },
+ handleClick(row) {
+ const index = row.$index
+ this.form = this.tableData[index]
this.dialogRecording = true
},
handleSizeChange(val) {
@@ -146,7 +242,8 @@ export default {
color: orange;
font-size: 12px;
}
-span{
+
+span {
font-size: 12px;
}
@@ -154,4 +251,15 @@ span{
display: inline-block;
margin: 0 10px;
}
+
+.buttons {
+ display: flex;
+ justify-content: center;
+}
+
+.button {
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 10px;
+}
\ No newline at end of file
diff --git a/FlowerGully/src/views/Equipment/components/intertwo.vue b/FlowerGully/src/views/Equipment/components/intertwo.vue
index 0b7bce44e42b0f81bb112c14fd50c488049665ce..511be53c83f34537d2e98ae0ac834901b737439e 100644
--- a/FlowerGully/src/views/Equipment/components/intertwo.vue
+++ b/FlowerGully/src/views/Equipment/components/intertwo.vue
@@ -10,9 +10,9 @@
设备状态
-
-
+
设备名称
@@ -31,9 +31,9 @@
- 编辑
+ 编辑
|
- 设备预警
+ 设备预警
@@ -42,35 +42,66 @@
@current-change="handleCurrentChange" :current-page="page.currentPage" :page-size="100"
layout="total, prev, pager, next, jumper" :total="page.total">
-
-
+
+
-
-
-
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
-
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+
+
+ 取消
+ 确认
+
@@ -80,6 +111,13 @@
export default {
data() {
return {
+ type: [{
+ value: 1,
+ label: '在线'
+ }, {
+ value: 2,
+ label: '离线'
+ }],
options: [{
value: '选项1',
label: '黄金糕'
@@ -96,8 +134,27 @@ export default {
value: '选项5',
label: '北京烤鸭'
}],
+ // 归属大棚
+ options2: [{
+ value: '选项1',
+ label: '黄金糕'
+ }, {
+ value: '选项2',
+ label: '双皮奶'
+ }, {
+ value: '选项3',
+ label: '蚵仔煎'
+ }, {
+ value: '选项4',
+ label: '龙须面'
+ }, {
+ value: '选项5',
+ label: '北京烤鸭'
+ }],
value: '',
+ value2: '',
dialogRecording: false,
+ dialogRecording2: false,
tableData: [{
Productname: '监控',
lotnumber: '武功山智慧大棚',
@@ -105,13 +162,36 @@ export default {
manufactureDate: '1号',
printstate: 1,//打印状态
}],
+ formData: [{
+ type: '电导率',//属性
+ early: 0,//是否预警
+ unit: 'us/cm',//参数单位
+ range: '最大值：123 最小值：28.9',//预警范围
+ },
+ {
+ type: 'PH',//属性
+ early: 1,//是否预警
+ unit: 'PH',//参数单位
+ range: '最大值：13 最小值：0',//预警范围
+ },
+ {
+ type: '水质溶解氧',//属性
+ early: 1,//是否预警
+ unit: 'mg/L',//参数单位
+ range: '最大值：80 最小值：20',//预警范围
+ },
+ {
+ type: '水温',//属性
+ early: 1,//是否预警
+ unit: '℃',//参数单位
+ range: '最大值：40 最小值：0',//预警范围
+ }],
form: {
- Sourcecode: '16566611291258518',
- Scanaddress: '江西南昌',
- IPaddress: '172.16.123.221',
- terminal: '手机ios',
- Creationtime: '2022-06-30 14:46:09',
- Updatetime: '2022-06-30 14:46:09'
+ Productname: '', //设备名称
+ lotnumber: '', //归属基地
+ Sourcecode: '', //归属大棚
+ manufactureDate: '', //设备编号
+ printstate: null, //设备状态
},
page: {
currentPage: 1,
@@ -121,7 +201,16 @@ export default {
}
},
methods: {
- handleClick() {
+ changeEarly(scope) {
+ if (scope.row.early == 1) {
+ this.formData[scope.$index].early = 0
+ } else {
+ this.formData[scope.$index].early = 1
+ }
+ },
+ handleClick(row) {
+ const index = row.$index
+ this.form = this.tableData[index]
this.dialogRecording = true
},
handleSizeChange(val) {
@@ -153,7 +242,8 @@ export default {
color: orange;
font-size: 12px;
}
-span{
+
+span {
font-size: 12px;
}
@@ -161,4 +251,15 @@ span{
display: inline-block;
margin: 0 10px;
}
+
+.buttons {
+ display: flex;
+ justify-content: center;
+}
+
+.button {
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 10px;
+}
\ No newline at end of file