diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index d909a76..6fb292c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,7 +119,13 @@
     {
       path: '/questionnaire',
       name: 'questionnaire',
-      component: () => import('@/views/wjdc/questionnaire.vue'),
+      component: () => import('@/views/gzjy/questionnaire.vue'),
+      meta: { keepAlive: false, title: '公众建议', ifShowHead: true },
+    },
+    {
+      path: '/PublicAdvice',
+      name: 'PublicAdvice',
+      component: () => import('@/views/wjdc/PublicAdvice.vue'),
       meta: { keepAlive: false, title: '问卷调查', ifShowHead: true },
     },
   ],

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index d909a76..6fb292c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,7 +119,13 @@
     {
       path: '/questionnaire',
       name: 'questionnaire',
-      component: () => import('@/views/wjdc/questionnaire.vue'),
+      component: () => import('@/views/gzjy/questionnaire.vue'),
+      meta: { keepAlive: false, title: '公众建议', ifShowHead: true },
+    },
+    {
+      path: '/PublicAdvice',
+      name: 'PublicAdvice',
+      component: () => import('@/views/wjdc/PublicAdvice.vue'),
       meta: { keepAlive: false, title: '问卷调查', ifShowHead: true },
     },
   ],
diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index ff1043d..782c91f 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -10,7 +10,20 @@
           label="项目名称"
           type="textarea"
           disabled="true"
-        />
+        /><van-field
+          label="整改状态"
+          name="caseLevel"
+          required
+          :rules="[{ required: true, message: '请选择整改状态' }]"
+        >
+          <template #input>
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
+                {{ item.label }}
+              </van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
 
         <!-- <van-field
           v-model="AllData.formData.problemType"
@@ -74,15 +87,6 @@
           </div>
         </van-popup>
 
-        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
-          <template #input>
-            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
-              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
-                {{ item.label }}
-              </van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
         <van-field
           v-model="AllData.formData.problemContent"
           rows="2"

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index d909a76..6fb292c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,7 +119,13 @@
     {
       path: '/questionnaire',
       name: 'questionnaire',
-      component: () => import('@/views/wjdc/questionnaire.vue'),
+      component: () => import('@/views/gzjy/questionnaire.vue'),
+      meta: { keepAlive: false, title: '公众建议', ifShowHead: true },
+    },
+    {
+      path: '/PublicAdvice',
+      name: 'PublicAdvice',
+      component: () => import('@/views/wjdc/PublicAdvice.vue'),
       meta: { keepAlive: false, title: '问卷调查', ifShowHead: true },
     },
   ],
diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index ff1043d..782c91f 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -10,7 +10,20 @@
           label="项目名称"
           type="textarea"
           disabled="true"
-        />
+        /><van-field
+          label="整改状态"
+          name="caseLevel"
+          required
+          :rules="[{ required: true, message: '请选择整改状态' }]"
+        >
+          <template #input>
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
+                {{ item.label }}
+              </van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
 
         <!-- <van-field
           v-model="AllData.formData.problemType"
@@ -74,15 +87,6 @@
           </div>
         </van-popup>
 
-        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
-          <template #input>
-            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
-              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
-                {{ item.label }}
-              </van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
         <van-field
           v-model="AllData.formData.problemContent"
           rows="2"
diff --git a/src/views/gzjy/questionnaire.vue b/src/views/gzjy/questionnaire.vue
new file mode 100644
index 0000000..77263fd
--- /dev/null
+++ b/src/views/gzjy/questionnaire.vue
@@ -0,0 +1,331 @@
+<template>
+  <!-- 公众建议 -->
+  <div class="SpongeCultureCLass">
+    <van-list
+      v-model:loading="loading"
+      v-model:error="error"
+      error-text="请求失败，点击重新加载"
+      :finished="finished"
+      finished-text="已经到底了~~"
+      :offset="50"
+      @load="getDataList"
+    >
+      <div class="ConstrucClass" v-for="(item, index) in tableData" :key="index">
+        <div class="MainBox">
+          <div class="AvatarAppearance">
+            <!-- <div class="zp">
+              <img src="../assets/images/tx.png" alt="" class="txclass" />
+            </div> -->
+            <div class="NameTime">
+              <p class="Namea">{{ item.wechatName }}</p>
+              <p class="Timea">{{ item.createTime }}</p>
+            </div>
+          </div>
+          <div class="below">
+            <p class="belowNr">
+              {{ item.opinion }}
+            </p>
+            <div class="belowZp">
+              <img
+                v-for="(item1, index) in item.filelist"
+                :key="index"
+                :src="item1.url"
+                style="width: 100px; height: 50px; margin-top: 5px; padding-left: 5px"
+                @click="clickImg(item.filelist)"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </van-list>
+
+    <div class="rotundity" @click="sayClick">
+      <p>我想说</p>
+    </div>
+  </div>
+  <van-form @submit="onSubmitData">
+    <van-popup v-model:show="allData.showCancel" position="center" closeable :style="{ width: '100%' }">
+      <div class="popup_tittle">
+        <div class="tittle">留言提交</div>
+      </div>
+
+      <van-cell-group>
+        <van-field
+          v-model="allData.formData.wechatName"
+          label="姓名/昵称"
+          placeholder="请输入姓名/昵称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入姓名/昵称' }]"
+          :key="fieldKey"
+        />
+
+        <van-field
+          v-model="allData.formData.opinion"
+          rows="1"
+          label="留言描述"
+          type="textarea"
+          maxlength="100"
+          placeholder="请输入留言描述"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入留言描述' }]"
+          style="margin-top: 10px"
+          :key="fieldKey"
+        />
+      </van-cell-group>
+
+      <div class="mediumList">
+        <span class="Title">现场图片(最多3张)</span>
+        <div class="picBox">
+          <UploadImg
+            :maxCount="3"
+            :saveFileArr="allData.formData.filelist"
+            :acceptFormat="'image/*'"
+            @update:saveFileArr="getImgList"
+          />
+        </div>
+      </div>
+
+      <div class="BottomView">
+        <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
+        <van-button native-type="submit" class="BotBtn" type="primary">提交</van-button>
+      </div>
+    </van-popup>
+  </van-form>
+</template>
+
+<script setup>
+import { useStore } from '@/pinia/store.js';
+import { peopleOpinionPage, peopleOpinionAdd } from '@/api/PublicAdvice.js';
+import UploadImg from '@/views/components/uploadFile.vue';
+import { showImagePreview } from 'vant';
+
+const pinias = useStore();
+const fieldKey = ref(0);
+
+const allData = reactive({
+  showCancel: false,
+  currentPage: 0,
+  formData: {
+    opinion: '',
+    wechatName: '',
+    filelist: [], //获取的图片数组
+  },
+});
+const loading = ref(false);
+const tableData = ref([]);
+const pageNum = ref(0);
+const pageSize = ref(10);
+const error = ref(false);
+const finished = ref(false);
+
+/** 获取查询数据列表 */
+async function getDataList(bol) {
+  pinias.showLoading();
+  pageNum.value = pageNum.value + 1;
+  loading.value = true;
+  try {
+    const params = {
+      pageNum: pageNum.value,
+      pageSize: pageSize.value,
+    };
+    const res = await peopleOpinionPage(params);
+    loading.value = false;
+    if (res?.code === 200) {
+      const data = res.data || [];
+      tableData.value = tableData.value.concat(data);
+      pinias.hideLoading();
+      const total = res.total;
+      const pageTotal = Math.ceil(total / pageSize.value);
+      if (pageNum.value >= pageTotal) {
+        finished.value = true;
+      }
+    } else {
+      error.value = true;
+    }
+  } catch (error) {
+    console.log(error);
+    loading.value = false;
+    error.value = true;
+  }
+}
+
+// 点击预览大图//照片弹框
+function clickImg(url) {
+  let params = [];
+  url.forEach((item) => {
+    params.push(item.url);
+  });
+  showImagePreview(params);
+}
+// 我想说点击事件
+function sayClick() {
+  allData.showCancel = true;
+  allData.formData.opinion = '';
+  allData.formData.wechatName = '';
+  allData.formData.filelist = [];
+}
+// 获取上传的图片
+function getImgList(e) {
+  e.forEach((item) => {
+    item.refField = 'commentPhotos';
+  });
+  allData.formData.filelist = e;
+}
+// 取消按钮
+function closeDaKa() {
+  allData.showCancel = false;
+  allData.formData = {};
+  fieldKey.value++;
+}
+
+// 提交上报
+const onSubmitData = async () => {
+  console.log('表单数据信息：', allData.formData);
+  peopleOpinionAdd(allData.formData).then((response) => {
+    allData.showCancel = false;
+    pageNum.value = 0;
+    finished.value = false;
+    tableData.value = [];
+    getDataList();
+  });
+};
+
+onMounted(() => {
+  getDataList();
+});
+</script>
+
+<style lang="less">
+.SpongeCultureCLass {
+  height: calc(100% - 95px);
+  overflow: auto;
+  background: #f1f1f1;
+  .ConstrucClass {
+    margin: 15px 20px;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    background: #ffffff;
+    .MainBox {
+      width: 100%;
+      .AvatarAppearance {
+        width: 100%;
+        height: 120px;
+        display: flex;
+        justify-content: space-around;
+        border-bottom: 1px solid #eaeaea;
+        .zp {
+          width: 20%;
+          height: 120px;
+          // background: red;
+          .txclass {
+            width: 80px;
+            height: 80px;
+            border-radius: 50px;
+            position: relative;
+            top: 18px;
+            left: 25px;
+          }
+        }
+        .NameTime {
+          width: 95%;
+          height: 60px;
+          .Namea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: bold;
+            font-size: 28px;
+            color: #121212;
+            line-height: 26px;
+          }
+          .Timea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 22px;
+            color: #7b7b7e;
+          }
+        }
+      }
+      .below {
+        width: 100%;
+        padding-bottom: 10px;
+        .belowNr {
+          width: 95%;
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          font-size: 26px;
+          color: #121212;
+          margin-left: 15px;
+        }
+        .belowZp {
+          margin-left: 15px;
+          display: inline-block;
+        }
+      }
+    }
+  }
+  .rotundity {
+    width: 120px;
+    height: 120px;
+    background: rgba(20, 91, 247, 1);
+    border-radius: 100px;
+    position: fixed;
+    bottom: 180px;
+    right: 20px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    p {
+      font-family: Source Han Sans CN;
+      font-weight: 500;
+      font-size: 24px;
+      color: #ffffff;
+    }
+  }
+}
+.popup_tittle {
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  // justify-content: space-between;
+  padding: 15px;
+  height: 100px;
+  // background: red;
+  .tittle {
+    font-size: 40px;
+    font-weight: bold;
+  }
+}
+.BottomView {
+  width: 100%;
+  height: 120px;
+  display: flex;
+  justify-content: space-around;
+  margin-top: 20px;
+  .BotBtn {
+    width: 45%;
+    height: 65px;
+    border-radius: 20px;
+  }
+}
+.mediumList {
+  width: 100%;
+  height: auto;
+  padding: 10px 30px;
+
+  .Title {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    display: inline-block;
+  }
+
+  .picBox {
+    width: 100%;
+    height: auto;
+  }
+}
+</style>

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index d909a76..6fb292c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,7 +119,13 @@
     {
       path: '/questionnaire',
       name: 'questionnaire',
-      component: () => import('@/views/wjdc/questionnaire.vue'),
+      component: () => import('@/views/gzjy/questionnaire.vue'),
+      meta: { keepAlive: false, title: '公众建议', ifShowHead: true },
+    },
+    {
+      path: '/PublicAdvice',
+      name: 'PublicAdvice',
+      component: () => import('@/views/wjdc/PublicAdvice.vue'),
       meta: { keepAlive: false, title: '问卷调查', ifShowHead: true },
     },
   ],
diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index ff1043d..782c91f 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -10,7 +10,20 @@
           label="项目名称"
           type="textarea"
           disabled="true"
-        />
+        /><van-field
+          label="整改状态"
+          name="caseLevel"
+          required
+          :rules="[{ required: true, message: '请选择整改状态' }]"
+        >
+          <template #input>
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
+                {{ item.label }}
+              </van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
 
         <!-- <van-field
           v-model="AllData.formData.problemType"
@@ -74,15 +87,6 @@
           </div>
         </van-popup>
 
-        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
-          <template #input>
-            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
-              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
-                {{ item.label }}
-              </van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
         <van-field
           v-model="AllData.formData.problemContent"
           rows="2"
diff --git a/src/views/gzjy/questionnaire.vue b/src/views/gzjy/questionnaire.vue
new file mode 100644
index 0000000..77263fd
--- /dev/null
+++ b/src/views/gzjy/questionnaire.vue
@@ -0,0 +1,331 @@
+<template>
+  <!-- 公众建议 -->
+  <div class="SpongeCultureCLass">
+    <van-list
+      v-model:loading="loading"
+      v-model:error="error"
+      error-text="请求失败，点击重新加载"
+      :finished="finished"
+      finished-text="已经到底了~~"
+      :offset="50"
+      @load="getDataList"
+    >
+      <div class="ConstrucClass" v-for="(item, index) in tableData" :key="index">
+        <div class="MainBox">
+          <div class="AvatarAppearance">
+            <!-- <div class="zp">
+              <img src="../assets/images/tx.png" alt="" class="txclass" />
+            </div> -->
+            <div class="NameTime">
+              <p class="Namea">{{ item.wechatName }}</p>
+              <p class="Timea">{{ item.createTime }}</p>
+            </div>
+          </div>
+          <div class="below">
+            <p class="belowNr">
+              {{ item.opinion }}
+            </p>
+            <div class="belowZp">
+              <img
+                v-for="(item1, index) in item.filelist"
+                :key="index"
+                :src="item1.url"
+                style="width: 100px; height: 50px; margin-top: 5px; padding-left: 5px"
+                @click="clickImg(item.filelist)"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </van-list>
+
+    <div class="rotundity" @click="sayClick">
+      <p>我想说</p>
+    </div>
+  </div>
+  <van-form @submit="onSubmitData">
+    <van-popup v-model:show="allData.showCancel" position="center" closeable :style="{ width: '100%' }">
+      <div class="popup_tittle">
+        <div class="tittle">留言提交</div>
+      </div>
+
+      <van-cell-group>
+        <van-field
+          v-model="allData.formData.wechatName"
+          label="姓名/昵称"
+          placeholder="请输入姓名/昵称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入姓名/昵称' }]"
+          :key="fieldKey"
+        />
+
+        <van-field
+          v-model="allData.formData.opinion"
+          rows="1"
+          label="留言描述"
+          type="textarea"
+          maxlength="100"
+          placeholder="请输入留言描述"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入留言描述' }]"
+          style="margin-top: 10px"
+          :key="fieldKey"
+        />
+      </van-cell-group>
+
+      <div class="mediumList">
+        <span class="Title">现场图片(最多3张)</span>
+        <div class="picBox">
+          <UploadImg
+            :maxCount="3"
+            :saveFileArr="allData.formData.filelist"
+            :acceptFormat="'image/*'"
+            @update:saveFileArr="getImgList"
+          />
+        </div>
+      </div>
+
+      <div class="BottomView">
+        <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
+        <van-button native-type="submit" class="BotBtn" type="primary">提交</van-button>
+      </div>
+    </van-popup>
+  </van-form>
+</template>
+
+<script setup>
+import { useStore } from '@/pinia/store.js';
+import { peopleOpinionPage, peopleOpinionAdd } from '@/api/PublicAdvice.js';
+import UploadImg from '@/views/components/uploadFile.vue';
+import { showImagePreview } from 'vant';
+
+const pinias = useStore();
+const fieldKey = ref(0);
+
+const allData = reactive({
+  showCancel: false,
+  currentPage: 0,
+  formData: {
+    opinion: '',
+    wechatName: '',
+    filelist: [], //获取的图片数组
+  },
+});
+const loading = ref(false);
+const tableData = ref([]);
+const pageNum = ref(0);
+const pageSize = ref(10);
+const error = ref(false);
+const finished = ref(false);
+
+/** 获取查询数据列表 */
+async function getDataList(bol) {
+  pinias.showLoading();
+  pageNum.value = pageNum.value + 1;
+  loading.value = true;
+  try {
+    const params = {
+      pageNum: pageNum.value,
+      pageSize: pageSize.value,
+    };
+    const res = await peopleOpinionPage(params);
+    loading.value = false;
+    if (res?.code === 200) {
+      const data = res.data || [];
+      tableData.value = tableData.value.concat(data);
+      pinias.hideLoading();
+      const total = res.total;
+      const pageTotal = Math.ceil(total / pageSize.value);
+      if (pageNum.value >= pageTotal) {
+        finished.value = true;
+      }
+    } else {
+      error.value = true;
+    }
+  } catch (error) {
+    console.log(error);
+    loading.value = false;
+    error.value = true;
+  }
+}
+
+// 点击预览大图//照片弹框
+function clickImg(url) {
+  let params = [];
+  url.forEach((item) => {
+    params.push(item.url);
+  });
+  showImagePreview(params);
+}
+// 我想说点击事件
+function sayClick() {
+  allData.showCancel = true;
+  allData.formData.opinion = '';
+  allData.formData.wechatName = '';
+  allData.formData.filelist = [];
+}
+// 获取上传的图片
+function getImgList(e) {
+  e.forEach((item) => {
+    item.refField = 'commentPhotos';
+  });
+  allData.formData.filelist = e;
+}
+// 取消按钮
+function closeDaKa() {
+  allData.showCancel = false;
+  allData.formData = {};
+  fieldKey.value++;
+}
+
+// 提交上报
+const onSubmitData = async () => {
+  console.log('表单数据信息：', allData.formData);
+  peopleOpinionAdd(allData.formData).then((response) => {
+    allData.showCancel = false;
+    pageNum.value = 0;
+    finished.value = false;
+    tableData.value = [];
+    getDataList();
+  });
+};
+
+onMounted(() => {
+  getDataList();
+});
+</script>
+
+<style lang="less">
+.SpongeCultureCLass {
+  height: calc(100% - 95px);
+  overflow: auto;
+  background: #f1f1f1;
+  .ConstrucClass {
+    margin: 15px 20px;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    background: #ffffff;
+    .MainBox {
+      width: 100%;
+      .AvatarAppearance {
+        width: 100%;
+        height: 120px;
+        display: flex;
+        justify-content: space-around;
+        border-bottom: 1px solid #eaeaea;
+        .zp {
+          width: 20%;
+          height: 120px;
+          // background: red;
+          .txclass {
+            width: 80px;
+            height: 80px;
+            border-radius: 50px;
+            position: relative;
+            top: 18px;
+            left: 25px;
+          }
+        }
+        .NameTime {
+          width: 95%;
+          height: 60px;
+          .Namea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: bold;
+            font-size: 28px;
+            color: #121212;
+            line-height: 26px;
+          }
+          .Timea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 22px;
+            color: #7b7b7e;
+          }
+        }
+      }
+      .below {
+        width: 100%;
+        padding-bottom: 10px;
+        .belowNr {
+          width: 95%;
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          font-size: 26px;
+          color: #121212;
+          margin-left: 15px;
+        }
+        .belowZp {
+          margin-left: 15px;
+          display: inline-block;
+        }
+      }
+    }
+  }
+  .rotundity {
+    width: 120px;
+    height: 120px;
+    background: rgba(20, 91, 247, 1);
+    border-radius: 100px;
+    position: fixed;
+    bottom: 180px;
+    right: 20px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    p {
+      font-family: Source Han Sans CN;
+      font-weight: 500;
+      font-size: 24px;
+      color: #ffffff;
+    }
+  }
+}
+.popup_tittle {
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  // justify-content: space-between;
+  padding: 15px;
+  height: 100px;
+  // background: red;
+  .tittle {
+    font-size: 40px;
+    font-weight: bold;
+  }
+}
+.BottomView {
+  width: 100%;
+  height: 120px;
+  display: flex;
+  justify-content: space-around;
+  margin-top: 20px;
+  .BotBtn {
+    width: 45%;
+    height: 65px;
+    border-radius: 20px;
+  }
+}
+.mediumList {
+  width: 100%;
+  height: auto;
+  padding: 10px 30px;
+
+  .Title {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    display: inline-block;
+  }
+
+  .picBox {
+    width: 100%;
+    height: auto;
+  }
+}
+</style>
diff --git a/src/views/lsxmsb/TemporaryProject.vue b/src/views/lsxmsb/TemporaryProject.vue
index a1da68e..9769a90 100644
--- a/src/views/lsxmsb/TemporaryProject.vue
+++ b/src/views/lsxmsb/TemporaryProject.vue
@@ -52,7 +52,8 @@
           problemDetail.isRectification == '1' ? '无需整改' : problemDetail.isRectification == '2' ? '需要整改' : ''
         "
       />
