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

src/assets/i18n/langs/cn/laborManage/personManage.js

@@ -72,7 +72,7 @@ export default {
     IdCardHead: '身份证头像',
     spotFaceCollection: '现场采集人脸',
     // '现场采集人脸要求：人脸正面免冠照，jpeg或jpg格式，图片像素需为640x480像素或以上，图片大小需不超过500KB,人脸眼间距需大于60像素点'
-    imgHint: '现场采集人脸要求：人脸正面免冠照，jpg格式，图片像素需为640x480像素或以上，图片大小需为10-200KB,人脸大小占整张图片1/3以上',
+    imgHint: '现场采集人脸要求：人脸正面免冠照，图片格式为jpg格式、大小为10~200KB，人脸大小占整张图片1/3以上',
     cancel: '取消',
     confirm: '确定',
     noData: '暂无数据',

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -1888,7 +1888,7 @@
                         <!-- </div> -->
                       </div>
                       <el-upload
-                        accept=".jpg, .jpeg"
+                        accept=".jpg"
                         class="upload-demo"
                         action="uploadUrl"
                         :on-remove="(file) => handleRemove(file, 7)"
@@ -2204,6 +2204,8 @@
           :autoCropHeight="cropperOption.autoCropHeight"
           :autoCrop="true"
           :fixedBox="true"
+          :outputSize="0.7"
+          :maxImgSize="300"
         ></vueCropper>
         <!-- </vue-scroll> -->
       </div>
@@ -3969,12 +3971,19 @@ export default {
         this.$message.error(this.$t("message.companyDiagram.uploadMsg")); //只能上传图片
         return false;
       } else if (type == 7) {
+        console.log(file)
         if (
           file.type != "image/jpeg" &&
           file.type != "image/jpg"
           // file.type != "image/png"
         ) {
-          this.$message.error(this.$t("message.laborMange.hint8")); //"请上传jpg、jpeg格式图片"
+          this.$message.error(this.$t("请上传jpg格式图片")); //"请上传jpg、jpeg格式图片"
+          return false;
+        }
+        let imgSize = Number(file.size / 1024);
+        console.log(11111111, imgSize)
+        if (imgSize <= 10 || imgSize >= 200) {
+          this.$message.error("文件大小不能超过200kb小于10kb,请重新上传!")
           return false;
         }
       }

src/views/projectFront/specialWork/blindPlugWork.vue

@@ -1209,8 +1209,8 @@ export default {
             ...res.result,
             // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
             hotWorkExecutionTime: [
-              res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : "",
-              res.result.workExecutionEndTime ? res.result.workExecutionEndTime: "",
+              res.result.actualJobBeginTime ? res.result.actualJobBeginTime : "",
+              res.result.actualJobEndTime ? res.result.actualJobEndTime: "",
             ],
           };
           if (this.workDetail.fieldWorkingEnvironment) {