From 549d602fd1e6429fc188a198fd9eeb385615276f Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 27 May 2024 11:45:40 +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

---
 src/views/projectFront/inspecPoint/inspection.vue   | 10 ++++++++++
 src/views/projectFront/inspectRoute/routeManage.vue | 13 +++++++++++++
 .../laborManage/safeWorkManage/safeWorkRules.vue    |  9 +++++----
 .../progressManagementAg/ganttChart.vue             |  5 +++--
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/views/projectFront/inspecPoint/inspection.vue b/src/views/projectFront/inspecPoint/inspection.vue
index 9a9510fd..0c036a92 100644
--- a/src/views/projectFront/inspecPoint/inspection.vue
+++ b/src/views/projectFront/inspecPoint/inspection.vue
@@ -1089,6 +1089,16 @@ export default {
 
 .dialogFormBox {
   width: 580px;
+  /deep/.el-select .el-tag{
+    display: flex;
+    align-items: center;
+  }
+  /deep/.el-select .el-tag .el-select__tags-text{
+    display: inline-block;
+    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
 }
 .addrTitle {
   font-size: 16px;
diff --git a/src/views/projectFront/inspectRoute/routeManage.vue b/src/views/projectFront/inspectRoute/routeManage.vue
index 3daa6161..c7880229 100644
--- a/src/views/projectFront/inspectRoute/routeManage.vue
+++ b/src/views/projectFront/inspectRoute/routeManage.vue
@@ -1443,6 +1443,19 @@ export default {
       }
     }
   }
+  /deep/.el-select .el-select__tags{
+    flex-wrap: nowrap;
+  }
+  /deep/.el-select .el-tag{
+    display: flex;
+    align-items: center;
+  }
+  /deep/.el-select .el-tag .el-select__tags-text{
+    display: inline-block;
+    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
 }
 .task-detail-main {
   height: 100%;
diff --git a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
index 01386638..ab57296e 100644
--- a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
+++ b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
@@ -36,12 +36,12 @@
     <div class="table_wrap whiteBlock">
       <vue-scroll>
         <el-table class="tables" :data="rulesList">
-          <el-table-column prop="type" label="安全履职规则类型">
+          <el-table-column prop="type" label="规则类型名称">
             <template slot-scope="scope">
               <span>{{ scope.row.type | typeText(rulesTypeList) }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="dayNum" label="连续未履职（天数）">
+          <el-table-column prop="dayNum" label="数值">
             <template v-slot="{ row }">
               <!-- <el-input
                 v-if="row.isEdit"
@@ -122,7 +122,7 @@
           size="medium"
           class="dialogFormBox"
         >
-          <el-form-item prop="type" label="安全履职规则类型">
+          <el-form-item prop="type" label="规则类型名称">
             <!-- <el-input
               v-model="workerInfo.type"
               :placeholder="$t('message.workType.placeholder')"
@@ -136,7 +136,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="dayNum" label="连续未履职（天数）">
+          <el-form-item prop="dayNum" label="数值">
             <!-- <el-input
               v-model="workerInfo.dayNum"
               :placeholder="$t('message.workType.placeholder')"
@@ -293,6 +293,7 @@ export default {
         { name: "每个项目自检任务", value: 2 },
         { name: "一个月内缺勤超过", value: 3 },
         { name: "一个月内迟到超过", value: 4 },
+        { name: "同一企业同一隐患连续检查到(x)次", value: 5 },
       ],
       pageInfo: {
         total: 0,
diff --git a/src/views/projectFront/progressManagementAg/ganttChart.vue b/src/views/projectFront/progressManagementAg/ganttChart.vue
index 75d67b42..eb5388f3 100644
--- a/src/views/projectFront/progressManagementAg/ganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/ganttChart.vue
@@ -49,7 +49,7 @@
           <p class="pageTitle">
             承包商列表
           </p>
-          <vue-scroll v-if="level1CompanyData.length > 0">
+          <vue-scroll style="height: calc(100% - 30px)" v-if="level1CompanyData.length > 0">
             <el-tree
               :data="level1CompanyData"
               :props="defaultProps"
@@ -1535,7 +1535,8 @@ export default {
     display: flex;
     flex-direction: column;
     .treeBox {
-      flex: 1;
+      // flex: 1;
+      height: 87%;
       background-color: rgba(216, 216, 216, 0.2);
       padding-top: 10px;
       margin-top: 20px;