Merge remote-tracking branch 'HS_MZAP/master'

src/main.js

@@ -9,7 +9,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, Loading } 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, TextEllipsis } from 'vant';
 import 'vant/lib/index.css';
 import store from './store';
 
@@ -53,6 +53,7 @@ app.use(router)
     .use(Swipe)
     .use(SwipeItem)
     .use(Loading)
+    .use(TextEllipsis)
 
 app.config.globalProperties.$API = api
 app.config.globalProperties.$axios = axios

src/styles/index.css

@@ -7,6 +7,7 @@
 
 body {
     background-color: #f5f5f5;
+    line-height: 1.5;
 }
 
 .main {
@@ -15,8 +16,16 @@ body {
     top: 39.5px;
 }
 
+.van-loading {
+    text-align: center;
+    margin-top: 80px;
+}
+
+.van-cell__value .van-field__right-icon .van-icon-location {
+    color: #36a7f3 !important;
+}
+
 p {
-    line-height: 1.5;
     margin: 5px;
 }
 

src/styles/style.css

@@ -73,4 +73,77 @@
 .subbtn .van-button {
     width: 40%;
     margin: 5px;
+}
+
+
+/* 详情页 */
+
+
+/* banner 图片 */
+
+.banner {
+    width: 100vw;
+}
+
+.banner img {
+    width: 100%;
+    height: 100%;
+}
+
+
+/* 内容区域 */
+
+.info {
+    position: relative;
+    width: 86vw;
+    margin: 10px auto;
+    padding: 10px;
+    background: #fff;
+    border-radius: 10px;
+    top: -50px;
+    font-size: 14px;
+    border: 1px solid #f5f5f5;
+}
+
+
+/* 列表页 */
+
+.van-list {
+    height: 80%;
+    margin-top: 5px;
+}
+
+
+/*  */
+
+.list_item {
+    display: table;
+    background: #fff;
+}
+
+.item-left {
+    text-align: center;
+    display: table-cell;
+    vertical-align: middle;
+    width: 30%;
+    font-size: 12px;
+    border-right: 1px solid #eee;
+}
+
+.van-cell__title {
+    font-size: 14px !important;
+    font-weight: 700;
+}
+
+.van-cell__label {
+    font-size: 10px !important;
+    font-weight: 400;
+}
+
+.list_item .van-cell__right-icon {
+    color: #999999!important;
+}
+
+.van-swipe-cell__right .button {
+    height: 100%;
 }

src/utils/config.js

@@ -3,6 +3,7 @@ let APP_SERVER_URL = ""
 if (process.env.NODE_ENV === 'development') {
     // 开发环境
     //APP_SERVER_URL = 'http://192.168.139.110:8084'
+    //APP_SERVER_URL = 'http://192.168.139.74:8080'
     APP_SERVER_URL = 'http://localhost:8084'
 } else {
     // 生产环境
@@ -11,4 +12,4 @@ if (process.env.NODE_ENV === 'development') {
 
 // APP_SERVER_URL = APP_SERVER_URL + "/app"
 
-export default APP_SERVER_URL
+export default APP_SERVER_URL

src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue

@@ -9,23 +9,89 @@
   <van-loading size="16px" v-if="isLoading">加载中...</van-loading>
   <div class="main" v-if="!isLoading">
     <div class="banner">
-      <h2>扎实提升“三力”</h2>
-      <h2>深入推进“三化”</h2>
-      <h2>坚持“三个思维”</h2>
+      <img src="../../../../public/loginbg/banner.jpg" alt="" />
     </div>
     <div class="info">
-      <p>异常人员姓名:{{ inputForm.abnormalName }}</p>
-      <p>人员身份证号:{{ inputForm.abnormalIdcar }}</p>
-      <p>
-        性别:
-        <span v-if="inputForm.sex == 1">男</span>
-        <span v-if="inputForm.sex == 2">女</span>
-      </p>
-      <p>手机号:{{ inputForm.abnormalPhone }}</p>
-      <p>籍贯:{{ inputForm.nativePlace }}</p>
-      <p>现居地:{{ inputForm.currentResidence }}</p>
-      <p>现居地详情:{{ inputForm.currentResidenceDetail }}</p>
-      <p>异常行为:{{ inputForm.abnormalBehavior }}</p>
+      <p class="miniTitle">详细信息</p>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.abnormalName"
+          center
+          readonly
+          label="异常人员:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.abnormalIdcar"
+          center
+          readonly
+          label="身份证号:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.abnormalPhone"
+          center
+          label="手机号:"
+          readonly
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.sex"
+          center
+          label="性别:"
+          readonly
+          input-align="right"
+        >
+          <template #input>
+            <span v-if="inputForm.sex == 1">男</span>
+            <span v-if="inputForm.sex == 2">女</span>
+          </template>
+        </van-field>
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.nativePlace"
+          center
+          readonly
+          label="籍贯:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.currentResidence"
+          center
+          readonly
+          label="现居地:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.currentResidenceDetail"
+          center
+          readonly
+          label="现居地详情:"
+          input-align="right"
+          right-icon="location"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.abnormalBehavior"
+          center
+          readonly
+          label="异常行为:"
+          input-align="right"
+        >
+        </van-field>
+      </van-cell-group>
     </div>
     <van-button
       v-if="inputForm.assessment == 0"
@@ -98,46 +164,10 @@ export default {
 </script>
       
 <style lang="less">
-.main {
-  background: #fff;
-  position: relative;
-  top: 40px;
-}
-.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;
-    }
-  }
-}
-.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%;
-}
-.van-loading {
-  text-align: center;
-  margin-top: 80px;
+  margin-bottom: 40px;
 }
 </style>

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -6,7 +6,11 @@
     left-arrow
     @click-left="onClickLeft"
     @click-right="onClickRight"
