Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5a95f8e7 by zhaoqian
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/zd/zddcb/index.vue
2 parents ee7a9031 4a16a083
Expand all
Inline Side-by-side
Showing 19 changed files with 533 additions and 121 deletions
...@@ -208,3 +208,4 @@ export function registerCall(data) { ...@@ -208,3 +208,4 @@ export function registerCall(data) {
208 data:data 208 data:data
209 }) 209 })
210 } 210 }
211
......
...@@ -10,6 +10,10 @@ export function getSearchList(data) { ...@@ -10,6 +10,10 @@ export function getSearchList(data) {
10 }) 10 })
11 } 11 }
12 12
13 /**
14 * 宗地分割选择宗地列表
15 * @param data
16 */
13 export function zdlist(data) { 17 export function zdlist(data) {
14 return request({ 18 return request({
15 url: '/zd/qjZdjbxx/zdlist', 19 url: '/zd/qjZdjbxx/zdlist',
...@@ -17,3 +21,15 @@ export function zdlist(data) { ...@@ -17,3 +21,15 @@ export function zdlist(data) {
17 data:data 21 data:data
18 }) 22 })
19 } 23 }
24
25 /**
26 * 多幢分割选择多幢列表
27 * @param data
28 */
29 export function dzList(data) {
30 return request({
31 url:'/fw/qjDz/dzlist',
32 method:'post',
33 data:data
34 })
35 }
......
...@@ -23,7 +23,15 @@ ...@@ -23,7 +23,15 @@
23 "color": "#f50325", 23 "color": "#f50325",
24 "width": 1 24 "width": 1
25 } 25 }
26 },
27 "importSymbol": {
28 "type": "simple-fill",
29 "color": [ 245,3, 37, 0.4 ],
30 "style": "none",
31 "outline": {
32 "color": "#006cff",
33 "width": 2
34 }
26 } 35 }
27
28 } 36 }
29 } 37 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template>
2 <div>
3 <el-dialog
4 title="新增"
5 :visible.sync="isVisible"
6 width="70%"
7 @close="close"
8 :modal-append-to-body="false"
9 center>
10 <div class="search">
11 <el-row>
12 <el-col :span="24">
13 <el-form :inline="true" class="demo-form-inline">
14 <el-form-item label="宗地编码">
15 <el-input
16 v-model="queryData.zddm"
17 placeholder="输入宗地编码"
18 ></el-input>
19 </el-form-item>
20 <el-form-item label="不动产权证号">
21 <el-input
22 v-model="queryData.bdcqzh"
23 placeholder="输入不动产权证号"
24 ></el-input>
25 </el-form-item>
26 <el-form-item label="不动产单元号">
27 <el-input
28 maxlength="28"
29 v-model="queryData.bdcdyh"
30 placeholder="输入不动产单元号"
31 ></el-input>
32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button>
35 </el-form>
36 </el-col>
37 </el-row>
38 <el-row>
39 <el-col :span="24">
40 <el-form :inline="true" class="demo-form-inline">
41 <el-form-item label="权利人">
42 <el-input
43 v-model="queryData.qlrmc"
44 placeholder="输入权利人"
45 ></el-input>
46 </el-form-item>
47 <el-form-item label="坐落">
48 <el-input
49 v-model="queryData.zl"
50 placeholder="输入坐落"
51 ></el-input>
52 </el-form-item>
53 </el-form>
54 </el-col>
55 </el-row>
56 <div class="table-bode">
57 <table border="1">
58 <tr>
59 <td>序号</td>
60 <td>操作</td>
61 <td>宗地代码</td>
62 <td>不动产单元号</td>
63 <td>项目名称</td>
64 <td>不动产权证号</td>
65 <td>权利人</td>
66 <td>坐落</td>
67 </tr>
68 <tr v-if="Data.length==0">
69 <td colspan="8">
70 <span class="noData">暂无数据</span>
71 </td>
72 </tr>
73 <tr v-else v-for="(item,index) in Data" :key="index">
74 <td>{{index+1}}</td>
75 <td @click="addData(item)" class="xz">
76 <span>选择</span>
77 </td>
78 <td>{{item.zddm}}</td>
79 <td>{{item.bdcdyh}}</td>
80 <td>{{item.xmmc}}</td>
81 <td>{{item.bdcqzh}}</td>
82 <td>{{item.qlr}}</td>
83 <td>{{item.zl}}</td>
84 </tr>
85 </table>
86 </div>
87 </div>
88 <div class="page">
89 <el-pagination
90 background
91 layout="prev, pager, next,total"
92 :page-size="queryData.pageSize"
93 :total="total"
94 @current-change="currentChange"
95 >
96 </el-pagination>
97 </div>
98 </el-dialog>
99
100 </div>
101 </template>
102
103 <script>
104 import {dzList} from './../../api/search'
105
106 export default {
107 name: "zdQueryData",
108 data() {
109 return {
110 total: 1,
111 queryData: {
112 bdcdyh: "",
113 bdcqzh: "",
114 qlrmc: "",
115 xmmc: "",
116 zddm: "",
117 zl: "",
118 pageNo: 1,
119 pageSize: 10,
120 },
121 Data: [],
122 isVisible: false
123 }
124 },
125 props: {
126 centerDialogVisible: {
127 type: Boolean,
128 default: function () {
129 return false
130 }
131 },
132 isClose: {
133 type: Boolean,
134 default: false
135 }
136 },
137 mounted() {
138 this.getData(this.queryData)
139 },
140 created() {
141 },
142 methods: {
143 currentChange: function (val) {
144 this.queryData.pageNo = val;
145 this.getData(this.queryData);
146 },
147 reset: function () {
148 this.queryData = {
149 bdcdyh: "",
150 bdcqzh: "",
151 qlrmc: "",
152 xmmc: "",
153 zddm: "",
154 zl: "",
155 pageNo: 1,
156 pageSize: 10
157 };
158 this.getData(this.queryData)
159 },
160 getData: function (data) {
161 dzList(data).then(res => {
162 this.Data = res.result.records
163 this.total = res.result.total;
164 })
165 },
166 search: function () {
167 this.getData(this.queryData)
168 },
169 addData: function (val) {
170 this.$emit("getData", val)
171 if (this.isClose) {
172 this.close();
173 }
174 },
175 close: function () {
176 this.$emit('close')
177 this.reset();
178 }
179 },
180 watch: {
181 centerDialogVisible(val) {
182 this.isVisible = val
183 }
184 }
185 }
186 </script>
187
188 <style scoped lang="less">
189
190 .main {
191 box-sizing: border-box;
192 padding: 18px;
193 height: auto;
194 width: 80%;
195 }
196
197 /deep/ .el-form-item__label {
198 width: 96px;
199 text-align: right;
200 }
201
202 table {
203 margin-top: 10px;
204 background-color: #fff;
205 font-size: 14px;
206 width: 100%;
207 tr:hover {
208 background-color: #F5F7FA;
209 }
210 }
211
212 td {
213 text-align: center;
214 height: 36px;
215 min-width: 50px;
216 }
217
218 table:hover {
219 cursor: pointer;
220 }
221
222 .inputtitle {
223 line-height: 40px;
224 }
225
226 .shop {
227 margin-top: 20px;
228 }
229
230 .xz {
231 color: blue;
232 }
233
234 .noData {
235 color: #b2b2b2;
236 }
237 .table-bode{
238 height: 450px;
239 }
240 .page {
241 margin-top: 20px;
242 }
243
244 </style>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 <li @click="exportToShp">ESRI Shape</li> 67 <li @click="exportToShp">ESRI Shape</li>
68 </ul> 68 </ul>
69 </li> 69 </li>
70 <li v-show="isZD">导入属性</li> 70 <li v-show="isZD" @click="drsx">导入属性</li>
71 <li v-show="!isZD">导入楼盘</li> 71 <li v-show="!isZD">导入楼盘</li>
72 <li>重叠分析</li> 72 <li>重叠分析</li>
73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li> 73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
...@@ -101,13 +101,15 @@ ...@@ -101,13 +101,15 @@
101 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除</li> 101 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除</li>
102 </ul> 102 </ul>
103 103
104 <el-dialog title="导入图形" :visible.sync="improtDialog"> 104 <!--@close="closeImportDialog"-->
105 <el-dialog title="导入图形" :modal="false" :close-on-click-modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog">
105 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 106 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
106 </el-dialog> 107 </el-dialog>
107 <!-- 添加定着物弹框 --> 108 <!-- 添加定着物弹框 -->
108 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%"> 109 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
109 <Create @closeDialog="closeDialog" :auth="true"></Create> 110 <Create @closeDialog="closeDialog" :auth="true"></Create>
110 </el-dialog> 111 </el-dialog>
112 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
111 </div> 113 </div>
112 </template> 114 </template>
113 <script> 115 <script>
...@@ -119,6 +121,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils"; ...@@ -119,6 +121,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils";
119 import featureUpdate from "@libs/map/featureUpdate"; 121 import featureUpdate from "@libs/map/featureUpdate";
120 import {deleteLjz,deleteZdy} from "./../../api/lpb" 122 import {deleteLjz,deleteZdy} from "./../../api/lpb"
121 import exportTemJson from '@/assets/json/exportTemplate.json' 123 import exportTemJson from '@/assets/json/exportTemplate.json'
124 import sxdr from './../../components/sxdr/sxdr'
122 export default { 125 export default {
123 inheritAttrs: false, 126 inheritAttrs: false,
124 props: { 127 props: {
...@@ -132,10 +135,11 @@ export default { ...@@ -132,10 +135,11 @@ export default {
132 default: false, 135 default: false,
133 } 136 }
134 }, 137 },
135 components: { lineItem,Create,ImportGeo }, 138 components: { lineItem,Create,ImportGeo,sxdr },
136 mixins:[geoUtils,featureUpdate], 139 mixins:[geoUtils,featureUpdate],
137 data() { 140 data() {
138 return { 141 return {
142 sxdrVisible:false,
139 selectedDetail: {}, 143 selectedDetail: {},
140 timer: {}, 144 timer: {},
141 formatData: [], 145 formatData: [],
...@@ -195,6 +199,12 @@ export default { ...@@ -195,6 +199,12 @@ export default {
195 }, 199 },
196 200
197 methods: { 201 methods: {
202 drsx(){
203 this.sxdrVisible=true;
204 },
205 sxdrClose(){
206 this.sxdrVisible=false;
207 },
198 loading(){ 208 loading(){
199 this.$emit("loading") 209 this.$emit("loading")
200 }, 210 },
...@@ -432,6 +442,7 @@ export default { ...@@ -432,6 +442,7 @@ export default {
432 }else { 442 }else {
433 BSM = this.zdData.bsm; 443 BSM = this.zdData.bsm;
434 } 444 }
445 //当确定导入图形是 跳转到图形界面
435 this.queryGeoByBsm(BSM,type,function (features){ 446 this.queryGeoByBsm(BSM,type,function (features){
436 if(features && features.length > 0){ 447 if(features && features.length > 0){
437 if(features[0].geometry){ 448 if(features[0].geometry){
...@@ -440,6 +451,7 @@ export default { ...@@ -440,6 +451,7 @@ export default {
440 cancelButtonText: '取消', 451 cancelButtonText: '取消',
441 type: 'warning' 452 type: 'warning'
442 }).then(() => { 453 }).then(() => {
454 self.postionToMap();
443 self.improtDialog = true; 455 self.improtDialog = true;
444 self.currentClickZdGeo = features[0]; 456 self.currentClickZdGeo = features[0];
445 }).catch(() => { 457 }).catch(() => {
...@@ -449,11 +461,13 @@ export default { ...@@ -449,11 +461,13 @@ export default {
449 }); 461 });
450 }); 462 });
451 }else { 463 }else {
464 self.postionToMap();
452 self.currentClickZdGeo = features[0]; 465 self.currentClickZdGeo = features[0];
453 self.improtDialog = true; 466 self.improtDialog = true;
454 } 467 }
455 468
456 }else{ 469 }else{
470 self.postionToMap();
457 self.currentClickZdGeo = null; 471 self.currentClickZdGeo = null;
458 self.improtDialog = true; 472 self.improtDialog = true;
459 } 473 }
...@@ -502,7 +516,6 @@ export default { ...@@ -502,7 +516,6 @@ export default {
502 }).then(res => { 516 }).then(res => {
503 debugger 517 debugger
504 });*/ 518 });*/
505
506 }else{ 519 }else{
507 self.$message.warning("暂无空间信息!!!!"); 520 self.$message.warning("暂无空间信息!!!!");
508 } 521 }
...@@ -576,6 +589,7 @@ export default { ...@@ -576,6 +589,7 @@ export default {
576 //关闭图形弹框 589 //关闭图形弹框
577 closeImportDialog(){ 590 closeImportDialog(){
578 this.improtDialog = false; 591 this.improtDialog = false;
592 this.clearOverLayer();
579 } 593 }
580 594
581 }, 595 },
...@@ -724,4 +738,8 @@ export default { ...@@ -724,4 +738,8 @@ export default {
724 center; 738 center;
725 background-size: contain; 739 background-size: contain;
726 } 740 }
741 /deep/ .importDialog{
742 margin-top: 120px!important;
743 margin-left: 291px;
744 }
727 </style> 745 </style>
......
...@@ -38,14 +38,13 @@ ...@@ -38,14 +38,13 @@
38 esriMap 38 esriMap
39 ]) => { 39 ]) => {
40 var map = new esriMap({ 40 var map = new esriMap({
41 basemap:"hybrid" 41 basemap:"osm"
42 }); 42 });
43 //108.95 34.27 43 //108.95 34.27
44 var view = new MapView({ 44 var view = new MapView({
45 container: self.viewId, 45 container: self.viewId,
46 map: map, 46 map: map,
47 zoom:10, 47 zoom:10,
48 zoom:10,
49 center: [-0.154133333770497,0.6138183594020817], 48 center: [-0.154133333770497,0.6138183594020817],
50 spatialReference: { 49 spatialReference: {
51 wkid: 102100 50 wkid: 102100
......
...@@ -56,42 +56,7 @@ ...@@ -56,42 +56,7 @@
56 </el-form> 56 </el-form>
57 </el-col> 57 </el-col>
58 </el-row> 58 </el-row>
59 <!-- <el-row :gutter="10" class="shop"> 59 <div class="table-data">
60 <el-col :span="4" class="inputtitle">
61 宗地编码:
62 </el-col>
63 <el-col :span="8" class="">
64 <el-input v-model="queryData.zddm"></el-input>
65 </el-col>
66 <el-col :span="4" class="inputtitle">
67 不动产权证号:
68 </el-col>
69 <el-col :span="8" class="">
70 <el-input v-model="queryData.bdcqzh"></el-input>
71 </el-col>
72 </el-row> -->
73 <!-- <el-row :gutter="10">
74 <el-col :span="4" class="inputtitle">
75 不动产单元号:
76 </el-col>
77 <el-col :span="8">
78 <el-input v-model="queryData.bdcdyh"></el-input>
79 </el-col>
80 <el-col :span="4" class="inputtitle">
81 权利人:
82 </el-col>
83 <el-col :span="8">
84 <el-input v-model="queryData.qlrmc"></el-input>
85 </el-col>
86 </el-row>
87 <el-row :gutter="10">
88 <el-col :span="4" class="inputtitle">
89 坐落:
90 </el-col>
91 <el-col :span="8">
92 <el-input v-model="queryData.zl"></el-input>
93 </el-col>
94 </el-row> -->
95 <table border="1"> 60 <table border="1">
96 <tr> 61 <tr>
97 <td>序号</td> 62 <td>序号</td>
...@@ -120,9 +85,9 @@ ...@@ -120,9 +85,9 @@
120 <td>{{item.qlr}}</td> 85 <td>{{item.qlr}}</td>
121 <td>{{item.zl}}</td> 86 <td>{{item.zl}}</td>
122 </tr> 87 </tr>
123
124 </table> 88 </table>
125 </div> 89 </div>
90 </div>
126 <div class="page"> 91 <div class="page">
127 <el-pagination 92 <el-pagination
128 background 93 background
...@@ -145,7 +110,7 @@ ...@@ -145,7 +110,7 @@
145 name: "queryData", 110 name: "queryData",
146 data() { 111 data() {
147 return { 112 return {
148 total:1, 113 total: 1,
149 queryData: { 114 queryData: {
150 bdcdyh: "", 115 bdcdyh: "",
151 bdcqzh: "", 116 bdcqzh: "",
...@@ -175,9 +140,9 @@ ...@@ -175,9 +140,9 @@
175 return ['zd'] 140 return ['zd']
176 } 141 }
177 }, 142 },
178 isZdClose:{ 143 isZdClose: {
179 type:Boolean, 144 type: Boolean,
180 default:false 145 default: false
181 } 146 }
182 }, 147 },
183 mounted() { 148 mounted() {
...@@ -190,7 +155,7 @@ ...@@ -190,7 +155,7 @@
190 this.queryData.pageNo = val; 155 this.queryData.pageNo = val;
191 this.getData(this.queryData); 156 this.getData(this.queryData);
192 }, 157 },
193 reset(){ 158 reset() {
194 this.queryData = { 159 this.queryData = {
195 bdcdyh: "", 160 bdcdyh: "",
196 bdcqzh: "", 161 bdcqzh: "",
...@@ -204,23 +169,23 @@ ...@@ -204,23 +169,23 @@
204 }; 169 };
205 this.getData(this.queryData) 170 this.getData(this.queryData)
206 }, 171 },
207 getData(data){ 172 getData(data) {
208 data['dylxs'] = this.dylxs; 173 data['dylxs'] = this.dylxs;
209 getSearchList(data).then(res => { 174 getSearchList(data).then(res => {
210 this.Data = res.result.records 175 this.Data = res.result.records
211 this.total = res.result.total; 176 this.total = res.result.total;
212 }) 177 })
213 }, 178 },
214 search(){ 179 search() {
215 this.getData(this.queryData) 180 this.getData(this.queryData)
216 }, 181 },
217 addData(val){ 182 addData(val) {
218 this.$emit("getData", val) 183 this.$emit("getData", val)
219 if (this.isZdClose) { 184 if (this.isZdClose) {
220 this.close(); 185 this.close();
221 } 186 }
222 }, 187 },
223 close(){ 188 close() {
224 this.$emit('close') 189 this.$emit('close')
225 this.reset(); 190 this.reset();
226 } 191 }
...@@ -241,7 +206,8 @@ ...@@ -241,7 +206,8 @@
241 height: auto; 206 height: auto;
242 width: 80%; 207 width: 80%;
243 } 208 }
244 /deep/ .el-form-item__label{ 209
210 /deep/ .el-form-item__label {
245 width: 96px; 211 width: 96px;
246 text-align: right; 212 text-align: right;
247 } 213 }
...@@ -251,7 +217,7 @@ ...@@ -251,7 +217,7 @@
251 background-color: #fff; 217 background-color: #fff;
252 font-size: 14px; 218 font-size: 14px;
253 width: 100%; 219 width: 100%;
254 tr:hover{ 220 tr:hover {
255 background-color: #F5F7FA; 221 background-color: #F5F7FA;
256 } 222 }
257 } 223 }
...@@ -281,7 +247,10 @@ ...@@ -281,7 +247,10 @@
281 .noData { 247 .noData {
282 color: #b2b2b2; 248 color: #b2b2b2;
283 } 249 }
284 .page{ 250 .table-data{
251 height: 450px;
252 }
253 .page {
285 margin-top: 20px; 254 margin-top: 20px;
286 } 255 }
287 256
......
1 <template>
2 <div>
3 <el-dialog
4 title="属性导入"
5 :visible.sync="isVisible"
6 width="30%"
7 :before-close="close">
8 <div class="main-button">
9 <el-upload
10 class="upload-demo"
11 :action="uploadUrl"
12 :data="sxdrData"
13 :on-success="uploadSuccess"
14 :show-file-list="false"
15 multiple
16 >
17 <el-button type="primary">上传</el-button>
18 <el-button type="primary" @click="downloadTemplate">下载模板</el-button>
19 </el-upload>
20 </div>
21 <ul>
22 <li v-for="(item,index) in errorData" :key="index">{{item}}</li>
23 </ul>
24 <span slot="footer" class="dialog-footer">
25 <el-button @click="dialogVisible = false">取 消</el-button>
26 <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
27 </span>
28 </el-dialog>
29 </div>
30 </template>
31
32 <script>
33
34 export default {
35 name: "sxdr",
36 props: {
37 sxdrVisible: {
38 type: Boolean,
39 default: false
40 },
41 dylx: {
42 type: String,
43 },
44 bsm: {
45 type: String
46 }
47 },
48 data() {
49 return {
50 uploadUrl: '',
51 isVisible: false,
52 sxdrData: {
53 bsm: ''
54 },
55 errorData: []
56 }
57 },
58 mounted() {
59 this.$store.state.sxdrType = '';
60 },
61 methods: {
62 loading() {
63 this.$store.state.sxdrType = this.dylx;
64 },
65 reset() {
66 this.errorData = [];
67 this.uploadUrl = '';
68 this.sxdrData = {bsm: ''};
69 },
70 close() {
71 this.$emit('close')
72 this.reset();
73 },
74 downloadTemplate() {
75 window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
76 },
77 uploadSuccess(res, file, fileList) {
78 if (res.success) {
79 this.$message.success("上传成功")
80 debugger
81 this.loading();
82 this.close()
83 } else {
84 this.$message.error("上传失败")
85 this.errorData = res.result
86 }
87 }
88 },
89 watch: {
90 sxdrVisible(val) {
91 this.isVisible = val;
92 },
93 dylx(val) {
94 switch (val) {
95 case "zd":
96 this.uploadUrl = "/api/tx/excelGeo/Zdimport";
97 break;
98 default:
99 break;
100 }
101 },
102 bsm(val) {
103 this.sxdrData.bsm = val;
104 }
105 }
106 }
107 </script>
108
109 <style scoped lang="less">
110 .main-button {
111 display: -webkit-flex;
112 display: flex;
113 flex-direction: column-reverse;
114 flex-wrap: nowrap;
115 }
116
117 ul {
118 margin-top: 20px;
119 li {
120 line-height: 15px;
121 color: red;
122 }
123 }
124 </style>
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
53 </el-form> 53 </el-form>
54 </el-col> 54 </el-col>
55 </el-row> 55 </el-row>
56 <div class="table-bode">
56 <table border="1"> 57 <table border="1">
57 <tr> 58 <tr>
58 <td>序号</td> 59 <td>序号</td>
...@@ -81,9 +82,9 @@ ...@@ -81,9 +82,9 @@
81 <td>{{item.qlr}}</td> 82 <td>{{item.qlr}}</td>
82 <td>{{item.zl}}</td> 83 <td>{{item.zl}}</td>
83 </tr> 84 </tr>
84
85 </table> 85 </table>
86 </div> 86 </div>
87 </div>
87 <div class="page"> 88 <div class="page">
88 <el-pagination 89 <el-pagination
89 background 90 background
...@@ -106,13 +107,11 @@ ...@@ -106,13 +107,11 @@
106 name: "zdQueryData", 107 name: "zdQueryData",
107 data() { 108 data() {
108 return { 109 return {
109 total:1, 110 total: 1,
110 queryData: { 111 queryData: {
111 bdcdyh: "", 112 bdcdyh: "",
112 bdcqzh: "", 113 bdcqzh: "",
113 dylxs: ['zd'],
114 qlrmc: "", 114 qlrmc: "",
115 qszt: ["2"],
116 xmmc: "", 115 xmmc: "",
117 zddm: "", 116 zddm: "",
118 zl: "", 117 zl: "",
...@@ -130,15 +129,9 @@ ...@@ -130,15 +129,9 @@
130 return false 129 return false
131 } 130 }
132 }, 131 },
133 qszt:{ 132 isZdClose: {
134 type:Array, 133 type: Boolean,
135 default:function () { 134 default: false
136 return ['2']
137 }
138 },
139 isZdClose:{
140 type:Boolean,
141 default:false
142 } 135 }
143 }, 136 },
144 mounted() { 137 mounted() {
...@@ -156,7 +149,6 @@ ...@@ -156,7 +149,6 @@
156 bdcdyh: "", 149 bdcdyh: "",
157 bdcqzh: "", 150 bdcqzh: "",
158 qlrmc: "", 151 qlrmc: "",
159 qszt: ["2"],
160 xmmc: "", 152 xmmc: "",
161 zddm: "", 153 zddm: "",
162 zl: "", 154 zl: "",
...@@ -166,7 +158,6 @@ ...@@ -166,7 +158,6 @@
166 this.getData(this.queryData) 158 this.getData(this.queryData)
167 }, 159 },
168 getData: function (data) { 160 getData: function (data) {
169 data['dylxs'] = this.dylxs;
170 zdlist(data).then(res => { 161 zdlist(data).then(res => {
171 this.Data = res.result.records 162 this.Data = res.result.records
172 this.total = res.result.total; 163 this.total = res.result.total;
...@@ -202,18 +193,18 @@ ...@@ -202,18 +193,18 @@
202 height: auto; 193 height: auto;
203 width: 80%; 194 width: 80%;
204 } 195 }
205 /deep/ .el-form-item__label{ 196
197 /deep/ .el-form-item__label {
206 width: 96px; 198 width: 96px;
207 text-align: right; 199 text-align: right;
208 } 200 }
209 201
210
211 table { 202 table {
212 margin-top: 10px; 203 margin-top: 10px;
213 background-color: #fff; 204 background-color: #fff;
214 font-size: 14px; 205 font-size: 14px;
215 width: 100%; 206 width: 100%;
216 tr:hover{ 207 tr:hover {
217 background-color: #F5F7FA; 208 background-color: #F5F7FA;
218 } 209 }
219 } 210 }
...@@ -243,7 +234,10 @@ ...@@ -243,7 +234,10 @@
243 .noData { 234 .noData {
244 color: #b2b2b2; 235 color: #b2b2b2;
245 } 236 }
246 .page{ 237 .table-bode{
238 height: 450px;
239 }
240 .page {
247 margin-top: 20px; 241 margin-top: 20px;
248 } 242 }
249 243
......
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
24 identifyParameters.tolerance = tolerance ? tolerance : 3; 24 identifyParameters.tolerance = tolerance ? tolerance : 3;
25 identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent; 25 identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent;
26 identifyParameters.returnGeometry = returnGeometry ? returnGeometry : false; 26 identifyParameters.returnGeometry = returnGeometry ? returnGeometry : false;
27 //identifyParameters.returnFieldName = false; 27 //identifyParameters.returnFieldName = true;
28 identifyParameters.spatialReference = geometry.spatialReference; 28 identifyParameters.spatialReference = geometry.spatialReference;
29 identifyTask.execute(identifyParameters).then(result => { 29 identifyTask.execute(identifyParameters).then(result => {
30 if(callBackFunction && typeof callBackFunction == 'function'){ 30 if(callBackFunction && typeof callBackFunction == 'function'){
......
...@@ -22,20 +22,29 @@ export default { ...@@ -22,20 +22,29 @@ export default {
22 var featureLayer = new FeatureLayer({ 22 var featureLayer = new FeatureLayer({
23 url:url 23 url:url
24 }) 24 })
25 var saveGraphics = [];
26 if(!Array.isArray(graphic)){
27 graphic = [graphic];
28 }
29 for(var i = 0;i < graphic.length;i++){
25 var geo = null; 30 var geo = null;
26 if(graphic.geometry.type == 'point'){ 31 if(!graphic[i].geometry){
27 geo = new Point(graphic.geometry); 32 geo = null;
28 }else if(graphic.geometry.type == 'polyline'){ 33 }else if(graphic[i].geometry.type == 'point'){
29 geo = new Polyline(graphic.geometry); 34 geo = new Point(graphic[i].geometry);
30 }else if(graphic.geometry.type == 'polygon'){ 35 }else if(graphic[i].geometry.type == 'polyline'){
31 geo = new Polygon(graphic.geometry); 36 geo = new Polyline(graphic[i].geometry);
37 }else if(graphic[i].geometry.type == 'polygon'){
38 geo = new Polygon(graphic[i].geometry);
32 } 39 }
33 var saveGraphic = new Graphic({ 40 var saveGraphic = new Graphic({
34 attributes:graphic.attributes, 41 attributes:graphic[i].attributes,
35 geometry:geo 42 geometry:geo
36 }); 43 });
44 saveGraphics.push(saveGraphic);
45 }
37 featureLayer.applyEdits({ 46 featureLayer.applyEdits({
38 addFeatures:[saveGraphic] 47 addFeatures:saveGraphics
39 }).then(function (res){ 48 }).then(function (res){
40 if(callBackFunction && typeof callBackFunction == 'function'){ 49 if(callBackFunction && typeof callBackFunction == 'function'){
41 callBackFunction(res); 50 callBackFunction(res);
...@@ -62,20 +71,30 @@ export default { ...@@ -62,20 +71,30 @@ export default {
62 var featureLayer = new FeatureLayer({ 71 var featureLayer = new FeatureLayer({
63 url:url 72 url:url
64 }) 73 })
74 var updGraphics = [];
75 if(!Array.isArray(graphic)){
76 graphic = [graphic];
77 }
78 for(var i = 0;i < graphic.length;i++){
65 var geo = null; 79 var geo = null;
66 if(graphic.geometry.type == 'point'){ 80 if(!graphic[i].geometry){
67 geo = new Point(graphic.geometry); 81 geo = new Polygon();
68 }else if(graphic.geometry.type == 'polyline'){ 82 }else if(graphic[i].geometry.type == 'point'){
69 geo = new Polyline(graphic.geometry); 83 geo = new Point(graphic[i].geometry);
70 }else if(graphic.geometry.type == 'polygon'){ 84 }else if(graphic[i].geometry.type == 'polyline'){
71 geo = new Polygon(graphic.geometry); 85 geo = new Polyline(graphic[i].geometry);
86 }else if(graphic[i].geometry.type == 'polygon'){
87 geo = new Polygon(graphic[i].geometry);
72 } 88 }
73 var updGraphic = new Graphic({ 89 var updGraphic = new Graphic({
74 attributes:graphic.attributes, 90 attributes:graphic[i].attributes,
75 geometry:geo 91 geometry:geo
76 }); 92 });
93 updGraphics.push(updGraphic);
94 }
95
77 featureLayer.applyEdits({ 96 featureLayer.applyEdits({
78 updateFeatures:[updGraphic] 97 updateFeatures:updGraphics
79 }).then(function (res){ 98 }).then(function (res){
80 if(callBackFunction && typeof callBackFunction == 'function'){ 99 if(callBackFunction && typeof callBackFunction == 'function'){
81 callBackFunction(res); 100 callBackFunction(res);
...@@ -102,21 +121,31 @@ export default { ...@@ -102,21 +121,31 @@ export default {
102 var featureLayer = new FeatureLayer({ 121 var featureLayer = new FeatureLayer({
103 url:url 122 url:url
104 }) 123 })
124 var delGraphics = [];
125 if(!Array.isArray(graphic)){
126 graphic = [graphic];
127 }
128 for(var i = 0;i < graphic.length;i++){
105 var geo = null; 129 var geo = null;
106 if(graphic.geometry.type == 'point'){ 130 if(!graphic[i].geometry){
107 geo = new Point(graphic.geometry); 131 geo = null;
108 }else if(graphic.geometry.type == 'polyline'){ 132 }else if(graphic[i].geometry.type == 'point'){
109 geo = new Polyline(graphic.geometry); 133 geo = new Point(graphic[i].geometry);
110 }else if(graphic.geometry.type == 'polygon'){ 134 }else if(graphic[i].geometry.type == 'polyline'){
111 geo = new Polygon(graphic.geometry); 135 geo = new Polyline(graphic[i].geometry);
136 }else if(graphic[i].geometry.type == 'polygon'){
137 geo = new Polygon(graphic[i].geometry);
112 } 138 }
113 var delGraphic = new Graphic({ 139 var delGraphic = new Graphic({
114 attributes:graphic.attributes, 140 attributes:graphic[i].attributes,
115 geometry:geo 141 geometry:geo
116 }); 142 });
143 delGraphics.push(delGraphic);
144 }
145
117 146
118 featureLayer.applyEdits({ 147 featureLayer.applyEdits({
119 deleteFeatures:[delGraphic] 148 deleteFeatures:delGraphics
120 }).then(function (res){ 149 }).then(function (res){
121 if(callBackFunction && typeof callBackFunction == 'function'){ 150 if(callBackFunction && typeof callBackFunction == 'function'){
122 callBackFunction(res); 151 callBackFunction(res);
......
...@@ -28,7 +28,7 @@ export default{ ...@@ -28,7 +28,7 @@ export default{
28 where += " and "; 28 where += " and ";
29 } 29 }
30 if(Array.isArray(parames[i].value)){ 30 if(Array.isArray(parames[i].value)){
31 where += parames[i].name + " in (" + parames[i].value.toString + ")"; 31 where += parames[i].name + " in (" + parames[i].value.toString() + ")";
32 }else if(typeof parames[i].value == 'number'){ 32 }else if(typeof parames[i].value == 'number'){
33 where += parames[i].name + " =" + parames[i].value ; 33 where += parames[i].name + " =" + parames[i].value ;
34 }else{ 34 }else{
......
...@@ -15,6 +15,7 @@ const store = new Vuex.Store({ ...@@ -15,6 +15,7 @@ const store = new Vuex.Store({
15 zdmj: '', // 宗地面积 15 zdmj: '', // 宗地面积
16 zdzl: '', // 宗地坐落 16 zdzl: '', // 宗地坐落
17 rightClickZdbsm:'', //右键菜单传入的zdbsm 17 rightClickZdbsm:'', //右键菜单传入的zdbsm
18 sxdrType:'', // zd/zrz/dz/h 导入属性刷新数据
18 tdytList:[], 19 tdytList:[],
19 tddjList:[], 20 tddjList:[],
20 qlxzList:[], 21 qlxzList:[],
......
...@@ -293,9 +293,10 @@ ...@@ -293,9 +293,10 @@
293 </tr> 293 </tr>
294 </table> 294 </table>
295 </div> 295 </div>
296 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
297 :isZdClose="true" 297 :isClose="true"
298 @close="close"></query-data> 298 @close="close">
299 </dz-query-data>
299 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 300 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
300 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 301 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
301 </div> 302 </div>
...@@ -310,7 +311,7 @@ ...@@ -310,7 +311,7 @@
310 <ul> 311 <ul>
311 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li> 312 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
312 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li> 313 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
313 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>s's's's's's's's's's's's's's's's's's's 314 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>
314 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li> 315 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
315 <li><span>权利人:</span>{{hFgqData.qlr}}</li> 316 <li><span>权利人:</span>{{hFgqData.qlr}}</li>
316 <li><span>坐落:</span>{{hFgqData.zl}}</li> 317 <li><span>坐落:</span>{{hFgqData.zl}}</li>
...@@ -331,7 +332,7 @@ ...@@ -331,7 +332,7 @@
331 </div> 332 </div>
332 <ul> 333 <ul>
333 <li v-for="(item,index) in zdZxx.dzList" :key="index" 334 <li v-for="(item,index) in zdZxx.dzList" :key="index"
334 :class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}} 335 :class="(index+1)%2===0?'':'oddborder'">{{item.xmmc}}
335 </li> 336 </li>
336 </ul> 337 </ul>
337 </div> 338 </div>
...@@ -455,11 +456,12 @@ ...@@ -455,11 +456,12 @@
455 import {getHZdxx} from './../../../../api/h' 456 import {getHZdxx} from './../../../../api/h'
456 import QueryData from './../../../../components/queryData/queryData' 457 import QueryData from './../../../../components/queryData/queryData'
457 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 458 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
459 import dzQueryData from './../../../../components/dzQueryData/dzQueryData'
458 import {Message} from 'element-ui' 460 import {Message} from 'element-ui'
459 461
460 export default { 462 export default {
461 name: "", 463 name: "",
462 components: {QueryData, zdQueryData}, 464 components: {QueryData, zdQueryData,dzQueryData},
463 props: {}, 465 props: {},
464 data() { 466 data() {
465 return { 467 return {
...@@ -557,7 +559,7 @@ ...@@ -557,7 +559,7 @@
557 this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1); 559 this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1);
558 this.tempBsmList = this.tempBsmList.filter(i => i!== bsm); 560 this.tempBsmList = this.tempBsmList.filter(i => i!== bsm);
559 this.dzFgqZrzData.forEach(i=>{ 561 this.dzFgqZrzData.forEach(i=>{
560 if (i.bsm == bsm) { 562 if (i.bsm === bsm) {
561 i.hasChoosed = "" 563 i.hasChoosed = ""
562 } 564 }
563 }) 565 })
...@@ -667,7 +669,7 @@ ...@@ -667,7 +669,7 @@
667 if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){ 669 if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){
668 // this.zdZrzList[childIndex].hasChoosed = index; 670 // this.zdZrzList[childIndex].hasChoosed = index;
669 if(fwlist.zrzlist.indexOf(bsm) < 0){ 671 if(fwlist.zrzlist.indexOf(bsm) < 0){
670 if(fwlist.ztype == 'zrz' && fwlist.zrzlist.length>0){ 672 if(fwlist.ztype === 'zrz' && fwlist.zrzlist.length>0){
671 Message.warning("当前幢类型只能选择一个自然幢") 673 Message.warning("当前幢类型只能选择一个自然幢")
672 }else{ 674 }else{
673 //存入当前选择幢信息的bsm 675 //存入当前选择幢信息的bsm
...@@ -744,7 +746,7 @@ ...@@ -744,7 +746,7 @@
744 } 746 }
745 }, 747 },
746 saveZd() { 748 saveZd() {
747 if(this.tempBsmList.length == (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 749 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
748 zdfg(this.zdFghData).then(res => { 750 zdfg(this.zdFghData).then(res => {
749 if (res.success) { 751 if (res.success) {
750 this.$store.state.zdbsms = res.result; 752 this.$store.state.zdbsms = res.result;
...@@ -973,9 +975,9 @@ ...@@ -973,9 +975,9 @@
973 }, 975 },
974 dzFgqData: { 976 dzFgqData: {
975 handler: function (item) { 977 handler: function (item) {
976 this.dzFgqData.oldZdbsm = item.glbsm; 978 this.dzFgqData.oldZdbsm = item.bsm;
977 this.getDzZdjbxx(item.glbsm); 979 this.getDzZdjbxx(item.bsm);
978 this.dzfgGetZrzxx(item.glbsm) 980 this.dzfgGetZrzxx(item.bsm)
979 }, 981 },
980 deep: true 982 deep: true
981 }, 983 },
......
...@@ -76,15 +76,20 @@ export default { ...@@ -76,15 +76,20 @@ export default {
76 }, 76 },
77 mixins:[mapLayerManager,findTask], 77 mixins:[mapLayerManager,findTask],
78 mounted(){ 78 mounted(){
79 var query = this.$route.query; 79
80 var query = this.$route.query
81 var self = this;
82 setTimeout(function () {
80 if(query && JSON.stringify(query) != "{}"){ 83 if(query && JSON.stringify(query) != "{}"){
81 //self.addGeoByBsm(query.bsm,query.type,self.viewId); 84 //self.addGeoByBsm(query.bsm,query.type,self.viewId);
82 if(query.type == 'zd'){ 85 if(query.type == 'zd'){
83 this.getRightTree(query.bsm) 86 self.getRightTree(query.bsm)
84 }else if(query.type == 'zrz'){ 87 }else if(query.type == 'zrz'){
85 this.getRightTreeByZrzbsm(query.bsm); 88 self.getRightTreeByZrzbsm(query.bsm);
86 } 89 }
87 } 90 }
91 },500);
92
88 93
89 }, 94 },
90 methods:{ 95 methods:{
...@@ -93,9 +98,9 @@ export default { ...@@ -93,9 +98,9 @@ export default {
93 var view = maps[this.viewId]; 98 var view = maps[this.viewId];
94 view.ui.remove('zoom'); 99 view.ui.remove('zoom');
95 loadModules([ 100 loadModules([
96 "esri/layers/MapImageLayer", 101 "esri/layers/MapImageLayer"
97 ]).then(([ 102 ]).then(([
98 MapImageLayer, 103 MapImageLayer
99 ])=>{ 104 ])=>{
100 var mapImageLayer = new MapImageLayer({ 105 var mapImageLayer = new MapImageLayer({
101 url:self.layerUrl, 106 url:self.layerUrl,
...@@ -137,9 +142,11 @@ export default { ...@@ -137,9 +142,11 @@ export default {
137 }, 142 },
138 //图层选择事件 143 //图层选择事件
139 selectLayerChange(){ 144 selectLayerChange(){
145 debugger
140 var self = this; 146 var self = this;
147 this.features = [];
141 var layerAndResult = this.results.filter(function (item) { 148 var layerAndResult = this.results.filter(function (item) {
142 return item.layerId = self.selectResLayerId; 149 return item.layerId == self.selectResLayerId;
143 }) 150 })
144 if(layerAndResult){ 151 if(layerAndResult){
145 this.features = layerAndResult[0].features; 152 this.features = layerAndResult[0].features;
......
...@@ -79,12 +79,12 @@ export default { ...@@ -79,12 +79,12 @@ export default {
79 return; 79 return;
80 } 80 }
81 for(var i = 0;i < searchResult.length;i++){ 81 for(var i = 0;i < searchResult.length;i++){
82 var layer = view.map.findLayerById("searchResult"+searchResult.layerName); 82 var layer = view.map.findLayerById("searchResult"+searchResult[i].layerId);
83 if(layer){ 83 if(layer){
84 layer.removeAll(); 84 layer.removeAll();
85 }else{ 85 }else{
86 layer = new GraphicsLayer({ 86 layer = new GraphicsLayer({
87 id:"searchResult"+searchResult.layerName 87 id:"searchResult"+searchResult[i].layerId
88 }) 88 })
89 view.map.add(layer); 89 view.map.add(layer);
90 } 90 }
......