From a0a25e0c42afba1da667a47d88c8d941d362053c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 5 Jul 2024 19:16:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?BUG=E4=BB=A5=E5=8F=8A=E4=BA=BA=E5=91=98=E6=80=BB=E8=A7=88?=
 =?UTF-8?q?=E6=9F=B1=E5=BD=A2=E5=9B=BE=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectFront/carManage/carManage.vue      |   2 +-
 .../laborManage/personnelOverview.vue         | 207 +++++++++++-------
 2 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index 81ae2212..c049abd0 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -132,7 +132,7 @@
           prop="isBlack"
           :label="$t('message.carManage.isBlack')"
           align="center"
-          v-permission="{key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}"
+          v-if="checkPermission({key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'})"
         >
           <template slot-scope="scope">
             <!-- {{ $t('message.carManage.isBlackArr')[scope.row.isBlack] }} -->
diff --git a/src/views/projectFront/laborManage/personnelOverview.vue b/src/views/projectFront/laborManage/personnelOverview.vue
index c2ee4a61..8010d771 100644
--- a/src/views/projectFront/laborManage/personnelOverview.vue
+++ b/src/views/projectFront/laborManage/personnelOverview.vue
@@ -47,87 +47,116 @@
         </div>
         <div class="echarts" ref="safetyTraining"></div> -->
         <div class="condition-change">
-          <el-radio-group v-model="timeRadio" size="small" @change="radioGroupChange">
+          <el-radio-group
+            v-model="timeRadio"
+            size="small"
+            @change="radioGroupChange"
+          >
             <el-radio-button label="3">安全履职分析</el-radio-button>
             <el-radio-button label="4">安全培训分析</el-radio-button>
           </el-radio-group>
         </div>
-          <div class="work-data-analysis" v-show="timeRadio == '3'">
-            <div class="analysis-item">
-              <span>{{safeData.notPerformNum || 0}}/{{safeData.inServiceNum || 0}}</span>
-              <span>未履职人员</span>
-            </div>
-            <div class="analysis-item">
-              <span>{{safeData.xmjlNotPerformNum || 0}}/{{safeData.xmjlInServiceNum || 0}}</span>
-              <span>项目经理</span>
-            </div>
-            <div class="analysis-item">
-              <span>{{safeData.aqyNotPerformNum || 0}}/{{safeData.aqyInServiceNum || 0}}</span>
-              <span>安全员</span>
-            </div>
-            <div class="analysis-item">
-              <span>{{safeData.zlyNotPerformNum || 0}}/{{safeData.zlyInServiceNum || 0}}</span>
-              <span>质量员</span>
-            </div>
-            <div class="analysis-item">
-              <span>{{safeData.jlNotPerformNum || 0}}/{{safeData.jlInServiceNum || 0}}</span>
-              <span>监理</span>
-            </div>
-          </div>
-          <div class="work-data-table" v-show="timeRadio == '3'">
-            <el-table
-              class="table-item"
-              :data="safeWorkList"
-              height="95%"
+        <div class="work-data-analysis" v-show="timeRadio == '3'">
+          <div class="analysis-item">
+            <span
+              >{{ safeData.notPerformNum || 0 }}/{{
+                safeData.inServiceNum || 0
+              }}</span
             >
-              <el-table-column
-                prop="enterpriseName"
-                align="center"
-                label="企业名称"
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="未履职人数"
-              >
-              <template v-slot="{ row }">
-                <span>{{row.notPerformNum || 0}}/{{row.inServiceNum || 0}}</span>
-              </template>
-              </el-table-column>
-              <el-table-column
-                align="center"
-                label="项目经理"
-              >
-              <template v-slot="{ row }">
-                <span>{{row.xmjlNotPerformNum || 0}}/{{row.xmjlInServiceNum || 0}}</span>
-              </template>
-              </el-table-column>
-              <el-table-column
-                align="center"
-                label="安全员"
-              >
-              <template v-slot="{ row }">
-                <span>{{row.aqyNotPerformNum || 0}}/{{row.aqyInServiceNum || 0}}</span>
-              </template>
-              </el-table-column>
-              <el-table-column
-                align="center"
-                label="质量员"
-              >
-              <template v-slot="{ row }">
-                <span>{{row.zlyNotPerformNum || 0}}/{{row.zlyInServiceNum || 0}}</span>
-              </template>
-              </el-table-column>
-              <el-table-column
-                align="center"
-                label="监理"
-              >
-              <template v-slot="{ row }">
-                <span>{{row.jlNotPerformNum || 0}}/{{row.jlInServiceNum || 0}}</span>
-              </template>
-              </el-table-column>
-            </el-table>
+            <span>未履职人员</span>
           </div>
