diff --git a/package-lock.json b/package-lock.json index 99ca6aa6..34b82b58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -183,7 +183,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -1346,6 +1345,34 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "dev": true }, + "bmaplib.curveline": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bmaplib.curveline/-/bmaplib.curveline-1.0.0.tgz", + "integrity": "sha512-9wcFMVhiYxNPqpvsLDAADn3qDhNzXp2mA6VyHSHg2XOAgSooC7ZiujdFhy0sp+0QYjTfJ/MjmLuNoUg2HHxH4Q==" + }, + "bmaplib.heatmap": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/bmaplib.heatmap/-/bmaplib.heatmap-1.0.4.tgz", + "integrity": "sha512-rmhqUARBpUSJ9jXzUI2j7dIOqnc38bqubkx/8a349U2qtw/ulLUwyzRD535OrA8G7w5cz4aPKm6/rNvUAarg/Q==" + }, + "bmaplib.lushu": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/bmaplib.lushu/-/bmaplib.lushu-1.0.7.tgz", + "integrity": "sha512-LVvgpESPii6xGxyjnQjq8u+ic4NjvhdCPV/RiSS/PGTUdZKeTDS7prSpleJLZH3ES0+oc0gYn8bw0LtPYUSz2w==" + }, + "bmaplib.markerclusterer": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/bmaplib.markerclusterer/-/bmaplib.markerclusterer-1.0.13.tgz", + "integrity": "sha512-VrLyWSiuDEVNi0yUfwOhFQ6z1oEEHS4w36GNu3iASu6p52QIx9uAXMUkuSCHReNR0bj2Cp9SA1dSx5RpojXajQ==", + "requires": { + "bmaplib.texticonoverlay": "^1.0.2" + } + }, + "bmaplib.texticonoverlay": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bmaplib.texticonoverlay/-/bmaplib.texticonoverlay-1.0.2.tgz", + "integrity": "sha512-4ZTWr4ZP3B6qEWput5Tut16CfZgII38YwM3bpyb4gFTQyORlKYryFp9WHWrwZZaHlOyYDAXG9SX0hka43jTADg==" + }, "bn.js": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", @@ -3557,12 +3584,12 @@ } }, "echarts": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz", - "integrity": "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.3.tgz", + "integrity": "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==", "requires": { "tslib": "2.3.0", - "zrender": "5.2.1" + "zrender": "5.3.2" } }, "ee-first": { @@ -5867,6 +5894,14 @@ "resolved": "https://registry.npmjs.org/lib-flexible/-/lib-flexible-0.3.2.tgz", "integrity": "sha1-BvWnSDIxSi01wSA5vJw8otrqpCY=" }, + "linkify-it": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", + "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", + "requires": { + "uc.micro": "^1.0.1" + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -6044,6 +6079,25 @@ "object-visit": "^1.0.0" } }, + "markdown-it": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", + "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", + "requires": { + "argparse": "^1.0.7", + "entities": "~1.1.1", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "dependencies": { + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + } + } + }, "math-expression-evaluator": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.3.7.tgz", @@ -6073,6 +6127,11 @@ "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", "dev": true }, + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -11210,8 +11269,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { "version": "1.16.1", @@ -11702,6 +11760,11 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" + }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", @@ -12084,6 +12147,18 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz", "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==" }, + "vue-baidu-map": { + "version": "0.21.22", + "resolved": "https://registry.npmjs.org/vue-baidu-map/-/vue-baidu-map-0.21.22.tgz", + "integrity": "sha512-WQMPCih4UTh0AZCKKH/OVOYnyAWjfRNeK6BIeoLmscyY5aF8zzlJhz/NOHLb3mdztIpB0Z6aohn4Jd9mfCSjQw==", + "requires": { + "bmaplib.curveline": "^1.0.0", + "bmaplib.heatmap": "^1.0.4", + "bmaplib.lushu": "^1.0.7", + "bmaplib.markerclusterer": "^1.0.13", + "markdown-it": "^8.4.0" + } + }, "vue-cookies": { "version": "1.7.4", "resolved": "https://registry.npmjs.org/vue-cookies/-/vue-cookies-1.7.4.tgz", @@ -13508,9 +13583,9 @@ } }, "zrender": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz", - "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.2.tgz", + "integrity": "sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==", "requires": { "tslib": "2.3.0" } diff --git a/package.json b/package.json index 7b917c60..61b005ae 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "@vant/area-data": "^1.2.2", "axios": "^0.21.1", - "echarts": "^5.2.2", + "echarts": "^5.3.3", "element-ui": "^2.15.6", "font-awesome": "^4.7.0", "font-awesome.css": "^4.7.2", @@ -28,6 +28,7 @@ "sass-loader": "^6.0.6", "vant": "^2.12.8", "vue": "^2.5.2", + "vue-baidu-map": "^0.21.22", "vue-cookies": "^1.7.4", "vue-esign": "^1.0.5", "vue-router": "^3.0.1", diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index 2938291a..98b58937 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -390,3 +390,321 @@ export function updatePersonal(data) { data: data }) } +// 查询农业执法-监管对象(个体户)列表 +export function listPersonal(query) { + return request({ + url: '/enforce/personal/list', + method: 'get', + params: query + }) +} +// 查询农业执法-监管对象(个体户)详细 +export function getPersonal(id) { + return request({ + url: '/enforce/personal/get/' + id, + method: 'get' + }) +} +// 查询农业执法-监管对象(企业)列表 +export function listCompany(query) { + return request({ + url: '/enforce/company/list', + method: 'get', + params: query + }) +} +// 查询农业执法-监管对象(企业)详细 +export function getCompany(id) { + return request({ + url: '/enforce/company/get/' + id, + method: 'get' + }) +} +// 根据deptId查询所在地区 +export function getDeptName(id) { + return request({ + url: '/system/dept/get/' + id, + method: 'get' + }) +} +// 执法依据列表查询 +export function getNewsList(query) { + return request({ + url: '/enforce/website/newsList', + method: 'get', + params: query + }) +} +// 查询农用品管理列表 +export function listProduct(query) { + return request({ + url: '/enforce/product/list', + method: 'get', + params: query + }) +} +// 查询种子信息列表 +export function listSeed(query) { + return request({ + url: '/enforce/seed/list', + method: 'get', + params: query + }) +} +// 查询肥料信息列表 +export function listFertilizer(query) { + return request({ + url: '/enforce/fertilizer/list', + method: 'get', + params: query + }) +} +// 查询兽药信息列表 +export function listGmp(query) { + return request({ + url: '/enforce/gmp/list', + method: 'get', + params: query + }) +} +// 查询兽药信息列表 +export function listFeed(query) { + return request({ + url: '/enforce/feed/list', + method: 'get', + params: query + }) +} +// 查询农产品信息列表 +export function listAgri(query) { + return request({ + url: '/enforce/agri/list', + method: 'get', + params: query + }) +} +// 执法依据类型 +export function enforceNewsType(query) { + return request({ + url: '/enforce/website/data/type/enforce_news_type/002', + method: 'get', + params: query + }) +} +// 查询案件勘察列表 +export function listSurvey(query) { + return request({ + url: '/enforce/survey/list', + method: 'get', + params: query + }) +} +// 查询执法人员管理列表 +export function listEnforcer(query) { + return request({ + url: '/enforce/enforcer/list', + method: 'get', + params: query + }) +} +// 修改案件勘察 +export function updateSurvey(data) { + return request({ + url: '/enforce/survey/edit', + method: 'post', + data: data + }) +} +// 新增案件勘察 +export function addSurvey(data) { + return request({ + url: '/enforce/survey/add', + method: 'post', + data: data + }) +} +// 案件退回,从勘察退回至登记 +export function returnCase(data) { + return request({ + url: '/enforce/case/returnCase', + method: 'post', + data: data + }) +} + +// 案件退回,从勘察退回至登记 +export function addCase(data) { + return request({ + url: '/enforce/case/add', + method: 'post', + data: data + }) +} +// 新增执法进度历史 +export function addProgress(data) { + return request({ + url: '/enforce/progress/add', + method: 'post', + data: data + }) +} +// 任务查看列表 +export function caseTasklist(query) { + return request({ + url: '/enforce/case/caseTasklist', + method: 'get', + params: query + }) +} +//上传全局方法附件 +export function commonUpload(data) { + return request({ + url: '/common/upload', + method: 'post', + header: { "Content-Type": 'application/x-www-form-urlencoded' }, + data: data + }) +} +// 新增勘察打卡 +export function addClockin(data) { + return request({ + url: '/enforce/clockin/add', + method: 'post', + data: data + }) +} +// 查询勘察打卡列表 +export function clockinList(query) { + return request({ + url: '/enforce/clockin/list', + method: 'get', + params: query + }) +} +// 查询勘察打卡详情 +export function clockinGet(id) { + return request({ + url: '/enforce/clockin/get/'+ id, + method: 'get', + }) +} +// 已上传文件列表查询 +export function attachmentList(query) { + return request({ + url: '/enforce/progress/attachmentList', + method: 'get', + params: query + }) +} +// 各个节点附件上传保存方法 +export function attachmentEdit(data) { + return request({ + url: '/enforce/progress/attachmentEdit', + method: 'post', + data: data + }) +} +// 修改案件登记 +export function updateCase(data) { + return request({ + url: '/enforce/case/edit', + method: 'post', + data: data + }) +} +// 新增农业执法-案件-备案信息 +export function addOnrecord(data) { + return request({ + url: '/enforce/onrecord/add', + method: 'post', + data: data + }) +} +// 新增立案信息 +export function addPutrecord(data) { + return request({ + url: '/enforce/putrecord/add', + method: 'post', + data: data + }) +} + +// 修改立案信息 +export function updatePutrecord(data) { + return request({ + url: '/enforce/putrecord/edit', + method: 'post', + data: data + }) +} + +// 新增抽样信息 +export function addSampling(data) { + return request({ + url: '/enforce/sampling/add', + method: 'post', + data: data + }) +} + +// 修改抽样信息 +export function updateSampling(data) { + return request({ + url: '/enforce/sampling/edit', + method: 'post', + data: data + }) +} + +// 新增农业执法-案件-取证信息 +export function addEvidence(data) { + return request({ + url: '/enforce/evidence/add', + method: 'post', + data: data + }) +} + +// 修改农业执法-案件-取证信息 +export function updateEvidence(data) { + return request({ + url: '/enforce/evidence/edit', + method: 'post', + data: data + }) +} + +// 查询处理流程关联办理人员列表 +export function caseHandlerList(query) { + return request({ + url: '/enforce/caseHandler/caseHandlerList', + method: 'get', + params: query + }) +} + +// 删除案件登记 +export function delCase(id) { + return request({ + url: '/enforce/case/remove/' + id, + method: 'get' + }) +} + +// 执法人员签到次数查询 +export function enforceLockinCount(query) { + return request({ + url: '/enforce/clockin/enforceLockinCount', + method: 'get', + params: query + }) +} + +// 查询案件编号 +export function getCaseNum(query) { + return request({ + url: '/enforce/survey/getCaseNum', + method: 'get', + params: query + }) +} diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js index 5f79538b..e2f3f2f2 100644 --- a/src/api/onlineHome/homestead/circulation.js +++ b/src/api/onlineHome/homestead/circulation.js @@ -32,6 +32,48 @@ export function zjdzd(){ method:'get' }) } +//通过宅基地编码查询宅基地信息 +export function queryGeoZjdzd(query) { + return request({ + url: '/house/lz/queryGeoZjdzd', + method: 'get', + params: query + }) +} + +//宅基地退出申请人信息 +export function getExitProposerDetail() { + return request({ + url: '/house/mobile/exit/proposer', + method: 'get' + }) +} + +// 查询权利人列表 +export function obligeeList(query) { + return request({ + url: '/house/obligee/obligeeHouselist', + method: 'get', + params: query + }) +} + +// 条件查询使用权人列表 +export function selectTHouseBaseObligeeMapList(query) { + return request({ + url: '/house/obligee/selectTHouseBaseObligeeMapList', + method: 'get', + params: query + }) +} + +export function getObligeeList(query) { + return request({ + url: '/house/obligee/selectObligeeListByName', + method: 'get', + params: query + }) +} //权利人代码 export function getByZjddm(data){ @@ -84,3 +126,12 @@ export function getByLyZjddm(data){ method:'get', }) } + +//宅基地使用权流转农户查询 +export function queryHouserBaseNh(query) { + return request({ + url: '/house/lz/queryHouserBaseNh', + method: 'get', + params: query + }) +} diff --git a/src/api/onlineHome/homestead/lzspyj.js b/src/api/onlineHome/homestead/lzspyj.js new file mode 100644 index 00000000..44e160ac --- /dev/null +++ b/src/api/onlineHome/homestead/lzspyj.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询宅基地使用权流转审批列表 +export function listLzspyj(query) { + return request({ + url: '/house/lzspyj/list', + method: 'get', + params: query + }) +} + +// 导出宅基地使用权流转审批 +export function exportLzspyj(query) { + return request({ + url: '/house/lzspyj/export', + method: 'get', + params: query + }) +} + +// 查询宅基地使用权流转审批详细 +export function getLzspyj(id) { + return request({ + url: '/house/lzspyj/get/' + id, + method: 'get' + }) +} + +// 新增宅基地使用权流转审批 +export function addLzspyj(data) { + return request({ + url: '/house/lzspyj/add', + method: 'post', + data: data + }) +} + +// 修改宅基地使用权流转审批 +export function updateLzspyj(data) { + return request({ + url: '/house/lzspyj/edit', + method: 'post', + data: data + }) +} + +// 删除宅基地使用权流转审批 +export function delLzspyj(id) { + return request({ + url: '/house/lzspyj/remove/' + id, + method: 'get' + }) +} + diff --git a/src/api/onlineHome/homestead/paidExit.js b/src/api/onlineHome/homestead/paidExit.js index 5d3624ae..6e7bb1e5 100644 --- a/src/api/onlineHome/homestead/paidExit.js +++ b/src/api/onlineHome/homestead/paidExit.js @@ -44,9 +44,15 @@ export function zyyctcEdit(data){ } //宅基地流转提交 -export function zyyctcApply(id){ +/*export function zyyctcApply(id){ return request({ url:'/house/zyyctc/submitApply/'+id, method:'post', }) +}*/ +export function zyyctcApply(id){ + return request({ + url:'/house/zyyctc/paidExitSubmitApply/'+id, + method:'post', + }) } diff --git a/src/api/onlineHome/phfs/phfs.js b/src/api/onlineHome/phfs/phfs.js new file mode 100644 index 00000000..6bbf54fe --- /dev/null +++ b/src/api/onlineHome/phfs/phfs.js @@ -0,0 +1,71 @@ +import request from '@/utils/request' + +//查询列表 +export function getList(data){ + return request({ + url:'/house/phxxb/list', + method:'get', + params:data + }) + +} +// 宅基地盘活信息统计 +export function utilizeStatistics(query) { + return request({ + url: '/house/phxxb/utilizeStatistics', + method: 'get', + params: query + }) +} + +// 导出宅基地盘活信息 +export function exportPhxxb(query) { + return request({ + url: '/house/phxxb/export', + method: 'get', + params: query + }) +} + +// 查询宅基地盘活信息详细 +export function getPhxxb(id) { + return request({ + url: '/house/phxxb/get/' + id, + method: 'get' + }) +} + +// 新增宅基地盘活信息 +export function addPhxxb(data) { + return request({ + url: '/house/phxxb/add', + method: 'post', + data: data + }) +} + +// 修改宅基地盘活信息 +export function updatePhxxb(data) { + return request({ + url: '/house/phxxb/edit', + method: 'post', + data: data + }) +} + +// 删除宅基地盘活信息 +export function delPhxxb(id) { + return request({ + url: '/house/phxxb/remove/' + id, + method: 'get' + }) +} + +//通过宅基地编码查询宅基地信息 +export function queryGeoZjdzd(query) { + return request({ + url: '/house/lz/queryGeoZjdzd', + method: 'get', + params: query + }) +} diff --git a/src/components/Map/MapGisObtain.vue b/src/components/Map/MapGisObtain.vue new file mode 100644 index 00000000..0ecab3f7 --- /dev/null +++ b/src/components/Map/MapGisObtain.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/components/common/lawNew_footer.vue b/src/components/common/lawNew_footer.vue new file mode 100644 index 00000000..99b2ab73 --- /dev/null +++ b/src/components/common/lawNew_footer.vue @@ -0,0 +1,69 @@ + + + + diff --git a/src/main.js b/src/main.js index 910a616e..87ad471a 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,8 @@ import SearchTree from 'vue-search-tree' import VueHtml5Editor from 'vue-html5-editor' import "font-awesome/css/font-awesome.css" import VueCookies from 'vue-cookies' +//引用百度地图 +import BaiduMap from 'vue-baidu-map' Vue.use(VueCookies); import global from '@/utils/global'; @@ -40,6 +42,10 @@ import Vant from 'vant'; import 'vant/lib/index.css'; Vue.use(Vant) Vue.use(SearchTree) +Vue.use(BaiduMap, { + /* Visit http://lbsyun.baidu.com/apiconsole/key for details about app key. */ + ak: 'XzwOBaO4CElCsPdl8LIFEvv5rTemG6w1' +}) Vue.use(VueHtml5Editor,{ // 全局组件名称,使用new VueHtml5Editor(options)时该选项无效 // global component name diff --git a/src/permission.js b/src/permission.js index 03fd72cc..91ffbd4a 100644 --- a/src/permission.js +++ b/src/permission.js @@ -127,6 +127,7 @@ const whiteList = [ '/sunVillage_info/list_vote', //详情页 '/sunVillage_info/list_vote_detail', //详情页 '/sunVillage_info/list_vote_form', //详情页 + ] router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index edf95bbf..b51ccf90 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -753,6 +753,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitList'], resolve) }, + { + path: '/freeExit', + name: 'freeExit', + meta: { + title: '无偿退出', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitList'], resolve) + }, { path: '/paidExitAdd', name: 'paidExitAdd', @@ -762,6 +771,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitAdd'], resolve) }, + { + path: '/freeExitAdd', + name: 'freeExitAdd', + meta: { + title: '无偿退出', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitAdd'], resolve) + }, { path: '/mortgage', name: 'mortgage', @@ -897,6 +915,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitDetail'], resolve) }, + { + path: '/freeExitDetail', + name: 'freeExitDetail', + meta: { + title: '无偿退出详情', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitDetail'], resolve) + }, { path: '/paidExitModify', name: 'paidExitModify', @@ -906,6 +933,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitModify'], resolve) }, + { + path: '/freeExitModify', + name: 'freeExitModify', + meta: { + title: '无偿退出修改', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitModify'], resolve) + }, { path: '/paidUtilizeList', name: 'paidUtilizeList', @@ -942,6 +978,186 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd'], resolve) }, + { + path: '/zzjyList', + name: 'zzjyList', + meta: { + title: '自主经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyList'], resolve) + }, + { + path: '/zzjyAdd', + name: 'zzjyAdd', + meta: { + title: '添加自主经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyAdd'], resolve) + }, + { + path: '/zzjyDetails', + name: 'zzjyDetails', + meta: { + title: '自主经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyDetails'], resolve) + }, + { + path: '/zzjyModify', + name: 'zzjyModify', + meta: { + title: '修改自主经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyModify'], resolve) + }, + { + path: '/czjyList', + name: 'czjyList', + meta: { + title: '出租经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyList'], resolve) + }, + { + path: '/czjyAdd', + name: 'czjyAdd', + meta: { + title: '添加出租经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyAdd'], resolve) + }, + { + path: '/czjyModify', + name: 'czjyModify', + meta: { + title: '修改出租经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyModify'], resolve) + }, + { + path: '/czjyDetails', + name: 'czjyDetails', + meta: { + title: '出租经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyDetails'], resolve) + }, + { + path: '/rgjyList', + name: 'rgjyList', + meta: { + title: '入股经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyList'], resolve) + }, + { + path: '/rgjyAdd', + name: 'rgjyAdd', + meta: { + title: '添加入股经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyAdd'], resolve) + }, + { + path: '/rgjyModify', + name: 'rgjyModify', + meta: { + title: '修改入股经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyModify'], resolve) + }, + { + path: '/rgjyDetails', + name: 'rgjyDetails', + meta: { + title: '入股经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyDetails'], resolve) + }, + { + path: '/hzjyList', + name: 'hzjyList', + meta: { + title: '合作经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyList'], resolve) + }, + { + path: '/hzjyAdd', + name: 'hzjyAdd', + meta: { + title: '添加合作经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyAdd'], resolve) + }, + { + path: '/hzjyModify', + name: 'hzjyModify', + meta: { + title: '修改合作经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyModify'], resolve) + }, + { + path: '/hzjyDetails', + name: 'hzjyDetails', + meta: { + title: '合作经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyDetails'], resolve) + }, + { + path: '/zzlyList', + name: 'zzlyList', + meta: { + title: '整治利用列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyList'], resolve) + }, + { + path: '/zzlyAdd', + name: 'zzlyAdd', + meta: { + title: '添加整治利用', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyAdd'], resolve) + }, + { + path: '/zzlyModify', + name: 'zzlyModify', + meta: { + title: '修改整治利用', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyModify'], resolve) + }, + { + path: '/zzlyDetails', + name: 'zzlyDetails', + meta: { + title: '整治利用', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyDetails'], resolve) + }, { path: '/task', name: 'task', @@ -2143,15 +2359,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/lawEnforcement/index'], resolve) }, - { - path: '/lawEnforcement/caseList', - name: 'caseList', - meta: { - title: '案件', - hidden: true, - }, - component: (resolve) => require(['@/views/lawEnforcement/case/caseList'], resolve) - }, + // { + // path: '/lawEnforcement/caseList', + // name: 'caseList', + // meta: { + // title: '案件', + // hidden: true, + // }, + // component: (resolve) => require(['@/views/lawEnforcement/case/caseList'], resolve) + // }, { path: '/lawEnforcement/productsList', name: 'caseList', @@ -2795,7 +3011,7 @@ export const constantRoutes = [ path: '/onlineHome/arbitrationList', name: 'arbitrationList', meta: { - title: '纠纷调请', + title: '纠纷调解', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/arbitration/arbitrationList'], resolve) @@ -2804,7 +3020,7 @@ export const constantRoutes = [ path: '/onlineHome/arbitrationDetail', name: 'arbitrationDetail', meta: { - title: '纠纷调请', + title: '纠纷调解', hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/arbitration/arbitrationDetail'], resolve) @@ -3214,6 +3430,449 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/sunVillage_info/index_code_rights'], resolve) + }, + { ////农业综合行政执法公众平台 + path: '/lawEnforcement/index_new', + name: 'lawEnforcementIndexNew', + meta: { + title: '农业综合行政执法公众平台', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/index_new'], resolve) + }, + { ////农业执法(新)-- 案件分配 + path: '/lawEnforcement/caseAllocation', + name: 'lawEnforcementCaseAllocation', + meta: { + title: '案件分配', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAllocation'], resolve) + }, + { ////农业执法(新)-- 历史任务 + path: '/lawEnforcement/caseHistory', + name: 'lawEnforcementCaseHistory', + meta: { + title: '历史任务', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseHistory'], resolve) + }, + { ////农业执法(新)-- 查看登记 + path: '/lawEnforcement/caseDetailNew', + name: 'lawEnforcementCaseDetailNew', + meta: { + title: '查看登记', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseDetail'], resolve) + }, + { ////农业执法(新)-- 分配案件 + path: '/lawEnforcement/caseDistribution', + name: 'lawEnforcementCaseDistribution', + meta: { + title: '分配案件', + hidden: true, + keepAlive: true + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseDistribution'], resolve) + }, + { ////农业执法(新)-- 执行人员 + path: '/lawEnforcement/caseLawEnforcer', + name: 'lawEnforcementCaseLawEnforcer', + meta: { + title: '执行人员', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseLawEnforcer'], resolve) + }, + { ////农业执法(新)-- 退回案件 + path: '/lawEnforcement/caseReturn', + name: 'lawEnforcementCaseReturn', + meta: { + title: '退回案件', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseReturn'], resolve) + }, + { ////农业执法(新)-- 任务查看 + path: '/lawEnforcement/task', + name: 'lawEnforcementTask', + meta: { + title: '任务查看', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/task'], resolve) + }, + { ////农业执法(新)-- 查看登记案件 + path: '/lawEnforcement/taskDetail', + name: 'lawEnforcementTaskDetail', + meta: { + title: '查看登记案件', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskDetail'], resolve) + }, + { ////农业执法(新)-- 执法打卡 + path: '/lawEnforcement/taskSignIn', + name: 'lawEnforcementTaskSignIn', + meta: { + title: '执法打卡', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskSignIn'], resolve) + }, + { ////农业执法(新)-- 签到记录 + path: '/lawEnforcement/taskRecord', + name: 'lawEnforcementTaskRecord', + meta: { + title: '签到记录', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskRecord'], resolve) + }, + { ////农业执法(新)-- 现场检查(勘察)笔录 + path: '/lawEnforcement/record', + name: 'lawEnforcementRecord', + meta: { + title: '现场检查(勘察)笔录', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/record/record'], resolve) + }, + { ////农业执法(新)-- 案件列表 + path: '/lawEnforcement/caseList', + name: 'lawEnforcementCaseList', + meta: { + title: '案件列表', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/record/caseList'], resolve) + }, + { ////农业执法(新)-- 文书打印 + path: '/lawEnforcement/recordDocument', + name: 'lawEnforcementRecordDocument', + meta: { + title: '文书打印', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/record/recordDocument'], resolve) + }, + { ////农业执法(新)-- 案件查询 + path: '/lawEnforcement/caseQuery', + name: 'lawEnforcementCaseQuery', + meta: { + title: '案件查询', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseQuery/caseQuery'], resolve) + }, + { ////农业执法(新)-- 归档详情 + path: '/lawEnforcement/caseQueryDocument', + name: 'lawEnforcementCaseQueryDocument', + meta: { + title: '归档详情', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseQuery/caseQueryDocument'], resolve) + }, + { ////农业执法(新)-- 案件统计 + path: '/lawEnforcement/caseStatistics', + name: 'lawEnforcementCaseStatistics', + meta: { + title: '案件统计', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseStatistics/caseStatistics'], resolve) + }, + { ////农业执法(新)-- 案件分布 + path: '/lawEnforcement/caseDistributionMap', + name: 'lawEnforcementCaseDistributionMap', + meta: { + title: '案件分布', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseDistribution/caseDistribution'], resolve) + }, + { ////农业执法(新)-- 个体商户 + path: '/lawEnforcement/individual', + name: 'lawEnforcementIndividual', + meta: { + title: '个体商户', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/supervise/individual'], resolve) + }, + { ////农业执法(新)-- 查看个体工商户 + path: '/lawEnforcement/individualDetail', + name: 'lawEnforcementIndividualDetail', + meta: { + title: '查看个体工商户', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/supervise/individualDetail'], resolve) + }, + { ////农业执法(新)-- 关联案件 + path: '/lawEnforcement/individualRelation', + name: 'lawEnforcementIndividualRelation', + meta: { + title: '关联案件', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/supervise/individualRelation'], resolve) + }, + { ////农业执法(新)-- 企业商户 + path: '/lawEnforcement/enterprise', + name: 'lawEnforcementEnterprise', + meta: { + title: '企业商户', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/supervise/enterprise'], resolve) + }, + { ////农业执法(新)-- 查看企业商户 + path: '/lawEnforcement/enterpriseDetail', + name: 'lawEnforcementEnterpriseDetail', + meta: { + title: '查看企业商户', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/supervise/enterpriseDetail'], resolve) + }, + { ////农业执法(新)-- 关联案件 + path: '/lawEnforcement/enterpriseRelation', + name: 'lawEnforcementEnterpriseRelation', + meta: { + title: '关联案件', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/supervise/enterpriseRelation'], resolve) + }, + { ////农业执法(新)-- 电子追溯 + path: '/lawEnforcement/retrospect', + name: 'lawEnforcementRetrospect', + meta: { + title: '电子追溯', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/retrospect/retrospect'], resolve) + }, + { ////农业执法(新)-- 执法依据 + path: '/lawEnforcement/basis', + name: 'lawEnforcementBasis', + meta: { + title: '执法依据', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/basis/basis'], resolve) + }, + { ////农业执法(新)-- 执法依据 + path: '/lawEnforcement/basisDetail', + name: 'lawEnforcementBasisDetail', + meta: { + title: '查看执法依据', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/basis/basisDetail'], resolve) + }, + { ////农业执法(新)-- 种子扫描 + path: '/lawEnforcement/retrospectDetail', + name: 'lawEnforcementRetrospectDetail', + meta: { + title: '种子扫描', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/retrospect/retrospectDetail'], resolve) + }, + { ////农业执法(新)-- 我的 + path: '/lawEnforcement/user_new', + name: 'lawEnforcementUserNew', + meta: { + title: '我的', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/userNew/user_new'], resolve) + }, + { ////农业执法(新)-- 修改密码 + path: '/lawEnforcement/changePasswordNew', + name: 'lawEnforcementChangePasswordNew', + meta: { + title: '修改密码', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/userNew/changePassword'], resolve) + }, + { ////农业执法(新)-- 查农药 + path: '/lawEnforcement/pesticides', + name: 'lawEnforcementPesticides', + meta: { + title: '查农药', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/pesticides'], resolve) + }, + { ////农业执法(新)-- 查农药 + path: '/lawEnforcement/pesticidesDetail', + name: 'lawEnforcementPesticidesDetail', + meta: { + title: '查农药', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/pesticidesDetail'], resolve) + }, + { ////农业执法(新)-- 查种子 + path: '/lawEnforcement/seed', + name: 'lawEnforcementSeed', + meta: { + title: '查种子', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/seed'], resolve) + }, + { ////农业执法(新)-- 查种子 + path: '/lawEnforcement/seedDetail', + name: 'lawEnforcementSeedDetail', + meta: { + title: '查种子', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/seedDetail'], resolve) + }, + { ////农业执法(新)-- 查肥料 + path: '/lawEnforcement/fertilizer', + name: 'lawEnforcementFertilizer', + meta: { + title: '查肥料', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/fertilizer'], resolve) + }, + { ////农业执法(新)-- 查肥料 + path: '/lawEnforcement/fertilizerDetail', + name: 'lawEnforcementFertilizerDetail', + meta: { + title: '查肥料', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/fertilizerDetail'], resolve) + }, + { ////农业执法(新)-- 查兽药 + path: '/lawEnforcement/veterinary', + name: 'lawEnforcementVeterinary', + meta: { + title: '查兽药', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/veterinary'], resolve) + }, + { ////农业执法(新)-- 查兽药 + path: '/lawEnforcement/veterinaryDetail', + name: 'lawEnforcementVeterinaryDetail', + meta: { + title: '查兽药', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/veterinaryDetail'], resolve) + }, + { ////农业执法(新)-- 查饲料 + path: '/lawEnforcement/feed', + name: 'lawEnforcementFeed', + meta: { + title: '查饲料', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/feed'], resolve) + }, + { ////农业执法(新)-- 查饲料 + path: '/lawEnforcement/feedDetail', + name: 'lawEnforcementFeedDetail', + meta: { + title: '查饲料', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/feedDetail'], resolve) + }, + { ////农业执法(新)-- 查农产品 + path: '/lawEnforcement/product', + name: 'lawEnforcementProduct', + meta: { + title: '查农产品', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/product'], resolve) + }, + { ////农业执法(新)-- 查农产品 + path: '/lawEnforcement/productDetail', + name: 'lawEnforcementProductDetail', + meta: { + title: '查农产品', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/trace/productDetail'], resolve) + }, + { ////农业执法(新)-- 上传签字文书 + path: '/lawEnforcement/signInRecord', + name: 'lawEnforcementSignInRecord', + meta: { + title: '上传签字文书', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/signInRecord'], resolve) + }, + { ////农业执法(新)-- 巡查登记 + path: '/lawEnforcement/caseAdd', + name: 'lawEnforcementCaseAdd', + meta: { + title: '巡查登记', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAdd'], resolve) + }, + { ////农业执法(新)-- 巡查登记 + path: '/lawEnforcement/caseEdit', + name: 'lawEnforcementCaseEdit', + meta: { + title: '登记修改', + hidden: true + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEdit'], resolve) + }, + { ////农业执法(新)-- 巡查登记列表 + path: '/lawEnforcement/caseListNew', + name: 'lawEnforcementCaseListNew', + meta: { + title: '登记列表', + hidden: true + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseListNew'], resolve) + }, + { ////农业执法(新)-- 记录查看 + path: '/lawEnforcement/taskSignInSee', + name: 'lawEnforcementTaskSignInSee', + meta: { + title: '记录查看', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskSignInSee'], resolve) + }, + { ////农业执法(新)-- 案件处理 + path: '/lawEnforcement/taskHandle', + name: 'lawEnforcementTaskHandle', + meta: { + title: '案件处理', + hidden: true, + keepAlive: true + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskHandle'], resolve) + }, + { ////农业执法(新)-- 案件处理 + path: '/lawEnforcement/caseEnforceList', + name: 'lawEnforcementCaseEnforceList', + meta: { + title: '添加执法人员', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEnforceList'], resolve) } ]; diff --git a/src/views/lawEnforcement/basis/basis.vue b/src/views/lawEnforcement/basis/basis.vue new file mode 100644 index 00000000..9d9a82ee --- /dev/null +++ b/src/views/lawEnforcement/basis/basis.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/src/views/lawEnforcement/basis/basisDetail.vue b/src/views/lawEnforcement/basis/basisDetail.vue new file mode 100644 index 00000000..48d2cc69 --- /dev/null +++ b/src/views/lawEnforcement/basis/basisDetail.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue index 4f3d6150..d0b9bfe3 100644 --- a/src/views/lawEnforcement/case/caseDetail.vue +++ b/src/views/lawEnforcement/case/caseDetail.vue @@ -1,12 +1,17 @@