Halaman utama Jelajahi Bantuan
Daftar Masuk
yin_yu820
/
HS_MZAP
1
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

Merge remote-tracking branch 'HS_MZAP/master'

# Conflicts:
#	src/api/index.js
#	src/utils/request.js
#	src/views/tab_a/tabAll.vue
yin_yu820 2 tahun lalu
induk
30c35212c2 843968a92d
melakukan
7925e388d0
13 mengubah file dengan 406 tambahan dan 182 penghapusan
Unified View Tampilkan Statistik Diff
  1. 1 1
      public/index.html
  2. 6 0
      src/api/placeActivity/placeActivityServer.js
  3. 8 0
      src/router/index.js
  4. 127 100
      src/styles/index.css
  5. 77 0
      src/views/activityMan/placeactivity/placeActivityInfo.vue
  6. 99 29
      src/views/activityMan/placeactivity/placeActivityList.vue
  7. 8 2
      src/views/activityMan/placeactivity/placeActivityView.vue
  8. 44 22
      src/views/activityMan/selfMeetingReport/selfMeetingList.vue
  9. 9 2
      src/views/placeManage/placePerson.vue
  10. 1 1
      src/views/placeManage/placePersoninfo.vue
  11. 15 21
      src/views/placeManage/placeRegister.vue
  12. 1 1
      src/views/tab_a/tabAll.vue
  13. 10 3
      src/views/toBeDone/toBeDone.vue

+ 1 - 1
public/index.html
Tampilan Berkas 

@@ -8,7 +8,7 @@
 
     <title><%= htmlWebpackPlugin.options.title %></title>
 
     <title><%= htmlWebpackPlugin.options.title %></title>
 
 
 
     <!--小程序SDK 只有在小程序容器中才能加载到 -->
 
     <!--小程序SDK 只有在小程序容器中才能加载到 -->
 
-	  <!-- <script src="shinemosdk://20000/index.js"></script> -->
 
+	  <script src="shinemosdk://20000/index.js"></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <noscript>
 
     <noscript>

+ 6 - 0
src/api/placeActivity/placeActivityServer.js
Tampilan Berkas 

@@ -0,0 +1,6 @@
 
+import request from '@/utils/request'
 
+export default class placeActivityServer {
 
+    treeData() {
 
+        return request.get('/tools/area_yc/treeData');
 
+    }
 
+}

+ 8 - 0
src/router/index.js
Tampilan Berkas 

