From 5f975771fe4b7718214838b062d27d7f82434aa9 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 12 Jul 2024 10:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   | 10 ++++++-
 .../components/addPhotoDialog.vue             | 17 ++++++-----
 src/views/photographicDevice/index.vue        |  8 ++++--
 src/views/realTimeMonitor/index.vue           |  8 +++++-
 .../globalTools/components/termsAdd.vue       |  2 +-
 src/views/system/globalTools/index.vue        | 28 ++++++++++++-------
 6 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/src/main.js b/src/main.js
index 7515aa4..a5ebb16 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,7 +30,15 @@ import VueLazyload from "vue-lazyload";
 //注册插件
 Vue.use(VueLazyload, {
   error: require("./assets/img/nodatapic2.jpg"),
-  listenEvents: [ 'scroll', 'wheel', 'mousewheel', 'resize', 'animationend', 'transitionend', 'touchmove' ]
+  listenEvents: [
+    "scroll",
+    "wheel",
+    "mousewheel",
+    "resize",
+    "animationend",
+    "transitionend",
+    "touchmove",
+  ],
 });
 /* 引入公共js*/
 import common from "@/utils/common/common.js";
diff --git a/src/views/photographicDevice/components/addPhotoDialog.vue b/src/views/photographicDevice/components/addPhotoDialog.vue
index 4fc5329..193bf86 100644
--- a/src/views/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/photographicDevice/components/addPhotoDialog.vue
@@ -92,6 +92,9 @@
           ></el-option>
         </el-select>
       </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 label="装置型号：" prop="model">
         <el-input v-model="formInfo.model" auto-complete="on"></el-input>
@@ -238,30 +241,30 @@ export default {
       //装置类型
       devTypeOptions: [
         {
-          id: 1,
+          id: "1",
           name: "微拍",
         },
         {
-          id: 2,
+          id: "2",
           name: "覆冰拉力",
         },
         {
-          id: 3,
+          id: "3",
           name: "微气象",
         },
       ],
       networkOptions: [
         {
           id: 1,
-          name: "移动",
+          name: "大汉移动",
         },
         {
           id: 2,
-          name: "联通",
+          name: "公田移动",
         },
         {
-          id: 3,
-          name: "电信",
+          id: -1,
+          name: "无绑定",
         },
       ], //网络类型
       statusOptions: [
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index cff0dec..bda97e2 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -203,11 +203,13 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.netType == 1"> 移动</span>
-              <span v-if="scope.row.netType == 2"> 联通</span>
-              <span v-if="scope.row.netType == 3"> 电信</span>
+              <span v-if="scope.row.netType == 1"> 大汉移动</span>
+              <span v-if="scope.row.netType == 2"> 公田移动</span>
+              <span v-if="scope.row.netType == -1"> 无绑定</span>
             </template>
           </el-table-column>
+          <el-table-column prop="iccid" label="iccid" show-overflow-tooltip>
+          </el-table-column>
           <el-table-column prop="sim" label="SIM卡号" show-overflow-tooltip>
           </el-table-column>
           <el-table-column prop="model" label="装置型号" show-overflow-tooltip>
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index b4154cb..e8efe9d 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -5,7 +5,11 @@
         <div class="typeList">
           <el-radio-group v-model="typeRadio" size="mini" @input="getTypeRadio">
             <el-radio-button :label="-1">全部</el-radio-button>
-            <el-radio-button :label="1">活动</el-radio-button>
+            <el-radio-button
+              :label="1"
+              v-if="roleName === 'superadmin' || roleName === 'Matthew'"
+              >活动</el-radio-button
+            >
           </el-radio-group>
         </div>
         <sideBar ref="sideTree" v-if="allTreeFlag"></sideBar>
@@ -70,6 +74,7 @@ export default {
       nopicPath: require("@/assets/img/nopic.jpg"),
       typeRadio: -1, //类型选择
       allTreeFlag: true,
+      roleName: "",
     };
   },
   watch: {
@@ -93,6 +98,7 @@ export default {
     },
   },
   created() {
+    this.roleName = localStorage.getItem("userName");
     //this.treeSelectData = currentData;
     //获取当前时间
   },
diff --git a/src/views/system/globalTools/components/termsAdd.vue b/src/views/system/globalTools/components/termsAdd.vue
index 2eae169..5ec03e9 100644
--- a/src/views/system/globalTools/components/termsAdd.vue
+++ b/src/views/system/globalTools/components/termsAdd.vue
@@ -63,7 +63,7 @@
             <el-form-item label="装置编号(一行一个)" class="termClass">
               <el-input
                 type="textarea"
-                :rows="20"
+                :rows="10"
                 placeholder="请输入装置列表"
                 v-model="formdata.cmdidArr"
               >
diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue
index c112398..c6b6e19 100644
--- a/src/views/system/globalTools/index.vue
+++ b/src/views/system/globalTools/index.vue
@@ -36,15 +36,17 @@
         <div slot="header" class="clearfix">
           <span>设置告警可信度</span>
         </div>
-        <div v-for="(item, index) in probList" :key="index" class="probBox">
-          <label>{{ item.name }}</label>
-          <el-input-number
-            :min="0"
-            :max="110"
-            controls-position="right"
-            v-model="item.prob"
-            placeholder="请输入可信度值"
-          ></el-input-number>
+        <div class="warnBox">
+          <div v-for="(item, index) in probList" :key="index" class="probBox">
+            <label>{{ item.name }}</label>
+            <el-input-number
+              :min="0"
+              :max="110"
+              controls-position="right"
+              v-model="item.prob"
+              placeholder="请输入可信度值"
+            ></el-input-number>
+          </div>
         </div>
         <el-button class="setbtn" type="primary" @click="setProb"
           >设置</el-button
@@ -181,12 +183,18 @@ export default {
     }
     .globalprob {
       width: 378px;
-      height: max-content;
+      height: calc(100% - 60px);
+
       display: flex;
       flex-direction: column;
       .el-card__body {
         display: flex;
         flex-direction: column;
+        height: calc(100% - 98px);
+        .warnBox {
+          height: calc(100% - 80px);
+          overflow: auto;
+        }
         .probBox {
           display: flex;
           height: 40px;