From 9e2e0fa9fbae049be48befe719c29ea260ae3af9 Mon Sep 17 00:00:00 2001
From: liy <1492230202@qq.com>
Date: Tue, 9 Jan 2024 03:56:41 +0800
Subject: [PATCH] 1

---
 apis/modules/ly.js                                 |   8 ++++++--
 pages/declaration/declaration.vue                  |  10 +++++-----
 pages/declaration/declarationListdetail.vue        |   4 ++--
 pages/declaration/list.vue                         |   2 +-
 pages/declaration/newDeclaration.vue               | 420 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 pages/mapstakelinedetail/addmapstakelinedetail.vue |  36 ++++++++++++++++++++----------------
 pages/mapstakelinedetail/mapstakelinedetail.vue    |  11 ++++++-----
 7 files changed, 448 insertions(+), 43 deletions(-)

diff --git a/apis/modules/ly.js b/apis/modules/ly.js
index 3dca82d..b13e617 100644
--- a/apis/modules/ly.js
+++ b/apis/modules/ly.js
@@ -1,9 +1,13 @@
 import request from '../../service/request.js'
 import utils from '../../service/utils.js'
 export default {	
+	// 获取详情界桩
+	getariesInfo(data){
+		return request.get('/areBoundary/ariesInfo/'+data)
+	},
 	// 修改界桩
 	removeplie(data){
-		return request.put('/areBoundary/plie',data)
+		return request.put('/areBoundary/ariesInfo',data)
 	},
 	// 添加界桩
 	addplie(data){
@@ -43,7 +47,7 @@ export default {
 	},
 	// 行政区
 	getplie(data){
-		return request.get('/areBoundary/plie/list',data)
+		return request.get('/areBoundary/ariesInfo/list',data)
 	},
 	// 申报小区门牌
 	adddoorplate(data){
diff --git a/pages/declaration/declaration.vue b/pages/declaration/declaration.vue
index 648e18b..936773f 100644
--- a/pages/declaration/declaration.vue
+++ b/pages/declaration/declaration.vue
@@ -617,7 +617,7 @@
 								<view class="serve-title">类型</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,7)" :value="index" :range="array5">
-										<view :class="doorplate.cellType?'uni-input1':'uni-input2'">{{doorplate.cellType?doorplate.cellType:'请选择'}}
+										<view :class="doorplate.gridman?'uni-input1':'uni-input2'">{{doorplate.gridman?doorplate.gridman:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -640,7 +640,7 @@
 					<view class="info-box">
 						<view class="info-box-list">
 							<view class="serve">
-								<view class="serve-title">曾用名</view>
+								<view class="serve-title">门牌号</view>
 								<view>
 									<input id="formerName" @input="oninput4" v-module="doorplate.formerName"
 										placeholder="请输入" style="text-align: right;"
@@ -652,7 +652,7 @@
 					<view class="info-box">
 						<view class="info-box-list">
 							<view class="serve">
-								<view class="serve-title">历史地名</view>
+								<view class="serve-title">门牌地址</view>
 								<view>
 									<input id="historicalPlaceNames" @input="oninput4"
 										v-module="doorplate.historicalPlaceNames" placeholder="请输入"
@@ -727,7 +727,7 @@
 					applyId: uni.getStorageSync('USERS_KEY').userId,
 					createdUser: uni.getStorageSync('USERS_KEY').userId,
 					communityName: null, //小区名称
-					cellType:null,//门牌类型
+					gridman:null,//门牌类型
 					formerName: null, //曾用名
 					historicalPlaceNames: null, //历史地名
 					doorNumberFile: null, //门牌文件
@@ -936,7 +936,7 @@
 				}else if (e1 == 6) {
 					this.array4type = this.array4[e.detail.value]
 				}else if (e1 == 7) {
-					this.doorplate.cellType = this.array5[e.detail.value]
+					this.doorplate.gridman = this.array5[e.detail.value]
 				}
 			},
 			mapdoorplatesuccess() {
diff --git a/pages/declaration/declarationListdetail.vue b/pages/declaration/declarationListdetail.vue
index 05a4e3a..1649df2 100644
--- a/pages/declaration/declarationListdetail.vue
+++ b/pages/declaration/declarationListdetail.vue
@@ -363,9 +363,9 @@
 									{{info.historicalPlaceNames?info.historicalPlaceNames:'-'}}</view>
 								<view class="info-box-small">历史地名</view>
 							</view>
-							<view class="info-box-width" style="width: 100%;" v-if="info.cellType">
+							<view class="info-box-width" style="width: 100%;" v-if="info.gridman">
 								<view class="info-box-overflow">
-									{{info.cellType?info.cellType:'-'}}</view>
+									{{info.gridman?info.gridman:'-'}}</view>
 								<view class="info-box-small">类型</view>
 							</view>
 						</view>
diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue
index 7b264b7..1f7c392 100644
--- a/pages/declaration/list.vue
+++ b/pages/declaration/list.vue
@@ -41,7 +41,7 @@
 					<image style="height: 120rpx;width: 100%;" src="/static/new/3.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					界桩界线管护
+					界桩管护
 				</view>
 			</view>
 			<view @click="gopath('/pages/map1/map')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
diff --git a/pages/declaration/newDeclaration.vue b/pages/declaration/newDeclaration.vue
index 090aa29..93f2912 100644
--- a/pages/declaration/newDeclaration.vue
+++ b/pages/declaration/newDeclaration.vue
@@ -270,6 +270,34 @@
 								</view>
 							</view>
 						</view>
+						<view class="info-box" v-else-if="item.type == '9'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange3(e,index,'array6')" :range="array6">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '10'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange3(e,index,'array7')" :range="array7">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 <!-- 				<view class="message-list">
@@ -318,6 +346,8 @@
 				array2: ['可公开', '不宜公开','大洋怪重', '不属于地名'],
 				array4: ['现今地名', '历史地名','本地名删除'],
 				array5: ['冷泉', '热泉'],
+				array6: ['冷泉', '热泉'],
+				array7: ['冷泉', '热泉'],
 				time: null,
 				array3: getApp().globalData.list1,
 				BASE_URL,
@@ -632,12 +662,35 @@
 			},
 			bindPickerChange2: function(e, e1) {
 				console.log('picker发送选择改变，携带值为', e, e1,this.array1)
-				let box1 = this.array1[0]
-				let box2 = this.array1[1]
-				let box3 = this.array1[2]
-				let box4 = this.array1[3]
-				this.textlist[e1].cent = box4[e.detail.value[3]]?box4[e.detail.value[3]].name:box3[e.detail.value[2]]?box3[e.detail.value[2]].name:box2[e.detail.value[1]]?box2[e.detail.value[1]].name:box1[e.detail.value[0]].name
-				if(this.textlist[e1].cent == '泉') {
+				let text = ''
+				// for (let i = 0; i < this.array1.length; i++) {
+					
+				// 	if(i == 0) {
+				// 		text = this.array1[i]
+				// 	} else {
+				// 		text =text +'/'+ this.array1[i]
+				// 	}
+				// }
+				let box1 = this.array1[0][e.detail.value[0]]?this.array1[0][e.detail.value[0]].name:null
+				let box2 = this.array1[1][e.detail.value[1]]?this.array1[1][e.detail.value[1]].name:null
+				let box3 = this.array1[2][e.detail.value[2]]?this.array1[2][e.detail.value[2]].name:null
+				let box4 = this.array1[3][e.detail.value[3]]?this.array1[3][e.detail.value[3]].name:null
+				if(box1) {
+					text = box1
+				}
+				if(box2) {
+					text = text+'/'+ box2
+				}
+				if(box3) {
+					text = text+'/'+ box3
+				}
+				if(box4) {
+					text = text+'/'+ box4
+				}
+				console.log(box1,box2,box3,box4,text)
+				this.textlist[e1].cent = text
+				// this.textlist[e1].cent = box4[e.detail.value[3]]?box4[e.detail.value[3]].name:box3[e.detail.value[2]]?box3[e.detail.value[2]].name:box2[e.detail.value[1]]?box2[e.detail.value[1]].name:box1[e.detail.value[0]].name
+				if(text == '陆地水系/泉') {
 					this.array5 = ['冷泉', '热泉']
 					this.newtextlist = [
 						{
@@ -690,7 +743,7 @@
 							from:'name6'
 						},
 					]
-				} else if(this.textlist[e1].cent == '瀑布') {
+				} else if(text == '陆地水系/瀑布') {
 					this.newtextlist = [
 						{
 							name: '最大落差(米)',
@@ -721,12 +774,355 @@
 							from:'name0'
 						},
 					]
-				}else if(this.textlist[e1].cent == '') {
-					
-				}else if(this.textlist[e1].cent == '') {
-					
+				}else if(text == '陆地水系/湖泊') {
+					this.array5 = ['常年湖', '时令湖']
+					this.array6 = ['淡水湖', '咸水湖']
+					this.newtextlist = [
+						{
+							name: '类型1',
+							type: '8',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '类型2',
+							type: '9',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '面(平方干米)',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '最大长度(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '最大宽度(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '平均水深(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '最大水深(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '主要水源',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/冰川') {
+					this.newtextlist = [
+						{
+							name: '面积(平方千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '长度(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '宽度(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '冰层厚度(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '海拔(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '所属山系',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/河流/河源') {
+					this.newtextlist = []
+				}else if(text == '陆地水系/河流/峡谷') {
+					this.newtextlist = [
+						{
+							name: '长度(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '宽度(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '走向',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '所属山系',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '起点名',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '止点名',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '河流名',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/河流/河滩') {
+					this.newtextlist = [
+						{
+							name: '面积(平方千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/河流/阶地') {
+					this.newtextlist = [
+						{
+							name: '高度(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '阶地级数',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '陡坎角度',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '所属河流',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/河流/河湾') {
+					this.newtextlist = [
+						{
+							name: '所在河流',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						}
+					]
+				}else if(text == '陆地水系/河流/河口') {
+					this.array5 = ['滨海', '滨湖','滨河']
+					this.newtextlist = [
+						{
+							name: '类型',
+							type: '8',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/河流/三角洲') {
+					this.array5 = ['滨海', '滨湖','滨河']
+					this.newtextlist = [
+						{
+							name: '类型',
+							type: '8',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '面积(平方千米)',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '海拔(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/河流/本级') {
+					this.array5 = ['内流河', '外流河']
+					this.array6 = ['地上河', '地下河']
+					this.array7 = ['常年河', '季节河']
+					this.newtextlist = [
+						{
+							name: '长度(千米)',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '流域面积(平方千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '主要支流',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '河流级别',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '河流类别1',
+							type: '8',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '河流类别2',
+							type: '9',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '河流类别3',
+							type: '10',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '主要水文站',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '径流量(立方米/秒)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(text == '陆地水系/陆地岛屿/矶' || text == '陆地水系/陆地岛屿/湖岛' || text == '陆地水系/陆地岛屿/洲河岛') {
+					this.array5 = ['基岩', '冲洪积']
+					this.newtextlist = [
+						{
+							name: '类型',
+							type: '8',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '面积(平方千米)',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '近陆距离(千米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '植被覆盖率(%)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
 				}
-				
 				this.newtextlist.push(
 					{
 						name: '所在(跨) 行政区',
diff --git a/pages/mapstakelinedetail/addmapstakelinedetail.vue b/pages/mapstakelinedetail/addmapstakelinedetail.vue
index 06c3fb8..213be7e 100644
--- a/pages/mapstakelinedetail/addmapstakelinedetail.vue
+++ b/pages/mapstakelinedetail/addmapstakelinedetail.vue
@@ -232,13 +232,7 @@
 					},
 				},
 				lbbox: [],
-				textlist: [{
-						name: '界线名称',
-						type: '1',
-						isbx: false,
-						cent: '',
-						from: 'boundaryName'
-					},
+				textlist: [
 					{
 						name: '界桩编号',
 						type: '1',
@@ -299,10 +293,16 @@
 				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
 			}
 		},
-		onLoad(params) {
-			let from = params.cent?JSON.parse(params.cent):''
-			console.log(from)
-			this.from = params.cent?JSON.parse(params.cent):''
+		async onLoad(params) {
+			
+			let from1 = params.cent?JSON.parse(params.cent):''
+			console.log(from1)
+			let from = null
+			await this.API.getariesInfo(from1.id).then(res => {
+				console.log(res);
+				from = res.data
+			})
+			this.from = from
 			if(from) {
 				for (let i = 0; i < this.textlist.length; i++) {
 					if(this.textlist[i].from == 'location') {
@@ -313,11 +313,15 @@
 						this.textlist[i].cent = from[this.textlist[i].from]
 					}
 				}
-				this.fileList.push({
-					name: from.imageInfo,
-					fileId: from.imageInfo,
-					url: this.BASE_URL + from.imageInfo
-				})
+					
+				if(from.imageInfo) {
+					this.fileList.push({
+						name: from.imageInfo,
+						fileId: from.imageInfo,
+						url: this.BASE_URL +from.imageInfo
+					})
+				}
+				
 			}
 		},
 		methods: {
diff --git a/pages/mapstakelinedetail/mapstakelinedetail.vue b/pages/mapstakelinedetail/mapstakelinedetail.vue
index 2639221..6742085 100644
--- a/pages/mapstakelinedetail/mapstakelinedetail.vue
+++ b/pages/mapstakelinedetail/mapstakelinedetail.vue
@@ -24,9 +24,13 @@
 								<view class="info-box-small">界桩编号</view>
 							</view>
 							<view class="info-box-width">
+								<view>{{info.enteredUser?info.enteredUser:'-'}}</view>
+								<view class="info-box-small">录入人姓名</view>
+							</view>
+					<!-- 		<view class="info-box-width">
 								<view>{{info.boundaryName || '-'}}</view>
 								<view class="info-box-small">界线名称</view>
-							</view>
+							</view> -->
 				<!-- 			<view class="info-box-width">
 								<view>北纬{{info.latitude}}，东经{{info.longitude}}</view>
 								<view class="info-box-small">经纬度</view>
@@ -67,10 +71,7 @@
 								<view>{{info.enteredTime?info.enteredTime:'-'}}</view>
 								<view class="info-box-small">设立时间</view>
 							</view>
-							<view class="info-box-width">
-								<view>{{info.enteredUser?info.enteredUser:'-'}}</view>
-								<view class="info-box-small">录入人姓名</view>
-							</view>
+
 						</view>
 						<view class="info-box-list" v-if="info.imageInfo">
 							<view class="info-box-width">
--
libgit2 0.21.4