Commit 9e2e0fa9fbae049be48befe719c29ea260ae3af9
1 parent
4f4dcb1f
1
Showing
7 changed files
with
448 additions
and
43 deletions
apis/modules/ly.js
| 1 | import request from '../../service/request.js' | 1 | import request from '../../service/request.js' |
| 2 | import utils from '../../service/utils.js' | 2 | import utils from '../../service/utils.js' |
| 3 | export default { | 3 | export default { |
| 4 | + // 获取详情界桩 | ||
| 5 | + getariesInfo(data){ | ||
| 6 | + return request.get('/areBoundary/ariesInfo/'+data) | ||
| 7 | + }, | ||
| 4 | // 修改界桩 | 8 | // 修改界桩 |
| 5 | removeplie(data){ | 9 | removeplie(data){ |
| 6 | - return request.put('/areBoundary/plie',data) | 10 | + return request.put('/areBoundary/ariesInfo',data) |
| 7 | }, | 11 | }, |
| 8 | // 添加界桩 | 12 | // 添加界桩 |
| 9 | addplie(data){ | 13 | addplie(data){ |
| @@ -43,7 +47,7 @@ export default { | @@ -43,7 +47,7 @@ export default { | ||
| 43 | }, | 47 | }, |
| 44 | // 行政区 | 48 | // 行政区 |
| 45 | getplie(data){ | 49 | getplie(data){ |
| 46 | - return request.get('/areBoundary/plie/list',data) | 50 | + return request.get('/areBoundary/ariesInfo/list',data) |
| 47 | }, | 51 | }, |
| 48 | // 申报小区门牌 | 52 | // 申报小区门牌 |
| 49 | adddoorplate(data){ | 53 | adddoorplate(data){ |
pages/declaration/declaration.vue
| @@ -617,7 +617,7 @@ | @@ -617,7 +617,7 @@ | ||
| 617 | <view class="serve-title">类型</view> | 617 | <view class="serve-title">类型</view> |
| 618 | <view class="serve-right"> | 618 | <view class="serve-right"> |
| 619 | <picker @change="e=> bindPickerChange1(e,7)" :value="index" :range="array5"> | 619 | <picker @change="e=> bindPickerChange1(e,7)" :value="index" :range="array5"> |
| 620 | - <view :class="doorplate.cellType?'uni-input1':'uni-input2'">{{doorplate.cellType?doorplate.cellType:'请选择'}} | 620 | + <view :class="doorplate.gridman?'uni-input1':'uni-input2'">{{doorplate.gridman?doorplate.gridman:'请选择'}} |
| 621 | </view> | 621 | </view> |
| 622 | </picker> | 622 | </picker> |
| 623 | <image src="../../static/down3.png"></image> | 623 | <image src="../../static/down3.png"></image> |
| @@ -640,7 +640,7 @@ | @@ -640,7 +640,7 @@ | ||
| 640 | <view class="info-box"> | 640 | <view class="info-box"> |
| 641 | <view class="info-box-list"> | 641 | <view class="info-box-list"> |
| 642 | <view class="serve"> | 642 | <view class="serve"> |
| 643 | - <view class="serve-title">曾用名</view> | 643 | + <view class="serve-title">门牌号</view> |
| 644 | <view> | 644 | <view> |
| 645 | <input id="formerName" @input="oninput4" v-module="doorplate.formerName" | 645 | <input id="formerName" @input="oninput4" v-module="doorplate.formerName" |
| 646 | placeholder="请输入" style="text-align: right;" | 646 | placeholder="请输入" style="text-align: right;" |
| @@ -652,7 +652,7 @@ | @@ -652,7 +652,7 @@ | ||
| 652 | <view class="info-box"> | 652 | <view class="info-box"> |
| 653 | <view class="info-box-list"> | 653 | <view class="info-box-list"> |
| 654 | <view class="serve"> | 654 | <view class="serve"> |
| 655 | - <view class="serve-title">历史地名</view> | 655 | + <view class="serve-title">门牌地址</view> |
| 656 | <view> | 656 | <view> |
| 657 | <input id="historicalPlaceNames" @input="oninput4" | 657 | <input id="historicalPlaceNames" @input="oninput4" |
| 658 | v-module="doorplate.historicalPlaceNames" placeholder="请输入" | 658 | v-module="doorplate.historicalPlaceNames" placeholder="请输入" |
| @@ -727,7 +727,7 @@ | @@ -727,7 +727,7 @@ | ||
| 727 | applyId: uni.getStorageSync('USERS_KEY').userId, | 727 | applyId: uni.getStorageSync('USERS_KEY').userId, |
| 728 | createdUser: uni.getStorageSync('USERS_KEY').userId, | 728 | createdUser: uni.getStorageSync('USERS_KEY').userId, |
| 729 | communityName: null, //小区名称 | 729 | communityName: null, //小区名称 |
| 730 | - cellType:null,//门牌类型 | 730 | + gridman:null,//门牌类型 |
| 731 | formerName: null, //曾用名 | 731 | formerName: null, //曾用名 |
| 732 | historicalPlaceNames: null, //历史地名 | 732 | historicalPlaceNames: null, //历史地名 |
| 733 | doorNumberFile: null, //门牌文件 | 733 | doorNumberFile: null, //门牌文件 |
| @@ -936,7 +936,7 @@ | @@ -936,7 +936,7 @@ | ||
| 936 | }else if (e1 == 6) { | 936 | }else if (e1 == 6) { |
| 937 | this.array4type = this.array4[e.detail.value] | 937 | this.array4type = this.array4[e.detail.value] |
| 938 | }else if (e1 == 7) { | 938 | }else if (e1 == 7) { |
| 939 | - this.doorplate.cellType = this.array5[e.detail.value] | 939 | + this.doorplate.gridman = this.array5[e.detail.value] |
| 940 | } | 940 | } |
| 941 | }, | 941 | }, |
| 942 | mapdoorplatesuccess() { | 942 | mapdoorplatesuccess() { |
pages/declaration/declarationListdetail.vue
| @@ -363,9 +363,9 @@ | @@ -363,9 +363,9 @@ | ||
| 363 | {{info.historicalPlaceNames?info.historicalPlaceNames:'-'}}</view> | 363 | {{info.historicalPlaceNames?info.historicalPlaceNames:'-'}}</view> |
| 364 | <view class="info-box-small">历史地名</view> | 364 | <view class="info-box-small">历史地名</view> |
| 365 | </view> | 365 | </view> |
| 366 | - <view class="info-box-width" style="width: 100%;" v-if="info.cellType"> | 366 | + <view class="info-box-width" style="width: 100%;" v-if="info.gridman"> |
| 367 | <view class="info-box-overflow"> | 367 | <view class="info-box-overflow"> |
| 368 | - {{info.cellType?info.cellType:'-'}}</view> | 368 | + {{info.gridman?info.gridman:'-'}}</view> |
| 369 | <view class="info-box-small">类型</view> | 369 | <view class="info-box-small">类型</view> |
| 370 | </view> | 370 | </view> |
| 371 | </view> | 371 | </view> |
pages/declaration/list.vue
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | <image style="height: 120rpx;width: 100%;" src="/static/new/3.png" mode="aspectFit"></image> | 41 | <image style="height: 120rpx;width: 100%;" src="/static/new/3.png" mode="aspectFit"></image> |
| 42 | </view> | 42 | </view> |
| 43 | <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;"> | 43 | <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;"> |
| 44 | - 界桩界线管护 | 44 | + 界桩管护 |
| 45 | </view> | 45 | </view> |
| 46 | </view> | 46 | </view> |
| 47 | <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;"> | 47 | <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;"> |
pages/declaration/newDeclaration.vue
| @@ -270,6 +270,34 @@ | @@ -270,6 +270,34 @@ | ||
| 270 | </view> | 270 | </view> |
| 271 | </view> | 271 | </view> |
| 272 | </view> | 272 | </view> |
| 273 | + <view class="info-box" v-else-if="item.type == '9'"> | ||
| 274 | + <view class="info-box-list"> | ||
| 275 | + <view class="serve"> | ||
| 276 | + <view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view> | ||
| 277 | + <view class="serve-right"> | ||
| 278 | + <picker @change="e=> bindPickerChange3(e,index,'array6')" :range="array6"> | ||
| 279 | + <view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}} | ||
| 280 | + </view> | ||
| 281 | + </picker> | ||
| 282 | + <image src="../../static/down3.png"></image> | ||
| 283 | + </view> | ||
| 284 | + </view> | ||
| 285 | + </view> | ||
| 286 | + </view> | ||
| 287 | + <view class="info-box" v-else-if="item.type == '10'"> | ||
| 288 | + <view class="info-box-list"> | ||
| 289 | + <view class="serve"> | ||
| 290 | + <view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view> | ||
| 291 | + <view class="serve-right"> | ||
| 292 | + <picker @change="e=> bindPickerChange3(e,index,'array7')" :range="array7"> | ||
| 293 | + <view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}} | ||
| 294 | + </view> | ||
| 295 | + </picker> | ||
| 296 | + <image src="../../static/down3.png"></image> | ||
| 297 | + </view> | ||
| 298 | + </view> | ||
| 299 | + </view> | ||
| 300 | + </view> | ||
| 273 | </view> | 301 | </view> |
| 274 | </view> | 302 | </view> |
| 275 | <!-- <view class="message-list"> | 303 | <!-- <view class="message-list"> |
| @@ -318,6 +346,8 @@ | @@ -318,6 +346,8 @@ | ||
| 318 | array2: ['可公开', '不宜公开','大洋怪重', '不属于地名'], | 346 | array2: ['可公开', '不宜公开','大洋怪重', '不属于地名'], |
| 319 | array4: ['现今地名', '历史地名','本地名删除'], | 347 | array4: ['现今地名', '历史地名','本地名删除'], |
| 320 | array5: ['冷泉', '热泉'], | 348 | array5: ['冷泉', '热泉'], |
| 349 | + array6: ['冷泉', '热泉'], | ||
| 350 | + array7: ['冷泉', '热泉'], | ||
| 321 | time: null, | 351 | time: null, |
| 322 | array3: getApp().globalData.list1, | 352 | array3: getApp().globalData.list1, |
| 323 | BASE_URL, | 353 | BASE_URL, |
| @@ -632,12 +662,35 @@ | @@ -632,12 +662,35 @@ | ||
| 632 | }, | 662 | }, |
| 633 | bindPickerChange2: function(e, e1) { | 663 | bindPickerChange2: function(e, e1) { |
| 634 | console.log('picker发送选择改变，携带值为', e, e1,this.array1) | 664 | console.log('picker发送选择改变，携带值为', e, e1,this.array1) |
| 635 | - let box1 = this.array1[0] | ||
| 636 | - let box2 = this.array1[1] | ||
| 637 | - let box3 = this.array1[2] | ||
| 638 | - let box4 = this.array1[3] | ||
| 639 | - 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 | ||
| 640 | - if(this.textlist[e1].cent == '泉') { | 665 | + let text = '' |
| 666 | + // for (let i = 0; i < this.array1.length; i++) { | ||
| 667 | + | ||
| 668 | + // if(i == 0) { | ||
| 669 | + // text = this.array1[i] | ||
| 670 | + // } else { | ||
| 671 | + // text =text +'/'+ this.array1[i] | ||
| 672 | + // } | ||
| 673 | + // } | ||
| 674 | + let box1 = this.array1[0][e.detail.value[0]]?this.array1[0][e.detail.value[0]].name:null | ||
| 675 | + let box2 = this.array1[1][e.detail.value[1]]?this.array1[1][e.detail.value[1]].name:null | ||
| 676 | + let box3 = this.array1[2][e.detail.value[2]]?this.array1[2][e.detail.value[2]].name:null | ||
| 677 | + let box4 = this.array1[3][e.detail.value[3]]?this.array1[3][e.detail.value[3]].name:null | ||
| 678 | + if(box1) { | ||
| 679 | + text = box1 | ||
| 680 | + } | ||
| 681 | + if(box2) { | ||
| 682 | + text = text+'/'+ box2 | ||
| 683 | + } | ||
| 684 | + if(box3) { | ||
| 685 | + text = text+'/'+ box3 | ||
| 686 | + } | ||
| 687 | + if(box4) { | ||
| 688 | + text = text+'/'+ box4 | ||
| 689 | + } | ||
| 690 | + console.log(box1,box2,box3,box4,text) | ||
| 691 | + this.textlist[e1].cent = text | ||
| 692 | + // 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 | ||
| 693 | + if(text == '陆地水系/泉') { | ||
| 641 | this.array5 = ['冷泉', '热泉'] | 694 | this.array5 = ['冷泉', '热泉'] |
| 642 | this.newtextlist = [ | 695 | this.newtextlist = [ |
| 643 | { | 696 | { |
| @@ -690,7 +743,7 @@ | @@ -690,7 +743,7 @@ | ||
| 690 | from:'name6' | 743 | from:'name6' |
| 691 | }, | 744 | }, |
| 692 | ] | 745 | ] |
| 693 | - } else if(this.textlist[e1].cent == '瀑布') { | 746 | + } else if(text == '陆地水系/瀑布') { |
| 694 | this.newtextlist = [ | 747 | this.newtextlist = [ |
| 695 | { | 748 | { |
| 696 | name: '最大落差(米)', | 749 | name: '最大落差(米)', |
| @@ -721,12 +774,355 @@ | @@ -721,12 +774,355 @@ | ||
| 721 | from:'name0' | 774 | from:'name0' |
| 722 | }, | 775 | }, |
| 723 | ] | 776 | ] |
| 724 | - }else if(this.textlist[e1].cent == '') { | ||
| 725 | - | ||
| 726 | - }else if(this.textlist[e1].cent == '') { | ||
| 727 | - | 777 | + }else if(text == '陆地水系/湖泊') { |
| 778 | + this.array5 = ['常年湖', '时令湖'] | ||
| 779 | + this.array6 = ['淡水湖', '咸水湖'] | ||
| 780 | + this.newtextlist = [ | ||
| 781 | + { | ||
| 782 | + name: '类型1', | ||
| 783 | + type: '8', | ||
| 784 | + isbx:true, | ||
| 785 | + cent: '', | ||
| 786 | + from:'name0' | ||
| 787 | + }, | ||
| 788 | + { | ||
| 789 | + name: '类型2', | ||
| 790 | + type: '9', | ||
| 791 | + isbx:true, | ||
| 792 | + cent: '', | ||
| 793 | + from:'name0' | ||
| 794 | + }, | ||
| 795 | + { | ||
| 796 | + name: '面(平方干米)', | ||
| 797 | + type: '1', | ||
| 798 | + isbx:true, | ||
| 799 | + cent: '', | ||
| 800 | + from:'name0' | ||
| 801 | + }, | ||
| 802 | + { | ||
| 803 | + name: '最大长度(千米)', | ||
| 804 | + type: '1', | ||
| 805 | + isbx:false, | ||
| 806 | + cent: '', | ||
| 807 | + from:'name0' | ||
| 808 | + }, | ||
| 809 | + { | ||
| 810 | + name: '最大宽度(千米)', | ||
| 811 | + type: '1', | ||
| 812 | + isbx:false, | ||
| 813 | + cent: '', | ||
| 814 | + from:'name0' | ||
| 815 | + }, | ||
| 816 | + { | ||
| 817 | + name: '平均水深(米)', | ||
| 818 | + type: '1', | ||
| 819 | + isbx:false, | ||
| 820 | + cent: '', | ||
| 821 | + from:'name0' | ||
| 822 | + }, | ||
| 823 | + { | ||
| 824 | + name: '最大水深(米)', | ||
| 825 | + type: '1', | ||
| 826 | + isbx:false, | ||
| 827 | + cent: '', | ||
| 828 | + from:'name0' | ||
| 829 | + }, | ||
| 830 | + { | ||
| 831 | + name: '主要水源', | ||
| 832 | + type: '1', | ||
| 833 | + isbx:false, | ||
| 834 | + cent: '', | ||
| 835 | + from:'name0' | ||
| 836 | + }, | ||
| 837 | + ] | ||
| 838 | + }else if(text == '陆地水系/冰川') { | ||
| 839 | + this.newtextlist = [ | ||
| 840 | + { | ||
| 841 | + name: '面积(平方千米)', | ||
| 842 | + type: '1', | ||
| 843 | + isbx:false, | ||
| 844 | + cent: '', | ||
| 845 | + from:'name0' | ||
| 846 | + }, | ||
| 847 | + { | ||
| 848 | + name: '长度(千米)', | ||
| 849 | + type: '1', | ||
| 850 | + isbx:false, | ||
| 851 | + cent: '', | ||
| 852 | + from:'name0' | ||
| 853 | + }, | ||
| 854 | + { | ||
| 855 | + name: '宽度(千米)', | ||
| 856 | + type: '1', | ||
| 857 | + isbx:false, | ||
| 858 | + cent: '', | ||
| 859 | + from:'name0' | ||
| 860 | + }, | ||
| 861 | + { | ||
| 862 | + name: '冰层厚度(米)', | ||
| 863 | + type: '1', | ||
| 864 | + isbx:false, | ||
| 865 | + cent: '', | ||
| 866 | + from:'name0' | ||
| 867 | + }, | ||
| 868 | + { | ||
| 869 | + name: '海拔(米)', | ||
| 870 | + type: '1', | ||
| 871 | + isbx:false, | ||
| 872 | + cent: '', | ||
| 873 | + from:'name0' | ||
| 874 | + }, | ||
| 875 | + { | ||
| 876 | + name: '所属山系', | ||
| 877 | + type: '1', | ||
| 878 | + isbx:false, | ||
| 879 | + cent: '', | ||
| 880 | + from:'name0' | ||
| 881 | + }, | ||
| 882 | + ] | ||
| 883 | + }else if(text == '陆地水系/河流/河源') { | ||
| 884 | + this.newtextlist = [] | ||
| 885 | + }else if(text == '陆地水系/河流/峡谷') { | ||
| 886 | + this.newtextlist = [ | ||
| 887 | + { | ||
| 888 | + name: '长度(千米)', | ||
| 889 | + type: '1', | ||
| 890 | + isbx:false, | ||
| 891 | + cent: '', | ||
| 892 | + from:'name0' | ||
| 893 | + }, | ||
| 894 | + { | ||
| 895 | + name: '宽度(千米)', | ||
| 896 | + type: '1', | ||
| 897 | + isbx:false, | ||
| 898 | + cent: '', | ||
| 899 | + from:'name0' | ||
| 900 | + }, | ||
| 901 | + { | ||
| 902 | + name: '走向', | ||
| 903 | + type: '1', | ||
| 904 | + isbx:false, | ||
| 905 | + cent: '', | ||
| 906 | + from:'name0' | ||
| 907 | + }, | ||
| 908 | + { | ||
| 909 | + name: '所属山系', | ||
| 910 | + type: '1', | ||
| 911 | + isbx:false, | ||
| 912 | + cent: '', | ||
| 913 | + from:'name0' | ||
| 914 | + }, | ||
| 915 | + { | ||
| 916 | + name: '起点名', | ||
| 917 | + type: '1', | ||
| 918 | + isbx:false, | ||
| 919 | + cent: '', | ||
| 920 | + from:'name0' | ||
| 921 | + }, | ||
| 922 | + { | ||
| 923 | + name: '止点名', | ||
| 924 | + type: '1', | ||
| 925 | + isbx:false, | ||
| 926 | + cent: '', | ||
| 927 | + from:'name0' | ||
| 928 | + }, | ||
| 929 | + { | ||
| 930 | + name: '河流名', | ||
| 931 | + type: '1', | ||
| 932 | + isbx:false, | ||
| 933 | + cent: '', | ||
| 934 | + from:'name0' | ||
| 935 | + }, | ||
| 936 | + ] | ||
| 937 | + }else if(text == '陆地水系/河流/河滩') { | ||
| 938 | + this.newtextlist = [ | ||
| 939 | + { | ||
| 940 | + name: '面积(平方千米)', | ||
| 941 | + type: '1', | ||
| 942 | + isbx:false, | ||
| 943 | + cent: '', | ||
| 944 | + from:'name0' | ||
| 945 | + }, | ||
| 946 | + ] | ||
| 947 | + }else if(text == '陆地水系/河流/阶地') { | ||
| 948 | + this.newtextlist = [ | ||
| 949 | + { | ||
| 950 | + name: '高度(米)', | ||
| 951 | + type: '1', | ||
| 952 | + isbx:false, | ||
| 953 | + cent: '', | ||
| 954 | + from:'name0' | ||
| 955 | + }, | ||
| 956 | + { | ||
| 957 | + name: '阶地级数', | ||
| 958 | + type: '1', | ||
| 959 | + isbx:false, | ||
| 960 | + cent: '', | ||
| 961 | + from:'name0' | ||
| 962 | + }, | ||
| 963 | + { | ||
| 964 | + name: '陡坎角度', | ||
| 965 | + type: '1', | ||
| 966 | + isbx:false, | ||
| 967 | + cent: '', | ||
| 968 | + from:'name0' | ||
| 969 | + }, | ||
| 970 | + { | ||
| 971 | + name: '所属河流', | ||
| 972 | + type: '1', | ||
| 973 | + isbx:false, | ||
| 974 | + cent: '', | ||
| 975 | + from:'name0' | ||
| 976 | + }, | ||
| 977 | + ] | ||
| 978 | + }else if(text == '陆地水系/河流/河湾') { | ||
| 979 | + this.newtextlist = [ | ||
| 980 | + { | ||
| 981 | + name: '所在河流', | ||
| 982 | + type: '1', | ||
| 983 | + isbx:false, | ||
| 984 | + cent: '', | ||
| 985 | + from:'name0' | ||
| 986 | + } | ||
| 987 | + ] | ||
| 988 | + }else if(text == '陆地水系/河流/河口') { | ||
| 989 | + this.array5 = ['滨海', '滨湖','滨河'] | ||
| 990 | + this.newtextlist = [ | ||
| 991 | + { | ||
| 992 | + name: '类型', | ||
| 993 | + type: '8', | ||
| 994 | + isbx:true, | ||
| 995 | + cent: '', | ||
| 996 | + from:'name0' | ||
| 997 | + }, | ||
| 998 | + ] | ||
| 999 | + }else if(text == '陆地水系/河流/三角洲') { | ||
| 1000 | + this.array5 = ['滨海', '滨湖','滨河'] | ||
| 1001 | + this.newtextlist = [ | ||
| 1002 | + { | ||
| 1003 | + name: '类型', | ||
| 1004 | + type: '8', | ||
| 1005 | + isbx:true, | ||
| 1006 | + cent: '', | ||
| 1007 | + from:'name0' | ||
| 1008 | + }, | ||
| 1009 | + { | ||
| 1010 | + name: '面积(平方千米)', | ||
| 1011 | + type: '1', | ||
| 1012 | + isbx:true, | ||
| 1013 | + cent: '', | ||
| 1014 | + from:'name0' | ||
| 1015 | + }, | ||
| 1016 | + { | ||
| 1017 | + name: '海拔(米)', | ||
| 1018 | + type: '1', | ||
| 1019 | + isbx:false, | ||
| 1020 | + cent: '', | ||
| 1021 | + from:'name0' | ||
| 1022 | + }, | ||
| 1023 | + ] | ||
| 1024 | + }else if(text == '陆地水系/河流/本级') { | ||
| 1025 | + this.array5 = ['内流河', '外流河'] | ||
| 1026 | + this.array6 = ['地上河', '地下河'] | ||
| 1027 | + this.array7 = ['常年河', '季节河'] | ||
| 1028 | + this.newtextlist = [ | ||
| 1029 | + { | ||
| 1030 | + name: '长度(千米)', | ||
| 1031 | + type: '1', | ||
| 1032 | + isbx:true, | ||
| 1033 | + cent: '', | ||
| 1034 | + from:'name0' | ||
| 1035 | + }, | ||
| 1036 | + { | ||
| 1037 | + name: '流域面积(平方千米)', | ||
| 1038 | + type: '1', | ||
| 1039 | + isbx:false, | ||
| 1040 | + cent: '', | ||
| 1041 | + from:'name0' | ||
| 1042 | + }, | ||
| 1043 | + { | ||
| 1044 | + name: '主要支流', | ||
| 1045 | + type: '1', | ||
| 1046 | + isbx:false, | ||
| 1047 | + cent: '', | ||
| 1048 | + from:'name0' | ||
| 1049 | + }, | ||
| 1050 | + { | ||
| 1051 | + name: '河流级别', | ||
| 1052 | + type: '1', | ||
| 1053 | + isbx:true, | ||
| 1054 | + cent: '', | ||
| 1055 | + from:'name0' | ||
| 1056 | + }, | ||
| 1057 | + { | ||
| 1058 | + name: '河流类别1', | ||
| 1059 | + type: '8', | ||
| 1060 | + isbx:true, | ||
| 1061 | + cent: '', | ||
| 1062 | + from:'name0' | ||
| 1063 | + }, | ||
| 1064 | + { | ||
| 1065 | + name: '河流类别2', | ||
| 1066 | + type: '9', | ||
| 1067 | + isbx:true, | ||
| 1068 | + cent: '', | ||
| 1069 | + from:'name0' | ||
| 1070 | + }, | ||
| 1071 | + { | ||
| 1072 | + name: '河流类别3', | ||
| 1073 | + type: '10', | ||
| 1074 | + isbx:true, | ||
| 1075 | + cent: '', | ||
| 1076 | + from:'name0' | ||
| 1077 | + }, | ||
| 1078 | + { | ||
| 1079 | + name: '主要水文站', | ||
| 1080 | + type: '1', | ||
| 1081 | + isbx:false, | ||
| 1082 | + cent: '', | ||
| 1083 | + from:'name0' | ||
| 1084 | + }, | ||
| 1085 | + { | ||
| 1086 | + name: '径流量(立方米/秒)', | ||
| 1087 | + type: '1', | ||
| 1088 | + isbx:false, | ||
| 1089 | + cent: '', | ||
| 1090 | + from:'name0' | ||
| 1091 | + }, | ||
| 1092 | + ] | ||
| 1093 | + }else if(text == '陆地水系/陆地岛屿/矶' || text == '陆地水系/陆地岛屿/湖岛' || text == '陆地水系/陆地岛屿/洲河岛') { | ||
| 1094 | + this.array5 = ['基岩', '冲洪积'] | ||
| 1095 | + this.newtextlist = [ | ||
| 1096 | + { | ||
| 1097 | + name: '类型', | ||
| 1098 | + type: '8', | ||
| 1099 | + isbx:true, | ||
| 1100 | + cent: '', | ||
| 1101 | + from:'name0' | ||
| 1102 | + }, | ||
| 1103 | + { | ||
| 1104 | + name: '面积(平方千米)', | ||
| 1105 | + type: '1', | ||
| 1106 | + isbx:true, | ||
| 1107 | + cent: '', | ||
| 1108 | + from:'name0' | ||
| 1109 | + }, | ||
| 1110 | + { | ||
| 1111 | + name: '近陆距离(千米)', | ||
| 1112 | + type: '1', | ||
| 1113 | + isbx:false, | ||
| 1114 | + cent: '', | ||
| 1115 | + from:'name0' | ||
| 1116 | + }, | ||
| 1117 | + { | ||
| 1118 | + name: '植被覆盖率(%)', | ||
| 1119 | + type: '1', | ||
| 1120 | + isbx:false, | ||
| 1121 | + cent: '', | ||
| 1122 | + from:'name0' | ||
| 1123 | + }, | ||
| 1124 | + ] | ||
| 728 | } | 1125 | } |
| 729 | - | ||
| 730 | this.newtextlist.push( | 1126 | this.newtextlist.push( |
| 731 | { | 1127 | { |
| 732 | name: '所在(跨) 行政区', | 1128 | name: '所在(跨) 行政区', |
pages/mapstakelinedetail/addmapstakelinedetail.vue
| @@ -232,13 +232,7 @@ | @@ -232,13 +232,7 @@ | ||
| 232 | }, | 232 | }, |
| 233 | }, | 233 | }, |
| 234 | lbbox: [], | 234 | lbbox: [], |
| 235 | - textlist: [{ | ||
| 236 | - name: '界线名称', | ||
| 237 | - type: '1', | ||
| 238 | - isbx: false, | ||
| 239 | - cent: '', | ||
| 240 | - from: 'boundaryName' | ||
| 241 | - }, | 235 | + textlist: [ |
| 242 | { | 236 | { |
| 243 | name: '界桩编号', | 237 | name: '界桩编号', |
| 244 | type: '1', | 238 | type: '1', |
| @@ -299,10 +293,16 @@ | @@ -299,10 +293,16 @@ | ||
| 299 | return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight | 293 | return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight |
| 300 | } | 294 | } |
| 301 | }, | 295 | }, |
| 302 | - onLoad(params) { | ||
| 303 | - let from = params.cent?JSON.parse(params.cent):'' | ||
| 304 | - console.log(from) | ||
| 305 | - this.from = params.cent?JSON.parse(params.cent):'' | 296 | + async onLoad(params) { |
| 297 | + | ||
| 298 | + let from1 = params.cent?JSON.parse(params.cent):'' | ||
| 299 | + console.log(from1) | ||
| 300 | + let from = null | ||
| 301 | + await this.API.getariesInfo(from1.id).then(res => { | ||
| 302 | + console.log(res); | ||
| 303 | + from = res.data | ||
| 304 | + }) | ||
| 305 | + this.from = from | ||
| 306 | if(from) { | 306 | if(from) { |
| 307 | for (let i = 0; i < this.textlist.length; i++) { | 307 | for (let i = 0; i < this.textlist.length; i++) { |
| 308 | if(this.textlist[i].from == 'location') { | 308 | if(this.textlist[i].from == 'location') { |
| @@ -313,11 +313,15 @@ | @@ -313,11 +313,15 @@ | ||
| 313 | this.textlist[i].cent = from[this.textlist[i].from] | 313 | this.textlist[i].cent = from[this.textlist[i].from] |
| 314 | } | 314 | } |
| 315 | } | 315 | } |
| 316 | - this.fileList.push({ | ||
| 317 | - name: from.imageInfo, | ||
| 318 | - fileId: from.imageInfo, | ||
| 319 | - url: this.BASE_URL + from.imageInfo | ||
| 320 | - }) | 316 | + |
| 317 | + if(from.imageInfo) { | ||
| 318 | + this.fileList.push({ | ||
| 319 | + name: from.imageInfo, | ||
| 320 | + fileId: from.imageInfo, | ||
| 321 | + url: this.BASE_URL +from.imageInfo | ||
| 322 | + }) | ||
| 323 | + } | ||
| 324 | + | ||
| 321 | } | 325 | } |
| 322 | }, | 326 | }, |
| 323 | methods: { | 327 | methods: { |
pages/mapstakelinedetail/mapstakelinedetail.vue
| @@ -24,9 +24,13 @@ | @@ -24,9 +24,13 @@ | ||
| 24 | <view class="info-box-small">界桩编号</view> | 24 | <view class="info-box-small">界桩编号</view> |
| 25 | </view> | 25 | </view> |
| 26 | <view class="info-box-width"> | 26 | <view class="info-box-width"> |
| 27 | + <view>{{info.enteredUser?info.enteredUser:'-'}}</view> | ||
| 28 | + <view class="info-box-small">录入人姓名</view> | ||
| 29 | + </view> | ||
| 30 | + <!-- <view class="info-box-width"> | ||
| 27 | <view>{{info.boundaryName || '-'}}</view> | 31 | <view>{{info.boundaryName || '-'}}</view> |
| 28 | <view class="info-box-small">界线名称</view> | 32 | <view class="info-box-small">界线名称</view> |
| 29 | - </view> | 33 | + </view> --> |
| 30 | <!-- <view class="info-box-width"> | 34 | <!-- <view class="info-box-width"> |
| 31 | <view>北纬{{info.latitude}}，东经{{info.longitude}}</view> | 35 | <view>北纬{{info.latitude}}，东经{{info.longitude}}</view> |
| 32 | <view class="info-box-small">经纬度</view> | 36 | <view class="info-box-small">经纬度</view> |
| @@ -67,10 +71,7 @@ | @@ -67,10 +71,7 @@ | ||
| 67 | <view>{{info.enteredTime?info.enteredTime:'-'}}</view> | 71 | <view>{{info.enteredTime?info.enteredTime:'-'}}</view> |
| 68 | <view class="info-box-small">设立时间</view> | 72 | <view class="info-box-small">设立时间</view> |
| 69 | </view> | 73 | </view> |
| 70 | - <view class="info-box-width"> | ||
| 71 | - <view>{{info.enteredUser?info.enteredUser:'-'}}</view> | ||
| 72 | - <view class="info-box-small">录入人姓名</view> | ||
| 73 | - </view> | 74 | + |
| 74 | </view> | 75 | </view> |
| 75 | <view class="info-box-list" v-if="info.imageInfo"> | 76 | <view class="info-box-list" v-if="info.imageInfo"> |
| 76 | <view class="info-box-width"> | 77 | <view class="info-box-width"> |