Merge remote-tracking branch 'HS_MZAP/master'

babel.config.js

@@ -1,12 +1,12 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ],
-  plugins: [
-    ['import', {
-        libraryName: 'vant',
-        libraryDirectory: 'es',
-        style: true
-      }, 'vant']
+    presets: [
+        '@vue/cli-plugin-babel/preset'
+    ],
+    plugins: [
+        ['import', {
+            libraryName: 'vant',
+            libraryDirectory: 'es',
+            style: true
+        }, 'vant']
     ]
-}
+}

src/styles/style.css

@@ -7,6 +7,7 @@
 
 .van-nav-bar {
     background-color: #36a7f3!important;
+    z-index: 10000!important;
 }
 
 .van-nav-bar__title {

src/utils/httpRequest.js

@@ -2,10 +2,10 @@ import Vue from 'vue'
 import axios from 'axios'
 import BASE_URL from './config.js'
 
-const request=axios.create({
-	baseURL:BASE_URL,
-	//请求拦截器
-	//响应拦截器
+const request = axios.create({
+    baseURL: BASE_URL,
+    //请求拦截器
+    //响应拦截器
 });
 
-export default request;
+export default request;

src/utils/request.js

@@ -3,17 +3,18 @@ import sysConfig from '@/config' //引入配置文件
 import store from "../store/index"
 import qs from "qs"
 
-// console.log(process.env.NODE_ENV)
 
 axios.defaults.baseURL = sysConfig.baseUrl //设置请求时间
 axios.defaults.timeout = sysConfig.timeout //设置请求超时时间
 const ContentType = sysConfig.ContentType
 
-//axios.defaults.headers["Content-Type"] = "application/json";
 // axios.defaults.withCredentials = true
 axios.defaults.headers = { 'Content-Type': 'application/json; charset=utf-8' };
-
-// axios.defaults.headers["Content-Type"] = "application/x-www-form-urlencoded";
+axios.defaults.paramsSerializer = {
+    serialize: function(params) {
+        return qs.stringify(params, { allowDots: true })
+    }
+}
 
 
 /** 请求发送前拦截，用于配置求情内容，如headers参数等 */
@@ -32,29 +33,29 @@ function error1(res) {
     if (res.status == 408 || res.status == 401) { // 需要重新登录
         store.commit('setPcToken', "");
         console.log(res.data);
-        // window.xm.showToast({
-        //     message:res.data
-        // })
+        window.xm.showToast({
+            message: res.data
+        })
     } else if (res.status === 404) {
         console.log("404，路径找不到：" + res.data.path);
-        // window.xm.showToast({
-        //     message:"404，路径找不到："+res.data.path
-        // })
+        window.xm.showToast({
+            message: "404，路径找不到：" + res.data.path
+        })
     } else if (res.status === 503) {
         console.log("服务不可用");
-        // window.xm.showToast({
-        //     message:"服务不可用"
-        // })
+        window.xm.showToast({
+            message: "服务不可用"
+        })
     } else if (res.status === 504) {
         console.log("网络连接错误");
-        // window.xm.showToast({
-        //     message:"网络连接错误"
-        // })
+        window.xm.showToast({
+            message: "网络连接错误"
+        })
     } else {
         console.log(res.data);
-        // window.xm.showToast({
-        //     message:res.data
-        // })
+        window.xm.showToast({
+            message: res.data
+        })
     }
 }
 
@@ -115,16 +116,9 @@ var http = {
                 url: url,
                 method: 'post',
                 data: data,
-                // params: params,
                 params: qs.stringify(params),
                 config: config
             }).then((response) => {
-                //if(response.data && response.data.statusCode !== 200){
-                // 	error(response.data);
-                // 	reject(response.data)
-                // }
-                // resolve(response.data);
-
                 resolve(response);
             }).catch((error) => {
                 reject(error)

src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue

@@ -145,12 +145,21 @@ export default {
       });
     // 审核通过
     const update = () => {
-      isLoading.value = true;
-      inputForm.value.assessment = 1;
-      new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
-        console.log(res);
-        onClickLeft();
-        isLoading.value = false;
+      xm.showConfirm({
+        title: "审核",
+        message: "确定审核所选项吗?",
+      }).then((result) => {
+        if (result == "ok") {
+          inputForm.value.assessment = 1;
+          new PrivatePartyPointService().save(inputForm.value).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: "已审核",
+              });
+            }
+            onClickLeft();
+          });
+        }
       });
     };
     return {

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -132,14 +132,6 @@
         </div>
       </van-swipe-cell>
     </van-list>
-    <van-dialog
-      v-model:show="showDel"
-      show-cancel-button
-      confirmButtonText="删除"
-      message="请确认删除该记录"
-      @confirm="Itemdel"
-    >
-    </van-dialog>
   </div>
 </template>
     
@@ -170,23 +162,21 @@ export default {
       loading.value = true;
       finished.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new ReligiousPeopleReportService()
         .list({
           current: index + 1,
           size: 10,
           assessment: 0,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           list.value.push(...records);
           // 加载状态结束
           loading.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index + 1 >= pages) {
             finished.value = true;
-          } else {
-            index++;
           }
+          index++;
         });
     };
     const loading1 = ref(false);
@@ -196,23 +186,21 @@ export default {
       loading1.value = true;
       finished1.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new ReligiousPeopleReportService()
         .list({
           current: index1 + 1,
           size: 10,
           assessment: 1,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           readList.value.push(...records);
           // 加载状态结束
           loading1.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index1 + 1 >= pages) {
             finished1.value = true;
-          } else {
-            index1++;
           }
+          index1++;
         });
     };
     // 搜索
@@ -238,22 +226,26 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 删除确认
-    let showDel = ref(false);
-    let ids = ref("");
-    const deleteItem = (val) => {
-      showDel.value = true;
-      ids.value = val;
-    };
-    // 删除
-    const Itemdel = () => {
-      new ReligiousPeopleReportService().delete(ids.value).then((res) => {
-        console.log("删除", res);
-        index = 0;
-        loading.value = true;
-        list.value = [];
-        readList.value = [];
-        onLoad();
+   // 删除
+   const deleteItem = (val) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new ReligiousPeopleReportService().delete(val).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            list.value = [];
+            readList.value = [];
+            onLoad();
+          });
+        }
       });
     };
     let router = useRouter();
@@ -290,9 +282,7 @@ export default {
       onClickRight,
       updateItem,
       goInfo,
-      showDel,
       deleteItem,
-      Itemdel,
     };
   },
 };

src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -196,9 +196,12 @@ export default {
     const submit = () => {
       isLoading.value = true;
       new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
-        console.log("提交", res);
+        if (res.status == 200 || res.statusText == "OK") {
+          xm.showToast({
+            message: res.data,
+          });
+        }
         onClickLeft();
-        isLoading.value = false;
       });
     };
     return {

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -162,15 +162,9 @@
             <span
               v-show="placeActivity.subjectContent != ''"
               style="color: #36a7f3"
-              @click="showReport = true"
+              @click="open"
               >查看内容</span
             >
-            <van-popup v-model:show="showReport" 
-              ><wang-editor
-                ref="subjectContentEditor"
-                v-model="placeActivity.subjectContent"
-              />
-            </van-popup>
           </template>
         </van-field>
       </van-cell-group>
@@ -183,16 +177,24 @@
       >审核</van-button
     >
   </div>
+  <van-popup v-model:show="showReport"
+    ><wang-editor
+      ref="subjectContentEditor"
+      v-model="placeActivity.subjectContent"
+    />
+  </van-popup>
 </template>
   
   <script>
-import { ref, onMounted } from "vue";
+import "vant/es/toast/style";
+import { ref, onMounted, nextTick } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 import $base from "@/utils/config";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
+
 export default {
   components: { WangEditor },
   setup() {
@@ -259,25 +261,35 @@ export default {
             });
           }
         });
-        if (subjectContentEditor.value != null) {
-          subjectContentEditor.value.init(placeActivity.value.subjectContent);
-        }
         isLoading.value = false;
       });
     });
     // 打开富文本
