首页 发现 帮助
注册 登录
yin_yu820
/
HS_MZAP
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

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

guoqing 2 年之前
父节点
98728c3e90 c3857b1cff
当前提交
a9d9e58ab5
共有 30 个文件被更改，包括 11659 次插入 和 231 次删除
合并视图 显示文件统计
  1. 10605 1
      package-lock.json
  2. 12 7
      public/index.html
  3. 1 6
      src/App.vue
  4. 16 0
      src/api/nonReligiousInformation/nonReligiousInformationService.js
  5. 3 0
      src/api/placeActivity/placeActivityServer.js
  6. 16 0
      src/api/religiousConference/religiousConferenceService.js
  7. 16 0
      src/api/securityFacilitiesErr/securityFacilitiesErrService.js
  8. 6 0
      src/api/sys/tools.js
  9. 7 0
      src/api/sys/userSets.js
  10. 14 22
      src/components/editor/WangEditor.vue
  11. 0 1
      src/main.js
  12. 9 1
      src/router/index.js
  13. 3 0
      src/store/index.js
  14. 3 3
      src/utils/config.js
  15. 12 1
      src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue
  16. 11 3
      src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue
  17. 263 5
      src/views/activityMan/nonReligiousInformation/nonReligiousInformationList.vue
  18. 12 1
      src/views/activityMan/placeactivity/placeActivityInfo.vue
  19. 1 1
      src/views/activityMan/placeactivity/placeActivityList.vue
  20. 17 3
      src/views/activityMan/placeactivity/placeActivityView.vue
  21. 214 5
      src/views/activityMan/religiousConference/religiousConferenceList.vue
  22. 225 82
      src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrList.vue
  23. 13 2
      src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue
  24. 3 3
      src/views/activityMan/selfMeetingReport/selfMeetingList.vue
  25. 24 48
      src/views/activityMan/selfMeetingReport/selfMeetingView.vue
  26. 20 6
      src/views/activityMan/siteInspection/siteInspectionList.vue
  27. 4 2
      src/views/activityMan/siteInspection/siteInspectionView.vue
  28. 94 0
      src/views/login/changePassword.vue
  29. 18 11
      src/views/tab_a/tabAll.vue
  30. 17 17
      vue.config.js

文件差异内容过多而无法显示
+ 10605 - 1
package-lock.json


+ 12 - 7
public/index.html
查看文件 

@@ -1,20 +1,25 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="">
 
 <html lang="">
 
-  <head>
 
+
 
+<head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
-    <title><%= htmlWebpackPlugin.options.title %></title>
 
+    <title>
 
+        <%= htmlWebpackPlugin.options.title %>
 
+    </title>
 
 
 
     <!--小程序SDK 只有在小程序容器中才能加载到 -->
 
     <!--小程序SDK 只有在小程序容器中才能加载到 -->
 
-	  <!-- <script src="shinemosdk://20000/index.js"></script> -->
 
-  </head>
 
-  <body>
 
+    <script src="shinemosdk://20000/index.js"></script>
 
+</head>
 
+
 
+<body>
 
     <noscript>
 
     <noscript>
 
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 
     </noscript>
 
     </noscript>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
     <!-- built files will be auto injected -->
 
     <!-- built files will be auto injected -->
 
-  </body>
 
-</html>
 
+</body>
 
+
 
+</html>

+ 1 - 6
src/App.vue
查看文件 

@@ -1,11 +1,6 @@
 
 <template>
 
 <template>
 
 	<router-view></router-view>
 
 	<router-view></router-view>
 
-	<van-tabbar v-model="active" route  v-show="showStatus" >
 
-        <van-tabbar-item replace to="/setting" name="toBeDone" icon="notes-o">我的待办</van-tabbar-item>
 
-        <van-tabbar-item replace to="/setting" name="siteMan" icon="shop-o">场所管理</van-tabbar-item>
 
-        <van-tabbar-item replace to="/setting" name="activityMan" icon="newspaper-o">活动管理</van-tabbar-item>
 
-        <van-tabbar-item replace to="/setting" name="setting" icon="friends-o">个人中心</van-tabbar-item>
 
-    </van-tabbar>
 
+	
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>

+ 16 - 0
src/api/nonReligiousInformation/nonReligiousInformationService.js
查看文件 

@@ -0,0 +1,16 @@
 
+import request from '@/utils/request'
 
+export default class nonReligiousInformationService {
 
+    // 保存
 
+    save(inputForm) {
 
+        return request.post(
 
+            '/nonreligiousinformation/nonReligiousInformation/save',
 
+            inputForm
 
+        )
 
+    }
 
+    list(params) {
 
+        return request.get(
 
+            `/nonreligiousinformation/nonReligiousInformation/list`,
 
+            params
 
+        )
 
+    }
 
+}

+ 3 - 0
src/api/placeActivity/placeActivityServer.js
查看文件 

@@ -19,4 +19,7 @@ export default class placeActivityServer {
 
             params
 
             params
 
         )
 
         )
 
     };
 
     };
 
+    queryListLonginId() {
 
+        return request.get('/reporting/reportingActivities/queryListLonginId')
 
+    }
 
 }
 
 }

+ 16 - 0
src/api/religiousConference/religiousConferenceService.js
查看文件 

@@ -0,0 +1,16 @@
 
+import request from '@/utils/request'
 
+export default class religiousConferenceService {
 
+    // 保存
 
+    save(inputForm) {
 
+        return request.post(
 
+            '/zzcssb/religiousConference/save',
 
+            inputForm
 
+        )
 
+    }
 
+    list(params) {
 
+        return request.get(
 
+            `/zzcssb/religiousConference/list`,
 
+            params
 
+        )
 
+    }
 
+}

+ 16 - 0
src/api/securityFacilitiesErr/securityFacilitiesErrService.js
查看文件 

@@ -0,0 +1,16 @@
 
+import request from '@/utils/request'
 
+export default class securityFacilitiesErrService {
 
+    // 保存
 
+    save(inputForm) {
 
+        return request.post(
 
+            '/afssyc/securityFacilitiesErr/save',
 
+            inputForm
 
+        )
 
+    }
 
+    list(params) {
 
+        return request.get(
 
+            `/afssyc/securityFacilitiesErr/list`,
 
+            params
 
+        )
 
+    }
 
+}

+ 6 - 0
src/api/sys/tools.js
查看文件 

@@ -15,5 +15,11 @@ export default class Tools {
 
             `/sys/file/webupload/upload?uploadPath=${uploadPath}`,
 
             `/sys/file/webupload/upload?uploadPath=${uploadPath}`,
 
             formData
 
             formData
 
         )
 
         )
 
+    };
 
+    // 用户查询
 
+    queryById(id) {
 
+        return request.get(
 
+            `/sys/user/queryById`, { id: id }
 
+        )
 
     }
 
     }
 
 }
 
 }

+ 7 - 0
src/api/sys/userSets.js
查看文件 

@@ -18,6 +18,13 @@ export default class userSets {
 
             params
 
             params
 
         )
 
         )
 
     };
 
     };
 
+    //修改密码
 
