Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

 Conflicts:

	config/index.js

src/api/onlineHome/done.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询待办列表
+export function ListTodo(query) {
+  return request({
+    url: "/activiti/process/taskList",
+    method: "get",
+    params: query,
+  })
+}
+
+// 查询待办列表
+export function ListDone(query) {
+  return request({
+    url: "/activiti/process/taskDoneList",
+    method: "get",
+    params: query,
+  })
+}

src/api/onlineHome/threeAffairs.js

@@ -51,3 +51,11 @@ export function exportAffairs(query) {
     params: query
   })
 }
+
+// 查询村务公开详细
+export function getVillageAffairs(id) {
+  return request({
+    url: '/service/villageAffairs/get/' + id,
+    method: 'get'
+  })
+}

src/router/index.js

@@ -445,6 +445,24 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/onlineHome/threeAffairs'], resolve)
   },
+  {
+    path: '/onlineHome/threeAffairsDetail',
+    name: 'threeAffairsDetail',
+    meta: {
+      title: '三务公开详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/threeAffairsDetail'], resolve)
+  },
+  {
+    path: '/onlineHome/villageAffairsDetail',
+    name: 'villageAffairsDetail',
+    meta: {
+      title: '村规民约详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/villageAffairsDetail'], resolve)
+  },
   {
     path: '/onlineHome/homePoll',
     name: 'onlineHomeHomePoll',

src/views/onlineHome/done.vue

@@ -5,254 +5,34 @@
       left-arrow
       @click-left="$router.back(-1)"
     />
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-tabs v-model="activeName" title-active-color="#1D6FE9" color="#1D6FE9" line-width="20px" swipeable @click="getList">
+      <van-tab title="待办" name="1" >
+      </van-tab>
+      <van-tab title="已办" name="2">
+      </van-tab>
+    </van-tabs>
+    <van-cell-group v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #title>
           <van-row style="margin-bottom:10px ">
             <van-col span="23" :offset="1">
-              <van-image
-                height="20"
-                width="20"
-                style="vertical-align: middle"
-                src="../../../static/images/onlineHome/done.png"></van-image>
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row style="margin: 5px 0">
-            <van-col span="15" :offset="1">
-              <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
-            </van-col>
-            <van-col span="6" :offset="2">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">2021-08-06</p>
-            </van-col>
-            <van-col span="16" :offset="1">
-              <p style="color: #878787">来自宅基地改革管理</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="margin-bottom:10px ">
-            <van-col span="23" :offset="1">
-              <van-image
-                height="20"
-                width="20"
-                style="vertical-align: middle"
-                src="../../../static/images/onlineHome/done.png"></van-image>
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row style="margin: 5px 0">
-            <van-col span="15" :offset="1">
-              <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
-            </van-col>
-            <van-col span="6" :offset="2">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">2021-08-06</p>
-            </van-col>
-            <van-col span="16" :offset="1">
-              <p style="color: #878787">来自宅基地改革管理</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="margin-bottom:10px ">
-            <van-col span="23" :offset="1">
-              <van-image
-                height="20"
-                width="20"
-                style="vertical-align: middle"
-                src="../../../static/images/onlineHome/done.png"></van-image>
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row style="margin: 5px 0">
-            <van-col span="15" :offset="1">
-              <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
-            </van-col>
-            <van-col span="6" :offset="2">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">2021-08-06</p>
-            </van-col>
-            <van-col span="16" :offset="1">
-              <p style="color: #878787">来自宅基地改革管理</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="margin-bottom:10px ">
-            <van-col span="23" :offset="1">
-              <van-image
-                height="20"
-                width="20"
-                style="vertical-align: middle"
-                src="../../../static/images/onlineHome/done.png"></van-image>
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row style="margin: 5px 0">
-            <van-col span="15" :offset="1">
-              <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
-            </van-col>
-            <van-col span="6" :offset="2">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">2021-08-06</p>
-            </van-col>
-            <van-col span="16" :offset="1">
-              <p style="color: #878787">来自宅基地改革管理</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group><van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-    <van-cell>
-      <template #title>
-        <van-row style="margin-bottom:10px ">
-          <van-col span="23" :offset="1">
-            <van-image
-              height="20"
-              width="20"
-              style="vertical-align: middle"
-              src="../../../static/images/onlineHome/done.png"></van-image>
-            <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
-          </van-col>
-        </van-row>
-      </template>
-      <template #label>
-        <van-row style="margin: 5px 0">
-          <van-col span="15" :offset="1">
-            <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
-          </van-col>
-          <van-col span="6" :offset="2">
-            <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
-          </van-col>
-        </van-row>
-      </template>
-    </van-cell>
-    <van-cell>
-      <template #title>
-        <van-row>
-          <van-col span="6" :offset="1">
-            <p style="color: #878787">2021-08-06</p>
-          </van-col>
-          <van-col span="16" :offset="1">
-            <p style="color: #878787">来自宅基地改革管理</p>
-          </van-col>
-        </van-row>
-      </template>
-    </van-cell>
-  </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="margin-bottom:10px ">
-            <van-col span="23" :offset="1">
-              <van-image
-                height="20"
-                width="20"
-                style="vertical-align: middle"
-                src="../../../static/images/onlineHome/done.png"></van-image>
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row style="margin: 5px 0">
-            <van-col span="15" :offset="1">
-              <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
-            </van-col>
-            <van-col span="6" :offset="2">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">2021-08-06</p>
-            </van-col>
-            <van-col span="16" :offset="1">
-              <p style="color: #878787">来自宅基地改革管理</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="margin-bottom:10px ">
-            <van-col span="23" :offset="1">
-              <van-image
-                height="20"
-                width="20"
-                style="vertical-align: middle"
-                src="../../../static/images/onlineHome/done.png"></van-image>
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px">刘权泽提交的宅基地申请</h3>
+
+              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                <van-image
+                  height="20"
+                  width="20"
+                  style="vertical-align: middle;margin-right: 10px"
+                  src="../../../static/images/onlineHome/done.png"></van-image>{{item.projectName}}</h3>
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row style="margin: 5px 0">
             <van-col span="15" :offset="1">
-              <p style="font-size: 14px;">申请：张村镇东夼村87号宅基地</p>
+              <p style="font-size: 14px;">申请：</p>
             </van-col>
             <van-col span="6" :offset="2">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">审批通过</p>
+              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
             </van-col>
           </van-row>
         </template>
@@ -261,10 +41,10 @@
         <template #title>
           <van-row>
             <van-col span="6" :offset="1">
-              <p style="color: #878787">2021-08-06</p>
+              <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
             </van-col>
             <van-col span="16" :offset="1">
-              <p style="color: #878787">来自宅基地改革管理</p>
+              <p style="color: #878787">{{item.tableName}}</p>
             </van-col>
           </van-row>
         </template>
@@ -275,12 +55,62 @@
 
 <script>
     import onlineHomeIndex from "../onlineHomeIndex";
+    import {ListDone, ListTodo} from "../../api/onlineHome/done";
 
     export default {
       components: {
         onlineHomeIndex
       },
-        name: "done"
+        name: "done",
+      data(){
+        return{
+          taskList:[],
+          activeName:'1',
+          total:0,
+          queryParams: {
+            pageNum: 1,
+            pageSize: 100,
+          },
+        }
+      },
+      created() {
+        this.getList();
+      },
+      methods: {
+        getList() {
+          this.taskList = []
+          this.$set(this.queryParams, "systemType", '');
+          if(this.activeName=='1'){
+            ListTodo(this.queryParams).then((response) => {
+              console.log(response)
+              response.rows.map(res => {
+                if(res.tableName?res.tableName.indexOf('house')>0:""){
+                  res.tableName = '来自农村宅基地管理系统'
+                }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }
+                this.taskList.push(res)
+              })
+            })
+          }else{
+            ListDone(this.queryParams).then((response) => {
+              console.log(response)
+              response.rows.map(res => {
+                if(res.tableName?res.tableName.indexOf('house')>0:""){
+                  res.tableName = '来自农村宅基地管理系统'
+                }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }
+                this.taskList.push(res)
+              })
+            })
+          }
+        },
+      },
     }
 </script>
 