-    // const open = () => {
-    //   subjectContentEditor.value.init(placeActivity.value.subjectContent);
-    // };
-
+    const open = () => {
+      showReport.value = true;
+      nextTick(() => {
+        if (subjectContentEditor.value != null) {
+          subjectContentEditor.value.init(placeActivity.value.subjectContent);
+        }
+      });
+    };
     // 审核通过
     const update = () => {
-      isLoading.value = true;
-      placeActivity.value.assessment = 1;
-      new placeActivityServer().save(placeActivity.value).then((res) => {
-        console.log(res);
-        onClickLeft();
-        isLoading.value = false;
+      xm.showConfirm({
+        title: "审核",
+        message: "确定审核所选项吗?",
+      }).then((result) => {
+        if (result == "ok") {
+          placeActivity.value.assessment = 1;
+          new placeActivityServer().save(placeActivity.value).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: "已审核",
+              });
+            }
+            onClickLeft();
+          });
+        }
       });
     };
     return {
@@ -288,16 +300,13 @@ export default {
       update,
       subjectContentEditor,
       showReport,
-      // open,
+      open,
     };
   },
 };
 </script>
   
 <style lang="less">
-.van-cell__value .van-field__right-icon .van-icon-location {
-  color: #36a7f3 !important;
-}
 .btn-sub {
   width: 90%;
   border-radius: 20px;
@@ -305,10 +314,6 @@ export default {
   margin-bottom: 40px;
   margin-top: -100px;
 }
-.van-loading {
-  text-align: center;
-  margin-top: 80px;
-}
 .van-popup--center {
   width: 98% !important;
 }

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -139,14 +139,6 @@
         </div>
       </van-swipe-cell>
     </van-list>
-    <van-dialog
-      v-model:show="showDel"
-      show-cancel-button
-      confirmButtonText="删除"
-      message="请确认删除该记录"
-      @confirm="Itemdel"
-    >
-    </van-dialog>
   </div>
 </template>
 
@@ -185,17 +177,15 @@ export default {
           size: 10,
           assessment: 0,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           list.value.push(...records);
           // 加载状态结束
           loading.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index + 1 >= pages) {
             finished.value = true;
-          } else {
-            index++;
           }
+          index++;
         });
     };
     const loading1 = ref(false);
@@ -211,17 +201,15 @@ export default {
           size: 10,
           assessment: 1,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           readList.value.push(...records);
           // 加载状态结束
           loading1.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index1 + 1 >= pages) {
             finished1.value = true;
-          } else {
-            index1++;
           }
+          index1++;
         });
     };
     // 搜索
@@ -247,22 +235,26 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 删除确认
-    let showDel = ref(false);
-    let ids = ref("");
-    const deleteItem = (val) => {
-      showDel.value = true;
-      ids.value = val;
-    };
     // 删除
-    const Itemdel = () => {
-      new placeActivityServer().delete(ids.value).then((res) => {
-        console.log("删除", res);
-        index = 0;
-        loading.value = true;
-        list.value = [];
-        readList.value = [];
-        onLoad();
+    const deleteItem = (val) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new placeActivityServer().delete(val).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            list.value = [];
+            readList.value = [];
+            onLoad();
+          });
+        }
       });
     };
     // 修改跳转
@@ -299,8 +291,7 @@ export default {
       deleteItem,
       updateItem,
       goInfo,
-      showDel,
-      Itemdel,
+      deleteItem,
     };
   },
 };

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -220,7 +220,7 @@
     </div>
     <div class="subbtn">
       <van-button type="primary" @click="submit">提交</van-button>
-      <van-button type="default" hairline>取消</van-button>
+      <van-button type="default" hairline @click="onClickLeft">暂存</van-button>
     </div>
   </div>
 </template>
@@ -386,24 +386,31 @@ export default {
       new tools()
         .uploadFile(file, `reporting/reportingActivities`)
         .then(({ data }) => {
-          placeActivity.value.safetyPlan = data.url;
-          fileList.value.push(data);
-          fileList.value[0].url = `${$base}` + fileList.value[0].url;
-          fileList.value[0].name = decodeURIComponent(
-            fileList.value[0].url.substring(
-              fileList.value[0].url.lastIndexOf("/") + 1
-            )
-          );
+          if (res.status == 200 || res.statusText == "OK") {
+            xm.showToast({
+              message: "上传成功",
+            });
+            placeActivity.value.safetyPlan = data.url;
+            fileList.value.push(data);
+            fileList.value[0].url = `${$base}` + fileList.value[0].url;
+            fileList.value[0].name = decodeURIComponent(
+              fileList.value[0].url.substring(
+                fileList.value[0].url.lastIndexOf("/") + 1
+              )
+            );
+          }
         });
-      console.log("上传文件", placeActivity.value.safetyPlan);
     };
     // 提交数据
     const submit = () => {
       isLoading.value = true;
       new placeActivityServer().save(placeActivity.value).then((res) => {
-        console.log("提交", res);
+        if (res.status == 200 || res.statusText == "OK") {
+          xm.showToast({
+            message: res.data,
+          });
+        }
         onClickLeft();
-        isLoading.value = false;
       });
     };
     return {

src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -67,15 +67,9 @@
             <span
               v-show="inputForm.content != ''"
               style="color: #36a7f3"
-              @click="showReport = true"
+              @click="open"
               >查看内容</span
             >
-            <van-popup v-model:show="showReport"
-              ><wang-editor
-                ref="contentEditor"
-                v-model="inputForm.content"
-              />
-            </van-popup>
           </template>
         </van-field>
       </van-cell-group>
@@ -88,10 +82,14 @@
       >审核</van-button
     >
   </div>
+  <!-- 富文本编辑器 -->
+  <van-popup v-model:show="showReport"
+    ><wang-editor ref="contentEditor" v-model="inputForm.content" />
+  </van-popup>
 </template>
     
     <script>
-import { ref } from "vue";
+import { ref, nextTick } from "vue";
 import { useRoute } from "vue-router";
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 import UserManage from "@/api/user/UserManage";
@@ -139,17 +137,34 @@ export default {
           inputForm.value.relatedPersons.name += data.name + ",";
         });
       });
-      // contentEditor.value.init(inputForm.value.content);
       isLoading.value = false;
     });
+    // 打开富文本
+    const open = () => {
+      showReport.value = true;
+      nextTick(() => {
+        if (contentEditor.value != null) {
+          contentEditor.value.init(inputForm.value.content);
+        }
+      });
+    };
     // 审核通过
     const update = () => {
-      isLoading.value = true;
-      inputForm.value.assessment = 1;
-      new PrivatePartyPointService().save(inputForm.value).then((res) => {
-        console.log(res);
-        onClickLeft();
-        isLoading.value = false;
+      xm.showConfirm({
+        title: "审核",
+        message: "确定审核所选项吗?",
+      }).then((result) => {
+        if (result == "ok") {
+          inputForm.value.assessment = 1;
+          new PrivatePartyPointService().save(inputForm.value).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: "已审核",
+              });
+            }
+            onClickLeft();
+          });
+        }
       });
     };
     return {
@@ -158,7 +173,8 @@ export default {
       isLoading,
       update,
       contentEditor,
-      showReport
+      showReport,
+      open,
     };
   },
 };
@@ -171,5 +187,7 @@ export default {
   margin-left: 5%;
   margin-bottom: 40px;
 }
-
+.van-popup--center {
+  width: 98% !important;
+}
 </style>

src/views/activityMan/selfMeetingReport/selfMeetingList.vue

@@ -146,14 +146,6 @@
         </div>
       </van-swipe-cell>
     </van-list>
-    <van-dialog
-      v-model:show="showDel"
-      show-cancel-button
-      confirmButtonText="删除"
-      message="请确认删除该记录"
-      @confirm="Itemdel"
-    >
-    </van-dialog>
   </div>
 </template>
 
@@ -162,7 +154,7 @@ import { ref } from "vue";
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 import { useRouter } from "vue-router";
 export default {
-  name: "placeActivityList",
+  name: "selfMeetingList",
   setup() {
     const onClickLeft = () => {
       history.back();
@@ -184,23 +176,21 @@ export default {
       loading.value = true;
       finished.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new PrivatePartyPointService()
         .list({
           current: index + 1,
           size: 10,
           assessment: 0,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           list.value.push(...records);
           // 加载状态结束
           loading.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index + 1 >= pages) {
             finished.value = true;
-          } else {
-            index++;
           }
+          index++;
         });
     };
     const loading1 = ref(false);
@@ -210,23 +200,21 @@ export default {
       loading1.value = true;
       finished1.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new PrivatePartyPointService()
         .list({
           current: index1 + 1,
           size: 10,
           assessment: 1,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           readList.value.push(...records);
           // 加载状态结束
           loading1.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index1 + 1 >= pages) {
             finished1.value = true;
-          } else {
-            index1++;
           }
+          index1++;
         });
     };
     // 搜索
@@ -252,22 +240,26 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 删除确认
-    let showDel = ref(false);
-    let ids = ref("");
-    const deleteItem = (val) => {
-      showDel.value = true;
-      ids.value = val;
-    };
     // 删除
-    const Itemdel = () => {
-      new PrivatePartyPointService().delete(ids.value).then((res) => {
-        console.log("删除", res);
-        index = 0;
-        loading.value = true;
-        list.value = [];
-        readList.value = [];
-        onLoad();
+    const deleteItem = (val) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new PrivatePartyPointService().delete(val).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            list.value = [];
+            readList.value = [];
+            onLoad();
+          });
+        }
       });
     };
     let router = useRouter();
