Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/nonReligiousInformation/nonReligiousInformationInfo.vue

@@ -79,6 +79,29 @@
             input-align="right"
           />
         </van-cell-group>
+
+        <van-cell-group>
+          <van-field
+            name="uploader"
+            readonly
+            label="证据:"
+            input-align="right"
+          >
+            <template #input>
+              <span v-show="fileList.length == 0">无</span>
+              <van-uploader
+                v-show="fileList.length != 0"
+                v-model="fileList"
+                :max-count="fileList.length"
+                capture="camera"
+                accept=""
+                @click-preview="downHandle"
+              >
+              </van-uploader>
+            </template>
+          </van-field>
+        </van-cell-group>
+        
         <van-cell-group>
           <van-field
             v-model="info.eventOverview"
@@ -134,6 +157,21 @@
           info.value = data;  
           //info.value.nonReligiousCategoriesName=getCategories(info.value.nonReligiousCategories)
 
+          info.value.annex.split("|").forEach((item) => {
+            if (item.trim().length > 0) {
+
+              fileList.value.push({
+                file: {
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
+                },
+                url: $base + item.replace("程序附件//", "程序附件/"),
+              });
+
+            }
+          });
+
           isLoading.value = false;
         });
       });

src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -154,12 +154,19 @@
 	  </van-cell-group>
 
     <van-cell-group>
-        <van-field name="uploader" required :rules="[{ required: true }]" label="证据上传:">
+        <van-field name="uploader" label="证据上传:">
           <template #input>
-            <van-uploader :after-read="afterRead" v-model="fileList" :max-count="5" capture="camera" accept=""
+
+            <!-- <van-uploader :after-read="afterRead" v-model="fileList" :max-count="5" capture="camera" accept=""
               :preview-full-image="false" :before-delete="deleteRead">
               <van-button>上传文件</van-button>
+            </van-uploader> -->
+
+            <van-uploader readonly v-model="fileList" :max-count="5" accept="" :preview-full-image="false"
+              :before-delete="deleteRead" @click-upload="chooseImg">
+              <van-button>上传文件</van-button>
             </van-uploader>
+
           </template>
         </van-field>
       </van-cell-group>
@@ -201,6 +208,8 @@ import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
+// 图片路径
+import $base from "@/utils/config";
 export default {
   components: { personList, WangEditor,organizationsList },
   setup() {
@@ -369,45 +378,78 @@ export default {
     // 文件上传
     let fileList = ref([]);
     let fileupList = ref([]);
-    const afterRead = (file) => {
-      // 此时可以自行将文件上传至服务器
-      new tools()
-        .uploadFile(file, `nonReligiousInformation/nonReligiousInformation`)
-        .then(({ data }) => {
-        
-          data.name = decodeURIComponent(
-            data.url.substring(
-              data.url.lastIndexOf("/") + 1
-            )
-          );
-
-          //data.url = `${$base}` + data.url;    
-          fileupList.value.push(data);
-          window.xm.showToast({
-             message:"文件上传成功!"
-          })
-
-        });
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url: $base + `/sys/file/webupload/upload?uploadPath=nonReligiousInformation/nonReligiousInformation`,
+        headers: { 'Content-Type': 'multipart/form-data', "token": window.localStorage.getItem('MZ_TOKEN') },
+      }).then(res => {
+        let data = res[0].data
+        data.name = decodeURIComponent(
+          data.id.substring(data.url.lastIndexOf("/") + 1)
+        );
+        data.url = $base + data.url;
+        fileupList.value.push(data);
+        fileList.value.push(data)
+      })
     };
-    const fjdelete = (file) => {
+
+    // const afterRead = (file) => {
+    //   // 此时可以自行将文件上传至服务器
+    //   new tools()
+    //     .uploadFile(file, `nonReligiousInformation/nonReligiousInformation`)
+    //     .then(({ data }) => {
+        
+    //       data.name = decodeURIComponent(
+    //         data.url.substring(
+    //           data.url.lastIndexOf("/") + 1
+    //         )
+    //       );
+
+    //       //data.url = `${$base}` + data.url;    
+    //       fileupList.value.push(data);
+    //       window.xm.showToast({
+    //          message:"文件上传成功!"
+    //       })
+
+    //     });
+    // };
+
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if(file.file==fileList.value[index].file){
-          let delurl=fileupList.value[index].url;                   
-          new tools()
-            .uploadFiledelete("", delurl)
-            .then(({ data }) => {
-          });
-          fileupList.value.splice(index,1);
-          fileList.value.splice(index,1); 
-        }        
-      }      
+        if (file.id == fileList.value[index].id) {
+          fileList.value.splice(index, 1);
+          if (fileupList.value[index]) {
+            let delurl = fileupList.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileupList.value.splice(index, 1);
+          }
+        }
+      }
     };
 
