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

Reviewed-on: #177

src/api/index.js

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

src/assets/css/main.css

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

src/assets/css/main.scss

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

src/views/page/systemSet-con.vue

@@ -94,6 +94,12 @@
                 SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br>
                 信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31.
             </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>
 </template>
@@ -108,6 +114,9 @@ export default {
             inputData: [],
       loading:null,
       ICCID:'',
+      memoDetail: {
+                memo: ''
+            },
         }
     },
     watch: {
@@ -249,7 +258,30 @@ this.dataInit();
                     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) {
             if (index == 0) {
                 return '控制器正常'
@@ -260,6 +292,23 @@ this.dataInit();
             } else {
                 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) {

src/views/page/systemSet-soil.vue

@@ -75,6 +75,12 @@
                     SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br>
                     信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31.
                 </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>
 </template>
@@ -84,7 +90,11 @@ export default {
         return {
             inputData: [],
           loading:null,
-          ICCID:''
+          ICCID:'',
+          
+          memoDetail: {
+                memo: ''
+            },
         }
     },
     
@@ -221,6 +231,29 @@ export default {
                     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) {
             if (index == 0) {
@@ -233,6 +266,23 @@ export default {
                 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) {
       var store = this.$store.state

src/views/page/systemSet.vue

@@ -7,7 +7,8 @@
                     <div class="export-btn">导入设定值</div>
                 </label>
                 <div class="export-btn" @click="downLoadData">导出设定值</div>
-                <input ref="fileInput" style="display: none" multiple id="upInput" type="file" accept=".txt" @change="changeTxt" />
+                <input ref="fileInput" style="display: none" multiple id="upInput" type="file" accept=".txt"
+                    @change="changeTxt" />
             </div>
             <div class="table-title">
                 <img src="../../assets/image/system.png" alt=""> 系统参数设置
@@ -34,39 +35,56 @@
             <div class="flex-view">
                 <div class="input-main">
                     <span>信号质量</span>
-                    <input disabled  @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 disabled @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 disabled @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 disabled @blur="blurChange('68', $event)" v-model="inputData['68']" @input="change('68', $event)" type="number" placeholder="0">
+                    <input disabled @blur="blurChange('68', $event)" v-model="inputData['68']"
-                    <input disabled @blur="blurChange('69', $event)" v-model="inputData['69']" @input="change('69', $event)" type="number" placeholder="0">
+                        @input="change('68', $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('69', $event)" v-model="inputData['69']"
-                    <input disabled @blur="blurChange('71', $event)" v-model="inputData['71']" @input="change('71', $event)" type="number" placeholder="0">
+                        @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 disabled @blur="blurChange('55', $event)" v-model="inputData['55']" @input="change16to10('55', $event)" type="text" placeholder="0">
+                    <input disabled @blur="blurChange('55', $event)" v-model="inputData['55']"
-                    <input disabled @blur="blurChange('56', $event)" v-model="inputData['56']" @input="change16to10('56', $event)" type="text" placeholder="0">
+                        @input="change16to10('55', $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('56', $event)" v-model="inputData['56']"
-                    <input disabled @blur="blurChange('58', $event)" v-model="inputData['58']" @input="change16to10('58', $event)" type="text" placeholder="0">
+                        @input="change16to10('56', $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('57', $event)" v-model="inputData['57']"
-                    <input disabled @blur="blurChange('60', $event)" v-model="inputData['60']" @input="change16to10('60', $event)" type="text" placeholder="0">
+                        @input="change16to10('57', $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('58', $event)" v-model="inputData['58']"
-                    <input disabled @blur="blurChange('62', $event)" v-model="inputData['62']" @input="change16to10('62', $event)" type="text" placeholder="0">
+                        @input="change16to10('58', $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('59', $event)" v-model="inputData['59']"
-                    <input disabled @blur="blurChange('64', $event)" v-model="inputData['64']" @input="change16to10('64', $event)" type="text" placeholder="0">
+                        @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>
@@ -77,6 +95,12 @@
                     SIM:=0,SIM卡正常;=1,无SIM卡;=2,SIM卡异常(网络注册失败)<br>
                     信号质量:CSQ&lt;11 信号很差;11&lt;CSQ&lt;18,信号不稳定;CSQ&gt;18,信号稳定,最大是31.
                 </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>
@@ -90,8 +114,12 @@ export default {
     data() {
         return {
             inputData: [],
-          loading:null,
+            loading: null,
-          ICCID:''
+            ICCID: '',
+
+            memoDetail: {
+                memo: ''
+            },
         }
     },
 
@@ -120,13 +148,13 @@ export default {
             });
             var store = this.$store.state
             var index = store.equipmentIndex;
-            var devicecode=store.equipmentList[index - 1].deviceId
+            var devicecode = store.equipmentList[index - 1].deviceId
             this.api.FsdataReadValuedownload(devicecode).then(res => {
                 // 创建一个blob对象
                 this.loading.close()
-                console.log(res,111);
+                console.log(res, 111);
                 const blob = new Blob([res.data], { type: 'text/txt' });
-                console.log(blob,111);
+                console.log(blob, 111);
                 // 创建一个a标签
                 const url = window.URL.createObjectURL(blob);
                 const link = document.createElement('a');
@@ -153,7 +181,7 @@ export default {
                 background: 'rgba(0, 0, 0, 0.7)'
             });
             var store = this.$store.state
-            var deviceId=store.equipmentList[store.equipmentIndex - 1].deviceId
+            var deviceId = store.equipmentList[store.equipmentIndex - 1].deviceId
 
             const files = e.target.files
 
@@ -168,7 +196,7 @@ export default {
                     this.loading.close()
                     if (res.data.code == 200) {
                         this.$message.success(res.data.msg);
-          }else{
+                    } else {
                         this.$message.error(res.data.msg);
                     }
                 })
@@ -177,21 +205,21 @@ export default {
                 this.$refs.fileInput.value = ''
             }, 100)
         },
-        change16to10(code,el){
+        change16to10(code, el) {
-            var num=parseInt(el.target.value,16)
+            var num = parseInt(el.target.value, 16)
-            var dataNum={
+            var dataNum = {
-                target:{
+                target: {
-                    value:num
+                    value: num
                 }
             }
             this.change(code, dataNum)
         },
-        fliter2(string){
+        fliter2(string) {
-            var data=''
+            var data = ''
-            if(string.length<2){
+            if (string.length < 2) {
-                data='0'+string
+                data = '0' + string
-            }else{
+            } else {
-                data=string
+                data = string
             }
             return data
         },
@@ -207,16 +235,16 @@ export default {
                 this.loading.close()
                 if (res.data.code == 200) {
                     this.inputData = res.data.data;
-                    this.inputData['55']=  this.fliter2(this.inputData['55'].toString(16))
+                    this.inputData['55'] = this.fliter2(this.inputData['55'].toString(16))
-                    this.inputData['56']=  this.fliter2(this.inputData['56'].toString(16))
+                    this.inputData['56'] = this.fliter2(this.inputData['56'].toString(16))
-                    this.inputData['57']=  this.fliter2(this.inputData['57'].toString(16))
+                    this.inputData['57'] = this.fliter2(this.inputData['57'].toString(16))
-                    this.inputData['58']=  this.fliter2(this.inputData['58'].toString(16))
+                    this.inputData['58'] = this.fliter2(this.inputData['58'].toString(16))
-                    this.inputData['59']=  this.fliter2(this.inputData['59'].toString(16))
+                    this.inputData['59'] = this.fliter2(this.inputData['59'].toString(16))
-                    this.inputData['60']=  this.fliter2(this.inputData['60'].toString(16))
+                    this.inputData['60'] = this.fliter2(this.inputData['60'].toString(16))
-                    this.inputData['61']=  this.fliter2(this.inputData['61'].toString(16))
+                    this.inputData['61'] = this.fliter2(this.inputData['61'].toString(16))
-                    this.inputData['62']=  this.fliter2(this.inputData['62'].toString(16))
+                    this.inputData['62'] = this.fliter2(this.inputData['62'].toString(16))
-                    this.inputData['63']=  this.fliter2(this.inputData['63'].toString(16))
+                    this.inputData['63'] = this.fliter2(this.inputData['63'].toString(16))
-                    this.inputData['64']=  this.fliter2(this.inputData['64'].toString(16))
+                    this.inputData['64'] = this.fliter2(this.inputData['64'].toString(16))
                     this.inputData['76'] = 'REV:' + this.inputData['76']
                     this.inputData['77'] = this.getType(this.inputData['77'])
                 } else {
@@ -226,13 +254,36 @@ export default {
             var data1 = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
             };
-            this.api.getFsIccid(data1).then(res=>{
+            this.api.getFsIccid(data1).then(res => {
-                if(res.data.code==200){
+                if (res.data.code == 200) {
-                    this.ICCID=res.data.msg
+                    this.ICCID = res.data.msg
-                }else{
+                } else {
                     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) {
             if (index == 0) {
@@ -245,17 +296,34 @@ export default {
                 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) {
             var store = this.$store.state
-            store.nowInput=e.target.value
+            store.nowInput = e.target.value
             e.currentTarget.select();
         },
         //失去焦点
         blurChange(code, el) {
-      var store=this.$store.state
+            var store = this.$store.state
             var data = {
-        equipmentId: store.equipmentList[store.equipmentIndex-1].deviceId,
+                equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
                 regAddress: code,
                 num: el.target.value,
             }; //避免开启多个计时器
@@ -314,7 +382,4 @@ export default {
 
 }
 </script>
-<style lang="scss">
+<style lang="scss"></style>
-
-</style>
-