@@ -304,9 +296,7 @@ export default {
       onClickRight,
       updateItem,
       goInfo,
-      showDel,
       deleteItem,
-      Itemdel,
     };
   },
 };

src/views/activityMan/selfMeetingReport/selfMeetingView.vue

@@ -233,9 +233,12 @@ export default {
     const submit = () => {
       isLoading.value = true;
       new PrivatePartyPointService().save(inputForm.value).then((res) => {
-        console.log(res);
+        if (res.status == 200 || res.statusText == "OK") {
+          xm.showToast({
+            message: res.data,
+          });
+        }
         onClickLeft();
-        isLoading.value = false;
       });
     };
     return {

src/views/placeManage/ManageList.vue

@@ -6,33 +6,7 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <!-- <van-checkbox-group
-        v-if="type == 1"
-        v-model="checked"
-        ref="checkboxGroup"
-      >
-        <van-button type="primary" size="mini" @click="checkAll"
-          >全选</van-button
-        >
-        <van-cell-group inset>
-          <van-cell
-            v-for="(item, index) in list3"
-            clickable
-            :key="item"
-            :title="item.name"
-            @click="toggle(index)"
-          >
-            <template #right-icon>
-              <van-checkbox
-                shape="square"
-                :name="item"
-                :ref="(el) => (checkboxRefs[index] = el)"
-              />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-checkbox-group> -->
-      <van-radio-group v-if="type == 0 && stateType == 0" v-model="checked">
+      <van-radio-group v-if="type == 0" v-model="checked">
         <van-cell-group inset>
           <van-cell
             v-for="item in list3"
@@ -47,21 +21,6 @@
           </van-cell>
         </van-cell-group>
       </van-radio-group>
-      <van-radio-group v-if="type == 0 && stateType == 1" v-model="checked">
-        <van-cell-group inset>
-          <van-cell
-            v-for="item in list4"
-            clickable
-            :key="item"
-            :title="item.name"
-            @click="selectes(item)"
-          >
-            <template #right-icon>
-              <van-radio :name="item" />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-radio-group>
     </van-list>
   </div>
 </template>
@@ -72,16 +31,20 @@ import placeRegister from "@/api/placeRegister/placeRegister";
 export default {
   name: "personList",
   emits: ["selected"],
-  props: ["type", "stateType", "placeAddress"],
+  props: ["type", "placeAddress"],
   setup(props, { emit }) {
     const list = ref([]);
     const list3 = ref([]);
-    const list4 = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     let index = 0;
     let zjList = ref([]);
-    let gaList = ref([]);
+    let mechanism1 = ref([]); //宗教
+    new placeRegister().treeDate2().then((res) => {
+      mechanism1.value.push(res[0]);
+      Getzj(mechanism1.value);
+    });
+
     const onLoad = () => {
       // 异步更新数据
       new placeRegister()
@@ -94,14 +57,40 @@ export default {
           // 加载状态结束
           loading.value = false;
           index++;
-          // console.log(list.value);
           // 数据全部加载完成
           if (records.length < 10) {
             finished.value = true;
           }
         });
+      let placeAddress = "";
+      placeAddress = props.placeAddress.split("/");
+      let itemId = [];
+      let listTwo = [];
+      zjList.value.forEach((item1) => {
+        if (item1.regionLevel5 == placeAddress[2]) {
+          itemId.push(item1.id);
+        }
+      });
+      itemId.forEach((N1) => {
+        if (!listTwo.includes(N1)) {
+          listTwo.push(N1);
+        }
+      });
+      list.value.forEach((item2) => {
+        listTwo.forEach((ID) => {
+          if (ID == item2.officeDTO.id) {
+            list3.value.push(item2);
+          }
+        });
+      });
+      let listOne = [];
+      list3.value.forEach((N2)=>{
+        if(!listOne.includes(N2)){
+          listOne.push(N2)
+        }
+      })
+      list3.value = listOne
     };
-
     //获取宗教部门数组
     function Getzj(list) {
       list.forEach((item) => {
@@ -111,19 +100,18 @@ export default {
         }
       });
     }
-    //获取公安部门数组
-    function Getga(list) {
-      list.forEach((item) => {
-        gaList.value.push(item);
-        if (item.children) {
-          Getga(item.children);
-        }
-      });
+    const close = ()=>{
+      list3.value.splice(0,list3.value.length);
     }
-    // 搜索
-    const value = ref("");
-    const onSearch = (val) => showToast(val);
-    const onCancel = () => showToast("取消");
+    //获取公安部门数组
+    // function Getga(list) {
+    //   list.forEach((item) => {
+    //     gaList.value.push(item);
+    //     if (item.children) {
+    //       Getga(item.children);
+    //     }
+    //   });
+    // }
     // 选择人员
     const checked = ref([]);
     const checkboxRefs = ref([]);
@@ -141,105 +129,40 @@ export default {
       checked.value = val;
       emit("selected", checked.value, 0);
     };
-    let placeAddress = "";
-    watch(
-      () => props.placeAddress,
-      (val) => {
-        placeAddress = props.placeAddress.split("/");
-        let mechanism1 = ref([]); //宗教
-        let mechanism2 = ref([]); //公安
-        new placeRegister().treeDate2().then((res) => {
-          mechanism1.value.push(res[0]);
-          mechanism2.value.push(res[1]);
-          Getzj(mechanism1.value);
-          Getga(mechanism2.value);
-          console.log(zjList);
-          console.log(gaList);
-          if (props.stateType == 0) {
-            let listone = [];
-             console.log('0')
-            zjList.value.forEach((item1) => {
-               console.log('00')
-              if (
-                item1.regionLevel5 == placeAddress[2]
-              ) {
-                let itemId = item1.id;
-                list.value.forEach((item2) => {
-                  if (itemId == item2.officeDTO.id) {
-                    listone.push(item2);
-                  }
-                });
-                list3.value = listone;
-              }if (
-                item1.regionLevel4 == placeAddress[1]
-              ) {
-                let itemId = item1.id;
-                list.value.forEach((item2) => {
-                  if (itemId == item2.officeDTO.id) {
-                    listone.push(item2);
-                  }
-                });
-                list3.value = listone;
-              }
-              if (
-                item1.regionLevel4 == placeAddress[0]
-              ) {
-                let itemId = item1.id;
-                list.value.forEach((item2) => {
-                  if (itemId == item2.officeDTO.id) {
-                    listone.push(item2);
-                  }
-                });
-                list3.value = listone;
-              }
-            });
-          }
-          if (props.stateType == 1) {
-            let listtwo = [];
-            gaList.value.forEach((item3) => {
-              if (
-                item3.regionLevel5 == placeAddress[2]
-              ) {
-                let itemId = item3.id;
-                list.value.forEach((item2) => {
-                  if (itemId == item2.officeDTO.id) {
-                    listtwo.push(item2);
-                  }
-                });
-                list4.value = listtwo;
-              }
-              if (item3.regionLevel4 == placeAddress[1]) {
-                let itemId = item3.id;
-                list.value.forEach((item2) => {
-                  if (itemId == item2.officeDTO.id) {
-                    listtwo.push(item2);
-                  }
-                });
-                list4.value = listtwo;
-              }
-              if (item3.regionLevel3 == placeAddress[0]) {
-                let itemId = item3.id;
-                list.value.forEach((item2) => {
-                  if (itemId == item2.officeDTO.id) {
-                    listtwo.push(item2);
-                  }
-                });
-                list4.value = listtwo;
-              }
-              console.log(listtwo)
-            });
-          }
-        });
-      },
-      {
-        //如果加了这个参数，值为true的话，就消除了惰性，watch会在创建后立即执行一次
-        //那么首次执行，val为默认值,preVal为undefined
-        immediate: true,
-        //这个参数代表监听对象时，可以监听深度嵌套的对象属性
-        //比如message是一个对象的话，可以监听到message.a.b.c，也就是message下的所有属性
-        deep: true,
-      }
-    );
+
+    // let placeAddress = "";
+    // watch(
+    //   () => props.placeAddress,
+    //   (val) => {
+    //     placeAddress = val.split("/");
+    //     let mechanism1 = ref([]); //宗教
+    //     new placeRegister().treeDate2().then((res) => {
+    //       mechanism1.value.push(res[0]);
+    //       Getzj(mechanism1.value);
+    //       let listone = [];
+    //       zjList.value.forEach((item1) => {
+    //         let itemId = '';
+    //         if (item1.regionLevel5 == placeAddress[2]) {
+    //           itemId = item1.id;
+    //           list.value.forEach((item2) => {
+    //             if (itemId == item2.officeDTO.id) {
+    //               listone.push(item2);
+    //             }
+    //           });
+    //           list3.value = listone;
+    //         }
+    //       });
+    //     });
+    //   },
+    //   {
+    //     //如果加了这个参数，值为true的话，就消除了惰性，watch会在创建后立即执行一次
+    //     //那么首次执行，val为默认值,preVal为undefined
+    //     immediate: true,
+    //     //这个参数代表监听对象时，可以监听深度嵌套的对象属性
+    //     //比如message是一个对象的话，可以监听到message.a.b.c，也就是message下的所有属性
+    //     deep: true,
+    //   }
+    // );
 
     return {
       // 人员
@@ -255,7 +178,7 @@ export default {
       // 单选
       selectes,
       list3,
-      list4,
+      close
     };
   },
 };

src/views/placeManage/ManageList2.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="personList">
+    <van-list
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="onLoad"
+    >
+      <van-radio-group v-if="type == 0" v-model="checked">
+        <van-cell-group inset>
+          <van-cell
+            v-for="item in list4"
+            clickable
+            :key="item"
+            :title="item.name"
+            @click="selectes(item)"
+          >
+            <template #right-icon>
+              <van-radio :name="item" />
+            </template>
+          </van-cell>
+        </van-cell-group>
+      </van-radio-group>
+    </van-list>
+  </div>
+</template>
+
+<script>
+import { ref, watch } from "vue";
+import placeRegister from "@/api/placeRegister/placeRegister";
+export default {
+  name: "personList",
+  emits: ["selected"],
+  props: ["type", "placeAddress"],
+  setup(props, { emit }) {
+    const list = ref([]);
+    const list4 = ref([]);
+    const loading = ref(false);
+    const finished = ref(false);
+    let index = 0;
+    let gaList = ref([]);
+    let placeAddress = "";
+    placeAddress = props.placeAddress.split("/");
+    let mechanism2 = ref([]); //公安
+    new placeRegister().treeDate2().then((res) => {
+      mechanism2.value.push(res[1]);
+      Getga(mechanism2.value);
+    });
+    const onLoad = () => {
+      // 异步更新数据
+      new placeRegister()
+        .list({
+          current: index + 1,
+          size: 10,
+        })
+        .then(({ records }) => {
+          list.value.push(...records);
+          // 加载状态结束
+          loading.value = false;
+          index++;
+          // console.log(list.value);
+          // 数据全部加载完成
+          if (records.length < 10) {
+            finished.value = true;
+          }
+        });
+      let itemId = [];
+      let listTwo = [];
+      gaList.value.forEach((item3) => {
+        if (item3.regionLevel5 == placeAddress[2]) {
+          itemId.push(item3.id);
+        }
+      });
+      itemId.forEach((N1) => {
+        if (!listTwo.includes(N1)) {
+          listTwo.push(N1);
+        }
+      });
+      list.value.forEach((item2) => {
+        itemId.forEach((ID) => {
+          if (ID == item2.officeDTO.id) {
+            list4.value.push(item2);
+          }
+        });
+      });
+      let listOne = [];
+      list4.value.forEach((N2)=>{
+        if(!listOne.includes(N2)){
+          listOne.push(N2)
+        }
+      })
+      list4.value = listOne
+    };
+    //获取公安部门数组
+    function Getga(list) {
+      list.forEach((item) => {
+        gaList.value.push(item);
+        if (item.children) {
+          Getga(item.children);
+        }
+      });
+    }
+    //获取宗教部门数组
+    // function Getzj(list) {
+    //   list.forEach((item) => {
+    //     zjList.value.push(item);
+    //     if (item.children) {
+    //       Getzj(item.children);
+    //     }
+    //   });
+    // }
+
+    // 选择人员
+    const checked = ref([]);
+    const checkboxRefs = ref([]);
+    const checkboxGroup = ref(null);
+    const toggle = (index) => {
+      checkboxRefs.value[index].toggle();
+      emit("selected", checked.value, 1);
+    };
+    // 全选
+    const checkAll = () => {
+      checkboxGroup.value.toggleAll(true);
+      emit("selected", checked.value, 1);
+    };
+    const selectes = (val) => {
+      checked.value = val;
+      emit("selected", checked.value, 0);
+    };
+    // let placeAddress = "";
+    // watch(
+    //   () => props.placeAddress,
+    //   (val) => {
+    //     placeAddress = val.split("/");
+
+    //   },
+    //   {
+    //     //如果加了这个参数，值为true的话，就消除了惰性，watch会在创建后立即执行一次
+    //     //那么首次执行，val为默认值,preVal为undefined
+    //     immediate: true,
+    //     //这个参数代表监听对象时，可以监听深度嵌套的对象属性
+    //     //比如message是一个对象的话，可以监听到message.a.b.c，也就是message下的所有属性
+    //     deep: true,
+    //   }
+    // );
+
+    return {
+      // 人员
+      onLoad,
+      loading,
+      finished,
+      // 全选
+      checkAll,
+      toggle,
+      checked,
+      checkboxRefs,
+      checkboxGroup,
+      // 单选
+      selectes,
+      list4,
+    };
+  },
+};
+</script>
+
+<style scoped>
+.personList {
+  height: 65vh;
+  overflow: auto;
+  margin: 10px;
+}
+.van-button {
+  top: -5px;
+}
+.search {
+  height: 40px;
+  line-height: 40px;
+}
+.van-list {
+  height: 80%;
+  margin-top: 5px;
+}
+.keyword {
+  width: 70%;
+  height: 25px;
+  border-radius: 25px;
+  border: 1px solid;
+  padding-left: 15px;
+}
+</style>

src/views/placeManage/placePerson.vue

@@ -1,4 +1,7 @@
 <template>
+<div>
+    <van-nav-bar title="人员档案管理" left-arrow @click-left="onClickLeft" />
+  </div>
   <div class="serach">
     <van-search
       v-model="value"
@@ -260,11 +263,11 @@ export default {
       }
     };
     //返回
-    const goback = () => {
+    const onClickLeft = () => {
       history.back();
     };
     return {
-      goback,
+      onClickLeft,
       value,
       value1,
       option1,

src/views/placeManage/placePersoninfo.vue

@@ -1,19 +1,22 @@
 <template>
+  <div>
+    <van-nav-bar title="人员档案管理" left-arrow @click-left="onClickLeft" />
+  </div>
   <div class="banner">
-    <h2>扎实提升“三力”</h2>
-    <h2>深入推进“三化”</h2>
-    <h2>坚持“三个思维”</h2>
+      <img src="../../../public/loginbg/banner.jpg" alt="" />
   </div>
   <div class="content">
     <div class="itemInfo">
-    <h3 style="color: #40abf4">个人信息-{{data.data.name}}</h3>
+      <h3 style="color: #40abf4">个人信息-{{ data.data.name }}</h3>
       <van-row justify="space-between">
         <van-col span="14">
           <van-row class="item">
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="8"> 姓名： </van-col>
-                <van-col span="8" style="text-align: right"> {{data.data.name}} </van-col>
+                <van-col span="8" style="text-align: right">
+                  {{ data.data.name }}
+                </van-col>
               </van-row>
             </van-col>
           </van-row>
@@ -21,7 +24,9 @@
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="8"> 性别： </van-col>
-                <van-col span="8" style="text-align: right"> {{data.data.sex == 1?'男':'女'}} </van-col>
+                <van-col span="8" style="text-align: right">
+                  {{ data.data.sex == 1 ? "男" : "女" }}
+                </van-col>
               </van-row>
             </van-col>
           </van-row>
@@ -30,10 +35,10 @@
               <van-row justify="space-between">
                 <van-col span="12"> 证件类型： </van-col>
                 <van-col span="6" style="text-align: right">
-                   <span v-if="data.data.idType==1">身份证</span>
-                   <span v-if="data.data.idType==2">护照</span>
-                   <span v-if="data.data.idType==3">港澳通行证</span>
-                   <span v-if="data.data.idType==4">其他</span>
+                  <span v-if="data.data.idType == 1">身份证</span>
+                  <span v-if="data.data.idType == 2">护照</span>
+                  <span v-if="data.data.idType == 3">港澳通行证</span>
+                  <span v-if="data.data.idType == 4">其他</span>
                 </van-col>
               </van-row>
             </van-col>
@@ -48,7 +53,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 证件号码： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.idcard}}
+              {{ data.data.idcard }}
             </van-col>
           </van-row>
         </van-col>
@@ -58,7 +63,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 手机号： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.phone}}
+              {{ data.data.phone }}
             </van-col>
           </van-row>
         </van-col>
