添加修改ICCID功能

public/wulw/static/css/personal.css

@@ -0,0 +1,176 @@
+@charset "utf-8";
+/*
+* @Author: Larry
+* @Date:   2016-12-15 17:20:54
+* @Last Modified by:   qinsh
+* @Last Modified time: 2016-12-20 18:06:40
+* +----------------------------------------------------------------------
+* | LarryBlogCMS [ LarryCMS网站内容管理系统 ]
+* | Copyright (c) 2016-2017 http://www.larrycms.com All rights reserved.
+* | Licensed ( http://www.larrycms.com/licenses/ )
+* | Author: qinshouwei <313492783@qq.com>
+* +----------------------------------------------------------------------
+*/
+/* 公共样式 */
+body {
+  background: #f1f2f7;
+  /*overflow-x:hidden;*/
+  padding: 0px;
+}
+
+.larry-personal {
+  margin: 0 auto;
+  background: #ffffff;
+  border-radius: 3px;
+  padding-bottom: 0px;
+  border: none;
+}
+header.larry-personal-tit {
+  width: 100%;
+  height: 50px;
+  border-bottom: 1px solid #eeeff1;
+  padding: 0 20px;
+  padding-left: 30px;
+}
+header.larry-personal-tit span {
+  line-height: 50px;
+  font-size: 14px;
+  color: #858585;
+  font-weight: 300;
+}
+.larry-personal-body {
+  padding: 8px 10px 8px 10px;
+}
+.layui-form {
+  padding: 0px;
+}
+/* 个人信息 */
+.layui-form .layui-form-item label.layui-form-label {
+  width: 180px;
+  font-family: "Microsoft YaHei";
+}
+.layui-input-block {
+  margin-left: 200px;
+}
+.layui-disabled {
+  background: #eeeeee;
+  color: #595963 !important;
+}
+.layui-disabled:hover {
+  color: #595963 !important;
+}
+.layui-input-block textarea {
+  height: 90px;
+}
+/* 修改密码 */
+.changepwd {
+  padding-bottom: 150px;
+}
+.change-submit {
+  margin-top: 20px;
+}
+/* 日志管理 */
+.layui-elem-quote {
+  background: #ffffff;
+  border-bottom: 1px solid #e2e2e2;
+  margin-bottom: 0px;
+}
+.larry-separate {
+  background: #f2f2f2;
+  width: 100%;
+  height: 10px;
+}
+.mylog-info-tit .layui-tab-title {
+  border: none;
+}
+.mylog-info-tit .layui-tab-title li {
+  color: #ffffff;
+  border-radius: 3px;
+  margin-right: 10px;
+}
+.mylog-info-tit .layui-tab-title li i {
+  padding-right: 5px;
+}
+.mylog-info-tit .layui-tab-title li.layui-this {
+  background: #ff5722;
+  border: none;
+  border-radius: 3px;
+}
+.larry-log-del {
+  display: inline-block;
+  width: 100px;
+  height: 38px;
+  float: right;
+  color: #ffffff;
+  line-height: 38px;
+  text-align: center;
+}
+.larry-log-del i {
+  display: inline-block;
+  font-size: 16px;
+}
+.mylog-info-box .layui-tab-content {
+  margin: 0px;
+  padding: 0px;
+}
+.mylog-info-box .layui-tab-content .layui-tab-item {
+  margin: 0px;
+  padding: 0px;
+  width: 100%;
+}
+.mylog-info-box {
+  padding-top: 15px;
+  padding-bottom: 20px;
+}
+.mylog-info-box .layui-tab-item {
+  /* 	border: 1px solid red; */
+}
+.layui-field-box .layui-table {
+  margin-top: 0px;
+  border: 1px solid #e2e2e2;
+}
+.layui-field-box .layui-table tr th,
+.layui-field-box .layui-table tr td {
+  text-align: center;
+  /* 	padding: 0px; */
+}
+.layui-field-box .layui-table tr th:first-child,
+.layui-field-box .layui-table tr td:first-child {
+  width: 40px;
+  padding: 0px;
+}
+.layui-field-box .layui-table tr th:nth-child(2) {
+  padding: 0px;
+  text-align: left;
+  text-indent: 5px;
+}
+.layui-field-box .layui-table tr td:nth-child(2) {
+  padding: 0px;
+  text-align: left;
+}
+.table-hover tbody tr:hover {
+  background-color: #eeeeee;
+}
+.layui-btn i {
+  padding-right: 5px;
+}
+.larry-table-page {
+  width: 100%;
+  height: 50px;
+  padding-top: 6px;
+}
+.larry-table-page .layui-btn {
+  display: block;
+  float: left;
+}
+.larry-table-page .page {
+  padding-left: 15px;
+  float: left;
+}
+.larry-table-page .page .layui-laypage {
+  padding: 0px;
+  margin: 0px;
+}
+.layui-table {
+  margin: 1px 0;
+}

src/utils/api/index.js

@@ -267,3 +267,20 @@ export function getPermissionTree(data) {
     params: data,
   });
 }
