Merge remote-tracking branch 'HS_MZAP/master'

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -223,7 +223,7 @@ export default {
       new tools()
         .uploadFile(file, `csjcqk/siteInspection`)
         .then(({ data }) => {
-        
+          console.log(data);
           data.name = decodeURIComponent(
             data.url.substring(
               data.url.lastIndexOf("/") + 1

src/views/placeManage/ManageList.vue

@@ -6,7 +6,7 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <van-radio-group v-if="type == 0" v-model="checked">
+      <van-radio-group v-model="checked">
         <van-cell-group inset>
           <van-cell
             v-for="item in list3"
@@ -31,7 +31,7 @@ import placeRegister from "@/api/placeRegister/placeRegister";
 export default {
   name: "personList",
   emits: ["selected"],
-  props: ["type", "placeAddress"],
+  props: [ "placeAddress"],
   setup(props, { emit }) {
     const list = ref([]);
     const list3 = ref([]);
@@ -118,16 +118,16 @@ export default {
     const checkboxGroup = ref(null);
     const toggle = (index) => {
       checkboxRefs.value[index].toggle();
-      emit("selected", checked.value, 1);
+      emit("selected",checked.value);
     };
     // 全选
     const checkAll = () => {
       checkboxGroup.value.toggleAll(true);
-      emit("selected", checked.value, 1);
+      emit("selected",checked.value);
     };
     const selectes = (val) => {
       checked.value = val;
-      emit("selected", checked.value, 0);
+      emit("selected",checked.value);
     };
 
     // let placeAddress = "";

src/views/placeManage/ManageList2.vue

@@ -6,14 +6,14 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <van-radio-group v-if="type == 0" v-model="checked">
+      <van-radio-group v-model="checked">
         <van-cell-group inset>
           <van-cell
             v-for="item in list4"
             clickable
             :key="item"
             :title="item.name"
-            @click="selectes(item)"
+            @click="selectes2(item)"
           >
             <template #right-icon>
               <van-radio :name="item" />
@@ -30,8 +30,8 @@ import { ref, watch } from "vue";
 import placeRegister from "@/api/placeRegister/placeRegister";
 export default {
   name: "personList",
-  emits: ["selected"],
-  props: ["type", "placeAddress"],
+  emits: ["selected2"],
+  props: [ "placeAddress"],
   setup(props, { emit }) {
     const list = ref([]);
     const list4 = ref([]);
@@ -84,12 +84,12 @@ export default {
         });
       });
       let listOne = [];
-      list4.value.forEach((N2)=>{
-        if(!listOne.includes(N2)){
-          listOne.push(N2)
+      list4.value.forEach((N2) => {
+        if (!listOne.includes(N2)) {
+          listOne.push(N2);
         }
-      })
-      list4.value = listOne
+      });
+      list4.value = listOne;
     };
     //获取公安部门数组
     function Getga(list) {
@@ -116,16 +116,17 @@ export default {
     const checkboxGroup = ref(null);
     const toggle = (index) => {
       checkboxRefs.value[index].toggle();
-      emit("selected", checked.value, 1);
+      emit("selected2", checked.value);
     };
     // 全选
     const checkAll = () => {
       checkboxGroup.value.toggleAll(true);
-      emit("selected", checked.value, 1);
+      emit("selected2", checked.value);
     };
-    const selectes = (val) => {
+    const selectes2 = (val) => {
+      // console.log(val);
       checked.value = val;
-      emit("selected", checked.value, 0);
+      emit("selected2", checked.value);
     };
     // let placeAddress = "";
     // watch(
@@ -156,7 +157,7 @@ export default {
       checkboxRefs,
       checkboxGroup,
       // 单选
-      selectes,
+      selectes2,
       list4,
     };
   },

src/views/placeManage/placeRegister.vue

@@ -182,8 +182,7 @@
           @confirm="reselected2"
         >
           <manage-list-2
-            @selected="selected2"
-            :type="0"
+            @selected2="selected2"
             :placeAddress="placeAddress"
           ></manage-list-2>
         </van-dialog>
@@ -198,29 +197,24 @@
         />
       </van-cell-group>
       <van-cell-group>
-        <van-field name="uploader" label-align="top" label="外景照片:">
+        <van-field name="uploader" label-align="top" label="场所内外景照片:">
           <template #input>
             <van-uploader
-              v-model="placeActivity.fileList1"
-              :after-read="afterRead"
-            />
-          </template>
-        </van-field>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field name="uploader" label-align="top" label="内景照片:">
-          <template #input>
-            <van-uploader
-              v-model="placeActivity.fileList2"
-              :after-read="afterRead"
-            />
+              v-model="fileList"
+              :after-read="afterRead1"
+              :max-count="6"
+              capture="camera"
+              accept=""
+              :before-delete="fjdelete"
+            >
+            </van-uploader>
           </template>
         </van-field>
       </van-cell-group>
     </div>
     <div class="subbtn">
       <van-button type="primary" @click="submit">提交</van-button>
-      <van-button @click="goback" type="default" hairline>取消</van-button>
+      <van-button @click="onClickLeft" type="default" hairline>取消</van-button>
     </div>
   </div>
 </template>
@@ -230,6 +224,7 @@ import { reactive, ref } from "vue";
 import ManageList from "../placeManage/ManageList.vue";
 import ManageList2 from "../placeManage/ManageList2.vue";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
+import tools from "@/api/sys/tools";
 export default {
   components: { ManageList, ManageList2 },
   setup() {
@@ -255,10 +250,7 @@ export default {
         securityDeptManaUser: "", //公安部门管理人员id
         securityDeptManaUserName: "", //公安部门管理人员
         peopleThreshold: "", //场所活动人数
-        scenesImage: "", //内外景图片
       },
-      fileList1: [], //外景图片
-      fileList2: [], //内景图片
       religiousType: "", //所属宗教
       placeSelectName: "", //场所地点
       siteType: "", //场所类型
@@ -314,15 +306,28 @@ export default {
     };
 
     //图片上传
-    const afterRead = (file) => {
-      // 此时可以自行将文件上传至服务器
-      console.log(file);
-      xm.chooseImage({
-        count: 9,
-      }).then(function (result) {
-        console.log(result);
-        // [ {name: 'a.png', size: 1234, path: '/root/images/, base64: '' } ]
-      });
+    let fileList = ref([]);
+    let fileImg = ref([]);
+    const afterRead1 = (file) => {
+      new tools()
+        .uploadFile(file, `religioussites/siteinfo/religiousSitesInfo`)
+        .then(({ data }) => {
+          data.name = decodeURIComponent(
+            data.url.substring(data.url.lastIndexOf("/") + 1)
+          );
+          fileImg.value.push(data);
+        });
+    };
+    const fjdelete = (file) => {
+      //删除文件操作
+      for (let index = 0; index < fileList.value.length; index++) {
+        if (file.file == fileList.value[index].file) {
+          let delurl = fileImg.value[index].url;
+          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+          fileImg.value.splice(index, 1);
+          fileList.value.splice(index, 1);
+        }
+      }
     };
     // 地区选择
     let placeAddress = ref("");
@@ -364,57 +369,29 @@ export default {
       value: [],
       type: "",
     };
-    const selected = (val, type) => {
+    const selected = (val) => {
       list.value = val;
-      list.type = type;
     };
-    const selected2 = (val, type) => {
+    const selected2 = (val) => {
       list2.value = val;
-      list2.type = type;
     };
     const reselected = () => {
-      let ids = [];
-      let names = [];
-      if (list.type == 1) {
-        list.value.forEach((item) => {
-          ids.push(item.id);
-          names.push(item.name);
-        });
-        placeActivity.placeData.religiousDeptManaUser = ids.join(",");
-        placeActivity.placeData.religiousDeptManaUserName = names.join(",");
-      } else {
-        placeActivity.placeData.religiousDeptManaUser = list.value.id;
-        placeActivity.placeData.religiousDeptManaUserName = list.value.name;
-      }
+      placeActivity.placeData.religiousDeptManaUser = list.value.id;
+      placeActivity.placeData.religiousDeptManaUserName = list.value.name;
     };
     const reselected2 = () => {
-      let ids = [];
-      let names = [];
-      if (list.type == 1) {
-        list.value.forEach((item) => {
-          ids.push(item.id);
-          names.push(item.name);
-        });
-        placeActivity.placeData.securityDeptManaUser = ids.join(",");
-        placeActivity.placeData.securityDeptManaUserName = names.join(",");
-      } else {
-        placeActivity.placeData.securityDeptManaUser = list.value.id;
-        placeActivity.placeData.securityDeptManaUserName = list.value.name;
-      }
-    };
-    //数据校验
-    const validator = (val) => {
-      console.log(val);
+        placeActivity.placeData.securityDeptManaUser = list2.value.id;
+        placeActivity.placeData.securityDeptManaUserName = list2.value.name;
     };
     //数据提交
     const submit = () => {
       console.log(placeActivity.placeData);
-      // new PlaceRegister().sava(placeActivity.placeData).then((res) => {
-      //   console.log("提交成功", res);
-      //   // router.push({
-      //   //   path: "/tabAll",
-      //   // });
-      // });
+      new PlaceRegister().sava(placeActivity.placeData).then((res) => {
+        console.log("提交成功", res);
+        // router.push({
+        //   path: "/tabAll",
+        // });
+      });
     };
 
     return {
@@ -436,7 +413,10 @@ export default {
       property,
       getproperty,
       //图片上传
-      afterRead,
+      fileList,
+      afterRead1,
+      //图片删除
+      fjdelete,
       // 返回
       onClickLeft,
       // 地区选择