+    ChangePass(params) {
 
+        return request.put(
 
+            `/sys/user/savePwd`,
 
+            params
 
+        )
 
+    };
 
 
 
     //盐政通测试用户同步规则
 
     //盐政通测试用户同步规则
 
     SchemaService(params) {
 
     SchemaService(params) {

+ 14 - 22
src/components/editor/WangEditor.vue
查看文件 

@@ -1,11 +1,6 @@
 
 <template>
 
 <template>
 
-   <div class="editor" style="min-width:100px; padding-right:10px">
 
-    <div ref="toolbar" class="toolbar">
 
-    </div>
 
-    <div ref="editor" class="wtext">
 
-    </div>
 
-  </div>
 
-  </template>
 
+  <div id="editor" style="min-width: 100px; padding-right: 10px"></div>
 
+</template>
 
   
   
   <script>
 
   <script>
 
 import E from "wangeditor";
 
 import E from "wangeditor";
 
@@ -18,8 +13,8 @@ export default {
 
     };
 
     };
 
   },
 
   },
 
   model: {
 
   model: {
 
-    prop: "value",
 
-    event: "change",
 
+    prop: "modelValue",
 
+    event: "update:modelValue",
 
   },
 
   },
 
   props: {
 
   props: {
 
     isClear: {
 
     isClear: {
 
@@ -45,8 +40,10 @@ export default {
 
       this.editor.txt.html(val);
 
       this.editor.txt.html(val);
 
     },
 
     },
 
     seteditor() {
 
     seteditor() {
 
-      this.editor = new E(this.$refs.toolbar, this.$refs.editor);
 
-      this.editor.customConfig.placeholder = "请输入内容";
 
+      this.editor = new E("#editor");
 
+      this.editor.customConfig.placeholder = "请输入内容....";
 
+      this.editor.customConfig.zIndex = 500;
 
+      this.editor.customConfig.height = 150;
 
       this.editor.customConfig.uploadImgShowBase64 = true; // base 64 存储图片
 
       this.editor.customConfig.uploadImgShowBase64 = true; // base 64 存储图片
 
       this.editor.customConfig.uploadImgServer = ""; // 配置服务器端地址
 
       this.editor.customConfig.uploadImgServer = ""; // 配置服务器端地址
 
       this.editor.customConfig.uploadImgHeaders = {}; // 自定义 header
 
       this.editor.customConfig.uploadImgHeaders = {}; // 自定义 header
 
@@ -77,7 +74,7 @@ export default {
 
       };
 
       };
 
       this.editor.customConfig.onchange = (html) => {
 
       this.editor.customConfig.onchange = (html) => {
 
         this.info_ = html; // 绑定当前逐渐地值
 
         this.info_ = html; // 绑定当前逐渐地值
 
-        this.$emit("change", this.info_); // 将内容同步到父组件中
 
+        this.$emit("update:modelValue", this.info_); // 将内容同步到父组件中
 
       };
 
       };
 
       // 创建富文本编辑器
 
       // 创建富文本编辑器
 
       this.editor.create();
 
       this.editor.create();
 
@@ -90,15 +87,10 @@ export default {
 
 </script>
 
 </script>
 
   
   
 <style lang="css">
 
 <style lang="css">
 
-.editor {
 
-  width: 98%;
 
+#editor {
 
+  width: 100%;
 
+  height: 150px;
 
   margin: 0 auto;
 
   margin: 0 auto;
 
 }
 
 }
 
-.toolbar {
 
-  border: 1px solid #ccc;
 
-}
 
-.wtext {
 
-  border: 1px solid #ccc;
 
-  height: 100px;
 
-}
 
-</style>
 
+
 
+</style>

+ 0 - 1
src/main.js
查看文件 

@@ -13,7 +13,6 @@ import 'vant/lib/index.css';
 
 import store from './store';
 
 import store from './store';
 
 
 
 const app = createApp(App)
 
 const app = createApp(App)
 
-
 
 app.use(router)
 
 app.use(router)
 
     .use(NavBar)
 
     .use(NavBar)
 
     .use(Button)
 
     .use(Button)

+ 9 - 1
src/router/index.js
查看文件 

@@ -4,7 +4,7 @@ const routes = [{
 
         path: '/',
 
         path: '/',
 
         name: 'home',
 
         name: 'home',
 
         component: () =>
 
         component: () =>
 
-            import ('../views/login/login.vue'),
 
+            import ('../views/tab_a/tabAll.vue'),
 
         meta: {
 
         meta: {
 
             isShowTarbar: false,
 
             isShowTarbar: false,
 
         }
 
         }
 
@@ -25,6 +25,14 @@ const routes = [{
 
             isShowTarbar: false,
 
             isShowTarbar: false,
 
         }
 
         }
 
     }, {
 
     }, {
 
+        path: '/changePassword',
 
+        name: 'changePassword',
 
+        component: () =>
 
+            import ('../views/login/changePassword.vue'),
 
+        meta: {
 
+            isShowTarbar: false,
 
+        }
 
+    },{
 
         path: '/tab_a',
 
         path: '/tab_a',
 
         name: 'tab_a',
 
         name: 'tab_a',
 
         component: () =>
 
         component: () =>

+ 3 - 0
src/store/index.js
查看文件 

@@ -14,8 +14,11 @@ const store =createStore({
 
             window.localStorage.setItem(TOKEN_Key,state.user);
 
             window.localStorage.setItem(TOKEN_Key,state.user);
 
         },
 
         },
 
         setPcToken(state,data){
 
         setPcToken(state,data){
 
+            console.log("设置token1");
 
             state.pctoken=data;
 
             state.pctoken=data;
 
+            console.log("设置token2");
 
             window.localStorage.setItem(PCTOKEN_Key,state.pctoken);
 
             window.localStorage.setItem(PCTOKEN_Key,state.pctoken);
 
+            console.log("设置token3"+state.pctoken);
 
         },
 
         },
 
         setSelectColor(state,data){
 
         setSelectColor(state,data){
 
             state.selectcolor=data;
 
             state.selectcolor=data;

+ 3 - 3
src/utils/config.js
查看文件 

@@ -1,9 +1,9 @@
 
 let APP_SERVER_URL = ""
 
 let APP_SERVER_URL = ""
 
 
 
-if(process.env.NODE_ENV === 'development'){
 
+if (process.env.NODE_ENV === 'development') {
 
     // 开发环境
 
     // 开发环境
 
-    APP_SERVER_URL = 'http://localhost:8084'
 
-}else{
 
+    APP_SERVER_URL = 'http://192.168.139.86:8084'
 
+} else {
 
     // 生产环境
 
     // 生产环境
 
     APP_SERVER_URL = 'http://123.57.226.179:8010/hs'
 
     APP_SERVER_URL = 'http://123.57.226.179:8010/hs'
 
 }
 
 }

+ 12 - 1
src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue
查看文件 

@@ -23,7 +23,7 @@
 
       <p>现居地详情:{{ inputForm.currentResidenceDetail }}</p>
 
       <p>现居地详情:{{ inputForm.currentResidenceDetail }}</p>
 
       <p>异常行为:{{ inputForm.abnormalBehavior }}</p>
 
       <p>异常行为:{{ inputForm.abnormalBehavior }}</p>
 
     </div>
 
     </div>
 
-    <van-button type="primary" class="btn-sub">审核</van-button>
 
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
       
       
@@ -67,10 +67,21 @@ export default {
 
         inputForm.value = data;
 
         inputForm.value = data;
 
         isLoading.value = false;
 
         isLoading.value = false;
 
       });
 
       });
 
+    // 审核通过
 
+    const update = () => {
 
+      isLoading.value = true;
 
+      inputForm.value.assessment = 1;
 
+      new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
 
+        console.log(res);
 
+        onClickLeft();
 
+        isLoading.value = false;
 
+      });
 
+    };
 
     return {
 
     return {
 
       onClickLeft,
 
       onClickLeft,
 
       inputForm,
 
       inputForm,
 
       isLoading,
 
       isLoading,
 
+      update,
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };

+ 11 - 3
src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue
查看文件 

@@ -117,7 +117,7 @@
 
       </van-cell-group>
 
       </van-cell-group>
 
     </div>
 
     </div>
 
     <div class="subbtn">
 
     <div class="subbtn">
 
-      <van-button type="primary">提交</van-button>
 
+      <van-button type="primary" @click="submit">提交</van-button>
 
       <van-button type="default" hairline>取消</van-button>
 
       <van-button type="default" hairline>取消</van-button>
 
     </div>
 
     </div>
 
   </div>
 
   </div>
 
@@ -183,8 +183,15 @@ export default {
 
         .map((option) => option.text)
 
         .map((option) => option.text)
 
         .join("/");
 
         .join("/");
 
     };
 
     };
 
-    // 性别
 
-    let checked = ref("1");
 
+    // 提交数据
 
+    const submit = () => {
 
+      isLoading.value = true;
 
+      new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
 
+        console.log("提交", res);
 
+        onClickLeft();
 
+        isLoading.value = false;
 
+      });
 
+    };
 
     return {
 
     return {
 
       inputForm,
 
       inputForm,
 
       // 返回
 
       // 返回
 
@@ -195,6 +202,7 @@ export default {
 
       onFinish,
 
       onFinish,
 
       cascaderValue,
 
       cascaderValue,
 
       isLoading,
 
       isLoading,
 
+      submit,
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };

+ 263 - 5
src/views/activityMan/nonReligiousInformation/nonReligiousInformationList.vue
查看文件 

@@ -1,6 +1,264 @@
 
 <template>
 
 <template>
 
-    <div class="about">
 
-      <h1>This is an about page</h1>
 
-    </div>
 
-  </template>
 
-  
+  <van-nav-bar
 
+    title="其他有害信息"
 
+    left-text=""
 
+    right-text="上报"
 
+    left-arrow
 
+    @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="list_item" @click="goInfo(item.id)">
 
+            <div class="item-left">
 
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
 
+              <p style="color: red">待审核</p>
 
+            </div>
 
+            <van-cell is-link >
 
+              <template #title >
 
+                {{ getCategories(item.nonReligiousCategories) }}（{{ item.placeSelectName }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.siteName.organizationName }}
 
+              </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"
 
+        >
 
+          <div class="list_item" @click="goInfo(item.id)">
 
+            <div class="item-left">
 
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
 
+              <p style="color: gray">已审核</p>
 
+            </div>
 
+            <van-cell is-link >
 
+              <template #title >
 
+                {{ getCategories(item.nonReligiousCategories) }}（{{ item.placeSelectName }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.siteName.organizationName }}
 
+              </template>
 
+            </van-cell>
 
+          </div>
 
+        </van-swipe-cell>
 
+      </van-list>
 
+    </van-tab>
 
+  </van-tabs>
 
+</template>
 
+
 
+<script>
 
+import { ref } from "vue";
 
+import router from "@/router";
 
+import nonReligiousInformationService from "@/api/nonReligiousInformation/nonReligiousInformationService";
 
+export default {
 
+name: "nonReligiousInformationList",
 
+setup() {
 
+  const onClickLeft = () => {
 
+    history.back();
 
+  };
 
+  const onClickRight = () => {
 
+    router.push("/nonReligiousInformationView");
 
+  };
 
+  let tabIndex = ref(0);
 
+  
+  //tab切换
 
+  let active = ref(0);
 
+  const onClickTab = (val) => {
 
+    // 清空列表数据
 
+    finished.value = false;
 
+    list.value = [];
 
+    // 重新加载数据
 
+    // 将 loading 设置为 true，表示处于加载状态
 
+    loading.value = true;
 
+    index = 0;
 
+    if (val.name == 0) {
 
+      onLoad(0);
 
+    } else {
 
+      onLoad(1);
 
+    }
 
+  };
 
+  // 列表
 
+  let list = ref([]);
 
+  const loading = ref(false);
 
+  const finished = ref(false);
 
+  let index = 0;
 
+  const onLoad = (val) => {
 
+    // 异步更新数据
 
+    new nonReligiousInformationService()
 
+      .list({
 
+        current: index + 1,
 
+        size: 10,
 
+        assessment:val ? val : 0,
 
+      })
 
+      .then((res) => {
 
+        list.value.push(...res.records) ;
 
+        // 加载状态结束
 
+        loading.value = false;        
+        // 数据全部加载完成
 
+        if (res.records.length < 10) {
 
+          finished.value = true;
 
+        }
 
+        index++;        
+      });
 
+  };
 
+  //字典配置
 
+  const getCategories= (key ) => {
 
+    let re="";
 
+    switch(key){
 
+      case "1":
 
+          re="宗教组织";
 
+          break;
 
+      case "10":
 
+          re="邪教组织";
 
+          break;
 
+      case "11":
 
+          re="地下神学院";
 
+          break;
 
+      case "2":
 
+          re="地下教会";
 
+          break;
 
+      case "3":
 
+          re="韩美境外渗透组织";
 
+          break;
 
+      case "4":
 
+          re="本地精神控制类有害培训机构";
 
+          break;      
+      case "5":
 
+          re="“呼喊派”骨干组织";
 
+          break;
 
+      case "6":
 
+          re="“改革宗”地下教会组织";
 
+          break;
 
+      case "7":
 
+          re="藏传佛教本地组织";
 
+          break;
 
+      case "8":
 
+          re="学生传教组织";
 
+          break;
 
+      case "9":
 
+          re="“义诊医疗”地下教会组织";
 
+          break;
 
+      case "91":
 
+          re="“亚文化”传教组织";
 
+          break;
 
+      case "92":
 
+          re="重点公司组织";
 
+          break;          
+    }
 
+    return re;
 
+  };
 
+
 
+  
+  
+  // 搜索
 
+  let value = ref("");
 
+  // 删除确认
 
+  const beforeClose = ({ position }) => {
 
+    switch (position) {
 
+      case "left":
 
+      case "cell":
 
+      case "outside":
 
+        return true;
 
+      case "right":
 
+        return new Promise((resolve) => {
 
+          showConfirmDialog({
 
+            title: "确定删除吗？",
 
+          }).then(resolve);
 
+        });
 
+    }
 
+  };
 
+  return {
 
+    onClickLeft,
 
+    onClickTab,
 
+    list,
 
+    onLoad,
 
+    getCategories,
 
+    loading,
 
+    finished,
 
+    value,
 
+    onClickRight,
 
+    tabIndex,
 
+    beforeClose,
 
+  };
 
+},
 
+};
 
+</script>
 
+
 
+<style>
 
+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 {
 
+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>

+ 12 - 1
src/views/activityMan/placeactivity/placeActivityInfo.vue
查看文件 

@@ -25,7 +25,7 @@
 
       <p>安全预案：<span style="color: #6892ff">活动申请书</span></p>
 
       <p>安全预案：<span style="color: #6892ff">活动申请书</span></p>
 
       <p>主题内容：{{ placeActivity.subjectContent }}</p>
 
       <p>主题内容：{{ placeActivity.subjectContent }}</p>
 
     </div>
 
     </div>
 
-    <van-button type="primary" class="btn-sub">审核</van-button>
 
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
   
   
@@ -85,10 +85,21 @@ export default {
 
       });
 
       });
 
       isLoading.value = false;
 
       isLoading.value = false;
 
     });
 
     });
 