+
+//查询当前装置的iccid
+export function getSimcardApi(data) {
+  return request({
+    url: "/xymanager/terminal/getSimcard",
+    method: "get",
+    params: data,
+  });
+}
+//修改当前装置的iccic
+export function updateSimcardApi(data) {
+  return request({
+    url: "/xymanager/terminal/updateSimcard",
+    method: "post",
+    data,
+  });
+}

src/utils/request.js

@@ -8,7 +8,7 @@ const service = axios.create({
   // baseURL: '',
   // timeout: 5000
   baseURL: "api", //把原来的项目地址，改成api，解决跨域问题
-  timeout: 30000,
+  timeout: 60000,
 });
 
 service.interceptors.request.use((config) => {

src/views/homePage/components/editIccid.vue

@@ -0,0 +1,189 @@
+<template>
+  <el-dialog
+    class="changeIccicDialog"
+    title="修改ICCID"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="680px"
+  >
+    <el-form
+      label-position="left"
+      label-width="92px"
+      ref="formLineInfo"
+      :model="formdata"
+    >
+      <div class="left">
+        <el-form-item label="网络类型：" prop="type1">
+          <el-select v-model="formdata.type1" placeholder="请选择">
+            <el-option
+              v-for="item in networkOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="ICCID1：" prop="iccid1">
+          <el-input placeholder="请输入iccid1" v-model="formdata.iccid1">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="imsi1：" prop="imsi1">
+          <el-input placeholder="请输入imsi1" v-model="formdata.imsi1">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="msisdn1：" prop="msisdn1">
+          <el-input placeholder="请输入msisdn1" v-model="formdata.msisdn1">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="sim1：" prop="sim1">
+          <el-input placeholder="请输入sim1" v-model="formdata.sim1">
+          </el-input>
+        </el-form-item>
+      </div>
+      <div class="right">
+        <el-form-item label="网络类型：" prop="type2">
+          <el-select v-model="formdata.type2" placeholder="请选择">
+            <el-option
+              v-for="item in networkOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="ICCID2：" prop="iccid2">
+          <el-input placeholder="请输入iccid2" v-model="formdata.iccid2">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="imsi2：" prop="imsi2">
+          <el-input placeholder="请输入imsi2" v-model="formdata.imsi2">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="msisdn2：" prop="msisdn2">
+          <el-input placeholder="请输入msisdn2" v-model="formdata.msisdn2">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="sim2：" prop="sim2">
+          <el-input placeholder="请输入sim2" v-model="formdata.sim2">
+          </el-input>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="isShow = false">取 消</el-button>
+      <el-button type="primary" @click="submitForm()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getSimcardApi, updateSimcardApi } from "@/utils/api/index";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      isShow: false,
+      termInfo: "",
+      formdata: {},
+      networkOptions: [
+        {
+          id: -1,
+          name: "未绑定",
+        },
+        {
+          id: 1,
+          name: "大汉移动",
+        },
+        {
+          id: 2,
+          name: "公田移动rabchase",
+        },
+        {
+          id: 3,
+          name: "公田m2m10086",
+        },
+        {
+          id: 4,
+          name: "安徽",
+        },
+      ], //网络类型
+    };
+  },
+  computed: {},
+  methods: {
+    getsimCard() {
+      getSimcardApi({
+        termId: this.termInfo.id,
+      })
+        .then((res) => {
+          console.log(res);
+          if (res.code == 200 && res.data !== null) {
+            this.formdata = res.data;
+          } else {
+            this.formdata = {};
+          }
+        })
+        .catch((err) => {});
+    },
+    // 保存确定操作
+    submitForm() {
+      console.log(this.formdata);
+
+      this.$refs.formLineInfo.validate((valid) => {
+        if (valid) {
+          console.log(this.formdata);
+
+          this.formdata.termId = this.termInfo.id;
+
+          updateSimcardApi(this.formdata)
+            .then((res) => {
+              console.log(res);
+              if (res.code == 200) {
+                this.isShow = false;
+                this.$message({
+                  duration: 1500,
+                  showClose: true,
+                  message: "修改成功",
+                  type: "success",
+                });
+              } else {
+                this.$message({
+                  duration: 1500,
+                  showClose: true,
+                  message: res.msg,
+                  type: "error",
+                });
+              }
+            })
+            .catch((err) => {});
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    display(val) {
+      console.log(val);
+      this.termInfo = val;
+      this.isShow = true;
+      this.getsimCard();
+    },
+    hide() {
+      this.isShow = false;
+      this.formdata = {};
+    },
+  },
+};
+</script>
+<style lang="less">
+.changeIccicDialog {
+  .el-form {
+    display: flex;
+    justify-content: space-between;
+  }
+  .el-select {
+    width: 100%;
+  }
+}
+</style>

src/views/homePage/components/msglist.vue

@@ -13,9 +13,9 @@
           <el-descriptions-item label="装置编号">{{
             termInfo.cmdid
           }}</el-descriptions-item>
-          <el-descriptions-item label="iccid">{{
+          <!-- <el-descriptions-item label="iccid">{{
             termInfo.iccid
-          }}</el-descriptions-item>
+          }}</el-descriptions-item> -->
           <el-descriptions-item label="运营商">{{
             msgCompany
           }}</el-descriptions-item>
@@ -122,10 +122,6 @@
             style="width: 100%; height: 380px; border: none"
             class="iframeBox"
           ></iframe>
-          <!-- <iframe
-            src="/wulw/message/history"
-            style="width: 100%; height: 500px; border: none"
-          ></iframe> -->
         </div>
       </div>
     </div>
@@ -154,6 +150,7 @@ export default {
       console.log(this.multipleSelection);
       this.msgisShow = true;
       this.termInfo = this.multipleSelection[0];
+      console.log("aaaaaaaa", this.msgtype);
       //安徽的短信平台
       if (this.msgtype == 4) {
         // 创建一个新的DOM解析器
@@ -161,10 +158,8 @@ export default {
         // 将HTML字符串解析为文档对象
         const doc = parser.parseFromString(this.msgListData, "text/html");
         console.log(doc);
-
         // 查找并删除指定的<div>元素
         const divToRemove = doc.getElementsByClassName("larry-personal");
-
         while (divToRemove.length > 0) {
           // elements[elements.length - 1] 获取最后一个元素
           // 因为我们从后往前删除，所以索引不会受到前面删除操作的影响
@@ -175,7 +170,7 @@ export default {
         // 返回修改后的HTML字符串
         console.log(doc.documentElement.outerHTML);
         //console.log(this.msgListData);
-        this.modifiedMsgListData = doc.documentElement.outerHTML
+        let modifiedHtml = doc.documentElement.outerHTML
           .replace(
             /\/wulw\/static\/layui\/css\/layui\.css\?v=26/g,
             "https://www.lwwlkj.com/wulw/static/layui/css/layui.css?v=26"
@@ -193,11 +188,15 @@ export default {
             "https://www.lwwlkj.com/wulw/static/css/global.css?v=26"
           );
         console.log(this.modifiedMsgListData);
+        this.$nextTick(() => {
+          this.modifiedMsgListData = modifiedHtml;
+        });
       }
     },
 
     handleclose() {
       this.msgisShow = false;
+      this.modifiedMsgListData = "";
     },
   },
 };
@@ -209,6 +208,7 @@ export default {
     .msgTbale {
       .msgHead {
         margin-bottom: 8px;
+        width: 50%;
       }
     }
     .tableBox {
@@ -220,7 +220,7 @@ export default {
       }
       .anhui {
         iframe {
-          background-color: #fcc;
+          //background-color: #fcc;
           .larry-personal {
             display: none;
           }

src/views/homePage/components/tableMain.vue

@@ -19,6 +19,9 @@
           <el-form-item>
             <el-button type="primary" @click="sendMsg">发送短信</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="editIccid">修改ICCID</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="zzMsg">
@@ -704,6 +707,11 @@
           <span> {{ scope.row.mntnStatus.lastIp }}</span>
         </template>
       </u-table-column>
+      <u-table-column label="算法" width="120">
+        <template slot-scope="scope">
+          <span> {{ scope.row.mntnStatus.reportMap.night415 }}</span>
+        </template>
+      </u-table-column>
       <u-table-column
         label="备注"
         v-if="notecheck"
@@ -1218,6 +1226,11 @@
         <el-button type="primary" @click="handlemsgList">查询短信</el-button>
       </div>
     </el-dialog>
+    <!-- 修改ICCID -->
+    <editIccid
+      ref="iccidRef"
+      :multipleSelection="multipleSelection"
+    ></editIccid>
     <!-- 短信接收记录 -->
 
     <msgList
@@ -1277,6 +1290,7 @@ import {
   msglistApi,
 } from "@/utils/api/index";
 import rowMsgDialog from "./rowMsgDialog.vue";
+import editIccid from "./editIccid.vue";
 import msgList from "./msglist.vue";
 import config from "./setConfig/config";
 import htmlToExcel from "@/utils/htmlToExcel";
@@ -1296,6 +1310,7 @@ export default {
     rowMsgDialog,
     msgList,
     config,
+    editIccid,
   },
   data() {
     //判断ip
@@ -1792,6 +1807,8 @@ export default {
           desc: "系统日志目录",
         },
       ],
+      //iccid弹窗
+      iccidVisible: false,
     };
   },
   mounted() {
@@ -2385,6 +2402,21 @@ export default {
         return;
       }
     },
+    //editIccid修改ICCICD
+    editIccid() {
+      if (this.idArray.length == 1) {
+        console.log(this.multipleSelection[0]);
+        this.$refs.iccidRef.display(this.multipleSelection[0]);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "最多选中一个设备",
+          type: "warning",
+        });
+        return;
+      }
+    },
     handleSend(item) {
       console.log(item);
       this.sendForm.msginfo = item.value;
@@ -2423,7 +2455,9 @@ export default {
               this.msgListData = res.data.data;
               this.msgCompany = this.companyMap[res.data.type];
               this.msgtype = res.data.type;
+              this.$nextTick(() => {
                 this.$refs.msglistRef.display();
+              });
             } else {
               this.$message({
                 duration: 1500,