更新，修改路径

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -7,80 +7,82 @@
     @click-left="onClickLeft"
     @click-right="onClickRight"
   />
-  <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
-  <van-tabs
-    v-model:active="active"
-    title-inactive-color="#bdbdbd"
-    title-active-color="#36a7f3"
-    @click-tab="onClickTab"
-  >
-    <van-tab title="未审核" name="0">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
-      >
-        <van-swipe-cell
-          v-for="item in list"
-          :key="item"
-          :before-close="beforeClose"
+  <div class="main">
+    <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
+    <van-tabs
+      v-model:active="active"
+      title-inactive-color="#bdbdbd"
+      title-active-color="#36a7f3"
+      @click-tab="onClickTab"
+    >
+      <van-tab title="未审核" name="0">
+        <van-list
+          v-model:loading="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
         >
-          <div class="list_item" @click="goInfo(item.id)">
-            <div class="item-left">
-              <p style="color: #c4c4c4">{{ item.partyTime }}</p>
-              <p style="color: red">待审核</p>
+          <van-swipe-cell
+            v-for="item in list"
+            :key="item"
+            :before-close="beforeClose"
+          >
+            <div class="list_item" @click="goInfo(item.id)">
+              <div class="item-left">
+                <p style="color: #c4c4c4">{{ item.partyTime }}</p>
+                <p style="color: red">待审核</p>
+              </div>
+              <van-cell is-link>
+                <template #title>
+                  <p>异常人员：{{ item.abnormalName }}</p>
+                  <p>身份证号：{{ item.abnormalIdcar }}</p>
+                  <p>异常行为：{{ item.abnormalBehavior }}</p>
+                </template>
+              </van-cell>
             </div>
-            <van-cell is-link>
-              <template #title>
-                <p>异常人员：{{ item.abnormalName }}</p>
-                <p>身份证号：{{ item.abnormalIdcar }}</p>
-                <p>异常行为：{{ item.abnormalBehavior }}</p>
-              </template>
-            </van-cell>
-          </div>
-          <template #right>
-            <van-button square type="danger" text="删除" class="button" />
-            <van-button
-              square
-              type="primary"
-              text="修改"
-              class="button"
-              @click="updateItem(item)"
-            />
-          </template>
-        </van-swipe-cell>
-      </van-list>
-    </van-tab>
-    <van-tab title="已审核" name="1">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
-      >
-        <van-swipe-cell
-          v-for="item in list"
-          :key="item"
-          :before-close="beforeClose"
+            <template #right>
+              <van-button square type="danger" text="删除" class="button" />
+              <van-button
+                square
+                type="primary"
+                text="修改"
+                class="button"
+                @click="updateItem(item)"
+              />
+            </template>
+          </van-swipe-cell>
+        </van-list>
+      </van-tab>
+      <van-tab title="已审核" name="1">
+        <van-list
+          v-model:loading="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
         >
-          <div class="list_item" @click="goInfo(item.id)">
-            <div class="item-left">
-              <p style="color: #c4c4c4">{{ item.partyTime }}</p>
-              <p style="color: red">已审核</p>
+          <van-swipe-cell
+            v-for="item in list"
+            :key="item"
+            :before-close="beforeClose"
+          >
+            <div class="list_item" @click="goInfo(item.id)">
+              <div class="item-left">
+                <p style="color: #c4c4c4">{{ item.partyTime }}</p>
+                <p style="color: red">已审核</p>
+              </div>
+              <van-cell is-link>
+                <template #title>
+                  <p>异常人员：{{ item.abnormalName }}</p>
+                  <p>身份证号：{{ item.abnormalIdcar }}</p>
+                  <p>异常行为：{{ item.abnormalBehavior }}</p>
+                </template>
+              </van-cell>
             </div>
-            <van-cell is-link>
-              <template #title>
-                <p>异常人员：{{ item.abnormalName }}</p>
-                <p>身份证号：{{ item.abnormalIdcar }}</p>
-                <p>异常行为：{{ item.abnormalBehavior }}</p>
-              </template>
-            </van-cell>
-          </div>
-        </van-swipe-cell>
-      </van-list>
-    </van-tab>
-  </van-tabs>
+          </van-swipe-cell>
+        </van-list>
+      </van-tab>
+    </van-tabs>
+  </div>
 </template>
     
     <script>

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -6,8 +6,8 @@
     left-arrow
     @click-left="onClickLeft"
   />
-  <van-loading size="16px" v-if="isLoading">加载中...</van-loading>
-  <div class="main" v-if="!isLoading">
+  <van-loading size="16px" v-show="isLoading">加载中...</van-loading>
+  <div class="main" v-show="!isLoading">
     <div class="banner">
       <h2>扎实提升“三力”</h2>
       <h2>深入推进“三化”</h2>
@@ -22,8 +22,18 @@
       <p>活动地点：{{ placeActivity.place }}</p>
       <p>详细地址：{{ placeActivity.placeDel }}</p>
       <p>活动时间：{{ placeActivity.activityTime }}</p>
-      <p>安全预案：<span style="color: #6892ff">活动申请书</span></p>
-      <p>主题内容：{{ placeActivity.subjectContent }}</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"
+      />
     </div>
     <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