@@ -72,6 +72,14 @@ const routes = [{
 
         meta: {
 
         meta: {
 
             isShowTarbar: true,
 
             isShowTarbar: true,
 
         }
 
         }
 
+    }, {
 
+        path: '/placeActivityInfo',
 
+        name: 'placeActivityInfo',
 
+        component: () =>
 
+            import ('../views/activityMan/placeactivity/placeActivityInfo.vue'),
 
+        meta: {
 
+            isShowTarbar: true,
 
+        }
 
     }, {
 
     }, {
 
         path: '/selfMeetingList',
 
         path: '/selfMeetingList',
 
         name: 'selfMeetingList',
 
         name: 'selfMeetingList',

+ 127 - 100
src/styles/index.css
Tampilan Berkas 

@@ -1,131 +1,158 @@
 
 /*公用样式 开始----*/
 
 /*公用样式 开始----*/
 
+
 
+
 
 /*字体黑，正文常用*/
 
 /*字体黑，正文常用*/
 
-.textRegular{
 
-	font-size: 12sp;
 
-	color: #262A30;
 
-}
 
-.textRed{
 
-	font-size: 13sp;
 
-	color: red;
 
-	font-weight: 700;
 
-	padding-top: 8px;
 
-}
 
-.textBlue{
 
-	font-size: 13sp;
 
-	color:#00aaff;
 
-	font-weight: 700;
 
-	padding-top: 8px;
 
-}
 
-.verticalLine{
 
-	width: 2px;
 
-	margin-top: 10px;
 
-	margin-bottom: 12px;	
-	background-color: rgb(236, 232, 232);
 
-}
 
-.hLine{
 
-	width: 100%;
 
-	height: 5px;
 
-	margin-bottom: 12px;	
-	background-color: #F2F2F2;
 
-}
 
-.flexll{
 
-	display: flex;
 
-}
 
-.flexll2{
 
-	display: flex;
 
-	flex-direction: column;
 
+
 
+.textRegular {
 
+    font-size: 12sp;
 
+    color: #262A30;
 
+}
 
+
 
+.textRed {
 
+    font-size: 13sp;
 
+    color: red;
 
+    font-weight: 700;
 
+    padding-top: 8px;
 
+}
 
+
 
+.textBlue {
 
+    font-size: 13sp;
 
+    color: #00aaff;
 
+    font-weight: 700;
 
+    padding-top: 8px;
 
+}
 
+
 
+.verticalLine {
 
+    width: 2px;
 
+    margin-top: 10px;
 
+    margin-bottom: 12px;
 
+    background-color: rgb(236, 232, 232);
 
 }
 
 }
 
 
 
+.hLine {
 
+    width: 100%;
 
+    height: 5px;
 
+    margin-bottom: 12px;
 
+    background-color: #F2F2F2;
 
+}
 
+
 
+.flexll {
 
+    display: flex;
 
+}
 
+
 
+.flexll2 {
 
+    display: flex;
 
+    flex-direction: column;
 
+}
 
+
 
+
 
 /*----公用样式 结束*/
 
 /*----公用样式 结束*/
 
 
 
+
 
 /*页面*/
 
 /*页面*/
 
-.d1{
 
-	display: flex;
 
-	width: 100%;	
-	justify-content: center;
 
+
 
+.d1 {
 
+    display: flex;
 
+    width: 100%;
 
+    justify-content: center;
 
 }
 
 }
 
-.logo{		
-	width: 20%;
 
-	padding-top: 90px;
 
-	margin-bottom: 80px;
 
+
 
+.logo {
 
+    width: 20%;
 
+    padding-top: 90px;
 
+    margin-bottom: 80px;
 
 }
 
 }
 
-.changetype{		
-	color: #00aaff;
 
-	font-size: 3px;
 
-	padding-top: 30px;
 
-	padding-left: 30px;
 
-	padding-bottom: 10px;
 
+
 
+.changetype {
 
+    color: #00aaff;
 
+    font-size: 3px;
 
+    padding-top: 30px;
 
+    padding-left: 30px;
 
+    padding-bottom: 10px;
 
 }
 
 }
 
 
 
+
 
 /*tabAll */
 
 /*tabAll */
 
-.tabtitlelay{
 
-	display: flex;
 
-	border-bottom: 2px rgb(236, 232, 232) solid;
 
+
 
+.tabtitlelay {
 
+    display: flex;
 
+    border-bottom: 2px rgb(236, 232, 232) solid;
 
 }
 
 }
 
-.tabtitle1{
 
-	width: 8px;
 
-	margin-top: 10px;
 
-	margin-left: 10px;
 
-	margin-right: 8px;
 
-	margin-bottom: 12px;
 
-	height: 23px;	
-	background-color: #0293EB;
 
+
 
+.tabtitle1 {
 
+    width: 8px;
 
+    margin-top: 10px;
 
+    margin-left: 10px;
 
+    margin-right: 8px;
 
+    margin-bottom: 12px;
 
+    height: 23px;
 
+    background-color: #0293EB;
 
 }
 
 }
 
-.tabtitle{
 
-	margin-top: 12px;
 
-	margin-bottom: 12px;
 
-	font-weight: bold;
 
+
 
+.tabtitle {
 
+    margin-top: 12px;
 
+    margin-bottom: 12px;
 
+    font-weight: bold;
 
 }
 
 }
 
-.tabtitle2{
 
-	margin-top: 12px;
 
+
 
+.tabtitle2 {
 
+    margin-top: 12px;
 
 }
 
 }
 
-.tabtitle3{
 
-	margin-top: 12px;
 
-	color: red;
 
+
 
+.tabtitle3 {
 
+    margin-top: 12px;
 
+    color: red;
 
 }
 
 }
 
-.tabtitle4{
 
-	margin-top: 12px;
 
+
 
+.tabtitle4 {
 
+    margin-top: 12px;
 
 }
 
 }
 
-.tabtitle5{
 
-	margin-left: auto;
 
-	padding-left: 20px;
 
-	padding-right: 20px;
 
-	padding-top: 12px;
 
-	padding-bottom: 12px;
 
+
 
+.tabtitle5 {
 
+    margin-left: auto;
 
+    padding-left: 20px;
 
+    padding-right: 20px;
 
+    padding-top: 12px;
 
+    padding-bottom: 12px;
 
 }
 
 }
 
 
 
-.ffl2{
 
-	flex-grow: 1;
 
-	display: flex;
 
-	flex-direction: column;
 
-	align-items: center;
 
-	padding: 20px;
 
+.ffl2 {
 
+    flex-grow: 1;
 
+    display: flex;
 
+    flex-direction: column;
 
+    align-items: center;
 
+    padding: 20px;
 
 }
 
 }
 
 
 
 
 
 /*setting */
 
 /*setting */
 
-.touxiang{
 
-	margin-left: 50px;
 
-	margin-top: 50px;
 
+
 
+.touxiang {
 
+    margin-left: 50px;
 
+    margin-top: 50px;
 
 }
 
 }
 
-.setffl{
 
-	display: flex;
 
-	flex-direction: column;
 
-	margin-top: 60px;
 
-	margin-left: 15px;
 
+
 
+.setffl {
 
+    display: flex;
 
+    flex-direction: column;
 
+    margin-top: 60px;
 
+    margin-left: 15px;
 
 }
 
 }
 
-.settingtex1{
 
-	font-size: large;
 
+
 
+.settingtex1 {
 
+    font-size: large;
 
 }
 
 }
 
-.settingtex2{
 
-	margin-top: 5px;
 
-	color: coral;
 
+
 
+.settingtex2 {
 
+    margin-top: 5px;
 
+    color: coral;
 
 }
 
 }
 
-.settingtex3{
 
-	margin-top: 5px;
 
+
 
+.settingtex3 {
 
+    margin-top: 5px;
 
 }
 
 }
 
 
 
-.settingtitlelay{
 
-	display: flex;
 
-	margin-top: 30px;
 
+.settingtitlelay {
 
+    display: flex;
 
+    margin-top: 30px;
 
 }
 
 }

+ 77 - 0
src/views/activityMan/placeactivity/placeActivityInfo.vue
Tampilan Berkas 

@@ -0,0 +1,77 @@
 
+<template>
 
+  <van-nav-bar
 
+    fixed
 
+    title="场所活动"
 
+    left-text=""
 
+    left-arrow
 
+    @click-left="onClickLeft"
 
+  />
 
+  <div class="banner"></div>
 
+  <div class="info">
 
+    <p>活动名称：{{ placeActivity.activity }}</p>
 
+    <p>场所名称：{{placeActivity.place}}</p>
 
+    <p>发起人：{{ placeActivity.portname }}</p>
 
+    <p>参会人数：{{placeActivity.countPerson}}</p>
 
+    <p>活动地点：{{placeActivity.activityPlace}}</p>
 
+    <p>详细地址：{{placeActivity.address}}</p>
 
+    <p>活动时间：{{placeActivity.activityTime}}</p>
 
+    <p>安全预案：<span style="color: #6892ff">活动申请书</span></p>
 
+    <p>主题内容：{{placeActivity.into}}</p>
 
+  </div>
 
+  <van-button type="primary" class="btn-sub">审核</van-button>
 
+</template>
 
+  
+  <script>
 
+import { reactive } from "vue";
 
+export default {
 
+  setup() {
 
+    const onClickLeft = () => {
 
+      history.back();
 
+    };
 
+    // 活动信息
 
+    const placeActivity = 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",
 
+    });
 
+    return {
 
+      onClickLeft,
 
+      placeActivity,
 
+    };
 
+  },
 
+};
 