+    // 审核通过
 
+    const update = () => {
 
+      isLoading.value = true;
 
+      placeActivity.value.assessment = 1;
 
+      new placeActivityServer().save(placeActivity.value).then((res) => {
 
+        console.log(res);
 
+        onClickLeft();
 
+        isLoading.value = false;
 
+      });
 
+    };
 
     return {
 
     return {
 
       onClickLeft,
 
       onClickLeft,
 
       placeActivity,
 
       placeActivity,
 
       isLoading,
 
       isLoading,
 
+      update,
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };

+ 1 - 1
src/views/activityMan/placeactivity/placeActivityList.vue
查看文件 

@@ -219,4 +219,4 @@ export default {
 
 .button {
 
 .button {
 
   height: 100%;
 
   height: 100%;
 
 }
 
 }
 
-</style>
 
+</style>

+ 17 - 3
src/views/activityMan/placeactivity/placeActivityView.vue
查看文件 

@@ -102,10 +102,10 @@
 
         <van-field
 
         <van-field
 
           v-model="placeActivity.reporter.name"
 
           v-model="placeActivity.reporter.name"
 
           center
 
           center
 
+          readonly
 
           label="报告人:"
 
           label="报告人:"
 
           placeholder="请选择报告人"
 
           placeholder="请选择报告人"
 
           input-align="right"
 
           input-align="right"
 
-          right-icon="arrow-down"
 
         />
 
         />
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
@@ -229,6 +229,7 @@ import UserManage from "@/api/user/UserManage";
 
 import { useRoute } from "vue-router";
 
 import { useRoute } from "vue-router";
 
 // 富文本编辑器
 
 // 富文本编辑器
 
 import WangEditor from "@/components/editor/WangEditor";
 
 import WangEditor from "@/components/editor/WangEditor";
 
+
 
 export default {
 
 export default {
 
   components: { personList, WangEditor },
 
   components: { personList, WangEditor },
 
   setup() {
 
   setup() {
 
@@ -270,13 +271,22 @@ export default {
 
       state: "0",
 
       state: "0",
 
       assessment: "0",
 
       assessment: "0",
 
     });
 
     });
 
+    // 富文本编辑器
 
     const subjectContentEditor = ref(null);
 
     const subjectContentEditor = ref(null);
 
+    // 获取当前登录用户
 
+    const user = new placeActivityServer().queryListLonginId().then((data) => {
 
+      let id = data + "";
 
+      new tools().queryById(id).then((res) => {
 
+        placeActivity.value.reporter = res;
 
+      });
 
+    });
 
     // 根据路由初始化
 
     // 根据路由初始化
 
     let route = useRoute();
 
     let route = useRoute();
 
     onMounted(() => {
 
     onMounted(() => {
 
       if (route.query.id) {
 
       if (route.query.id) {
 
         new placeActivityServer().queryById(route.query.id).then((data) => {
 
         new placeActivityServer().queryById(route.query.id).then((data) => {
 
           placeActivity.value = data;
 
           placeActivity.value = data;
 
+          placeActivity.value.reporter = user;
 
           let ids = data.knownList.id.split(",");
 
           let ids = data.knownList.id.split(",");
 
           placeActivity.value.knownList.name = "";
 
           placeActivity.value.knownList.name = "";
 
           ids.forEach((item) => {
 
           ids.forEach((item) => {
 
@@ -288,7 +298,8 @@ export default {
 
           isLoading.value = false;
 
           isLoading.value = false;
 
         });
 
         });
 
       } else {
 
       } else {
 
-        subjectContentEditor.value.init("");
 
+        subjectContentEditor.value.init(placeActivity.value.subjectContent);
 
+        placeActivity.value.reporter = user;
 
         isLoading.value = false;
 
         isLoading.value = false;
 
       }
 
       }
 
     });
 
     });
 
@@ -373,18 +384,21 @@ export default {
 
     let fileList = ref([]);
 
     let fileList = ref([]);
 
     const afterRead = (file) => {
 
     const afterRead = (file) => {
 
       // 此时可以自行将文件上传至服务器
 
       // 此时可以自行将文件上传至服务器
 
-      console.log(file);
 
       new tools()
 
       new tools()
 
         .uploadFile(file, `reporting/reportingActivities`)
 
         .uploadFile(file, `reporting/reportingActivities`)
 
         .then(({ data }) => {
 
         .then(({ data }) => {
 
+          fileList.value = [];
 
           fileList.value.push(data);
 
           fileList.value.push(data);
 
           placeActivity.value.safetyPlan = data.url;
 
           placeActivity.value.safetyPlan = data.url;
 
         });
 
         });
 
     };
 
     };
 
     // 提交数据
 
     // 提交数据
 
     const submit = () => {
 
     const submit = () => {
 
+      isLoading.value = true;
 
       new placeActivityServer().save(placeActivity.value).then((res) => {
 
       new placeActivityServer().save(placeActivity.value).then((res) => {
 
         console.log("提交", res);
 
         console.log("提交", res);
 
+        onClickLeft();
 
+        isLoading.value = false;
 
       });
 
       });
 
     };
 
     };
 
     return {
 
     return {

+ 214 - 5
src/views/activityMan/religiousConference/religiousConferenceList.vue
查看文件 

@@ -1,6 +1,215 @@
 
 <template>
 
 <template>
 
-    <div class="about">
 
-      <h1>This is an about page</h1>
 
-    </div>
 
-  </template>
 
-  
+  <van-nav-bar
 
+    title="负责人会议"
 
+    left-text=""
 
+    right-text="上报"
 
+    left-arrow
 
+    @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="list_item" @click="goInfo(item.id)">
 
+            <div class="item-left">
 
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
 
+              <p style="color: red">待审核</p>
 
+            </div>
 
+            <van-cell is-link>
 
+              <template #title >
 
+                {{ item.siteName.name }}（{{ item.meetingTime }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.participants.name }}
 
+              </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"
 
+        >
 
+          <div class="list_item" @click="goInfo(item.id)">
 
+            <div class="item-left">
 
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
 
+              <p style="color: gray">已审核</p>
 
+            </div>            
+            <van-cell is-link>
 
+              <template #title >
 
+                {{ item.siteName.name }}（{{ item.meetingTime }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.participants.name }}
 
+              </template>
 
+            </van-cell>
 
+          </div>
 
+        </van-swipe-cell>
 
+      </van-list>
 
+    </van-tab>
 
+  </van-tabs>
 
+</template>
 
+
 
+<script>
 
+import { ref } from "vue";
 
+import router from "@/router";
 
+import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";
 
+export default {
 
+name: "religiousConferenceList",
 
+setup() {
 
+  const onClickLeft = () => {
 
+    history.back();
 
+  };
 
+  const onClickRight = () => {
 
+    router.push("/religiousConferenceView");
 
+  };
 
+  let tabIndex = ref(0);
 
+  
+  //tab切换
 
+  let active = ref(0);
 
+  const onClickTab = (val) => {
 
+    // 清空列表数据
 
+    finished.value = false;
 
+    list.value = [];
 
+    // 重新加载数据
 
+    // 将 loading 设置为 true，表示处于加载状态
 
+    loading.value = true;
 
+    index = 0;
 
+    if (val.name == 0) {
 
+      onLoad(0);
 
+    } else {
 
+      onLoad(1);
 
+    }
 
+  };
 
+  // 列表
 
+  let list = ref([]);
 
+  const loading = ref(false);
 
+  const finished = ref(false);
 
+  let index = 0;
 
+  const onLoad = (val) => {
 
+    // 异步更新数据
 
+    console.log(val);
 
+    new religiousConferenceService()
 
+      .list({
 
+        current: index + 1,
 
+        size: 10,
 
+        assessment:val ? val : 0,
 
+      })
 
+      .then((res) => {
 
+        list.value.push(...res.records) ;
 
+        // 加载状态结束
 
+        loading.value = false;        
+        // 数据全部加载完成
 
+        if (res.records.length < 10) {
 
+          finished.value = true;
 
+        }
 
+        index++;
 
+      });
 
+  };
 
+  // 搜索
 
+  let value = ref("");
 
+  // 删除确认
 
+  const beforeClose = ({ position }) => {
 
+    switch (position) {
 
+      case "left":
 
+      case "cell":
 
+      case "outside":
 
+        return true;
 
+      case "right":
 
+        return new Promise((resolve) => {
 
+          showConfirmDialog({
 
+            title: "确定删除吗？",
 
+          }).then(resolve);
 
+        });
 
+    }
 
+  };
 
+  return {
 
+    onClickLeft,
 
+    onClickTab,
 
+    list,
 
+    onLoad,
 
+    loading,
 
+    finished,
 
+    value,
 
+    onClickRight,
 
+    tabIndex,
 
+    beforeClose,
 
+  };
 
+},
 
+};
 
+</script>
 
+
 
+<style>
 
+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 {
 
+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>

+ 225 - 82
src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrList.vue
查看文件 

@@ -1,87 +1,230 @@
 
 <template>
 
 <template>
 
-    <van-nav-bar
 
-      title="安防设施异常"
 
-      left-text=""
 
-      left-arrow
 
-      @click-left="onClickLeft"
 
-    />
 
-    <van-search
 
-    v-model="value"
 
-    shape="round"
 
-    placeholder="请输入搜索关键词"
 
+  <van-nav-bar
 
+    title="安防设施异常"
 
+    left-text=""
 
+    right-text="上报"
 
+    left-arrow
 
+    @click-left="onClickLeft"
 
+    @click-right="onClickRight"
 
   />
 
   />
 
-    <van-list
 
-      v-model:loading="loading"
 
-      :finished="finished"
 
-      finished-text="没有更多了"
 
-    >
 
-      <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
 
-        </template>
 
-      </van-cell>
 
-    </van-list>
 
-  </template>
 
+  <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="list_item" @click="goInfo(item.id)">
 
+            <div class="item-left">
 
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
 
+              <p style="color: red">待审核</p>
 
+            </div>
 
+            <van-cell is-link v-if="item.facilityType==0">
 
+              <template #title >
 
+                {{ item.siteName.name }}（{{ item.videoAudioPoint.name }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.position }}
 
+              </template>
 
+            </van-cell>
 
+            <van-cell is-link v-if="item.facilityType==1">
 
+              <template #title >
 
+                {{ item.siteName.name }}（{{ item.siteFireProtection.name }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.position }}
 
+              </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"
 
+        >
 
+          <div class="list_item" @click="goInfo(item.id)">
 
+            <div class="item-left">
 
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
 
+              <p style="color: gray">已审核</p>
 
+            </div>
 
+            <van-cell is-link v-if="item.facilityType==0">
 
+              <template #title >
 
+                {{ item.siteName.name }}（{{ item.videoAudioPoint.name }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.position }}
 
+              </template>
 
+            </van-cell>
 
+            <van-cell is-link v-if="item.facilityType==1">
 
+              <template #title >
 
+                {{ item.siteName.name }}（{{ item.siteFireProtection.name }}）
 
+              </template>
 
+              <template #label>
 
+                {{ item.position }}
 
+              </template>
 
+            </van-cell>
 
+          </div>
 
+        </van-swipe-cell>
 
+      </van-list>
 
+    </van-tab>
 
+  </van-tabs>
 
+</template>
 
 
 
-  <script>
 
-  import  qs  from "qs";
 
-
 
-  export default {
 
-		data() {
 
-			return{
 
-        value:"",
 
-        list:[],
 
-        loading:false,
 
-        finished:false,
 
-        title:'民宗干事',
 
-				username:"",
 
-				sms:"",
 
-				password:"",
 
-				password2:"",
 
-				con1:"0",
 
-        searchForm: {
 
-            siteName: {
 
-                id: ''
 
-            }
 
-        },
 
-			}
 
-		},
 
-
 
-		async created(){
 
-			let aa=qs.stringify({
 
-            'current': 1,
 
-            'size': 10,
 
-            'orders': [],
 
-            ...this.searchForm
 
-            },  { allowDots: true, arrayFormat: 'indices' })
 
-
 
-			let id=this.$route.query.id;
 
-
 
-			var res = await this.$API.activityMan.siteInspectionList.get(aa);
 
-      console.log(res);
 
-
 
-		},
 
-
 
-		methods:{
 
-        onClickLeft(){
 
-          history.back();
 
-        },
 
-      },
 
+<script>
 
+import { ref } from "vue";
 
+import router from "@/router";
 
+import securityFacilitiesErrService from "@/api/securityFacilitiesErr/securityFacilitiesErrService";
 
+export default {
 
+name: "securityFacilitiesErrList",
 
+setup() {
 
+  const onClickLeft = () => {
 
+    history.back();
 
   };
 
   };
 
+  const onClickRight = () => {
 
+    router.push("/securityFacilitiesErrView");
 
+  };
 
+  let tabIndex = ref(0);
 
+  
+  //tab切换
 
+  let active = ref(0);
 
+  const onClickTab = (val) => {
 
+    // 清空列表数据
 
+    finished.value = false;
 
+    list.value = [];
 
+    // 重新加载数据
 
+    // 将 loading 设置为 true，表示处于加载状态
 
+    loading.value = true;
 
+    index = 0;
 
+    if (val.name == 0) {
 
+      onLoad(0);
 
+    } else {
 
+      onLoad(1);
 
+    }
 
+  };
 
+  // 列表
 
+  let list = ref([]);
 
+  const loading = ref(false);
 
+  const finished = ref(false);
 
+  let index = 0;
 
+  const onLoad = (val) => {
 
+    // 异步更新数据
 
+    console.log(val);
 
+    new securityFacilitiesErrService()
 
+      .list({
 
+        current: index + 1,
 
+        size: 10,
 
+        assessment:val ? val : 0,
 
+      })
 
+      .then((res) => {
 
+        list.value.push(...res.records) ;
 
+        // 加载状态结束
 
+        loading.value = false;        
+        // 数据全部加载完成
 
+        if (res.records.length < 10) {
 
+          finished.value = true;
 
+        }
 
+        index++;
 
+      });
 
+  };
 
+  // 搜索
 
+  let value = ref("");
 
+  // 删除确认
 
+  const beforeClose = ({ position }) => {
 
+    switch (position) {
 
+      case "left":
 
+      case "cell":
 
+      case "outside":
 
+        return true;
 
+      case "right":
 
+        return new Promise((resolve) => {
 
+          showConfirmDialog({
 
+            title: "确定删除吗？",
 
+          }).then(resolve);
 
+        });
 
+    }
 
+  };
 
+  return {
 
+    onClickLeft,
 
+    onClickTab,
 
+    list,
 
+    onLoad,
 
+    loading,
 
+    finished,
 
+    value,
 
+    onClickRight,
 
+    tabIndex,
 
+    beforeClose,
 
+  };
 
+},
 
+};
 
+</script>
 
 
 
-
 
-
 
-  </script>
 
-
 
-  <style>
 
-  .van-button {
 
-    top: -5px;
 
-  }
 
-
 
-  .van-list {
 
-    height: 80%;
 
-    margin-top: 5px;
 
-  }
 
-
 
-  </style>
 
+<style>
 
+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 {
 
+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>

+ 13 - 2
src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue
查看文件 

@@ -21,7 +21,7 @@
 
       <p>相关人：{{ inputForm.relatedPersons.name }}</p>
 
       <p>相关人：{{ inputForm.relatedPersons.name }}</p>
 
       <p>内容：{{ inputForm.content }}</p>
 
       <p>内容：{{ inputForm.content }}</p>
 
     </div>
 
     </div>
 
-    <van-button type="primary" class="btn-sub">审核</van-button>
 
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
     
     
@@ -37,7 +37,7 @@ export default {
 
     };
 
     };
 
     // 加载
 
     // 加载
 
     let isLoading = ref(true);
 
     let isLoading = ref(true);
 
-    // 异常人员信息
 
+    // 私设聚会点信息
 
     let inputForm = ref({
 
     let inputForm = ref({
 
       id: "",
 
       id: "",
 
       place: "320900",
 
       place: "320900",
 
@@ -70,10 +70,21 @@ export default {
 
       });
 
       });
 
       isLoading.value = false;
 
       isLoading.value = false;
 
     });
 
     });
 
+    // 审核通过
 
+    const update = () => {
 
+      isLoading.value = true;
 
+      inputForm.value.assessment = 1;
 
+      new PrivatePartyPointService().save(inputForm.value).then((res) => {
 
+        console.log(res);
 
+        onClickLeft();
 
+        isLoading.value = false;
 
+      });
 
+    };
 
     return {
 
     return {
 
       onClickLeft,
 
       onClickLeft,
 
       inputForm,
 
       inputForm,
 
       isLoading,
 
       isLoading,
 
+      update,
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };

+ 3 - 3
src/views/activityMan/selfMeetingReport/selfMeetingList.vue
查看文件 

@@ -85,7 +85,7 @@
 
     </van-tabs>
 
     </van-tabs>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
-  
+
 
   <script>
 
   <script>
 
 import { ref } from "vue";
 
 import { ref } from "vue";
 
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 
@@ -187,7 +187,7 @@ export default {
 
   },
 
   },
 
 };
 
 };
 
 </script >
 
 </script >
 
-  
+
 
 <style scope>
 
 <style scope>
 
 .main {
 
 .main {
 
   background: #fff;
 
   background: #fff;
 
@@ -211,4 +211,4 @@ export default {
 
 .button {
 
 .button {
 
   height: 100%;
 
   height: 100%;
 
 }
 
 }
 
-</style>
 
+</style>

+ 24 - 48
src/views/activityMan/selfMeetingReport/selfMeetingView.vue
查看文件 

@@ -101,19 +101,15 @@
 
         </van-dialog>
 
         </van-dialog>
 
       </van-cell-group>
 
       </van-cell-group>
 
       <van-cell-group>
 
       <van-cell-group>
 
-        <div class="rowTextArea">
 
-          <van-field
 
-            v-model="inputForm.into"
 
-            center
 
-            label="内容:"
 
-            label-align="top"
 
-          />
 
-          <div name="editor" id="editor" ref="editor"></div>
 
-        </div>
 
+        <van-field label="内容:" label-align="top">
 
+          <template #input>
 
+            <wang-editor ref="contentEditor" v-model="inputForm.content" />
 
+          </template>
 
+        </van-field>
 
       </van-cell-group>
 
       </van-cell-group>
 
     </div>
 
     </div>
 
     <div class="subbtn">
 
     <div class="subbtn">
 
-      <van-button type="primary">提交</van-button>
 
+      <van-button type="primary" @click="submit">提交</van-button>
 
       <van-button type="default" hairline>取消</van-button>
 
       <van-button type="default" hairline>取消</van-button>
 
     </div>
 
     </div>
 
   </div>
 
   </div>
 
@@ -127,9 +123,9 @@ import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointServic
 
 import UserManage from "@/api/user/UserManage";
 
 import UserManage from "@/api/user/UserManage";
 
 import { useRoute } from "vue-router";
 
 import { useRoute } from "vue-router";
 
 // 富文本编辑器
 
 // 富文本编辑器
 
-import EWangEditor from "wangeditor";
 
+import WangEditor from "@/components/editor/WangEditor";
 
 export default {
 
 export default {
 
-  components: { personList },
 
+  components: { personList, WangEditor },
 
   setup() {
 
   setup() {
 
     // 加载
 
     // 加载
 
     let isLoading = ref(true);
 
     let isLoading = ref(true);
 
@@ -157,7 +153,7 @@ export default {
 
       state: "0",
 
       state: "0",
 
       assessment: "0",
 
       assessment: "0",
 
     });
 
     });
 
-
 
+    const contentEditor = ref(null);
 
     let route = useRoute();
 
     let route = useRoute();
 
     onMounted(() => {
 
     onMounted(() => {
 
       // 根据路由初始化
 
       // 根据路由初始化
 
@@ -173,37 +169,13 @@ export default {
 
                 inputForm.value.relatedPersons.name += data.name + ",";
 
                 inputForm.value.relatedPersons.name += data.name + ",";
 
               });
 
               });
 
             });
 
             });
 
+            contentEditor.value.init(inputForm.value.content);
 
             isLoading.value = false;
 
             isLoading.value = false;
 
           });
 
           });
 
       } else {
 
       } else {
 
+        contentEditor.value.init(inputForm.value.content);
 
         isLoading.value = false;
 
         isLoading.value = false;
 
       }
 
       }
 
