Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

src/assets/i18n/langs/cn/quality.js

@@ -143,6 +143,12 @@ export default {
         regionId: [
             { required: true, message: "请选择检查部位", trigger: "change" },
         ],
+        dangerItemId: [
+            { required: true, message: "请选择排查分类", trigger: "change" },
+        ],
+        enterpriseName: [
+            { required: true, message: "请选择分包单位", trigger: "change" },
+        ],
         inspectManId: [
             { required: true, message: "请选择检查人", trigger: "change" },
         ],

src/views/projectFront/laborManage/personDetails.vue

@@ -1941,7 +1941,7 @@
                   {{
                     scope.row.isPass == 1
                       ? "是"
-                      : "否"
+                      : scope.row.isPass == 0 ? "否" : ""
                   }}
                 </template>
               </el-table-column>

src/views/projectFront/laborManage/safetyTrainManage.vue

@@ -115,7 +115,8 @@
                   width="15px"
                   height="15px"
                 />
-                <span><a :href="uploadaurl" class="uploadpoint">下载</a></span>
+                <!-- :href="uploadaurl" :target="uploadaurl ? '_blank' : '_self'" -->
+                <span><a  class="uploadpoint">下载</a></span>
               </div>
               <div v-permission="{key: 'edit', menuPath: '/project/labor/safetyTrainManage'}" @click="editPoint(scope.row)" class="operationText">
                 <img
@@ -773,14 +774,17 @@ export default {
     // 下载材料
     uploadPoint(item){
       console.log('item',item)
-      if(!item.uploadAttachments){
+      if(item.uploadAttachments){
-        this.uploadaurl = this.$store.state.FILEURL + item.uploadAttachments
+        this.uploadaurl = this.$store.state.FILEURL + item.uploadAttachments;
+        // console.log(this.uploadaurl)
+        window.open(this.uploadaurl);
       }else{
         this.$message({
           message: '当前没有相关材料！',
           type: 'error'
         });
-        this.uploadaurl = window.location
+        // this.uploadaurl = window.location
+        this.uploadaurl = "javascript:void(0);"
       }
     },
     removePoint(item) {

src/views/projectFront/quality/qualityAnalysis.vue

@@ -508,7 +508,7 @@ export default {
                 this.examineInfo2.rectificationNum,
                 this.examineInfo2.reviewNum,
                 this.examineInfo2.verificationNum];
-            const maxCount = data.map(item => item).sort((a,b) => b - a)[0];
+            const maxCount = [...data].map(item => item).sort((a,b) => b - a)[0];
             // console.log('~~~~~~~~~~~~~',this.examineInfo2,data);
             let option = {
                 legend: {

src/views/projectFront/safetyEducation/safetyAnalysis.vue

@@ -507,8 +507,8 @@ export default {
                 this.examineInfo2.rectificationNum,
                 this.examineInfo2.reviewNum,
                 this.examineInfo2.verificationNum];
-            const maxCount =  data.map(item => item).sort((a,b) => b - a)[0];
+            const maxCount = [...data].map(item => item).sort((a,b) => b - a)[0];
-            // console.log('~~~~~~~~~~~~~',this.examineInfo2,data);
+            console.log('~~~~~~~~~~~~~',this.examineInfo2, data);
             let option = {
                 legend: {
                     icon: 'roundRect',
@@ -545,7 +545,7 @@ export default {
                         },
                         {
                             name: '待核验',
-                            max: data.sort((a,b) => b - a)[0],
+                            max: maxCount,
                         },
                     ]
                 },