Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5eab16e7 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 4e928d97 3f1fb4a7
Inline Side-by-side
Showing 22 changed files with 853 additions and 119 deletions
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 "lint": "vue-cli-service lint" 12 "lint": "vue-cli-service lint"
13 }, 13 },
14 "dependencies": { 14 "dependencies": {
15 "@antv/g6": "^4.0.2", 15 "@antv/g6": "^4.0.3",
16 "axios": "^0.19.0", 16 "axios": "^0.19.0",
17 "core-js": "^2.6.5", 17 "core-js": "^2.6.5",
18 "e-icon-picker": "^1.0.7", 18 "e-icon-picker": "^1.0.7",
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 "fillSymbol": { 8 "fillSymbol": {
9 "defaultSymbol": { 9 "defaultSymbol": {
10 "type": "simple-fill", 10 "type": "simple-fill",
11 "color": [ 0,233, 245, 0.8 ], 11 "color": [ 0,233, 245, 0.4 ],
12 "style": "solid", 12 "style": "solid",
13 "outline": { 13 "outline": {
14 "color": "#00e9f5", 14 "color": "#00e9f5",
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 }, 17 },
18 "highlightSymbol": { 18 "highlightSymbol": {
19 "type": "simple-fill", 19 "type": "simple-fill",
20 "color": [ 245,3, 37, 0.8 ], 20 "color": [ 245,3, 37, 0.4 ],
21 "style": "solid", 21 "style": "solid",
22 "outline": { 22 "outline": {
23 "color": "#f50325", 23 "color": "#f50325",
......
1 [{ 1 [{
2 "layerName": "ZDJBXX", 2 "layerName": "ZDJBXX",
3 "layerLabel": "宗地",
3 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer", 4 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
4 "id": "8" 5 "id":8,
6 "fieldAliases": {
7 "BSM": "标识码",
8 "YSDM": "要素代码",
9 "ZDDM": "宗地代码",
10 "BDCDYH": "不动产单元号",
11 "ZDTZM": "宗地特征码",
12 "ZL": "坐落",
13 "ZDMJ": "宗地面积",
14 "MJDW": "面积单位",
15 "YT": "用途",
16 "DJ": "等级",
17 "JG": "价格",
18 "QLLX": "权利类型",
19 "QLXZ": "权利性质",
20 "QLSDFS": "权利设定方式",
21 "RJL": "容积率",
22 "JZMD": "建筑密度",
23 "JZXG": "建筑限高",
24 "ZDSZD": "宗地四至-东",
25 "ZDSZN": "宗地四至-南",
26 "ZDSZX": "宗地四至-西",
27 "ZDSZB": "宗地四至-北",
28 "TFH": "图幅号",
29 "DJH": "地籍号",
30 "DAH": "档案号",
31 "BZ": "备注",
32 "ZT": "状态",
33 "YWZT": "业务状态",
34 "XMMC": "项目名称",
35 "BGRQ": "变更日期",
36 "TDZH": "土地证号"
37 }
5 }, 38 },
6 { 39 {
7 "layerName": "ZRZ", 40 "layerName": "ZRZ",
41 "layerLabel": "自然幢",
8 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer", 42 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
9 "id": "10" 43 "id": 10,
44 "fieldAliases": {
45 "YSDM": "要素代码",
46 "BDCDYH": "不动产单元号",
47 "ZDDM": "宗地代码",
48 "ZRZH": "自然幢号",
49 "XMMC": "项目名称",
50 "JZWMC": "建筑物名称",
51 "JGRQ": "竣工日期",
52 "JZWGD": "建筑物高度",
53 "ZZDMJ": "幢占地面积",
54 "ZYDMJ": "幢用地面积",
55 "YCJZMJ": "预测建筑面积",
56 "SCJZMJ": "实测建筑面积",
57 "ZCS": "总层数",
58 "DSCS": "地上层数",
59 "DXCS": "地下层数",
60 "DXSD": "地下深度",
61 "GHYT": "规划用途",
62 "FWJG": "房屋结构",
63 "ZTS": "总套数",
64 "JZWJBYT": "建筑物基本用途",
65 "DAH": "档案号",
66 "BZ": "备注",
67 "ZT": "状态",
68 "YWZT": "业务状态",
69 "BSM": "标识码"
70 }
10 }, 71 },
11 { 72 {
12 "layerName": "DJQ", 73 "layerName": "DJQ",
74 "layerLabel": "地籍区",
13 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer", 75 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
14 "id": "13" 76 "id": 13,
77 "fieldAliases": {
78 "BSM": "标识码",
79 "YSDM": "要素代码",
80 "DJQDM": "地籍区代码",
81 "DJQMC": "地籍区名称"
82 }
15 }, 83 },
16 { 84 {
17 "layerName": "DJZQ", 85 "layerName": "DJZQ",
86 "layerLabel": "地籍子区",
18 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer", 87 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
19 "id": "14" 88 "id": 14,
89 "fieldAliases": {
90 "BSM": "标识码",
91 "YSDM": "要素代码",
92 "DJZQDM": "地籍子区代码",
93 "DJZQMC": "地籍子区名称"
94 }
20 }, 95 },
21 { 96 {
22 "layerName": "XJZQ", 97 "layerName": "XJZQ",
98 "layerLabel": "行政区",
23 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer", 99 "layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
24 "id": "19" 100 "id": 19,
101 "fieldAliases": {
102 "BSM": "标识码",
103 "YSDM": "要素代码",
104 "XZQDM": "行政区代码",
105 "XZQMC": "行政区名称",
106 "XZQMJ": "行政区面积"
107 }
108
25 } 109 }
26 ] 110 ]
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -242,4 +242,10 @@ ol, ul { list-style:none; } ...@@ -242,4 +242,10 @@ ol, ul { list-style:none; }
242 } 242 }
243 .creat:hover:focus{ 243 .creat:hover:focus{
244 opacity: .8!important; 244 opacity: .8!important;
245 }
246 .iconfontEdit{
247 cursor: pointer;
248 }
249 .iconfontEdit:hover{
250 color: rgb(0, 108, 255);
245 } 251 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -6,6 +6,7 @@ import layers from '@/assets/json/layers.json' ...@@ -6,6 +6,7 @@ import layers from '@/assets/json/layers.json'
6 import queryUtils from "@libs/map/queryUtils"; 6 import queryUtils from "@libs/map/queryUtils";
7 import identifyUtils from '@/libs/map/IdentifyUtils' 7 import identifyUtils from '@/libs/map/IdentifyUtils'
8 import {loadModules} from "esri-loader" 8 import {loadModules} from "esri-loader"
9 import featureUpdate from "@libs/map/featureUpdate";
9 import arcgisParser from 'terraformer-arcgis-parser' 10 import arcgisParser from 'terraformer-arcgis-parser'
10 import wktParse from 'terraformer-wkt-parser' 11 import wktParse from 'terraformer-wkt-parser'
11 12
...@@ -199,11 +200,38 @@ export default { ...@@ -199,11 +200,38 @@ export default {
199 if(callBacFunction && typeof callBacFunction == "function"){ 200 if(callBacFunction && typeof callBacFunction == "function"){
200 callBacFunction(isJoint,message); 201 callBacFunction(isJoint,message);
201 } 202 }
202 }) 203 },true)
203 }).catch(err => { 204 }).catch(err => {
204 console.log(err); 205 console.log(err);
205 throw (err); 206 throw (err);
206 }) 207 })
208 },
209 //保存或者编辑属性信息
210 updAttributes(bsm,type,attributes,callBackFunction){
211 var layer = null;
212 if(type == 'zd'){
213 layer = this.getLayerByName("ZDJBXX");
214 }else{
215 layer = this.getLayerByName("ZRZ");
216 }
217 var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
218 featureUrl += "/"+layer.id;
219 this.queryGeoByBsm(bsm,type,function (features) {
220 if(features && features.length > 0){
221 attributes.OBJECTID = features[0].attributes.OBJECTID;
222 features[0].attributes = attributes;
223 var wkt = "PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]";
224 features[0].geometry.spatialReference = {
225 wkt:wkt
226 }
227 featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction);
228 }else{
229 var graphic = {
230 attributes:attributes
231 }
232 featureUpdate.methods.addGraphic(featureUrl,graphic,callBackFunction) ;
233 }
234 });
207 } 235 }
208 236
209 } 237 }
......
...@@ -3,7 +3,7 @@ import {loadModules} from 'esri-loader' ...@@ -3,7 +3,7 @@ import {loadModules} from 'esri-loader'
3 export default { 3 export default {
4 methods: { 4 methods: {
5 5
6 identify(url,layerIds,geometry ,callBackFunction){ 6 identify(url,layerIds,geometry,callBackFunction,returnGeometry,layerOption,tolerance,mapExtent){
7 var self = this; 7 var self = this;
8 loadModules([ 8 loadModules([
9 "esri/tasks/IdentifyTask", 9 "esri/tasks/IdentifyTask",
...@@ -20,10 +20,11 @@ export default { ...@@ -20,10 +20,11 @@ export default {
20 if(layerIds){ 20 if(layerIds){
21 identifyParameters.layerIds = layerIds; 21 identifyParameters.layerIds = layerIds;
22 } 22 }
23 identifyParameters.layerOption = "all"; 23 identifyParameters.layerOption = layerOption ? layerOption : "all";
24 identifyParameters.tolerance = 3; 24 identifyParameters.tolerance = tolerance ? tolerance : 3;
25 identifyParameters.mapExtent = geometry.extent; 25 identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent;
26 identifyParameters.returnGeometry = true; 26 identifyParameters.returnGeometry = returnGeometry ? returnGeometry : false;
27 //identifyParameters.returnFieldName = false;
27 identifyParameters.spatialReference = geometry.spatialReference; 28 identifyParameters.spatialReference = geometry.spatialReference;
28 identifyTask.execute(identifyParameters).then(result => { 29 identifyTask.execute(identifyParameters).then(result => {
29 if(callBackFunction && typeof callBackFunction == 'function'){ 30 if(callBackFunction && typeof callBackFunction == 'function'){
......
...@@ -87,15 +87,36 @@ export default { ...@@ -87,15 +87,36 @@ export default {
87 }, 87 },
88 delGraphic(url,graphic,callBackFunction){ 88 delGraphic(url,graphic,callBackFunction){
89 loadModules([ 89 loadModules([
90 "esri/layers/FeatureLayer" 90 "esri/layers/FeatureLayer",
91 "esri/Graphic",
92 "esri/geometry/Point",
93 "esri/geometry/Polygon",
94 "esri/geometry/Polyline"
91 ]).then(([ 95 ]).then(([
92 FeatureLayer 96 FeatureLayer,
97 Graphic,
98 Point,
99 Polygon,
100 Polyline
93 ])=>{ 101 ])=>{
94 var featureLayer = new FeatureLayer({ 102 var featureLayer = new FeatureLayer({
95 url:url 103 url:url
96 }) 104 })
105 var geo = null;
106 if(graphic.geometry.type == 'point'){
107 geo = new Point(graphic.geometry);
108 }else if(graphic.geometry.type == 'polyline'){
109 geo = new Polyline(graphic.geometry);
110 }else if(graphic.geometry.type == 'polygon'){
111 geo = new Polygon(graphic.geometry);
112 }
113 var delGraphic = new Graphic({
114 attributes:graphic.attributes,
115 geometry:geo
116 });
117
97 featureLayer.applyEdits({ 118 featureLayer.applyEdits({
98 deleteFeatures:[graphic] 119 deleteFeatures:[delGraphic]
99 }).then(function (res){ 120 }).then(function (res){
100 if(callBackFunction && typeof callBackFunction == 'function'){ 121 if(callBackFunction && typeof callBackFunction == 'function'){
101 callBackFunction(res); 122 callBackFunction(res);
......
1 import {loadModules} from 'esri-loader'
2
3 export default {
4
5 methods:{
6 findByPro(url,layerIds,searchFields,searchText,returnGeometry,callBackFunction){
7 loadModules([
8 "esri/tasks/FindTask",
9 "esri/tasks/support/FindParameters"
10 ]).then(([
11 FindTask,
12 FindParameters
13 ]) => {
14 var findTask = new FindTask({
15 url:url
16 }),
17 findParameters = new FindParameters();
18 findParameters.returnGeometry = returnGeometry ? returnGeometry : false;
19 findParameters.layerIds = layerIds;
20 findParameters.searchFields = searchFields;
21 findParameters.searchText = searchText;
22 findTask.execute(findParameters).then(function (result) {
23 if(callBackFunction){
24 callBackFunction(result);
25 }
26 });
27 }).catch(err => {
28 throw (err);
29 })
30
31 }
32
33 }
34 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -177,6 +177,9 @@ export default { ...@@ -177,6 +177,9 @@ export default {
177 "$store.state.zdbsm": function(bsm) { 177 "$store.state.zdbsm": function(bsm) {
178 this.getRightTree(bsm); 178 this.getRightTree(bsm);
179 }, 179 },
180 "$store.state.zrzbsm": function(bsm) {
181 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
182 },
180 183
181 "$store.state.treeData":function (val) { 184 "$store.state.treeData":function (val) {
182 console.log(val,'val'); 185 console.log(val,'val');
...@@ -430,6 +433,8 @@ export default { ...@@ -430,6 +433,8 @@ export default {
430 width: 100%; 433 width: 100%;
431 height: 100vh; 434 height: 100vh;
432 position: relative; 435 position: relative;
436 min-width: 1500px;
437 overflow-x: auto;
433 .calcWidth{ 438 .calcWidth{
434 width: calc(100% - 300px); 439 width: calc(100% - 300px);
435 } 440 }
......
...@@ -9,15 +9,6 @@ ...@@ -9,15 +9,6 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button
17 >
18 <el-button type="text" size="small">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column> 13 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
...@@ -37,7 +28,17 @@ ...@@ -37,7 +28,17 @@
37 {{scope.row.addtime | timeFilter}} 28 {{scope.row.addtime | timeFilter}}
38 </template> 29 </template>
39 </el-table-column> 30 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 31 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
32 </el-table-column> -->
33 <el-table-column label="操作" align="center" width="100">
34 <template slot-scope="scope">
35 <el-tooltip class="item" effect="light" content="办理" placement="top">
36 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
37 </el-tooltip>
38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit"></i>
40 </el-tooltip>
41 </template>
41 </el-table-column> 42 </el-table-column>
42 </el-table> 43 </el-table>
43 <div class="pagination"> 44 <div class="pagination">
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
61 return { 62 return {
62 total: 0, 63 total: 0,
63 pageNo: 1, 64 pageNo: 1,
64 pageSize: 10, 65 pageSize: 15,
65 qszt: ['1', '2'], 66 qszt: ['1', '2'],
66 queryData: {}, 67 queryData: {},
67 formData: { 68 formData: {
......
...@@ -64,13 +64,6 @@ ...@@ -64,13 +64,6 @@
64 <td class="zl">坐落</td> 64 <td class="zl">坐落</td>
65 <el-table-column type="index" width="80" align="center" label="序号"> 65 <el-table-column type="index" width="80" align="center" label="序号">
66 </el-table-column> 66 </el-table-column>
67 <el-table-column label="操作" width="100">
68 <template slot-scope="scope">
69 <el-button @click="xzzrz(scope.row)" type="text" size="small"
70 >选择
71 </el-button>
72 </template>
73 </el-table-column>
74 <el-table-column prop="zddm" align="left" label="宗地代码"> 67 <el-table-column prop="zddm" align="left" label="宗地代码">
75 </el-table-column> 68 </el-table-column>
76 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 69 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
...@@ -82,6 +75,16 @@ ...@@ -82,6 +75,16 @@
82 <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> 75 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
83 </el-table-column> 76 </el-table-column>
84 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 77 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
78 <el-table-column label="操作" align="center" width="100">
79 <template slot-scope="scope">
80 <el-tooltip class="item" effect="light" content="选择" placement="top">
81 <i class="iconfont iconbanli iconfontEdit" @click="xzzrz(scope.row)" style="padding:0 10px"></i>
82 </el-tooltip>
83 <!-- <el-button @click="xzzrz(scope.row)" type="text" size="small"
84 >选择
85 </el-button> -->
86 </template>
87 </el-table-column>
85 </el-table> 88 </el-table>
86 </div> 89 </div>
87 <span slot="footer" class="dialog-footer"> </span> 90 <span slot="footer" class="dialog-footer"> </span>
......
...@@ -9,14 +9,6 @@ ...@@ -9,14 +9,6 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button>
17 <el-button type="text" size="small">定位</el-button>
18 </template>
19 </el-table-column>
20 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
21 </el-table-column> 13 </el-table-column>
22 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
...@@ -41,7 +33,21 @@ ...@@ -41,7 +33,21 @@
41 {{ scope.row.addtime | timeFilter }} 33 {{ scope.row.addtime | timeFilter }}
42 </template> 34 </template>
43 </el-table-column> 35 </el-table-column>
44 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 36 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
37 </el-table-column> -->
38 <el-table-column label="操作" align="center" width="100">
39 <template slot-scope="scope">
40 <el-tooltip class="item" effect="light" content="办理" placement="top">
41 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
42 </el-tooltip>
43 <el-tooltip class="item" effect="light" content="定位" placement="top">
44 <i class="iconfont icondingwei iconfontEdit"></i>
45 </el-tooltip>
46 <!-- <el-button @click="handleClick(scope.row)" type="text" size="small"
47 >办理
48 </el-button>
49 <el-button type="text" size="small">定位</el-button> -->
50 </template>
45 </el-table-column> 51 </el-table-column>
46 </el-table> 52 </el-table>
47 <div class="pagination"> 53 <div class="pagination">
...@@ -72,7 +78,7 @@ export default { ...@@ -72,7 +78,7 @@ export default {
72 qszt: ['2'], 78 qszt: ['2'],
73 total: 0, 79 total: 0,
74 pageNo: 1, 80 pageNo: 1,
75 pageSize: 10, 81 pageSize: 15,
76 tableData: [], 82 tableData: [],
77 tableHeight: "100", 83 tableHeight: "100",
78 queryData: {}, 84 queryData: {},
...@@ -80,7 +86,7 @@ export default { ...@@ -80,7 +86,7 @@ export default {
80 }, 86 },
81 created() {}, 87 created() {},
82 mounted() { 88 mounted() {
83 this.getData({}); 89 this.getData({pageSize:this.pageSize});
84 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight'); 90 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
85 this.$nextTick(() => { 91 this.$nextTick(() => {
86 this.tableHeight = 92 this.tableHeight =
......
...@@ -98,11 +98,10 @@ ...@@ -98,11 +98,10 @@
98 </el-tab-pane> 98 </el-tab-pane>
99 <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> 99 <el-tab-pane class="eltabspane" label="自然幢" name="zrz">
100 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline"> 100 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline">
101 <el-form-item label="项目名称" prop="xmmc"> 101 <el-form-item label="项目名称" class="w100" prop="xmmc">
102 <el-input 102 <el-input
103 v-model="ruleForm1.xmmc" 103 v-model="ruleForm1.xmmc"
104 placeholder="项目名称" 104 placeholder="项目名称"
105 style="width:400px;"
106 ></el-input> 105 ></el-input>
107 </el-form-item> 106 </el-form-item>
108 </el-form> 107 </el-form>
...@@ -114,11 +113,10 @@ ...@@ -114,11 +113,10 @@
114 </el-tab-pane> 113 </el-tab-pane>
115 <el-tab-pane class="eltabspane" label="多幢" name="dz"> 114 <el-tab-pane class="eltabspane" label="多幢" name="dz">
116 <el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline"> 115 <el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline">
117 <el-form-item label="项目名称" prop="xmmc"> 116 <el-form-item label="项目名称" class="w100" prop="xmmc">
118 <el-input 117 <el-input
119 v-model="ruleForm2.xmmc" 118 v-model="ruleForm2.xmmc"
120 placeholder="项目名称" 119 placeholder="项目名称"
121 style="width:400px;"
122 ></el-input> 120 ></el-input>
123 </el-form-item> 121 </el-form-item>
124 </el-form> 122 </el-form>
...@@ -243,9 +241,15 @@ export default { ...@@ -243,9 +241,15 @@ export default {
243 methods: { 241 methods: {
244 // 重置 242 // 重置
245 reset(){ 243 reset(){
246 this.$refs['ruleForm'].resetFields(); 244 if(this.$refs['ruleForm']){
247 this.$refs["ruleForm1"].resetFields(); 245 this.$refs['ruleForm'].resetFields();
248 this.$refs["ruleForm2"].resetFields(); 246 }
247 if(this.$refs["ruleForm1"]){
248 this.$refs["ruleForm1"].resetFields();
249 }
250 if (this.$refs["ruleForm2"]) {
251 this.$refs["ruleForm2"].resetFields();
252 }
249 }, 253 },
250 handleClick(tab, event) { 254 handleClick(tab, event) {
251 console.log(tab, event); 255 console.log(tab, event);
...@@ -290,7 +294,6 @@ export default { ...@@ -290,7 +294,6 @@ export default {
290 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : ''; 294 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
291 insertZrzjbxx(this.ruleForm1) 295 insertZrzjbxx(this.ruleForm1)
292 .then((res) => { 296 .then((res) => {
293 debugger
294 if (res.code == "200") { 297 if (res.code == "200") {
295 this.$message({ 298 this.$message({
296 message: "创建成功！", 299 message: "创建成功！",
...@@ -300,13 +303,13 @@ export default { ...@@ -300,13 +303,13 @@ export default {
300 this.$store.state.zdbsm=res.result.zdbsm; 303 this.$store.state.zdbsm=res.result.zdbsm;
301 this.$store.state.zrzbsm=res.result.bsm; 304 this.$store.state.zrzbsm=res.result.bsm;
302 this.$store.state.xmmc=res.result.xmmc; 305 this.$store.state.xmmc=res.result.xmmc;
306 this.close();
303 this.$router.push({ 307 this.$router.push({
304 path: '/zrz', query:{ 308 path: '/zrz', query:{
305 source: 1, 309 source: 1,
306 bsm:res.result.bsm 310 bsm:res.result.bsm
307 } 311 }
308 }); 312 });
309 this.close();
310 } else { 313 } else {
311 this.$message.error("创建失败！"); 314 this.$message.error("创建失败！");
312 } 315 }
...@@ -334,13 +337,13 @@ export default { ...@@ -334,13 +337,13 @@ export default {
334 this.$store.state.zdbsm=res.result.zdbsm; 337 this.$store.state.zdbsm=res.result.zdbsm;
335 this.$store.state.dzbsm=res.result.bsm; 338 this.$store.state.dzbsm=res.result.bsm;
336 this.$store.state.xmmc=res.result.xmmc; 339 this.$store.state.xmmc=res.result.xmmc;
340 this.close();
337 this.$router.push({ 341 this.$router.push({
338 path: '/dz', query:{ 342 path: '/dz', query:{
339 source: 1, 343 source: 1,
340 bsm:res.result.bsm 344 bsm:res.result.bsm
341 } 345 }
342 }); 346 });
343 this.close();
344 } else { 347 } else {
345 this.$message.error("创建失败！"); 348 this.$message.error("创建失败！");
346 } 349 }
...@@ -405,8 +408,8 @@ export default { ...@@ -405,8 +408,8 @@ export default {
405 } 408 }
406 }, 409 },
407 close() { 410 close() {
408 this.$emit("closeDialog");
409 this.reset(); 411 this.reset();
412 this.$emit("closeDialog");
410 }, 413 },
411 }, 414 },
412 computed: {}, 415 computed: {},
......
...@@ -9,15 +9,6 @@ ...@@ -9,15 +9,6 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >更正
16 </el-button
17 >
18 <el-button type="text" size="small">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column> 13 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
...@@ -37,7 +28,24 @@ ...@@ -37,7 +28,24 @@
37 {{scope.row.addtime | timeFilter}} 28 {{scope.row.addtime | timeFilter}}
38 </template> 29 </template>
39 </el-table-column> 30 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 31 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人"> -->
32 <!-- </el-table-column> -->
33 <el-table-column label="操作" align="center" width="100">
34 <template slot-scope="scope">
35 <el-tooltip class="item" effect="light" content="更正" placement="top">
36 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
37 </el-tooltip>
38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit"></i>
40 </el-tooltip>
41 </template>
42 <!-- <template slot-scope="scope">
43 <el-button @click="handleClick(scope.row)" type="text" size="small"
44 >更正
45 </el-button
46 >
47 <el-button type="text" size="small">定位</el-button>
48 </template> -->
41 </el-table-column> 49 </el-table-column>
42 </el-table> 50 </el-table>
43 <div class="pagination"> 51 <div class="pagination">
...@@ -63,7 +71,7 @@ ...@@ -63,7 +71,7 @@
63 qszt: ['1'], 71 qszt: ['1'],
64 total: 0, 72 total: 0,
65 pageNo: 1, 73 pageNo: 1,
66 pageSize: 10, 74 pageSize: 15,
67 formData: { 75 formData: {
68 user: "", 76 user: "",
69 region: "", 77 region: "",
......
...@@ -9,22 +9,13 @@ ...@@ -9,22 +9,13 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button
17 >
18 <el-button type="text" size="small" @click="postionToMap(scope.row)">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column> 13 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
24 </el-table-column> 15 </el-table-column>
25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> 16 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
26 </el-table-column> 17 </el-table-column>
27 <el-table-column prop="dylx" align="left" width="120" label="类型"> 18 <el-table-column prop="dylx" align="left" width="100" label="类型">
28 <template slot-scope="scope"> 19 <template slot-scope="scope">
29 {{scope.row.dylx | bdcLxFilter}} 20 {{scope.row.dylx | bdcLxFilter}}
30 </template> 21 </template>
...@@ -37,7 +28,22 @@ ...@@ -37,7 +28,22 @@
37 {{scope.row.addtime | timeFilter}} 28 {{scope.row.addtime | timeFilter}}
38 </template> 29 </template>
39 </el-table-column> 30 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 31 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
32 </el-table-column> -->
33 <el-table-column label="操作" align="center" width="100">
34 <template slot-scope="scope">
35 <el-tooltip class="item" effect="light" content="办理" placement="top">
36 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
37 </el-tooltip>
38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
40 </el-tooltip>
41 <!-- <el-button type="text" size="small"
42 >办理
43 </el-button
44 >
45 <el-button type="text" size="small">定位</el-button> -->
46 </template>
41 </el-table-column> 47 </el-table-column>
42 </el-table> 48 </el-table>
43 <div class="pagination"> 49 <div class="pagination">
......
...@@ -4,6 +4,46 @@ ...@@ -4,6 +4,46 @@
4 <mapTools :viewId="viewId"></mapTools> 4 <mapTools :viewId="viewId"></mapTools>
5 </div> 5 </div>
6 <EsriMap :viewId = "viewId" :afterLoaderFunction="addLayer"></EsriMap> 6 <EsriMap :viewId = "viewId" :afterLoaderFunction="addLayer"></EsriMap>
7 <div class="searchDiv">
8 <el-input placeholder="请输入标识码" clearable v-model="inputBsm"> <el-button slot="append" type="primary" icon="el-icon-search" @click="doSearch"></el-button> </el-input>
9 <!--搜索弹出框-->
10 <div class="searchResult" v-show="dialogVisible">
11 <div class="-header">
12 <span class="title">地块信息</span>
13 <span class="closeButton">
14 <i class="close el-icon-close" @click="closeResultDialog"></i>
15 </span>
16 </div>
17 <el-card class="box-card">
18 <div slot="header" class="clearfix">
19 <!-- 图层选择-->
20 <span class="formTitle">图层选择:</span>
21 <el-select v-model="selectResLayerId" size="mini" @change="selectLayerChange" placeholder="请选择">
22 <el-option
23 v-for="(item,index) in resultLayers"
24 :key="index"
25 :label="item.label"
26 :value="item.id"
27 >
28 </el-option>
29 </el-select>
30 </div>
31 <!-- 数据结果-->
32 <div class="text item" v-for="(item,index) in features" :key="index">
33 <P>
34 <span class="title"><i class="iconfont iconxinxi"></i> 基本信息</span>
35 <a href="#" @click="toMap(item)">缩放至</a>
36 </P>
37 <hr />
38 <div class="contentItem" v-for="(value,key,index) in item.attributes" :key="index">
39 <span class="key">{{key}}：</span>
40 <span class="value" :title="value">{{value}}</span>
41 </div>
42 </div>
43 </el-card>
44 </div>
45 </div>
46
7 </div> 47 </div>
8 </template> 48 </template>
9 <script> 49 <script>
...@@ -12,6 +52,9 @@ import MapTools from './mapWeight/mapTools' ...@@ -12,6 +52,9 @@ import MapTools from './mapWeight/mapTools'
12 import {loadModules} from 'esri-loader' 52 import {loadModules} from 'esri-loader'
13 import {maps} from '@/libs/map/mapUtils' 53 import {maps} from '@/libs/map/mapUtils'
14 import mapLayerManager from "./mapWeight/js/mapLayerManager"; 54 import mapLayerManager from "./mapWeight/js/mapLayerManager";
55 import layers from '@/assets/json/layers.json'
56 import findTask from '@/libs/map/findTask'
57
15 export default { 58 export default {
16 components:{ 59 components:{
17 EsriMap, 60 EsriMap,
...@@ -20,10 +63,17 @@ export default { ...@@ -20,10 +63,17 @@ export default {
20 data(){ 63 data(){
21 return{ 64 return{
22 viewId:"testMap", 65 viewId:"testMap",
23 layerUrl:"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer" 66 layerUrl:"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
67 dialogVisible:false,
68 selectResLayerId:null,
69 features:[],
70 resultLayers:[],
71 results:[],
72 inputBsm:"",
73 heighGraphic:null
24 } 74 }
25 }, 75 },
26 mixins:[mapLayerManager], 76 mixins:[mapLayerManager,findTask],
27 mounted(){ 77 mounted(){
28 var query = this.$route.query; 78 var query = this.$route.query;
29 if(query && JSON.stringify(query) != "{}"){ 79 if(query && JSON.stringify(query) != "{}"){
...@@ -34,6 +84,7 @@ export default { ...@@ -34,6 +84,7 @@ export default {
34 addLayer(){ 84 addLayer(){
35 var self = this; 85 var self = this;
36 var view = maps[this.viewId]; 86 var view = maps[this.viewId];
87 view.ui.remove('zoom');
37 loadModules([ 88 loadModules([
38 "esri/layers/MapImageLayer", 89 "esri/layers/MapImageLayer",
39 ]).then(([ 90 ]).then(([
...@@ -60,7 +111,118 @@ export default { ...@@ -60,7 +111,118 @@ export default {
60 }).catch(err => { 111 }).catch(err => {
61 throw(err); 112 throw(err);
62 }) 113 })
63 } 114 },
115 //缩放至
116 toMap(attr){
117 var self = this;
118 this.extentToGraphic(attr,this.heighGraphic,this.viewId,function () {
119 self.heighGraphic = attr;
120 });
121 },
122 //图层选择事件
123 selectLayerChange(){
124 var self = this;
125 var layerAndResult = this.results.filter(function (item) {
126 return item.layerId = self.selectResLayerId;
127 })
128 if(layerAndResult){
129 this.features = layerAndResult[0].features;
130 }
131 },
132 //属性查询
133 doSearch(){
134 var self = this;
135 if(!this.inputBsm){
136 return;
137 }else if(this.inputBsm.length != 19){
138 this.$message.warning("标识码格式输入有误!!!");
139 return;
140 }
141 this.findByPro(this.layerUrl,[8,10],'BSM',this.inputBsm,true,function (res) {
142 var resultes = res.results;
143 if(resultes && resultes.length > 0){
144 self.delIdentifyData(resultes);
145 if(!self.dialogVisible){
146 self.dialogVisible = true;
147 }
148 }else {
149 self.$message.warning("查询不到相关数据!!!");
150 }
151 });
152 },
153 //关闭查询结果
154 closeResultDialog(){
155 //关闭时清除查询结果 清除数据
156 this.results = [];
157 this.selectResLayerId =null;
158 this.features = [];
159 this.resultLayers = [];
160 this.heighGraphic = null;
161 //清除查询图层
162 this.clearSearchLayer(this.viewId);
163 this.dialogVisible = false;
164 },
165 //处理数据
166 delIdentifyData(data){
167 var self = this;
168 self.results = [];
169 self.selectResLayerId =null;
170 self.features = [];
171 self.resultLayers = [];
172 this.heighGraphic = null;
173 for(var i = 0;i < data.length;i++){
174 var layerId = data[i].layerId;
175 var layer = self.getLayerById(layerId);
176 var layerResult = self.results.filter(function (item) {
177 return item.layerId == layerId;
178 })
179 if(layerResult && layerResult.length > 0){
180 var feature = data[i].feature,
181 attributes = {},
182 fieldAliases = layer.fieldAliases;
183 for(var key in feature.attributes){
184 if(!feature.attributes[key]){
185 delete feature.attributes[key]
186 }
187 }
188 layerResult.features.push(feature);
189 }else{
190 if(layer){
191 this.resultLayers.push({
192 id:layerId,
193 label:layer.layerLabel
194 })
195 var layerAndResult = {
196 layerId:layerId,
197 features:[]
198 }
199 var feature = data[i].feature,
200 attributes = {},
201 fieldAliases = layer.fieldAliases;
202 for(var key in feature.attributes){
203 if(!feature.attributes[key]){
204 delete feature.attributes[key]
205 }
206 }
207 layerAndResult.features.push(feature);
208 self.results.push(layerAndResult);
209 }
210 }
211 }
212 this.addSearchResultToMap(this.results,this.viewId);
213 },
214 getLayerById(layerId){
215 var parseLayers = JSON.parse(JSON.stringify(layers));
216 var layer = parseLayers.filter(function (item) {
217 return item.id == layerId;
218 })
219 if(layer){
220 return layer[0];
221 }
222
223 return null;
224 },
225 //展示查询数据结果
64 226
65 } 227 }
66 } 228 }
...@@ -76,5 +238,86 @@ export default { ...@@ -76,5 +238,86 @@ export default {
76 z-index: 99; 238 z-index: 99;
77 right: 5px; 239 right: 5px;
78 } 240 }
241 .searchDiv{
242 position: absolute;
243 top: 12px;
244 left: 7px;
245 width: 35%;
246 max-height: 100%;
247 /deep/ .el-input-group__append{
248 background-color: #409eff;
249 color: white;
250 }
251 .searchResult{
252 margin-top: 3px;
253 background: white;
254 border-radius: 4px;
255 max-height: 80%;
256 .-header{
257 line-height: 32px;
258 padding: 3px 20px;
259 background-color: #519eff;
260 border-top-right-radius: 4px;
261 border-top-left-radius: 4px;
262 .title{
263 font-size: 14px;
264 color: white;
265 font-weight: 600;
266 }
267 .closeButton{
268 float: right;
269 font-size: 16px;
270 color: black;
271 }
272 .closeButton :hover{
273 cursor:pointer
274 }
275 }
276 /deep/ .el-card__header {
277 padding: 10px 20px;
278 }
279 .formTitle{
280 margin-right: 5px;
281 font-size: 14px;
282 }
283 .item{
284 p{
285 margin: 0px 3px;
286 font-size: 14px;
287 .title{
288
289 }
290 a{
291 float: right;
292 color: #519eff
293 }
294 }
295 .contentItem{
296 display: flex;
297 font-size: 14px;
298 width: 100%;
299 line-height: 23px;
300 align-items: center;
301 .key{
302 width: 30%;
303 margin: 5px 3px;
304 text-align: right;
305 }
306 .value{
307 width: 70%;
308 overflow:hidden;
309 text-overflow:ellipsis;
310 white-space:nowrap;
311 word-break:keep-all;
312 }
313 }
314
315 }
316 /deep/ .el-card__body{
317 max-height: 363px;
318 overflow: auto;
319 }
320 }
321 }
79 } 322 }
80 </style> 323 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
50 layer = new GraphicsLayer({ 50 layer = new GraphicsLayer({
51 id:"highlightLayer" 51 id:"highlightLayer"
52 }) 52 })
53 view.map.add(layer); 53 view.map.add(layer,5);
54 } 54 }
55 var symbol = graphicSymbol.fillSymbol.highlightSymbol; 55 var symbol = graphicSymbol.fillSymbol.highlightSymbol;
56 var graphic = features[0]; 56 var graphic = features[0];
...@@ -66,6 +66,61 @@ export default { ...@@ -66,6 +66,61 @@ export default {
66 } 66 }
67 }); 67 });
68 }, 68 },
69 69 //将查询结果展示在地图上
70 addSearchResultToMap(searchResult,viewId){
71 var view = maps[viewId],
72 self = this;
73 loadModules([
74 "esri/layers/GraphicsLayer"
75 ]).then(([
76 GraphicsLayer
77 ]) => {
78 if(!searchResult || searchResult.length == 0){
79 return;
80 }
81 for(var i = 0;i < searchResult.length;i++){
82 var layer = view.map.findLayerById("searchResult"+searchResult.layerName);
83 if(layer){
84 layer.removeAll();
85 }else{
86 layer = new GraphicsLayer({
87 id:"searchResult"+searchResult.layerName
88 })
89 view.map.add(layer);
90 }
91 var symbol = graphicSymbol.fillSymbol.highlightSymbol;
92 var features = searchResult[i].features;
93 for(var j = 0;j < features.length;j++){
94 features[j].symbol = symbol;
95 layer.add(features[j]);
96 }
97 }
98 }).catch(err=>{
99 console.log(err);
100 })
101 },
102 //缩放至当前对象
103 extentToGraphic(feature,highlightGraohic,viewId,callBackFunction){
104 var symbol = graphicSymbol.fillSymbol.highlightSymbol;
105 var highlightSymbol = graphicSymbol.fillSymbol.defaultSymbol;
106 if(highlightGraohic){
107 highlightGraohic.symbol = symbol;
108 }
109 feature.symbol = highlightSymbol;
110 var view = maps[viewId];
111 view.center = feature.geometry.type == 'point' ? feature.geometry : feature.geometry.extent.center;
112 if(callBackFunction && typeof callBackFunction == 'function'){
113 callBackFunction();
114 }
115 },
116 clearSearchLayer(viewId){
117 var view = maps[viewId],
118 layers = view.map.allLayers;
119 layers.filter(function (item) {
120 if(item.id.indexOf("searchResult") != -1){
121 item.removeAll();
122 }
123 });
124 }
70 } 125 }
71 } 126 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -29,7 +29,11 @@ export default { ...@@ -29,7 +29,11 @@ export default {
29 mixins:[draw,identifyUtils,measure], 29 mixins:[draw,identifyUtils,measure],
30 data(){ 30 data(){
31 return{ 31 return{
32 url:"" 32 url:"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
33 selectResLayerId:"",
34 features:[],
35 resultLayers:[],
36 results:[]
33 } 37 }
34 }, 38 },
35 methods:{ 39 methods:{
...@@ -51,11 +55,16 @@ export default { ...@@ -51,11 +55,16 @@ export default {
51 var view = maps[this.viewId]; 55 var view = maps[this.viewId];
52 var self = this; 56 var self = this;
53 this.initDraw("point",this.viewId,null,function(geo){ 57 this.initDraw("point",this.viewId,null,function(geo){
54 self.identify(self.url,[],geo,function(result){ 58 self.identify(self.url,[8,10],geo,function(res){
55 debugger 59 var resultes = res.results;
56 }); 60 if(resultes && resultes.length > 0){
61 self.$parent.delIdentifyData(resultes);
62 self.$parent.dialogVisible = true;
63 }
64 },true,'all',3,view.extent);
57 }); 65 });
58 }, 66 },
67
59 zoomOut(){ 68 zoomOut(){
60 var view = maps[this.viewId]; 69 var view = maps[this.viewId];
61 this.initDraw("rectangle",this.viewId,null,function(geo){ 70 this.initDraw("rectangle",this.viewId,null,function(geo){
......
1 <template> 1 <template>
2 <div class="">历史回溯 2 <div class="lshs-content">
3 <div id="mountNode"></div> 3 <div class="slot">
4 <div><span class="tip-title">范围属性变更：</span></div>
5 <div><span class="tip-title">宗地分割：</span></div>
6 <div><span class="tip-title">宗地合并：</span></div>
7 </div>
8 <div id="mountNode" ref="containerWidth"></div>
4 </div> 9 </div>
5 </template> 10 </template>
6 11
...@@ -38,6 +43,8 @@ export default { ...@@ -38,6 +43,8 @@ export default {
38 methods: { 43 methods: {
39 initG6() { 44 initG6() {
40 const data = this.data; 45 const data = this.data;
46 const eWidth = this.$refs.containerWidth.clientWidth
47 console.log(eWidth+":width")
41 G6.registerNode( 48 G6.registerNode(
42 'sql', 49 'sql',
43 { 50 {
...@@ -75,13 +82,67 @@ export default { ...@@ -75,13 +82,67 @@ export default {
75 }, 82 },
76 'single-node', 83 'single-node',
77 ); 84 );
85 G6.registerEdge(
86 'circle-running',
87 {
88 afterDraw(cfg, group) {
89 const shape = group.get('children')[0];
90 const startPoint = shape.getPoint(0);
78 91
79 const container = document.getElementById('mountNode'); 92 const circle = group.addShape('circle', {
93 attrs: {
94 x: startPoint.x,
95 y: startPoint.y,
96 fill: '#1890ff',
97 r: 3,
98 },
99 name: 'circle-shape',
100 });
101
102 circle.animate(
103 (ratio) => {
104 const tmpPoint = shape.getPoint(ratio);
105 return {
106 x: tmpPoint.x,
107 y: tmpPoint.y,
108 };
109 },
110 {
111 repeat: true,
112 duration: 3000,
113 },
114 );
115 },
116 },
117 'line',
118 );
80 119
120 const tooltip = new G6.Tooltip({
121 offsetX: 10 + 10,
122 offsetY: 10 + 10,
123 itemTypes: ['node', 'edge'],
124 getContent: (e) => {
125 const outDiv = document.createElement('div');
126 outDiv.style.width = 'fit-content';
127 outDiv.innerHTML = `
128 <ul>
129 <li> ${e.item.getModel().conf[0].label}:${e.item.getModel().conf[0].value}</li>
130 <li> ${e.item.getModel().conf[1].label}:${e.item.getModel().conf[1].value}</li>
131 <li> ${e.item.getModel().conf[2].label}:${e.item.getModel().conf[2].value}</li>
132 <li> ${e.item.getModel().conf[3].label}:${e.item.getModel().conf[3].value}</li>
133 <li> ${e.item.getModel().conf[4].label}:${e.item.getModel().conf[4].value}</li>
134 </ul>`
135 ;
136 return outDiv;
137 },
138 });
139
140 const container = document.getElementById('mountNode');
141 console.log(container)
81 const graph = new G6.Graph({ 142 const graph = new G6.Graph({
82 container: 'mountNode', 143 container: 'mountNode',
83 width:1000, 144 width:1000,
84 height:800, 145 height:1000,
85 layout: { 146 layout: {
86 type: 'dagre', 147 type: 'dagre',
87 nodesepFunc: (d) => { 148 nodesepFunc: (d) => {
...@@ -103,7 +164,7 @@ export default { ...@@ -103,7 +164,7 @@ export default {
103 offset: 45, 164 offset: 45,
104 endArrow: true, 165 endArrow: true,
105 lineWidth: 2, 166 lineWidth: 2,
106 stroke: '#C2C8D5', 167 stroke: 'rgba(78,142,230,0.45)',
107 }, 168 },
108 }, 169 },
109 nodeStateStyles: { 170 nodeStateStyles: {
...@@ -113,31 +174,54 @@ export default { ...@@ -113,31 +174,54 @@ export default {
113 }, 174 },
114 }, 175 },
115 176
177 plugins: [tooltip],
116 modes: { 178 modes: {
117 default: [ 179 default: [
118 'drag-canvas', 180 'drag-node',
119 'zoom-canvas', 181 'drag-canvas',
120 'click-select', 182 'zoom-canvas',
121 { 183 'click-select',
122 type: 'tooltip',
123 formatText(model) {
124 const cfg = model.conf;
125 const text = [];
126 cfg.forEach((row) => {
127 text.push(row.label + ':' + row.value + '<br>');
128 });
129 return text.join('\n');
130 },
131 offset: 30,
132 },
133 ], 184 ],
134 }, 185 },
186
187 // modes: {
188 // default: [
189 // 'drag-canvas',
190 // 'zoom-canvas',
191 // 'click-select',
192 // {
193 // type: 'tooltip',
194 // formatText(model) {
195 // const cfg = model.conf;
196 // const text = [];
197 // cfg.forEach((row) => {
198 // text.push(row.label + ':' + row.value + '<br>');
199 // });
200 // return text.join('\n');
201 // },
202 // offset: -30,
203 // },
204 // ],
205 // },
135 fitView: true, 206 fitView: true,
136 }); 207 });
137 208
138 graph.data(data); 209 graph.data(data);
139 graph.render(); 210 graph.render();
140 211
212 graph.on('node:mouseenter', e => {
213 graph.setItemState(e.item, 'active', true)
214 });
215 graph.on('node:mouseleave', e => {
216 graph.setItemState(e.item, 'active', false)
217 });
218 graph.on('edge:mouseenter', e => {
219 graph.setItemState(e.item, 'active', true)
220 });
221 graph.on('edge:mouseleave', e => {
222 graph.setItemState(e.item, 'active', false)
223 });
224
141 if (typeof window !== 'undefined') 225 if (typeof window !== 'undefined')
142 window.onresize = () => { 226 window.onresize = () => {
143 if (!graph || graph.get('destroyed')) return; 227 if (!graph || graph.get('destroyed')) return;
...@@ -167,4 +251,21 @@ export default { ...@@ -167,4 +251,21 @@ export default {
167 </script> 251 </script>
168 <style scoped lang="less"> 252 <style scoped lang="less">
169 253
254 .lshs-content{
255 width: 100%;
256 }
257
258 #mountNode{
259 width: 100%;
260 }
261
262 .slot{
263 margin-left: 50px;
264 margin-top: 20px;
265 width: 300px;
266 }
267
268 .tip-title{
269 font-weight: 700;
270 }
170 </style> 271 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
108 <td colspan="2">宗地代码<i class="requisite">*</i></td> 108 <td colspan="2">宗地代码<i class="requisite">*</i></td>
109 <td colspan="4" class="psr"> 109 <td colspan="4" class="psr">
110 <input :disabled="formData.qszt!='0'" maxlength="19" 110 <input :disabled="formData.qszt!='0'" maxlength="19"
111 type="text" 111 type="text"
112 class="formInput percent80" 112 class="formInput percent80"
113 v-model="formData.zddm" 113 v-model="formData.zddm"
114 /> 114 />
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 <td colspan="2">项目名称</td> 141 <td colspan="2">项目名称</td>
142 <td colspan="4" class="psr"> 142 <td colspan="4" class="psr">
143 <input :disabled="formData.qszt!='0'" 143 <input :disabled="formData.qszt!='0'"
144 type="text" 144 type="text"
145 class="formInput " 145 class="formInput "
146 v-model="formData.xmmc" 146 v-model="formData.xmmc"
147 /> 147 />
...@@ -225,14 +225,14 @@ ...@@ -225,14 +225,14 @@
225 </td> 225 </td>
226 <td colspan="2"> 226 <td colspan="2">
227 <input 227 <input
228 type="text" 228 type="text"
229 v-model="jzmd" :disabled="formData.qszt!='0'" 229 v-model="jzmd" :disabled="formData.qszt!='0'"
230 v-show="isInterval(formData.jyjzmd)" 230 v-show="isInterval(formData.jyjzmd)"
231 class="formInput percent47" 231 class="formInput percent47"
232 /> 232 />
233 <span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span> 233 <span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span>
234 <input 234 <input
235 type="text" 235 type="text"
236 v-model="formData.jzmd" :disabled="formData.qszt!='0'" 236 v-model="formData.jzmd" :disabled="formData.qszt!='0'"
237 :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'" 237 :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'"
238 /> 238 />
...@@ -349,6 +349,7 @@ ...@@ -349,6 +349,7 @@
349 <script> 349 <script>
350 import Qlr from "../../../components/formMenu/qlr"; 350 import Qlr from "../../../components/formMenu/qlr";
351 import Qlxz from "../../../components/formMenu/qlxz"; 351 import Qlxz from "../../../components/formMenu/qlxz";
352 import geoUtils from "@components/lineTree/tx/js/geoUtils";
352 import { 353 import {
353 getAllList, 354 getAllList,
354 getDdicByMC, 355 getDdicByMC,
...@@ -410,9 +411,55 @@ export default { ...@@ -410,9 +411,55 @@ export default {
410 formData: {}, 411 formData: {},
411 dpdm:'', //宗地底盘代码 412 dpdm:'', //宗地底盘代码
412 curZdbsm:'', 413 curZdbsm:'',
414 geoAttributes:{
415 OBJECTID:"",
416 BSM:"",
417 YSDM:"",
418 ZDDM:"",
419 BDCDYH:"",
420 ZDTZM :"",
421 ZL:"",
422 ZDMJ:0,
423 MJDW:"",
424 YT:"",
425 DJ:"",
426 JG:0,
427 QLLX:"",
428 QLXZ:"",
429 QLSDFS:"",
430 RJL:0,
431 JZMD:0,
432 JZXG:0,
433 ZDSZD:"",
434 ZDSZN :"",
435 ZDSZX :"",
436 ZDSZB :"",
437 TFH:"",
438 DJH:"",
439 DAH:"",
440 BZ :"",
441 ZT:"",
442 YWZT:"",
443 BLID:"",
444 XMMC:"",
445 XMID:"",
446 BGRQ:"",
447 BGID:"",
448 BGZT:"",
449 TDZH:"",
450 QSZT:0,
451 BBLX:0,
452 SFDB:0,
453 QLR :"",
454 CUTID:"",
455 BHQKID:"",
456 DJZQDM :"",
457 SYQLXID:"",
458 }
413 }; 459 };
414 }, 460 },
415 created() { 461 mixins:[geoUtils],
462 created() {
416 this.curZdbsm = this.$route.query.bsm; 463 this.curZdbsm = this.$route.query.bsm;
417 }, 464 },
418 mounted() { 465 mounted() {
...@@ -612,6 +659,26 @@ export default { ...@@ -612,6 +659,26 @@ export default {
612 } 659 }
613 }) 660 })
614 .catch((error) => {}); 661 .catch((error) => {});
662 //保存到空间库里面
663 var self = this;
664 for(var key in this.geoAttributes){
665 if(key == "BSM"){
666 self.geoAttributes[key] = this.$store.state.zdbsm
667 }else if(key == 'QLSDFS'){
668 var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
669 var qlsdfs = qlsdfsList.filter(item => {
670 return item.bsm == value;
671 })
672 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:"";
673 }else {
674 var formKay = key.toLowerCase();
675 self.geoAttributes[key] = self.formData[formKay];
676 }
677 }
678 self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
679 console.log("属性保存完成!!");
680 });
681
615 } 682 }
616 683
617 684
...@@ -719,7 +786,7 @@ export default { ...@@ -719,7 +786,7 @@ export default {
719 this.$store.state.zddm = val; 786 this.$store.state.zddm = val;
720 }, 787 },
721 zdbsm:function (val) { 788 zdbsm:function (val) {
722 this.getZdjbxxData(val) 789 this.getZdjbxxData(val)
723 this.curZdbsm = val; 790 this.curZdbsm = val;
724 } 791 }
725 }, 792 },
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> 21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
23 <td colspan="4" class="psr"> 23 <td colspan="4" class="psr">
24 <el-input v-model="form.bdcdyh" class="percent80" disabled></el-input> 24 <el-input v-model="form.bdcdyh" class="percent80"></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> 25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
26 </td> 26 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 27 <td colspan="2" align="center" >原不动产单元</td>
...@@ -37,25 +37,25 @@ ...@@ -37,25 +37,25 @@
37 </td> 37 </td>
38 <td colspan="2" align="center" >层号</td> 38 <td colspan="2" align="center" >层号</td>
39 <td colspan="4" > 39 <td colspan="4" >
40 <el-input v-model="form.ch" disabled></el-input> 40 <el-input v-model="form.ch"></el-input>
41 </td> 41 </td>
42 </tr> 42 </tr>
43 43
44 <tr height="30"> 44 <tr height="30">
45 <td colspan="2" align="center" >实际层数</td> 45 <td colspan="2" align="center" >实际层数</td>
46 <td colspan="4" > 46 <td colspan="4" >
47 <el-input v-model="form.sjcs" disabled></el-input> 47 <el-input v-model="form.sjcs"></el-input>
48 </td> 48 </td>
49 <td colspan="2" align="center" >实际层</td> 49 <td colspan="2" align="center" >实际层</td>
50 <td colspan="4" > 50 <td colspan="4" >
51 <el-input v-model="form.sjc" disabled></el-input> 51 <el-input v-model="form.sjc"></el-input>
52 </td> 52 </td>
53 </tr> 53 </tr>
54 54
55 <tr height="30"> 55 <tr height="30">
56 <td colspan="2" align="center" >所在单元</td> 56 <td colspan="2" align="center" >所在单元</td>
57 <td colspan="4" > 57 <td colspan="4" >
58 <el-input v-model="form.zdymc" disabled></el-input> 58 <el-input v-model="form.zdymc"></el-input>
59 </td> 59 </td>
60 <td colspan="2" align="center" >房屋编号</td> 60 <td colspan="2" align="center" >房屋编号</td>
61 <td colspan="4" > 61 <td colspan="4" >
......
...@@ -353,6 +353,45 @@ ...@@ -353,6 +353,45 @@
353 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 353 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
354 loading:false, 354 loading:false,
355 source:'', 355 source:'',
356 geoAttributes:{
357 OBJECTID:null,
358 YSDM:"",
359 BDCDYH:"",
360 ZDDM:"",
361 ZRZH:"",
362 XMMC:"",
363 JZWMC:"",
364 JGRQ:"",
365 JZWGD:"",
366 ZZDMJ:0,
367 ZYDMJ:0,
368 YCJZMJ:0,
369 SCJZMJ:0,
370 ZCS:0,
371 DSCS:0,
372 DXCS:0,
373 DXSD:0,
374 GHYT:"",
375 FWJG:"",
376 ZTS:0,
377 JZWJBYT:"",
378 DAH:"",
379 BZ:"",
380 ZT:"",
381 YWZT:"",
382 BLID:"",
383 XMID:"",
384 BGZT:"",
385 BGRQ:"",
386 BGID:"",
387 BBLX:"",
388 QSZT:"",
389 CUTID :"",
390 BHQKID:"",
391 DJZQDM:"",
392 ZDTZM:"",
393 BSM:"",
394 }
356 } 395 }
357 }, 396 },
358 methods: { 397 methods: {
...@@ -421,6 +460,20 @@ ...@@ -421,6 +460,20 @@
421 }) 460 })
422 this.loading=false; 461 this.loading=false;
423 } 462 }
463
464 //保存到空间库里面
465 var self = this;
466 for(var key in this.geoAttributes){
467 if(key == "BSM"){
468 self.geoAttributes[key] = this.bsm
469 }else{
470 var formKay = key.toLowerCase();
471 self.geoAttributes[key] = self.formData[formKay];
472 }
473 }
474 self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
475 console.log("属性保存完成!!");
476 });
424 } 477 }
425 478
426 }, 479 },
......