-      // 富文本编辑器
 
-      let editor = new EWangEditor("#editor");
 
-      editor.config.uploadImgShowBase64 = true;
 
-      editor.config.onchangeTimeout = 400;
 
-
 
-      editor.config.customAlert = (err) => {
 
-        console.log(err);
 
-      };
 
-
 
-      editor.customConfig = editor.customConfig
 
-        ? editor.customConfig
 
-        : editor.config;
 
-
 
-      editor.customConfig.onchange = (html) => {
 
-        data.editorContent = html;
 
-        console.log(html);
 
-      };
 
-      //以下为新增
 
-      const menuItem = [
 
-        //工具栏里有哪些工具
 
-        "image",
 
-      ];
 
-      editor.config.menus = [...menuItem]; /* 应用设置好的工具栏 */
 
-      editor.config.height = 100; //你可能发现这个编辑器是没法用样式调高度的?
 
-      //新增至此
 
-      editor.create();
 
     });
 
     });
 
     // 获取活动时间
 
     // 获取活动时间
 
     let showAct = ref(false);
 
     let showAct = ref(false);
 
@@ -258,6 +230,14 @@ export default {
 
         .map((option) => option.name)
 
         .map((option) => option.name)
 
         .join("/");
 
         .join("/");
 
     };
 
     };
 