@@ -34,7 +44,10 @@ import { ref } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
+// 富文本编辑器
+import WangEditor from "@/components/editor/WangEditor";
 export default {
+  components: { WangEditor },
   setup() {
     const onClickLeft = () => {
       history.back();
@@ -73,6 +86,10 @@ export default {
       state: "",
       assessment: "",
     });
+    // 文件上传
+    let fileList = ref([]);
+    // 富文本
+    let subjectContentEditor = ref(null);
     let route = useRoute();
     new placeActivityServer().queryById(route.query.id).then((data) => {
       placeActivity.value = data;
@@ -83,8 +100,18 @@ export default {
           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,
+          });
+        }
+      });
+      subjectContentEditor.value.init(placeActivity.value.subjectContent);
       isLoading.value = false;
     });
+
     // 审核通过
     const update = () => {
       isLoading.value = true;
@@ -98,8 +125,10 @@ export default {
     return {
       onClickLeft,
       placeActivity,
+      fileList,
       isLoading,
       update,
+      subjectContentEditor,
     };
   },
 };
@@ -148,4 +177,9 @@ export default {
   text-align: center;
   margin-top: 80px;
 }
+#editor {
+  width: 100%;
+  height: 150px;
+  overflow: hidden;
+}
 </style>

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -193,11 +193,14 @@
             <van-uploader
               :after-read="afterRead"
               v-model="fileList"
-              multiple
               :max-count="1"
+              capture="camera"
               accept=""
             >
               <van-button icon="plus">上传文件</van-button>
+              <template #preview-cover="file">
+                <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+              </template>
             </van-uploader>
           </template>
         </van-field>
@@ -286,7 +289,6 @@ export default {
       if (route.query.id) {
         new placeActivityServer().queryById(route.query.id).then((data) => {
           placeActivity.value = data;
-          placeActivity.value.reporter = user;
           let ids = data.knownList.id.split(",");
           placeActivity.value.knownList.name = "";
           ids.forEach((item) => {
@@ -294,6 +296,16 @@ export default {
               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,
+              });
+            }
+          });
           subjectContentEditor.value.init(placeActivity.value.subjectContent);
           isLoading.value = false;
         });
@@ -383,11 +395,11 @@ export default {
     // 文件上传
     let fileList = ref([]);
     const afterRead = (file) => {
+      fileList.value = [];
       // 此时可以自行将文件上传至服务器
       new tools()
         .uploadFile(file, `reporting/reportingActivities`)
         .then(({ data }) => {
-          fileList.value = [];
           fileList.value.push(data);
           placeActivity.value.safetyPlan = data.url;
         });
@@ -493,6 +505,18 @@ export default {
   margin-top: 80px;
 }
 #editor {
-  width: 98%;
+  width: 100%;
+  height: 150px;
+}
+.preview-cover {
+  position: absolute;
+  bottom: 0;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 4px;
+  color: #fff;
+  font-size: 12px;
+  text-align: center;
+  background: rgba(0, 0, 0, 0.3);
 }
 </style>

src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -6,8 +6,8 @@
     left-arrow
     @click-left="onClickLeft"
   />
-  <van-loading size="16px" v-if="isLoading">加载中...</van-loading>
-  <div class="main" v-if="!isLoading">
+  <van-loading size="16px" v-show="isLoading">加载中...</van-loading>
+  <div class="main" v-show="!isLoading">
     <div class="banner">
       <h2>扎实提升“三力”</h2>
       <h2>深入推进“三化”</h2>
@@ -19,7 +19,8 @@
       <p>频次:{{ inputForm.frequency }}</p>
       <p>时间：{{ inputForm.partyTime }}</p>
       <p>相关人：{{ inputForm.relatedPersons.name }}</p>
-      <p>内容：{{ inputForm.content }}</p>
+      <p>内容：</p>
+      <wang-editor ref="contentEditor" v-model="inputForm.content" />
     </div>
     <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
@@ -30,7 +31,10 @@ import { ref } from "vue";
 import { useRoute } from "vue-router";
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 import UserManage from "@/api/user/UserManage";
+// 富文本编辑器
+import WangEditor from "@/components/editor/WangEditor";
 export default {
+  components: { WangEditor },
   setup() {
     const onClickLeft = () => {
       history.back();
@@ -59,6 +63,8 @@ export default {
     });
     // 获取信息
     let route = useRoute();
+    // 富文本
+    let contentEditor = ref(null);
     new PrivatePartyPointService().queryById(route.query.id).then((data) => {
       inputForm.value = data;
       let ids = data.relatedPersons.id.split(",");
@@ -68,6 +74,7 @@ export default {
           inputForm.value.relatedPersons.name += data.name + ",";
         });
       });
+      contentEditor.value.init(inputForm.value.content);
       isLoading.value = false;
     });
     // 审核通过
@@ -85,6 +92,7 @@ export default {
       inputForm,
       isLoading,
       update,
+      contentEditor,
     };
   },
 };
@@ -133,4 +141,9 @@ export default {
   text-align: center;
   margin-top: 80px;
 }
+#editor {
+  width: 100%;
+  height: 150px;
+  overflow: hidden;
+}
 </style>

src/views/tab_a/tabAll.vue

@@ -131,7 +131,7 @@ import userSets from "@/api/sys/userSets";
 				this.$router.push("/selfMeetingList")
 			},
 			abnormalCrowd(){
-				this.$router.push("/abnormalCrowd")
+				this.$router.push("/differentbelieversList")
 			},
 			async TokenLogin(){
 				let that=this;