更新

src/api/placeActivity/placeActivityServer.js

@@ -6,11 +6,17 @@ export default class placeActivityServer {
             '/reporting/reportingActivities/save',
             inputForm
         )
-    }
+    };
+    // 修改
+    queryById(id) {
+        return request.get(
+            '/reporting/reportingActivities/queryById', { id: id }
+        )
+    };
     list(params) {
         return request.get(
             `/reporting/reportingActivities/list`,
             params
         )
-    }
+    };
 }

src/api/user/UserManage.js

@@ -7,4 +7,9 @@ export default class UserManage {
             params
         )
     }
+    queryById(id) {
+        return request.get(
+            '/user/usermanagement/userManagement/queryById', { id: id }
+        )
+    }
 }

src/main.js

@@ -8,7 +8,7 @@ import axios from 'axios';
 
 
 
-import { NavBar, Button, Form, Field, CellGroup, Tabbar, TabbarItem, Icon, Toast, Image as VanImage, Grid, GridItem, Row, Col, Tab, Tabs, Popup, PickerGroup, DatePicker, TimePicker, Picker, Uploader, Dialog, List, Cell, Cascader, Search, RadioGroup, Radio, DropdownMenu, DropdownItem, SwipeCell, Checkbox, CheckboxGroup,Swipe, SwipeItem } from 'vant';
+import { NavBar, Button, Form, Field, CellGroup, Tabbar, TabbarItem, Icon, Toast, Image as VanImage, Grid, GridItem, Row, Col, Tab, Tabs, Popup, PickerGroup, DatePicker, TimePicker, Picker, Uploader, Dialog, List, Cell, Cascader, Search, RadioGroup, Radio, DropdownMenu, DropdownItem, SwipeCell, Checkbox, CheckboxGroup, Swipe, SwipeItem, Loading } from 'vant';
 import 'vant/lib/index.css';
 import store from './store';
 
@@ -52,6 +52,7 @@ app.use(router)
     .use(CheckboxGroup)
     .use(Swipe)
     .use(SwipeItem)
+    .use(Loading)
 
 app.config.globalProperties.$API = api
 app.config.globalProperties.$axios = axios

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -47,16 +47,22 @@
       </div>
       <template #right>
         <van-button square type="danger" text="删除" class="button" />
-        <van-button square type="primary" text="修改" class="button" />
+        <van-button
+          square
+          type="primary"
+          text="修改"
+          class="button"
+          @click="updateItem(item)"
+        />
       </template>
     </van-swipe-cell>
   </van-list>
 </template>
 
 <script>
