Squashed commit of the following:

commit bc04a099fb741080a177eb25193d65b7b2f3fa2c
Author: guoqing <1624870927@qq.com>
Date:   Fri Apr 7 17:54:43 2023 +0800

    功能更新

commit 8757d1e5e10456f1c36ffa12930da3c3f4d4af4e
Merge: a7ce731 4816053
Author: guoqing <1624870927@qq.com>
Date:   Fri Apr 7 17:05:06 2023 +0800

    更新

commit a7ce7318675c8b4b9004de9d359f1e55c8fa99b6
Author: guoqing <1624870927@qq.com>
Date:   Fri Apr 7 17:03:45 2023 +0800

    更新

commit 286d4c36f4c9da88148ad88f4bb00709ca6ff202
Author: guoqing <1624870927@qq.com>
Date:   Fri Apr 7 17:02:24 2023 +0800

    模块功能更新

commit 48160537a70950aad71680585c8d87c71d1ce408
Merge: bfc5b4f a896d70
Author: yin_yu820 <895937358@qq.com>
Date:   Fri Apr 7 16:37:34 2023 +0800

    Merge remote-tracking branch 'HS_MZAP/master'

commit bfc5b4ff78180eb025e4097b6ebf637ff295c738
Author: yin_yu820 <895937358@qq.com>
Date:   Fri Apr 7 16:37:28 2023 +0800

    更新

src/api/placeRegister/placeRegister.js

@@ -9,11 +9,11 @@ export default class placeRegister {
     };
     //所属场所
     queryById(id) {
-            return request.get(
-                `/religioussites/siteinfo/religiousSitesInfo/queryById`, { id: id }
-            )
-        }
-        //地点
+        return request.get(
+            `/religioussites/siteinfo/religiousSitesInfo/queryById`, { id: id }
+        )
+    };
+    //地点
     treeDate(params) {
         return request.get(
             `/tools/area_yc/treeData`,
@@ -27,4 +27,11 @@ export default class placeRegister {
             params
         )
     };
+    //机构
+    treeDate2(params) {
+        return request.get(
+            `/sys/office/treeData`,
+            params
+        )
+    }
 }

src/utils/config.js