@@ -68,7 +73,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 所属场所： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.locationName}}
+              {{ data.data.locationName }}
             </van-col>
           </van-row>
         </van-col>
@@ -78,27 +83,43 @@
           <van-row justify="space-between">
             <van-col span="10"> 人员类型： </van-col>
             <van-col span="14" style="text-align: right">
-              <span v-if="data.data.personnelType==1">宗教从业人员</span>
-              <span v-else-if="data.data.personnelType==2">民族场所从业人员</span>
-              <span v-else-if="data.data.personnelType==3">教职人员</span>
-              <span v-else-if="data.data.personnelType==4">固定信徒</span>
-              <span v-else-if="data.data.personnelType==5">场所居住人员</span>
-              <span v-else-if="data.data.personnelType==6">境外人员</span>
-              <span v-else-if="data.data.personnelType==7">非本市人员</span>
-              <span v-else-if="data.data.personnelType==8">非本教人员</span>
-              <span v-else-if="data.data.personnelType==9">新增信徒人员</span>
-              <span v-else-if="data.data.personnelType==10">临时人员</span>
-              <span v-else-if="data.data.personnelType==11">异常人员</span>
-              <span v-else-if="data.data.personnelType==12">邪教人员</span>
-              <span v-else-if="data.data.personnelType==13">管理人员</span>
-              <span v-else-if="data.data.personnelType==14">全能神离家人员</span>
-              <span v-else-if="data.data.personnelType==15">全能神骨干人员</span>
-              <span v-else-if="data.data.personnelType==16">网络运营人员</span>
-              <span v-else-if="data.data.personnelType==17">涉政有害活动人员</span>
-              <span v-else-if="data.data.personnelType==18">境内外记者</span>
-              <span v-else-if="data.data.personnelType==19">境外法轮功骨干人员</span>
-              <span v-else-if="data.data.personnelType==20">其他邪教骨干人员</span>
-              <span v-else-if="data.data.personnelType==21">心灵法门骨干人员</span>
+              <span v-if="data.data.personnelType == 1">宗教从业人员</span>
+              <span v-else-if="data.data.personnelType == 2"
+                >民族场所从业人员</span
+              >
+              <span v-else-if="data.data.personnelType == 3">教职人员</span>
+              <span v-else-if="data.data.personnelType == 4">固定信徒</span>
+              <span v-else-if="data.data.personnelType == 5">场所居住人员</span>
+              <span v-else-if="data.data.personnelType == 6">境外人员</span>
+              <span v-else-if="data.data.personnelType == 7">非本市人员</span>
+              <span v-else-if="data.data.personnelType == 8">非本教人员</span>
+              <span v-else-if="data.data.personnelType == 9">新增信徒人员</span>
+              <span v-else-if="data.data.personnelType == 10">临时人员</span>
+              <span v-else-if="data.data.personnelType == 11">异常人员</span>
+              <span v-else-if="data.data.personnelType == 12">邪教人员</span>
+              <span v-else-if="data.data.personnelType == 13">管理人员</span>
+              <span v-else-if="data.data.personnelType == 14"
+                >全能神离家人员</span
+              >
+              <span v-else-if="data.data.personnelType == 15"
+                >全能神骨干人员</span
+              >
+              <span v-else-if="data.data.personnelType == 16"
+                >网络运营人员</span
+              >
+              <span v-else-if="data.data.personnelType == 17"
+                >涉政有害活动人员</span
+              >
+              <span v-else-if="data.data.personnelType == 18">境内外记者</span>
+              <span v-else-if="data.data.personnelType == 19"
+                >境外法轮功骨干人员</span
+              >
+              <span v-else-if="data.data.personnelType == 20"
+                >其他邪教骨干人员</span
+              >
+              <span v-else-if="data.data.personnelType == 21"
+                >心灵法门骨干人员</span
+              >
               <span v-else>“精神控制”有害培训骨干人员</span>
             </van-col>
           </van-row>
