From 04dda6ab1b3b7f20c6a5d01c1053e01b99327c11 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 Jul 2024 15:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=8D=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        |  25 +++
 .../components/addPhotoDialog.vue             |   4 +-
 .../components/iccidChangeDialog.vue          | 174 ++++++++++++++++++
 .../components/iccidDialog.vue                | 123 +++++++++++++
 src/views/photographicDevice/index.vue        |  33 +++-
 .../components/setChannelDialog.vue           |   4 +-
 vue.config.js                                 |   4 +-
 7 files changed, 360 insertions(+), 7 deletions(-)
 create mode 100644 src/views/photographicDevice/components/iccidChangeDialog.vue
 create mode 100644 src/views/photographicDevice/components/iccidDialog.vue

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 6625218..d41a2da 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -989,3 +989,28 @@ export function importTermsApi(data) {
     data,
   });
 }
+
+//导入iccid
+export function importiccidApi(data) {
+  return request({
+    url: "/xymanager/terminal/importIccidForMaintain",
+    method: "post",
+    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,
+  });
+}
diff --git a/src/views/photographicDevice/components/addPhotoDialog.vue b/src/views/photographicDevice/components/addPhotoDialog.vue
index 193bf86..d98db1e 100644
--- a/src/views/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/photographicDevice/components/addPhotoDialog.vue
@@ -79,7 +79,7 @@
       <el-form-item label="装置名称：" prop="equipName">
         <el-input v-model="formInfo.equipName" auto-complete="on"></el-input>
       </el-form-item>
-      <el-form-item label="SIM卡：" prop="sim">
+      <!-- <el-form-item label="SIM卡：" prop="sim">
         <el-input v-model="formInfo.sim" auto-complete="on"></el-input>
       </el-form-item>
       <el-form-item label="网络类型：" prop="netType">
@@ -94,7 +94,7 @@
       </el-form-item>
       <el-form-item label="ICCID：" prop="iccid">
         <el-input v-model="formInfo.iccid" auto-complete="on"></el-input>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="装置型号：" prop="model">
         <el-input v-model="formInfo.model" auto-complete="on"></el-input>
