diff --git a/src/api/index.js b/src/api/index.js index 5763594..452b295 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -577,7 +577,14 @@ addpermissionall(equipmentId, data) { addDevice(data){ return sendPostRequest(`/admin/addDevice`, data) }, - +//查询施肥级ICCID +getFsIccid(data){ + return sendGetRequest(`/readControl/getFsIccid`, data) +}, +//查询控制器权限 +getIccid(data){ + return sendGetRequest(`/readControl/getIccid`, data) +}, //二维码溯源 //查看农事作物信息 getAgriculturalInformation(data) { diff --git a/src/assets/css/main.css b/src/assets/css/main.css index f6fed57..62ebf30 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -714,6 +714,42 @@ color: #859BB6; } +.input-main-one { + width: 100%; + flex-wrap: wrap; + display: flex; + align-items: center; +} + +.input-main-one.table-input { + justify-content: center; +} + +.input-main-one.table-input > span { + color: #FF9191; +} + +.input-main-one span { + padding: 0 10px; +} + +.input-main-one input { + width: 300px; + height: 44px; + background: rgba(0, 186, 255, 0.15); + border: 2px solid rgba(0, 186, 255, 0.4); + font-size: 16px; + font-family: Microsoft YaHei; + font-weight: 400; + color: #fff; + margin: 5px 5px; + text-align: center; +} + +.input-main-one input::placeholder { + color: #859BB6; +} + .outline { color: red; font-weight: bold; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 248b62e..03efe09 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -768,7 +768,42 @@ } } } +.input-main-one{ + width: 100%; + flex-wrap: wrap; + display: flex; + align-items: center; + &.table-input { + justify-content: center; + + >span { + color: #FF9191; + } + } + + span { + padding: 0 10px; + } + + input { + width:300px; + height: 44px; + background: rgba(0, 186, 255, 0.15); + border: 2px solid rgba(0, 186, 255, 0.40); + // padding-left: 15px; + font-size: 16px; + font-family: Microsoft YaHei; + font-weight: 400; + color: #fff; + margin: 5px 5px; + text-align: center; + + &::placeholder { + color: #859BB6; + } + } +} .outline { color: red; font-weight: bold; diff --git a/src/views/page/systemSet-con.vue b/src/views/page/systemSet-con.vue index 3438797..9218c56 100644 --- a/src/views/page/systemSet-con.vue +++ b/src/views/page/systemSet-con.vue @@ -6,19 +6,19 @@
软件版本号 - +
控制器状况 - +
控制器剩余使用时间 - +
@@ -26,29 +26,29 @@
信号质量 -
SIM -
4G -

IP - - - -
@@ -57,27 +57,31 @@
ICCID - - - - - - - - - -
+
+ ICCID + +
说明:4G:=0,无网络;=2,2G网络;=4,4G网络
SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)
@@ -96,6 +100,7 @@ export default { return { inputData: [], loading:null, + ICCID:'', } }, watch: { @@ -163,6 +168,13 @@ this.dataInit(); this.$message.error(res.data.msg); } }); + this.api.getIccid(data).then(res=>{ + if(res.data.code==200){ + this.ICCID=res.data.msg + }else{ + this.$message.error(res.data.msg); + } + }) }, getType(index) { if (index == 0) { diff --git a/src/views/page/systemSet.vue b/src/views/page/systemSet.vue index 32d53ce..93ced55 100644 --- a/src/views/page/systemSet.vue +++ b/src/views/page/systemSet.vue @@ -8,58 +8,62 @@
软件版本号 - +
施肥机状况 - +
施肥机剩余使用时间 - +
信号质量 - +
SIM - +
4G - +

IP - - - - + + + +
ICCID - - - - - - - - - - + + + + + + + + + + +
+
+ ICCID +
说明:4G:=0,无网络;=2,2G网络;=4,4G网络
@@ -80,6 +84,7 @@ export default { return { inputData: [], loading:null, + ICCID:'' } }, @@ -144,6 +149,16 @@ export default { this.$message.error(res.data.msg); } }); + var data1 = { + deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, + }; + this.api.getFsIccid(data1).then(res=>{ + if(res.data.code==200){ + this.ICCID=res.data.msg + }else{ + this.$message.error(res.data.msg); + } + }) }, getType(index) { if (index == 0) { @@ -205,21 +220,21 @@ export default { // }, 100); }, changeData(data) { - var store = this.$store.state - this.api.postWriteFs(data).then((res) => { - if (res.data.code == 200) { - this.$message({ - message: res.data.msg, - type: "success", - }); - store.nowInput='' - // this.dataInit(); - } else { - this.inputData[data.regAddress]=store.nowInput - this.$message.error(res.data.msg); - } - this.timer = null - }); + // var store = this.$store.state + // this.api.postWriteFs(data).then((res) => { + // if (res.data.code == 200) { + // this.$message({ + // message: res.data.msg, + // type: "success", + // }); + // store.nowInput='' + // // this.dataInit(); + // } else { + // this.inputData[data.regAddress]=store.nowInput + // this.$message.error(res.data.msg); + // } + // this.timer = null + // }); }, },