+</script>
 
+  
+<style lang="less">
 
+.banner {
 
+  height: 30vh;
 
+  background: #36a7f3;
 
+}
 
+.info {
 
+  position: relative;
 
+  width: 86vw;
 
+  // height: 120px;
 
+  margin: 10px auto;
 
+  padding: 10px;
 
+  background: #fff;
 
+  border-radius: 20px;
 
+  top: -50px;
 
+  font-size: 14px;
 
+}
 
+.btn-sub {
 
+  width: 90%;
 
+  border-radius: 20px;
 
+  margin-left: 5%;
 
+}
 
+</style>

+ 99 - 29
src/views/activityMan/placeactivity/placeActivityList.vue
Tampilan Berkas 

@@ -1,81 +1,151 @@
 
 <template>
 
 <template>
 
   <van-nav-bar
 
   <van-nav-bar
 
+    fixed
 
     title="场所活动"
 
     title="场所活动"
 
     left-text=""
 
     left-text=""
 
+    right-text="上报"
 
     left-arrow
 
     left-arrow
 
     @click-left="onClickLeft"
 
     @click-left="onClickLeft"
 
+    @click-right="onClickRight"
 
   />
 
   />
 
-  <van-search
 
-  v-model="value"
 
-  shape="round"
 
-  placeholder="请输入搜索关键词"
 