-      <van-cell title="检查项:" :label="jcxList.filter((item) => item.value == problemDetail.checkItem)[0].label" />
+      <van-cell title="检查项:" :label="problemDetail.checkItemName" />
+      <van-cell title="问题类型:" :label="problemDetail.problemTypeName" />
       <van-cell title="问题描述:" :label="problemDetail.problemContent" />
       <div style="margin: 15px 18px; font-size: 15px">问题图片</div>
       <div class="imageP" v-if="problemDetail.sysFileList.length > 0">

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index d909a76..6fb292c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,7 +119,13 @@
     {
       path: '/questionnaire',
       name: 'questionnaire',
-      component: () => import('@/views/wjdc/questionnaire.vue'),
+      component: () => import('@/views/gzjy/questionnaire.vue'),
+      meta: { keepAlive: false, title: '公众建议', ifShowHead: true },
+    },
+    {
+      path: '/PublicAdvice',
+      name: 'PublicAdvice',
+      component: () => import('@/views/wjdc/PublicAdvice.vue'),
       meta: { keepAlive: false, title: '问卷调查', ifShowHead: true },
     },
   ],
diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index ff1043d..782c91f 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -10,7 +10,20 @@
           label="项目名称"
           type="textarea"
           disabled="true"
-        />
+        /><van-field
+          label="整改状态"
+          name="caseLevel"
+          required
+          :rules="[{ required: true, message: '请选择整改状态' }]"
+        >
+          <template #input>
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
+                {{ item.label }}
+              </van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
 
         <!-- <van-field
           v-model="AllData.formData.problemType"
@@ -74,15 +87,6 @@
           </div>
         </van-popup>
 
-        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
-          <template #input>
-            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
-              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
-                {{ item.label }}
-              </van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
         <van-field
           v-model="AllData.formData.problemContent"
           rows="2"
