Merge remote-tracking branch 'HS_MZAP/master'

# Conflicts:
#	public/index.html

package-lock.json

@@ -16,7 +16,8 @@
         "vant": "^4.1.2",
         "vue": "^3.2.13",
         "vue-router": "^4.0.3",
-        "vuex": "^4.0.2"
+        "vuex": "^4.0.2",
+        "wangeditor": "^3.1.1"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~5.0.0",
@@ -9964,6 +9965,11 @@
         "vue": "^3.0.2"
       }
     },
+    "node_modules/wangeditor": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/wangeditor/-/wangeditor-3.1.1.tgz",
+      "integrity": "sha512-co18zRS96xVKhLyhTIqgqWs5khSbNPlZeoT8/B2dxnVKQMntRGu1D8ks+nbNOvZcIjyrdhhtde6LjqzVECL6DA=="
+    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",

src/api/placeActivity/placeActivityServer.js

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

src/api/sys/tools.js

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

src/api/toBeDone/toBeDone.js

@@ -6,5 +6,22 @@ export default class toBeDone {
             `/assign/assignWorkOrder/list2`,
             params
         )
+    };
+    queryById(id) {
+        return request.get(
+            `/assign/assignWorkOrder/queryById`, { id: id }
+        )
+    };
+    save(inputFrom) {
+        return request.post(
+            `/assign/assignWorkOrder/save`,
+            inputFrom
+        )
+    };
+    list2(params) {
+        return request.get(
+            `/assign/assignWorkOrder/list3`,
+            params
+        )
     }
 }

src/components/editor/WangEditor.vue

@@ -1,11 +1,6 @@
 <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>
 import E from "wangeditor";
@@ -18,8 +13,8 @@ export default {
     };
   },
   model: {
-    prop: "value",
-    event: "change",
+    prop: "modelValue",
+    event: "update:modelValue",
   },
   props: {
     isClear: {
@@ -45,8 +40,10 @@ export default {
       this.editor.txt.html(val);
     },
     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.uploadImgServer = ""; // 配置服务器端地址
       this.editor.customConfig.uploadImgHeaders = {}; // 自定义 header
@@ -77,7 +74,7 @@ export default {
       };
       this.editor.customConfig.onchange = (html) => {
         this.info_ = html; // 绑定当前逐渐地值
-        this.$emit("change", this.info_); // 将内容同步到父组件中
+        this.$emit("update:modelValue", this.info_); // 将内容同步到父组件中
       };
       // 创建富文本编辑器
       this.editor.create();
@@ -90,15 +87,10 @@ export default {
 </script>
   
 <style lang="css">
-.editor {
-  width: 98%;
+#editor {
+  width: 100%;
+  height: 150px;
   margin: 0 auto;
 }
-.toolbar {
-  border: 1px solid #ccc;
-}
-.wtext {
-  border: 1px solid #ccc;
-  height: 100px;
-}
-</style>
+
+</style>

src/main.js

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

src/router/index.js

@@ -302,4 +302,4 @@ const router = createRouter({
     routes,
 })
 
-export default router
+export default router

src/utils/config.js

@@ -1,9 +1,9 @@
 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'
 }

src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue

@@ -23,7 +23,7 @@
       <p>现居地详情:{{ inputForm.currentResidenceDetail }}</p>
       <p>异常行为:{{ inputForm.abnormalBehavior }}</p>
     </div>
-    <van-button type="primary" class="btn-sub">审核</van-button>
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
 </template>
       
@@ -67,10 +67,21 @@ export default {
         inputForm.value = data;
         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 {
       onClickLeft,
       inputForm,
       isLoading,
+      update,
     };
   },
 };

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/differentbelievers/ReligiousPeopleReportView.vue

@@ -117,7 +117,7 @@
       </van-cell-group>
     </div>
     <div class="subbtn">
-      <van-button type="primary">提交</van-button>
+      <van-button type="primary" @click="submit">提交</van-button>
       <van-button type="default" hairline>取消</van-button>
     </div>
   </div>
@@ -183,8 +183,15 @@ export default {
         .map((option) => option.text)
         .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 {
       inputForm,
       // 返回
@@ -195,6 +202,7 @@ export default {
       onFinish,
       cascaderValue,
       isLoading,
+      submit,
     };
   },
 };

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,10 +22,20 @@
       <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">审核</van-button>
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
 </template>
   
@@ -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,12 +100,35 @@ 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;
+      placeActivity.value.assessment = 1;
+      new placeActivityServer().save(placeActivity.value).then((res) => {
+        console.log(res);
+        onClickLeft();
+        isLoading.value = false;
+      });
+    };
     return {
       onClickLeft,
       placeActivity,
+      fileList,
       isLoading,
+      update,
+      subjectContentEditor,
     };
   },
 };