src/views/onlineHome/doneDetail.vue

@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <van-nav-bar
+      title="我的事项"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+    <van-tabs v-model="activeName" title-active-color="#1D6FE9" color="#1D6FE9" line-width="20px" swipeable @click="getList">
+      <van-tab title="待办" name="1" >
+      </van-tab>
+      <van-tab title="已办" name="2">
+      </van-tab>
+    </van-tabs>
+    <van-cell-group v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell>
+        <template #title>
+          <van-row style="margin-bottom:10px ">
+            <van-col span="23" :offset="1">
+
+              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                <van-image
+                  height="20"
+                  width="20"
+                  style="vertical-align: middle;margin-right: 10px"
+                  src="../../../static/images/onlineHome/done.png"></van-image>{{item.projectName}}</h3>
+            </van-col>
+          </van-row>
+        </template>
+        <template #label>
+          <van-row style="margin: 5px 0">
+            <van-col span="15" :offset="1">
+              <p style="font-size: 14px;">申请：</p>
+            </van-col>
+            <van-col span="6" :offset="2">
+              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+      <van-cell>
+        <template #title>
+          <van-row>
+            <van-col span="6" :offset="1">
+              <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
+            </van-col>
+            <van-col span="16" :offset="1">
+              <p style="color: #878787">{{item.tableName}}</p>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-cell-group>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {ListDone, ListTodo} from "../../api/onlineHome/done";
+
+    export default {
+      components: {
+        onlineHomeIndex
+      },
+        name: "doneDetail",
+      data(){
+        return{
+          taskList:[],
+          activeName:'1',
+          total:0,
+          queryParams: {
+            pageNum: 1,
+            pageSize: 100,
+          },
+        }
+      },
+      created() {
+        this.getList();
+      },
+      methods: {
+        getList() {
+          this.taskList = []
+          this.$set(this.queryParams, "systemType", '');
+          if(this.activeName=='1'){
+            ListTodo(this.queryParams).then((response) => {
+              console.log(response)
+              response.rows.map(res => {
+                if(res.tableName?res.tableName.indexOf('house')>0:""){
+                  res.tableName = '来自农村宅基地管理系统'
+                }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }
+                this.taskList.push(res)
+              })
+            })
+          }else{
+            ListDone(this.queryParams).then((response) => {
+              console.log(response)
+              response.rows.map(res => {
+                if(res.tableName?res.tableName.indexOf('house')>0:""){
+                  res.tableName = '来自农村宅基地管理系统'
+                }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                  res.tableName = '来自银农直联审批管理系统'
+                }
+                this.taskList.push(res)
+              })
+            })
+          }
+        },
+      },
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/onlineHome/gzdt.vue