diff --git a/src/views/gzjy/questionnaire.vue b/src/views/gzjy/questionnaire.vue
new file mode 100644
index 0000000..77263fd
--- /dev/null
+++ b/src/views/gzjy/questionnaire.vue
@@ -0,0 +1,331 @@
+<template>
+  <!-- 公众建议 -->
+  <div class="SpongeCultureCLass">
+    <van-list
+      v-model:loading="loading"
+      v-model:error="error"
+      error-text="请求失败，点击重新加载"
+      :finished="finished"
+      finished-text="已经到底了~~"
+      :offset="50"
+      @load="getDataList"
+    >
+      <div class="ConstrucClass" v-for="(item, index) in tableData" :key="index">
+        <div class="MainBox">
+          <div class="AvatarAppearance">
+            <!-- <div class="zp">
+              <img src="../assets/images/tx.png" alt="" class="txclass" />
+            </div> -->
+            <div class="NameTime">
+              <p class="Namea">{{ item.wechatName }}</p>
+              <p class="Timea">{{ item.createTime }}</p>
+            </div>
+          </div>
+          <div class="below">
+            <p class="belowNr">
+              {{ item.opinion }}
+            </p>
+            <div class="belowZp">
+              <img
+                v-for="(item1, index) in item.filelist"
+                :key="index"
+                :src="item1.url"
+                style="width: 100px; height: 50px; margin-top: 5px; padding-left: 5px"
+                @click="clickImg(item.filelist)"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </van-list>
+
+    <div class="rotundity" @click="sayClick">
+      <p>我想说</p>
+    </div>
+  </div>
+  <van-form @submit="onSubmitData">
+    <van-popup v-model:show="allData.showCancel" position="center" closeable :style="{ width: '100%' }">
+      <div class="popup_tittle">
+        <div class="tittle">留言提交</div>
+      </div>
+
+      <van-cell-group>
+        <van-field
+          v-model="allData.formData.wechatName"
+          label="姓名/昵称"
+          placeholder="请输入姓名/昵称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入姓名/昵称' }]"
+          :key="fieldKey"
+        />
+
+        <van-field
+          v-model="allData.formData.opinion"
+          rows="1"
+          label="留言描述"
+          type="textarea"
+          maxlength="100"
+          placeholder="请输入留言描述"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入留言描述' }]"
+          style="margin-top: 10px"
+          :key="fieldKey"
+        />
+      </van-cell-group>
+
+      <div class="mediumList">
+        <span class="Title">现场图片(最多3张)</span>
+        <div class="picBox">
+          <UploadImg
+            :maxCount="3"
+            :saveFileArr="allData.formData.filelist"
+            :acceptFormat="'image/*'"
+            @update:saveFileArr="getImgList"
+          />
+        </div>
+      </div>
+
+      <div class="BottomView">
+        <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
+        <van-button native-type="submit" class="BotBtn" type="primary">提交</van-button>
+      </div>
+    </van-popup>
+  </van-form>
+</template>
+
+<script setup>
+import { useStore } from '@/pinia/store.js';
+import { peopleOpinionPage, peopleOpinionAdd } from '@/api/PublicAdvice.js';
+import UploadImg from '@/views/components/uploadFile.vue';
+import { showImagePreview } from 'vant';
+
+const pinias = useStore();
+const fieldKey = ref(0);
+
+const allData = reactive({
+  showCancel: false,
+  currentPage: 0,
+  formData: {
+    opinion: '',
+    wechatName: '',
+    filelist: [], //获取的图片数组
+  },
+});
+const loading = ref(false);
+const tableData = ref([]);
+const pageNum = ref(0);
+const pageSize = ref(10);
+const error = ref(false);
+const finished = ref(false);
+
+/** 获取查询数据列表 */
+async function getDataList(bol) {
+  pinias.showLoading();
+  pageNum.value = pageNum.value + 1;
+  loading.value = true;
+  try {
+    const params = {
+      pageNum: pageNum.value,
+      pageSize: pageSize.value,
+    };
+    const res = await peopleOpinionPage(params);
+    loading.value = false;
+    if (res?.code === 200) {
+      const data = res.data || [];
+      tableData.value = tableData.value.concat(data);
+      pinias.hideLoading();
+      const total = res.total;
+      const pageTotal = Math.ceil(total / pageSize.value);
+      if (pageNum.value >= pageTotal) {
+        finished.value = true;
+      }
+    } else {
+      error.value = true;
+    }
+  } catch (error) {
+    console.log(error);
+    loading.value = false;
+    error.value = true;
+  }
+}
+
+// 点击预览大图//照片弹框
+function clickImg(url) {
+  let params = [];
+  url.forEach((item) => {
+    params.push(item.url);
+  });
+  showImagePreview(params);
+}
+// 我想说点击事件
+function sayClick() {
+  allData.showCancel = true;
+  allData.formData.opinion = '';
+  allData.formData.wechatName = '';
+  allData.formData.filelist = [];
+}
+// 获取上传的图片
+function getImgList(e) {
+  e.forEach((item) => {
+    item.refField = 'commentPhotos';
+  });
+  allData.formData.filelist = e;
+}
+// 取消按钮
+function closeDaKa() {
+  allData.showCancel = false;
+  allData.formData = {};
+  fieldKey.value++;
+}
+
+// 提交上报
+const onSubmitData = async () => {
+  console.log('表单数据信息：', allData.formData);
+  peopleOpinionAdd(allData.formData).then((response) => {
+    allData.showCancel = false;
+    pageNum.value = 0;
+    finished.value = false;
+    tableData.value = [];
+    getDataList();
+  });
+};
+
+onMounted(() => {
+  getDataList();
+});
+</script>
+
+<style lang="less">
+.SpongeCultureCLass {
+  height: calc(100% - 95px);
+  overflow: auto;
+  background: #f1f1f1;
+  .ConstrucClass {
+    margin: 15px 20px;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    background: #ffffff;
+    .MainBox {
+      width: 100%;
+      .AvatarAppearance {
+        width: 100%;
+        height: 120px;
+        display: flex;
+        justify-content: space-around;
+        border-bottom: 1px solid #eaeaea;
+        .zp {
+          width: 20%;
+          height: 120px;
+          // background: red;
+          .txclass {
+            width: 80px;
+            height: 80px;
+            border-radius: 50px;
+            position: relative;
+            top: 18px;
+            left: 25px;
+          }
+        }
+        .NameTime {
+          width: 95%;
+          height: 60px;
+          .Namea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: bold;
+            font-size: 28px;
+            color: #121212;
+            line-height: 26px;
+          }
+          .Timea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 22px;
+            color: #7b7b7e;
+          }
+        }
+      }
+      .below {
+        width: 100%;
+        padding-bottom: 10px;
+        .belowNr {
+          width: 95%;
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          font-size: 26px;
+          color: #121212;
+          margin-left: 15px;
+        }
+        .belowZp {
+          margin-left: 15px;
+          display: inline-block;
+        }
+      }
+    }
+  }
+  .rotundity {
+    width: 120px;
+    height: 120px;
+    background: rgba(20, 91, 247, 1);
+    border-radius: 100px;
+    position: fixed;
+    bottom: 180px;
+    right: 20px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    p {
+      font-family: Source Han Sans CN;
+      font-weight: 500;
+      font-size: 24px;
+      color: #ffffff;
+    }
+  }
+}
+.popup_tittle {
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  // justify-content: space-between;
+  padding: 15px;
+  height: 100px;
+  // background: red;
+  .tittle {
+    font-size: 40px;
+    font-weight: bold;
+  }
+}
+.BottomView {
+  width: 100%;
+  height: 120px;
+  display: flex;
+  justify-content: space-around;
+  margin-top: 20px;
+  .BotBtn {
+    width: 45%;
+    height: 65px;
+    border-radius: 20px;
+  }
+}
+.mediumList {
+  width: 100%;
+  height: auto;
+  padding: 10px 30px;
+
+  .Title {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    display: inline-block;
+  }
+
+  .picBox {
+    width: 100%;
+    height: auto;
+  }
+}
+</style>
diff --git a/src/views/lsxmsb/TemporaryProject.vue b/src/views/lsxmsb/TemporaryProject.vue
index a1da68e..9769a90 100644
--- a/src/views/lsxmsb/TemporaryProject.vue
+++ b/src/views/lsxmsb/TemporaryProject.vue
@@ -52,7 +52,8 @@
           problemDetail.isRectification == '1' ? '无需整改' : problemDetail.isRectification == '2' ? '需要整改' : ''
         "
       />
-      <van-cell title="检查项:" :label="jcxList.filter((item) => item.value == problemDetail.checkItem)[0].label" />
+      <van-cell title="检查项:" :label="problemDetail.checkItemName" />
+      <van-cell title="问题类型:" :label="problemDetail.problemTypeName" />
       <van-cell title="问题描述:" :label="problemDetail.problemContent" />
       <div style="margin: 15px 18px; font-size: 15px">问题图片</div>
       <div class="imageP" v-if="problemDetail.sysFileList.length > 0">