@@ -137,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

@@ -102,10 +102,10 @@
         <van-field
           v-model="placeActivity.reporter.name"
           center
+          readonly
           label="报告人:"
           placeholder="请选择报告人"
           input-align="right"
-          right-icon="arrow-down"
         />
       </van-cell-group>
       <van-cell-group>
@@ -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>
@@ -229,6 +232,7 @@ import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
+
 export default {
   components: { personList, WangEditor },
   setup() {
@@ -270,7 +274,15 @@ export default {
       state: "0",
       assessment: "0",
     });
+    // 富文本编辑器
     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();
     onMounted(() => {
@@ -284,11 +296,22 @@ 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;
         });
       } else {
-        subjectContentEditor.value.init("");
+        subjectContentEditor.value.init(placeActivity.value.subjectContent);
+        placeActivity.value.reporter = user;
         isLoading.value = false;
       }
     });
@@ -372,8 +395,8 @@ export default {
     // 文件上传
     let fileList = ref([]);
     const afterRead = (file) => {
+      fileList.value = [];
       // 此时可以自行将文件上传至服务器
-      console.log(file);
       new tools()
         .uploadFile(file, `reporting/reportingActivities`)
         .then(({ data }) => {
@@ -383,8 +406,11 @@ export default {
     };
     // 提交数据
     const submit = () => {
+      isLoading.value = true;
       new placeActivityServer().save(placeActivity.value).then((res) => {
         console.log("提交", res);
+        onClickLeft();
+        isLoading.value = false;
       });
     };
     return {
@@ -479,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,9 +19,10 @@
       <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">审核</van-button>
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
 </template>
     
@@ -30,14 +31,17 @@ 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();
     };
     // 加载
     let isLoading = ref(true);
-    // 异常人员信息
+    // 私设聚会点信息
     let inputForm = ref({
       id: "",
       place: "320900",
@@ -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,12 +74,25 @@ export default {
           inputForm.value.relatedPersons.name += data.name + ",";
         });
       });
+      contentEditor.value.init(inputForm.value.content);
       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 {
       onClickLeft,
       inputForm,
       isLoading,
+      update,
+      contentEditor,
     };
   },
 };
@@ -122,4 +141,9 @@ export default {
   text-align: center;
   margin-top: 80px;
 }
+#editor {
+  width: 100%;
+  height: 150px;
+  overflow: hidden;
+}
 </style>

src/views/activityMan/selfMeetingReport/selfMeetingView.vue

@@ -101,19 +101,15 @@
         </van-dialog>
       </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>
     </div>
     <div class="subbtn">
-      <van-button type="primary">提交</van-button>
+      <van-button type="primary" @click="submit">提交</van-button>
       <van-button type="default" hairline>取消</van-button>
     </div>
   </div>
@@ -127,9 +123,9 @@ import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointServic
 import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 // 富文本编辑器
-import EWangEditor from "wangeditor";
+import WangEditor from "@/components/editor/WangEditor";
 export default {
-  components: { personList },
+  components: { personList, WangEditor },
   setup() {
     // 加载
     let isLoading = ref(true);
@@ -157,7 +153,7 @@ export default {
       state: "0",
       assessment: "0",
     });
-
+    const contentEditor = ref(null);
     let route = useRoute();
     onMounted(() => {
       // 根据路由初始化
@@ -173,37 +169,13 @@ export default {
                 inputForm.value.relatedPersons.name += data.name + ",";
               });
             });
