From 7cb889e459d07bae21c40b6b4483dfe1096f0051 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 14 May 2024 20:04:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiAnalysis/dealPushManage.vue             | 12 +++++-
 .../projectFront/aiAnalysis/warningList.vue   | 12 +++++-
 .../configManage/personnelAccess.vue          | 40 ++++++++-----------
 .../projectSummary/cooperatorDatails.vue      |  5 ++-
 .../safetyEducation/safetyAnalysis.vue        |  2 +-
 5 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/views/projectFront/aiAnalysis/dealPushManage.vue b/src/views/projectFront/aiAnalysis/dealPushManage.vue
index 3f766b01..560d1874 100644
--- a/src/views/projectFront/aiAnalysis/dealPushManage.vue
+++ b/src/views/projectFront/aiAnalysis/dealPushManage.vue
@@ -103,7 +103,17 @@
                 </div>
                 <!-- 来源 -->
                 <!-- @click="openDialogDetail(item)" -->
-                <div class="title">{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</div>
+                <div class="title">
+                  <!-- {{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }} -->
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="item.alarmDesc"
+                    placement="top-start"
+                  >
+                    <span>{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</span>
+                  </el-tooltip>
+                </div>
                 <!-- 去处置 -->
                 <div class="toDisposeOf pushBtn" @click="pushAlarm(item)">
                   <el-button type="primary" size="small">违章推送</el-button>
diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue
index ad1819cf..b3bf3a66 100644
--- a/src/views/projectFront/aiAnalysis/warningList.vue
+++ b/src/views/projectFront/aiAnalysis/warningList.vue
@@ -109,7 +109,17 @@
                   <div class="status-style" :class="item.handleResult?'result-style':'no-result-style'">{{item.handleResult?'已处置':'未处置'}}</div>
                 </div>
                 <!-- 来源 -->
-                <div class="title" @click="openDialogDetail(item)">{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</div>
+                <div class="title" @click="openDialogDetail(item)">
+                  <!-- {{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }} -->
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="item.alarmDesc"
+                    placement="top-start"
+                  >
+                    <span>{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</span>
+                  </el-tooltip>
+                </div>
                 <!-- 去处置 -->
                 <div class="toDisposeOf" @click="openDialog(item)" v-if="!item.handleResult">
                   <el-button v-permission="{key: 'ai_disposition', menuPath: '/project/aiAnalysis/warningList'}" type="primary" size="small">去处置</el-button>
diff --git a/src/views/projectFront/configManage/personnelAccess.vue b/src/views/projectFront/configManage/personnelAccess.vue
index 98c25955..02bdd331 100644
--- a/src/views/projectFront/configManage/personnelAccess.vue
+++ b/src/views/projectFront/configManage/personnelAccess.vue
@@ -28,7 +28,20 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item>
+        
+        <el-form-item label="单位类型">
+          <!--          筛选 -->
+          <el-select v-model="screenStr" class="screen" placeholder="请选择" clearable>
+            <el-option
+              v-for="(item) in screen"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id" 
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="姓名">
           <!-- 请输入姓名 -->
           <el-input
             style="display: inline-block"
@@ -56,16 +69,6 @@
           <el-button type="primary" @click="add">{{
             $t("message.videoManage.add")
           }}</el-button>
-          <!--          筛选 -->
-          <el-select v-model="screenStr" class="screen" placeholder="请选择筛选模块" @change="handleCommand">
-            <el-option
-              v-for="(item) in screen"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id" 
-            >
-            </el-option>
-          </el-select>
           <!-- <el-dropdown class="screen" size="medium" @command="handleCommand">
             <el-button type="success" plain>  
               {{$t("message.videoManage.screen")}}
@@ -495,7 +498,7 @@ export default {
         externalAccount: "",
       },
       screen:[
-        {id:0,name:" "},
+        // {id:0,name:" "},
         {id:1,name:"专业分包"},
         {id:2,name:"设备分包"},
         {id:3,name:"材料分包"},
@@ -973,21 +976,10 @@ export default {
       this.screenStr = ""
       this.getList();
     },
-    // 实现筛选
-    handleCommand(command){
-      getProjectChilderSystemUserListApi({
-        projectSn: this.$store.state.projectSn,
-        enterpriseTypeId:command,
-      }).then((result)=>{ 
-        if(result.success){
-          this.List = result.result;
-          // console.log('筛选列表',result); 
-        }
-      })
-    },
     getList() {
       getProjectChilderSystemUserListApi({
         projectSn: this.$store.state.projectSn,
+        enterpriseTypeId:this.screenStr,
         workerName: this.workerName,
       }).then((result) => {
         if (result.success) {
diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue
index 8da823bb..bb363235 100644
--- a/src/views/projectFront/projectSummary/cooperatorDatails.vue
+++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue
@@ -58,13 +58,14 @@
       </vue-scroll>
     </div>
     <div v-if="activeIndex == '2'" class="content_wrap">
-      <!-- <el-button
+      <el-button
         class="addQualificationBtn"
         type="primary"
         size="medium"
         @click="addBtn(1)"
+        v-permission="{key: 'hzdw_add_qualifications', menuPath: '/project/summary/cooperationUnit'}"
         >新增</el-button
-      > -->
+      >
       <el-table
         :data="qualificationList"
         stripe
diff --git a/src/views/projectFront/safetyEducation/safetyAnalysis.vue b/src/views/projectFront/safetyEducation/safetyAnalysis.vue
index 33d717dc..d2d17792 100644
--- a/src/views/projectFront/safetyEducation/safetyAnalysis.vue
+++ b/src/views/projectFront/safetyEducation/safetyAnalysis.vue
@@ -474,7 +474,7 @@ export default {
                         color: "#268dff",
                         label: {
                             show: true, //开启显示
-                            position: 'right', //在上方显示
+                            position: 'top', //在上方显示
                             formatter: function (val) {
                                 if (val.value !== 0) {
                                     return val.value;