-/>
 
+  <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
 
   <van-list
 
   <van-list
 
     v-model:loading="loading"
 
     v-model:loading="loading"
 
     :finished="finished"
 
     :finished="finished"
 
     finished-text="没有更多了"
 
     finished-text="没有更多了"
 
     @load="onLoad"
 
     @load="onLoad"
 
   >
 
   >
 
-    <van-button type="primary" size="small" to="/placeActivity">新增</van-button>
 
-    <van-cell v-for="item in list" :key="item" :title="item" label="2222" is-link>
 
-      <template #value>
 
-        11111
 
+    <!-- tab切换 -->
 
+    <div class="nav_tab">
 
+      <div class="tab active">未审核</div>
 
+      <div class="tab">已审核</div>
 
+    </div>
 
+    <van-swipe-cell v-for="item in list" :key="item">
 
+      <div class="list_item">
 
+        <div class="item-left">
 
+          <p style="color: #c4c4c4">{{ item.activityTime }}</p>
 
+          <p style="color: red">待审核</p>
 
+        </div>
 
+        <van-cell is-link to="placeActivityInfo">
 
+          <template #title>
 
+            {{ item.portname }}申请于{{ item.place }}举办{{ item.activity }}活动
 
+          </template>
 
+          <template #label>
 
+            {{ item.activityPlace + " " + item.address }}
 
+          </template>
 
+        </van-cell>
 
+      </div>
 
+      <template #right>
 
+        <van-button square type="danger" text="删除" class="button" />
 
+        <van-button square type="primary" text="修改" class="button" />
 
       </template>
 
       </template>
 
-    </van-cell>
 
+    </van-swipe-cell>
 
   </van-list>
 
   </van-list>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
-import { ref } from "vue";
 
+import { reactive, ref } from "vue";
 