@@ -109,13 +130,13 @@
           <van-row justify="space-between">
             <van-col span="10"> 从业类型： </van-col>
             <van-col span="14" style="text-align: right">
-              <span v-if="data.data.typeOfEmployees==1">场所负责人</span>
-              <span v-if="data.data.typeOfEmployees==2">堂管会成员</span>
-              <span v-if="data.data.typeOfEmployees==3">小组负责人</span>
-              <span v-if="data.data.typeOfEmployees==4">财会</span>
-              <span v-if="data.data.typeOfEmployees==5">义工</span>
-              <span v-if="data.data.typeOfEmployees==6">保安</span>
-              <span v-if="data.data.typeOfEmployees==7">信息审核员</span>
+              <span v-if="data.data.typeOfEmployees == 1">场所负责人</span>
+              <span v-if="data.data.typeOfEmployees == 2">堂管会成员</span>
+              <span v-if="data.data.typeOfEmployees == 3">小组负责人</span>
+              <span v-if="data.data.typeOfEmployees == 4">财会</span>
+              <span v-if="data.data.typeOfEmployees == 5">义工</span>
+              <span v-if="data.data.typeOfEmployees == 6">保安</span>
+              <span v-if="data.data.typeOfEmployees == 7">信息审核员</span>
             </van-col>
           </van-row>
         </van-col>
@@ -125,7 +146,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 籍贯： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.nativePlace}}
+              {{ data.data.nativePlace }}
             </van-col>
           </van-row>
         </van-col>
@@ -135,7 +156,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 现居地： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.currentResidence}}
+              {{ data.data.currentResidence }}
             </van-col>
           </van-row>
         </van-col>
@@ -145,58 +166,75 @@
           <van-row justify="space-between">
             <van-col span="10"> 详细地址： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.currentResidenceDetail}}
+              {{ data.data.currentResidenceDetail }}
             </van-col>
           </van-row>
         </van-col>
       </van-row>
-      <h3 style="color: #40abf4;margin-top:10px;">拓展信息</h3>
-      <van-row class="item" v-for="(item,index) in data.data.userManagenmetDetailsDTOList" :key="index">
-        <van-col span="24" v-if="item.dataType === '1' && item.dataDictionary==''">
+      <h3 style="color: #40abf4; margin-top: 10px">拓展信息</h3>
+      <van-row
+        class="item"
+        v-for="(item, index) in data.data.userManagenmetDetailsDTOList"
+        :key="index"
+      >
+        <van-col
+          span="24"
+          v-if="item.dataType === '1' && item.dataDictionary == ''"
+        >
           <van-row justify="space-between">
-            <van-col span="10"> {{item.chineseName}} </van-col>
+            <van-col span="10"> {{ item.chineseName }} </van-col>
             <van-col span="14" style="text-align: right">
-              {{item.value}}
+              {{ item.value }}
             </van-col>
           </van-row>
         </van-col>
-        <van-col span="24" v-if="item.dataType === '1' && item.dataDictionary=='hs_religion_type'">
+        <van-col
+          span="24"
+          v-if="
+            item.dataType === '1' && item.dataDictionary == 'hs_religion_type'
+          "
+        >
           <van-row justify="space-between">
-            <van-col span="10"> {{item.chineseName}} </van-col>
+            <van-col span="10"> {{ item.chineseName }} </van-col>
             <van-col span="14" style="text-align: right">
