From 78eb7de549a78e0ecd38d2ed4b793da73ce3119f Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 28 Dec 2023 17:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=A4=9A=E4=BD=99=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=EF=BC=8C=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1-?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=BB=84=E5=9B=9E=E6=98=BE=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/index.vue         |  8 ++++----
 src/page/index/top/index.vue     |  8 ++++----
 src/store/modules/common.js      |  2 +-
 src/views/inspection/insTask.vue | 14 +++++++++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 2339a27..2401584 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -94,10 +94,10 @@ export default {
           clearInterval(this.timer);
           return;
         }
-        if (this.itemList.length === 0) {
-          this.notifyList = [];
-          this.notice();
-        }
+        // if (this.itemList.length === 0) {
+        //   this.notifyList = [];
+        //   this.notice();
+        // }
       }, 20000);
     },
     // 消息通知
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 122d38e..26a733d 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -40,7 +40,7 @@
           <top-color></top-color>
         </div>
       </el-tooltip> -->
-      <span style="color:#E6A23C;margin-right:20px;font-weight:600;cursor: pointer;" v-if="total>0" @click="oneClickRead">一键已读 {{total}}</span>
+      <!-- <span style="color:#E6A23C;margin-right:20px;font-weight:600;cursor: pointer;" v-if="total>0" @click="oneClickRead">一键已读 {{total}}</span>
        <el-tooltip 
                   effect="dark"
                   content="切换输入框颜色"
@@ -55,7 +55,7 @@
         <div class="iconfont iconicon_scan code" @click="codeHandle">
           
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <el-tooltip
         v-if="showLock"
         effect="dark"
@@ -76,7 +76,7 @@
           <top-theme></top-theme>
         </div>
       </el-tooltip>
-      <el-tooltip
+      <!-- <el-tooltip
         effect="dark"
         :content="$t('navbar.notice')"
         placement="bottom"
@@ -93,7 +93,7 @@
         <div class="top-bar__item top-bar__item--show">
           <top-lang></top-lang>
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <el-tooltip
         v-if="showFullScren"
         effect="dark"
diff --git a/src/store/modules/common.js b/src/store/modules/common.js
index ec24a59..93d5e1f 100644
--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -18,7 +18,7 @@ const common = {
     showTag: true,
     showDebug: true,
     showCollapse: true,
-    showSearch: true,
+    showSearch: false,
     showLock: true,
     showFullScren: true,
     showTheme: true,
diff --git a/src/views/inspection/insTask.vue b/src/views/inspection/insTask.vue
index 1d4c4e0..b54e2f6 100644
--- a/src/views/inspection/insTask.vue
+++ b/src/views/inspection/insTask.vue
@@ -176,7 +176,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="6" style="width: 31%; margin-left: 1%">
-              <el-form-item label="巡检班组" prop="groupId">
+              <el-form-item label="巡检班组" prop="groupName">
+                <el-input
+                  style="width: 98%"
+                  v-model="addForm.groupName"
+                  placeholder="巡检班组"
+                  disabled
+                ></el-input>
+              </el-form-item>
+              <!-- <el-form-item label="巡检班组" prop="groupId">
                 <el-select
                   v-model="addForm.groupId"
                   placeholder="请选择巡检班组"
@@ -184,7 +192,7 @@
                 >
                   <el-option v-for="item in groupList" :key="item.id"  :label="item.fullName" :value="item.id"></el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -470,7 +478,7 @@
             <el-descriptions-item span="1" label="巡检名称">{{taskForm.planName}}</el-descriptions-item>
             <el-descriptions-item span="1" label="计划单据">{{taskForm.taskCode}}</el-descriptions-item>
             <el-descriptions-item span="1" label="巡检班组">
-                {{taskForm.groupId | groupName}}
+                {{taskForm.groupName}}
             </el-descriptions-item>
             <el-descriptions-item span="1" label="实际开始">{{taskForm.actStartTime}}</el-descriptions-item>
             <el-descriptions-item span="1" label="实际完成">{{taskForm.actFinishTime}}</el-descriptions-item>