diff --git a/src/views/photographicDevice/components/iccidChangeDialog.vue b/src/views/photographicDevice/components/iccidChangeDialog.vue
new file mode 100644
index 0000000..c63d480
--- /dev/null
+++ b/src/views/photographicDevice/components/iccidChangeDialog.vue
@@ -0,0 +1,174 @@
+<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: 2,
+          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);
+          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>
diff --git a/src/views/photographicDevice/components/iccidDialog.vue b/src/views/photographicDevice/components/iccidDialog.vue
new file mode 100644
index 0000000..9e05def
--- /dev/null
+++ b/src/views/photographicDevice/components/iccidDialog.vue
@@ -0,0 +1,123 @@
+<template>
+  <el-dialog
+    class="iccidDialog"
+    title="导入ICCID"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="420px"
+  >
+    <el-form
+      label-position="left"
+      label-width="92px"
+      ref="formLineInfo"
+      :model="formdata"
+    >
+      <el-form-item label="网络类型：" prop="netType">
+        <el-select v-model="formdata.netType" 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="ICCID：" prop="iccid">
+        <el-input
+          type="textarea"
+          :rows="10"
+          placeholder="请输入iccid"
+          v-model="formdata.iccid"
+        >
+        </el-input>
+      </el-form-item>
+    </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 { importiccidApi } from "@/utils/api/index";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      isShow: false,
+      formdata: {},
+      networkOptions: [
+        {
+          id: 1,
+          name: "大汉移动",
+        },
+        {
+          id: 2,
+          name: "公田移动",
+        },
+      ], //网络类型
+    };
+  },
+  computed: {
+    // 计算属性，将 cmdidArr 字符串转换为数组
+    iccidArrList() {
+      // 使用 split 方法按换行符分割字符串，并返回数组
+      return this.formdata.iccid.split(/\r\n|\n|\r/).filter(Boolean);
+    },
+  },
+  methods: {
+    // 保存确定操作
+    submitForm() {
+      console.log(this.formdata);
+      console.log(this.iccidArrList);
+      this.$refs.formLineInfo.validate((valid) => {
+        if (valid) {
+          console.log(this.formdata);
+          importiccidApi({
+            iccidList: this.iccidArrList,
+            type: this.formdata.netType,
+          })
+            .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() {
+      this.isShow = true;
+    },
+    hide() {
+      this.isShow = false;
+    },
+  },
+};
+</script>
+<style lang="less">
+.iccidDialog {
+  .el-select {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index bda97e2..66ffb31 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -16,6 +16,13 @@
             @click="handleExport()"
             >导出</el-button
           >
+          <el-button
+            class="iccidbtn"
+            type="primary"
+            icon="el-icon-document"
+            @click="handleICCID()"
+            >导入ICCID</el-button
+          >
         </div>
       </div>
       <div class="searchBox">
@@ -241,7 +248,7 @@
           <el-table-column
             fixed="right"
             label="操作"
-            width="320"
+            width="380"
             v-if="roleUser == 0"
           >
             <template slot-scope="scope">
@@ -282,6 +289,11 @@
                 type="text"
                 >修改</el-button
               >
+              <el-button
+                @click.native.stop="handlexgiccid(scope.row)"
+                type="text"
+                >修改ICCID</el-button
+              >
               <el-button
                 type="text"
                 @click.native.stop="handlepicture(scope.row)"
@@ -353,6 +365,10 @@
     <!-- 新增线路 -->
     <add-lineDialog ref="addlineDialogref"></add-lineDialog>
     <towerDialog ref="towerDialogref"></towerDialog>
+    <!-- 导入iccid -->
+    <iccidDialog ref="iccidref"></iccidDialog>
+    <!-- 修改iccid -->
+    <iccidChangeDialog ref="xgiccidref"></iccidChangeDialog>
   </div>
 </template>
 <script>
@@ -376,6 +392,8 @@ import gpsSite from "./components/gpsSite.vue";
 import faultInfomation from "./components/faultInfomation.vue";
 import addLineDialog from "./components/addLineDialog.vue";
 import towerDialog from "./components/towerDialog.vue";
+import iccidDialog from "./components/iccidDialog.vue";
+import iccidChangeDialog from "./components/iccidChangeDialog.vue";
 export default {
   name: "photographicDevice",
   components: {
@@ -390,6 +408,8 @@ export default {
     addLineDialog,
     towerDialog,
     faultInfomation,
+    iccidDialog,
+    iccidChangeDialog,
   },
   data() {
     return {
@@ -725,6 +745,14 @@ export default {
       this.pageSize = val;
       this.terminalList();
     },
+    //导入ICCID
+    handleICCID() {
+      this.$refs.iccidref.display();
+    },
+    //修改iccic
+    handlexgiccid(val) {
+      this.$refs.xgiccidref.display(val);
+    },
   },
 };
 </script>
@@ -766,6 +794,9 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    .iccidbtn {
+      width: auto;
+    }
   }
   .searchBox {
     margin-top: 8px;
diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index 2406999..a63fc48 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -779,7 +779,7 @@ export default {
             { name: "value21", value: this.channelForm.compensationVal },
             { name: "type21", value: 0 },
             //光敏控制
-            { name: "name22", value: "gmkz" },
+            { name: "name22", value: "ldrEnabled" },
             { name: "value22", value: this.channelForm.gmkzchecked ? 1 : 0 },
             { name: "type22", value: 0 },
             //模板template
@@ -946,7 +946,7 @@ export default {
               this.channelForm.zdbgchecked =
                 resultContent.autoExposure == 1 ? true : false;
               this.channelForm.gmkzchecked =
-                resultContent.gmkz == 1 ? true : false;
+                resultContent.ldrEnabled == 1 ? true : false;
               this.channelForm.bgsj =
                 resultContent.exposureTime == 0
                   ? ""
diff --git a/vue.config.js b/vue.config.js
index 86367af..01f1548 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,8 +23,8 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
 
         //target: "http://192.168.1.190:8080", //190 需要去掉/Api
-        // target: "http://61.169.135.146:9911/", //运维 覆冰
-        target: "http://61.169.135.146:40080/", //dell
+        target: "http://61.169.135.146:9911/", //运维 覆冰
+        //target: "http://61.169.135.146:40080/", //dell
         //target: "http://192.168.50.198:8093", //java本机
         changOrigin: true, //是否开启跨域
         pathRewrite: {