+            contentEditor.value.init(inputForm.value.content);
             isLoading.value = false;
           });
       } else {
+        contentEditor.value.init(inputForm.value.content);
         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);
@@ -258,6 +230,14 @@ export default {
         .map((option) => option.name)
         .join("/");
     };
+    const submit = () => {
+      isLoading.value = true;
+      new PrivatePartyPointService().save(inputForm.value).then((res) => {
+        console.log(res);
+        onClickLeft();
+        isLoading.value = false;
+      });
+    };
     return {
       isLoading,
       inputForm,
@@ -279,6 +259,9 @@ export default {
       options,
       onFinish,
       cascaderValue,
+      contentEditor,
+      // change,
+      submit,
     };
   },
 };
@@ -321,19 +304,12 @@ export default {
 .van-cell__value .van-field__right-icon .van-icon-location {
   color: #36a7f3 !important;
 }
-.rowTextArea {
-  width: 98%;
-}
-.rowTextArea::v-deep .van-cell {
-  display: flow-root;
-}
 #editor {
   position: relative;
-  top: -40px;
-  height: 100px;
+  height: 200px;
 }
 .w-e-text-container {
-  height: 100px !important;
+  height: 150px !important;
 }
 .subbtn {
   margin: 20px;

src/views/placeManage/ManageList.vue

@@ -109,10 +109,6 @@ export default {
       onLoad,
       loading,
       finished,
-      // 搜索
-      value,
-      onSearch,
-      onCancel,
       // 全选
       checkAll,
       toggle,

src/views/placeManage/placePerson.vue

@@ -15,6 +15,7 @@
               overlay="false"
               v-model="value1"
               :options="option1"
+              @change="changeValue(value1)"
             />
           </van-dropdown-menu>
         </div>
@@ -31,21 +32,23 @@
       <van-row>
         <van-col span="18">
           <p>
-            {{ item.name }}（<span style="color: #36a7f3">{{ item.idcard }}</span
+            {{ item.name }}（<span style="color: #36a7f3">{{
+              item.idcard
+            }}</span
             >）
           </p>
         </van-col>
         <van-col span="6">
-          <p v-if="item.church == '基督教'" style="color: #36a7f3">基督教</p>
-          <p v-else-if="item.church == '佛教'" style="color: #e4dd65">佛教</p>
-          <p v-else-if="item.church == '伊斯兰教'" style="color: #52ca7d">
-            伊斯兰教
-          </p>
+          <p v-if="item.userManagenmetDetailsDTOList[1].value == 1" style="color: #36a7f3">伊斯兰教</p>
+          <p v-if="item.userManagenmetDetailsDTOList[1].value == 2" style="color: #36a7f3">基督教</p>
+          <p v-if="item.userManagenmetDetailsDTOList[1].value == 3" style="color: #36a7f3">天主教</p>
+          <p v-if="item.userManagenmetDetailsDTOList[1].value == 4" style="color: #36a7f3">佛教</p>
+          <p v-if="item.userManagenmetDetailsDTOList[1].value == 5" style="color: #36a7f3">道教</p>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="18">
-          <p>{{ item.locationName }}</p>
+          <p>{{ item.nativePlace }}</p>
         </van-col>
         <van-col span="6">
           <p>{{ item.position }}</p>
@@ -65,36 +68,53 @@ export default {
     const value1 = ref(0);
     const option1 = [
       { text: "所有教别", value: 0 },
-      { text: "基督教", value: 1 },
-      { text: "佛教", value: 2 },
-      { text: "伊斯兰教", value: 3 },
+      { text: "伊斯兰教", value: 1 },
+      { text: "基督教", value: 2 },
+      { text: "天主教", value: 3 },
+      { text: "佛教", value: 4 },
+      { text: "道教", value: 5 },
     ];
     const Person = reactive({
       PersonList: [],
     });
+    //宗教选择
+    const changeValue = (value1) => {
+      Person.PersonList.forEach((item) => {
+        console.log(item);
+      });
+    };
+
     //跳转
     let router = useRouter();
     const goPlacePersonInfo = (item) => {
-      var data = JSON.stringify(item)
+      var data = JSON.stringify(item);
       router.push({
-        path:"/placePersoninfo",
-        query:{'data':data}
+        path: "/placePersoninfo",
+        query: { data: data },
       });
     };
 
     //数据获取
-    let list = ref([])
+    let list = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     new UserManage()
       .list({
-        current:  1,
+        current: 1,
         size: 10,
       })
       .then((res) => {
-        console.log(res);
-        list.value.push(...res.records)
-        Person.PersonList = list
+        list.value.push(...res.records);
+        let Ids = [];
+        list.value.forEach((item) => {
+          Ids.push(item.id);
+        });
+        Ids.forEach((item2) => {
+          new UserManage().queryById(item2).then((res) => {
+            Person.PersonList.push(res);
+          });
+        });
+        console.log(Person.PersonList);
       });
 
     //返回
@@ -110,6 +130,7 @@ export default {
       loading,
       finished,
       goPlacePersonInfo,
+      changeValue,
     };
   },
 };

src/views/placeManage/placePersoninfo.vue

@@ -74,7 +74,28 @@
           <van-row justify="space-between">
             <van-col span="10"> 人员类型： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.personnelType}}