@@ -6,7 +6,7 @@
       @click-left="$router.back(-1)"
     />
     <van-list>
-      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell v-for="item in list" :key="item.id" is-link :to="{path:'villageAffairsDetail',query:{id:item.id,type:'3'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
         <template #title>
           <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
         </template>

src/views/onlineHome/hnzc.vue

@@ -6,7 +6,7 @@
       @click-left="$router.back(-1)"
     />
     <van-list>
-      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell v-for="item in list" :key="item.id" is-link :to="{path:'villageAffairsDetail',query:{id:item.id,type:'2'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
         <template #title>
           <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
         </template>

src/views/onlineHome/threeAffairs.vue

@@ -9,7 +9,7 @@
       <van-tab title="村务" name="1" >
         <van-list
         >
-          <van-cell v-for="item in list1" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+          <van-cell v-for="item in list1" :key="item.id" is-link :to="{path:'threeAffairsDetail',query:{id:item.id,type:'1'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
             <template #title>
               <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
             </template>
@@ -25,7 +25,7 @@
       <van-tab title="党务" name="2">
         <van-list
         >
-          <van-cell v-for="item in list2" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+          <van-cell v-for="item in list2" :key="item.id" is-link :to="{path:'threeAffairsDetail',query:{id:item.id,type:'2'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
             <template #title>
               <p style="display:inline-block;background: #FF4646;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
             </template>
@@ -41,7 +41,7 @@
       <van-tab title="政务" name="3">
         <van-list
         >
-          <van-cell v-for="item in list3" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+          <van-cell v-for="item in list3" :key="item.id" is-link :to="{path:'threeAffairsDetail',query:{id:item.id,type:'3'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
             <template #title>
               <p style="display:inline-block;background: #7DDA4F;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
             </template>