-  />
+  >
+    <template #right>
+      <van-icon name="plus" size="18" />
+    </template>
+  </van-nav-bar>
   <div class="main">
     <van-search
       v-model="searchVal"
@@ -39,14 +43,20 @@
           >
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
-                <p style="color: #c4c4c4">{{ item.partyTime }}</p>
+                <p v-show="item.partyTime != ''" style="color: #c4c4c4">
+                  {{ item.partyTime }}
+                </p>
                 <p style="color: red">待审核</p>
               </div>
-              <van-cell is-link>
+              <van-cell>
                 <template #title>
-                  <p>异常人员：{{ item.abnormalName }}</p>
-                  <p>身份证号：{{ item.abnormalIdcar }}</p>
-                  <p>异常行为：{{ item.abnormalBehavior }}</p>
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`"
+                  />
+                </template>
+                <template #label>
+                  {{ item.currentResidence }}
                 </template>
               </van-cell>
             </div>
@@ -56,7 +66,7 @@
                 type="danger"
                 text="删除"
                 class="button"
-                @click="beforeClose(item.id)"
+                @click="deleteItem(item.id)"
               />
               <van-button
                 square
@@ -82,11 +92,15 @@
                 <p style="color: #c4c4c4">{{ item.partyTime }}</p>
                 <p style="color: red">已审核</p>
               </div>
-              <van-cell is-link>
+              <van-cell>
                 <template #title>
-                  <p>异常人员：{{ item.abnormalName }}</p>
-                  <p>身份证号：{{ item.abnormalIdcar }}</p>
-                  <p>异常行为：{{ item.abnormalBehavior }}</p>
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`"
+                  />
+                </template>
+                <template #label>
+                  {{ item.currentResidence }}
                 </template>
               </van-cell>
             </div>
@@ -108,11 +122,15 @@
             <p style="color: #c4c4c4">{{ item.partyTime }}</p>
             <p style="color: red">已审核</p>
           </div>
-          <van-cell is-link>
+          <van-cell>
             <template #title>