@@ -2,7 +2,7 @@ let APP_SERVER_URL = ""
 
 if (process.env.NODE_ENV === 'development') {
     // 开发环境
-    APP_SERVER_URL = 'http://192.168.139.110:8084'
+    APP_SERVER_URL = 'http://192.168.139.74:8084'
 } else {
     // 生产环境
     APP_SERVER_URL = 'http://123.57.226.179:8010/hs'

src/views/activityMan/nonReligiousInformation/nonReligiousInformationInfo.vue

@@ -28,7 +28,6 @@
   import { useRoute } from "vue-router";
   export default {
     setup() {
-      //window.xm.setNavigationBarTitle({ title: '其他有害信息详情'})
       let isLoading = ref(true);
       let canAudit = ref(false);
       // 活动信息

src/views/activityMan/religiousConference/religiousConferenceInfo.vue

@@ -25,7 +25,6 @@
   import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";  
   export default {
     setup() {
-      //window.xm.setNavigationBarTitle({ title: '负责人会议详情'})
       let isLoading = ref(true);
       let canAudit = ref(false);
       // 活动信息

src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrInfo.vue

@@ -34,7 +34,6 @@
   import { useRoute } from "vue-router";
   export default {
     setup() {
-      window.xm.setNavigationBarTitle({ title: '安防设施异常详情'})
       let isLoading = ref(true);
       let canAudit = ref(false);
       // 活动信息

src/views/activityMan/siteInspection/siteInspectionInfo.vue

@@ -32,7 +32,6 @@
   import { useRoute } from "vue-router";
   export default {
     setup() {
-      //window.xm.setNavigationBarTitle({ title: '场所检查详情'})
       let isLoading = ref(true);
       let canAudit = ref(false);
       // 活动信息

src/views/activityMan/siteInspection/siteInspectionList.vue

@@ -57,7 +57,6 @@ import siteInspectionService from "@/api/siteInspection/siteInspectionService";
 export default {
   name: "siteInspectionList",
   setup() {
-    window.xm.setNavigationBarTitle({ title: '场所检查情况'})
     const onClickLeft = () => {
       history.back();
     };

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -32,16 +32,6 @@
       </van-cell-group>
 
       <van-cell-group>
-        <!-- <van-field
-          v-model="siteInspection.place"
-          center
-          readonly
-          label="地点:"
-          placeholder="请填写地点"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="showArea = true"
-        /> -->
         <van-field
           v-model="siteInspection.place"
           center
@@ -98,7 +88,7 @@
         </van-popup>
       </van-cell-group>
 
-      <van-cell-group>
+      <!-- <van-cell-group>
         <van-field name="uploader" label="附件:">
           <template #input>
             <van-uploader>
@@ -106,7 +96,28 @@
             </van-uploader>
           </template>
         </van-field>
+      </van-cell-group> -->
+
+      <van-cell-group>
+        <van-field name="uploader" label="附件:">
+          <template #input>
+            <van-uploader
+              :after-read="afterRead"
+              v-model="fileList"
+              :max-count="1"
+              capture="camera"
+              accept=""
+            >
+              <van-button icon="plus">上传文件</van-button>
+              <template #preview-cover="file">
+                <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+              </template>
+            </van-uploader>
+          </template>
+        </van-field>
       </van-cell-group>
+
+
       <van-cell-group>
         <div class="rowTextArea">
           <van-field
@@ -212,6 +223,21 @@ export default {
           .join("/");
       }
     };
+    // 文件上传
+    let fileList = ref([]);
+    const afterRead = (file) => {
+      fileList.value = [];
+      // 此时可以自行将文件上传至服务器
+      new tools()
+        .uploadFile(file, `csjcqk/siteInspection`)
+        .then(({ data }) => {
+          // window.xm.showToast({
+          //     message:data.url
+          // })
+          fileList.value.push("http://localhost:3000"+data.url);
+          //siteInspection.value.enclosure = data.url;
+        });
+    };
     // 提交数据
     const submit = () => {
       //添加保存前判断
@@ -247,6 +273,9 @@ export default {
       options,
       onFinish,
       cascaderValue,
+      // 文件上传
+      afterRead,
+      fileList,
       submit,
     };
   },

src/views/placeManage/ManageList.vue

@@ -16,7 +16,7 @@
         >
         <van-cell-group inset>
           <van-cell
-            v-for="(item, index) in list"
+            v-for="(item, index) in list3"
             clickable
             :key="item"
             :title="item.name"
@@ -26,7 +26,8 @@
               <van-checkbox
                 shape="square"
                 :name="item"
-                :ref="(el) => (checkboxRefs[index] = el)"/>
+                :ref="(el) => (checkboxRefs[index] = el)"
+              />
             </template>
           </van-cell>
         </van-cell-group>
@@ -34,7 +35,7 @@
       <van-radio-group v-if="type == 0" v-model="checked">
         <van-cell-group inset>
           <van-cell
-            v-for="item in list"
+            v-for="item in list3"
             clickable
             :key="item"
             :title="item.name"
@@ -52,16 +53,21 @@
 
 <script>
 import { ref } from "vue";
-import placeRegister from "@/api/placeRegister/placeRegister" 
+import placeRegister from "@/api/placeRegister/placeRegister";
+import { List } from "vant";
 export default {
   name: "personList",
   emits: ["selected"],
-  props: ["type"],
+  props: ["type", "stateType", "placeAddress"],
   setup(props, { emit }) {
     const list = ref([]);
+    const list3 = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     let index = 0;
+    let placeAddress = props.placeAddress.split("/");
+    let zjList = ref([]);
+    let gaList = ref([]);
     const onLoad = () => {
       // 异步更新数据
       new placeRegister()
@@ -74,12 +80,84 @@ export default {
           // 加载状态结束
           loading.value = false;
           index++;
+          // console.log(list.value);
           // 数据全部加载完成
           if (records.length < 10) {
             finished.value = true;
           }
         });
+      let mechanism1 = []; //宗教
+      let mechanism2 = []; //公安
+      new placeRegister().treeDate2().then((res) => {
+        mechanism1.push(res[0]);
+        mechanism2.push(res[1]);
+        if (props.stateType == 0) {
+          Getzj(mechanism1);
+          // console.log(zjList.value);
+          zjList.value.forEach((item1) => {
+            if (
+              
+              item1.regionLevel3 == placeAddress[0]||
+              item1.regionLevel4 == placeAddress[1]||
+              item1.regionLevel5 == placeAddress[2]
+            ) {
+              let itemId = item1.id;
+              let list2 = [];
+              list.value.forEach((item2) => {
+                if (itemId == item2.officeDTO.id) {
+                  list2.push(item2)
+                }
+              });
+              list3.value = list2;
+              console.log(list2);
+            }
+          });
+        } else {
+          Getga(mechanism2);
+          // console.log(gaList.value);
+          gaList.value.forEach((item3) => {
+            if (
+              // item3.regionLevel3 == placeAddress[0] ||
+              // (item3.regionLevel3 == placeAddress[0] &&
+              //   item3.regionLevel4 == placeAddress[1]) ||
+              // (item3.regionLevel3 == placeAddress[0] &&
+              //   item3.regionLevel4 == placeAddress[1] &&
+              //   item3.regionLevel5 == placeAddress[2])
+              item3.regionLevel3 == placeAddress[0]||
+              item3.regionLevel4 == placeAddress[1]||
+              item3.regionLevel5 == placeAddress[2]
+            ) {
+              let itemId = item3.id;
+              let list2 = [];
+              list.value.forEach((item2) => {
+                if (itemId == item2.officeDTO.id) {
+                  list2.push(item2)
+                }
+              });
+              list3.value = list2;
+            }
+          });
+        }
+      });
     };
+    //获取宗教部门数组
+    function Getzj(list) {
+      list.forEach((item) => {
+        zjList.value.push(item);
+        if (item.children) {
+          Getzj(item.children);
+        }
+      });
+    }
+    //获取公安部门数组
+    function Getga(list) {
+      list.forEach((item) => {
+        gaList.value.push(item);
+        if (item.children) {
+          Getga(item.children);
+        }
+      });
+    }
     // 搜索
     const value = ref("");
     const onSearch = (val) => showToast(val);
@@ -104,7 +182,6 @@ export default {
 
     return {
       // 人员
-      list,
       onLoad,
       loading,
       finished,
@@ -116,6 +193,7 @@ export default {
       checkboxGroup,
       // 单选
       selectes,
+      list3
     };
   },
 };

src/views/placeManage/placeRegister.vue

@@ -62,7 +62,7 @@
         />
         <van-popup v-model:show="showPlace1" round position="bottom">
           <van-picker
-            title="活动场所"
+            title="场所地点"
             :columns="options"
             :columns-field-names="customFieldName"
             @cancel="showPlace1 = false"
@@ -139,7 +139,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.placeData.religiousDeptManaUserName.name"
+          v-model="placeActivity.placeData.religiousDeptManaUserName"
           center
           label="宗教管理人员"
           placeholder="请填写宗教管理人员"
@@ -153,26 +153,36 @@
           show-cancel-button
           @confirm="reselected"
         >
-          <manage-list @selected="selected" :type="1"></manage-list>
+          <manage-list
+            @selected="selected"
+            :type="0"
+            :stateType="0"
+            :placeAddress="placeAddress"
+          ></manage-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.placeData.securityDeptManaUserName.name"
+          v-model="placeActivity.placeData.securityDeptManaUserName"
           center
           label="公安管理人员"
           placeholder="请填写公安管理人员"
           input-align="right"
           right-icon="arrow-down"
           @click="showReport = true"
-        />  
+        />
         <van-dialog
           v-model:show="showReport"
           title="公安部门管理人员"
           show-cancel-button
           @confirm="reselected"
         >
-          <manage-list @selected="selected" :type="0"></manage-list>
+          <manage-list
+            @selected="selected"
+            :type="0"
+            :stateType="1"
+            :placeAddress="placeAddress"
+          ></manage-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
@@ -214,11 +224,10 @@
 
 <script>
 import { reactive, ref } from "vue";
-import ManageList from "../placeManage/ManageList.vue"
+import ManageList from "../placeManage/ManageList.vue";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
-import router from "@/router";
 export default {
-  components:{ManageList},
+  components: { ManageList },
   setup() {
     const goback = () => {
       history.back();
@@ -236,14 +245,10 @@ export default {
         siteType: "", //场所类型
         constructionStage: "", //场所建设阶段
         nature: "", //场所性质
-        religiousDeptManaUserName: {
-          id:"",
-          name:""
-        }, //宗教部门管理人员
-        securityDeptManaUserName: {
-          id:"",
-          name:""
-        }, //公安部门管理人员
+        religiousDeptManaUser: "", //宗教部门管理人员id
+        religiousDeptManaUserName: "", //宗教部门管理人员
+        securityDeptManaUser: "", //公安部门管理人员id
+        securityDeptManaUserName: "", //公安部门管理人员
         peopleThreshold: "", //场所活动人数
         scenesImage: "", //内外景图片
       },
@@ -298,9 +303,15 @@ 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 placeAddress = ref("");
     const customFieldName = {
       text: "name",
       value: "id",
@@ -313,6 +324,13 @@ export default {
     });
     let showPlace1 = ref(false);
     const getPlace1 = ({ selectedOptions }) => {
+      placeAddress.value =
+        selectedOptions[0].id +
+        "/" +
+        selectedOptions[1].id +
+        "/" +
+        selectedOptions[2].id;
+      // console.log(placeAddress.value);
       showPlace1.value = false;
       placeActivity.placeData.placeSelectName =
         selectedOptions[0].name +
@@ -329,7 +347,6 @@ export default {
       type: "",
     };
     const selected = (val, type) => {
-      
       list.value = val;
       list.type = type;
       console.log(list);
@@ -342,11 +359,11 @@ export default {
           ids.push(item.id);
           names.push(item.name);
         });
-      placeActivity.placeData.religiousDeptManaUserName.id =  ids.join(',')
-      placeActivity.placeData.religiousDeptManaUserName.name =  names.join(',')  
+        placeActivity.placeData.religiousDeptManaUser = ids.join(",");
+        placeActivity.placeData.religiousDeptManaUserName = names.join(",");
       } else {
-      placeActivity.placeData.securityDeptManaUserName.id =  list.value.id
-      placeActivity.placeData.securityDeptManaUserName.name =  list.value.name
+        placeActivity.placeData.securityDeptManaUser = list.value.id;
+        placeActivity.placeData.securityDeptManaUserName = list.value.name;
       }
     };
     //数据提交
@@ -354,9 +371,9 @@ export default {
       // console.log(placeActivity.placeData.scenesImage);
       new PlaceRegister().sava(placeActivity.placeData).then((res) => {
         console.log("提交成功", res);
-        router.push({
-          path: "/tabAll",
-        });
+        // router.push({
+        //   path: "/tabAll",
+        // });
       });
     };
 
@@ -383,6 +400,7 @@ export default {
       // 返回
       goback,
       // 地区选择
+      placeAddress,
       customFieldName,
       showPlace1,
       getPlace1,

src/views/toBeDone/toBeDone_details.vue

@@ -17,10 +17,7 @@
       <p>发生时间：{{ PersonInfo.data.problemTime }}</p>
       <p>截止时间：{{ PersonInfo.data.deadlineTime }}</p>
       <p>
-        问题附件：
-        <van-uploader>
-          <van-button>活动申请书</van-button>
-        </van-uploader>
+        问题附件：{{PersonInfo.data.problemAccessory}}
       </p>
     </div>
     <div class="content-bottom">