+              <span v-if="data.data.personnelType==1">宗教从业人员</span>
+              <span v-else-if="data.data.personnelType==2">民族场所从业人员</span>
+              <span v-else-if="data.data.personnelType==3">教职人员</span>
+              <span v-else-if="data.data.personnelType==4">固定信徒</span>
+              <span v-else-if="data.data.personnelType==5">场所居住人员</span>
+              <span v-else-if="data.data.personnelType==6">境外人员</span>
+              <span v-else-if="data.data.personnelType==7">非本市人员</span>
+              <span v-else-if="data.data.personnelType==8">非本教人员</span>
+              <span v-else-if="data.data.personnelType==9">新增信徒人员</span>
+              <span v-else-if="data.data.personnelType==10">临时人员</span>
+              <span v-else-if="data.data.personnelType==11">异常人员</span>
+              <span v-else-if="data.data.personnelType==12">邪教人员</span>
+              <span v-else-if="data.data.personnelType==13">管理人员</span>
+              <span v-else-if="data.data.personnelType==14">全能神离家人员</span>
+              <span v-else-if="data.data.personnelType==15">全能神骨干人员</span>
+              <span v-else-if="data.data.personnelType==16">网络运营人员</span>
+              <span v-else-if="data.data.personnelType==17">涉政有害活动人员</span>
+              <span v-else-if="data.data.personnelType==18">境内外记者</span>
+              <span v-else-if="data.data.personnelType==19">境外法轮功骨干人员</span>
+              <span v-else-if="data.data.personnelType==20">其他邪教骨干人员</span>
+              <span v-else-if="data.data.personnelType==21">心灵法门骨干人员</span>
+              <span v-else>“精神控制”有害培训骨干人员</span>
             </van-col>
           </van-row>
         </van-col>
@@ -84,7 +105,13 @@
           <van-row justify="space-between">
             <van-col span="10"> 从业类型： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.typeOfEmployees}}
+              <span v-if="data.data.typeOfEmployees==1">场所负责人</span>
+              <span v-if="data.data.typeOfEmployees==2">堂管会成员</span>
+              <span v-if="data.data.typeOfEmployees==3">小组负责人</span>
+              <span v-if="data.data.typeOfEmployees==4">财会</span>
+              <span v-if="data.data.typeOfEmployees==5">义工</span>
+              <span v-if="data.data.typeOfEmployees==6">保安</span>
+              <span v-if="data.data.typeOfEmployees==7">信息审核员</span>
             </van-col>
           </van-row>
         </van-col>