-          <div class="echarts" ref="safetyTraining" v-show="timeRadio == '4'"></div>
+          <div class="analysis-item">
+            <span
+              >{{ safeData.xmjlNotPerformNum || 0 }}/{{
+                safeData.xmjlInServiceNum || 0
+              }}</span
+            >
+            <span>项目经理</span>
+          </div>
+          <div class="analysis-item">
+            <span
+              >{{ safeData.aqyNotPerformNum || 0 }}/{{
+                safeData.aqyInServiceNum || 0
+              }}</span
+            >
+            <span>安全员</span>
+          </div>
+          <div class="analysis-item">
+            <span
+              >{{ safeData.zlyNotPerformNum || 0 }}/{{
+                safeData.zlyInServiceNum || 0
+              }}</span
+            >
+            <span>质量员</span>
+          </div>
+          <div class="analysis-item">
+            <span
+              >{{ safeData.jlNotPerformNum || 0 }}/{{
+                safeData.jlInServiceNum || 0
+              }}</span
+            >
+            <span>监理</span>
+          </div>
+        </div>
+        <div class="work-data-table" v-show="timeRadio == '3'">
+          <el-table class="table-item" :data="safeWorkList" height="95%">
+            <el-table-column
+              prop="enterpriseName"
+              align="center"
+              label="企业名称"
+            ></el-table-column>
+            <el-table-column align="center" label="未履职人数">
+              <template v-slot="{ row }">
+                <span
+                  >{{ row.notPerformNum || 0 }}/{{
+                    row.inServiceNum || 0
+                  }}</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="项目经理">
+              <template v-slot="{ row }">
+                <span
+                  >{{ row.xmjlNotPerformNum || 0 }}/{{
+                    row.xmjlInServiceNum || 0
+                  }}</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="安全员">
+              <template v-slot="{ row }">
+                <span
+                  >{{ row.aqyNotPerformNum || 0 }}/{{
+                    row.aqyInServiceNum || 0
+                  }}</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="质量员">
+              <template v-slot="{ row }">
+                <span
+                  >{{ row.zlyNotPerformNum || 0 }}/{{
+                    row.zlyInServiceNum || 0
+                  }}</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="监理">
+              <template v-slot="{ row }">
+                <span
+                  >{{ row.jlNotPerformNum || 0 }}/{{
+                    row.jlInServiceNum || 0
+                  }}</span
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div
+          class="echarts"
+          ref="safetyTraining"
+          v-show="timeRadio == '4'"
+        ></div>
       </div>
     </div>
     <div class="content2 flex">
@@ -490,7 +519,7 @@ import {
   getEnterpriseInfoList,
   getWorkerTeamStatisticsApi,
   getPersonTypeAndEduStatisticsApi,
-  getSafetyPerformanceAnalysisApi
+  getSafetyPerformanceAnalysisApi,
 } from "@/assets/js/api/laborPerson";
 import { selectProjectComapnyWorkTotalListApi } from "@/assets/js/api/dataBoard.js";
 
@@ -528,7 +557,7 @@ export default {
       enterpriseListData: [],
       teamListData: [],
       departmentListData: [],
-      safeData: {}
+      safeData: {},
     };
   },
   mounted() {
@@ -560,11 +589,11 @@ export default {
     clearInterval(this.interval);
   },
   methods: {
-    radioGroupChange(){
-      if(this.timeRadio == '4'){
+    radioGroupChange() {
+      if (this.timeRadio == "4") {
         this.createdEcharts3();
       }
-      console.log(777888)
+      console.log(777888);
     },
     changeCompany() {
       this.formInline.departmentId = "";
@@ -688,10 +717,24 @@ export default {
             axisLabel: {
               color: "#9fa2ad",
               fontSize: 12,
+              interval: 0, // 强制显示所有标签
             },
           },
         ],
-
+        dataZoom: [
+          {
+            type: "slider", // 使用滑动条形式的数据区域缩放组件
+            start: 0, // 数据窗口范围的起始百分比
+            end: 50, // 数据窗口范围的结束百分比
+            height: 10, // 滑动条组件高度
+            bottom: 5, // 距离图表区域下边的距离
+            showDetail: false, // 拖拽时是否显示详情
+            showDataShadow: false, // 是否在组件中显示数据阴影
+            fillerColor: "#dbdee5", // 平移条的填充颜色
+            borderColor: "transparent", // 边框颜色
+            zoomLock: true, // 锁定视图
+          },
+        ],
         yAxis: {
           type: "value",
           axisTick: {
@@ -1591,7 +1634,7 @@ export default {
         width: 100%;
         height: 72%;
         margin-top: 10px;
-        .table-item{
+        .table-item {
           height: 100%;
         }
       }