+    const submit = () => {
 
+      isLoading.value = true;
 
+      new PrivatePartyPointService().save(inputForm.value).then((res) => {
 
+        console.log(res);
 
+        onClickLeft();
 
+        isLoading.value = false;
 
+      });
 
+    };
 
     return {
 
     return {
 
       isLoading,
 
       isLoading,
 
       inputForm,
 
       inputForm,
 
@@ -279,6 +259,9 @@ export default {
 
       options,
 
       options,
 
       onFinish,
 
       onFinish,
 
       cascaderValue,
 
       cascaderValue,
 
+      contentEditor,
 
+      // change,
 
+      submit,
 
     };
 
     };
 
   },
 
   },
 
 };
 
 };
 
@@ -321,19 +304,12 @@ export default {
 
 .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 {
 
-  width: 98%;
 
-}
 
-.rowTextArea::v-deep .van-cell {
 
-  display: flow-root;
 
-}
 
 #editor {
 
 #editor {
 
   position: relative;
 
   position: relative;
 
-  top: -40px;
 
-  height: 100px;
 
+  height: 200px;
 
 }
 
 }
 
 .w-e-text-container {
 
 .w-e-text-container {
 
-  height: 100px !important;
 
+  height: 150px !important;
 
 }
 
 }
 
 .subbtn {
 
 .subbtn {
 
   margin: 20px;
 
   margin: 20px;

+ 20 - 6
src/views/activityMan/siteInspection/siteInspectionList.vue
查看文件 

@@ -1,6 +1,5 @@
 
 <template>
 
 <template>
 
     <van-nav-bar
 
     <van-nav-bar
 
-      fixed
 
       title="场所检查情况"
 
       title="场所检查情况"
 
       left-text=""
 
       left-text=""
 
       right-text="上报"
 
       right-text="上报"
 
@@ -16,10 +15,10 @@
 
       @load="onLoad"
 
       @load="onLoad"
 
     >
 
     >
 
     <div class="nav_tab">
 
     <div class="nav_tab">
 
-      <div class="tab" :class="tabIndex ? '' : 'active'" @click="tabIndex = 0">
 
+      <div class="tab" :class="tabIndex ? '' : 'active'" @click="onClickTab(0)">
 
         未审核
 
         未审核
 
       </div>
 
       </div>
 
-      <div class="tab" :class="tabIndex ? 'active' : ''" @click="tabIndex = 1">
 
+      <div class="tab" :class="tabIndex ? 'active' : ''" @click="onClickTab(1)">
 
         已审核
 
         已审核
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
@@ -31,7 +30,8 @@
 
       <div class="list_item">
 
       <div class="list_item">
 
         <div class="item-left">
 
         <div class="item-left">
 
           <p style="color: #c4c4c4">{{ item.supervisionTime }}</p>
 
           <p style="color: #c4c4c4">{{ item.supervisionTime }}</p>
 
-          <p style="color: red">待审核</p>
 
+          <p v-if="item.assessment==0" style="color: red">待审核</p>
 
+          <p v-if="item.assessment==1" style="color: gray">已审核</p>
 
         </div>
 
         </div>
 
         <van-cell is-link to="siteInspectionView">
 
         <van-cell is-link to="siteInspectionView">
 
           <template #title>
 
           <template #title>
 
@@ -57,6 +57,7 @@ import siteInspectionServer from "@/api/siteInspection/siteInspectionServer";
 
 export default {
 
 export default {
 
   name: "siteInspectionList",
 
   name: "siteInspectionList",
 
   setup() {
 
   setup() {
 
+    window.xm.setNavigationBarTitle({ title: '场所检查情况'})
 
     const onClickLeft = () => {
 
     const onClickLeft = () => {
 
       history.back();
 
       history.back();
 
     };
 
     };
 
@@ -68,23 +69,35 @@ export default {
 
     const loading = ref(false);
 
     const loading = ref(false);
 
     const finished = ref(false);
 
     const finished = ref(false);
 
     let index = 0;
 
     let index = 0;
 
+    //tab切换
 
+    const onClickTab= (wh) => {
 
+      tabIndex.value = wh;
 
+
 
+      // 清空列表数据
 
+      finished.value = false;
 
+      list.value = [];
 
+      loading.value = true;
 
+
 
+      index = 0;
 
+      onLoad();
 
+    };
 
     const onLoad = () => {
 
     const onLoad = () => {
 
       // 异步更新数据
 
       // 异步更新数据
 
       new siteInspectionServer()
 
       new siteInspectionServer()
 
         .list({
 
         .list({
 
           current: index + 1,
 
           current: index + 1,
 
           size: 10,
 
           size: 10,
 
-          assessment:0,
 
+          assessment:tabIndex.value,
 
         })
 
         })
 
         .then((res) => {
 
         .then((res) => {
 
           list.value.push(...res.records) ;
 
           list.value.push(...res.records) ;
 
           // 加载状态结束
 
           // 加载状态结束
 
           loading.value = false;
 
           loading.value = false;
 
-          index++;
 
           // 数据全部加载完成
 
           // 数据全部加载完成
 
           if (res.records.length < 10) {
 
           if (res.records.length < 10) {
 
             finished.value = true;
 
             finished.value = true;
 
           }
 
           }
 
+          index++;
 
         });
 
         });
 
     };
 
     };
 
     // 搜索
 
     // 搜索
 
@@ -106,6 +119,7 @@ export default {
 
     };
 
     };
 
     return {
 
     return {
 
       onClickLeft,
 
       onClickLeft,
 
+      onClickTab,
 
       list,
 
       list,
 
       onLoad,
 
       onLoad,
 
       loading,
 
       loading,

+ 4 - 2
src/views/activityMan/siteInspection/siteInspectionView.vue
查看文件 

@@ -215,8 +215,10 @@ export default {
 
 
 
       new siteInspectionServer().save(siteInspection).then((res) => {
 
       new siteInspectionServer().save(siteInspection).then((res) => {
 
         if(res.data=="保存场所检查情况成功"){
 
         if(res.data=="保存场所检查情况成功"){
 
-          console.log("保存成功");
 
-          //添加保存后跳转
 
+          window.xm.showToast({
 
+             message:"保存成功!"
 
+          })
 
+          history.back();
 
         }
 
         }
 
 
 
       });
 
       });

+ 94 - 0
src/views/login/changePassword.vue
查看文件 

@@ -0,0 +1,94 @@
 
+<template>
 
+	<van-nav-bar
 
+	  title="修改密码"
 
+	  left-arrow
 
+	  @click-left="onClickLeft"
 
+	/>
 
+	
+	<van-form @submit="onSubmit" class="main">
 
+	  <van-cell-group inset>
 
+	    	
+        <van-field
 
+	      v-model="oldpassword"
 
+	      type="password"
 
+	      name="旧密码"
 
+	      label="旧密码"
 
+	      placeholder="旧密码"
 
+	      :rules="[{ required: true, message: '请填写旧密码' }]"
 
+	    />
 
+	    <van-field
 
+	      v-model="password"
 
+	      type="password"
 
+	      name="新密码"
 
+	      label="新密码"
 
+	      placeholder="新密码"
 
+	      :rules="[{ required: true, message: '请填写新密码' }]"
 
+	    />
 
+		<van-field
 
+		  v-model="password2"
 
+		  type="password"
 
+		  name="确认密码"
 
+		  label="确认密码"
 
+		  placeholder="确认新密码"
 
+		  :rules="[{ required: true, message: '请确认新密码' }]"
 
+		/>
 
+	  </van-cell-group>
 
+	  <div class="submit">
 
+	    <van-button round block type="primary" native-type="submit" @click="save">
 
+	      确认修改
 
+	    </van-button>
 
+	  </div>
 
+	</van-form>
 
+	
+</template>
 
+
 
+<script>
 
+import userSets from "@/api/sys/userSets";
 
+	export default {
 
+		data() {
 
+			return{
 
+                oldpassword:"",
 
+				password:"",
 
+				password2:"",
 
+			}			
+		},
 
+		methods:{
 
+			onClickLeft(){
 
+				history.back();
 
+			},
 
+			save(){
 
+                var that=this;
 
+                if(that.password!=that.password2){
 
+                    console.log("确认密码与新密码不一致！");
 
+                }else{
 
+                    new userSets()
 
+                    .ChangePass({
 
+                        oldPassword: that.oldpassword,
 
+                        newPassword: that.password
 
+                    })
 
+                    .then((res) => {
 
+                        console.log("修改密码成功！"+"++"+this.password+"++"+this.password2);
 
+                    });
 
+                }
 
+           
+                
+				
+			},
 
+		},
 
+	 
+	};
 
+</script>
 
+
 
+<style>
 
+body {
 
+  background: #f5f5f5;
 
+}
 
+.main {
 
+  margin-top: 20px;
 
+}
 
+.submit{
 
+    margin-left: 20px;
 
+    margin-right: 20px;
 
+  margin-top: 40px;
 
+}
 
+</style>

+ 18 - 11
src/views/tab_a/tabAll.vue
查看文件 

@@ -1,4 +1,5 @@
 
 <template>
 
 <template>
 
+<div class="bg">
 
 	<van-nav-bar
 
 	<van-nav-bar
 
 	  title="智慧“和顺”"
 
 	  title="智慧“和顺”"
 
 	  left-text="民宗干事"
 
 	  left-text="民宗干事"
 
@@ -49,7 +50,7 @@
 
 	<van-grid :border="false">
 
 	<van-grid :border="false">
 
 		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
 
 		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
 
 		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
 
 		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
 
-		<van-grid-item icon="../../../loginbg/cspw.png" text="牌位管理" @click="goPlaceTablet"/>
 
+		<van-grid-item icon="../../../loginbg/cspw.png" text="牌位管理" />
 
 	</van-grid>
 
 	</van-grid>
 
 
 
 	<div class="hLine"></div>
 
 	<div class="hLine"></div>
 
@@ -62,12 +63,13 @@
 
 	<van-grid :border="false" >
 
 	<van-grid :border="false" >
 
 		<van-grid-item icon="../../../loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
 
 		<van-grid-item icon="../../../loginbg/hd_cshd.png" @click="placeActivity" text="场所活动" />
 
 		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
 
 		<van-grid-item icon="../../../loginbg/hd_ssjhd.png" @click="selfMeetingList" text="私设聚会点" />
 
-		<van-grid-item icon="../../../loginbg/hd_xjqz.png" @click="differentbelieversList" text="信教群众异常" />
 
+		<van-grid-item icon="../../../loginbg/hd_xjqz.png" @click="abnormalCrowd" text="信教群众异常" />
 
 		<van-grid-item icon="../../../loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
 
 		<van-grid-item icon="../../../loginbg/hd_jc.png" text="场所检查" @click="tohd_jc" />
 
 		<van-grid-item icon="../../../loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
 
 		<van-grid-item icon="../../../loginbg/hd_af.png" text="安防设施异常" @click="tohd_af" />
 
 		<van-grid-item icon="../../../loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
 
 		<van-grid-item icon="../../../loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
 
 		<van-grid-item icon="../../../loginbg/hd_qt.png" to="/setting" text="其他" @click="tohd_qt" />
 
 		<van-grid-item icon="../../../loginbg/hd_qt.png" to="/setting" text="其他" @click="tohd_qt" />
 
 	</van-grid>
 
 	</van-grid>
 
+</div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
@@ -90,9 +92,8 @@ import userSets from "@/api/sys/userSets";
 
 
 
 		created(){
 
 		created(){
 
 			let id=this.$route.query.id;
 
 			let id=this.$route.query.id;
 
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 
 			this.TokenLogin2();
 
 			this.TokenLogin2();
 
-			this.getBannerImg();//获取轮播图
 
-			this.getSelectColor();//获取主题颜色
 
 		},
 
 		},
 
 
 
 		methods:{
 
 		methods:{
 
@@ -105,9 +106,7 @@ import userSets from "@/api/sys/userSets";
 
 			goPlacePerson() {
 
 			goPlacePerson() {
 
               this.$router.push("/placePerson");
 
               this.$router.push("/placePerson");
 
             },
 
             },
 
-			goPlaceTablet(){
 
-				this.$router.push("/placeTablet");
 
-			},
 
+
 
 			onClickLeft(){
 
 			onClickLeft(){
 
 				history.back();
 
 				history.back();
 
 			},
 
 			},
 
@@ -122,7 +121,7 @@ import userSets from "@/api/sys/userSets";
 
 				this.$router.push("/religiousConferenceList");
 
 				this.$router.push("/religiousConferenceList");
 
 			},
 
 			},
 
 			tohd_qt(){
 
 			tohd_qt(){
 
-				this.$router.push("/securityFacilitiesErrList");
 
+				this.$router.push("/nonReligiousInformationList");
 
 			},
 
 			},
 
 			// 活动场所
 
 			// 活动场所
 
 			placeActivity(){
 
 			placeActivity(){
 
@@ -131,8 +130,8 @@ import userSets from "@/api/sys/userSets";
 
 			selfMeetingList(){
 
 			selfMeetingList(){
 
 				this.$router.push("/selfMeetingList")
 
 				this.$router.push("/selfMeetingList")
 
 			},
 
 			},
 
-			differentbelieversList(){
 
-				this.$router.push("/differentbelieversList")
 
+			abnormalCrowd(){
 
+				this.$router.push("/abnormalCrowd")
 
 			},
 
 			},
 
 			async TokenLogin(){
 
 			async TokenLogin(){
 
 				let that=this;
 
 				let that=this;
 
@@ -174,10 +173,15 @@ import userSets from "@/api/sys/userSets";
 
 					.then((res) => {
 
 					.then((res) => {
 
 						that.$store.commit('setPcToken',res.PcToken);
 
 						that.$store.commit('setPcToken',res.PcToken);
 
 						that.$store.commit('setUser',res.account);
 
 						that.$store.commit('setUser',res.account);
 
+						that.getBannerImg();//获取轮播图
 
+						that.getSelectColor();//获取主题颜色
 
 					});
 
 					});
 
 
 
 					//})//上线取消注释
 
 					//})//上线取消注释
 
 
 
+				}else{
 
+					that.getBannerImg();//获取轮播图
 
+					that.getSelectColor();//获取主题颜色
 
 				}
 
 				}
 
 
 
 
 
@@ -323,6 +327,9 @@ import userSets from "@/api/sys/userSets";
 
 </script>
 
 </script>
 
 
 
 <style>
 
 <style>
 
-
 
+.bg{
 
+	height: 100%;
 
+	background: #ffffff;
 
+}
 
 
 
 </style>
 
 </style>

+ 17 - 17
vue.config.js
查看文件 

@@ -1,22 +1,22 @@
 
 const { defineConfig } = require('@vue/cli-service')
 
 const { defineConfig } = require('@vue/cli-service')
 
 module.exports = defineConfig({
 
 module.exports = defineConfig({
 
-  transpileDependencies: true,
 
-  publicPath:'./',
 
-  
-  // 代理服务，处理接口跨域请求
 
-  devServer:{
 
-    port:'8080',
 
-    proxy:{
 
-      '/api':{
 
-        //target:'http://124.70.137.152:8095',// http://124.70.137.152:8095
 
-        target:'http://localhost:8084',// 
-        changeOrigin:true,
 
-        pathRewrite:{
 
-          '^/api':'/'
 
+    transpileDependencies: true,
 
+    publicPath: './',
 
+
 
+    // 代理服务，处理接口跨域请求
 
+    devServer: {
 
+        port: '8080',
 
+        proxy: {
 
+            '/api': {
 
+                //target:'http://124.70.137.152:8095',// http://124.70.137.152:8095
 
+                target: 'http://0.0.0.0:8084', // 
+                changeOrigin: true,
 
+                pathRewrite: {
 
+                    '^/api': '/'
 
+                }
 
+            }
 
         }
 
         }
 
-      }
 
-    }
 
-  },
 
+    },
 
 
 
 
 
-})
 
+})

部分文件因为文件数量过多而无法显示