diff --git a/src/views/wjdc/PublicAdvice.vue b/src/views/wjdc/PublicAdvice.vue
new file mode 100644
index 0000000..de66c48
--- /dev/null
+++ b/src/views/wjdc/PublicAdvice.vue
@@ -0,0 +1,217 @@
+<template>
+  <!-- 问卷调查 -->
+  <div class="questionnaire">
+    <div class="top">
+      <img class="ImgCLass" src="@/assets/images/wjtc.png" alt="" />
+      <div class="below">
+        您好!今年是开封市创建海绵城市建设示范城市的第二年,为进一步了解群众对孝感市海绵城市建设的看法，我们正在进行项关于海绵城市建设群众满意度的调查,
+        希望能够占用您三分钟的时间,填写问卷,您的看法对我们非常重要,数据资料我们将严格保密,结果将作为海绵城市建设绩效评价的参考,
+        希望能够得到您的支持和配合,非常感谢!
+      </div>
+    </div>
+    <div class="under">
+      <van-form @submit="onSubmitData">
+        <div class="ContentView">
+          <van-cell-group inset>
+            <van-field
+              v-model="AllData.formData.name"
+              label="您的姓名"
+              placeholder="请输入您的姓名"
+              required
+              :rules="[{ required: true, message: '请输入您的姓名' }]"
+              style="display: block"
+            />
+            <van-field
+              v-model="AllData.formData.telephone"
+              label="您的手机号"
+              placeholder="请输入您的手机号"
+              required
+              :rules="[{ required: true, message: '请输入您的手机号' }]"
+              style="display: block"
+            />
+
+            <div v-for="(item, index) in AllData.problemConfigListA" :key="index">
+              <!-- 单选 -->
+              <van-field :label="index + 1 + ',' + item.problemName" v-if="item.problemType == 'radio'">
+                <template #input>
+                  <van-radio-group v-model="AllData.formData.problemResultList[index].answersResult">
+                    <van-radio v-for="(item2, index2) in item.problemOptionList" :name="item2.id" :key="item2.id">
+                      {{ item2.optionName }}
+                    </van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+
+              <!--  multiple 多选 -->
+              <!-- <van-field :label="index + 1 + ',' + item.problemName" v-if="item.problemType == 'checkbox'">
+                <template #input>
+                  <van-radio-group v-model="AllData.formData.problemResultList[index].answersResult">
+                    <van-radio v-for="(item2, index2) in item.problemOptionList" :name="item2.id" :key="item2.id">
+                      {{ item2.optionName }}
+                    </van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field> -->
+              <!-- 简答题 -->
+              <van-field
+                v-model="AllData.formData.problemResultList[index].answersResult"
+                rows="2"
+                autosize
+                :label="AllData.problemConfigListA.length + ',' + item.problemName"
+                type="textarea"
+                maxlength="200"
+                placeholder="请输入意见和建议"
+                show-word-limit
+                v-if="item.problemType == 'answers'"
+              />
+            </div>
+          </van-cell-group>
+        </div>
+        <div class="BottomView">
+          <van-button native-type="submit" class="BotBtn" type="primary"> 提交调查问卷 </van-button>
+        </div>
+      </van-form>
+    </div>
+  </div>
+</template>
+
+<script setup name="PublicAdvice">
+import { executingQuestionnaireList, publicServiceAdd } from '@/api/wjdc.js';
+const { proxy } = getCurrentInstance();
+const AllData = reactive({
+  problemConfigListA: [],
+  formData: {
+    name: '',
+    telephone: '',
+    problemResultList: [],
+  },
+
+  formOptions: {},
+});
+
+// 提交上报
+const onSubmitData = async () => {
+  let pattrens = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
+  if (!pattrens.test(AllData.formData.telephone)) {
+    proxy.showFailToast('手机号格式不正确');
+  }
+  // console.log(AllData.formData.problemResultList, 'AllData.formData');
+  AllData.formData.problemResultList.forEach((item) => {
+    // console.log(item, 'element.problemType');
+    if (item.problemType == 'radio') {
+      console.log('radio');
+      item.problemOptionList = [];
+      item.problemOptionList.push({
+        optionId: item.answersResult,
+      });
+    }
+  });
+  let params = JSON.parse(JSON.stringify(AllData.formData));
+  // console.log(params, 'params---');
+
+  // 多选转换格式为string，方便后端接收
+
+  console.log(params, 'params');
+  // params.problemResultList.map((item) => {
+  //   if (item.problemType == 'checkbox') {
+  //     item.answersResult = item.answersResult.join(',');
+  //   }
+  // });
+  publicServiceAdd(params).then((response) => {
+    proxy.showSuccessToast('填报成功');
+    AllData.formData.name = '';
+    AllData.formData.telephone = '';
+    AllData.formData.problemResultList = [];
+    getData();
+  });
+};
+
+// 获取数据
+const getData = async () => {
+  let res = await executingQuestionnaireList();
+  AllData.problemConfigListA = res.data.problemConfigList;
+  AllData.formData.questionnaireId = res.data.id;
+  res.data.problemConfigList.map((item) => {
+    AllData.formData.problemResultList.push({
+      answersResult: item.problemType == 'checkbox' ? [] : '',
+      problemType: item.problemType,
+      problemId: item.id,
+    });
+  });
+};
+getData();
+</script>
+
+<style lang="less">
+.questionnaire {
+  height: calc(100% - 155px);
+  overflow: auto;
+  background: #f6f6f6;
+  // background: red;
+  padding: 30px;
+
+  .top {
+    width: 100%;
+    .ImgCLass {
+      margin: 20px 0px;
+      width: 100%;
+      height: 120px;
+    }
+    .below {
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      font-size: 24px;
+      color: #121212;
+      line-height: 39px;
+      text-indent: 45px;
+    }
+  }
+  .under {
+    width: 100%;
+    margin-top: 20px;
+    .ContentView {
+      .van-cell-group--inset {
+        margin: 0px !important;
+      }
+      .van-field__label {
+        flex: none;
+        box-sizing: border-box;
+        width: var(--van-field-label-width);
+        margin-right: var(--van-field-label-margin-right);
+        color: var(--van-field-label-color);
+        text-align: left;
+        word-wrap: break-word;
+        width: 100%;
+        font-family: Source Han Sans CN;
+        font-weight: 500;
+        font-size: 28px;
+        color: #121212;
+      }
+      .van-radio {
+        margin-top: 10px;
+        .van-radio__icon .van-icon {
+          width: 30px;
+          height: 30px;
+          position: relative;
+          top: 3px;
+        }
+        .van-icon-success:before {
+          content: '' !important;
+        }
+      }
+    }
+    .BottomView {
+      width: 100%;
+      display: flex;
+      justify-content: space-around;
+      // margin-bottom: 50px;
+      .BotBtn {
+        margin-top: 20px;
+        width: 45%;
+        height: 62px;
+        border-radius: 31px;
+      }
+    }
+  }
+}
+</style>