+import router from "@/router";
 
 export default {
 
 export default {
 
   name: "placeActivityList",
 
   name: "placeActivityList",
 
   setup() {
 
   setup() {
 
+    // 返回
 
     const onClickLeft = () => {
 
     const onClickLeft = () => {
 
       history.back();
 
       history.back();
 
     };
 
     };
 
-    const list = ref([]);
 
+    // 上报
 
+    const onClickRight = () => {
 
+      router.push("placeActivity");
 
+    };
 
+    // 列表
 
+    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",
 
+      },
 
+    ]);
 
     const loading = ref(false);
 
     const loading = ref(false);
 
     const finished = ref(false);
 
     const finished = ref(false);
 
 
 
     const onLoad = () => {
 
     const onLoad = () => {
 
       // 异步更新数据
 
       // 异步更新数据
 
       // setTimeout 仅做示例，真实场景中一般为 ajax 请求
 
       // setTimeout 仅做示例，真实场景中一般为 ajax 请求
 
-      setTimeout(() => {
 
-        for (let i = 0; i < 10; i++) {
 
-          list.value.push(list.value.length + 1);
 
-        }
 
+      // setTimeout(() => {
 
+      //   for (let i = 0; i < 10; i++) {
 
+      //     list.value.push(list.value.length + 1);
 
+      //   }
 
 
 
-        // 加载状态结束
 
-        loading.value = false;
 
+      // 加载状态结束
 
+      loading.value = false;
 
 
 
-        // 数据全部加载完成
 
-        if (list.value.length >= 10) {
 
-          finished.value = true;
 
-        }
 
-      }, 1000);
 
+      // 数据全部加载完成
 
+      // if (list.value.length >= 10) {
 
+      //   finished.value = true;
 
+      // }
 
+      // }, 1000);
 
     };
 
     };
 
     // 搜索
 
     // 搜索
 
-    let value = ref('');
 
+    let value = ref("");
 
     return {
 
     return {
 
       onClickLeft,
 
       onClickLeft,
 
       list,
 
       list,
 
       onLoad,
 
       onLoad,
 
       loading,
 
       loading,
 
       finished,
 
       finished,
 
-      value
 
+      value,
 
+      onClickRight,
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };
 
 </script>
 
 </script>
 
 
 
 <style>
 
 <style>
 
-.van-button {
 
-  top: -5px;
 
+body {
 
+  background: #f5f5f5;
 
+}
 
+.nav_tab {
 
+  width: 100vw;
 
+  display: flex;
 
+  text-align: center;
 
+  background: #fff;
 
+  margin: 10px 0;
 
+}
 
+.tab {
 
+  flex: 1;
 
+  line-height: 40px;
 
+  font-size: 14px;
 
+}
 
+.active {
 
+  background: #36a7f3;
 
+  color: #fff;
 
 }
 
 }
 
-
 
 .van-list {
 
 .van-list {
 
   height: 80%;
 
   height: 80%;
 
   margin-top: 5px;
 
   margin-top: 5px;
 
 }
 
 }
 
-
 
+.list_item {
 
+  display: flex;
 
+  background: #fff;
 
+}
 
+.item-left {
 
+  text-align: center;
 
+  width: 30%;
 
+  font-size: 12px;
 
+  border-right: 1px solid #eee;
 
+}
 
+.button {
 
+  height: 100%;
 
+}
 
 </style>
 
 </style>

+ 8 - 2
src/views/activityMan/placeactivity/placeActivityView.vue
Tampilan Berkas 

@@ -211,6 +211,7 @@
 
 <script>
 
 <script>
 
 import { reactive, ref } from "vue";
 
 import { reactive, ref } from "vue";
 
 import personList from "../personList.vue";
 
 import personList from "../personList.vue";
 
+import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 
 export default {
 
 export default {
 
   components: { personList },
 
   components: { personList },
 
   setup() {
 
   setup() {
 
@@ -267,7 +268,6 @@ export default {
 
     };
 
     };
 
     let list = "";
 
     let list = "";
 
     const selected = (val) => {
 
     const selected = (val) => {
 
-      
       list = val;
 
       list = val;
 
     };
 
     };
 
     const reselected = () => {
 
     const reselected = () => {
 
@@ -276,6 +276,9 @@ export default {
 
     // 地区选择
 
     // 地区选择
 
     let showArea = ref(false);
 
     let showArea = ref(false);
 
     const cascaderValue = ref("");
 
     const cascaderValue = ref("");
 
+    new placeActivityServer().treeData().then((res) => {
 
+      console.log("area", res);
 
+    });
 
     // 选项列表，children 代表子选项，支持多级嵌套
 
     // 选项列表，children 代表子选项，支持多级嵌套
 
     const options = [
 
     const options = [
 
       {
 
       {
 
@@ -329,6 +332,9 @@ export default {
 
   margin: 0;
 
   margin: 0;
 
   padding: 0;
 
   padding: 0;
 
 }
 
 }
 
+.main {
 
+  background: #fff;
 
+}
 
 .main p {
 
 .main p {
 
   height: 40px;
 
   height: 40px;
 
   line-height: 40px;
 
   line-height: 40px;
 
@@ -353,7 +359,7 @@ export default {
 
   line-height: 40px;
 
   line-height: 40px;
 
 }
 
 }
 
 .van-cell__value .van-field__right-icon .van-icon-location {
 
 .van-cell__value .van-field__right-icon .van-icon-location {
 
-  color: #36a7f3!important;
 
+  color: #36a7f3 !important;
 
 }
 
 }
 
 .rowTextArea::v-deep .van-field__value {
 
 .rowTextArea::v-deep .van-field__value {
 
   width: 98%;
 
   width: 98%;

+ 44 - 22
src/views/activityMan/selfMeetingReport/selfMeetingList.vue
Tampilan Berkas 

@@ -1,25 +1,45 @@
 
 <template>
 
 <template>
 
   <van-nav-bar
 
   <van-nav-bar
 
+    fixed
 
     title="私设聚会点"
 
     title="私设聚会点"
 
     left-text=""
 
     left-text=""
 
+    right-text="上报"
 
     left-arrow
 
     left-arrow
 
     @click-left="onClickLeft"
 
     @click-left="onClickLeft"
 
+    @click-right="onClickRight"
 
   />
 
   />
 
-  <div class="search">
 
-    <input type="text" placeholder="请输入查询信息" class="keyword" />
 
-    <van-button icon="search" type="primary" size="small">查询</van-button>
 
-  </div>
 
+  <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
 
   <van-list
 
   <van-list
 
     v-model:loading="loading"
 
     v-model:loading="loading"
 
     :finished="finished"
 
     :finished="finished"
 
     finished-text="没有更多了"
 
     finished-text="没有更多了"
 
     @load="onLoad"
 
     @load="onLoad"
 
   >
 
   >
 
-    <van-button type="primary" size="small" to="/selfMeeting"
 
-      >上报</van-button
 
-    >
 
-    <van-cell v-for="item in list" :key="item" :title="item" is-link>
 
-    </van-cell>
 
+    <!-- tab切换 -->
 
+    <div class="nav_tab">
 
+      <div class="tab active">未审核</div>
 
+      <div class="tab">已审核</div>
 
+    </div>
 
+    <van-swipe-cell v-for="item in list" :key="item">
 
+      <div class="list_item">
 
+        <!-- <div class="item-left">
 
+          <p style="color: #c4c4c4">{{ item.activityTime }}</p>
 
+          <p style="color: red">待审核</p>
 
+        </div> -->
 
+        <van-cell is-link :title="item">
 
+          <!-- <template #title>
 
+            {{ item.portname }}申请于{{ item.place }}举办{{ item.activity }}活动
 
+          </template>
 
+          <template #label>
 
+            {{ item.activityPlace + " " + item.address }}
 
+          </template> -->
 
+        </van-cell>
 
+      </div>
 
+      <template #right>
 
+        <van-button square type="danger" text="删除" class="button" />
 
+        <van-button square type="primary" text="修改" class="button" />
 
+      </template>
 
+    </van-swipe-cell>
 
   </van-list>
 
   </van-list>
 
 </template>
 
 </template>
 
   
   
@@ -64,22 +84,24 @@ export default {
 
 </script>
 
 </script>
 
   
   
   <style>
 
   <style>
 
-.van-button {
 
-  top: -5px;
 
-}
 
-.search {
 
-  height: 40px;
 
-  line-height: 40px;
 
-}
 
 .van-list {
 
 .van-list {
 
   height: 80%;
 
   height: 80%;
 
   margin-top: 5px;
 
   margin-top: 5px;
 
 }
 
 }
 
-.keyword {
 
-  width: 70%;
 
-  height: 25px;
 
-  border-radius: 25px;
 
-  border: 1px solid;
 
-  padding-left: 15px;
 
+.nav_tab {
 
+  width: 100vw;
 
+  display: flex;
 
+  text-align: center;
 
+  background: #fff;
 
+  margin: 10px 0;
 
+}
 
+.tab {
 
+  flex: 1;
 
+  line-height: 40px;
 
+  font-size: 14px;
 
+}
 
+.active {
 
+  background: #36a7f3;
 
+  color: #fff;
 
 }
 
 }
 
 </style>
 
 </style>

+ 9 - 2
src/views/placeManage/placePerson.vue
Tampilan Berkas 

@@ -18,7 +18,7 @@
 
     </van-search>
 
     </van-search>
 
   </div>
 
   </div>
 
   <div class="PersonList">
 
   <div class="PersonList">
 
-    <div class="PersonItem" v-for="item in Person.PersonList" :key="item.id">
 
+    <div class="PersonItem" v-for="item in Person.PersonList" :key="item.id" @click="goPlacePersonInfo">
 
       <van-row>
 
       <van-row>
 
         <van-col span="18">
 
         <van-col span="18">
 
             <p>{{item.name}}（<span style="color:#36a7f3;">{{item.id}}</span>）</p>
 
             <p>{{item.name}}（<span style="color:#36a7f3;">{{item.id}}</span>）</p>
 
@@ -43,6 +43,7 @@
 
 
 
 <script>
 
 <script>
 
 import { reactive,ref } from "vue";
 
 import { reactive,ref } from "vue";
 
+import { useRouter } from 'vue-router'
 
 export default {
 
 export default {
 
   setup() {
 
   setup() {
 
     const value = ref("");
 
     const value = ref("");
 
@@ -92,6 +93,11 @@ export default {
 
             },
 
             },
 
         ]
 
         ]
 
     })
 
     })
 
+    //跳转
 
+    let router = useRouter()
 
+    const goPlacePersonInfo = ()=>{
 
+      router.push("/placePersoninfo")
 
+    }
 
     //返回
 
     //返回
 
     const goback = () => {
 
     const goback = () => {
 
       history.back();
 
       history.back();
 
@@ -101,7 +107,8 @@ export default {
 
       value,
 
       value,
 
       value1,
 
       value1,
 
       option1,
 
       option1,
 
-      Person
 
+      Person,
 
+      goPlacePersonInfo
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };

+ 1 - 1
src/views/placeManage/placePersoninfo.vue
Tampilan Berkas 

@@ -1,5 +1,5 @@
 
 <template>
 
 <template>
 
-  <van-nav-bar title="人员档案信息" left-arrow @click-left="goback" />
 
+  <van-nav-bar title="人员档案信息" left-arrow @click="goback" />
 
   <div class="banner">
 
   <div class="banner">
 
     <h2>扎实提升“三力”</h2>
 
     <h2>扎实提升“三力”</h2>
 
     <h2>深入推进“三化”</h2>
 
     <h2>深入推进“三化”</h2>

+ 15 - 21
src/views/placeManage/placeRegister.vue
Tampilan Berkas 

@@ -6,7 +6,7 @@
 
       <p class="miniTitle">基础信息</p>
 
       <p class="miniTitle">基础信息</p>
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field
 
         <van-field
 
-          v-model="placeActivity.place"
 
+          v-model="placeActivity.religion"
 
           readonly
 
           readonly
 
           label="所属宗教:"
 
           label="所属宗教:"
 
           placeholder="请选择宗教"
 
           placeholder="请选择宗教"
 
@@ -25,7 +25,7 @@
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field
 
         <van-field
 
-          v-model="placeActivity.activityPlace"
 
+          v-model="placeActivity.district"
 
           center
 
           center
 
           readonly
 
           readonly
 
           label="所属县(区):"
 
           label="所属县(区):"
 
@@ -56,7 +56,7 @@
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field
 
         <van-field
 
-          v-model="placeActivity.money"
 
+          v-model="placeActivity.place"
 
           center
 
           center
 
           label="场所名称:"
 
           label="场所名称:"
 
           placeholder="请填写场所名称"
 
           placeholder="请填写场所名称"
 
@@ -65,7 +65,7 @@
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field
 
         <van-field
 
-          v-model="placeActivity.money"
 
+          v-model="placeActivity.name"
 
           center
 
           center
 
           label="联络人姓名:"
 
           label="联络人姓名:"
 
           placeholder="请填写联络人姓名"
 
           placeholder="请填写联络人姓名"
 
@@ -74,7 +74,7 @@
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field
 
         <van-field
 
-          v-model="placeActivity.money"
 
+          v-model="placeActivity.tel"
 
           center
 
           center
 
           label="联系方式:"
 
           label="联系方式:"
 
           placeholder="请填写联络人联系方式"
 
           placeholder="请填写联络人联系方式"
 
@@ -84,14 +84,14 @@
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field name="uploader" label="外景照片:">
 
         <van-field name="uploader" label="外景照片:">
 
           <template #input>
 
           <template #input>
 
-            <van-uploader :after-read="afterRead" />
 
+            <van-uploader v-model="placeActivity.fileList1" :after-read="afterRead" />
 
           </template>
 
           </template>
 
         </van-field>
 
         </van-field>
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
         <van-field name="uploader" label="内景照片:">
 
         <van-field name="uploader" label="内景照片:">
 
           <template #input>
 
           <template #input>
 
-            <van-uploader :after-read="afterRead" />
 
+            <van-uploader v-model="placeActivity.fileList2" :after-read="afterRead" />
 
           </template>
 
           </template>
 
         </van-field>
 
         </van-field>
 
       </van-cell-group>
 
       </van-cell-group>
 
@@ -112,20 +112,14 @@ export default {
 
     };
 
     };
 
     //场所录入
 
     //场所录入
 
     const placeActivity = reactive({
 
     const placeActivity = reactive({
 
-      activity: "",
 
-      place: "",
 
-      activityTime: "",
 
-      countPerson: "",
 
-      list: "",
 
-      portname: "",
 
-      area: "",
 
-      activityPlace: "",
 
-      address: "",
 
-      money: "",
 
-      activityName: "",
 
-      tel: "",
 
-      file: "",
 
-      into: "",
 
+      religion: "",//所属宗教
 
+      district: "",//所属县区
 
+      address: "",//具体地址
 
+      place: "",//场所
 
+      name: "",//联系人姓名
 
+      tel: "",//联系方式
 
+      fileList1:[],//外景图片
 
+      fileList2: [],//内景图片
 
     });
 
     });
 
     // 宗教名称
 
     // 宗教名称
 
     const places = [
 
     const places = [

+ 1 - 1
src/views/tab_a/tabAll.vue
Tampilan Berkas 

@@ -124,7 +124,7 @@ import  qs  from "qs";
 
 					this.$store.commit('setUser',res.account);
 
 					this.$store.commit('setUser',res.account);
 
 				}
 
 				}
 
 
 
-				
+
 
 
 
 				//this.$store.commit('setUser',data);
 
 				//this.$store.commit('setUser',data);
 
 				// if (res.type == 1) {
 
 				// if (res.type == 1) {

+ 10 - 3
src/views/toBeDone/toBeDone.vue
Tampilan Berkas 

@@ -7,7 +7,7 @@
 
   >
 
   >
 
     <van-tab title="待处理">
 
     <van-tab title="待处理">
 
       <div class="list1">
 
       <div class="list1">
 
-        <van-row class="list-item" v-for="item in toBeDone.DoneList1" :key="item.dateTime">
 
+        <van-row class="list-item" v-for="item in toBeDone.DoneList1" :key="item.dateTime" @click="goToBeDoneinfo">
 
           <van-col span="6" class="list-item-left">
 
           <van-col span="6" class="list-item-left">
 
             <div>
 
             <div>
 
               <p style="color: #a3a3a3">{{item.dateTime}}</p>
 
               <p style="color: #a3a3a3">{{item.dateTime}}</p>
 
@@ -31,7 +31,7 @@
 
     </van-tab>
 
     </van-tab>
 
     <van-tab title="已处理">
 
     <van-tab title="已处理">
 
       <div class="list1">
 
       <div class="list1">
 
-        <van-row class="list-item" v-for="item in toBeDone.DoneList2" :key="item.dateTime">
 
+        <van-row class="list-item" v-for="item in toBeDone.DoneList2" :key="item.dateTime" @click="goToBeDoneinfo">
 
           <van-col span="6" class="list-item-left">
 
           <van-col span="6" class="list-item-left">
 
             <div>
 
             <div>
 
               <p style="color: #a3a3a3">{{item.dateTime}}</p>
 
               <p style="color: #a3a3a3">{{item.dateTime}}</p>
 
@@ -58,6 +58,7 @@
 
 
 
 <script>
 
 <script>
 
 import {reactive,ref} from "vue"
 
 import {reactive,ref} from "vue"
 
+import { useRouter } from 'vue-router'
 
 export default {
 
 export default {
 
   beforeCreate() {
 
   beforeCreate() {
 
     this.dealWith()
 
     this.dealWith()
 
@@ -186,13 +187,19 @@ export default {
 
         }
 
         }
 
       })
 
       })
 
     }
 
     }
 
+    //跳转
 
+    let router = useRouter()
 
+    const goToBeDoneinfo = ()=>{
 
+      router.push("/toBeDone_details")
 
+    }
 
     const goback = ()=>{
 
     const goback = ()=>{
 
       history.back();
 
       history.back();
 
     }
 
     }
 
     return {
 
     return {
 
       goback,
 
       goback,
 
       toBeDone,
 
       toBeDone,
 
-      dealWith
 
+      dealWith,
 
+      goToBeDoneinfo
 
     }
 
     }
 
   }
 
   }
 
 };
 
 };