Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/nonReligiousInformation/nonReligiousInformationInfo.vue

@@ -14,7 +14,8 @@
         <p>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;点：{{ info.placeSelectName }}</p>
         <p>详细地址：{{ info.placeDetailed }}</p>
         <p>事件概述：{{ info.eventOverview }}</p>
-        <p>事件内容：{{ info.eventContent }}</p>
+        <p>事件内容：</p>
+        <div v-html="info.eventContent" class="showhtml"> </div>
       </div>
       <van-button v-if="canAudit" type="primary" class="btn-sub" @click="update">审核</van-button>
     </div>
@@ -161,4 +162,10 @@
     text-align: center;
     margin-top: 80px;
   }
+  .showhtml{
+      margin: 5px;
+      padding: 10px;
+      border: 1px solid #ccc;
+      border-radius: 12px;
+    }
   </style>

src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -87,6 +87,7 @@
           v-model="inputForm.placeSelectName"
           center
           readonly
+          required
           label="地点:"
           placeholder="请选择"
           input-align="right"

src/views/activityMan/religiousConference/religiousConferenceInfo.vue

@@ -1,6 +1,5 @@
 <template>
-
-    <van-loading size="16px" v-if="isLoading">加载中...</van-loading>
+    <van-loading size="16px" v-if="isLoading" >加载中...</van-loading>
     <div class="main" v-if="!isLoading">
       <div class="banner">
         <h2>扎实提升“三力”</h2>
@@ -13,13 +12,8 @@
         <p>会议时间：{{ info.meetingTime }}</p>
         <p>会议场所：{{ info.siteName.name }}</p>
         <p>参会人员：{{ info.participants.name }}</p>
-        <p>附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件：<span style="color: #6892ff">活动申请书</span></p>
-        <!-- <p>会议议题：{{ info.meetingTopics }}</p> -->
         <p>会议议题：</p>
-          <wang-editor
-            ref="subjectContentEditor"
-            v-model="info.meetingTopics"
-          />
+          <div v-html="info.meetingTopics" class="showhtml"> </div>
       </div>
       <van-button v-if="canAudit" type="primary" class="btn-sub" @click="update">审核</van-button>
     </div>
@@ -27,23 +21,17 @@
     
     <script>
   import { ref } from "vue";
-  import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";
-  import UserManage from "@/api/user/UserManage";
   import { useRoute } from "vue-router";
-  // 富文本编辑器
-  import WangEditor from "@/components/editor/WangEditor";
+  import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";  
   export default {
-    components: { WangEditor },
     setup() {
       //window.xm.setNavigationBarTitle({ title: '负责人会议详情'})
       let isLoading = ref(true);
       let canAudit = ref(false);
       // 活动信息
       const info = ref({     
-        meetingTopics:"",   
+        meetingTopics:"",  
       });
-      // 富文本
-      let subjectContentEditor = ref(null);
       let route = useRoute();
       new religiousConferenceService().queryById(route.query.id).then((data) => {
         info.value = data;
@@ -53,8 +41,6 @@
           canAudit.value = false;
         }      
         console.log(info.value.meetingTopics);
-        //这边报错？
-        //subjectContentEditor.value.init(info.value.meetingTopics);
         isLoading.value = false;
       });
       // 审核通过
@@ -75,57 +61,63 @@
         isLoading,
         canAudit,
         update,
-        subjectContentEditor,
       };
     },
   };
   </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;
+    <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;
-    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;
-  }
-  #editor {
-  width: 100%;
-  height: 150px;
-  overflow: hidden;
-  }
-  </style>
+    .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;
+    }
+    #editor {
+      width: 100%;
+      height: 150px;
+      overflow: hidden;
+    }
+    .showhtml{
+      margin: 5px;
+      padding: 10px;
+      border: 1px solid #ccc;
+      border-radius: 12px;
+    }
+    </style>

src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -16,6 +16,7 @@
           v-model="inputForm.placeSelectName"
           center
           readonly
+          required
           label="会议地点:"
           placeholder="请选择"
           input-align="right"
@@ -107,7 +108,6 @@
         <van-field
           v-model="inputForm.participants.name"
           center
-          required
           label="参会人员:"
           placeholder="请选择参会人员"
           input-align="right"

src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrInfo.vue

@@ -14,7 +14,13 @@
         <p v-if="info.facilityType=='1'">场所消防点位：{{ info.siteFireProtection.name }}</p>
         <p v-if="info.facilityType=='0'">视频音频点位：{{ info.videoAudioPoint.name }}</p>
         <p>位&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;置：{{ info.position }}</p>
-        <p>附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件：<span style="color: #6892ff">活动申请书</span></p>
+        <p>
+          附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件：
+          <span v-if="fileList.length != 0" style="color: #6892ff">{{
+            fileList[0].name
+          }}</span>
+          <span v-else style="color: red">无</span>
+        </p>
         <p>异常内容：{{ info.abnormalContent }}</p>
       </div>
       <van-button v-if="canAudit" type="primary" class="btn-sub" @click="update">审核</van-button>
@@ -34,6 +40,7 @@
       // 活动信息
       const info = ref({        
       });
+      let fileList = ref([]);
       let route = useRoute();
       new securityFacilitiesErrService().queryById(route.query.id).then((data) => {
         info.value = data;
@@ -43,6 +50,14 @@
           canAudit.value = false;
         }      
 
+        info.value.enclosure.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
+            fileList.value.push({
+              name: decodeURIComponent(item.substring(item.lastIndexOf("/") + 1)),
+              url: item,
+            });
+          }
+        });
         isLoading.value = false;
       });
       // 审核通过
@@ -62,6 +77,7 @@
         info,
         isLoading,
         update,
+        fileList,
         canAudit,
       };
     },

src/views/activityMan/siteInspection/siteInspectionInfo.vue

@@ -12,7 +12,13 @@
         <p>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;点：{{ info.place }}</p>
         <p>详细地址：{{ info.placeDel }}</p>
         <p>督查时间：{{ info.supervisionTime }}</p>
-        <p>附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件：<span style="color: #6892ff">活动申请书</span></p>
+        <p>
+          附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件：
+          <span v-if="fileList.length != 0" style="color: #6892ff">{{
+            fileList[0].name
+          }}</span>
+          <span v-else style="color: red">无</span>
+        </p>
         <p>督查内容：{{ info.supervisionContent }}</p>
       </div>
       <van-button v-if="canAudit" type="primary" class="btn-sub" @click="update">审核</van-button>
@@ -26,12 +32,13 @@
   import { useRoute } from "vue-router";
   export default {
     setup() {
-      window.xm.setNavigationBarTitle({ title: '场所检查详情'})
+      //window.xm.setNavigationBarTitle({ title: '场所检查详情'})
       let isLoading = ref(true);
       let canAudit = ref(false);
       // 活动信息
       const info = ref({        
       });
+      let fileList = ref([]);
       let route = useRoute();
       new siteInspectionService().queryById(route.query.id).then((data) => {
         info.value = data;
@@ -41,7 +48,14 @@
           canAudit.value = false;
         }
         
-
+        info.value.enclosure.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
+            fileList.value.push({
+              name: decodeURIComponent(item.substring(item.lastIndexOf("/") + 1)),
+              url: item,
+            });
+          }
+        });
         isLoading.value = false;
       });
       // 审核通过
@@ -61,6 +75,7 @@
         info,
         isLoading,
         update,
+        fileList,
         canAudit,
       };
     },