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 @@
{{ row.workerGender == 1 ? '女' : '男' }}
-
+
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 @@
{{ row.enterDate | formatDate }}
-
+
{{row.companyName||row.degreeName}}
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 @@