From 62089bc8d6192109c9940298dbe00073e4ba6a2d Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 13 May 2024 23:56:07 +0800
Subject: [PATCH] update code

---
 .../components/AttendanceDetailDialog.vue      |  2 +-
 src/pages/components/JobWorkerDialog.vue       |  2 +-
 src/pages/projectEngin.vue                     | 18 ++++++++++++++++--
 src/pages/quality/checkDetectionDlg.vue        |  8 ++++----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/pages/components/AttendanceDetailDialog.vue b/src/pages/components/AttendanceDetailDialog.vue
index 277f425..ef908be 100644
--- a/src/pages/components/AttendanceDetailDialog.vue
+++ b/src/pages/components/AttendanceDetailDialog.vue
@@ -19,7 +19,7 @@
             <el-table-column label="性别" align="center" prop="attendanceType">
                 <template slot-scope="{row}">{{ row.workerGender == 1 ? '女' : '男' }}</template>
             </el-table-column>
-            <el-table-column label="分包商名称" align="center" prop="companyName" />
+            <el-table-column label="分包单位名称" align="center" prop="companyName" />
             <el-table-column label="所属班组" align="center" prop="groupName" />
             <el-table-column label="工种" align="center" prop="workTypeName" />
             <el-table-column label="上午打卡(首次)" align="center" prop="inTime">
diff --git a/src/pages/components/JobWorkerDialog.vue b/src/pages/components/JobWorkerDialog.vue
index 52135b4..14972c7 100644
--- a/src/pages/components/JobWorkerDialog.vue
+++ b/src/pages/components/JobWorkerDialog.vue
@@ -40,7 +40,7 @@
                 <el-table-column label="进场时间" align="center" prop="inTime" v-if="1 == 2">
                     <template slot-scope="{row}">{{ row.enterDate | formatDate }}</template>
                 </el-table-column>
-                <el-table-column label="分包商名称" align="center" prop="companyName">
+                <el-table-column label="分包单位名称" align="center" prop="companyName">
                     <template slot-scope="{row}">{{row.companyName||row.degreeName}}</template>
                 </el-table-column>
                 <el-table-column label="所属班组" align="center" >
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index e179c38..ec8fd70 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -337,15 +337,29 @@ export default {
             }
             func();
         },
-        showChart1(data) {
+        showChart1(data) {            
             let tmps = data.data || [];
             let datas = tmps.map(d => (d.status || 0) * 1);
             let sum = 0;
+            let objs=[
+                {id:1,text:'现场管理标准化',value:0},
+                {id:2,text:'作业标准化',value:0},
+                {id:3,text:'安全技术标准化',value:0},
+                {id:4,text:'文明施工标准化',value:0},
+                {id:5,text:'设备管理标准化',value:0},
+                {id:6,text:'环境保护标准化',value:0}
+            ];
             datas.forEach(d => {
                 sum += d;
             });
             this.label1 = `项目标准化管理(${sum})`
-            this.standList = tmps.map(d => {
+            this.standList =objs.map(d=>{
+                let o=tmps.filter(it=>it.dictLabel==d.id);
+                d.value=o.length>0?(o[0].status||0)*1:0;
+                return d;
+            })
+            
+            tmps.map(d => {
                 return {
                     id: d.dictValue,
                     text: d.dictLabel,
diff --git a/src/pages/quality/checkDetectionDlg.vue b/src/pages/quality/checkDetectionDlg.vue
index 5dc1b92..8beeef8 100644
--- a/src/pages/quality/checkDetectionDlg.vue
+++ b/src/pages/quality/checkDetectionDlg.vue
@@ -48,14 +48,14 @@
                         <div v-else style="text-align: center;height:100%" class="left-imglist">
                             <template v-if="it.trustDeed||it.specimenPhoto">
                                 <el-carousel>
-                                    <el-carousel-item>
-                                        <el-image ref="preview" style="width: 400px; " :preview-src-list="['/jhapi/'+it.trustDeed]" v-if="it.trustDeed"
+                                    <el-carousel-item v-if="it.trustDeed">
+                                        <el-image ref="preview" style="width: 400px; " :preview-src-list="['/jhapi/'+it.trustDeed]" 
                                     :src="'/jhapi/'+it.trustDeed + '.1000.jpg'">
                                 </el-image>
                                 <div class="div-tip">委托单</div>
                                     </el-carousel-item>
-                                    <el-carousel-item>
-                                        <el-image ref="preview" style="width: 400px; " :preview-src-list="['/jhapi/'+it.specimenPhoto]" v-if="it.specimenPhoto"
+                                    <el-carousel-item v-if="it.specimenPhoto">
+                                        <el-image ref="preview" style="width: 400px; " :preview-src-list="['/jhapi/'+it.specimenPhoto]" 
                                     :src="'/jhapi/'+it.specimenPhoto + '.1000.jpg'">
                                 </el-image>
                                 <div class="div-tip">样品照片</div>