diff --git a/src/api/wjdc.js b/src/api/wjdc.js
new file mode 100644
index 0000000..3eed63d
--- /dev/null
+++ b/src/api/wjdc.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+// 问卷调查 列表
+export function executingQuestionnaireList(query) {
+  return request({
+    url: '/publicService/wechatMiniProgram/adjustmentQuestionnaireConfig/executingQuestionnaireList',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 问卷调查 提交
+export function publicServiceAdd(data) {
+  return request({
+    url: '/publicService/adjustmentQuestionnaireResult/add',
+    method: 'post',
+    data: data,
+  });
+}
diff --git a/src/assets/images/wj.png b/src/assets/images/wj.png
new file mode 100644
index 0000000..28ff90a
--- /dev/null
+++ b/src/assets/images/wj.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index d909a76..6fb292c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,7 +119,13 @@
     {
       path: '/questionnaire',
       name: 'questionnaire',
-      component: () => import('@/views/wjdc/questionnaire.vue'),
+      component: () => import('@/views/gzjy/questionnaire.vue'),
+      meta: { keepAlive: false, title: '公众建议', ifShowHead: true },
+    },
+    {
+      path: '/PublicAdvice',
+      name: 'PublicAdvice',
+      component: () => import('@/views/wjdc/PublicAdvice.vue'),
       meta: { keepAlive: false, title: '问卷调查', ifShowHead: true },
     },
   ],
diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index ff1043d..782c91f 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -10,7 +10,20 @@
           label="项目名称"
           type="textarea"
           disabled="true"
-        />
+        /><van-field
+          label="整改状态"
+          name="caseLevel"
+          required
+          :rules="[{ required: true, message: '请选择整改状态' }]"
+        >
+          <template #input>
+            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
+              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
+                {{ item.label }}
+              </van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
 
         <!-- <van-field
           v-model="AllData.formData.problemType"
@@ -74,15 +87,6 @@
           </div>
         </van-popup>
 
-        <van-field label="整改状态" name="caseLevel" required :rules="[{ required: true, message: '请选择整改状态' }]">
-          <template #input>
-            <van-radio-group v-model="AllData.formData.isRectification" direction="horizontal">
-              <van-radio :name="item.value" v-for="item in AllData.formOptions.case_level" :key="item.value">
-                {{ item.label }}
-              </van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
         <van-field
           v-model="AllData.formData.problemContent"
           rows="2"
diff --git a/src/views/gzjy/questionnaire.vue b/src/views/gzjy/questionnaire.vue
new file mode 100644
index 0000000..77263fd
--- /dev/null
+++ b/src/views/gzjy/questionnaire.vue
@@ -0,0 +1,331 @@
+<template>
+  <!-- 公众建议 -->
+  <div class="SpongeCultureCLass">
+    <van-list
+      v-model:loading="loading"
+      v-model:error="error"
+      error-text="请求失败，点击重新加载"
+      :finished="finished"
+      finished-text="已经到底了~~"
+      :offset="50"
+      @load="getDataList"
+    >
+      <div class="ConstrucClass" v-for="(item, index) in tableData" :key="index">
+        <div class="MainBox">
+          <div class="AvatarAppearance">
+            <!-- <div class="zp">
+              <img src="../assets/images/tx.png" alt="" class="txclass" />
+            </div> -->
+            <div class="NameTime">
+              <p class="Namea">{{ item.wechatName }}</p>
+              <p class="Timea">{{ item.createTime }}</p>
+            </div>
+          </div>
+          <div class="below">
+            <p class="belowNr">
+              {{ item.opinion }}
+            </p>
+            <div class="belowZp">
+              <img
+                v-for="(item1, index) in item.filelist"
+                :key="index"
+                :src="item1.url"
+                style="width: 100px; height: 50px; margin-top: 5px; padding-left: 5px"
+                @click="clickImg(item.filelist)"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </van-list>
+
+    <div class="rotundity" @click="sayClick">
+      <p>我想说</p>
+    </div>
+  </div>
+  <van-form @submit="onSubmitData">
+    <van-popup v-model:show="allData.showCancel" position="center" closeable :style="{ width: '100%' }">
+      <div class="popup_tittle">
+        <div class="tittle">留言提交</div>
+      </div>
+
+      <van-cell-group>
+        <van-field
+          v-model="allData.formData.wechatName"
+          label="姓名/昵称"
+          placeholder="请输入姓名/昵称"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入姓名/昵称' }]"
+          :key="fieldKey"
+        />
+
+        <van-field
+          v-model="allData.formData.opinion"
+          rows="1"
+          label="留言描述"
+          type="textarea"
+          maxlength="100"
+          placeholder="请输入留言描述"
+          show-word-limit
+          required
+          :rules="[{ required: true, message: '请输入留言描述' }]"
+          style="margin-top: 10px"
+          :key="fieldKey"
+        />
+      </van-cell-group>
+
+      <div class="mediumList">
+        <span class="Title">现场图片(最多3张)</span>
+        <div class="picBox">
+          <UploadImg
+            :maxCount="3"
+            :saveFileArr="allData.formData.filelist"
+            :acceptFormat="'image/*'"
+            @update:saveFileArr="getImgList"
+          />
+        </div>
+      </div>
+
+      <div class="BottomView">
+        <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
+        <van-button native-type="submit" class="BotBtn" type="primary">提交</van-button>
+      </div>
+    </van-popup>
+  </van-form>
+</template>
+
+<script setup>
+import { useStore } from '@/pinia/store.js';
+import { peopleOpinionPage, peopleOpinionAdd } from '@/api/PublicAdvice.js';
+import UploadImg from '@/views/components/uploadFile.vue';
+import { showImagePreview } from 'vant';
+
+const pinias = useStore();
+const fieldKey = ref(0);
+
+const allData = reactive({
+  showCancel: false,
+  currentPage: 0,
+  formData: {
+    opinion: '',
+    wechatName: '',
+    filelist: [], //获取的图片数组
+  },
+});
+const loading = ref(false);
+const tableData = ref([]);
+const pageNum = ref(0);
+const pageSize = ref(10);
+const error = ref(false);
+const finished = ref(false);
+
+/** 获取查询数据列表 */
+async function getDataList(bol) {
+  pinias.showLoading();
+  pageNum.value = pageNum.value + 1;
+  loading.value = true;
+  try {
+    const params = {
+      pageNum: pageNum.value,
+      pageSize: pageSize.value,
+    };
+    const res = await peopleOpinionPage(params);
+    loading.value = false;
+    if (res?.code === 200) {
+      const data = res.data || [];
+      tableData.value = tableData.value.concat(data);
+      pinias.hideLoading();
+      const total = res.total;
+      const pageTotal = Math.ceil(total / pageSize.value);
+      if (pageNum.value >= pageTotal) {
+        finished.value = true;
+      }
+    } else {
+      error.value = true;
+    }
+  } catch (error) {
+    console.log(error);
+    loading.value = false;
+    error.value = true;
+  }
+}
+
+// 点击预览大图//照片弹框
+function clickImg(url) {
+  let params = [];
+  url.forEach((item) => {
+    params.push(item.url);
+  });
+  showImagePreview(params);
+}
+// 我想说点击事件
+function sayClick() {
+  allData.showCancel = true;
+  allData.formData.opinion = '';
+  allData.formData.wechatName = '';
+  allData.formData.filelist = [];
+}
+// 获取上传的图片
+function getImgList(e) {
+  e.forEach((item) => {
+    item.refField = 'commentPhotos';
+  });
+  allData.formData.filelist = e;
+}
+// 取消按钮
+function closeDaKa() {
+  allData.showCancel = false;
+  allData.formData = {};
+  fieldKey.value++;
+}
+
+// 提交上报
+const onSubmitData = async () => {
+  console.log('表单数据信息：', allData.formData);
+  peopleOpinionAdd(allData.formData).then((response) => {
+    allData.showCancel = false;
+    pageNum.value = 0;
+    finished.value = false;
+    tableData.value = [];
+    getDataList();
+  });
+};
+
+onMounted(() => {
+  getDataList();
+});
+</script>
+
+<style lang="less">
+.SpongeCultureCLass {
+  height: calc(100% - 95px);
+  overflow: auto;
+  background: #f1f1f1;
+  .ConstrucClass {
+    margin: 15px 20px;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    background: #ffffff;
+    .MainBox {
+      width: 100%;
+      .AvatarAppearance {
+        width: 100%;
+        height: 120px;
+        display: flex;
+        justify-content: space-around;
+        border-bottom: 1px solid #eaeaea;
+        .zp {
+          width: 20%;
+          height: 120px;
+          // background: red;
+          .txclass {
+            width: 80px;
+            height: 80px;
+            border-radius: 50px;
+            position: relative;
+            top: 18px;
+            left: 25px;
+          }
+        }
+        .NameTime {
+          width: 95%;
+          height: 60px;
+          .Namea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: bold;
+            font-size: 28px;
+            color: #121212;
+            line-height: 26px;
+          }
+          .Timea {
+            width: 100%;
+            font-family: Source Han Sans CN;
+            font-weight: 400;
+            font-size: 22px;
+            color: #7b7b7e;
+          }
+        }
+      }
+      .below {
+        width: 100%;
+        padding-bottom: 10px;
+        .belowNr {
+          width: 95%;
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          font-size: 26px;
+          color: #121212;
+          margin-left: 15px;
+        }
+        .belowZp {
+          margin-left: 15px;
+          display: inline-block;
+        }
+      }
+    }
+  }
+  .rotundity {
+    width: 120px;
+    height: 120px;
+    background: rgba(20, 91, 247, 1);
+    border-radius: 100px;
+    position: fixed;
+    bottom: 180px;
+    right: 20px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    p {
+      font-family: Source Han Sans CN;
+      font-weight: 500;
+      font-size: 24px;
+      color: #ffffff;
+    }
+  }
+}
+.popup_tittle {
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  // justify-content: space-between;
+  padding: 15px;
+  height: 100px;
+  // background: red;
+  .tittle {
+    font-size: 40px;
+    font-weight: bold;
+  }
+}
+.BottomView {
+  width: 100%;
+  height: 120px;
+  display: flex;
+  justify-content: space-around;
+  margin-top: 20px;
+  .BotBtn {
+    width: 45%;
+    height: 65px;
+    border-radius: 20px;
+  }
+}
+.mediumList {
+  width: 100%;
+  height: auto;
+  padding: 10px 30px;
+
+  .Title {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    display: inline-block;
+  }
+
+  .picBox {
+    width: 100%;
+    height: auto;
+  }
+}
+</style>
diff --git a/src/views/lsxmsb/TemporaryProject.vue b/src/views/lsxmsb/TemporaryProject.vue
index a1da68e..9769a90 100644
--- a/src/views/lsxmsb/TemporaryProject.vue
+++ b/src/views/lsxmsb/TemporaryProject.vue
@@ -52,7 +52,8 @@
           problemDetail.isRectification == '1' ? '无需整改' : problemDetail.isRectification == '2' ? '需要整改' : ''
         "
       />
-      <van-cell title="检查项:" :label="jcxList.filter((item) => item.value == problemDetail.checkItem)[0].label" />
+      <van-cell title="检查项:" :label="problemDetail.checkItemName" />
+      <van-cell title="问题类型:" :label="problemDetail.problemTypeName" />
       <van-cell title="问题描述:" :label="problemDetail.problemContent" />
       <div style="margin: 15px 18px; font-size: 15px">问题图片</div>
       <div class="imageP" v-if="problemDetail.sysFileList.length > 0">
diff --git a/src/views/wjdc/PublicAdvice.vue b/src/views/wjdc/PublicAdvice.vue
new file mode 100644
index 0000000..de66c48
--- /dev/null
+++ b/src/views/wjdc/PublicAdvice.vue
@@ -0,0 +1,217 @@
+<template>
+  <!-- 问卷调查 -->
+  <div class="questionnaire">
+    <div class="top">
+      <img class="ImgCLass" src="@/assets/images/wjtc.png" alt="" />
+      <div class="below">
+        您好!今年是开封市创建海绵城市建设示范城市的第二年,为进一步了解群众对孝感市海绵城市建设的看法，我们正在进行项关于海绵城市建设群众满意度的调查,
+        希望能够占用您三分钟的时间,填写问卷,您的看法对我们非常重要,数据资料我们将严格保密,结果将作为海绵城市建设绩效评价的参考,
+        希望能够得到您的支持和配合,非常感谢!
+      </div>
+    </div>
+    <div class="under">
+      <van-form @submit="onSubmitData">
+        <div class="ContentView">
+          <van-cell-group inset>
+            <van-field
+              v-model="AllData.formData.name"
+              label="您的姓名"
+              placeholder="请输入您的姓名"
+              required
+              :rules="[{ required: true, message: '请输入您的姓名' }]"
+              style="display: block"
+            />
+            <van-field
+              v-model="AllData.formData.telephone"
+              label="您的手机号"
+              placeholder="请输入您的手机号"
+              required
+              :rules="[{ required: true, message: '请输入您的手机号' }]"
+              style="display: block"
+            />
+
+            <div v-for="(item, index) in AllData.problemConfigListA" :key="index">
+              <!-- 单选 -->
+              <van-field :label="index + 1 + ',' + item.problemName" v-if="item.problemType == 'radio'">
+                <template #input>
+                  <van-radio-group v-model="AllData.formData.problemResultList[index].answersResult">
+                    <van-radio v-for="(item2, index2) in item.problemOptionList" :name="item2.id" :key="item2.id">
+                      {{ item2.optionName }}
+                    </van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+
+              <!--  multiple 多选 -->
+              <!-- <van-field :label="index + 1 + ',' + item.problemName" v-if="item.problemType == 'checkbox'">
+                <template #input>
+                  <van-radio-group v-model="AllData.formData.problemResultList[index].answersResult">
+                    <van-radio v-for="(item2, index2) in item.problemOptionList" :name="item2.id" :key="item2.id">
+                      {{ item2.optionName }}
+                    </van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field> -->
+              <!-- 简答题 -->
+              <van-field
+                v-model="AllData.formData.problemResultList[index].answersResult"
+                rows="2"
+                autosize
+                :label="AllData.problemConfigListA.length + ',' + item.problemName"
+                type="textarea"
+                maxlength="200"
+                placeholder="请输入意见和建议"
+                show-word-limit
+                v-if="item.problemType == 'answers'"
+              />
+            </div>
+          </van-cell-group>
+        </div>
+        <div class="BottomView">
+          <van-button native-type="submit" class="BotBtn" type="primary"> 提交调查问卷 </van-button>
+        </div>
+      </van-form>
+    </div>
+  </div>
+</template>
+
+<script setup name="PublicAdvice">
+import { executingQuestionnaireList, publicServiceAdd } from '@/api/wjdc.js';
+const { proxy } = getCurrentInstance();
+const AllData = reactive({
+  problemConfigListA: [],
+  formData: {
+    name: '',
+    telephone: '',
+    problemResultList: [],
+  },
+
+  formOptions: {},
+});
+
+// 提交上报
+const onSubmitData = async () => {
+  let pattrens = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
+  if (!pattrens.test(AllData.formData.telephone)) {
+    proxy.showFailToast('手机号格式不正确');
+  }
+  // console.log(AllData.formData.problemResultList, 'AllData.formData');
+  AllData.formData.problemResultList.forEach((item) => {
+    // console.log(item, 'element.problemType');
+    if (item.problemType == 'radio') {
+      console.log('radio');
+      item.problemOptionList = [];
+      item.problemOptionList.push({
+        optionId: item.answersResult,
+      });
+    }
+  });
+  let params = JSON.parse(JSON.stringify(AllData.formData));
+  // console.log(params, 'params---');
+
+  // 多选转换格式为string，方便后端接收
+
+  console.log(params, 'params');
+  // params.problemResultList.map((item) => {
+  //   if (item.problemType == 'checkbox') {
+  //     item.answersResult = item.answersResult.join(',');
+  //   }
+  // });
+  publicServiceAdd(params).then((response) => {
+    proxy.showSuccessToast('填报成功');
+    AllData.formData.name = '';
+    AllData.formData.telephone = '';
+    AllData.formData.problemResultList = [];
+    getData();
+  });
+};
+
+// 获取数据
+const getData = async () => {
+  let res = await executingQuestionnaireList();
+  AllData.problemConfigListA = res.data.problemConfigList;
+  AllData.formData.questionnaireId = res.data.id;
+  res.data.problemConfigList.map((item) => {
+    AllData.formData.problemResultList.push({
+      answersResult: item.problemType == 'checkbox' ? [] : '',
+      problemType: item.problemType,
+      problemId: item.id,
+    });
+  });
+};
+getData();
+</script>
+
+<style lang="less">
+.questionnaire {
+  height: calc(100% - 155px);
+  overflow: auto;
+  background: #f6f6f6;
+  // background: red;
+  padding: 30px;
+
+  .top {
+    width: 100%;
+    .ImgCLass {
+      margin: 20px 0px;
+      width: 100%;
+      height: 120px;
+    }
+    .below {
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      font-size: 24px;
+      color: #121212;
+      line-height: 39px;
+      text-indent: 45px;
+    }
+  }
+  .under {
+    width: 100%;
+    margin-top: 20px;
+    .ContentView {
+      .van-cell-group--inset {
+        margin: 0px !important;
+      }
+      .van-field__label {
+        flex: none;
+        box-sizing: border-box;
+        width: var(--van-field-label-width);
+        margin-right: var(--van-field-label-margin-right);
+        color: var(--van-field-label-color);
+        text-align: left;
+        word-wrap: break-word;
+        width: 100%;
+        font-family: Source Han Sans CN;
+        font-weight: 500;
+        font-size: 28px;
+        color: #121212;
+      }
+      .van-radio {
+        margin-top: 10px;
+        .van-radio__icon .van-icon {
+          width: 30px;
+          height: 30px;
+          position: relative;
+          top: 3px;
+        }
+        .van-icon-success:before {
+          content: '' !important;
+        }
+      }
+    }
+    .BottomView {
+      width: 100%;
+      display: flex;
+      justify-content: space-around;
+      // margin-bottom: 50px;
+      .BotBtn {
+        margin-top: 20px;
+        width: 45%;
+        height: 62px;
+        border-radius: 31px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/wjdc/questionnaire.vue b/src/views/wjdc/questionnaire.vue
deleted file mode 100644
index 77263fd..0000000
--- a/src/views/wjdc/questionnaire.vue
+++ /dev/null
@@ -1,331 +0,0 @@
-<template>
-  <!-- 公众建议 -->
-  <div class="SpongeCultureCLass">
-    <van-list
-      v-model:loading="loading"
-      v-model:error="error"
-      error-text="请求失败，点击重新加载"
-      :finished="finished"
-      finished-text="已经到底了~~"
-      :offset="50"
-      @load="getDataList"
-    >
-      <div class="ConstrucClass" v-for="(item, index) in tableData" :key="index">
-        <div class="MainBox">
-          <div class="AvatarAppearance">
-            <!-- <div class="zp">
-              <img src="../assets/images/tx.png" alt="" class="txclass" />
-            </div> -->
-            <div class="NameTime">
-              <p class="Namea">{{ item.wechatName }}</p>
-              <p class="Timea">{{ item.createTime }}</p>
-            </div>
-          </div>
-          <div class="below">
-            <p class="belowNr">
-              {{ item.opinion }}
-            </p>
-            <div class="belowZp">
-              <img
-                v-for="(item1, index) in item.filelist"
-                :key="index"
-                :src="item1.url"
-                style="width: 100px; height: 50px; margin-top: 5px; padding-left: 5px"
-                @click="clickImg(item.filelist)"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </van-list>
-
-    <div class="rotundity" @click="sayClick">
-      <p>我想说</p>
-    </div>
-  </div>
-  <van-form @submit="onSubmitData">
-    <van-popup v-model:show="allData.showCancel" position="center" closeable :style="{ width: '100%' }">
-      <div class="popup_tittle">
-        <div class="tittle">留言提交</div>
-      </div>
-
-      <van-cell-group>
-        <van-field
-          v-model="allData.formData.wechatName"
-          label="姓名/昵称"
-          placeholder="请输入姓名/昵称"
-          show-word-limit
-          required
-          :rules="[{ required: true, message: '请输入姓名/昵称' }]"
-          :key="fieldKey"
-        />
-
-        <van-field
-          v-model="allData.formData.opinion"
-          rows="1"
-          label="留言描述"
-          type="textarea"
-          maxlength="100"
-          placeholder="请输入留言描述"
-          show-word-limit
-          required
-          :rules="[{ required: true, message: '请输入留言描述' }]"
-          style="margin-top: 10px"
-          :key="fieldKey"
-        />
-      </van-cell-group>
-
-      <div class="mediumList">
-        <span class="Title">现场图片(最多3张)</span>
-        <div class="picBox">
-          <UploadImg
-            :maxCount="3"
-            :saveFileArr="allData.formData.filelist"
-            :acceptFormat="'image/*'"
-            @update:saveFileArr="getImgList"
-          />
-        </div>
-      </div>
-
-      <div class="BottomView">
-        <van-button @click="closeDaKa" class="BotBtn">返回</van-button>
-        <van-button native-type="submit" class="BotBtn" type="primary">提交</van-button>
-      </div>
-    </van-popup>
-  </van-form>
-</template>
-
-<script setup>
-import { useStore } from '@/pinia/store.js';
-import { peopleOpinionPage, peopleOpinionAdd } from '@/api/PublicAdvice.js';
-import UploadImg from '@/views/components/uploadFile.vue';
-import { showImagePreview } from 'vant';
-
-const pinias = useStore();
-const fieldKey = ref(0);
-
-const allData = reactive({
-  showCancel: false,
-  currentPage: 0,
-  formData: {
-    opinion: '',
-    wechatName: '',
-    filelist: [], //获取的图片数组
-  },
-});
-const loading = ref(false);
-const tableData = ref([]);
-const pageNum = ref(0);
-const pageSize = ref(10);
-const error = ref(false);
-const finished = ref(false);
-
-/** 获取查询数据列表 */
-async function getDataList(bol) {
-  pinias.showLoading();
-  pageNum.value = pageNum.value + 1;
-  loading.value = true;
-  try {
-    const params = {
-      pageNum: pageNum.value,
-      pageSize: pageSize.value,
-    };
-    const res = await peopleOpinionPage(params);
-    loading.value = false;
-    if (res?.code === 200) {
-      const data = res.data || [];
-      tableData.value = tableData.value.concat(data);
-      pinias.hideLoading();
-      const total = res.total;
-      const pageTotal = Math.ceil(total / pageSize.value);
-      if (pageNum.value >= pageTotal) {
-        finished.value = true;
-      }
-    } else {
-      error.value = true;
-    }
-  } catch (error) {
-    console.log(error);
-    loading.value = false;
-    error.value = true;
-  }
-}
-
-// 点击预览大图//照片弹框
-function clickImg(url) {
-  let params = [];
-  url.forEach((item) => {
-    params.push(item.url);
-  });
-  showImagePreview(params);
-}
-// 我想说点击事件
-function sayClick() {
-  allData.showCancel = true;
-  allData.formData.opinion = '';
-  allData.formData.wechatName = '';
-  allData.formData.filelist = [];
-}
-// 获取上传的图片
-function getImgList(e) {
-  e.forEach((item) => {
-    item.refField = 'commentPhotos';
-  });
-  allData.formData.filelist = e;
-}
-// 取消按钮
-function closeDaKa() {
-  allData.showCancel = false;
-  allData.formData = {};
-  fieldKey.value++;
-}
-
-// 提交上报
-const onSubmitData = async () => {
-  console.log('表单数据信息：', allData.formData);
-  peopleOpinionAdd(allData.formData).then((response) => {
-    allData.showCancel = false;
-    pageNum.value = 0;
-    finished.value = false;
-    tableData.value = [];
-    getDataList();
-  });
-};
-
-onMounted(() => {
-  getDataList();
-});
-</script>
-
-<style lang="less">
-.SpongeCultureCLass {
-  height: calc(100% - 95px);
-  overflow: auto;
-  background: #f1f1f1;
-  .ConstrucClass {
-    margin: 15px 20px;
-    padding: 10px;
-    display: flex;
-    align-items: center;
-    background: #ffffff;
-    .MainBox {
-      width: 100%;
-      .AvatarAppearance {
-        width: 100%;
-        height: 120px;
-        display: flex;
-        justify-content: space-around;
-        border-bottom: 1px solid #eaeaea;
-        .zp {
-          width: 20%;
-          height: 120px;
-          // background: red;
-          .txclass {
-            width: 80px;
-            height: 80px;
-            border-radius: 50px;
-            position: relative;
-            top: 18px;
-            left: 25px;
-          }
-        }
-        .NameTime {
-          width: 95%;
-          height: 60px;
-          .Namea {
-            width: 100%;
-            font-family: Source Han Sans CN;
-            font-weight: bold;
-            font-size: 28px;
-            color: #121212;
-            line-height: 26px;
-          }
-          .Timea {
-            width: 100%;
-            font-family: Source Han Sans CN;
-            font-weight: 400;
-            font-size: 22px;
-            color: #7b7b7e;
-          }
-        }
-      }
-      .below {
-        width: 100%;
-        padding-bottom: 10px;
-        .belowNr {
-          width: 95%;
-          font-family: Source Han Sans CN;
-          font-weight: 400;
-          font-size: 26px;
-          color: #121212;
-          margin-left: 15px;
-        }
-        .belowZp {
-          margin-left: 15px;
-          display: inline-block;
-        }
-      }
-    }
-  }
-  .rotundity {
-    width: 120px;
-    height: 120px;
-    background: rgba(20, 91, 247, 1);
-    border-radius: 100px;
-    position: fixed;
-    bottom: 180px;
-    right: 20px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    p {
-      font-family: Source Han Sans CN;
-      font-weight: 500;
-      font-size: 24px;
-      color: #ffffff;
-    }
-  }
-}
-.popup_tittle {
-  display: flex;
-  align-items: center;
-  justify-items: center;
-  // justify-content: space-between;
-  padding: 15px;
-  height: 100px;
-  // background: red;
-  .tittle {
-    font-size: 40px;
-    font-weight: bold;
-  }
-}
-.BottomView {
-  width: 100%;
-  height: 120px;
-  display: flex;
-  justify-content: space-around;
-  margin-top: 20px;
-  .BotBtn {
-    width: 45%;
-    height: 65px;
-    border-radius: 20px;
-  }
-}
-.mediumList {
-  width: 100%;
-  height: auto;
-  padding: 10px 30px;
-
-  .Title {
-    width: 100%;
-    height: 60px;
-    line-height: 60px;
-    display: inline-block;
-  }
-
-  .picBox {
-    width: 100%;
-    height: auto;
-  }
-}
-</style>