diff --git a/src/api/homesteadSurvey/index.js b/src/api/homesteadSurvey/index.js index 743fd338..f1eed6cc 100644 --- a/src/api/homesteadSurvey/index.js +++ b/src/api/homesteadSurvey/index.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询数据调查任务列表 export function listTask(query) { return request({ - url: '/houseSurvey/task/list', + url: '/home/homesteadsurvey/list', method: 'get', params: query }) @@ -79,7 +79,7 @@ export function sysConfig(query) { // 查询数据调查任务列表 export function userList() { return request({ - url: '/houseSurvey/task/userList', + url: '/home/homesteadsurvey/userList', method: 'get' }) } diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js index 10669eff..549d3036 100644 --- a/src/api/onlineHome/homestead/circulation.js +++ b/src/api/onlineHome/homestead/circulation.js @@ -28,7 +28,7 @@ export function getLz(id){ //宅基地代码 export function zjdzd(){ return request({ - url:'/house/mobile/zjdzd/list', + url:'/home/homesteadzjdzdxx/list', method:'get' }) } diff --git a/src/api/onlineHome/homestead/paidUtilize.js b/src/api/onlineHome/homestead/paidUtilize.js index 56a9f685..7a11c120 100644 --- a/src/api/onlineHome/homestead/paidUtilize.js +++ b/src/api/onlineHome/homestead/paidUtilize.js @@ -3,7 +3,7 @@ import request from '@/utils/request' //查询列表 export function getList(data){ return request({ - url:'/house/mobile/ycsy/list', + url:'/home/ycsy/list', method:'get', params:data }) @@ -12,7 +12,7 @@ export function getList(data){ //删除列表项 export function removeList(id){ return request({ - url:'/house/ycsy/remove/'+id, + url:'/home/ycsy/remove/'+id, method:'get' }) } @@ -20,23 +20,16 @@ export function removeList(id){ //详情 export function getYcsy(id){ return request({ - url:'/house/ycsy/get/'+id, + url:'/home/ycsy/get/'+id, method:'get' }) } -//提交 -export function submitApply(id){ - return request({ - url:'/house/ycsy/submitApply/'+id, - method:'post' - }) -} //修改 export function ycsyEdit(data){ return request({ - url:'/house/ycsy/edit', + url:'/home/ycsy/edit', method:'post', data:data }) @@ -45,12 +38,13 @@ export function ycsyEdit(data){ //新增 export function ycsyAdd(data){ return request({ - url:'/house/ycsy/add', + url:'/home/ycsy/add', method:'post', data:data }) } + //使用权人查询 export function listByDeptId(){ return request({ diff --git a/src/router/index.js b/src/router/index.js index d58d62b4..aec85a45 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1027,10 +1027,10 @@ export const constantRoutes = [ path: '/paidUtilizeList', name: 'paidUtilizeList', meta: { - title: '有偿利用', + title: '有偿使用', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeList'], resolve) + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeList'], resolve) }, { path: '/paidUtilizeModify', @@ -1039,7 +1039,7 @@ export const constantRoutes = [ title: '修改有偿利用', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeModify'], resolve) + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeModify'], resolve) }, { path: '/paidUtilizeDteail', @@ -1048,7 +1048,7 @@ export const constantRoutes = [ title: '查看有偿利用', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail'], resolve) + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeDteail'], resolve) }, { path: '/paidUtilizeAdd', @@ -1057,7 +1057,7 @@ export const constantRoutes = [ title: '添加有偿利用', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd'], resolve) + component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeAdd'], resolve) }, { path: '/zzjyList', diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue index 64f8ea5f..892d3f69 100644 --- a/src/views/homesteadSurvey/index.vue +++ b/src/views/homesteadSurvey/index.vue @@ -56,7 +56,6 @@

任务列表

-
{{item.planBeginTime}}~{{item.planEndTime}}

-

{{taskExecutorChange(item)}}

+

{{item.jhkssj}}~{{item.jhjssj}}

+

{{item.rwzxr}}

@@ -109,8 +108,8 @@ /> @@ -138,8 +137,8 @@ /> @@ -185,8 +184,8 @@ }, // 查询参数 queryParams: { - taskStatus: null, - taskPublishStatus:"PUBLISHED", + rwwczt: null, + rwfbzt:"PUBLISHED", taskExecutor:null }, nickName:"", @@ -297,8 +296,8 @@ let _this = this if(this.active==1){ let params = { - "taskStatus": "FINISHED", - "taskPublishStatus":"PUBLISHED", + "rwwczt": "FINISHED", + "rwfbzt":"PUBLISHED", "pageNum": this.countyhc+1, "pageSize":10, } @@ -312,8 +311,8 @@ }); }else if(this.active==2){ let params = { - "taskStatus": "UNFINISHED", - "taskPublishStatus":"PUBLISHED", + "rwwczt": "UNFINISHED", + "rwfbzt":"PUBLISHED", "pageNum": this.countwhc+1, "pageSize":10, } @@ -327,7 +326,7 @@ }); }else{ let params = { - "taskPublishStatus":"PUBLISHED", + "rwfbzt":"PUBLISHED", "pageNum": this.countqb+1, "pageSize":10, } diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue index 4115fb67..2bfab256 100644 --- a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue +++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue @@ -151,7 +151,7 @@ + + + @@ -232,4 +250,12 @@ background-color: #1D6FE9; } + .mapBox{ + position: relative; + .mapBox_button{ + position: absolute; + top: 0.2rem; + right: 2%; + } + } diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue index 0083e22e..e6eb6e6a 100644 --- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue +++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue @@ -1,151 +1,133 @@