-              <span v-if="item.value==1">伊斯兰教</span>
-              <span v-if="item.value==2">基督教</span>
-              <span v-if="item.value==3">天主教</span>
-              <span v-if="item.value==4">佛教</span>
-              <span v-if="item.value==5">道教</span>
+              <span v-if="item.value == 1">伊斯兰教</span>
+              <span v-if="item.value == 2">基督教</span>
+              <span v-if="item.value == 3">天主教</span>
+              <span v-if="item.value == 4">佛教</span>
+              <span v-if="item.value == 5">道教</span>
             </van-col>
           </van-row>
         </van-col>
-        <van-col span="24" v-if="item.dataType === '1' && item.dataDictionary=='hs_faculty_type'">
+        <van-col
+          span="24"
+          v-if="
+            item.dataType === '1' && item.dataDictionary == 'hs_faculty_type'
+          "
+        >
           <van-row justify="space-between">
-            <van-col span="10"> {{item.chineseName}} </van-col>
+            <van-col span="10"> {{ item.chineseName }} </van-col>
             <van-col span="14" style="text-align: right">
-              <span v-if="item.value==1">负责人</span>
-              <span v-if="item.value==2">牧师</span>
-              <span v-if="item.value==3">长老</span>
-              <span v-if="item.value==4">传道员</span>
-              <span v-if="item.value==5">神学生</span>
+              <span v-if="item.value == 1">负责人</span>
+              <span v-if="item.value == 2">牧师</span>
+              <span v-if="item.value == 3">长老</span>
+              <span v-if="item.value == 4">传道员</span>
+              <span v-if="item.value == 5">神学生</span>
             </van-col>
           </van-row>
         </van-col>
         <van-col span="24" v-if="item.dataType === '5'">
           <van-row justify="space-between">
-            <van-col span="10"> {{item.chineseName}} </van-col>
+            <van-col span="10"> {{ item.chineseName }} </van-col>
             <van-col span="14" style="text-align: right">
-              {{item.value}}
+              {{ item.value }}
             </van-col>
           </van-row>
         </van-col>
         <van-col span="24" v-if="item.dataType === '6'">
           <van-row justify="space-between">
-            <van-col span="10"> {{item.chineseName}} </van-col>
+            <van-col span="10"> {{ item.chineseName }} </van-col>
             <van-col span="14" style="text-align: right">
-              {{item.value}}
+              {{ item.value }}
             </van-col>
           </van-row>
         </van-col>
@@ -206,52 +244,54 @@
           </van-row>
           <van-row>
             <van-col span="10">
-                <img style="width: 100px;height: 100px;" :src="item.value" alt="" />
+              <img
+                style="width: 100px; height: 100px"
+                :src="item.value"
+                alt=""
+              />
             </van-col>
           </van-row>
         </van-col>
       </van-row>
-      
     </div>
   </div>
 </template>
 
 <script>