-              <p>异常人员：{{ item.abnormalName }}</p>
-              <p>身份证号：{{ item.abnormalIdcar }}</p>
-              <p>异常行为：{{ item.abnormalBehavior }}</p>
+              <van-text-ellipsis
+                rows="2"
+                :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`"
+              />
+            </template>
+            <template #label>
+              {{ item.currentResidence }}
             </template>
           </van-cell>
         </div>
@@ -207,7 +225,7 @@ export default {
     // 删除确认
     let showDel = ref(false);
     let ids = ref("");
-    const beforeClose = (val) => {
+    const deleteItem = (val) => {
       showDel.value = true;
       ids.value = val;
     };
@@ -254,7 +272,7 @@ export default {
       updateItem,
       goInfo,
       showDel,
-      beforeClose,
+      deleteItem,
       Itemdel,
     };
   },
@@ -262,26 +280,4 @@ export default {
 </script >
     
 <style scope>
-.main {
-  background: #fff;
-  position: relative;
-  top: 40px;
-}
-.van-list {
-  height: 80%;
-  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>

src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -67,7 +67,7 @@
             title="请选择籍贯"
             :options="options"
             @close="showArea = false"
-            @finish="onFinish"
+            @finish="onFinish2"
           />
         </van-popup>
       </van-cell-group>
@@ -80,14 +80,14 @@
           placeholder="请选择"
           input-align="right"
           right-icon="arrow-down"
-          @click="showArea = true"
+          @click="showCurrentArea = true"
         />
-        <van-popup v-model:show="showArea" round position="bottom">
+        <van-popup v-model:show="showCurrentArea" round position="bottom">
           <van-cascader
             v-model="cascaderValue"
             title="请选择现居地"
             :options="options"
-            @close="showArea = false"
+            @close="showCurrentArea = false"
             @finish="onFinish"
           />
         </van-popup>
@@ -171,18 +171,27 @@ export default {
         isLoading.value = false;
       }
     });
-    // 地区选择
-    let showArea = ref(false);
+    // 现居地选择
+    const showCurrentArea = ref(false);
     const cascaderValue = ref("");
     // 选项列表，children 代表子选项，支持多级嵌套
     const options = useCascaderAreaData();
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
-      showArea.value = false;
+      showCurrentArea.value = false;
       inputForm.value.currentResidence = selectedOptions
         .map((option) => option.text)
         .join("/");
     };
+    // 籍贯选择
+    let showArea = ref(false);
+    // 全部选项选择完毕后，会触发 finish 事件
+    const onFinish2 = ({ selectedOptions }) => {
+      showArea.value = false;
+      inputForm.value.nativePlace = selectedOptions
+        .map((option) => option.text)
+        .join("/");
+    };
     // 提交数据
     const submit = () => {
       isLoading.value = true;
@@ -200,48 +209,17 @@ export default {
       showArea,
       options,
       onFinish,
+      onFinish2,
       cascaderValue,
       isLoading,
       submit,
+      showCurrentArea,
     };
   },
 };
 </script>
     
-    <style scoped>
-* {
-  margin: 0;
-  padding: 0;
-}
-.main {
-  background: #fff;
-  position: relative;
-  top: 40px;
-}
-.title,
-.miniTitle {
-  height: 40px;
-  line-height: 40px;
-  color: #36a7f3;
-  border-bottom: 1px solid #eee;
-}
-.title {
-  font-size: 20px;
-  font-weight: 700;
-  padding-left: 20px;
-}
-.miniTitle {
-  font-size: 16px;
-}
-.formArea {
-  padding: 0px 20px;
-}
-.formArea .van-cell-group .van-field__label {
-  height: 40px;
-}
-.formArea .van-cell-group .van-cell {
-  line-height: 40px;
-}
+<style scoped>
 .van-cell__value .van-field__right-icon .van-icon-location {
   color: #36a7f3 !important;
 }
@@ -249,18 +227,11 @@ export default {
   width: 98%;
   border: 2px solid #ccc;
   border-radius: 10px;
+  padding-left: 10px;
 }
 .rowTextArea::v-deep .van-cell {
   display: flow-root;
 }
-.subbtn {
-  margin: 20px;
-  text-align: center;
-}
-.subbtn .van-button {
-  width: 40%;
-  margin: 5px;
-}
 .van-uploader .van-button {
   border: none;
   color: #36a7f3;

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -12,26 +12,168 @@
       <img src="../../../../public/loginbg/banner.jpg" alt="" />
     </div>
     <div class="info">
-      <p>活动名称：{{ placeActivity.activityName }}</p>
-      <p>场所名称：{{ placeActivity.siteName.name }}</p>
-      <p>发起人：{{ placeActivity.reporter.name }}</p>
-      <p>参会人数：{{ placeActivity.participantsNum }}</p>
-      <p>已知人员名单：{{ placeActivity.knownList.name }}</p>
-      <p>活动地点：{{ placeActivity.place }}</p>
-      <p>详细地址：{{ placeActivity.placeDel }}</p>
-      <p>活动时间：{{ placeActivity.activityTime }}</p>
-      <p>
-        安全预案：
-        <span v-if="fileList.length != 0" style="color: #6892ff">{{
-          fileList[0].name
-        }}</span>
-        <span v-else style="color: red">无</span>
-      </p>
-      <p>主题内容：</p>
-      <wang-editor
-        ref="subjectContentEditor"
-        v-model="placeActivity.subjectContent"
-      />
+      <p class="miniTitle">详细信息</p>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.activityName"
+          center
+          readonly
+          clearable
+          label="活动名称:"
+          placeholder="请填写活动名称"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.siteName.name"
+          readonly
+          label="场所名称:"
+          placeholder="请选择"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.activityTime"
+          center
+          readonly
+          label="活动时间:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.participantsNum"
+          center
+          readonly
+          clearable
+          label="参会人数:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.knownList.name"
+          center
+          readonly
+          label="已知名单:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.reporter.name"
+          center
+          readonly
+          label="报告人:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.participation"
+          center
+          readonly
+          label="参加范围:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.place"
+          center
+          readonly
+          label="活动地点:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.placeDel"
+          center
+          readonly
+          label="详细地址:"
+          input-align="right"
+        >
+          <template #right-icon>
+            <van-icon name="location" />
+          </template>
+        </van-field>
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.sourceFunds"
+          center
+          readonly
+          label="经费来源:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.activityPerson.name"
+          center
+          readonly
+          label="活动负责人:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="placeActivity.phone"
+          center
+          readonly
+          type="tel"
+          label="联系方式:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          name="uploader"
+          readonly
+          label="安全预案:"
+          input-align="right"
+        >
+          <template #input>
+            <span v-show="fileList.length == 0">无</span>
+            <van-uploader
+              v-show="fileList.length != 0"
+              v-model="fileList"
+              :max-count="1"
+            >
+              <template #preview-cover="file">
+                <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+              </template>
+            </van-uploader>
+          </template>
+        </van-field>
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          name="content"
+          readonly
+          label="主题内容:"
+          input-align="right"
+        >
+          <template #input>
+            <span v-show="placeActivity.subjectContent == ''">无</span>
+            <span
+              v-show="placeActivity.subjectContent != ''"
+              style="color: #36a7f3"
+              @click="showReport = true"
+              >查看内容</span
+            >
+            <van-popup v-model:show="showReport" 
+              ><wang-editor
+                ref="subjectContentEditor"
+                v-model="placeActivity.subjectContent"
+              />
+            </van-popup>
+          </template>
+        </van-field>
+      </van-cell-group>
     </div>
     <van-button
       v-if="placeActivity.assessment == 0"
@@ -44,10 +186,11 @@
 </template>
   
   <script>
-import { ref } from "vue";
+import { ref, onMounted } 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 {
@@ -90,31 +233,42 @@ export default {
       state: "",
       assessment: "",
     });
-    // 文件上传
+    // 文件
     let fileList = ref([]);
     // 富文本
+    const showReport = ref(false);
     let subjectContentEditor = ref(null);
     let route = useRoute();
-    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 + ",";
-        });
-      });
-      placeActivity.value.safetyPlan.split("|").forEach((item) => {
-        if (item.trim().length > 0) {
-          fileList.value.push({
-            name: decodeURIComponent(item.substring(item.lastIndexOf("/") + 1)),
-            url: item,
+    onMounted(() => {
+      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 + ",";
           });
+        });
+        placeActivity.value.safetyPlan.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
+            fileList.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+              url: $base + item,
+            });
+          }
+        });
+        if (subjectContentEditor.value != null) {
+          subjectContentEditor.value.init(placeActivity.value.subjectContent);
         }
+        isLoading.value = false;
       });
-      subjectContentEditor.value.init(placeActivity.value.subjectContent);
-      isLoading.value = false;
     });
+    // 打开富文本
+    // const open = () => {
+    //   subjectContentEditor.value.init(placeActivity.value.subjectContent);
+    // };
 
     // 审核通过
     const update = () => {
@@ -133,42 +287,29 @@ export default {
       isLoading,
       update,
       subjectContentEditor,
+      showReport,
+      // open,
     };
   },
 };
 </script>
   
 <style lang="less">
-.banner {
-  width: 100vw;
-}
-.banner img {
-  width: 100%;
-  height: 100%;
-}
-.info {
-  position: relative;
-  width: 86vw;
-  // height: 120px;
-  margin: 10px auto;
-  padding: 10px;
-  background: #fff;
-  border-radius: 20px;
-  top: -50px;
-  font-size: 14px;
+.van-cell__value .van-field__right-icon .van-icon-location {
+  color: #36a7f3 !important;
 }
 .btn-sub {
   width: 90%;
   border-radius: 20px;
   margin-left: 5%;
+  margin-bottom: 40px;
+  margin-top: -100px;
 }
 .van-loading {
   text-align: center;
   margin-top: 80px;
 }
-#editor {
-  width: 100%;
-  height: 150px;
-  overflow: hidden;
+.van-popup--center {
+  width: 98% !important;
 }
 </style>

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -39,14 +39,17 @@
           <van-swipe-cell v-for="item in list" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
-                <p style="color: #c4c4c4">{{ item.activityTime }}</p>
+                <p v-show="item.activityTime != ''" style="color: #c4c4c4">
+                  {{ item.activityTime }}
+                </p>
                 <p style="color: red">待审核</p>
               </div>
-              <van-cell is-link>
+              <van-cell>
                 <template #title>
-                  {{ item.reporter.name }}申请于{{ item.placeDel }}举办{{
-                    item.activityName
-                  }}活动
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
+                  />
                 </template>
                 <template #label>
                   {{ item.place }}
@@ -59,7 +62,7 @@
                 type="danger"
                 text="删除"
                 class="button"
-                @click="beforeClose(item.id)"
+                @click="deleteItem(item.id)"
               />
               <van-button
                 square
@@ -82,14 +85,17 @@
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
-                <p style="color: #c4c4c4">{{ item.activityTime }}</p>
+                <p v-show="item.activityTime != ''" style="color: #c4c4c4">
+                  {{ item.activityTime }}
+                </p>
                 <p style="color: red">已审核</p>
               </div>
-              <van-cell is-link>
+              <van-cell>
                 <template #title>
-                  {{ item.reporter.name }}申请于{{ item.placeDel }}举办{{
-                    item.activityName
-                  }}活动
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
+                  />
                 </template>
                 <template #label>
                   {{ item.place }}
@@ -111,17 +117,20 @@
       <van-swipe-cell v-for="item in searchList" :key="item">
         <div class="list_item" @click="goInfo(item.id)">
           <div class="item-left">
-            <p style="color: #c4c4c4">{{ item.activityTime }}</p>
+            <p v-show="item.activityTime != ''" style="color: #c4c4c4">
+              {{ item.activityTime }}
+            </p>
             <p style="color: red">
               <span v-if="item.assessment == 1">已审核</span>
               <span v-else>待审核</span>
             </p>
           </div>
-          <van-cell is-link>
+          <van-cell>
             <template #title>
-              {{ item.reporter.name }}申请于{{ item.placeDel }}举办{{
-                item.activityName
-              }}活动
+              <van-text-ellipsis
+                rows="2"
+                :content="` ${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
+              />
             </template>
             <template #label>
               {{ item.place }}
@@ -221,7 +230,7 @@ export default {
     // 删除确认
     let showDel = ref(false);
     let ids = ref("");
-    const beforeClose = (val) => {
+    const deleteItem = (val) => {
       showDel.value = true;
       ids.value = val;
     };
@@ -264,7 +273,7 @@ export default {
       onSearch,
       onCancel,
       onClickRight,
-      beforeClose,
+      deleteItem,
       updateItem,
       goInfo,
       showDel,
@@ -275,26 +284,4 @@ export default {
 </script>
 
 <style scoped>
-.main {
-  background: #fff;
-  position: relative;
-  top: 40px;
-}
-.van-list {
-  height: 80%;
-  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>

src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -9,18 +9,76 @@
   <van-loading size="16px" v-show="isLoading">加载中...</van-loading>
   <div class="main" v-show="!isLoading">
     <div class="banner">
-      <h2>扎实提升“三力”</h2>
-      <h2>深入推进“三化”</h2>
-      <h2>坚持“三个思维”</h2>
+      <img src="../../../../public/loginbg/banner.jpg" alt="" />
     </div>
     <div class="info">
-      <p>地点:{{ inputForm.placeSelectName }}</p>
-      <p>详细地点:{{ inputForm.placeDel }}</p>
-      <p>频次:{{ inputForm.frequency }}</p>
-      <p>时间：{{ inputForm.partyTime }}</p>
-      <p>相关人：{{ inputForm.relatedPersons.name }}</p>
-      <p>内容：</p>
-      <wang-editor ref="contentEditor" v-model="inputForm.content" />
+      <p class="miniTitle">基础信息</p>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.placeSelectName"
+          center
+          readonly
+          label="地点:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.placeDel"
+          center
+          label="详细地址:"
+          readonly
+          input-align="right"
+          right-icon="location"
+        />
+      </van-cell-group>
+
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.frequency"
+          center
+          label="频次:"
+          input-align="right"
+          readonly
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.partyTime"
+          center
+          readonly
+          label="时间:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.relatedPersons.name"
+          center
+          readonly
+          label="相关人:"
+          input-align="right"
+        />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field label="内容:" input-align="right">
+          <template #input>
+            <span v-show="inputForm.content == ''">无</span>
+            <span
+              v-show="inputForm.content != ''"
+              style="color: #36a7f3"
+              @click="showReport = true"
+              >查看内容</span
+            >
+            <van-popup v-model:show="showReport"
+              ><wang-editor
+                ref="contentEditor"
+                v-model="inputForm.content"
+              />
+            </van-popup>
+          </template>
+        </van-field>
+      </van-cell-group>
     </div>
     <van-button
       v-if="inputForm.assessment == 0"
@@ -71,6 +129,7 @@ export default {
     let route = useRoute();
     // 富文本
     let contentEditor = ref(null);
+    const showReport = ref(false);
     new PrivatePartyPointService().queryById(route.query.id).then((data) => {
       inputForm.value = data;
       let ids = data.relatedPersons.id.split(",");
@@ -80,7 +139,7 @@ export default {
           inputForm.value.relatedPersons.name += data.name + ",";
         });
       });
-      contentEditor.value.init(inputForm.value.content);
+      // contentEditor.value.init(inputForm.value.content);
       isLoading.value = false;
     });
     // 审核通过
@@ -99,57 +158,18 @@ export default {
       isLoading,
       update,
       contentEditor,
+      showReport
     };
   },
 };
 </script>
     
 <style lang="less">
-.main {
-  background: #fff;
-  position: relative;
-  top: 40px;
-}
-.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;
-    }
-  }
-}
-.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%;
+  margin-bottom: 40px;
 }
