Merge remote-tracking branch 'HS_MZAP/master'

# Conflicts:
#	src/views/tab_a/tabAll.vue

src/api/placeActivity/placeActivityServer.js

@@ -1,9 +1,16 @@
 import request from '@/utils/request'
 export default class placeActivityServer {
+    // 保存
+    save(inputForm) {
+        return request(
+            '/reporting/reportingActivities/save',
+            inputForm
+        )
+    }
     list(params) {
-        return request.get({
-            url: '/reporting/reportingActivities/list',
-            params: params
-        })
+        return request.get(
+            `/reporting/reportingActivities/list`,
+            params
+        )
     }
 }

src/api/sys/tools.js

@@ -1,12 +1,19 @@
+import request from '@/utils/request'
 export default class Tools {
     treeData() {
-            return request.get('/tools/area_yc/treeData');
-        }
-        // 获取人员信息
-    list(params) {
-        return request({
-            url: '/user/usermanagement/userManagement/list',
-            params: params
-        })
+        return request.get(`/tools/area_yc/treeData`);
+    };
+    // 获取人员信息
+    personList(params) {
+        return request.get(
+            `/user/usermanagement/userManagement/list`,
+            params
+        )
+    };
+    placeList(params) {
+        return request.get(
+            `/religioussites/siteinfo/religiousSitesInfo/list`,
+            params
+        )
     }
 }

src/api/toBeDone/toBeDone.js

@@ -0,0 +1,10 @@
+import request from "@/utils/httpRequest";
+
+export default class toBeDone {
+    list(params) {
+        return request.get(
+            ``,
+            params
+        )
+    }
+}

src/api/user/UserManage.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+export default class UserManage {
+    list(params) {
+        return request.get(
+            `/user/usermanagement/userManagement/list`,
+            params
+        )
+    }
+}

src/utils/request.js

@@ -1,12 +1,12 @@
-import axios from "axios";          //引入axios
-import sysConfig from '@/config'    //引入配置文件
+import axios from "axios"; //引入axios
+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   //设置请求超时时间
+axios.defaults.baseURL = sysConfig.baseUrl //设置请求时间
+axios.defaults.timeout = sysConfig.timeout //设置请求超时时间
 const ContentType = sysConfig.ContentType
 
 //axios.defaults.headers["Content-Type"] = "application/json";
