From 392941469c0496b450e3d2304e151a980a72b99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 5 Sep 2022 17:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8E=E5=8F=B0(=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=95=99=E8=82=B2):=E5=9F=B9=E8=AE=AD=E7=85=A7?=
 =?UTF-8?q?=E7=89=87=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                            |   8 +-
 .../personModule/laborComponent.vue           |   4 +-
 .../laborManage/personModule/temporary.vue    | 112 ++++++++++++++++++
 .../laborManage/safetyTrainManage.vue         |   4 +
 4 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 0f8baa6f..5cafa864 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
     // FILEURL: 'http://192.168.34.125:6023/image/',
     // 邱平毅的
-    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    // FILEURL: 'http://192.168.34.216:6023/image/',
+    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 53fb0819..a6264b9b 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -3499,7 +3499,7 @@ export default {
           }
           this.personForm.employmentCard = arrJoin.join(',')
         } else if (type == 8) {
-          console.log(file)
+          console.log('身份证正面上传',file)
           let data = {
             name: file.data[0].filename,
             url: file.data[0].imageUrl
@@ -4029,7 +4029,9 @@ export default {
         side: type
       }
       getIdCardInfoApi(data).then((res) => {
+        console.log('返回值',res)
         if (res.code == 200) {
+          console.log('成了吗',res)
           let val = res.result
           if (type == 1) {
             this.personForm.nation =
diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue
index 6a3cc7ff..2db12008 100644
--- a/src/views/projectFront/laborManage/personModule/temporary.vue
+++ b/src/views/projectFront/laborManage/personModule/temporary.vue
@@ -347,6 +347,118 @@
                       placeholder="请选择日期"
                     ></el-date-picker>
                   </el-form-item>-->
+                  <el-col :span="12">
+
+                    <!-- <el-form-item
+                      :label="$t('message.laborMange.frontAndBackOfIdCard')"
+                      prop="idCardUpPhotoUrl"
+                    >
+                      <div class="flex3" style="width: 160px">
+                        <div>
+                          <div
+                            v-if="personForm.idCardUpPhotoUrl"
+                            style="
+                              position: relative;
+                              width: 60px;
+                              height: 38px;
+                            "
+                          >
+                            <img
+                              :src="fileUrl + personForm.idCardUpPhotoUrl"
+                              style="width: 60px; height: 38px"
+                              @click="
+                                handlePreview(
+                                  fileUrl + personForm.idCardUpPhotoUrl,
+                                  0
+                                )
+                              "
+                            />
+                            <img
+                              v-if="
+                                personForm.idCardUpPhotoUrl &&
+                                titleType != 'detail'
+                              "
+                              src="@/assets/images/shut_icon.png"
+                              width="15px"
+                              height="15px"
+                              class="shut_icon"
+                              @click="shutIconBtn(2)"
+                            />
+                          </div>
+                          <el-upload
+                            v-else
+                            class="upload-demo identity_card"
+                            :action="uploadUrl"
+                            :on-remove="(file) => handleRemove(file, 8)"
+                            :on-success="(file) => handleSuccess(file, 8)"
+                            :on-error="(file) => handleError(file, 8)"
+                            :on-preview="(file) => handlePreview(file, 8)"
+                            :beforeUpload="
+                              (file) => handleBeforeUpload(file, 8)
+                            "
+                            name="files"
+                            :class="titleType == 'detail' ? 'margin_top35' : ''"
+                            :file-list="idCardUpPhotoUrlFile"
+                            :disabled="titleType == 'detail'"
+                            :show-file-list="false"
+                          >
+                            <img src="@/assets/images/cockade.png" />
+                          </el-upload>
+                        </div>
+                        <div>
+                          <div
+                            v-if="personForm.idCardDownPhotoUrl"
+                            style="
+                              position: relative;
+                              width: 60px;
+                              height: 38px;
+                            "
+                          >
+                            <img
+                              :src="fileUrl + personForm.idCardDownPhotoUrl"
+                              style="width: 60px; height: 38px"
+                              @click="
+                                handlePreview(
+                                  fileUrl + personForm.idCardDownPhotoUrl,
+                                  0
+                                )
+                              "
+                            />
+                            <img
+                              v-if="
+                                personForm.idCardDownPhotoUrl &&
+                                titleType != 'detail'
+                              "
+                              src="@/assets/images/shut_icon.png"
+                              width="15px"
+                              height="15px"
+                              class="shut_icon"
+                              @click="shutIconBtn(3)"
+                            />
+                          </div>
+                          <el-upload
+                            v-else
+                            class="upload-demo identity_card"
+                            :action="uploadUrl"
+                            :on-remove="(file) => handleRemove(file, 9)"
+                            :on-success="(file) => handleSuccess(file, 9)"
+                            :on-error="(file) => handleError(file, 9)"
+                            :on-preview="(file) => handlePreview(file, 9)"
+                            :beforeUpload="
+                              (file) => handleBeforeUpload(file, 9)
+                            "
+                            name="files"
+                            :class="titleType == 'detail' ? 'margin_top35' : ''"
+                            :file-list="idCardDownPhotoUrlFile"
+                            :disabled="titleType == 'detail'"
+                            :show-file-list="false"
+                          >
+                            <img src="@/assets/images/portrait.png" />
+                          </el-upload>
+                        </div>
+                      </div>
+                    </el-form-item> -->
+                  </el-col>
                 </el-col>
               </el-row>
             </el-col>
diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index b4ba0555..cab13b73 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -665,6 +665,10 @@ export default {
       });
     },
     addPoint() {
+      // 清空图片
+      this.cardForm.eduBeforePhoto= "";
+      this.cardForm.eduInPhoto= "";
+      this.cardForm.eduAfterPhoto= "";
       this.isAdd = true;
       this.cardDialog = true;
       this.$nextTick(() => {