Compare commits

..

No commits in common. "adad14e6184626845b9d25c96c694bee007429db" and "8261f38e9a3e79c21fd2441da4c6ee58893103c7" have entirely different histories.

7 changed files with 147 additions and 336 deletions

View File

@ -687,13 +687,5 @@ getIccid(data){
getFi_updateName(data){ getFi_updateName(data){
return sendPutRequest(`/getFi/updateName`, data) return sendPutRequest(`/getFi/updateName`, data)
}, },
//系统页面备忘录获取
readControl_getMemo(data){
return sendGetRequest(`/readControl/getMemo`, data)
},
//系统页面备忘录修改
readControl_setMemo(data){
return sendPostRequest(`/readControl/setMemo`, data)
},
}; };

View File

@ -116,10 +116,6 @@
max-height: 300px; max-height: 300px;
} }
textarea {
resize: none;
}
.border-none { .border-none {
border: none !important; border: none !important;
} }
@ -1380,12 +1376,6 @@ textarea {
color: #A8B6C8; color: #A8B6C8;
} }
.system-tips.system-textarea {
padding: 10px;
height: auto;
min-height: 101px;
}
.upload .upload-view { .upload .upload-view {
width: 520px; width: 520px;
height: 520px; height: 520px;

File diff suppressed because one or more lines are too long

View File

@ -118,9 +118,7 @@
max-height: 300px; max-height: 300px;
@extend .scroll; @extend .scroll;
} }
textarea{
resize: none;
}
.border-none { .border-none {
border: none !important; border: none !important;
} }
@ -1438,11 +1436,6 @@ textarea{
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #A8B6C8; color: #A8B6C8;
&.system-textarea{
padding: 10px;
height: auto;
min-height: 101px;
}
} }
.upload { .upload {

View File

@ -94,12 +94,6 @@
SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br> SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br>
信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31. 信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31.
</div> </div>
<div class="input-main">
<span>备忘录</span>
</div>
<textarea v-model="memoDetail.memo" @blur="blurMemo()" placeholder="备忘录"
class="system-tips system-textarea" maxlength="1200">
</textarea>
</div> </div>
</div> </div>
</template> </template>
@ -114,9 +108,6 @@ export default {
inputData: [], inputData: [],
loading:null, loading:null,
ICCID:'', ICCID:'',
memoDetail: {
memo: ''
},
} }
}, },
watch: { watch: {
@ -258,29 +249,6 @@ this.dataInit();
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }
}) })
this.getMemo()
},
getMemo() {
var store = this.$store.state
var data1 = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
};
this.api.readControl_getMemo(data1).then(res => {
if (res.data.code == 200) {
if (res.data.data) {
this.memoDetail = res.data.data
} else {
this.memoDetail = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
id: "",
memo: "",
}
}
} else {
// this.$message.error(res.data.msg);
}
})
}, },
getType(index) { getType(index) {
if (index == 0) { if (index == 0) {
@ -292,23 +260,6 @@ getMemo() {
} else { } else {
return ' ' return ' '
} }
},
//
blurMemo() {
var data = this.memoDetail
this.api.readControl_setMemo(data).then(res => {
if (res.data.code == 200) {
this.$message({
message: res.data.msg,
type: "success",
});
if(!data.id){
this.getMemo()
}
} else {
this.$message.error(res.data.msg);
}
})
}, },
// //
selectValue(e) { selectValue(e) {

View File

@ -75,12 +75,6 @@
SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br> SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br>
信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31. 信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31.
</div> </div>
<div class="input-main">
<span>备忘录</span>
</div>
<textarea v-model="memoDetail.memo" @blur="blurMemo()" placeholder="备忘录"
class="system-tips system-textarea" maxlength="1200">
</textarea>
</div> </div>
</div> </div>
</template> </template>
@ -90,11 +84,7 @@ export default {
return { return {
inputData: [], inputData: [],
loading:null, loading:null,
ICCID:'', ICCID:''
memoDetail: {
memo: ''
},
} }
}, },
@ -231,29 +221,6 @@ export default {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }
}) })
this.getMemo()
},
getMemo() {
var store = this.$store.state
var data1 = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
};
this.api.readControl_getMemo(data1).then(res => {
if (res.data.code == 200) {
if (res.data.data) {
this.memoDetail = res.data.data
} else {
this.memoDetail = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
id: "",
memo: "",
}
}
} else {
// this.$message.error(res.data.msg);
}
})
}, },
getType(index) { getType(index) {
if (index == 0) { if (index == 0) {
@ -266,23 +233,6 @@ export default {
return ' ' return ' '
} }
}, },
//
blurMemo() {
var data = this.memoDetail
this.api.readControl_setMemo(data).then(res => {
if (res.data.code == 200) {
this.$message({
message: res.data.msg,
type: "success",
});
if(!data.id){
this.getMemo()
}
} else {
this.$message.error(res.data.msg);
}
})
},
// //
selectValue(e) { selectValue(e) {
var store = this.$store.state var store = this.$store.state

View File

@ -7,8 +7,7 @@
<div class="export-btn">导入设定值</div> <div class="export-btn">导入设定值</div>
</label> </label>
<div class="export-btn" @click="downLoadData"></div> <div class="export-btn" @click="downLoadData"></div>
<input ref="fileInput" style="display: none" multiple id="upInput" type="file" accept=".txt" <input ref="fileInput" style="display: none" multiple id="upInput" type="file" accept=".txt" @change="changeTxt" />
@change="changeTxt" />
</div> </div>
<div class="table-title"> <div class="table-title">
<img src="../../assets/image/system.png" alt=""> 系统参数设置 <img src="../../assets/image/system.png" alt=""> 系统参数设置
@ -35,56 +34,39 @@
<div class="flex-view"> <div class="flex-view">
<div class="input-main"> <div class="input-main">
<span>信号质量</span> <span>信号质量</span>
<input disabled @blur="blurChange('65', $event)" v-model="inputData['65']" <input disabled @blur="blurChange('65', $event)" v-model="inputData['65']" @input="change('65', $event)" type="number" placeholder="0">
@input="change('65', $event)" type="number" placeholder="0">
</div> </div>
<div class="input-main"> <div class="input-main">
<span>SIM</span> <span>SIM</span>
<input disabled @blur="blurChange('66', $event)" v-model="inputData['66']" <input disabled @blur="blurChange('66', $event)" v-model="inputData['66']" @input="change('66', $event)" type="number" placeholder="0">
@input="change('66', $event)" type="number" placeholder="0">
</div> </div>
<div class="input-main"> <div class="input-main">
<span>4G</span> <span>4G</span>
<input disabled @blur="blurChange('67', $event)" v-model="inputData['67']" <input disabled @blur="blurChange('67', $event)" v-model="inputData['67']" @input="change('67', $event)" type="number" placeholder="0">
@input="change('67', $event)" type="number" placeholder="0">
</div> </div>
<br> <br>
<div class="input-main-80" style="width: 100%;"> <div class="input-main-80" style="width: 100%;">
<span>IP</span> <span>IP</span>
<input disabled @blur="blurChange('68', $event)" v-model="inputData['68']" <input disabled @blur="blurChange('68', $event)" v-model="inputData['68']" @input="change('68', $event)" type="number" placeholder="0">
@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('69', $event)" v-model="inputData['69']" <input disabled @blur="blurChange('70', $event)" v-model="inputData['70']" @input="change('70', $event)" type="number" placeholder="0">
@input="change('69', $event)" type="number" placeholder="0"> <input disabled @blur="blurChange('71', $event)" v-model="inputData['71']" @input="change('71', $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> </div>
<div class="flex-view" style="border: none;"> <div class="flex-view" style="border: none;">
<div class="input-main-80"> <div class="input-main-80">
<span>ICCID</span> <span>ICCID</span>
<input disabled @blur="blurChange('55', $event)" v-model="inputData['55']" <input disabled @blur="blurChange('55', $event)" v-model="inputData['55']" @input="change16to10('55', $event)" type="text" placeholder="0">
@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('56', $event)" v-model="inputData['56']" <input disabled @blur="blurChange('57', $event)" v-model="inputData['57']" @input="change16to10('57', $event)" type="text" placeholder="0">
@input="change16to10('56', $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('57', $event)" v-model="inputData['57']" <input disabled @blur="blurChange('59', $event)" v-model="inputData['59']" @input="change16to10('59', $event)" type="text" placeholder="0">
@input="change16to10('57', $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('58', $event)" v-model="inputData['58']" <input disabled @blur="blurChange('61', $event)" v-model="inputData['61']" @input="change16to10('61', $event)" type="text" placeholder="0">
@input="change16to10('58', $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('59', $event)" v-model="inputData['59']" <input disabled @blur="blurChange('63', $event)" v-model="inputData['63']" @input="change16to10('63', $event)" type="text" placeholder="0">
@input="change16to10('59', $event)" type="text" placeholder="0"> <input disabled @blur="blurChange('64', $event)" v-model="inputData['64']" @input="change16to10('64', $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>
<div class="input-main-one"> <div class="input-main-one">
<span>ICCID</span> <span>ICCID</span>
@ -95,12 +77,6 @@
SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br> SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br>
信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31. 信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31.
</div> </div>
<div class="input-main">
<span>备忘录</span>
</div>
<textarea v-model="memoDetail.memo" @blur="blurMemo()" placeholder="备忘录"
class="system-tips system-textarea" maxlength="1200">
</textarea>
</div> </div>
</div> </div>
</div> </div>
@ -115,11 +91,7 @@ export default {
return { return {
inputData: [], inputData: [],
loading:null, loading:null,
ICCID: '', ICCID:''
memoDetail: {
memo: ''
},
} }
}, },
@ -261,29 +233,6 @@ export default {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }
}) })
this.getMemo()
},
getMemo() {
var store = this.$store.state
var data1 = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
};
this.api.readControl_getMemo(data1).then(res => {
if (res.data.code == 200) {
if (res.data.data) {
this.memoDetail = res.data.data
} else {
this.memoDetail = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
id: "",
memo: "",
}
}
} else {
// this.$message.error(res.data.msg);
}
})
}, },
getType(index) { getType(index) {
if (index == 0) { if (index == 0) {
@ -296,23 +245,6 @@ export default {
return ' ' return ' '
} }
}, },
//
blurMemo() {
var data = this.memoDetail
this.api.readControl_setMemo(data).then(res => {
if (res.data.code == 200) {
this.$message({
message: res.data.msg,
type: "success",
});
if(!data.id){
this.getMemo()
}
} else {
this.$message.error(res.data.msg);
}
})
},
// //
selectValue(e) { selectValue(e) {
var store = this.$store.state var store = this.$store.state
@ -382,4 +314,7 @@ export default {
} }
</script> </script>
<style lang="scss"></style> <style lang="scss">
</style>