+    // const fjdelete = (file) => {
+    //   //删除文件操作
+    //   for (let index = 0; index < fileList.value.length; index++) {
+    //     if(file.file==fileList.value[index].file){
+    //       let delurl=fileupList.value[index].url;                   
+    //       new tools()
+    //         .uploadFiledelete("", delurl)
+    //         .then(({ data }) => {
+    //       });
+    //       fileupList.value.splice(index,1);
+    //       fileList.value.splice(index,1); 
+    //     }        
+    //   }      
+    // };
+
     const submit = () => {
       isLoading.value = true;
       //保存前附件处理
-      inputForm.value.annex = fileupList.value.map((option) => option.url).join("|");
+      inputForm.value.annex = fileupList.value.map((option) => option.id).join("|");
       new nonReligiousInformationService().save(inputForm.value).then((res) => {
         if(res.data=="保存其他有害信息上报成功"){
           window.xm.showToast({
@@ -451,10 +493,10 @@ export default {
       contentEditor,
 
       // 文件上传
-      afterRead,
+      chooseImg,
       fileList,
       fileupList,
-      fjdelete,
+      deleteRead,
       // change,
       submit,
       organ

src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrView.vue

@@ -117,7 +117,8 @@
       <van-cell-group>
         <van-field name="uploader" label="附件:">
           <template #input>
-            <van-uploader
+
+            <!-- <van-uploader
               :after-read="afterRead"
               v-model="fileList"
               :max-count="6"
@@ -126,7 +127,13 @@
               :before-delete="fjdelete"
             >
               <van-button icon="plus">上传文件</van-button>
+            </van-uploader> -->
+
+            <van-uploader readonly v-model="fileList" :max-count="5" accept="" :preview-full-image="false"
+              :before-delete="deleteRead" @click-upload="chooseImg">
+              <van-button>上传文件</van-button>
             </van-uploader>
+
           </template>
         </van-field>
       </van-cell-group>
@@ -317,38 +324,73 @@ export default {
     // 文件上传
     let fileList = ref([]);
     let fileupList = ref([]);
-    const afterRead = (file) => {
-      // 此时可以自行将文件上传至服务器
-      new tools()
-        .uploadFile(file, `afssyc/securityFacilitiesErr`)
-        .then(({ data }) => {
+
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url: $base + `/sys/file/webupload/upload?uploadPath=afssyc/securityFacilitiesErr`,
+        headers: { 'Content-Type': 'multipart/form-data', "token": window.localStorage.getItem('MZ_TOKEN') },
+      }).then(res => {
+        let data = res[0].data
+        data.name = decodeURIComponent(
+          data.id.substring(data.url.lastIndexOf("/") + 1)
+        );
+        data.url = $base + data.url;
+        fileupList.value.push(data);
+        fileList.value.push(data)
+      })
+    }
+
+
+    // const afterRead = (file) => {
+    //   // 此时可以自行将文件上传至服务器
+    //   new tools()
+    //     .uploadFile(file, `afssyc/securityFacilitiesErr`)
+    //     .then(({ data }) => {
         
-          data.name = decodeURIComponent(
-            data.url.substring(
-              data.url.lastIndexOf("/") + 1
-            )
-          );
+    //       data.name = decodeURIComponent(
+    //         data.url.substring(
+    //           data.url.lastIndexOf("/") + 1
+    //         )
+    //       );
 
-          //data.url = `${$base}` + data.url;    
-          fileupList.value.push(data);
+    //       //data.url = `${$base}` + data.url;    
+    //       fileupList.value.push(data);
 
-        });
-    };
-    const fjdelete = (file) => {
+    //     });
+    // };
+
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if(file.file==fileList.value[index].file){
-          let delurl=fileupList.value[index].url;                   
-          new tools()
-            .uploadFiledelete("", delurl)
-            .then(({ data }) => {
-          });
-          fileupList.value.splice(index,1);
-          fileList.value.splice(index,1); 
-        }        
-      }      
+        if (file.id == fileList.value[index].id) {
+          fileList.value.splice(index, 1);
+          if (fileupList.value[index]) {
+            let delurl = fileupList.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileupList.value.splice(index, 1);
+          }
+        }
+      }
     };
 
+    // const fjdelete = (file) => {
+    //   //删除文件操作
+    //   for (let index = 0; index < fileList.value.length; index++) {
+    //     if(file.file==fileList.value[index].file){
+    //       let delurl=fileupList.value[index].url;                   
+    //       new tools()
+    //         .uploadFiledelete("", delurl)
+    //         .then(({ data }) => {
+    //       });
+    //       fileupList.value.splice(index,1);
+    //       fileList.value.splice(index,1); 
+    //     }        
+    //   }      
+    // };
+
     // 提交数据
     const submit = () => {
       //添加保存前判断
@@ -359,7 +401,7 @@ export default {
       }else{
 
         //保存前附件处理
-        info.value.enclosure = fileupList.value.map((option) => option.url).join("|");
+        info.value.enclosure = fileupList.value.map((option) => option.id).join("|");
         new securityFacilitiesErrService().save(info.value).then((res) => {
           if(res.data=="保存安防设施异常成功"){
             window.xm.showToast({
@@ -398,10 +440,10 @@ export default {
       setFireStations,
       
       // 文件上传
-      afterRead,
+      chooseImg,
       fileList,
       fileupList,
-      fjdelete,
+      deleteRead,
 
       // 返回
       onClickLeft,

src/views/activityMan/siteInspection/siteInspectionInfo.vue

@@ -130,15 +130,7 @@
           info.value = data;
 
           info.value.enclosure.split("|").forEach((item) => {
-            console.log(item);
             if (item.trim().length > 0) {
-              // fileList.value.push({
-              //   name: decodeURIComponent(
-              //     item.substring(item.lastIndexOf("/") + 1)
-              //   ),
-              //   url: $base + item.replace('程序附件//','程序附件/'),
-              // });
-
 
               fileList.value.push({
                 file: {

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -103,7 +103,8 @@
       <van-cell-group>
         <van-field name="uploader" label="附件:">
           <template #input>
-            <van-uploader
+
+            <!-- <van-uploader
               :after-read="afterRead"
               v-model="fileList"
               :max-count="6"
@@ -112,7 +113,14 @@
               :before-delete="fjdelete"
             >
               <van-button icon="plus">上传文件</van-button>
+            </van-uploader> -->
+
+            <van-uploader readonly v-model="fileList" :max-count="5" accept="" :preview-full-image="false"
+              :before-delete="deleteRead" @click-upload="chooseImg">
+              <van-button>上传文件</van-button>
             </van-uploader>
+
+
           </template>
         </van-field>
       </van-cell-group>
@@ -259,37 +267,70 @@ export default {
     // 文件上传
     let fileList = ref([]);
     let fileupList = ref([]);
-    const afterRead = (file) => {
-      // 此时可以自行将文件上传至服务器
-      new tools()
-        .uploadFile(file, `csjcqk/siteInspection`)
-        .then(({ data }) => {
-          console.log(data);
-          data.name = decodeURIComponent(
-            data.url.substring(
-              data.url.lastIndexOf("/") + 1
-            )
-          );
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url: $base + `/sys/file/webupload/upload?uploadPath=csjcqk/siteInspection`,
+        headers: { 'Content-Type': 'multipart/form-data', "token": window.localStorage.getItem('MZ_TOKEN') },
+      }).then(res => {
+        let data = res[0].data
+        data.name = decodeURIComponent(
+          data.id.substring(data.url.lastIndexOf("/") + 1)
+        );
+        data.url = $base + data.url;
+        fileupList.value.push(data);
+        fileList.value.push(data)
+      })
+    }
 
-          //data.url = `${$base}` + data.url;    
-          fileupList.value.push(data);
+    // const afterRead = (file) => {
+    //   // 此时可以自行将文件上传至服务器
+    //   new tools()
+    //     .uploadFile(file, `csjcqk/siteInspection`)
+    //     .then(({ data }) => {
+    //       console.log(data);
+    //       data.name = decodeURIComponent(
+    //         data.url.substring(
+    //           data.url.lastIndexOf("/") + 1
+    //         )
+    //       );
 
-        });
-    };
-    const fjdelete = (file) => {
+    //       //data.url = `${$base}` + data.url;    
+    //       fileupList.value.push(data);
+
+    //     });
+    // };
+
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if(file.file==fileList.value[index].file){
-          let delurl=fileupList.value[index].url;                   
-          new tools()
-            .uploadFiledelete("", delurl)
-            .then(({ data }) => {
-          });
-          fileupList.value.splice(index,1);
-          fileList.value.splice(index,1); 
-        }        
-      }      
+        if (file.id == fileList.value[index].id) {
+          fileList.value.splice(index, 1);
+          if (fileupList.value[index]) {
+            let delurl = fileupList.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileupList.value.splice(index, 1);
+          }
+        }
+      }
     };
+
+    // const fjdelete = (file) => {
+    //   //删除文件操作
+    //   for (let index = 0; index < fileList.value.length; index++) {
+    //     if(file.file==fileList.value[index].file){
+    //       let delurl=fileupList.value[index].url;                   
+    //       new tools()
+    //         .uploadFiledelete("", delurl)
+    //         .then(({ data }) => {
+    //       });
+    //       fileupList.value.splice(index,1);
+    //       fileList.value.splice(index,1); 
+    //     }        
+    //   }      
+    // };
     
 	const getLocation = () => {
 	  xm.getLocation().then(data => {
@@ -307,7 +348,7 @@ export default {
       }else{
 
         //保存前附件处理
-        siteInspection.value.enclosure = fileupList.value.map((option) => option.url).join("|");
+        siteInspection.value.enclosure = fileupList.value.map((option) => option.id).join("|");
         new siteInspectionService().save(siteInspection.value).then((res) => {
           if(res.data=="保存场所检查情况成功"){
             window.xm.showToast({
@@ -346,10 +387,10 @@ export default {
 	  
 	  getLocation,
       // 文件上传
-      afterRead,
+      chooseImg,
       fileList,
       fileupList,
-      fjdelete,
+      deleteRead,
       submit,
     };
   },