提交

src/assets/js/http.js

@@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
     // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-    // axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
+    axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
-    axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+        // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
         // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
         // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
         // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

src/store/index.js

@@ -50,10 +50,10 @@ export default new Vuex.Store({
         // FILEURL:' http://101.43.164.214:11111/image/',// 百色
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
         // FILEURL:'http://182.90.224.237:51234/image/',
-        UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地
+        // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地
-        FILEURL: "http://192.168.34.155:19111/image/", //洁本地
+        // FILEURL: "http://192.168.34.155:19111/image/", //洁本地
-        // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
         WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程

src/views/projectFront/laborManage/dataValidation.vue

@@ -180,10 +180,9 @@ export default {
             }).then((res) => {
                 console.log(res);
                 if (res.code == 200) {
-                    if(res.result.success){
-                        this.$message.error(res.result.msg);
-                    }
                     this.getHikvisionPage();
+                }else {
+                    this.$message.error(res.result.msg);
                 }
             })
         },

src/views/projectFront/laborManage/personDetails.vue

@@ -1233,7 +1233,7 @@
                     class="upload-demo"
                     :action="uploadUrl"
                     :on-preview="(file) => handlePreview(file, 4)"
-                    :on-remove="(file) => handleRemove(file, 4)"
+                    :on-remove="(file) => handleRemove({file, index: scope.$index}, 4)"
                     :on-success="(file) => handleSuccess(file, 4)"
                     :limit="5"
                     name="files"
@@ -2799,19 +2799,19 @@ export default {
             data.contractList.map((item) => {
               if (item.imageUrl) {
                 if (item.imageUrl.indexOf(",") != -1) {
-                  let arr = item.imageUrl.split(",");
+                  console.log("劳动~~~~~",item);
-                  let fileList = [];
+                  item.fileList = item.imageUrl.split(",").map((item) => {
-                  arr.forEach((item) => {
+                  return {
-                    fileList.push({ name: item, url: item });
+                    name: item.split("*")[0],
-                  });
+                    url: item.split("*")[1],
-                  item.fileList = fileList;
+                  };
+                });
                 } else if (item.imageUrl.indexOf("*") != -1) {
-                  let arr = item.imageUrl.split("*");
+                  console.log("劳动1~~~~~",item);
-                  let fileList = [];
+                  item.fileList = [{ 
-                  arr.forEach((item) => {
+                  name: item.imageUrl.split("*")[0],
-                    fileList.push({ name: item, url: item });
+                  url: item.imageUrl.split("*")[1],
-                  });
+                 }];
-                  item.fileList = fileList;
                 }
               }
             });
@@ -2830,24 +2830,22 @@ export default {
               if (item.photoUrl.indexOf(",") != -1) {
                 item.fileList = item.photoUrl.split(",").map((item) => {
                   return {
-                    name: item,
+                    name: item.split("*")[0],
-                    url: item,
+                    url: item.split("*")[1],
                   };
                 });
                 // item.fileList = [{  }];
               } else if(item.photoUrl.indexOf("*") != -1) {
-                item.fileList = item.photoUrl.split("*").map((item) => {
+                item.fileList = [{ 
-                  return {
+                  name: item.photoUrl.split("*")[0],
-                    name: item,
+                  url: item.photoUrl.split("*")[1],
-                    url: item,
+                 }];
-                  };
-                });
-                // item.fileList = [{  }];
               } else {
                 item.fileList = [];
               }
             });
           }
+          console.log("详情~~~",data.certificateList);
           this.certificateList = data.certificateList; //证书
 
           //获取体检列表
@@ -2874,19 +2872,16 @@ export default {
               if (item.photoUrl.indexOf(",") != -1) {
                 item.fileList = item.photoUrl.split(",").map((item) => {
                   return {
-                    name: item,
+                    name: item.split("*")[0],
-                    url: item,
+                    url: item.split("*")[1],
                   };
                 });
                 // item.fileList = [{  }];
               } else if(item.photoUrl.indexOf("*") != -1) {
-                item.fileList = item.photoUrl.split("*").map((item) => {
+                item.fileList = [{ 
-                  return {
+                  name: item.photoUrl.split("*")[0],
-                    name: item,
+                  url: item.photoUrl.split("*")[1],
-                    url: item,
+                 }];
-                  };
-                });
-                // item.fileList = [{  }];
               } else {
                 item.fileList = [];
               }
@@ -3152,6 +3147,7 @@ export default {
     },
     // 资格证书和工伤共用添加
     addImgAdd(useName, file) {
+      console.log("上传图片~~~~~~~~~~~~",file);
       let data = {
         name: file.file.data[0].fileInfo.originalFilename,
         url: file.file.data[0].imageUrl,
@@ -3372,10 +3368,13 @@ export default {
       // type==1 现场采集照 2 身份证正面 3 身份证反面  4 合同  5 资格证书
       if (type == 4) {
         this.contractList[0].fileList.forEach((item, index) => {
-          if (file.url == item.url) {
+          if (file.file.url == item.url) {
             this.contractList[0].fileList.splice(index, 1);
+            this.contractList[0].imageUrl= this.contractList[0].imageUrl.split(",").splice(index, 1).join(",")
           }
         });
+        console.log(file, this.contractList);
+        // this.deleteImgUse("contractList", file);
       } else if (type == 5) {
         console.log("1111111111", file.file.url);
         // this.certificateList[file.index].fileList = [];
@@ -3620,6 +3619,7 @@ export default {
             fileList.push({ name: valArr[0], url: valArr[1] });
           });
           data.contractList[0].fileList = fileList;
+          console.log("回显~~~~~~~",data.contractList[0]);
         } else {
           data.contractList = [];
         }

src/views/projectFront/quality/criterionModule/qualityProblemBank.vue

@@ -182,7 +182,7 @@
               }}</template>
             </el-table-column>
           </el-table>
-          <div class="tab_btn_wrap" v-if="tableData.length == 0">
+          <div class="tab_btn_wrap" v-if="tableData.length > 0">
             <el-button
             v-permission="{key: 'criterions_stop_open', menuPath: '/project/quality/criterion'}"
               type="primary"