提交代码

src/pages/dlg/workTrainDlg.vue

@@ -53,6 +53,12 @@
                         <div>{{ data.trainContent }}</div>
                     </div>
                 </template>
+                <template v-if="data.trainDeptNames">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">协同部门</span></div>
+                    <div class="div-text ">
+                        <div>{{ data.trainDeptNames }}</div>
+                    </div>
+                </template>
                 <template v-if="data.trainFile">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">{{data.typeTitle+'附件'}}</span></div>
                     <div class="div-text ">

src/pages/index.vue

@@ -424,6 +424,9 @@ export default {
             projectCategory:[],
             projectCategoryWidth:200,
             deptInfo:{},
+            projectSafetyInterval:{
+
+            },
         }
     },
     created() {
@@ -570,8 +573,9 @@ export default {
                 //查询在岗人数
                 this.$api.attendance.getDeptWorksList(deptId).then(d => {
                 this.laborPersonnelTotal=0;
-                this.laborPersonnelData=[];
+                this.laborPersonnelData=[{text: "劳务人员", value: 0},{text: "监理人员", value: 0},{text: "总包人员", value: 0}];
                 if(d.rows.length>0 && d.rows[0]!=null){
+                    this.laborPersonnelData=[];
                     this.laborPersonnelTotal += d.rows[0].servicePersonnel;
                     this.laborPersonnelData.push({text: "劳务人员", value: d.rows[0].servicePersonnel});
                     this.laborPersonnelTotal += d.rows[0].supervisorPersonnel;
@@ -584,8 +588,9 @@ export default {
                 //查询出勤人数
                 this.$api.attendance.getWorkAttendanceList(deptId).then(d => {
                 this.laborPersonnelTotal=0;
-                this.laborPersonnelData=[];
+                this.laborPersonnelData=[{text: "劳务人员", value: 0},{text: "监理人员", value: 0},{text: "总包人员", value: 0}];
                 if(d.rows.length>0 && d.rows[0]!=null){
+                    this.laborPersonnelData=[];
                     this.laborPersonnelTotal += d.rows[0].servicePersonnel;
                     this.laborPersonnelData.push({text: "劳务人员", value: d.rows[0].servicePersonnel});
                     this.laborPersonnelTotal += d.rows[0].supervisorPersonnel;

src/pages/projectDetail.vue

@@ -815,8 +815,9 @@ export default {
                 //查询在岗人数
                 this.$api.attendance.getDeptWorksList(this.dept?.id||0,this.project?.id||0).then(d => {
                 this.laborPersonnelTotal=0;
-                this.laborPersonnelData=[];
+                this.laborPersonnelData=[{text: "劳务人员", value: 0},{text: "监理人员", value: 0},{text: "总包人员", value: 0}];
                 if(d.rows.length>0 && d.rows[0]!=null){
+                    this.laborPersonnelData=[];
                     this.laborPersonnelTotal += d.rows[0].servicePersonnel;
                     this.laborPersonnelData.push({text: "劳务人员", value: d.rows[0].servicePersonnel});
                     this.laborPersonnelTotal += d.rows[0].supervisorPersonnel;
@@ -830,8 +831,9 @@ export default {
                 //查询出勤人数
                 this.$api.attendance.getWorkAttendanceList(this.dept?.id||0,this.project?.id||0).then(d => {
                 this.laborPersonnelTotal=0;
-                this.laborPersonnelData=[];
+                this.laborPersonnelData=[{text: "劳务人员", value: 0},{text: "监理人员", value: 0},{text: "总包人员", value: 0}];
                 if(d.rows.length>0 && d.rows[0]!=null){
+                    this.laborPersonnelData=[];
                     this.laborPersonnelTotal += d.rows[0].servicePersonnel;
                     this.laborPersonnelData.push({text: "劳务人员", value: d.rows[0].servicePersonnel});
                     this.laborPersonnelTotal += d.rows[0].supervisorPersonnel;

src/pages/projectSafety.vue

@@ -413,8 +413,9 @@ export default {
                 //查询在岗人数
                 this.$api.attendance.getDeptWorksList(this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.laborPersonnelTotal=0;
-                this.laborPersonnelData=[];
+                this.laborPersonnelData=[{text: "劳务人员", value: 0},{text: "监理人员", value: 0},{text: "总包人员", value: 0}];
                 if(d.rows.length>0 && d.rows[0]!=null){
+                    this.laborPersonnelData=[];
                     this.laborPersonnelTotal += d.rows[0].servicePersonnel;
                     this.laborPersonnelData.push({text: "劳务人员", value: d.rows[0].servicePersonnel});
                     this.laborPersonnelTotal += d.rows[0].supervisorPersonnel;
@@ -427,8 +428,9 @@ export default {
                 //查询出勤人数
                 this.$api.attendance.getWorkAttendanceList(this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.laborPersonnelTotal=0;
-                this.laborPersonnelData=[];
+                this.laborPersonnelData=[{text: "劳务人员", value: 0},{text: "监理人员", value: 0},{text: "总包人员", value: 0}];
                 if(d.rows.length>0 && d.rows[0]!=null){
+                    this.laborPersonnelData=[];
                     this.laborPersonnelTotal += d.rows[0].servicePersonnel;
                     this.laborPersonnelData.push({text: "劳务人员", value: d.rows[0].servicePersonnel});
                     this.laborPersonnelTotal += d.rows[0].supervisorPersonnel;