-.van-loading {
-  text-align: center;
-  margin-top: 80px;
-}
-#editor {
-  width: 100%;
-  height: 150px;
-  overflow: hidden;
-}
+
 </style>

src/views/activityMan/selfMeetingReport/selfMeetingList.vue

@@ -7,7 +7,11 @@
     left-arrow
     @click-left="onClickLeft"
     @click-right="onClickRight"
-  />
+  >
+    <template #right>
+      <van-icon name="plus" size="18" />
+    </template>
+  </van-nav-bar>
   <div class="main">
     <van-search
       v-model="searchVal"
@@ -36,14 +40,22 @@
           <van-swipe-cell v-for="item in list" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
-                <p style="color: #c4c4c4">{{ item.partyTime }}</p>
+                <p v-show="item.partyTime != ''" style="color: #c4c4c4">
+                  {{ item.partyTime }}
+                </p>
                 <p style="color: red">待审核</p>
               </div>
-              <van-cell is-link>
+              <van-cell>
                 <template #title>
-                  <p>地点：{{ item.placeSelectName }}</p>
-                  <p>相关人员：{{ item.relatedPersons.name }}</p>
-                  <p>频次：{{ item.frequency }}</p>
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${
+                      item.relatedPersons.name + item.frequency
+                    }次私设聚会活动`"
+                  />
+                </template>
+                <template #label>
+                  {{ item.placeSelectName }}
                 </template>
               </van-cell>
             </div>
@@ -53,7 +65,7 @@
                 type="danger"
                 text="删除"
                 class="button"
-                @click="beforeClose(item.id)"
+                @click="deleteItem(item.id)"
               />
               <van-button
                 square
@@ -76,14 +88,22 @@
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
-                <p style="color: #c4c4c4">{{ item.partyTime }}</p>
-                <p style="color: red">已审核</p>
+                <p v-show="item.partyTime != ''" style="color: #c4c4c4">
+                  {{ item.partyTime }}
+                </p>
+                <p style="color: red">待审核</p>
               </div>
-              <van-cell is-link>
+              <van-cell>
                 <template #title>
-                  <p>地点：{{ item.placeSelectName }}</p>
-                  <p>相关人员：{{ item.relatedPersons.name }}</p>
-                  <p>频次：{{ item.frequency }}</p>
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${
+                      item.relatedPersons.name + item.frequency
+                    }次私设聚会活动`"
+                  />
+                </template>
+                <template #label>
+                  {{ item.placeSelectName }}
                 </template>
               </van-cell>
             </div>