src/views/onlineHome/threeAffairsDetail.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      :title="type"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+    <p class="title">{{form.title}}</p>
+    <van-row style="text-align: center;margin: 0.3rem 0;">
+      <van-col span="2" :offset="1">
+        <van-image
+          width="24"
+          height="24"
+          src="../../../static/images/onlineHome/threeAffair1.png"
+          style="margin-top: 5px;"
+        />
+      </van-col>
+      <van-col span="20">
+        <van-row>
+          <van-col span="24" style="text-align: left;font-size: 10px;">{{form.createBy}}</van-col>
+        </van-row>
+        <van-row>
+          <van-col span="24" style="text-align: left;font-size: 10px;">{{form.createTime}}</van-col>
+        </van-row>
+      </van-col>
+    </van-row>
+    <div id="content"></div>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {getAffairs, listAffairs} from "../../api/onlineHome/threeAffairs";
+
+    export default {
+      components: {
+
+      },
+        name: "threeAffairsDetail",
+      data() {
+        return {
+          loading: false,
+          finished: false,
+          id:null,
+          type:"",
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            openType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
+          form:{}
+        };
+      },
+      created() {
+        console.log(this.$route.query.type)
+        if(this.$route.query.type== "1"){
+          this.type = "村务公开"
+        }else if(this.$route.query.type== "2"){
+          this.type = "党务公开"
+        }else if(this.$route.query.type== "3"){
+          this.type = "政务公开"
+        }
+        this.id = this.$route.query.id
+        this.getDetail();
+      },
+      methods: {
+        getDetail() {
+          getAffairs(this.id).then(response => {
+            this.form = response.data
+            document.getElementById('content').innerHTML = response.data.content;
+          })
+        },
+      },
+    }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding-bottom: 0.5rem;
+    height: 100vh;
+    background-color: #fff;
+  }
+  .title{
+    text-align: center;
+    font-size: 0.6rem;
+  }
+  #content{
+    overflow: hidden;
+  }
+</style>

src/views/onlineHome/villageAffairsDetail.vue

@@ -0,0 +1,97 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      :title="type"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+    <p class="title">{{form.title}}</p>
+    <van-row style="text-align: center;margin: 0.3rem 0;">
+      <van-col span="2" :offset="1">
+        <van-image
+          width="24"
+          height="24"
+          src="../../../static/images/onlineHome/threeAffair1.png"
+          style="margin-top: 5px;"
+        />
+      </van-col>
+      <van-col span="20">
+        <van-row>
+          <van-col span="24" style="text-align: left;font-size: 10px;">{{form.createBy}}</van-col>
+        </van-row>
+        <van-row>
+          <van-col span="24" style="text-align: left;font-size: 10px;">{{form.createTime}}</van-col>
+        </van-row>
+      </van-col>
+    </van-row>
+    <div id="content"></div>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {getAffairs, getVillageAffairs, listAffairs} from "../../api/onlineHome/threeAffairs";
+
+    export default {
+      components: {
+
+      },
+        name: "villageAffairsDetail",
+      data() {
+        return {
+          loading: false,
+          finished: false,
+          id:null,
+          type:"",
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            openType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
+          form:{}
+        };
+      },
+      created() {
+        console.log(this.$route.query.type)
+        if(this.$route.query.type== "1"){
+          this.type = "政策法规"
+        }else if(this.$route.query.type== "2"){
+          this.type = "惠农政策"
+        }else if(this.$route.query.type== "3"){
+          this.type = "工作动态"
+        }else if(this.$route.query.type== "4"){
+          this.type = "制度建设"
+        }
+        this.id = this.$route.query.id
+        this.getDetail();
+      },
+      methods: {
+        getDetail() {
+          getVillageAffairs(this.id).then(response => {
+            this.form = response.data
+            document.getElementById('content').innerHTML = response.data.content;
+          })
+        },
+      },
+    }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding-bottom: 0.5rem;
+    height: 100vh;
+    background-color: #fff;
+  }
+  .title{
+    text-align: center;
+    font-size: 0.6rem;
+  }
+  #content{
+    overflow: hidden;
+  }
+</style>

src/views/onlineHome/workbench.vue

@@ -424,7 +424,8 @@
       },
       created() {
         getInfo().then(response => {
-          this.deptName = response.user.dept.deptName
+          console.log(response)
+          this.deptName = response.user.deptName
         });
       },
 

src/views/onlineHome/zcfg.vue

@@ -7,7 +7,7 @@
     />
 
     <van-list>
-      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell v-for="item in list" :key="item.id" is-link :to="{path:'villageAffairsDetail',query:{id:item.id,type:'1'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
         <template #title>
           <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
         </template>

src/views/onlineHome/zdjs.vue

@@ -6,7 +6,7 @@
       @click-left="$router.back(-1)"
     />
     <van-list>
-      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell v-for="item in list" :key="item.id" is-link :to="{path:'villageAffairsDetail',query:{id:item.id,type:'4'}}" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
         <template #title>
           <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
         </template>