diff --git a/config/index.js b/config/index.js index 8386f4ae..a73616ff 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - // target: 'http://218.59.175.44:8082/nsgk_test/', // 公网测试环境 + //target: 'http://218.59.175.44:8082/nsgk_test/', // 公网测试环境 // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境 target: 'http://localhost:8080/', //target: 'http://192.168.0.106:8080/', diff --git a/index.html b/index.html index cb89f9a2..e5aa6330 100644 --- a/index.html +++ b/index.html @@ -3,8 +3,10 @@ - + + diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 17c0fee8..07289300 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -449,15 +449,14 @@ export function addMajorevent(data) { export function customSubmitMajorevent(id) { return request({ url: '/yinnong/majorevent/customSubmitNew/' + id, - method: 'post' + method: 'get' }) } // 撤回 -export function updateTYinnongMajoreventFoStatus(data) { +export function updateTYinnongMajoreventFoStatus(id) { return request({ - url: '/yinnong/majorevent/updateTYinnongMajoreventFoStatus', - method: 'post', - data: data + url: '/yinnong/majorevent/updateTYinnongMajoreventFoStatus/' + id, + method: 'get' }) } // 查询重大事项申请详细 diff --git a/src/api/onlineHome/villageAffairs.js b/src/api/onlineHome/villageAffairs.js index 6a31ed94..029b0fde 100644 --- a/src/api/onlineHome/villageAffairs.js +++ b/src/api/onlineHome/villageAffairs.js @@ -19,6 +19,7 @@ export function getVillageAffairs(id) { // 查询地区下的账套列表 export function bookListByDept(deptId, bookType) { + console.log(deptId); return request({ url: '/open/villageAffairs/public/bookList/' + deptId, method: 'get', diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index b7bd6428..c514ba4e 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -279,6 +279,45 @@ export function majorEventPublicList(query) { params: query }) } +// 重要事项公开列表 +export function importantList(query) { + return request({ + url: '/open/villageAffairs/public/importantList', + method: 'get', + params: query + }) +} +// 重要事项公开详情 +export function importantDetail(query) { + return request({ + url: '/open/villageAffairs/public/importantDetail', + method: 'get', + params: query + }) +} +// 重要事项公开新增 +export function subcontractAdd(data) { + return request({ + url: '/subcontract/event/add', + method: 'post', + data: data + }) +} +// 重要事项公开修改 +export function subcontractEdit(data) { + return request({ + url: '/subcontract/event/edit', + method: 'post', + data: data + }) +} +// 重要事项公开删除 +export function subcontractRemove(id) { + return request({ + url: '/subcontract/event/remove/' + id, + method: 'get' + }) +} // 财务公开详情 export function financePublicDetail(query) { return request({ @@ -1219,3 +1258,227 @@ export const assetLiabilityReportByExpTpl = (data) => { params: data }) } + +// 查询四议两公开列表 +export function listOther(query) { + return request({ + url: '/subcontract/other/list', + method: 'get', + params: query + }) +} + +// 查询四议两公开列表 +export function listSiyigongkai(query) { + return request({ + url: '/subcontract/siyigongkai/list', + method: 'get', + params: query + }) +} + +// 查询四议两公开列表 +export function listOtherOpen(query) { + return request({ + url: '/open/villageAffairs/public/otherPublicList', + method: 'get', + params: query + }) +} + +// 查询四议两公开列表 +export function listSiyigongkaiOpen(query) { + return request({ + url: '/open/villageAffairs/public/siyigongkaiList', + method: 'get', + params: query + }) +} + +// 查询四议两公开详细 +export function otherPublicDetailN(id) { + return request({ + url: '/open/villageAffairs/public/otherPublicDetail?id=' + id, + method: 'get' + }) +} + +// 查询四议两公开详细 +export function otherPublicDetailOpen(id) { + return request({ + url: '/open/villageAffairs/public/otherPublicDetail?id=' + id, + method: 'get' + }) +} + +// 查询四议两公开详细 +export function getSiyigongkai(id) { + return request({ + url: '/subcontract/siyigongkai/get/' + id, + method: 'get' + }) +} + +// 查询四议两公开详细 +export function getSiyigongkaiOpen(id, bookId) { + return request({ + url: '/open/villageAffairs/public/siyigongkaiDetail', + method: 'get', + params: { id, bookId } + }) +} + +// 修改四议两公开 +export function updateSiyigongkai(data) { + return request({ + url: '/subcontract/siyigongkai/edit', + method: 'post', + data: data + }) +} + +// 新增四议两公开 +export function addSiyigongkai(data) { + return request({ + url: '/subcontract/siyigongkai/add', + method: 'post', + data: data + }) +} + +// 删除四议两公开 +export function delSiyigongkai(id) { + return request({ + url: '/subcontract/siyigongkai/remove/' + id, + method: 'get' + }) +} + +// 查询四议两公开列表 +export function specialPublicityList(query) { + return request({ + url: '/open/villageAffairs/public/specialPublicityList', + method: 'get', + params: query + }) +} + +// 查询四议两公开列表 +export function specialPublicityDetail(query) { + return request({ + url: '/open/villageAffairs/public/specialPublicityDetail', + method: 'get', + params: query + }) +} +// 查询四议表决详情 +export function specialPublicityVote(query) { + return request({ + url: '/open/villageAffairs/public/specialVote', + method: 'get', + params: query + }) +} +// 新增表决记录 +export function votedetailAdd(data) { + return request({ + url: '/open/villageAffairs/public/votedetailAdd', + method: 'post', + data: data + }) +} + +// 查询四议两公开列表 +export function addReadCount(query) { + return request({ + url: '/open/villageAffairs/public/addReadCount', + method: 'get', + params: query + }) +} + +// 查询四议两公开列表 +export function specialPublicityEdit(data) { + return request({ + url: '/subcontract/publicity/edit', + method: 'post', + data: data + }) +} + +// 查询四议两公开列表 +export function specialPublicityAdd(data) { + return request({ + url: '/subcontract/publicity/add', + method: 'post', + data: data + }) +} + +// 删除四议两公开 +export function specialPublicityRemove(id) { + return request({ + url: '/subcontract/publicity/remove/' + id, + method: 'get' + }) +} + +// 查询四议两公开列表 +export function updateSpecialPublicityCount(query) { + return request({ + url: '/open/villageAffairs/public/updateSpecialPublicityCount', + method: 'get', + params: query + }) +} + +// 收支明细公开 +export function financialPublicDetailReport(query) { + return request({ + url: '/open/finance/financialPublicDetailReport', + method: 'get', + params: query + }) +} + + +// 收支明细公开 +export function jyxzcqkgkList(query) { + return request({ + url: '/open/asset/jyxzcqkgk/list', + method: 'get', + params: query + }) +} + +// 收支明细公开 +export function jyxzyqkgkList(query) { + return request({ + url: '/open/assetresource/jyxzyqkgk/list', + method: 'get', + params: query + }) +} + +export function jyxzcqkgkDetail(id) { + return request({ + url: '/open/asset/jyxzcqkgk/detail/' + id, + method: 'get' + }) +} + +export function jyxzyqkgkDetail(id) { + return request({ + url: '/open/assetresource/jyxzyqkgk/detail/' + id, + method: 'get' + }) +} + +// 收支明细公开 +export function webList(query) { + return request({ + url: '/open/typz/list', + method: 'get', + params: query + }) +} diff --git a/src/api/sunVillage_info/three.js b/src/api/sunVillage_info/three.js new file mode 100644 index 00000000..2299642e --- /dev/null +++ b/src/api/sunVillage_info/three.js @@ -0,0 +1,98 @@ +import request from '@/utils/request' + +// 查询三清台账列表 +export function listThree(query) { + return request({ + url: '/asset/three/list', + method: 'get', + params: query + }) +} + +// 统计查询三清台账列表 +export function statisticThree(query) { + return request({ + url: '/asset/three/statistic', + method: 'get', + params: query + }) +} + +// 导出三清台账 +export function exportThree(query) { + return request({ + url: '/asset/three/export', + method: 'get', + params: query + }) +} + +// 查询三清台账详细 +export function getThree(id) { + return request({ + url: '/asset/three/get/' + id, + method: 'get', + params: arguments[1] || {} + }) +} + +// 新增三清台账 +export function addThree(data) { + return request({ + url: '/asset/three/add', + method: 'post', + data: data + }) +} + +// 修改三清台账 +export function updateThree(data) { + return request({ + url: '/asset/three/edit', + method: 'post', + data: data + }) +} + +// 删除三清台账 +export function delThree(id) { + return request({ + url: '/asset/three/remove/' + id, + method: 'get' + }) +} + +// 清空空间字段 +export function clearThreeGeom(id) { + return request({ + url: '/asset/three/clear/' + id, + method: 'get', + }) +} +//上传全局方法附件 +export function commonAttach(data) { + return request({ + url: '/common/attach', + method: 'post', + header: { "Content-Type": 'application/x-www-form-urlencoded' }, + data: data + }) +} +//查询已上传附件 +export const attachmentList = (data) => { + return request({ + url: '/system/attachment/query', + method: 'get', + params: data + }) +} +//删除已上传附件 +export function systemAttachment(ids) { + if (ids != undefined) { + return request({ + url: '/system/attachment/remove/' + ids, + method: 'get' + }) + } +} + diff --git a/src/assets/images/location/mark.png b/src/assets/images/location/mark.png new file mode 100644 index 00000000..782d405a Binary files /dev/null and b/src/assets/images/location/mark.png differ diff --git a/src/assets/images/sunVillage_info/index_block_28.png b/src/assets/images/sunVillage_info/index_block_28.png new file mode 100644 index 00000000..6127b65a Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_28.png differ diff --git a/src/assets/images/sunVillage_info/index_block_29.png b/src/assets/images/sunVillage_info/index_block_29.png new file mode 100644 index 00000000..0101d46f Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_29.png differ diff --git a/src/assets/images/sunVillage_info/index_block_30.png b/src/assets/images/sunVillage_info/index_block_30.png new file mode 100644 index 00000000..9048e21b Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_30.png differ diff --git a/src/assets/images/sunVillage_info/index_block_31.png b/src/assets/images/sunVillage_info/index_block_31.png new file mode 100644 index 00000000..49a573a0 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_31.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_16.png b/src/assets/images/sunVillage_info/index_code_btn_16.png new file mode 100644 index 00000000..524d5039 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_16.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_17.png b/src/assets/images/sunVillage_info/index_code_btn_17.png new file mode 100644 index 00000000..a61f3b61 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_17.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_18.png b/src/assets/images/sunVillage_info/index_code_btn_18.png new file mode 100644 index 00000000..a286ad9f Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_18.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_19.png b/src/assets/images/sunVillage_info/index_code_btn_19.png new file mode 100644 index 00000000..5f18713d Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_19.png differ diff --git a/src/components/Map/MapGisLine.vue b/src/components/Map/MapGisLine.vue index ce6a8381..c7d47aa2 100644 --- a/src/components/Map/MapGisLine.vue +++ b/src/components/Map/MapGisLine.vue @@ -7,11 +7,12 @@ +       -
备注信息：绿色地块表示该地块，蓝色表示本账套已标记的其他地块
+
备注：绿色地块表示该地块，蓝色表示本账套已标记的其他地块
@@ -31,6 +32,7 @@ export default { uuidMap: this.guidProduct(), drawingPolygonMap: this.guidProduct(), drawingResetMap: this.guidProduct(), + locationMap: this.guidProduct(), mapGeoServerUrl: "", // geoserver地址 villageBorderLayerName: "", // 乡镇边界图层名称 }; @@ -72,6 +74,72 @@ export default { return v.toString(16); }); }, + getCurrentLocation(callback) { + // 1. 首先尝试Android宿主端 + if(window._Native_object) // Android层注入全局对象 + { + console.log('使用Native获取定位'); + let coord = window._Native_object.GetLocation(null); + console.log('Native坐标: ' + coord); + if(coord) + { + let arr = coord.split(','); + let res = { + code: 200, + data: { + lng: arr[0], + lat: arr[1], + }, + }; + callback(res); + return; + } + } + + // 2. 再尝试浏览器 + if (navigator.geolocation) { + console.log('使用浏览器获取定位'); + navigator.geolocation.getCurrentPosition( + (position) => { + const { latitude, longitude } = position.coords; + let res = { + code: 200, + data: { + lng: longitude, + lat: latitude, + }, + }; + callback(res); + }, + (error) => { + console.log('定位失败: ' + error.message); + getQueryLand().then(callback); + }, + { enableHighAccuracy: true, timeout: 5000 } + ); + return; + } + + // 最后使用地区坐标 + console.log('使用地区坐标定位'); + getQueryLand().then(callback); + }, + getDeptLocation(callback) { + getQueryLand().then((response) => { + if (response.code == 200) { + let InsertCode = response.data; + if (InsertCode != null) { + var lat = InsertCode.lat; + var lng = InsertCode.lng; + if(lat !=null && lng !=null && lat !="" && lng !=""){ + callback(response); + return; + } + } + } + this.getCurrentLocation(callback); + }); + }, //地图查看 drawingPaceCountryLine() { //加载地图编辑 @@ -80,6 +148,45 @@ export default { //var hc_land; var draw; // global so we can remove it later var vector_drawing; + + var mark_layer = null; + function addMark(lng, lat) { + if(!mark_layer) + { + mark_layer = new ol.layer.Vector({ + source: new ol.source.Vector(), + }); + map.addLayer(mark_layer); + } + else + mark_layer.getSource().clear(); + + let newFeature = new ol.Feature({ + geometry: new ol.geom.Point(ol.proj.fromLonLat([lng, lat])), //几何信息 + //name: "标注点", + }); + newFeature.setStyle(new ol.style.Style({ + image: new ol.style.Icon({ + //设置图标偏移 + anchor: [0.5, 0.5], + //标注样式的起点位置 + anchorOrigin: "top-right", + //X方向单位：分数 + anchorXUnits: "fraction", + //Y方向单位：像素 + anchorYUnits: "fraction", + //偏移起点位置的方向 + offsetOrigin: "top-right", + //透明度 + opacity: 0.9, + //图片路径 + src: require('../../assets/images/location/mark.png'), + }), + zIndex: 9999, + })); + mark_layer.getSource().addFeature(newFeature); + } + if (that.message != null && that.message != "" && that.message != undefined) { document.getElementById(that.uuidMap).innerHTML = ''; @@ -297,6 +404,27 @@ export default { that.formSubmit(); } }); + $("#" + this.locationMap).click(function () { + that.getCurrentLocation(res => { + if (res.code == 200) { + let lat = res.data.lat; + let lng = res.data.lng; + if(lat && lng){ + Zb = [lng,lat]; + }else { + Zb =[115.452752, 31.789033]; + } + addMark(lng,lat); + map.getView().animate({ + // 只设置需要的属性即可 + center: ol.proj.fromLonLat(Zb), // 中心点 + zoom: 18, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + } + }); + }); } else{ //this.closeMoule = null; document.getElementById(that.uuidMap).innerHTML = ''; @@ -326,7 +454,7 @@ export default { }); //获取坐标是否存在 var Zb; - getQueryLand().then((response) => { + this.getDeptLocation((response) => { if (response.code == 200) { let InsertCode = response.data; if (InsertCode != null) { @@ -442,6 +570,27 @@ export default { //that.closeMoule = null; that.formSubmit(); }); + $("#" + this.locationMap).click(function () { + that.getCurrentLocation(res => { + if (res.code == 200) { + let lat = res.data.lat; + let lng = res.data.lng; + if(lat && lng){ + Zb = [lng,lat]; + }else { + Zb =[115.452752, 31.789033]; + } + addMark(lng,lat); + map.getView().animate({ + // 只设置需要的属性即可 + center: ol.proj.fromLonLat(Zb), // 中心点 + zoom: 18, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + } + }); + }); } }, }, diff --git a/src/components/Map/MapGisTagDTGCopy.vue b/src/components/Map/MapGisTagDTGCopy.vue index 1f8fb1dc..1bb2f217 100644 --- a/src/components/Map/MapGisTagDTGCopy.vue +++ b/src/components/Map/MapGisTagDTGCopy.vue @@ -3,6 +3,7 @@
+       @@ -27,6 +28,7 @@ uuidMap: this.guidProduct(), drawPolygonMap: this.guidProduct(), drawResetMap: this.guidProduct(), + locationMap: this.guidProduct(), mapGeoServerUrl: "", // geoserver地址 villageBorderLayerName: "", // 乡镇边界图层名称 }; @@ -68,6 +70,72 @@ return v.toString(16); }); }, + getCurrentLocation(callback) { + // 1. 首先尝试Android宿主端 + if(window._Native_object) // Android层注入全局对象 + { + console.log('使用Native获取定位'); + let coord = window._Native_object.GetLocation(null); + console.log('Native坐标: ' + coord); + if(coord) + { + let arr = coord.split(','); + let res = { + code: 200, + data: { + lng: arr[0], + lat: arr[1], + }, + }; + callback(res); + return; + } + } + + // 2. 再尝试浏览器 + if (navigator.geolocation) { + console.log('使用浏览器获取定位'); + navigator.geolocation.getCurrentPosition( + (position) => { + const { latitude, longitude } = position.coords; + let res = { + code: 200, + data: { + lng: longitude, + lat: latitude, + }, + }; + callback(res); + }, + (error) => { + console.log('定位失败: ' + error.message); + getQueryLand().then(callback); + }, + { enableHighAccuracy: true, timeout: 5000 } + ); + return; + } + + // 最后使用地区坐标 + console.log('使用地区坐标定位'); + getQueryLand().then(callback); + }, + getDeptLocation(callback) { + getQueryLand().then((response) => { + if (response.code == 200) { + let InsertCode = response.data; + if (InsertCode != null) { + var lat = InsertCode.lat; + var lng = InsertCode.lng; + if(lat !=null && lng !=null && lat !="" && lng !=""){ + callback(response); + return; + } + } + } + this.getCurrentLocation(callback); + }); + }, //地图查看 pointPaceCountryDarw() { //加载地图编辑 @@ -76,6 +144,45 @@ //var hc_land; var draw; // global so we can remove it later var vector_drawing; + + var mark_layer = null; + function addMark(lng, lat) { + if(!mark_layer) + { + mark_layer = new ol.layer.Vector({ + source: new ol.source.Vector(), + }); + map.addLayer(mark_layer); + } + else + mark_layer.getSource().clear(); + + let newFeature = new ol.Feature({ + geometry: new ol.geom.Point(ol.proj.fromLonLat([lng, lat])), //几何信息 + //name: "标注点", + }); + newFeature.setStyle(new ol.style.Style({ + image: new ol.style.Icon({ + //设置图标偏移 + anchor: [0.5, 0.5], + //标注样式的起点位置 + anchorOrigin: "top-right", + //X方向单位：分数 + anchorXUnits: "fraction", + //Y方向单位：像素 + anchorYUnits: "fraction", + //偏移起点位置的方向 + offsetOrigin: "top-right", + //透明度 + opacity: 0.9, + //图片路径 + src: require('../../assets/images/location/mark.png'), + }), + zIndex: 9999, + })); + mark_layer.getSource().addFeature(newFeature); + } + //矢量标注样式设置函数，设置image为图标ol.style.Icon function createLabelStyle() { return new ol.style.Style({ @@ -337,6 +444,27 @@ that.formSubmit(); } }); + $("#" + this.locationMap).click(function () { + that.getCurrentLocation(res => { + if (res.code == 200) { + let lat = res.data.lat; + let lng = res.data.lng; + if(lat && lng){ + Zb = [lng,lat]; + }else { + Zb =[115.452752, 31.789033]; + } + addMark(lng,lat); + map.getView().animate({ + // 只设置需要的属性即可 + center: ol.proj.fromLonLat(Zb), // 中心点 + zoom: 18, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + } + }); + }); } else{ this.closeMoule = null; @@ -368,7 +496,7 @@ //获取坐标是否存在 var Zb; //开始定位当前位置 - getQueryLand().then(res => { + this.getDeptLocation(res => { if (res.code == 200) { let lat = res.data.lat; let lng = res.data.lng; @@ -519,6 +647,27 @@ that.closeMoule = null; that.formSubmit(); }); + $("#" + this.locationMap).click(function () { + that.getCurrentLocation(res => { + if (res.code == 200) { + let lat = res.data.lat; + let lng = res.data.lng; + if(lat && lng){ + Zb = [lng,lat]; + }else { + Zb =[115.452752, 31.789033]; + } + addMark(lng,lat); + map.getView().animate({ + // 只设置需要的属性即可 + center: ol.proj.fromLonLat(Zb), // 中心点 + zoom: 18, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + } + }); + }); } }, }, diff --git a/src/components/common/Selector.vue b/src/components/common/Selector.vue new file mode 100644 index 00000000..5bd960ef --- /dev/null +++ b/src/components/common/Selector.vue @@ -0,0 +1,219 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index e4e1f466..f9cdb611 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,6 +36,7 @@ const whiteList = [ '/project', '/policy', '/policyDetail', + '/policyPDF', '/attestationDetail', '/noticeDetail', '/homestead/login', @@ -143,6 +144,19 @@ const whiteList = [ '/sunVillage_info/assetMapOpen', '/sunVillage_info/otherOpenVisitIndex', '/sunVillage_info/otherOpenVisitDetail', + '/sunVillage_info/list_discussions_new', + '/sunVillage_info/list_discussions_new_detail', + '/sunVillage_info/list_process', + '/sunVillage_info/list_process_detail', + '/sunVillage_info/list_issues_zy', + '/sunVillage_info/list_issues_zy_detail', + '/sunVillage_info/list_special', + '/sunVillage_info/list_special_detail', + '/sunVillage_info/list_special_detail_vote', + '/sunVillage_info/special_vote', + '/sunVillage_info/special_vote_detail', + '/sunVillage_info/list_finance_new', + '/sunVillage_info/list_finance_new_detail', // 新型经营主体 'newBusinessEntity/newsBulletin', //新闻公告 @@ -202,6 +216,16 @@ const whiteList = [ '/sunVillage_info/financeOpen', //村民主页 + '/sunVillage_info/login_code_new', //村民登录 + '/sunVillage_info/index_code_rights_new', //村民登录 + '/sunVillage_info/list_revenueAndExpenditure', //村民登录 + '/sunVillage_info/list_operatingAssets', //村民登录 + '/sunVillage_info/list_operatingAssets_detail', //村民登录 + '/sunVillage_info/list_operatingAssets_detail2', //村民登录 + '/sunVillage_info/otherOpenVisitIndexNew', //村民登录 + '/sunVillage_info/otherOpenVisitDetailNew', //村民登录 + + //承包地确权 '/contracted/login',//登录 '/contracted/index',//首页 diff --git a/src/router/index.js b/src/router/index.js index b7cb80c5..404adf9e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -407,6 +407,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/policy/policyDetail'], resolve) }, + { + path: '/policyPDF', + name: 'policyPDF', + meta: { + title: '文件预览', + hidden: true, + }, + component: (resolve) => require(['@/views/policy/policyPDF'], resolve) + }, { path: '/interactionAdd', name: 'interactionAddCJ', @@ -3416,6 +3425,123 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_contract'], resolve) }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_process', + name: 'sunVillageInfoListProcess', + meta: { + title: '实施过程公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_process'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_process_detail', + name: 'sunVillageInfoListProcessDetail', + meta: { + title: '实施过程公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_process_detail'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_discussions_new', + name: 'sunVillageInfoListDiscussions', + meta: { + title: '四议两公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_discussions_new'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_discussions_new_detail', + name: 'sunVillageInfoListDiscussionsDetail', + meta: { + title: '四议两公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_discussions_new_detail'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_discussions_new_edit', + name: 'sunVillageInfoListDiscussionsEdit', + meta: { + title: '四议两公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_discussions_new_edit'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_discussions_new_add', + name: 'sunVillageInfoListDiscussionsAdd', + meta: { + title: '四议两公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_discussions_new_add'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_special', + name: 'sunVillageInfoListSpecial', + meta: { + title: '专项公示', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_special'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_special_add', + name: 'sunVillageInfoListSpecialAdd', + meta: { + title: '专项公示', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_special_add'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_special_detail', + name: 'sunVillageInfoListSpecialDetail', + meta: { + title: '专项公示', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_special_detail'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_special_detail_vote', + name: 'sunVillageInfoListSpecialDetailVote', + meta: { + title: '专项公示', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_special_detail_vote'], resolve) + }, + { ////阳光村务（新）-- 四议两公开 + path: '/sunVillage_info/list_special_edit', + name: 'sunVillageInfoListSpecialEdit', + meta: { + title: '专项公示', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_special_edit'], resolve) + }, + { ////阳光村务（新）-- 四议表决 + path: '/sunVillage_info/special_vote', + name: 'sunVillageInfoSpecialVote', + meta: { + title: '四议表决', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/special_vote'], resolve) + }, + { ////阳光村务（新）-- 四议表决 + path: '/sunVillage_info/special_vote_detail', + name: 'sunVillageInfoSpecialVoteDetail', + meta: { + title: '四议表决', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/special_vote_detail'], resolve) + }, { ////阳光村务（新）-- 一张图公开 path: '/sunVillage_info/list_contract_detail', name: 'sunVillageInfoListContractDetail', @@ -3633,6 +3759,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_finance_edit'], resolve) }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_finance_new', + name: 'sunVillageInfoListFinanceNew', + meta: { + title: '财务公开榜', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_new'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_finance_new_add', + name: 'sunVillageInfoListFinanceAddNew', + meta: { + title: '新增财务公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_new_add'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_finance_new_detail', + name: 'sunVillageInfoListFinanceDetailNew', + meta: { + title: '查看财务公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_new_detail'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_finance_new_edit', + name: 'sunVillageInfoListFinanceEditNew', + meta: { + title: '修改财务公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_new_edit'], resolve) + }, { ////阳光村务（新）-- 合同信息 path: '/sunVillage_info/list_tourists_edit', name: 'sunVillageInfoListTouristsEdit', @@ -3678,6 +3840,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_issues_edit'], resolve) }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_issues_zy', + name: 'sunVillageInfoListIssuesZy', + meta: { + title: '重要事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_zy'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_issues_zy_add', + name: 'sunVillageInfoListIssuesAddZy', + meta: { + title: '新增重要事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_zy_add'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_issues_zy_detail', + name: 'sunVillageInfoListIssuesDetailZy', + meta: { + title: '查看重要事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_zy_detail'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_issues_zy_edit', + name: 'sunVillageInfoListIssuesEditZy', + meta: { + title: '修改重要事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_zy_edit'], resolve) + }, { ////阳光村务（新）-- 零工公开榜 path: '/sunVillage_info/list_tourists_ranking', name: 'sunVillageInfoListTouristsRanking', @@ -3849,6 +4047,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenVisitDetail'], resolve) }, + { ////阳光村务（新）-- 综合公开 游客 + path: '/sunVillage_info/otherOpenVisitIndexNew', + name: 'otherOpenVisitIndexNew', + meta: { + title: '综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpenNew/otherOpenVisitList'], resolve) + }, + { ////阳光村务（新）-- 综合公开详情 游客 + path: '/sunVillage_info/otherOpenVisitDetailNew', + name: 'otherOpenVisitDetailNew', + meta: { + title: '综合公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpenNew/otherOpenVisitDetail'], resolve) + }, { ////阳光村务（新）-- 发包方审核 path: '/sunVillage_info/list_employer_process', @@ -4516,6 +4732,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/resourceDetail'], resolve) }, + { ////阳光村务（新）-- 三清台账管理 + path: '/sunVillage_info/three', + name: 'sunVillageInfoListThree', + meta: { + title: '三清台账管理', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/three'], resolve) + }, + { ////阳光村务（新）-- 新增三清台账 + path: '/sunVillage_info/threeAdd', + name: 'sunVillageInfoListThreeAdd', + meta: { + title: '新增三清台账', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/threeAdd'], resolve) + }, + { ////阳光村务（新）-- 修改三清台账 + path: '/sunVillage_info/threeEdit', + name: 'sunVillageInfoListThreeEdit', + meta: { + title: '修改三清台账', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/threeEdit'], resolve) + }, + { ////阳光村务（新）-- 三清台账详情 + path: '/sunVillage_info/threeDetail', + name: 'sunVillageInfoListThreeDetail', + meta: { + title: '三清台账详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/threeDetail'], resolve) + }, { ////阳光村务（新）-- 修改资源 path: '/sunVillage_info/detailed_liabilities', name: 'sunVillageInfoDetailedLiabilities', @@ -6252,6 +6504,60 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/pest/temperatureAndHumidity/temperatureAndHumidity'], resolve) }, + { // 阳光村务（一村一码）-- 村民登录 + path: '/sunVillage_info/login_code_new', + name: 'sunVillageInfoCodeLoginNew', + meta: { + title: '登录', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/login_code_new'], resolve) + }, + { // 阳光村务（一村一码）-- 村民登录 + path: '/sunVillage_info/index_code_rights_new', + name: 'sunVillageInfoCodeRightsNew', + meta: { + title: '首页', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/index_code_rights_new'], resolve) + }, + { // 阳光村务（一村一码）-- 村民登录 + path: '/sunVillage_info/list_revenueAndExpenditure', + name: 'sunVillageInfoRevenueAndExpendituresNew', + meta: { + title: '收支明细公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_revenueAndExpenditure'], resolve) + }, + { // 阳光村务（一村一码）-- 村民登录 + path: '/sunVillage_info/list_operatingAssets', + name: 'sunVillageInfoOperatingAssets', + meta: { + title: '经营性资产情况公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_operatingAssets'], resolve) + }, + { // 阳光村务（一村一码）-- 村民登录 + path: '/sunVillage_info/list_operatingAssets_detail', + name: 'sunVillageInfoOperatingAssetsDetail', + meta: { + title: '经营性资产情况公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_operatingAssets_detail'], resolve) + }, + { // 阳光村务（一村一码）-- 村民登录 + path: '/sunVillage_info/list_operatingAssets_detail2', + name: 'sunVillageInfoOperatingAssetsDetail2', + meta: { + title: '经营性资产情况公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_operatingAssets_detail2'], resolve) + }, { // 阳光村务（一村一码）-- 村民登录 path: '/sunVillage_info/login_farmer', name: 'sunVillageInfoFarmerLogin', diff --git a/src/views/policy/policyDetail.vue b/src/views/policy/policyDetail.vue index 724fc4a0..b16ca6de 100644 --- a/src/views/policy/policyDetail.vue +++ b/src/views/policy/policyDetail.vue @@ -11,7 +11,7 @@
附件 - + diff --git a/src/views/sunVillage_info/special_vote_detail.vue b/src/views/sunVillage_info/special_vote_detail.vue new file mode 100644 index 00000000..4db6f015 --- /dev/null +++ b/src/views/sunVillage_info/special_vote_detail.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/src/views/sunVillage_info/three.vue b/src/views/sunVillage_info/three.vue new file mode 100644 index 00000000..c8e1cd5b --- /dev/null +++ b/src/views/sunVillage_info/three.vue @@ -0,0 +1,553 @@ + + + diff --git a/src/views/sunVillage_info/threeAdd.vue b/src/views/sunVillage_info/threeAdd.vue new file mode 100644 index 00000000..909c2872 --- /dev/null +++ b/src/views/sunVillage_info/threeAdd.vue @@ -0,0 +1,417 @@ + + + diff --git a/src/views/sunVillage_info/threeDetail.vue b/src/views/sunVillage_info/threeDetail.vue new file mode 100644 index 00000000..f58ceed9 --- /dev/null +++ b/src/views/sunVillage_info/threeDetail.vue @@ -0,0 +1,392 @@ + + + diff --git a/src/views/sunVillage_info/threeEdit.vue b/src/views/sunVillage_info/threeEdit.vue new file mode 100644 index 00000000..82e37566 --- /dev/null +++ b/src/views/sunVillage_info/threeEdit.vue @@ -0,0 +1,464 @@ + + + diff --git a/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue b/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue index 4487b13c..5a5a75be 100644 --- a/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue +++ b/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue @@ -1,44 +1,53 @@