-import { useRouter } from 'vue-router'
-import {onMounted, reactive,ref} from "vue"
-import $base from "@/utils/config"
+import { useRouter } from "vue-router";
+import { onMounted, reactive, ref } from "vue";
+import $base from "@/utils/config";
 export default {
-  setup(){
+  setup() {
     const data = reactive({
       //个人数据
-      data:{},
-    })
+      data: {},
+    });
     //数据接收
     const router = useRouter();
-    onMounted(()=>{
-      var item = JSON.parse(router.currentRoute.value.query.data)
+    onMounted(() => {
+      var item = JSON.parse(router.currentRoute.value.query.data);
       data.data = item;
-      data.data.workPicture = `${$base}` + data.data.workPicture
-      data.data.userManagenmetDetailsDTOList.forEach(item2 => {
-        if(item2.dataType === '4'){
-          item2.value = `${$base}` + item2.value
+      data.data.workPicture = `${$base}` + data.data.workPicture;
+      data.data.userManagenmetDetailsDTOList.forEach((item2) => {
+        if (item2.dataType === "4") {
+          item2.value = `${$base}` + item2.value;
         }
       });
-
-    })
+    });
     //返回
-    const goback = () => {
+    const onClickLeft = () => {
       history.back();
     };
-    return{
-      goback,
-      data
-    }
-  }
+    return {
+      onClickLeft,
+      data,
+    };
+  },
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 body,
 html {
   margin: 0;
@@ -269,30 +309,14 @@ html {
 }
 .banner {
   background-color: #36a7f3;
-  padding: 20px 50px 40px 50px;
-  color: #fff;
-  h2 {
-    &:nth-child(1) {
-      margin-top: 0px;
-      text-align: left;
-      font-size: 21pt;
-    }
-    &:nth-child(2) {
-      text-align: center;
-      font-size: 21pt;
-    }
-    &:nth-child(3) {
-      text-align: right;
-      font-size: 21pt;
-    }
-  }
+  width: 100%;
 }
 .content {
   position: fixed;
   width: 90%;
   // margin: 0 auto;
   height: 600px;
-  top: 140px;
+  top: 200px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);
@@ -304,24 +328,24 @@ html {
     margin: 0;
     padding: 0;
   }
-  .itemInfo{
+  .itemInfo {
     height: 100%;
-    .item{
-        padding: 15px 0;
-        border-bottom: 1px solid #f2f2f2;
-        .van-col{
-            .van-row{
-                .van-col{
-                    &:nth-child(2){
-                        color: #7f7f7f;
-                    }
-                }
+    .item {
+      padding: 15px 0;
+      border-bottom: 1px solid #f2f2f2;
+      .van-col {
+        .van-row {
+          .van-col {
+            &:nth-child(2) {
+              color: #7f7f7f;
             }
+          }
         }
+      }
     }
-    .personImg{
-        width: 100%;
-        height: 100%;
+    .personImg {
+      width: 100%;
+      height: 100%;
     }
   }
 }

src/views/placeManage/placeRegister.vue

@@ -1,4 +1,7 @@
 <template>
+  <div>
+    <van-nav-bar title="场所录入" left-arrow @click-left="onClickLeft" />
+  </div>
   <div class="main">
     <p class="title">宗教场所录入</p>
     <div class="formArea">
@@ -8,7 +11,7 @@
           v-model="placeActivity.religiousType"
           readonly
           label="宗教教别:"
-          name = "validator"
+          name="validator"
           placeholder="请选择宗教"
           input-align="right"
           right-icon="arrow-down"
@@ -158,7 +161,6 @@
           <manage-list
             @selected="selected"
             :type="0"
-            :stateType="0"
             :placeAddress="placeAddress"
           ></manage-list>
         </van-dialog>
@@ -177,14 +179,13 @@
           v-model:show="showReport"
           title="公安部门管理人员"
           show-cancel-button
-          @confirm="reselected"
+          @confirm="reselected2"
         >
-          <manage-list
-            @selected="selected"
+          <manage-list-2
+            @selected="selected2"
             :type="0"
-            :stateType="1"
             :placeAddress="placeAddress"
-          ></manage-list>
+          ></manage-list-2>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
@@ -227,11 +228,12 @@
 <script>
 import { reactive, ref } from "vue";
 import ManageList from "../placeManage/ManageList.vue";
+import ManageList2 from "../placeManage/ManageList2.vue";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
 export default {
-  components: { ManageList },
+  components: { ManageList, ManageList2 },
   setup() {
-    const goback = () => {
+    const onClickLeft = () => {
       history.back();
     };
 
@@ -242,7 +244,7 @@ export default {
         name: "", //场所名称
         contact: "", //场所联系人
         contactNumber: "", //联系电话
-        placeSelectId:"",//场所地点id
+        placeSelectId: "", //场所地点id
         placeSelectName: "", //场所地点
         place: "", //详细场所地点
         siteType: "", //场所类型
@@ -336,13 +338,6 @@ export default {
     });
     let showPlace1 = ref(false);
     const getPlace1 = ({ selectedOptions }) => {
-      placeAddress.value =
-        selectedOptions[0].id +
-        "/" +
-        selectedOptions[1].id +
-        "/" +
-        selectedOptions[2].id;
-      placeActivity.placeData.placeSelectId = placeAddress.value
       showPlace1.value = false;
       placeActivity.placeData.placeSelectName =
         selectedOptions[0].name +
@@ -350,6 +345,13 @@ export default {
         selectedOptions[1].name +
         "/" +
         selectedOptions[2].name;
+      placeAddress.value =
+        selectedOptions[0].id +
+        "/" +
+        selectedOptions[1].id +
+        "/" +
+        selectedOptions[2].id;
+      placeActivity.placeData.placeSelectId = placeAddress.value;
     };
     //人员选择
     let showPerson = ref(false);
@@ -358,10 +360,18 @@ export default {
       value: [],
       type: "",
     };
+    let list2 = {
+      value: [],
+      type: "",
+    };
     const selected = (val, type) => {
       list.value = val;
       list.type = type;
     };
+    const selected2 = (val, type) => {
+      list2.value = val;
+      list2.type = type;
+    };
     const reselected = () => {
       let ids = [];
       let names = [];
@@ -372,6 +382,21 @@ export default {
         });
         placeActivity.placeData.religiousDeptManaUser = ids.join(",");
         placeActivity.placeData.religiousDeptManaUserName = names.join(",");
+      } else {
+        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;
@@ -413,7 +438,7 @@ export default {
       //图片上传
       afterRead,
       // 返回
-      goback,
+      onClickLeft,
       // 地区选择
       placeAddress,
       customFieldName,
@@ -424,7 +449,9 @@ export default {
       showPerson,
       showReport,
       selected,
+      selected2,
       reselected,
+      reselected2,
       //数据提交
       submit,
     };
@@ -438,6 +465,7 @@ export default {
 }
 .main {
   background: #fff;
+  top: 0px !important;
 }
 .main p {
   height: 40px;

src/views/placeManage/placeTablet.vue

@@ -1,6 +1,14 @@
 <template>
+  <div>
+    <van-nav-bar title="牌位管理" left-arrow @click-left="onClickLeft" />
+  </div>
   <div class="PersonList">
-    <div class="PersonItem" v-for="item in TabletData.data" :key="item.id" @click="goTabletInfo(item)">
+    <div
+      class="PersonItem"
+      v-for="item in TabletData.data"
+      :key="item.id"
+      @click="goTabletInfo(item)"
+    >
       <van-row>
         <van-col span="18">
           <p>
@@ -38,25 +46,25 @@ export default {
     //获取牌位数据
     new TabletServer().list({}).then((res) => {
       TabletData.data = res.records;
-    //   console.log(TabletData.data);
+      //   console.log(TabletData.data);
     });
     //页面跳转以及数据传递
     let router = useRouter();
-    const goTabletInfo = (item)=>{
-        var data = JSON.stringify(item)
-        router.push({
-            path:'/placeTabletInfo',
-            query:{'data':data}
-        })
-    }
+    const goTabletInfo = (item) => {
+      var data = JSON.stringify(item);
+      router.push({
+        path: "/placeTabletInfo",
+        query: { data: data },
+      });
+    };
     //返回
-    const goback = () => {
+    const onClickLeft = () => {
       history.back();
     };
     return {
-      goback,
+      onClickLeft,
       TabletData,
-      goTabletInfo
+      goTabletInfo,
     };
   },
 };

src/views/placeManage/placeTabletInfo.vue

@@ -1,8 +1,9 @@
 <template>
+  <div>
+    <van-nav-bar title="牌位管理" left-arrow @click-left="onClickLeft" />
+  </div>
   <div class="banner">
-    <h2>扎实提升“三力”</h2>
-    <h2>深入推进“三化”</h2>
-    <h2>坚持“三个思维”</h2>
+      <img src="../../../public/loginbg/banner.jpg" alt="" />
   </div>
   <div class="content">
     <div class="itemInfo">
@@ -135,15 +136,17 @@
         <van-col span="24">
           <van-row justify="space-between">
             <van-col span="10">被供奉者信息： </van-col>
-            <van-col span="14" style="text-align: right">{{ dataitem.information}}</van-col>
+            <van-col span="14" style="text-align: right">{{
+              dataitem.information
+            }}</van-col>
           </van-row>
         </van-col>
       </van-row>
       <van-row class="item">
         <van-col span="24">
           <van-row>
-            <van-col span="24" style="margin-bottom:10px;">牌位照片： </van-col>
-            <van-col span="8" v-for="(item,index) in data.pic" :key="index">
+            <van-col span="24" style="margin-bottom: 10px">牌位照片： </van-col>
+            <van-col span="8" v-for="(item, index) in data.pic" :key="index">
               <img class="personImg" :src="item" alt="" />
             </van-col>
           </van-row>
@@ -155,13 +158,13 @@
 
 <script>
 import { useRouter } from "vue-router";
-import { onMounted, reactive ,ref} from "vue";
-import $base from "@/utils/config"
+import { onMounted, reactive, ref } from "vue";
+import $base from "@/utils/config";
 export default {
   setup() {
     const data = reactive({
       siteName: {},
-      pic:[]
+      pic: [],
     });
     //牌位数据
     let dataitem = ref({});
@@ -170,27 +173,27 @@ export default {
     onMounted(() => {
       var item = JSON.parse(router.currentRoute.value.query.data);
       dataitem.value = item;
-      data.siteName = dataitem.value.siteName; 
-      let pic = []
-      pic=dataitem.value.pic.split("|");
-      dataitem.value.pic = pic
-      data.pic = dataitem.value.pic
-      let picList = []
-      data.pic.forEach(item1=>{
+      data.siteName = dataitem.value.siteName;
+      let pic = [];
+      pic = dataitem.value.pic.split("|");
+      dataitem.value.pic = pic;
+      data.pic = dataitem.value.pic;
+      let picList = [];
+      data.pic.forEach((item1) => {
         // item1 = `${$base}`+item1
-        picList.push(`${$base}`+item1)
-      })
-      data.pic = picList
-      console.log(data.pic);
+        picList.push(`${$base}` + item1);
+      });
+      data.pic = picList;
+      // console.log(data.pic);
     });
     //返回
-    const goback = () => {
+    const onClickLeft = () => {
       history.back();
     };
     return {
-      goback,
+      onClickLeft,
       data,
-      dataitem
+      dataitem,
     };
   },
 };
@@ -214,30 +217,14 @@ html {
 }
 .banner {
   background-color: #36a7f3;
-  padding: 20px 50px 40px 50px;
-  color: #fff;
-  h2 {
-    &:nth-child(1) {
-      margin-top: 0px;
-      text-align: left;
-      font-size: 21pt;
-    }
-    &:nth-child(2) {
-      text-align: center;
-      font-size: 21pt;
-    }
-    &:nth-child(3) {
-      text-align: right;
-      font-size: 21pt;
-    }
-  }
+  width: 100%;
 }
 .content {
   position: fixed;
   width: 90%;
   // margin: 0 auto;
   height: 600px;
-  top: 140px;
+  top: 200px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);

src/views/tab_a/tabAll.vue

@@ -96,7 +96,7 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 
 		created(){
 			let id=this.$route.query.id;
-			// window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
 			//this.dataNumber();
 		},

src/views/toBeDone/toBeDone.vue

@@ -1,4 +1,7 @@
 <template>
+  <div>
+    <van-nav-bar title="我的待办" left-arrow @click-left="onClickLeft" />
+  </div>
   <van-tabs
     v-model:active="active"
     title-inactive-color="#bdbdbd"
@@ -6,50 +9,93 @@
   >
     <van-tab title="待处理">
       <div class="list1">
-        <van-row class="list-item" v-for="item in toBeDone.toBeDoneList" :key="item.id" @click="goToBeDoneinfo(item)">
+        <van-row
+          class="list-item"
+          v-for="item in toBeDone.toBeDoneList"
+          :key="item.id"
+          @click="goToBeDoneinfo(item)"
+        >
           <van-col span="6" class="list-item-left">
             <div>
-              <p style="color: #a3a3a3">{{item.createDate.split(' ')[0]}}</p>
-              <p style="color: #a3a3a3">{{item.createDate.split(' ')[1]}}</p>
+              <p style="color: #a3a3a3">{{ item.createDate.split(" ")[0] }}</p>
+              <p style="color: #a3a3a3">{{ item.createDate.split(" ")[1] }}</p>
             </div>
-            <p v-if="item.assignState==1" style="color: red; margin-top: 10px">已发起</p>
-            <p v-else-if="item.assignState==2" style="color: red; margin-top: 10px">待办中</p>
-            <p v-if="item.assignState==5" style="color: red; margin-top: 10px">已超期</p>
+            <p
+              v-if="item.assignState == 1"
+              style="color: red; margin-top: 10px"
+            >
+              已发起
+            </p>
+            <p
+              v-else-if="item.assignState == 2"
+              style="color: red; margin-top: 10px"
+            >
+              待办中
+            </p>
+            <p
+              v-if="item.assignState == 5"
+              style="color: red; margin-top: 10px"
+            >
+              已超期
+            </p>
           </van-col>
-          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+          <van-col
+            span="18"
+            style="border-left: 1px solid #e3e3e3"
+            class="list-item-right"
+          >
             <van-row>
-              <van-col span="24" style="height:50px;overflow: hidden;">
+              <van-col span="24" style="height: 50px; overflow: hidden">
                 <span v-html="item.problemContent"></span>
               </van-col>
             </van-row>
             <van-row justify="space-between">
-              <van-col span="12">{{item.areaSelectName}}</van-col>
-              <van-col span="8">{{item.assignTypeName}}</van-col>
+              <van-col span="12">{{ item.areaSelectName }}</van-col>
+              <van-col span="8">{{ item.assignTypeName }}</van-col>
             </van-row>
           </van-col>
-        </van-row> 
+        </van-row>
       </div>
     </van-tab>
     <van-tab title="已处理">
       <div class="list1">
-        <van-row class="list-item" v-for="item in toBeDone.toBeDoneList2" :key="item.id" @click="goToBeDoneinfo(item)">
+        <van-row
+          class="list-item"
+          v-for="item in toBeDone.toBeDoneList2"
+          :key="item.id"
+          @click="goToBeDoneinfo(item)"
+        >
           <van-col span="6" class="list-item-left">
             <div>
-              <p style="color: #a3a3a3">{{item.createDate.split(' ')[0]}}</p>
-              <p style="color: #a3a3a3">{{item.createDate.split(' ')[1]}}</p>
+              <p style="color: #a3a3a3">{{ item.createDate.split(" ")[0] }}</p>
+              <p style="color: #a3a3a3">{{ item.createDate.split(" ")[1] }}</p>
             </div>
-            <p v-if="item.assignState==3" style="color: red; margin-top: 10px">已反馈</p>
-            <p v-if="item.assignState==4" style="color: red; margin-top: 10px">已归档</p>
+            <p
+              v-if="item.assignState == 3"
+              style="color: red; margin-top: 10px"
+            >
+              已反馈
+            </p>
+            <p
+              v-if="item.assignState == 4"
+              style="color: red; margin-top: 10px"
+            >
+              已归档
+            </p>
           </van-col>
-          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+          <van-col
+            span="18"
+            style="border-left: 1px solid #e3e3e3"
+            class="list-item-right"
+          >
             <van-row>
-              <van-col span="24" style="height:50px;overflow: hidden;">
+              <van-col span="24" style="height: 50px; overflow: hidden">
                 <span v-html="item.problemContent"></span>
               </van-col>
             </van-row>
             <van-row justify="space-between">
-              <van-col span="12">{{item.areaSelectName}}</van-col>
-              <van-col span="8">{{item.assignTypeName}}</van-col>
+              <van-col span="12">{{ item.areaSelectName }}</van-col>
+              <van-col span="8">{{ item.assignTypeName }}</van-col>
             </van-row>
           </van-col>
         </van-row>
@@ -59,55 +105,53 @@
 </template>
 
 <script>
-import {onMounted,reactive,ref} from "vue"
-import { useRouter } from 'vue-router'
-import ToBeDone from '@/api/toBeDone/toBeDone'
+import { onMounted, reactive, ref } from "vue";
+import { useRouter } from "vue-router";
+import ToBeDone from "@/api/toBeDone/toBeDone";
 export default {
-  
   setup() {
-    const toBeDone =reactive({
+    const toBeDone = reactive({
       //未处理
-      toBeDoneList:[],
+      toBeDoneList: [],
       //已处理
-      toBeDoneList2:[]
-    })
+      toBeDoneList2: [],
+    });
     const active = ref(0);
     //获取待办列表
-    let workDBList = ref([])
-    new ToBeDone().list({}).then((res)=>{
-      workDBList.value.push(...res.records)
+    let workDBList = ref([]);
+    new ToBeDone().list({}).then((res) => {
+      workDBList.value.push(...res.records);
       toBeDone.toBeDoneList = workDBList;
-      
-    })
-    new ToBeDone().list2({}).then((res)=>{
+    });
+    new ToBeDone().list2({}).then((res) => {
       toBeDone.toBeDoneList2.push(...res.records);
-    })
+    });
     //跳转
-    let router = useRouter()
+    let router = useRouter();
     //数据接收
-    onMounted(()=>{
-      var item = JSON.parse(router.currentRoute.value.query.name)
-      if(item==1){
-        active.value = 1
+    onMounted(() => {
+      var item = JSON.parse(router.currentRoute.value.query.name);
+      if (item == 1) {
+        active.value = 1;
       }
-    })
-    const goToBeDoneinfo = (item)=>{
-      let data = JSON.stringify(item)
+    });
+    const goToBeDoneinfo = (item) => {
+      let data = JSON.stringify(item);
       router.push({
-        path:"/toBeDone_details",
-        query:{'data':data}
-      })
-    }
-    const goback = ()=>{
+        path: "/toBeDone_details",
+        query: { data: data },
+      });
+    };
+    const onClickLeft = () => {
       history.back();
-    }
+    };
     return {
-      goback,
+      onClickLeft,
       toBeDone,
       goToBeDoneinfo,
-      active 
-    }
-  }
+      active,
+    };
+  },
 };
 </script>
 
@@ -117,7 +161,6 @@ html {
   margin: 0;
   padding: 0;
   background-color: #f2f2f2;
-  
 }
 .van-nav-bar {
   background-color: #36a7f3;
@@ -144,21 +187,21 @@ html {
         padding: 0;
       }
     }
-    .list-item-right{
-      .van-row{
-        &:nth-child(1){
+    .list-item-right {
+      .van-row {
+        &:nth-child(1) {
           padding: 0 10px;
           font-size: 16px;
           font-weight: 700;
-          letter-spacing:2px
+          letter-spacing: 2px;
         }
-        &:nth-child(2){
+        &:nth-child(2) {
           margin-top: 10px;
           padding: 0 10px;
           color: #c0c0c0;
           font-size: 14px;
-          .van-col{
-            &:nth-child(2){
+          .van-col {
+            &:nth-child(2) {
               text-align: right;
             }
           }

src/views/toBeDone/toBeDone_details.vue

@@ -1,8 +1,9 @@
 <template>
+  <div>
+    <van-nav-bar title="我的待办" left-arrow @click-left="onClickLeft" />
+  </div>
   <div class="banner">
-    <h2>扎实提升“三力”</h2>
-    <h2>深入推进“三化”</h2>
-    <h2>坚持“三个思维”</h2>
+      <img src="../../../public/loginbg/banner.jpg" alt="" />
   </div>
   <div class="content">
     <div class="content-top">
@@ -16,9 +17,7 @@
       <p>详细地址：{{ PersonInfo.data.areaSelectName }}</p>
       <p>发生时间：{{ PersonInfo.data.problemTime }}</p>
       <p>截止时间：{{ PersonInfo.data.deadlineTime }}</p>
-      <p>
-        问题附件：{{PersonInfo.data.problemAccessory}}
-      </p>
+      <p>问题附件：{{ PersonInfo.data.problemAccessory }}</p>
     </div>
     <div class="content-bottom">
       <p>处理结果：</p>
@@ -79,7 +78,7 @@ export default {
       // })
     });
     //返回事件
-    const goback = () => {
+    const onClickLeft = () => {
       history.back();
     };
     //待办反馈提交
@@ -98,14 +97,14 @@ export default {
             path: "/toBeDone",
           });
         });
-      }else{
+      } else {
         router.push({
-          path:'/toBeDone'
-        })
+          path: "/toBeDone",
+        });
       }
     };
     return {
-      goback,
+      onClickLeft,
       PersonInfo,
       submit,
     };
@@ -132,27 +131,13 @@ html {
 }
 .banner {
   background-color: #36a7f3;
-  padding: 20px 50px 40px 50px;
-  color: #fff;
-  h2 {
-    &:nth-child(1) {
-      margin-top: 0px;
-      text-align: left;
-    }
-    &:nth-child(2) {
-      text-align: center;
-    }
-    &:nth-child(3) {
-      text-align: right;
-    }
-  }
+  width: 100%;
 }
 .content {
   position: fixed;
-  // width: 85%;
-  margin: 0 auto;
+  width: 85%;
   height: 600px;
-  top: 140px;
+  top: 200px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);