@@ -135,7 +162,11 @@
           <van-row justify="space-between">
             <van-col span="10">教别： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[1]}}
+              <span v-if="data.dataArray[1]==1">伊斯兰教</span>
+              <span v-if="data.dataArray[1]==2">基督教</span>
+              <span v-if="data.dataArray[1]==3">天主教</span>
+              <span v-if="data.dataArray[1]==4">佛教</span>
+              <span v-if="data.dataArray[1]==5">道教</span>
             </van-col>
           </van-row>
         </van-col>
@@ -205,7 +236,11 @@
           <van-row justify="space-between">
             <van-col span="10"> 教职人员类型： </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[9]}}
+              <span v-if="data.dataArray[9]==1">负责人</span>
+              <span v-if="data.dataArray[9]==2">牧师</span>
+              <span v-if="data.dataArray[9]==3">长老</span>
+              <span v-if="data.dataArray[9]==4">传道员</span>
+              <span v-if="data.dataArray[9]==5">神学生</span>
             </van-col>
           </van-row>
         </van-col>
@@ -244,7 +279,6 @@ export default {
     onMounted(()=>{
       var item = JSON.parse(router.currentRoute.value.query.data)
       data.data = item
-      // console.log(data.data);
       id = data.data.id
       //id查询扩展信息
       new UserManage().queryById(id).then((res)=>{

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;

src/views/toBeDone/toBeDone.vue

@@ -13,7 +13,9 @@
               <p style="color: #a3a3a3">{{item.createDate.split(' ')[0]}}</p>
               <p style="color: #a3a3a3">{{item.createDate.split(' ')[1]}}</p>
             </div>
-            <p style="color: red; margin-top: 10px">待处理{{item.state}}</p>
+            <p v-if="item.assignState==1" style="color: red; margin-top: 10px">已发起</p>
+            <p v-else-if="item.assignState==2" style="color: red; margin-top: 10px">待办中</p>
+            <p v-if="item.assignState==5" style="color: red; margin-top: 10px">已超期</p>
           </van-col>
           <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
             <van-row>
@@ -31,23 +33,24 @@
     </van-tab>
     <van-tab title="已处理">
       <div class="list1">
-        <van-row class="list-item" v-for="item in toBeDone.DoneList2" :key="item.dateTime" @click="goToBeDoneinfo">
+        <van-row class="list-item" v-for="item in toBeDone.toBeDoneList2" :key="item.id" @click="goToBeDoneinfo(item)">
           <van-col span="6" class="list-item-left">
             <div>
-              <p style="color: #a3a3a3">{{item.dateTime}}</p>
-              <p style="color: #a3a3a3">{{item.timer}}</p>
+              <p style="color: #a3a3a3">{{item.createDate.split(' ')[0]}}</p>
+              <p style="color: #a3a3a3">{{item.createDate.split(' ')[1]}}</p>
             </div>
-            <p style="color: red; margin-top: 10px">已处理{{item.state}}</p>
+            <p v-if="item.assignState==3" style="color: red; margin-top: 10px">已反馈</p>
+            <p v-if="item.assignState==4" style="color: red; margin-top: 10px">已归档</p>
           </van-col>
           <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
             <van-row>
-              <van-col span="24">
-                <p>{{item.title}}</p>
+              <van-col span="24" style="height:50px;overflow: hidden;">
+                <span v-html="item.problemContent"></span>
               </van-col>
             </van-row>
             <van-row justify="space-between">
-              <van-col span="12">{{item.address}}</van-col>
-              <van-col span="8">{{item.type}}交办</van-col>
+              <van-col span="12">{{item.areaSelectName}}</van-col>
+              <van-col span="8">{{item.assignTypeName}}</van-col>
             </van-row>
           </van-col>
         </van-row>
@@ -64,14 +67,20 @@ export default {
   
   setup() {
     const toBeDone =reactive({
+      //未处理
       toBeDoneList:[],
+      //已处理
+      toBeDoneList2:[]
     })
     //获取待办列表
     let workDBList = ref([])
     new ToBeDone().list({}).then((res)=>{
-      console.log(res);
       workDBList.value.push(...res.records)
-      toBeDone.toBeDoneList = workDBList
+      toBeDone.toBeDoneList = workDBList;
+      
+    })
+    new ToBeDone().list2({}).then((res)=>{
+      toBeDone.toBeDoneList2.push(...res.records);
     })
     //跳转
     let router = useRouter()

src/views/toBeDone/toBeDone_details.vue

@@ -17,29 +17,50 @@
       <p>详细地址：{{ PersonInfo.data.areaSelectName }}</p>
       <p>发生时间：{{ PersonInfo.data.problemTime }}</p>
       <p>截止时间：{{ PersonInfo.data.deadlineTime }}</p>
-      <p>问题附件：<span style="color: #6892ff">活动申请书</span></p>
+      <p>
+        问题附件：
+        <van-uploader>
+          <van-button>活动申请书</van-button>
+        </van-uploader>
+      </p>
     </div>
     <div class="content-bottom">
       <p>处理结果：</p>
       <div>
         <form action="">
-          <textarea name="" id="" cols="40" rows="5"></textarea>
+          <textarea
+            v-if="PersonInfo.data.disposeContent == ''"
+            v-model="PersonInfo.disposeContent"
+            name=""
+            id=""
+            cols="40"
+            rows="5"
+          ></textarea>
+          <textarea
+            v-if="PersonInfo.data.disposeContent != ''"
+            v-model="PersonInfo.data.disposeContent"
+            name=""
+            id=""
+            cols="40"
+            rows="5"
+          ></textarea>
         </form>
       </div>
       <div style="margin-top: 15px">
         处理证据资料：
         <van-uploader>
-          <van-button icon="plus" >点击上传</van-button>
+          <van-button icon="plus">点击上传</van-button>
         </van-uploader>
       </div>
     </div>
-    <van-button type="primary">确认</van-button>
+    <van-button type="primary" @click="submit">确认</van-button>
   </div>
 </template>
 
 <script>
 import { useRouter } from "vue-router";
 import { onMounted, reactive, ref } from "vue";
+import ToBeDone from "@/api/toBeDone/toBeDone";
 export default {
   setup() {
     const router = useRouter();
@@ -47,23 +68,50 @@ export default {
       data: {},
       createDepartment: {},
       todoBy: {},
+      disposeContent: "",
     });
     //数据接收
     onMounted(() => {
       var item = JSON.parse(router.currentRoute.value.query.data);
+      // let itemId = item.id
+      console.log(item);
       PersonInfo.data = item;
-      console.log(PersonInfo.data);
       PersonInfo.createDepartment = PersonInfo.data.createDepartment;
       PersonInfo.todoBy = PersonInfo.data.todoBy;
+      // new ToBeDone().queryById(itemId).then((res)=>{
+
+      // })
     });
     //返回事件
     const goback = () => {
       history.back();
     };
-
+    //待办反馈提交
+    const submit = () => {
+      if (
+        PersonInfo.data.assignState != "3" ||
+        PersonInfo.data.assignState != "4"
+      ) {
+        PersonInfo.data.disposeContent = PersonInfo.disposeContent;
+        PersonInfo.data.assignState = "3";
+        new ToBeDone().save(PersonInfo.data).then((res) => {
+          // console.log(PersonInfo.data);
+          // console.log("提交成功");
+          // console.log(res);
+          router.push({
+            path: "/toBeDone",
+          });
+        });
+      }else{
+        router.push({
+          path:'/toBeDone'
+        })
+      }
+    };
     return {
       goback,
       PersonInfo,
+      submit,
     };
   },
 };
@@ -133,7 +181,6 @@ html {
   }
   .content-bottom {
     margin-top: 20px;
-
   }
 }
 </style>

vue.config.js

@@ -1,22 +1,22 @@
 const { defineConfig } = require('@vue/cli-service')
 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': '/'
+                }
+            }
         }
-      }
-    }
-  },
+    },
 
 
-})
+})