From d7d4c01739740ff888159a565cc601cc71723e87 Mon Sep 17 00:00:00 2001 From: liy <1492230202@qq.com> Date: Wed, 3 Jan 2024 00:05:42 +0800 Subject: [PATCH] 1 --- .gitignore | 1 + apis/modules/ly.js | 26 +++++++++++++++++++++++++- pages.json | 31 +++++++++++++++++++++++++++++-- pages/declaration/declaration.vue | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------- pages/declaration/declaration1.vue | 25 +++++++++++++++++++------ pages/declaration/declarationList.vue | 10 +++++++++- pages/declaration/declarationListdetail.vue | 29 +++++++++++++++++++++++++---- pages/declaration/list - 副本.vue | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/declaration/list.vue | 27 ++++++++++++++------------- pages/declaration/newDeclaration.vue | 1031 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/declaration/newDeclarationdetail.vue | 606 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/home/home.vue | 13 +++++++------ pages/map1/home.scss | 45 +++++++++++++++++++++++++++++++++++++++++++++ pages/map1/map - 副本.vue | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/map1/map.vue | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/mapdoorplate/mapdoorplate.vue | 38 ++++++++++++++++++++++++++------------ pages/mapstakeline/mapstakeline.scss | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- pages/mapstakeline/mapstakeline.vue | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------ pages/mapstakelinedetail/addmapstakelinedetail.vue | 693 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/mapstakelinedetail/mapstakelinedetail.vue | 43 +++++++++++++++++++++++++++++++------------ static/imgs/index/icon23.png | Bin 0 -> 3658 bytes static/imgs/index/icon24.png | Bin 0 -> 2143 bytes static/imgs/index/icon25.png | Bin 0 -> 3597 bytes static/imgs/index/icon26.png | Bin 0 -> 2743 bytes static/imgs/index/icon27.png | Bin 0 -> 2040 bytes static/imgs/index/icon28.png | Bin 0 -> 1971 bytes static/imgs/index/icon29.png | Bin 0 -> 1628 bytes static/imgs/index/icon30.png | Bin 0 -> 1848 bytes static/imgs/index/icon31.png | Bin 0 -> 3771 bytes static/imgs/index/icon32.png | Bin 0 -> 2323 bytes static/imgs/index/icon33.png | Bin 0 -> 1491 bytes static/imgs/index/icon34.png | Bin 0 -> 2040 bytes static/xj.png | Bin 0 -> 6212 bytes 33 files changed, 3615 insertions(+), 400 deletions(-) create mode 100644 pages/declaration/list - 副本.vue create mode 100644 pages/declaration/newDeclaration.vue create mode 100644 pages/declaration/newDeclarationdetail.vue create mode 100644 pages/map1/home.scss create mode 100644 pages/map1/map - 副本.vue create mode 100644 pages/mapstakelinedetail/addmapstakelinedetail.vue create mode 100644 static/imgs/index/icon23.png create mode 100644 static/imgs/index/icon24.png create mode 100644 static/imgs/index/icon25.png create mode 100644 static/imgs/index/icon26.png create mode 100644 static/imgs/index/icon27.png create mode 100644 static/imgs/index/icon28.png create mode 100644 static/imgs/index/icon29.png create mode 100644 static/imgs/index/icon30.png create mode 100644 static/imgs/index/icon31.png create mode 100644 static/imgs/index/icon32.png create mode 100644 static/imgs/index/icon33.png create mode 100644 static/imgs/index/icon34.png create mode 100644 static/xj.png diff --git a/.gitignore b/.gitignore index ffed323..ddaf27f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +unpackage/ node_modules/ dist/ uploadfiles/ diff --git a/apis/modules/ly.js b/apis/modules/ly.js index 5b7566a..3dca82d 100644 --- a/apis/modules/ly.js +++ b/apis/modules/ly.js @@ -1,6 +1,30 @@ import request from '../../service/request.js' import utils from '../../service/utils.js' -export default { +export default { + // 修改界桩 + removeplie(data){ + return request.put('/areBoundary/plie',data) + }, + // 添加界桩 + addplie(data){ + return request.post('/areBoundary/plie',data) + }, + // 获取地名类别 + getregional(data){ + return request.get('/arePlaceName/regional/list',data) + }, + // 获取处理地名类别 + gettreeselect(data){ + return request.get('/arePlaceName/regional/treeselect',data) + }, + // 添加国家地理 + toponym(data){ + return request.post('/arePlaceName/toponym',data) + }, + // 获取国家地理 + gettoponym(data){ + return request.get('/arePlaceName/toponym/list',data) + }, // 申报巡检 addpatrol(data){ return request.post('/areBoundary/patrol',data) diff --git a/pages.json b/pages.json index be6a62a..0b67a98 100644 --- a/pages.json +++ b/pages.json @@ -140,12 +140,12 @@ }, { "path": "pages/map1/map", "style": { - "navigationStyle": "custom" + "navigationBarTitleText": "地名查询服务" } }, { "path": "pages/mapstakeline/mapstakeline", "style": { - "navigationStyle": "custom" + "navigationBarTitleText": "界桩界线管护" } }, { "path": "pages/mapstakelinedetail/mapstakelinedetail", @@ -427,6 +427,33 @@ "style": { "navigationStyle": "custom" } + }, + { + "path" : "pages/declaration/newDeclaration", + "style" : + { + "navigationStyle": "custom", + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/declaration/newDeclarationdetail", + "style" : + { + "navigationBarTitleText" : "", + "navigationStyle": "custom", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/mapstakelinedetail/addmapstakelinedetail", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false, + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/declaration/declaration.vue b/pages/declaration/declaration.vue index 464647b..648e18b 100644 --- a/pages/declaration/declaration.vue +++ b/pages/declaration/declaration.vue @@ -19,7 +19,7 @@ 行政区划 - {{community.adminArea?community.adminArea:'请选择'}} + {{community.adminArea?community.adminArea:'请选择'}} @@ -33,7 +33,7 @@ 地名类别 - + {{community.placeNameCategory?community.placeNameCategory:'请选择'}} @@ -48,7 +48,7 @@ 类型 - {{community.types?community.types:'请选择'}} + {{community.types?community.types:'请选择'}} @@ -63,7 +63,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -75,7 +75,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -87,7 +87,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -99,7 +99,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -111,7 +111,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -123,7 +123,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -133,7 +133,7 @@ 详细地址 - {{community.address?community.address:'请选择'}} + {{community.address?community.address:'请选择'}} @@ -143,7 +143,7 @@ 有效起始时间 - {{community.validStartDate?community.validStartDate:'请选择'}} + {{community.validStartDate?community.validStartDate:'请选择'}} @@ -154,7 +154,7 @@ 有效终止日期 - {{community.validEndDate?community.validEndDate:'请选择'}} + {{community.validEndDate?community.validEndDate:'请选择'}} @@ -167,7 +167,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -179,7 +179,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -192,7 +192,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -202,7 +202,7 @@ 设立时间 - {{community.establishTime?community.establishTime:'请选择'}} + {{community.establishTime?community.establishTime:'请选择'}} @@ -216,7 +216,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -229,7 +229,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -242,7 +242,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -254,7 +254,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -267,7 +267,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -281,7 +281,7 @@ 行政区划 - {{street.adminArea?street.adminArea:'请选择'}} + {{street.adminArea?street.adminArea:'请选择'}} @@ -296,7 +296,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -308,7 +308,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -320,7 +320,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -332,7 +332,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -344,7 +344,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -356,7 +356,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -369,7 +369,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -379,7 +379,7 @@ 有效起始时间 - {{street.validStartDate?street.validStartDate:'请选择'}} + {{street.validStartDate?street.validStartDate:'请选择'}} @@ -389,7 +389,7 @@ 有效终止日期 - {{street.validEndDate?street.validEndDate:'请选择'}} + {{street.validEndDate?street.validEndDate:'请选择'}} @@ -399,7 +399,7 @@ 开始位置 - {{street.startLocation?street.startLocation:'请选择'}} + {{street.startLocation?street.startLocation:'请选择'}} @@ -409,7 +409,7 @@ 结束位置 - {{street.endLocation?street.endLocation:'请选择'}} + {{street.endLocation?street.endLocation:'请选择'}} @@ -422,7 +422,7 @@ 行政区划 - {{build.adminArea?build.adminArea:'请选择'}} + {{build.adminArea?build.adminArea:'请选择'}} @@ -437,7 +437,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -449,7 +449,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -461,7 +461,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -473,7 +473,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -483,7 +483,7 @@ 详细地址 - {{build.locationPoint?build.locationPoint:'请选择'}} + {{build.locationPoint?build.locationPoint:'请选择'}} @@ -493,7 +493,7 @@ 有效起始时间 - {{build.validStartDate?build.validStartDate:'请选择'}} + {{build.validStartDate?build.validStartDate:'请选择'}} @@ -503,7 +503,7 @@ 有效终止日期 - {{build.validEndDate?build.validEndDate:'请选择'}} + {{build.validEndDate?build.validEndDate:'请选择'}} @@ -515,7 +515,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -527,7 +527,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -542,7 +542,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -554,7 +554,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -567,7 +567,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -578,7 +578,7 @@ 详细地址 - {{applicatio.address?applicatio.address:'请选择'}} + {{applicatio.address?applicatio.address:'请选择'}} @@ -590,7 +590,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -600,11 +600,39 @@ + 申报类型 + + + {{array4type?array4type:'请选择'}} + + + + + + + + + + + 类型 + + + {{doorplate.cellType?doorplate.cellType:'请选择'}} + + + + + + + + + + 小区名称 + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -616,7 +644,7 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> @@ -629,13 +657,13 @@ + placeholder-style="color: #909090;font-size: 26rpx;" /> - + @@ -648,6 +676,19 @@ + + + + + 资料附件（建筑物平面dwg格式、国土地） + + + + + + + + @@ -686,6 +727,7 @@ applyId: uni.getStorageSync('USERS_KEY').userId, createdUser: uni.getStorageSync('USERS_KEY').userId, communityName: null, //小区名称 + cellType:null,//门牌类型 formerName: null, //曾用名 historicalPlaceNames: null, //历史地名 doorNumberFile: null, //门牌文件 @@ -716,6 +758,7 @@ validEndDate: null, //有效终止日期 locationPoint: null, //地理位置 status: '待审核', //审核状态 + imageData:null }, street: { applyId: uni.getStorageSync('USERS_KEY').userId, @@ -775,6 +818,9 @@ array1: ['农村牧场点', '工矿点', '农村居民点', '城镇居民点'], array2: ['农林牧场', '工矿点', '农村', '城镇'], array3: getApp().globalData.list1, + array4: ['单个申报','批量申报'], + array5: ['临街门牌', '大门牌', '楼栋牌', '单元牌', '户牌'], + array4type:null, }; }, onPageScroll(e) { @@ -793,11 +839,11 @@ } else if (this.OrderType == 2) { this.nvConfig.title = '街路巷申报' } else if (this.OrderType == 3) { - this.nvConfig.title = '高层建筑申报' + this.nvConfig.title = '建筑名称备案' } else if (this.OrderType == 4) { - this.nvConfig.title = '地名申报' + this.nvConfig.title = '地名命名申报' } else if (this.OrderType == 5) { - this.nvConfig.title = '开发商小区门牌号申报' + this.nvConfig.title = '门楼牌需求申报' } }, methods: { @@ -887,8 +933,11 @@ this.street.adminArea = this.array3[e.detail.value] } else if (e1 == 5) { this.build.adminArea = this.array3[e.detail.value] + }else if (e1 == 6) { + this.array4type = this.array4[e.detail.value] + }else if (e1 == 7) { + this.doorplate.cellType = this.array5[e.detail.value] } - console.log(this.community) }, mapdoorplatesuccess() { if (this.OrderType == 1) { @@ -930,6 +979,18 @@ }) return } else if (this.OrderType == 3) { + console.log('this.filelist', this.filelist) + let box1 = '' + for (let i = 0; i < this.filelist.length; i++) { + console.log('this.filelist[i]',this.filelist[i]) + if(i == 0) { + box1 = this.filelist[i].url + } else { + box1 =box1+','+ this.filelist[i].url + } + } + console.log('box1',box1) + this.build.imageData = box1 console.log('this.build', this.build) // return this.API.addbuild(this.build).then(res => { @@ -968,18 +1029,22 @@ }) return } else if (this.OrderType == 5) { - console.log('this.filelist', this.filelist) - let box1 = '' - for (let i = 0; i < this.filelist.length; i++) { - console.log('this.filelist[i]',this.filelist[i]) - if(i == 0) { - box1 = this.filelist[i].url - } else { - box1 =box1+','+ this.filelist[i].url + + if(this.array4type == '批量申报') { + console.log('this.filelist', this.filelist) + let box1 = '' + for (let i = 0; i < this.filelist.length; i++) { + console.log('this.filelist[i]',this.filelist[i]) + if(i == 0) { + box1 = this.filelist[i].url + } else { + box1 =box1+','+ this.filelist[i].url + } } + console.log('box1',box1) + this.doorplate.doorNumberFile = box1 } - console.log('box1',box1) - this.doorplate.doorNumberFile = box1 + // return this.API.adddoorplate(this.doorplate).then(res => { console.log(res); @@ -1033,6 +1098,19 @@ diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue index fced1e3..ef94042 100644 --- a/pages/declaration/list.vue +++ b/pages/declaration/list.vue @@ -2,20 +2,21 @@ - + - + - 居民小区申报 + + 门楼牌需求申报 - + - 街路巷申报 + 地名标志牌需求申报 @@ -23,41 +24,41 @@ - 高层建筑申报 + 建筑名称备案 - + - 地名申报 + 地名命名申报 - + 界桩界线管护 - + - 路门牌上报 + 地名查询服务 diff --git a/pages/declaration/newDeclaration.vue b/pages/declaration/newDeclaration.vue new file mode 100644 index 0000000..090aa29 --- /dev/null +++ b/pages/declaration/newDeclaration.vue @@ -0,0 +1,1031 @@ + + + + + \ No newline at end of file diff --git a/pages/declaration/newDeclarationdetail.vue b/pages/declaration/newDeclarationdetail.vue new file mode 100644 index 0000000..ea5931c --- /dev/null +++ b/pages/declaration/newDeclarationdetail.vue @@ -0,0 +1,606 @@ + + + + + \ No newline at end of file diff --git a/pages/home/home.vue b/pages/home/home.vue index 2b7ebd8..ea878f4 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -31,14 +31,14 @@ 殡葬服务 - + - 路门牌上报 + 地名申报 - + - 地名申报 + 地名查询 @@ -128,7 +128,7 @@ }, toponym() { uni.navigateTo({ - url:"/pages/declaration/declaration?type=4" + url:"/pages/declaration/newDeclaration" }) }, tzyl(){ @@ -139,7 +139,8 @@ }, lmpsb(){ uni.navigateTo({ - url:'/pages/mapdoorplate/mapdoorplate' + // url:'/pages/mapdoorplate/mapdoorplate' + url:'/pages/map1/map' // url: '/pages/receiptRegistration/receiptRegistration' }) }, diff --git a/pages/map1/home.scss b/pages/map1/home.scss new file mode 100644 index 0000000..d615498 --- /dev/null +++ b/pages/map1/home.scss @@ -0,0 +1,45 @@ +.page{ + position: relative; + width: 100%; + overflow: hidden; +} + +.cent { + position: fixed; + bottom: 0; + width: 100%; + .list { + flex-wrap: wrap; + .on { + border: 2rpx solid sandybrown; + border-radius: 18rpx; + } + .item { + width: 20%; + height: 100rpx; + text-align: center; + font-size: 22rpx; + font-weight: 500; + color: #676767; + background: #FFFFFF; + // box-sizing: border-box; + padding: 20rpx 0rpx; + margin-left: 4%; + margin-bottom: 20rpx; + border-radius: 18rpx; + } + } + .list1 { + background: #FFFFFF; + padding: 0 30rpx; + .item { + width: 100%; + align-items: center; + padding: 20rpx 0; + border-top: 2rpx solid #EEEEEE; + font-size: 24rpx; + font-weight: 500; + color: #676767; + } + } +} \ No newline at end of file diff --git a/pages/map1/map - 副本.vue b/pages/map1/map - 副本.vue new file mode 100644 index 0000000..acf68e4 --- /dev/null +++ b/pages/map1/map - 副本.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/pages/map1/map.vue b/pages/map1/map.vue index f4c7233..5c6c926 100644 --- a/pages/map1/map.vue +++ b/pages/map1/map.vue @@ -1,266 +1,355 @@ -