-import { reactive, ref, toRaw, toRef } from "vue";
-import router from "@/router";
+import { ref } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
+import { useRouter } from "vue-router";
 export default {
   name: "placeActivityList",
   setup() {
@@ -64,6 +70,7 @@ export default {
     const onClickLeft = () => {
       history.back();
     };
+    let router = useRouter();
     // 上报
     const onClickRight = () => {
       router.push("placeActivity");
@@ -83,7 +90,7 @@ export default {
           size: 10,
         })
         .then((res) => {
-          list.value.push(...res.records) ;
+          list.value.push(...res.records);
           // 加载状态结束
           loading.value = false;
           index++;
@@ -110,6 +117,13 @@ export default {
           });
       }
     };
+    // 修改跳转
+    const updateItem = (val) => {
+      router.push({
+        path: "/placeActivity",
+        query: { id: val.id },
+      });
+    };
     return {
       onClickLeft,
       list,
@@ -120,6 +134,7 @@ export default {
       onClickRight,
       tabIndex,
       beforeClose,
+      updateItem,
     };
   },
 };

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -5,7 +5,10 @@
     left-arrow
     @click-left="onClickLeft"
   />
-  <div class="main">
+  <van-loading size="24px" vertical v-if="isLoading" color="#0094ff"
+    >加载中...</van-loading
+  >
+  <div class="main" v-if="!isLoading">
     <p class="title">场所活动上报</p>
     <div class="formArea">
       <p class="miniTitle">基础信息</p>
@@ -98,7 +101,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.reporter.id"
+          v-model="placeActivity.reporter.name"
           center
           label="报告人:"
           placeholder="请选择报告人"
@@ -215,23 +218,28 @@
 </template>
 
 <script>
-import { reactive, ref } from "vue";
+import { ref, onMounted } from "vue";
 import personList from "../personList.vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import tools from "@/api/sys/tools";
+import UserManage from "@/api/user/UserManage";
+import { useRoute } from "vue-router";
 export default {
   components: { personList },
   setup() {
+    // 加载
+    let isLoading = ref(true);
     // 返回
     const onClickLeft = () => {
       history.back();
     };
     // 活动信息
-    const placeActivity = reactive({
+    let placeActivity = ref({
       id: "",
       activityName: "",
       siteName: {
         id: "",
+        name: "",
       },
       activityTime: "",
       participantsNum: "",
@@ -242,6 +250,7 @@ export default {
       subjectContent: "",
       reporter: {
         id: "",
+        name: "",
       },
       participation: "",
       place: "",
@@ -256,6 +265,24 @@ export default {
       state: "0",
       assessment: "0",
     });
+    // 根据路由初始化
+    let route = useRoute();
+    onMounted(() => {
+      if (route.query) {
+        new placeActivityServer().queryById(route.query.id).then((data) => {
+          placeActivity.value = data;
+          let ids = data.knownList.id.split(",");
+          placeActivity.value.knownList.name = "";
+          ids.forEach((item) => {
+            new UserManage().queryById(item).then((data) => {
+              placeActivity.value.knownList.name += data.name + ",";
+            });
+          });
+
+          isLoading.value = false;
+        });
+      }
+    });
     // 场所名称
     let places = ref([]);
     const customFieldName = {
@@ -274,7 +301,7 @@ export default {
     const getPlace = ({ selectedOptions }) => {
       // console.log("选择",selectedOptions);
       showPlace.value = false;
-      placeActivity.siteName = selectedOptions[0];
+      placeActivity.value.siteName = selectedOptions[0];
     };
     // 获取活动时间
     let showAct = ref(false);
@@ -283,7 +310,7 @@ export default {
     const columnsType = ["hour", "minute", "second"];
     const getTime = () => {
       showAct.value = false;
-      placeActivity.activityTime = `${currentDate.value.join(
+      placeActivity.value.activityTime = `${currentDate.value.join(
         "-"
       )} ${currentTime.value.join(":")}`;
     };
@@ -298,7 +325,6 @@ export default {
     const selected = (val, type) => {
       list.value = val;
       list.type = type;
-      console.log("选择", list);
     };
     const reselected = () => {
       let ids = [];
@@ -308,11 +334,11 @@ export default {
           ids.push(item.id);
           names.push(item.name);
         });
-        placeActivity.knownList.id = ids.join(",");
-        placeActivity.knownList.name = names.join(",");
+        placeActivity.value.knownList.id = ids.join(",");
+        placeActivity.value.knownList.name = names.join(",");
       } else {
-        placeActivity.activityPerson.id = list.value.id;
-        placeActivity.activityPerson.name = list.value.name;
+        placeActivity.value.activityPerson.id = list.value.id;
+        placeActivity.value.activityPerson.name = list.value.name;
       }
     };
     // 地区选择
@@ -331,17 +357,18 @@ export default {
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
       showArea.value = false;
-      placeActivity.place = selectedOptions
+      placeActivity.value.place = selectedOptions
         .map((option) => option.name)
         .join("/");
     };
     // 提交数据
     const submit = () => {
-      new placeActivityServer().save(placeActivity).then((res) => {
+      new placeActivityServer().save(placeActivity.value).then((res) => {
         console.log("提交", res);
       });
     };
     return {
+      isLoading,
       placeActivity,
       // 活动场所
       customFieldName,

src/views/tab_a/tabAll.vue

@@ -60,9 +60,9 @@
 	</div>
 
 	<van-grid :border="false" >
-		<van-grid-item icon="../../../loginbg/hd_cshd.png" to="/placeActivityList" text="场所活动" />
-		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" to="/selfMeetingList" text="私设聚会点" />
-		<van-grid-item icon="../../../loginbg/hd_xjqz.png" to="/abnormalCrowd" text="信教群众异常" />
+		<van-grid-item icon="../../../loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
+		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
+		<van-grid-item icon="../../../loginbg/hd_xjqz.png" @click="abnormalCrowd" text="信教群众异常" />
 		<van-grid-item icon="../../../loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
 		<van-grid-item icon="../../../loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
 		<van-grid-item icon="../../../loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
@@ -116,7 +116,16 @@ import onlineXm from "../../utils/onlineXm"
 			tohd_qt(){
 				this.$router.push("/securityFacilitiesErrList");
 			},
-
+			// 活动场所
+			placeActivity(){
+				this.$router.push("/placeActivityList")
+			},
+			selfMeetingList(){
+				this.$router.push("/selfMeetingList")
+			},
+			abnormalCrowd(){
+				this.$router.push("/abnormalCrowd")
+			},
 			async TokenLogin(){
 
 				let that=this;