@@ -102,14 +122,25 @@
       <van-swipe-cell v-for="item in searchList" :key="item">
         <div class="list_item" @click="goInfo(item.id)">
           <div class="item-left">
-            <p style="color: #c4c4c4">{{ item.partyTime }}</p>
-            <p style="color: red">已审核</p>
+            <p v-show="item.partyTime != ''" style="color: #c4c4c4">
+              {{ item.partyTime }}
+            </p>
+            <p style="color: red">
+              <span v-if="item.assessment == 1">已审核</span>
+              <span v-else>待审核</span>
+            </p>
           </div>
-          <van-cell is-link>
+          <van-cell>
             <template #title>
-              <p>地点：{{ item.placeSelectName }}</p>
-              <p>相关人员：{{ item.relatedPersons.name }}</p>
-              <p>频次：{{ item.frequency }}</p>
+              <van-text-ellipsis
+                rows="2"
+                :content="`${
+                  item.relatedPersons.name + item.frequency
+                }次私设聚会活动`"
+              />
+            </template>
+            <template #label>
+              {{ item.placeSelectName }}
             </template>
           </van-cell>
         </div>
@@ -204,7 +235,7 @@ export default {
     // 删除确认
     let showDel = ref(false);
     let ids = ref("");
-    const beforeClose = (val) => {
+    const deleteItem = (val) => {
       showDel.value = true;
       ids.value = val;
     };
@@ -251,7 +282,7 @@ export default {
       updateItem,
       goInfo,
       showDel,
-      beforeClose,
+      deleteItem,
       Itemdel,
     };
   },

src/views/activityMan/selfMeetingReport/selfMeetingView.vue

@@ -267,69 +267,9 @@ export default {
 };
 </script>
   
-  <style scoped>
-* {
-  margin: 0;
-  padding: 0;
-}
-.main {
-  background: #fff;
-  position: relative;
-  top: 40px;
-}
-.title,
-.miniTitle {
-  height: 40px;
-  line-height: 40px;
-  color: #36a7f3;
-  border-bottom: 1px solid #eee;
-}
-.title {
-  font-size: 20px;
-  font-weight: 700;
-  padding-left: 20px;
-}
-.miniTitle {
-  font-size: 16px;
-}
-.formArea {
-  padding: 0px 20px;
-}
-.formArea .van-cell-group .van-field__label {
-  height: 40px;
-}
-.formArea .van-cell-group .van-cell {
-  line-height: 40px;
-}
-.van-cell__value .van-field__right-icon .van-icon-location {
-  color: #36a7f3 !important;
-}
-#editor {
-  position: relative;
-  height: 200px;
-}
-.w-e-text-container {
-  height: 150px !important;
-}
-.subbtn {
-  margin: 20px;
-  text-align: center;
-}
-.subbtn .van-button {
-  width: 40%;
-  margin: 5px;
-}
-.van-uploader .van-button {
-  border: none;
-  color: #36a7f3;
-  top: -4px;
-}
+<style scoped>
 .van-dialog {
   width: 80%;
   top: 50%;
 }
-.van-loading {
-  text-align: center;
-  margin-top: 80px;
-}
 </style>

src/views/placeManage/placePersoninfo.vue

@@ -29,7 +29,12 @@
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="12"> 证件类型： </van-col>
-                <van-col span="6" style="text-align: right"> {{data.data.idType==1?'身份证':'其他'}} </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>
+                </van-col>
               </van-row>
             </van-col>
           </van-row>
@@ -201,7 +206,7 @@
           </van-row>
           <van-row>
             <van-col span="10">
-                <img class="personImg" :src="item.value" alt="" />
+                <img style="width: 100px;height: 100px;" :src="item.value" alt="" />
             </van-col>
           </van-row>
         </van-col>
@@ -214,6 +219,7 @@
 <script>
 import { useRouter } from 'vue-router'
 import {onMounted, reactive,ref} from "vue"
+import $base from "@/utils/config"
 export default {
   setup(){
     const data = reactive({
@@ -225,6 +231,13 @@ export default {
     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
+        }
+      });
+
     })
     //返回
     const goback = () => {

src/views/placeManage/placeTabletInfo.vue

@@ -6,44 +6,47 @@
   </div>
   <div class="content">
     <div class="itemInfo">
-    <h3 style="color: #40abf4">牌位信息-{{data.data.brandName}}</h3>
+      <h3 style="color: #40abf4">牌位信息-{{ dataitem.brandName }}</h3>
       <van-row justify="space-between">
-        <van-col span="14">
+        <van-col span="24">
           <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.brandName}}</van-col>
+                <van-col span="10"> 名称： </van-col>
+                <van-col span="14" style="text-align: right">{{
+                  dataitem.brandName
+                }}</van-col>
               </van-row>
             </van-col>
           </van-row>
           <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.siteName.name}}</van-col>
+                <van-col span="10"> 所属场所名称： </van-col>
+                <van-col span="14" style="text-align: right">{{
+                  data.siteName.name
+                }}</van-col>
               </van-row>
             </van-col>
           </van-row>
           <van-row class="item">
             <van-col span="24">
               <van-row justify="space-between">
-                <van-col span="12"> 场所联系人： </van-col>
-                <van-col span="6" style="text-align: right">{{data.data.memorialTabletHolder}}</van-col>
+                <van-col span="10"> 场所联系人： </van-col>
+                <van-col span="14" style="text-align: right">{{
+                  dataitem.memorialTabletHolder
+                }}</van-col>
               </van-row>
             </van-col>
           </van-row>
         </van-col>
-        <van-col span="8">
-          <img class="personImg" :src="data.pic[0]" alt="" />
-        </van-col>
       </van-row>
       <van-row class="item">
         <van-col span="24">
           <van-row justify="space-between">
             <van-col span="10"> 联系方式： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.memorialTabletHolderPhone}}
+              {{ dataitem.memorialTabletHolderPhone }}
             </van-col>
           </van-row>
         </van-col>
@@ -53,7 +56,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 供奉牌位人： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.contactInformation}}
+              {{ dataitem.contactInformation }}
             </van-col>
           </van-row>
         </van-col>
@@ -63,7 +66,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 供奉牌位人电话： </van-col>
             <van-col span="14" style="text-align: right">
-             {{data.data.siteContact}}
+              {{ dataitem.siteContact }}
             </van-col>
           </van-row>
         </van-col>
@@ -73,7 +76,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 身份证号： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.udCard}}
+              {{ dataitem.udCard }}
             </van-col>
           </van-row>
         </van-col>
@@ -83,7 +86,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 籍贯： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.currentResidence}}
+              {{ dataitem.currentResidence }}
             </van-col>
           </van-row>
         </van-col>
@@ -93,7 +96,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 现居地： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.nativePlace}}
+              {{ dataitem.nativePlace }}
             </van-col>
           </van-row>
         </van-col>
@@ -103,7 +106,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 现居地详情： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.currentResidenceDel}}
+              {{ dataitem.currentResidenceDel }}
             </van-col>
           </van-row>
         </van-col>
@@ -113,7 +116,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 与供奉牌位关系： </van-col>
             <van-col span="14" style="text-align: right">
-                {{data.data.relationship}}
+              {{ dataitem.relationship }}
             </van-col>
           </van-row>
         </van-col>
@@ -123,7 +126,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 供奉费用(元/年)： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.sacrificeExpenses}}
+              {{ dataitem.sacrificeExpenses }}
             </van-col>
           </van-row>
         </van-col>
@@ -132,7 +135,16 @@
         <van-col span="24">
           <van-row justify="space-between">
             <van-col span="10">被供奉者信息： </van-col>
-            <van-col span="14" style="text-align: right">
+            <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">
+              <img class="personImg" :src="item" alt="" />
             </van-col>
           </van-row>
         </van-col>
@@ -142,33 +154,45 @@
 </template>
 
 <script>
-import { useRouter } from 'vue-router'
-import {onMounted, reactive} from "vue"
+import { useRouter } from "vue-router";
+import { onMounted, reactive ,ref} from "vue";
+import $base from "@/utils/config"
 export default {
-  setup(){
+  setup() {
     const data = reactive({
-      //牌位数据
-      data:{},
-      siteName:{},
+      siteName: {},
       pic:[]
-    })
+    });
+    //牌位数据
+    let dataitem = ref({});
     //数据接收
     const router = useRouter();
-    onMounted(()=>{
-      var item = JSON.parse(router.currentRoute.value.query.data)
-      data.data = item
-      data.siteName = data.data.siteName
-      data.pic.push(data.data.pic.split('|'))
-    })
+    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=>{
+        // item1 = `${$base}`+item1
+        picList.push(`${$base}`+item1)
+      })
+      data.pic = picList
+      console.log(data.pic);
+    });
     //返回
     const goback = () => {
       history.back();
     };
-    return{
+    return {
       goback,
-      data
-    }
-  }
+      data,
+      dataitem
+    };
+  },
 };
 </script>
 
@@ -189,7 +213,7 @@ html {
   }
 }
 .banner {
-  background-color: #36A7F3;
+  background-color: #36a7f3;
   padding: 20px 50px 40px 50px;
   color: #fff;
   h2 {
@@ -226,24 +250,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/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();
 		},