@@ -19,7 +19,7 @@ axios.defaults.headers["Content-Type"] = "application/x-www-form-urlencoded";
 /** 请求发送前拦截，用于配置求情内容，如headers参数等 */
 axios.interceptors.request.use(
     (config) => {
-        config.headers.token=window.localStorage.getItem('MZ_TOKEN');
+        config.headers.token = window.localStorage.getItem('MZ_TOKEN');
         return config
     },
     (error) => {
@@ -27,34 +27,34 @@ axios.interceptors.request.use(
     }
 )
 
-function error1(res){
-	if (res.status == 408 || res.status == 401) {// 需要重新登录
-        store.commit('setPcToken',"");
-		console.log(res.data);
+function error1(res) {
+    if (res.status == 408 || res.status == 401) { // 需要重新登录
+        store.commit('setPcToken', "");
+        console.log(res.data);
         // window.xm.showToast({
         //     message:res.data
         // })
-	}else if(res.status === 404){
-        console.log("404，路径找不到："+res.data.path);
+    } else if (res.status === 404) {
+        console.log("404，路径找不到：" + res.data.path);
         // window.xm.showToast({
         //     message:"404，路径找不到："+res.data.path
         // })
-	}else if(res.status === 503){
+    } else if (res.status === 503) {
         console.log("服务不可用");
         // window.xm.showToast({
         //     message:"服务不可用"
         // })
-	}else if(res.status === 504){
+    } else if (res.status === 504) {
         console.log("网络连接错误");
         // window.xm.showToast({
         //     message:"网络连接错误"
         // })
-	}else{
+    } else {
         console.log(res.data);
         // window.xm.showToast({
         //     message:res.data
         // })
-	}
+    }
 }
 
 /** 请求发送后返回拦截，用于处理数据格式等 */
@@ -63,11 +63,11 @@ axios.interceptors.response.use(
         return response
     },
     (error) => {
-		if(error.request){
-			error1(error.request);
-		} else if(error.response){
+        if (error.request) {
+            error1(error.request);
+        } else if (error.response) {
 
-		}
+        }
         return error
     }
 )
@@ -84,13 +84,13 @@ var http = {
      * @param {*} config    请求的config相关配置
      * @returns
      */
-    get: function (url, params = {}, config = {}) {
+    get: function(url, params = {}, config = {}) {
         return new Promise((resolve, reject) => {
             axios({
-                url: url+"?"+params,
+                url: url,
                 method: 'get',
-                //params: qs.stringify(params),
-                //params: params,
+                params: params,
+                // params: params,
                 config: config
             }).then((response) => {
                 resolve(response.data)
@@ -109,7 +109,7 @@ var http = {
      * @param {*} config   请求的config相关配置
      * @returns
      */
-    post: function (url, data = {}, params = {}, config = {}) {
+    post: function(url, data = {}, params = {}, config = {}) {
         return new Promise((resolve, reject) => {
             axios({
                 url: url,
@@ -119,11 +119,11 @@ var http = {
                 //params: qs.stringify(params),
                 config: config
             }).then((response) => {
-				//if(response.data && response.data.statusCode !== 200){
-				// 	error(response.data);
-				// 	reject(response.data)
-				// }
-				// resolve(response.data);
+                //if(response.data && response.data.statusCode !== 200){
+                // 	error(response.data);
+                // 	reject(response.data)
+                // }
+                // resolve(response.data);
 
                 resolve(response);
             }).catch((error) => {
@@ -133,5 +133,4 @@ var http = {
     }
 }
 
-export default http;
-
+export default http;

src/views/activityMan/personList.vue

@@ -13,44 +13,47 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <!-- <van-cell title="全选">
-        <template #right-icon>
-          <input type="checkbox" v-model="isAll" @change="selectAll" />
-        </template>
-      </van-cell>
-      <van-cell v-for="(item, index) in list" :key="item" :title="item">
-        <template #right-icon>
-          <input
-            type="checkbox"
-            :ref="getList"
-            @change="selectPerson(item, index)"
-          />
-        </template>
-      </van-cell> -->
-      <van-checkbox-group v-model="checked">
+      <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 title="全选">
-            <template #right-icon>
-              <input type="checkbox" v-model="isAll" @change="selectAll" />
-            </template>
-          </van-cell>
           <van-cell
             v-for="(item, index) in list"
             clickable
             :key="item"
-            :title="`复选框 ${item}`"
+            :title="item.name"
             @click="toggle(index)"
           >
             <template #right-icon>
               <van-checkbox
+                shape="square"
                 :name="item"
                 :ref="(el) => (checkboxRefs[index] = el)"
-                @click.stop
               />
             </template>
           </van-cell>
         </van-cell-group>
       </van-checkbox-group>
+      <van-radio-group v-if="type == 0" v-model="checked">
+        <van-cell-group inset>
+          <van-cell
+            v-for="item in list"
+            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>
@@ -61,109 +64,70 @@ import tools from "@/api/sys/tools";
 export default {
   name: "personList",
   emits: ["selected"],
+  props: ["type"],
   setup(props, { emit }) {
-    const list = [];
+    const list = ref([]);
     const loading = ref(false);
     const finished = ref(false);
-    // let index = 0;
-    // const onLoad = () => {
-    //   // 异步更新数据
-    //   new tools()
-    //     .list({
-    //       current: index + 1,
-    //       size: 10,
-    //     })
-    //     .then(({ data }) => {
-    //       console.log("获取数据", data);
-    //       // list.push(data);
-    //       // // 数据全部加载完成
-    //       // if (data.length < 10) {
-    //       //   finished.value = true;
-    //       // }
-    //     });
-    //   // 加载状态结束
-    //   loading.value = false;
-    //   index++;
-    // };
+    let index = 0;
     const onLoad = () => {
       // 异步更新数据
-      // setTimeout 仅做示例，真实场景中一般为 ajax 请求
-      setTimeout(() => {
-        for (let i = 0; i < 10; i++) {
-          list.value.push(list.value.length + 1);
-        }
-
-        // 加载状态结束
-        loading.value = false;
-
-        // 数据全部加载完成
-        if (list.value.length >= 40) {
-          finished.value = true;
-        }
-      }, 1000);
+      new tools()
+        .personList({
+          current: index + 1,
+          size: 10,
+        })
+        .then(({ records }) => {
+          list.value.push(...records);
+          // 加载状态结束
+          loading.value = false;
+          index++;
+          // 数据全部加载完成
+          if (records.length < 10) {
+            finished.value = true;
+          }
+        });
     };
-    const checked = ref([]);
-    const checkboxRefs = ref([]);
-    const toggle = (index) => {
-      checkboxRefs.value[index].toggle();
-    };
-
-    onBeforeUpdate(() => {
-      checkboxRefs.value = [];
-    });
-
     // 搜索
     const value = ref("");
     const onSearch = (val) => showToast(val);
     const onCancel = () => showToast("取消");
     // 选择人员
-    let selects = [];
+    const checked = ref([]);
+    const checkboxRefs = ref([]);
+    const checkboxGroup = ref(null);
+    const toggle = (index) => {
+      checkboxRefs.value[index].toggle();
+      emit("selected", checked.value, 1);
+    };
     // 全选
-    let isAll = ref(false);
-    let checks = [];
-    const getList = (el) => {
-      checks.push(el);
+    const checkAll = () => {
+      checkboxGroup.value.toggleAll(true);
+      emit("selected", checked.value, 1);
     };
-    const selectAll = () => {
-      checks.forEach((item) => {
-        item.checked = isAll.value;
-      });
-      if (isAll) {
-        selects = list;
-      } else {
-        selects = [];
-      }
-      emit("selected", selects.join(","));
+    const selectes = (val) => {
+      checked.value = val;
+      emit("selected", checked.value, 0);
     };
-    const selectPerson = (value, index) => {
-      if (checks[index].checked) {
-        selects.push(value);
-      } else {
-        selects.splice(selects.indexOf(value), 1);
-      }
 
-      if (selects.length == getList.length) {
-        isAll.value = true;
-      } else {
-        isAll.value = false;
-      }
-      emit("selected", selects.join(","));
-    };
     return {
+      // 人员
       list,
       onLoad,
       loading,
       finished,
-      selectPerson,
+      // 搜索
       value,
       onSearch,
       onCancel,
-      selectAll,
-      getList,
-      isAll,
+      // 全选
+      checkAll,
       toggle,
       checked,
       checkboxRefs,
+      checkboxGroup,
+      // 单选
+      selectes,
     };
   },
 };

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -36,10 +36,12 @@
         </div>
         <van-cell is-link to="placeActivityInfo">
           <template #title>
-            {{ item.portname }}申请于{{ item.place }}举办{{ item.activity }}活动
+            {{ item.reporter.name }}申请于{{ item.placeDel }}举办{{
+              item.activityName
+            }}活动
           </template>
           <template #label>
-            {{ item.activityPlace + " " + item.address }}
+            {{ item.place }}
           </template>
         </van-cell>
       </div>
@@ -52,7 +54,7 @@
 </template>
 
 <script>
-import { reactive, ref } from "vue";
+import { reactive, ref, toRaw, toRef } from "vue";
 import router from "@/router";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 export default {
@@ -69,24 +71,7 @@ export default {
     // 切换
     let tabIndex = ref(0);
     // 列表
-    const list = reactive([
-      {
-        activity: "测试",
-        place: "基督教",
-        activityTime: "2023-03-28 13:00",
-        countPerson: "100",
-        list: "11,22,33",
-        portname: "张三",
-        area: "",
-        activityPlace: "盐都区/张庄街道",
-        address: "1111",
-        money: "",
-        activityName: "李四",
-        tel: "",
-        file: "",
-        into: "1111",
-      },
-    ]);
+    let list = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     let index = 0;
@@ -97,17 +82,16 @@ export default {
           current: index + 1,
           size: 10,
         })
-        .then(({ data }) => {
-          console.log("获取数据", data);
-          // list.push(data);
-          // // 数据全部加载完成
-          // if (data.length < 10) {
-          //   finished.value = true;
-          // }
+        .then((res) => {
+          list.value.push(...res.records) ;
+          // 加载状态结束
+          loading.value = false;
+          index++;
+          // 数据全部加载完成
+          if (res.records.length < 10) {
+            finished.value = true;
+          }
         });
-      // 加载状态结束
-      loading.value = false;
-      index++;
     };
     // 搜索
     let value = ref("");

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -11,7 +11,7 @@
       <p class="miniTitle">基础信息</p>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.activity"
+          v-model="placeActivity.activityName"
           center
           label="活动名称:"
           placeholder="请填写活动名称"
@@ -20,7 +20,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.place"
+          v-model="placeActivity.siteName.name"
           readonly
           required
           label="场所名称:"
@@ -33,6 +33,7 @@
           <van-picker
             title="活动场所"
             :columns="places"
+            :columns-field-names="customFieldName"
             @cancel="showPlace = false"
             @confirm="getPlace"
           />
@@ -64,7 +65,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.countPerson"
+          v-model="placeActivity.participantsNum"
           center
           label="参会人数:"
           placeholder="请填写参会人数"
@@ -74,7 +75,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.list"
+          v-model="placeActivity.knownList.name"
           center
           required
           label="已知名单:"
@@ -89,12 +90,12 @@
           show-cancel-button
           @confirm="reselected"
         >
-          <person-list @selected="selected"></person-list>
+          <person-list @selected="selected" :type="1"></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.portname"
+          v-model="placeActivity.reporter.id"
           center
           label="报告人:"
           placeholder="请选择报告人"
@@ -104,7 +105,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.area"
+          v-model="placeActivity.participation"
           center
           label="参加范围:"
           placeholder="请填写参加范围"
@@ -113,7 +114,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.activityPlace"
+          v-model="placeActivity.place"
           center
           readonly
           label="活动地点:"
@@ -129,12 +130,13 @@
             :options="options"
             @close="showArea = false"
             @finish="onFinish"
+            :field-names="fieldNames"
           />
         </van-popup>
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.address"
+          v-model="placeActivity.placeDel"
           center
           label="详细地址:"
           placeholder="请填写活参加地点"
@@ -144,7 +146,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.money"
+          v-model="placeActivity.sourceFunds"
           center
           label="经费来源:"
           placeholder="请选择"
@@ -153,7 +155,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.activityName"
+          v-model="placeActivity.activityPerson.name"
           center
           label="活动负责人:"
           placeholder="请选择活动负责人"
@@ -165,13 +167,14 @@
           v-model:show="showReport"
           title="选择活动负责人"
           show-cancel-button
+          @confirm="reselected"
         >
-          <person-list></person-list>
+          <person-list @selected="selected" :type="0"></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.tel"
+          v-model="placeActivity.phone"
           center
           type="tel"
           label="联系方式:"
@@ -191,7 +194,7 @@
       <van-cell-group>
         <div class="rowTextArea">
           <van-field
-            v-model="placeActivity.into"
+            v-model="placeActivity.subjectContent"
             center
             rows="2"
             type="textarea"
@@ -202,7 +205,7 @@
       </van-cell-group>
     </div>
     <div class="subbtn">
-      <van-button type="primary">提交</van-button>
+      <van-button type="primary" @click="submit">提交</van-button>
       <van-button type="default" hairline>取消</van-button>
     </div>
   </div>
@@ -212,10 +215,9 @@
 import { reactive, ref } from "vue";
 import personList from "../personList.vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
-import tools from '@/api/sys/tools'
+import tools from "@/api/sys/tools";
 export default {
   components: { personList },
-  tools:new tools(),
   setup() {
     // 返回
     const onClickLeft = () => {
@@ -223,33 +225,53 @@ export default {
     };
     // 活动信息
     const placeActivity = reactive({
-      activity: "",
-      place: "",
-      activityTime: "",
-      countPerson: "",
-      list: "",
-      portname: "",
-      area: "",
-      activityPlace: "",
-      address: "",
-      money: "",
+      id: "",
       activityName: "",
-      tel: "",
-      file: "",
-      into: "",
+      siteName: {
+        id: "",
+      },
+      activityTime: "",
+      participantsNum: "",
+      knownList: {
+        id: "",
+        name: "",
+      },
+      subjectContent: "",
+      reporter: {
+        id: "",
+      },
+      participation: "",
+      place: "",
+      placeDel: "",
+      sourceFunds: "",
+      safetyPlan: "",
+      activityPerson: {
+        id: "",
+        name: "",
+      },
+      phone: "",
+      state: "0",
+      assessment: "0",
     });
     // 场所名称
-    const places = [
-      { text: "杭州", value: "Hangzhou" },
-      { text: "宁波", value: "Ningbo" },
-      { text: "温州", value: "Wenzhou" },
-      { text: "绍兴", value: "Shaoxing" },
-      { text: "湖州", value: "Huzhou" },
-    ];
+    let places = ref([]);
+    const customFieldName = {
+      text: "name",
+      value: "id",
+    };
+    new tools()
+      .placeList({
+        current: 1,
+        size: 10000,
+      })
+      .then(({ records }) => {
+        places.value.push(...records);
+      });
     let showPlace = ref(false);
     const getPlace = ({ selectedOptions }) => {
+      // console.log("选择",selectedOptions);
       showPlace.value = false;
-      placeActivity.place = selectedOptions[0].text;
+      placeActivity.siteName = selectedOptions[0];
     };
     // 获取活动时间
     let showAct = ref(false);
@@ -265,45 +287,60 @@ export default {
     let showPerson = ref(false);
     // 活动负责人
     let showReport = ref(false);
-    // const show = () => {
-    //   showPerson = true;
-    // };
-    let list = "";
-    const selected = (val) => {
-      list = val;
+    let list = {
+      value: [],
+      type: "",
+    };
+    const selected = (val, type) => {
+      list.value = val;
+      list.type = type;
+      console.log("选择", list);
     };
     const reselected = () => {
-      placeActivity.list = list;
+      let ids = [];
+      let names = [];
+      if (list.type == 1) {
+        list.value.forEach((item) => {
+          ids.push(item.id);
+          names.push(item.name);
+        });
+        placeActivity.knownList.id = ids.join(",");
+        placeActivity.knownList.name = names.join(",");
+      } else {
+        placeActivity.activityPerson.id = list.value.id;
+        placeActivity.activityPerson.name = list.value.name;
+      }
     };
     // 地区选择
     let showArea = ref(false);
     const cascaderValue = ref("");
-    tools.treeData().then((res) => {
-      console.log("area", res);
-    });
+    const fieldNames = {
+      text: "name",
+      value: "code",
+      children: "children",
+    };
     // 选项列表，children 代表子选项，支持多级嵌套
-    const options = [
-      {
-        text: "浙江省",
-        value: "330000",
-        children: [{ text: "杭州市", value: "330100" }],
-      },
-      {
-        text: "江苏省",
-        value: "320000",
-        children: [{ text: "南京市", value: "320100" }],
-      },
-    ];
+    let options = ref([]);
+    new tools().treeData().then((res) => {
+      options.value.push(res[0]);
+    });
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
       showArea.value = false;
-      placeActivity.activityPlace = selectedOptions
-        .map((option) => option.text)
+      placeActivity.place = selectedOptions
+        .map((option) => option.name)
         .join("/");
     };
+    // 提交数据
+    const submit = () => {
+      new placeActivityServer().save({placeActivity}).then((res) => {
+        console.log("提交", res);
+      });
+    };
     return {
       placeActivity,
       // 活动场所
+      customFieldName,
       showPlace,
       places,
       getPlace,
@@ -321,9 +358,11 @@ export default {
       reselected,
       // 地区选择
       showArea,
+      fieldNames,
       options,
       onFinish,
       cascaderValue,
+      submit,
     };
   },
 };

src/views/placeManage/placePerson.vue

@@ -11,30 +11,44 @@
       <template #action>
         <div @click="onClickButton">
           <van-dropdown-menu>
-            <van-dropdown-item overlay="false" v-model="value1" :options="option1" />
+            <van-dropdown-item
+              overlay="false"
+              v-model="value1"
+              :options="option1"
+            />
           </van-dropdown-menu>
         </div>
       </template>
     </van-search>
   </div>
   <div class="PersonList">
-    <div class="PersonItem" v-for="item in Person.PersonList" :key="item.id" @click="goPlacePersonInfo">
+    <div
+      class="PersonItem"
+      v-for="item in Person.PersonList"
+      :key="item.id"
+      @click="goPlacePersonInfo"
+    >
       <van-row>
         <van-col span="18">
-            <p>{{item.name}}（<span style="color:#36a7f3;">{{item.id}}</span>）</p>
+          <p>
+            {{ item.name }}（<span style="color: #36a7f3">{{ item.idcard }}</span
+            >）
+          </p>
         </van-col>
         <van-col span="6">
-            <p v-if="item.church == '基督教'" style="color:#36a7f3;">基督教</p>
-            <p v-else-if="item.church == '佛教'" style="color:#e4dd65;">佛教</p>
-            <p v-else-if="item.church == '伊斯兰教'" style="color:#52ca7d;">伊斯兰教</p>
+          <p v-if="item.church == '基督教'" style="color: #36a7f3">基督教</p>
+          <p v-else-if="item.church == '佛教'" style="color: #e4dd65">佛教</p>
+          <p v-else-if="item.church == '伊斯兰教'" style="color: #52ca7d">
+            伊斯兰教
+          </p>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="18">
-            <p>{{item.address}}</p>
+          <p>{{ item.nativePlace }}</p>
         </van-col>
         <van-col span="6">
-            <p>{{item.position}}</p>
+          <p>{{ item.position }}</p>
         </van-col>
       </van-row>
     </div>
@@ -42,8 +56,10 @@
 </template>
 
 <script>
-import { reactive,ref } from "vue";
-import { useRouter } from 'vue-router'
+import { reactive, ref } from "vue";
+import { useRouter } from "vue-router";
+import UserManage from "@/api/user/UserManage";
+import { List } from 'vant';
 export default {
   setup() {
     const value = ref("");
@@ -55,49 +71,65 @@ export default {
       { text: "伊斯兰教", value: 3 },
     ];
     const Person = reactive({
-        PersonList:[
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'基督教',
-                address:'盐都基督教总教',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'佛教',
-                address:'盐城永宁寺',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'基督教',
-                address:'盐都基督教总教',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'基督教',
-                address:'盐都基督教总教',
-                position:'教职人员'
-            },
-            {
-                name:'孙辉',
-                id:'320902198901523010',
-                church:'伊斯兰教',
-                address:'盐都清真寺',
-                position:'教职人员'
-            },
-        ]
-    })
+      PersonList: [
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "基督教",
+          address: "盐都基督教总教",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "佛教",
+          address: "盐城永宁寺",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "基督教",
+          address: "盐都基督教总教",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "基督教",
+          address: "盐都基督教总教",
+          position: "教职人员",
+        },
+        {
+          name: "孙辉",
+          id: "320902198901523010",
+          church: "伊斯兰教",
+          address: "盐都清真寺",
+          position: "教职人员",
+        },
+      ],
+    });
     //跳转
-    let router = useRouter()
-    const goPlacePersonInfo = ()=>{
-      router.push("/placePersoninfo")
-    }
+    let router = useRouter();
+    const goPlacePersonInfo = () => {
+      router.push("/placePersoninfo");
+    };
+
+    //数据获取
+    let list = ref([])
+    const loading = ref(false);
+    const finished = ref(false);
+    new UserManage()
+      .list({
+        current:  1,
+        size: 10,
+      })
+      .then((res) => {
+        // console.log(res);
+        list.value.push(...res.records)
+        Person.PersonList = list
+      });
+
     //返回
     const goback = () => {
       history.back();
@@ -108,7 +140,9 @@ export default {
       value1,
       option1,
       Person,
-      goPlacePersonInfo
+      loading,
+      finished,
+      goPlacePersonInfo,
     };
   },
 };
@@ -139,48 +173,47 @@ html {
 .PersonList {
   background-color: #fff;
   margin-top: 20px;
-  height: 600px;
-  p{
+  height: 100vh;
+  p {
     margin: 0;
     padding: 0;
   }
-  .PersonItem{
+  .PersonItem {
     padding: 10px 10px;
     font-size: 16px;
     border-bottom: 1px solid #f2f2f2;
-    .van-row{
-        &:nth-child(1){
-            margin-bottom: 10px;
-            .van-col{
-                &:nth-child(1){
-                    p{
-                        font-weight: 700;
-                    }
-                }
-                &:nth-child(2){
-                    p{
-                        text-align: right;
-                    }
-                }
+    .van-row {
+      &:nth-child(1) {
+        margin-bottom: 10px;
+        .van-col {
+          &:nth-child(1) {
+            p {
+              font-weight: 700;
+            }
+          }
+          &:nth-child(2) {
+            p {
+              text-align: right;
             }
+          }
         }
-        &:nth-child(2){
-            .van-col{
-                &:nth-child(1){
-                    p{
-                        color: #d0d0d0;
-                    }
-                }
-                &:nth-child(2){
-                    p{
-                        text-align: right;
-                        color: #d0d0d0;
-                    }
-                }
+      }
+      &:nth-child(2) {
+        .van-col {
+          &:nth-child(1) {
+            p {
+              color: #d0d0d0;
+            }
+          }
+          &:nth-child(2) {
+            p {
+              text-align: right;
+              color: #d0d0d0;
             }
+          }
         }
+      }
     }
   }
-  
 }
 </style>

src/views/placeManage/placePersoninfo.vue

@@ -227,7 +227,19 @@
 </template>
 
 <script>
-export default {};
+import { reactive,ref } from "vue";
+export default {
+  setup(){
+    
+    //返回
+    const goback = () => {
+      history.back();
+    };
+    return{
+      goback
+    }
+  }
+};
 </script>
 
 <style lang="less">

src/views/placeManage/placeRegister.vue

@@ -182,19 +182,12 @@ export default {
 </script>
 
 <style lang="less">
-body,
-html {
+* {
   margin: 0;
   padding: 0;
 }
-.van-nav-bar {
-  background-color: #36a7f3;
-  .van-nav-bar__title {
-    color: #fff;
-  }
-  .van-badge__wrapper {
-    color: #fff;
-  }
+.main {
+  background: #fff;
 }
 .main p {
   height: 40px;
@@ -243,8 +236,7 @@ html {
   color: #36a7f3;
   top: -4px;
 }
-.van-dialog {
-  width: 80%;
-  top: 50%;
+.van-radio {
+  margin-right: 10px;
 }
 </style>

src/views/tab_a/tabAll.vue

@@ -89,7 +89,7 @@ import onlineXm from "../../utils/onlineXm"
 		},
 
 		created(){
-			let id=this.$route.query.id;			
+			let id=this.$route.query.id;
 			this.TokenLogin();
 			this.getBannerImg();//获取轮播图
 			this.getSelectColor();//获取主题颜色
@@ -104,7 +104,7 @@ import onlineXm from "../../utils/onlineXm"
 				history.back();
 			},
 			tohd_jc(){
-				//this.onlineXm.xmNavTo("../activityMan\siteInspection\siteInspectionList");	
+				//this.onlineXm.xmNavTo("../activityMan\siteInspection\siteInspectionList");
 				this.$router.push("/siteInspectionList");
 			},
 			tohd_af(){
@@ -137,8 +137,8 @@ import onlineXm from "../../utils/onlineXm"
 						this.$store.commit('setUser',res.account);
 
 					//})//上线取消注释
-					
-				}			
+
+				}
 
 			},
 
@@ -153,8 +153,8 @@ import onlineXm from "../../utils/onlineXm"
 				let bs=[];
 				for(let i=0;i<res.records.length;i++){
 					bs.push(res.records[i].bannerImg);
-				}		
-				//需添加url拼接		
+				}
+				//需添加url拼接
 				//this.BannerImgurls=bs;
 				//console.log(this.BannerImgurls);
 			},
@@ -171,8 +171,8 @@ import onlineXm from "../../utils/onlineXm"
 				console.log(res.records[0].selectColor.substring(1, 7));
 				//存PCtoken
 				this.$store.commit('setSelectColor',res.records[0].selectColor.substring(1, 7));
-				
-				
+
+
 			},
 
 			//测试接口，可删除