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

Merge pull request '1' (#156) from pc-master into portal 

Reviewed-on: #156
portal
xiaomeng 2024-07-13 05:40:41 +00:00
parent 928c7c2fa0 5a1799cd67
commit 382eb9b968
5 changed files with 161 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/index.js
View File

@ -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) {

36
src/assets/css/main.css
View File

@ -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;

35
src/assets/css/main.scss
View File

@ -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;

52
src/views/page/systemSet-con.vue
View File

@ -6,19 +6,19 @@
<div class="flex-view border-none padding-none">
<div class="input-main-80" style="width: auto;">
<span>软件版本号</span>
<input v-model="inputData['1163']" disabled type="text" placeholder="0">
<input disabled v-model="inputData['1163']" type="text" placeholder="0">
<span></span>
</div>
<div class="input-main">
<span>控制器状况</span>
<input v-model="inputData['1164']" disabled type="text" placeholder="0">
<input disabled v-model="inputData['1164']" type="text" placeholder="0">
<span></span>
</div>
<div class="input-main-80" style="width: auto;">
<span>控制器剩余使用时间</span>
<input v-model="inputData['1165']" disabled type="text" placeholder="0">
<input disabled v-model="inputData['1165']" type="text" placeholder="0">
<span>天</span>
</div>
</div>
@ -26,29 +26,29 @@
<div class="input-main">
<span>信号质量</span>
<input @blur="blurChange('1061', $event)" v-model="inputData['1061']" @input="change('1061', $event)"
<input disabled @blur="blurChange('1061', $event)" v-model="inputData['1061']" @input="change('1061', $event)"
type="number" placeholder="0">
</div>
<div class="input-main">
<span>SIM</span>
<input @blur="blurChange('1062', $event)" v-model="inputData['1062']" @input="change('1062', $event)"
<input disabled @blur="blurChange('1062', $event)" v-model="inputData['1062']" @input="change('1062', $event)"
type="number" placeholder="0">
</div>
<div class="input-main">
<span>4G</span>
<input @blur="blurChange('1063', $event)" v-model="inputData['1063']" @input="change('1063', $event)"
<input disabled @blur="blurChange('1063', $event)" v-model="inputData['1063']" @input="change('1063', $event)"
type="number" placeholder="0">
</div>
<br>
<div class="input-main-80" style="width: 100%;">
<span>IP</span>
<input @blur="blurChange('1064', $event)" v-model="inputData['1064']" @input="change('1064', $event)"
<input disabled @blur="blurChange('1064', $event)" v-model="inputData['1064']" @input="change('1064', $event)"
type="number" placeholder="0">
<input @blur="blurChange('1065', $event)" v-model="inputData['1065']" @input="change('1065', $event)"
<input disabled @blur="blurChange('1065', $event)" v-model="inputData['1065']" @input="change('1065', $event)"
type="number" placeholder="0">
<input @blur="blurChange('1066', $event)" v-model="inputData['1066']" @input="change('1066', $event)"
<input disabled @blur="blurChange('1066', $event)" v-model="inputData['1066']" @input="change('1066', $event)"
type="number" placeholder="0">
<input @blur="blurChange('1067', $event)" v-model="inputData['1067']" @input="change('1067', $event)"
<input disabled @blur="blurChange('1067', $event)" v-model="inputData['1067']" @input="change('1067', $event)"
type="number" placeholder="0">
</div>
@ -57,26 +57,30 @@
<div class="input-main-80">
<span>ICCID</span>
<input @blur="blurChange('1051', $event)" v-model="inputData['1051']" @input="change16to10('1051', $event)"
<input disabled @blur="blurChange('1051', $event)" v-model="inputData['1051']" @input="change16to10('1051', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1052', $event)" v-model="inputData['1052']" @input="change16to10('1052', $event)"
<input disabled @blur="blurChange('1052', $event)" v-model="inputData['1052']" @input="change16to10('1052', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1053', $event)" v-model="inputData['1053']" @input="change16to10('1053', $event)"
<input disabled @blur="blurChange('1053', $event)" v-model="inputData['1053']" @input="change16to10('1053', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1054', $event)" v-model="inputData['1054']" @input="change16to10('1054', $event)"
<input disabled @blur="blurChange('1054', $event)" v-model="inputData['1054']" @input="change16to10('1054', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1055', $event)" v-model="inputData['1055']" @input="change16to10('1055', $event)"
<input disabled @blur="blurChange('1055', $event)" v-model="inputData['1055']" @input="change16to10('1055', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1056', $event)" v-model="inputData['1056']" @input="change16to10('1056', $event)"
<input disabled @blur="blurChange('1056', $event)" v-model="inputData['1056']" @input="change16to10('1056', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1057', $event)" v-model="inputData['1057']" @input="change16to10('1057', $event)"
<input disabled @blur="blurChange('1057', $event)" v-model="inputData['1057']" @input="change16to10('1057', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1058', $event)" v-model="inputData['1058']" @input="change16to10('1058', $event)"
<input disabled @blur="blurChange('1058', $event)" v-model="inputData['1058']" @input="change16to10('1058', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1059', $event)" v-model="inputData['1059']" @input="change16to10('1059', $event)"
<input disabled @blur="blurChange('1059', $event)" v-model="inputData['1059']" @input="change16to10('1059', $event)"
type="text" placeholder="0">
<input @blur="blurChange('1060', $event)" v-model="inputData['1060']" @input="change16to10('1060', $event)"
<input disabled @blur="blurChange('1060', $event)" v-model="inputData['1060']" @input="change16to10('1060', $event)"
type="text" placeholder="0">
</div>
<div class="input-main-one">
<span>ICCID</span>
<input disabled v-model="ICCID" type="text" placeholder="0" />
</div>
<div class="system-tips">
说明:4G:=0,无网络;=2,2G网络;=4,4G网络 <br>
@ -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) {

85
src/views/page/systemSet.vue
View File

@ -8,58 +8,62 @@
<div class="flex-view border-none padding-none">
<div class="input-main-80" style="width: auto;">
<span>软件版本号</span>
<input v-model="inputData['76']" disabled type="text" placeholder="0">
<input disabled v-model="inputData['76']" type="text" placeholder="0">
<span></span>
</div>
<div class="input-main">
<span>施肥机状况</span>
<input v-model="inputData['77']" disabled type="text" placeholder="0">
<input disabled v-model="inputData['77']" type="text" placeholder="0">
<span></span>
</div>
<div class="input-main-80" style="width: auto;">
<span>施肥机剩余使用时间</span>
<input v-model="inputData['78']" disabled type="text" placeholder="0">
<input disabled v-model="inputData['78']" type="text" placeholder="0">
<span>天</span>
</div>
</div>
<div class="flex-view">
<div class="input-main">
<span>信号质量</span>
<input @blur="blurChange('65', $event)" v-model="inputData['65']" @input="change('65', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('65', $event)" v-model="inputData['65']" @input="change('65', $event)" type="number" placeholder="0">
</div>
<div class="input-main">
<span>SIM</span>
<input @blur="blurChange('66', $event)" v-model="inputData['66']" @input="change('66', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('66', $event)" v-model="inputData['66']" @input="change('66', $event)" type="number" placeholder="0">
</div>
<div class="input-main">
<span>4G</span>
<input @blur="blurChange('67', $event)" v-model="inputData['67']" @input="change('67', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('67', $event)" v-model="inputData['67']" @input="change('67', $event)" type="number" placeholder="0">
</div>
<br>
<div class="input-main-80" style="width: 100%;">
<span>IP</span>
<input @blur="blurChange('68', $event)" v-model="inputData['68']" @input="change('68', $event)" type="number" placeholder="0">
<input @blur="blurChange('69', $event)" v-model="inputData['69']" @input="change('69', $event)" type="number" placeholder="0">
<input @blur="blurChange('70', $event)" v-model="inputData['70']" @input="change('70', $event)" type="number" placeholder="0">
<input @blur="blurChange('71', $event)" v-model="inputData['71']" @input="change('71', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('68', $event)" v-model="inputData['68']" @input="change('68', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('69', $event)" v-model="inputData['69']" @input="change('69', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('70', $event)" v-model="inputData['70']" @input="change('70', $event)" type="number" placeholder="0">
<input disabled @blur="blurChange('71', $event)" v-model="inputData['71']" @input="change('71', $event)" type="number" placeholder="0">
</div>
</div>
<div class="flex-view" style="border: none;">
<div class="input-main-80">
<span>ICCID</span>
<input @blur="blurChange('55', $event)" v-model="inputData['55']" @input="change16to10('55', $event)" type="text" placeholder="0">
<input @blur="blurChange('56', $event)" v-model="inputData['56']" @input="change16to10('56', $event)" type="text" placeholder="0">
<input @blur="blurChange('57', $event)" v-model="inputData['57']" @input="change16to10('57', $event)" type="text" placeholder="0">
<input @blur="blurChange('58', $event)" v-model="inputData['58']" @input="change16to10('58', $event)" type="text" placeholder="0">
<input @blur="blurChange('59', $event)" v-model="inputData['59']" @input="change16to10('59', $event)" type="text" placeholder="0">
<input @blur="blurChange('60', $event)" v-model="inputData['60']" @input="change16to10('60', $event)" type="text" placeholder="0">
<input @blur="blurChange('61', $event)" v-model="inputData['61']" @input="change16to10('61', $event)" type="text" placeholder="0">
<input @blur="blurChange('62', $event)" v-model="inputData['62']" @input="change16to10('62', $event)" type="text" placeholder="0">
<input @blur="blurChange('63', $event)" v-model="inputData['63']" @input="change16to10('63', $event)" type="text" placeholder="0">
<input @blur="blurChange('64', $event)" v-model="inputData['64']" @input="change16to10('64', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('55', $event)" v-model="inputData['55']" @input="change16to10('55', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('56', $event)" v-model="inputData['56']" @input="change16to10('56', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('57', $event)" v-model="inputData['57']" @input="change16to10('57', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('58', $event)" v-model="inputData['58']" @input="change16to10('58', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('59', $event)" v-model="inputData['59']" @input="change16to10('59', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('60', $event)" v-model="inputData['60']" @input="change16to10('60', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('61', $event)" v-model="inputData['61']" @input="change16to10('61', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('62', $event)" v-model="inputData['62']" @input="change16to10('62', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('63', $event)" v-model="inputData['63']" @input="change16to10('63', $event)" type="text" placeholder="0">
<input disabled @blur="blurChange('64', $event)" v-model="inputData['64']" @input="change16to10('64', $event)" type="text" placeholder="0">
</div>
<div class="input-main-one">
<span>ICCID</span>
<input disabled v-model="ICCID" type="text" placeholder="0">
</div>
<div class="system-tips">
说明:4G:=0,无网络;=2,2G网络;=4,4G网络 <br>
@ -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
// });
},
},