diff --git a/config/index.js b/config/index.js index 06eb9f32..bd0906ef 100644 --- a/config/index.js +++ b/config/index.js @@ -12,9 +12,10 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - target: 'http://116.255.135.38:8081/nsgk_test/', + //target: 'http://116.255.135.38:8081/nsgk_test/', //target: 'http://localhost:8080/', - //target:'http://192.168.31.26:8080', + //target:'192.168.31.228:8080', + target:'http://localhost:8080', changeOrigin: true, pathRewrite: { '^/api': '' @@ -23,8 +24,8 @@ module.exports = { }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + host: '192.168.31.228', // can be overwritten by process.env.HOST + port: 85, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, diff --git a/src/api/onlineHome/done.js b/src/api/onlineHome/done.js new file mode 100644 index 00000000..86022960 --- /dev/null +++ b/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, + }) +} diff --git a/src/api/onlineHome/threeAffairs.js b/src/api/onlineHome/threeAffairs.js index 11803c8e..93a8e64c 100644 --- a/src/api/onlineHome/threeAffairs.js +++ b/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' + }) +} diff --git a/src/router/index.js b/src/router/index.js index d858447a..66ad60a4 100644 --- a/src/router/index.js +++ b/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', diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index 469b03cd..925f0ce0 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -5,254 +5,34 @@ left-arrow @click-left="$router.back(-1)" /> - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -261,10 +41,10 @@ @@ -275,12 +55,62 @@ diff --git a/src/views/onlineHome/doneDetail.vue b/src/views/onlineHome/doneDetail.vue new file mode 100644 index 00000000..9dbbb625 --- /dev/null +++ b/src/views/onlineHome/doneDetail.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/onlineHome/gzdt.vue b/src/views/onlineHome/gzdt.vue index 9bb47f65..b615acf2 100644 --- a/src/views/onlineHome/gzdt.vue +++ b/src/views/onlineHome/gzdt.vue @@ -6,7 +6,7 @@ @click-left="$router.back(-1)" /> - + diff --git a/src/views/onlineHome/hnzc.vue b/src/views/onlineHome/hnzc.vue index 68e195cd..8cc525e0 100644 --- a/src/views/onlineHome/hnzc.vue +++ b/src/views/onlineHome/hnzc.vue @@ -6,7 +6,7 @@ @click-left="$router.back(-1)" /> - + diff --git a/src/views/onlineHome/threeAffairs.vue b/src/views/onlineHome/threeAffairs.vue index d524d9cf..f7269d78 100644 --- a/src/views/onlineHome/threeAffairs.vue +++ b/src/views/onlineHome/threeAffairs.vue @@ -9,7 +9,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/src/views/onlineHome/threeAffairsDetail.vue b/src/views/onlineHome/threeAffairsDetail.vue new file mode 100644 index 00000000..1c3804e9 --- /dev/null +++ b/src/views/onlineHome/threeAffairsDetail.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/views/onlineHome/villageAffairsDetail.vue b/src/views/onlineHome/villageAffairsDetail.vue new file mode 100644 index 00000000..01e142e2 --- /dev/null +++ b/src/views/onlineHome/villageAffairsDetail.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index 3aa0583a..76dc7de7 100644 --- a/src/views/onlineHome/workbench.vue +++ b/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 }); }, diff --git a/src/views/onlineHome/zcfg.vue b/src/views/onlineHome/zcfg.vue index 3e2a0260..e0b31c47 100644 --- a/src/views/onlineHome/zcfg.vue +++ b/src/views/onlineHome/zcfg.vue @@ -7,7 +7,7 @@ /> - + diff --git a/src/views/onlineHome/zdjs.vue b/src/views/onlineHome/zdjs.vue index 7382b383..f319da1f 100644 --- a/src/views/onlineHome/zdjs.vue +++ b/src/views/onlineHome/zdjs.vue @@ -6,7 +6,7 @@ @click-left="$router.back(-1)" /> - + diff --git a/static/images/onlineHome/threeAffair1.png b/static/images/onlineHome/threeAffair1.png new file mode 100644 index 00000000..c3e80156 Binary files /dev/null and b/static/images/onlineHome/threeAffair1.png differ diff --git a/static/images/onlineHome/threeAffair2.png b/static/images/onlineHome/threeAffair2.png new file mode 100644 index 00000000..645d804c Binary files /dev/null and b/static/images/onlineHome/threeAffair2.png differ diff --git a/static/images/onlineHome/threeAffair3.png b/static/images/onlineHome/threeAffair3.png new file mode 100644 index 00000000..c7e5488c Binary files /dev/null and b/static/images/onlineHome/threeAffair3.png differ