Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b36b10c1 by 焦泽平
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 880cc605 5110c733
Expand all
Inline Side-by-side
Showing 32 changed files with 878 additions and 158 deletions
...@@ -175,6 +175,18 @@ export function loadFile(url) { ...@@ -175,6 +175,18 @@ export function loadFile(url) {
175 } 175 }
176 }) 176 })
177 } 177 }
178 /**
179 * 删除文件
180 */
181 export function deleteFile(id) {
182 return request({
183 url:"/file/delete",
184 method:'delete',
185 params:{
186 id
187 }
188 })
189 }
178 190
179 /** 191 /**
180 * 多个宗地代码获取树的数据信息 192 * 多个宗地代码获取树的数据信息
...@@ -186,3 +198,13 @@ export function getListMenu(data) { ...@@ -186,3 +198,13 @@ export function getListMenu(data) {
186 data:data 198 data:data
187 }) 199 })
188 } 200 }
201 /**
202 * 登记调用
203 */
204 export function registerCall(data) {
205 return request({
206 url:'/system/basiccommon/registerCall',
207 method:'post',
208 data:data
209 })
210 }
......
...@@ -168,3 +168,14 @@ export function deleteZdy(id) { ...@@ -168,3 +168,14 @@ export function deleteZdy(id) {
168 } 168 }
169 }) 169 })
170 } 170 }
171
172 /**
173 * 批量提交
174 */
175 export function batchCommit(data) {
176 return request({
177 url:'/fw/lpbbatch/batchCommit',
178 method:'post',
179 data:data
180 })
181 }
......
...@@ -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 @@ ...@@ -3,7 +3,7 @@
3 <el-dialog 3 <el-dialog
4 title="新增" 4 title="新增"
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="50%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 center>
......
...@@ -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 }
...@@ -552,10 +557,8 @@ export default { ...@@ -552,10 +557,8 @@ export default {
552 -webkit-box-shadow: inset -14px 0px 16px red; 557 -webkit-box-shadow: inset -14px 0px 16px red;
553 box-shadow: inset -23px 0px 16px #1d50dd; 558 box-shadow: inset -23px 0px 16px #1d50dd;
554 transition: 0.3s; 559 transition: 0.3s;
555 display: none;
556 } 560 }
557 .w0{ 561 .w0{
558 display: block;
559 width: 64px; 562 width: 64px;
560 } 563 }
561 } 564 }
......
...@@ -199,6 +199,7 @@ ...@@ -199,6 +199,7 @@
199 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 199 <div style="min-height: 40px;text-align: center;margin-top: 10px">
200 <el-button type="success" @click="onSave">保存</el-button> 200 <el-button type="success" @click="onSave">保存</el-button>
201 <el-button type="primary" @click="onSubmit">提交</el-button> 201 <el-button type="primary" @click="onSubmit">提交</el-button>
202 <el-button type="primary" @click="registerCall">登记调用</el-button>
202 </div> 203 </div>
203 </div> 204 </div>
204 205
...@@ -209,7 +210,7 @@ ...@@ -209,7 +210,7 @@
209 import Qlxz from "../../../components/formMenu/qlxz_simple"; 210 import Qlxz from "../../../components/formMenu/qlxz_simple";
210 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; 211 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
211 import {getQjZdjbxxDetailById} from "../../../api/zd" 212 import {getQjZdjbxxDetailById} from "../../../api/zd"
212 import {submit} from "../../../api/common" 213 import {submit,registerCall} from "../../../api/common"
213 export default { 214 export default {
214 name:'zrz', 215 name:'zrz',
215 components:{ 216 components:{
...@@ -289,6 +290,17 @@ ...@@ -289,6 +290,17 @@
289 } 290 }
290 }, 291 },
291 methods: { 292 methods: {
293 registerCall(){
294 let data={
295 type:'dz',
296 bsm:this.$route.query.bsm
297 }
298 registerCall(data).then(res=>{
299 if (res.success) {
300 this.$message.success("登记成功")
301 }
302 })
303 },
292 addYtInfo(){ 304 addYtInfo(){
293 this.form.fwytList.push({ 305 this.form.fwytList.push({
294 glbsm:'', 306 glbsm:'',
...@@ -533,4 +545,4 @@ ...@@ -533,4 +545,4 @@
533 } 545 }
534 } 546 }
535 } 547 }
536 </style>
...\ No newline at end of file ...\ No newline at end of file
548 </style>
......
...@@ -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 =
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <td>操作</td> 18 <td>操作</td>
19 </tr> 19 </tr>
20 <tr v-if="zdhbqData.length==0"> 20 <tr v-if="zdhbqData.length==0">
21 <td colspan="7"> 21 <td colspan="8">
22 <span class="noData">暂无数据</span> 22 <span class="noData">暂无数据</span>
23 </td> 23 </td>
24 </tr> 24 </tr>
...@@ -134,9 +134,10 @@ ...@@ -134,9 +134,10 @@
134 <td class="bdcqzh">不动产权证号</td> 134 <td class="bdcqzh">不动产权证号</td>
135 <td class="qlr">权利人</td> 135 <td class="qlr">权利人</td>
136 <td class="zl">坐落</td> 136 <td class="zl">坐落</td>
137 <td class="">操作</td>
137 </tr> 138 </tr>
138 <tr v-if="dzhbqData.length==0"> 139 <tr v-if="dzhbqData.length==0">
139 <td colspan="7"> 140 <td colspan="8">
140 <span class="noData">暂无数据</span> 141 <span class="noData">暂无数据</span>
141 </td> 142 </td>
142 </tr> 143 </tr>
...@@ -154,6 +155,7 @@ ...@@ -154,6 +155,7 @@
154 readonly="readonly"/></td> 155 readonly="readonly"/></td>
155 <td class="zl"><input type="text" class="formInput" v-model="item.zl" 156 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
156 readonly="readonly"/></td> 157 readonly="readonly"/></td>
158 <td class="cz" @click="deleteData(index)"><span>删除</span></td>
157 </tr> 159 </tr>
158 </table> 160 </table>
159 </div> 161 </div>
...@@ -229,7 +231,7 @@ ...@@ -229,7 +231,7 @@
229 </tr> 231 </tr>
230 </table> 232 </table>
231 </div> 233 </div>
232 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 234 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true"
233 @close="close"></query-data> 235 @close="close"></query-data>
234 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 236 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
235 <el-button type="primary" class="saveBtn">保存</el-button> 237 <el-button type="primary" class="saveBtn">保存</el-button>
...@@ -250,9 +252,10 @@ ...@@ -250,9 +252,10 @@
250 <td class="bdcqzh">不动产权证号</td> 252 <td class="bdcqzh">不动产权证号</td>
251 <td class="qlr">权利人</td> 253 <td class="qlr">权利人</td>
252 <td class="zl">坐落</td> 254 <td class="zl">坐落</td>
255 <td class="">操作</td>
253 </tr> 256 </tr>
254 <tr v-if="hhbqData.length==0"> 257 <tr v-if="hhbqData.length==0">
255 <td colspan="7"> 258 <td colspan="8">
256 <span class="noData">暂无数据</span> 259 <span class="noData">暂无数据</span>
257 </td> 260 </td>
258 </tr> 261 </tr>
...@@ -270,6 +273,7 @@ ...@@ -270,6 +273,7 @@
270 readonly="readonly"/></td> 273 readonly="readonly"/></td>
271 <td class="zl"><input type="text" class="formInput" v-model="item.zl" 274 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
272 readonly="readonly"/></td> 275 readonly="readonly"/></td>
276 <td class="cz" @click="deleteData(index)"><span>删除</span></td>
273 </tr> 277 </tr>
274 </table> 278 </table>
275 </div> 279 </div>
...@@ -345,7 +349,7 @@ ...@@ -345,7 +349,7 @@
345 </tr> 349 </tr>
346 </table> 350 </table>
347 </div> 351 </div>
348 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" 352 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" :isZdClose="true"
349 @close="close"></query-data> 353 @close="close"></query-data>
350 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 354 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
351 <el-button type="primary" class="saveBtn">保存</el-button> 355 <el-button type="primary" class="saveBtn">保存</el-button>
...@@ -439,8 +443,6 @@ ...@@ -439,8 +443,6 @@
439 newzdzdtzmbsm: this.zdhbqData.zdtzmbsm, 443 newzdzdtzmbsm: this.zdhbqData.zdtzmbsm,
440 oldzdbsms: oldBsm 444 oldzdbsms: oldBsm
441 } 445 }
442 console.log(this.zdhbhData,"宗地合并后数据");
443 console.log(this.zdhbqData,"宗地合并前数据")
444 ZdHb(data).then(res=>{ 446 ZdHb(data).then(res=>{
445 if (res.success) { 447 if (res.success) {
446 this.$message.success("合并成功") 448 this.$message.success("合并成功")
...@@ -559,15 +561,34 @@ ...@@ -559,15 +561,34 @@
559 this.centerDialogVisible = true; 561 this.centerDialogVisible = true;
560 }, 562 },
561 getData: function (data) { 563 getData: function (data) {
564 let arr=[];
562 switch (this.tabName) { 565 switch (this.tabName) {
563 case "zd": 566 case "zd":
564 this.zdhbqData.push(data) 567 arr=this.zdhbqData.filter(i=>i.zddm==data.zddm);
568 if (arr.length>0) {
569 break
570 }
571 this.zdhbqData.push(data);
565 break 572 break
566 case "dz": 573 case "dz":
567 this.dzhbqData.push(data) 574 arr=this.dzhbqData.filter(i=>i.glbsm==data.glbsm);
575 if (arr.length>0) {
576 break
577 }
578 if (this.dzhbqData.includes(data)) {
579 break
580 }
581 this.dzhbqData.push(data);
568 break 582 break
569 case "h": 583 case "h":
570 this.hhbqData.push(data) 584 arr=this.hhbqData.filter(i=>i.glbsm==data.glbsm);
585 if (arr.length>0) {
586 break
587 }
588 if (this.hhbqData.includes(data)) {
589 break
590 }
591 this.hhbqData.push(data);
571 break 592 break
572 default: 593 default:
573 break; 594 break;
......
...@@ -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">
...@@ -50,6 +56,7 @@ ...@@ -50,6 +56,7 @@
50 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj> 56 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
51 <div class="btnGroup"> 57 <div class="btnGroup">
52 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 58 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
59 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
53 <el-button type="primary" @click="hbjResetInfo">重置</el-button> 60 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
54 <el-button type="primary" @click="hbjVisible = false">取消</el-button> 61 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
55 </div> 62 </div>
...@@ -104,6 +111,11 @@ ...@@ -104,6 +111,11 @@
104 this.$refs.hbj.onSave(this.hbsm, this.tabPosition); 111 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
105 this.getData({pageSize:15}); 112 this.getData({pageSize:15});
106 }, 113 },
114 //户提交
115 hbjSubmitInfo() {
116 this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
117 this.getData({pageSize:15});
118 },
107 //户编辑表单重置 119 //户编辑表单重置
108 hbjResetInfo() { 120 hbjResetInfo() {
109 this.$refs.hbj.onReset(); 121 this.$refs.hbj.onReset();
......
...@@ -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){
......
...@@ -33,7 +33,10 @@ ...@@ -33,7 +33,10 @@
33 <td class="lx">{{item.filepostfix}}</td> 33 <td class="lx">{{item.filepostfix}}</td>
34 <td class="cz"> 34 <td class="cz">
35 <span @click="downloadFile(item.fileurl)">下载</span> 35 <span @click="downloadFile(item.fileurl)">下载</span>
36 <span>/</span>
36 <span @click="loadFile(item.fileurl)">预览</span> 37 <span @click="loadFile(item.fileurl)">预览</span>
38 <span>/</span>
39 <span @click="deleteFile(item.bsm)">删除</span>
37 </td> 40 </td>
38 </tr> 41 </tr>
39 </table> 42 </table>
...@@ -41,7 +44,7 @@ ...@@ -41,7 +44,7 @@
41 </template> 44 </template>
42 45
43 <script> 46 <script>
44 import {insertFile, getFileLis, downloadFile,loadFile} from "./../../../api/common" 47 import {insertFile, getFileLis, downloadFile,loadFile,deleteFile} from "./../../../api/common"
45 import {Message} from "element-ui" 48 import {Message} from "element-ui"
46 49
47 export default { 50 export default {
...@@ -69,21 +72,29 @@ ...@@ -69,21 +72,29 @@
69 } 72 }
70 }, 73 },
71 mounted() { 74 mounted() {
72 switch (this.$route.name) { 75 this.getFileList()
73 case "宗地":
74 this.filesData.dylx = 'zd';
75 this.filesData.glbsm = this.$store.state.zdbsm
76 break;
77 case "自然幢":
78 this.filesData.dylx = 'zrz';
79 this.filesData.glbsm = this.$store.state.zrzbsm
80 break
81 default:
82 break
83 }
84 this.getFileList(this.filesData.glbsm)
85 }, 76 },
86 methods: { 77 methods: {
78 deleteFile(bsm){
79 this.$confirm('将删除该文件, 是否继续?', '提示', {
80 confirmButtonText: '确定',
81 cancelButtonText: '取消',
82 type: 'warning'
83 }).then(() => {
84 deleteFile(bsm).then(res=>{
85 if (res.success) {
86 this.getFileList();
87 }else {
88 this.$message.error("删除失败")
89 }
90 })
91 }).catch(() => {
92 this.$message({
93 type: 'info',
94 message: '已取消'
95 });
96 });
97 },
87 loadFile(url){ 98 loadFile(url){
88 loadFile(url).then(res=>{ 99 loadFile(url).then(res=>{
89 if (res.success) { 100 if (res.success) {
...@@ -94,8 +105,20 @@ ...@@ -94,8 +105,20 @@
94 downloadFile(url) { 105 downloadFile(url) {
95 window.open(`/api/file/download?url=`+url); 106 window.open(`/api/file/download?url=`+url);
96 }, 107 },
97 getFileList(bsm) { 108 getFileList() {
98 getFileLis(bsm).then(res => { 109 switch (this.$route.name) {
110 case "宗地":
111 this.filesData.dylx = 'zd';
112 this.filesData.glbsm = this.$store.state.zdbsm
113 break;
114 case "自然幢":
115 this.filesData.dylx = 'zrz';
116 this.filesData.glbsm = this.$store.state.zrzbsm
117 break
118 default:
119 break
120 }
121 getFileLis(this.filesData.glbsm ).then(res => {
99 if (res.success) { 122 if (res.success) {
100 this.list = res.result; 123 this.list = res.result;
101 } else { 124 } else {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane> 6 <el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane>
7 <el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane> 7 <el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane>
8 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 8 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
9 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> 9 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
10 <el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane> 10 <el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 </div> 12 </div>
...@@ -29,11 +29,15 @@ export default { ...@@ -29,11 +29,15 @@ export default {
29 data() { 29 data() {
30 return { 30 return {
31 activeName: "djdcb", 31 activeName: "djdcb",
32 lshsVisible:false,
32 }; 33 };
33 }, 34 },
34 methods: { 35 methods: {
35 handleClick(tab, event) { 36 handleClick(tab, event) {
36 // console.log(tab, event); 37 // console.log(tab, event);
38 if (tab.name == 'lshs') {
39 this.lshsVisible = true;
40 }
37 }, 41 },
38 }, 42 },
39 created() {}, 43 created() {},
......
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 });
80 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 );
119
120 const tooltip = new G6.Tooltip({
121 offsetX: 210,
122 offsetY: 210,
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:eWidth,
84 height:800, 145 height:1000,
85 layout: { 146 layout: {
86 type: 'dagre', 147 type: 'dagre',
87 nodesepFunc: (d) => { 148 nodesepFunc: (d) => {
...@@ -103,9 +164,15 @@ export default { ...@@ -103,9 +164,15 @@ 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 },
170 // defaultEdge: {
171 // type: 'cubic-vertical',
172 // style: {
173 // stroke: '#F6BD16',
174 // },
175 // },
109 nodeStateStyles: { 176 nodeStateStyles: {
110 selected: { 177 selected: {
111 stroke: '#d9d9d9', 178 stroke: '#d9d9d9',
...@@ -113,31 +180,35 @@ export default { ...@@ -113,31 +180,35 @@ export default {
113 }, 180 },
114 }, 181 },
115 182
183 plugins: [tooltip],
116 modes: { 184 modes: {
117 default: [ 185 default: [
118 'drag-canvas', 186 'drag-node',
119 'zoom-canvas', 187 'drag-canvas',
120 'click-select', 188 'zoom-canvas',
121 { 189 '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 ], 190 ],
134 }, 191 },
192
135 fitView: true, 193 fitView: true,
136 }); 194 });
137 195
138 graph.data(data); 196 graph.data(data);
139 graph.render(); 197 graph.render();
140 198
199 graph.on('node:mouseenter', e => {
200 graph.setItemState(e.item, 'active', true)
201 });
202 graph.on('node:mouseleave', e => {
203 graph.setItemState(e.item, 'active', false)
204 });
205 graph.on('edge:mouseenter', e => {
206 graph.setItemState(e.item, 'active', true)
207 });
208 graph.on('edge:mouseleave', e => {
209 graph.setItemState(e.item, 'active', false)
210 });
211
141 if (typeof window !== 'undefined') 212 if (typeof window !== 'undefined')
142 window.onresize = () => { 213 window.onresize = () => {
143 if (!graph || graph.get('destroyed')) return; 214 if (!graph || graph.get('destroyed')) return;
...@@ -156,6 +227,38 @@ export default { ...@@ -156,6 +227,38 @@ export default {
156 getLshs(data).then((res)=>{ 227 getLshs(data).then((res)=>{
157 if(res.code===200){ 228 if(res.code===200){
158 _this.data=res.result; 229 _this.data=res.result;
230 _this.data = {"nodes":[
231 {"id":"836524edab33ab19bb0e0b4fd064cd77","dataType":"sql","name":"20201127宗地A",
232 "conf":[{"label":"宗地代码","value":"610102123666GA10002"},{"label":"项目名称","value":"20201127宗地A"},
233 {"label":"不动产单元号","value":"610102123666GA10002W00000000"},{"label":"坐落","value":"610102123666G10003W"},
234 {"label":"权利人","value":""}]},
235 {"id":"601130536a6bf6efc7a248af469e982c","dataType":"sql","name":"20201127宗地A222221",
236 "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地A222221"},
237 {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
238 {"id":"c0818d9e4286b35b8ee9b96d90b522aa","dataType":"sql","name":"20201127宗地A2222222",
239 "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地A2222222"},
240 {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
241
242 {"id":"601130536a6bf6efc7a248af469e982c1","dataType":"sql","name":"20201127宗地B",
243 "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地B"},
244 {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
245 {"id":"c0818d9e4286b35b8ee9b96d90b522aa1","dataType":"sql","name":"20201127宗地B1",
246 "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地B1"},
247 {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
248
249 {"id":"c0818d9e4286b35b8ee9b96d90b522aa12","dataType":"sql","name":"20201127宗地C",
250 "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地C"},
251 {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
252 ],
253
254 "edges":[
255 {"source":"836524edab33ab19bb0e0b4fd064cd77","target":"601130536a6bf6efc7a248af469e982c"},
256 {"source":"836524edab33ab19bb0e0b4fd064cd77","target":"c0818d9e4286b35b8ee9b96d90b522aa"},
257 {"source":"c0818d9e4286b35b8ee9b96d90b522aa","target":"601130536a6bf6efc7a248af469e982c1"},
258 {"source":"c0818d9e4286b35b8ee9b96d90b522aa","target":"c0818d9e4286b35b8ee9b96d90b522aa1"},
259 {"source":"601130536a6bf6efc7a248af469e982c1","target":"c0818d9e4286b35b8ee9b96d90b522aa12"},
260 {"source":"c0818d9e4286b35b8ee9b96d90b522aa1","target":"c0818d9e4286b35b8ee9b96d90b522aa12"},
261 ]};
159 this.initG6(); 262 this.initG6();
160 } 263 }
161 }) 264 })
...@@ -167,4 +270,23 @@ export default { ...@@ -167,4 +270,23 @@ export default {
167 </script> 270 </script>
168 <style scoped lang="less"> 271 <style scoped lang="less">
169 272
273 .lshs-content{
274 width: 100%;
275 height: 100%;
276 }
277
278 #mountNode{
279 /*height: calc(100% - 68px);*/
280 margin-top: -60px;
281 }
282
283 .slot{
284 margin-left: 50px;
285 margin-top: 20px;
286 width: 300px;
287 }
288
289 .tip-title{
290 font-weight: 700;
291 }
170 </style> 292 </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 />
...@@ -341,6 +341,7 @@ ...@@ -341,6 +341,7 @@
341 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 341 <div style="min-height: 40px;text-align: center;margin-top: 10px">
342 <el-button type="success" @click="updateZDxx">保存</el-button> 342 <el-button type="success" @click="updateZDxx">保存</el-button>
343 <el-button type="primary" @click="submitZDxx">提交</el-button> 343 <el-button type="primary" @click="submitZDxx">提交</el-button>
344 <el-button type="primary" @click="registerCall">登记调用</el-button>
344 </div> 345 </div>
345 </div> 346 </div>
346 </div> 347 </div>
...@@ -349,6 +350,7 @@ ...@@ -349,6 +350,7 @@
349 <script> 350 <script>
350 import Qlr from "../../../components/formMenu/qlr"; 351 import Qlr from "../../../components/formMenu/qlr";
351 import Qlxz from "../../../components/formMenu/qlxz"; 352 import Qlxz from "../../../components/formMenu/qlxz";
353 import geoUtils from "@components/lineTree/tx/js/geoUtils";
352 import { 354 import {
353 getAllList, 355 getAllList,
354 getDdicByMC, 356 getDdicByMC,
...@@ -356,6 +358,7 @@ import { ...@@ -356,6 +358,7 @@ import {
356 getListByPbsm, 358 getListByPbsm,
357 submit, 359 submit,
358 getTree, 360 getTree,
361 registerCall
359 } from "../../../api/common"; 362 } from "../../../api/common";
360 import { 363 import {
361 getBdcdyh, 364 getBdcdyh,
...@@ -410,15 +413,72 @@ export default { ...@@ -410,15 +413,72 @@ export default {
410 formData: {}, 413 formData: {},
411 dpdm:'', //宗地底盘代码 414 dpdm:'', //宗地底盘代码
412 curZdbsm:'', 415 curZdbsm:'',
416 geoAttributes:{
417 OBJECTID:"",
418 BSM:"",
419 YSDM:"",
420 ZDDM:"",
421 BDCDYH:"",
422 ZDTZM :"",
423 ZL:"",
424 ZDMJ:0,
425 MJDW:"",
426 YT:"",
427 DJ:"",
428 JG:0,
429 QLLX:"",
430 QLXZ:"",
431 QLSDFS:"",
432 RJL:0,
433 JZMD:0,
434 JZXG:0,
435 ZDSZD:"",
436 ZDSZN :"",
437 ZDSZX :"",
438 ZDSZB :"",
439 TFH:"",
440 DJH:"",
441 DAH:"",
442 BZ :"",
443 ZT:"",
444 YWZT:"",
445 BLID:"",
446 XMMC:"",
447 XMID:"",
448 BGRQ:"",
449 BGID:"",
450 BGZT:"",
451 TDZH:"",
452 QSZT:0,
453 BBLX:0,
454 SFDB:0,
455 QLR :"",
456 CUTID:"",
457 BHQKID:"",
458 DJZQDM :"",
459 SYQLXID:"",
460 }
413 }; 461 };
414 }, 462 },
415 created() { 463 mixins:[geoUtils],
464 created() {
416 this.curZdbsm = this.$route.query.bsm; 465 this.curZdbsm = this.$route.query.bsm;
417 }, 466 },
418 mounted() { 467 mounted() {
419 this.getZdjbxxData(this.$store.state.zdbsm); 468 this.getZdjbxxData(this.$store.state.zdbsm);
420 }, 469 },
421 methods: { 470 methods: {
471 registerCall(){
472 let data={
473 type:'zd',
474 bsm:this.$store.state.zdbsm
475 }
476 registerCall(data).then(res=>{
477 if (res.success) {
478 this.$message.success("登记成功")
479 }
480 })
481 },
422 //根据zdbsm查询基本信息 482 //根据zdbsm查询基本信息
423 getZdjbxxData(bsm) { 483 getZdjbxxData(bsm) {
424 getQjZdjbxxDetailById(bsm) 484 getQjZdjbxxDetailById(bsm)
...@@ -612,6 +672,26 @@ export default { ...@@ -612,6 +672,26 @@ export default {
612 } 672 }
613 }) 673 })
614 .catch((error) => {}); 674 .catch((error) => {});
675 //保存到空间库里面
676 var self = this;
677 for(var key in this.geoAttributes){
678 if(key == "BSM"){
679 self.geoAttributes[key] = this.$store.state.zdbsm
680 }else if(key == 'QLSDFS'){
681 var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
682 var qlsdfs = qlsdfsList.filter(item => {
683 return item.bsm == value;
684 })
685 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:"";
686 }else {
687 var formKay = key.toLowerCase();
688 self.geoAttributes[key] = self.formData[formKay];
689 }
690 }
691 self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
692 console.log("属性保存完成!!");
693 });
694
615 } 695 }
616 696
617 697
...@@ -719,7 +799,7 @@ export default { ...@@ -719,7 +799,7 @@ export default {
719 this.$store.state.zddm = val; 799 this.$store.state.zddm = val;
720 }, 800 },
721 zdbsm:function (val) { 801 zdbsm:function (val) {
722 this.getZdjbxxData(val) 802 this.getZdjbxxData(val)
723 this.curZdbsm = val; 803 this.curZdbsm = val;
724 } 804 }
725 }, 805 },
......
...@@ -46,8 +46,8 @@ export default { ...@@ -46,8 +46,8 @@ export default {
46 }; 46 };
47 </script> 47 </script>
48 <style scoped lang="less"> 48 <style scoped lang="less">
49 // .content_box{ 49 .content_box{
50 // box-sizing: border-box; 50 padding: 0 0 16px;
51 // padding: 0 20px; 51 // padding: 0 20px;
52 // .el-tabs{ 52 // .el-tabs{
53 // width: 100%; 53 // width: 100%;
...@@ -65,5 +65,5 @@ export default { ...@@ -65,5 +65,5 @@ export default {
65 // width: 100%; 65 // width: 100%;
66 // height: 100%; 66 // height: 100%;
67 // } 67 // }
68 // } 68 }
69 </style> 69 </style>
......
...@@ -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" >
...@@ -403,7 +403,8 @@ ...@@ -403,7 +403,8 @@
403 import Qlr from "./../../../../../components/formMenu/qlr"; 403 import Qlr from "./../../../../../components/formMenu/qlr";
404 import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; 404 import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
405 import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; 405 import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
406 import {getBdcdyh} from "./../../../../../api/zrz" 406 import {getBdcdyh} from "./../../../../../api/zrz";
407 import {submit} from "./../../../../../api/common"
407 export default { 408 export default {
408 name:'zrz', 409 name:'zrz',
409 components:{ 410 components:{
...@@ -697,6 +698,18 @@ ...@@ -697,6 +698,18 @@
697 } 698 }
698 }) 699 })
699 }, 700 },
701 onSubmit(bsm,yclx){
702 let data={
703 glbsm:bsm,
704 status:1,
705 type:"h"
706 }
707 submit(data).then((res)=>{
708 if(res.code===200){
709 this.$message.success("提交完成！");
710 }
711 })
712 },
700 onReset(){ 713 onReset(){
701 this.form.bdcdyh='', //不动产单元号 714 this.form.bdcdyh='', //不动产单元号
702 this.form.mjdwbsm='', //面积单位编号 715 this.form.mjdwbsm='', //面积单位编号
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="edit"> 2 <div class="edit">
3 <div class="tab-header"> 3 <div class="tab-header">
4 <el-row class="searchContent"> 4 <el-row class="searchContent">
5 <el-col :span="8"> 5 <el-col :span="6">
6 <el-radio-group v-model="scyclx" @change="scyclxChange"> 6 <el-radio-group v-model="scyclx" @change="scyclxChange">
7 <el-radio-button label="1">实测</el-radio-button> 7 <el-radio-button label="1">实测</el-radio-button>
8 <el-radio-button label="0">预测</el-radio-button> 8 <el-radio-button label="0">预测</el-radio-button>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 ></i 23 ></i
24 ></el-input> 24 ></el-input>
25 </el-col> 25 </el-col>
26 <el-col :span="16"> 26 <el-col :span="18">
27 <div class="fr"> 27 <div class="fr">
28 <el-button class="radioBtn" label="1" border @click="create" 28 <el-button class="radioBtn" label="1" border @click="create"
29 ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button 29 ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
...@@ -66,9 +66,16 @@ ...@@ -66,9 +66,16 @@
66 class="radioBtn" 66 class="radioBtn"
67 label="7" 67 label="7"
68 border 68 border
69 @click="hcxlzVisible = true" 69 @click="hcxlz"
70 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button 70 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
71 > 71 >
72 <el-button
73 class="radioBtn"
74 label="7"
75 border
76 @click="batchCommit"
77 ><i class="iconfont iconhuzhongxinlazong"></i>批量提交</el-button
78 >
72 </div> 79 </div>
73 </el-col> 80 </el-col>
74 </el-row> 81 </el-row>
...@@ -252,8 +259,10 @@ ...@@ -252,8 +259,10 @@
252 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
253 <div class="btnGroup"> 260 <div class="btnGroup">
254 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 261 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
262 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
255 <el-button type="primary" @click="hbjResetInfo">重置</el-button> 263 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
256 <el-button type="primary" @click="hbjVisible = false">取消</el-button> 264 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
265 <el-button type="primary" @click="registerCall">登记调用</el-button>
257 </div> 266 </div>
258 </el-dialog> 267 </el-dialog>
259 </div> 268 </div>
...@@ -272,7 +281,8 @@ import addZdy from "./zdy/index"; ...@@ -272,7 +281,8 @@ import addZdy from "./zdy/index";
272 import addCh from "./ch/index"; 281 import addCh from "./ch/index";
273 import hbj from "./hbj/index"; 282 import hbj from "./hbj/index";
274 import lpbContent from "./lpbContent/index"; 283 import lpbContent from "./lpbContent/index";
275 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz } from "../../../../api/lpb"; 284 import {registerCall} from "../../../../api/common";
285 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
276 286
277 export default { 287 export default {
278 name: "", 288 name: "",
...@@ -395,6 +405,28 @@ export default { ...@@ -395,6 +405,28 @@ export default {
395 }, 100); 405 }, 100);
396 }, 406 },
397 methods: { 407 methods: {
408 registerCall(){
409 let data={
410 type:'h',
411 bsm:this.hbsm
412 }
413 registerCall(data).then(res=>{
414 if (res.success) {
415 this.$message.success("登记成功")
416 }
417 })
418 },
419 batchCommit(){
420 if (this.bsms.length <= 0) {
421 Message.warning("请选择操作户")
422 return
423 }
424 batchCommit(this.bsms).then(res=>{
425 if (res.success) {
426 Message.success("提交成功")
427 }
428 })
429 },
398 hcxlz(){ 430 hcxlz(){
399 if (this.bsms.length <= 0) { 431 if (this.bsms.length <= 0) {
400 Message.warning("请选择操作户") 432 Message.warning("请选择操作户")
...@@ -574,6 +606,10 @@ export default { ...@@ -574,6 +606,10 @@ export default {
574 hbjSaveInfo() { 606 hbjSaveInfo() {
575 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition); 607 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
576 }, 608 },
609 //户保存
610 hbjSubmitInfo() {
611 this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
612 },
577 //户编辑表单重置 613 //户编辑表单重置
578 hbjResetInfo() { 614 hbjResetInfo() {
579 this.$refs.hbj.onReset(); 615 this.$refs.hbj.onReset();
......
...@@ -65,6 +65,9 @@ ...@@ -65,6 +65,9 @@
65 @contextmenu.prevent="openMenu($event, hs, 'h')" 65 @contextmenu.prevent="openMenu($event, hs, 'h')"
66 > 66 >
67 {{ hs.shbw }} 67 {{ hs.shbw }}
68 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
69 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
70 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
68 </td> 71 </td>
69 </tr> 72 </tr>
70 </table> 73 </table>
...@@ -116,6 +119,9 @@ ...@@ -116,6 +119,9 @@
116 @contextmenu.prevent="openMenu($event, hs, 'h')" 119 @contextmenu.prevent="openMenu($event, hs, 'h')"
117 > 120 >
118 {{ hs.shbw }} 121 {{ hs.shbw }}
122 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
123 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
124 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
119 </td> 125 </td>
120 </tr> 126 </tr>
121 </table> 127 </table>
...@@ -172,6 +178,9 @@ ...@@ -172,6 +178,9 @@
172 @contextmenu.prevent="openMenu($event, hs, 'h')" 178 @contextmenu.prevent="openMenu($event, hs, 'h')"
173 > 179 >
174 {{ hs.shbw }} 180 {{ hs.shbw }}
181 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
182 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
183 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
175 </td> 184 </td>
176 </tr> 185 </tr>
177 </table> 186 </table>
...@@ -213,6 +222,9 @@ ...@@ -213,6 +222,9 @@
213 @contextmenu.prevent="openMenu($event, hs, 'h')" 222 @contextmenu.prevent="openMenu($event, hs, 'h')"
214 > 223 >
215 {{ hs.shbw }} 224 {{ hs.shbw }}
225 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
226 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
227 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
216 </td> 228 </td>
217 </tr> 229 </tr>
218 </table> 230 </table>
...@@ -784,6 +796,31 @@ export default { ...@@ -784,6 +796,31 @@ export default {
784 line-height: 64px; 796 line-height: 64px;
785 text-align: center; 797 text-align: center;
786 cursor: pointer; 798 cursor: pointer;
799 position: relative;
800 .hqszt{
801 display: inline-block;
802 width: 16px;
803 height: 16px;
804 font-size: 12px;
805 line-height: 16px;
806 position: absolute;
807 left: 6px;
808 top: 6px;
809 border: 1px solid;
810 border-radius: 8px;
811 }
812 .lin{
813 color:#F7B500;
814 border-color: #F7B500;
815 }
816 .zheng{
817 color: #1AD6E1;
818 border-color: #1AD6E1;
819 }
820 .xian{
821 color: #45AEFD;
822 border-color: #45AEFD;
823 }
787 } 824 }
788 .tdSelect { 825 .tdSelect {
789 border: 1px solid #006cff !important; 826 border: 1px solid #006cff !important;
......
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
265 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 265 <div style="min-height: 40px;text-align: center;margin-top: 10px">
266 <el-button type="success" @click="onSave">保存</el-button> 266 <el-button type="success" @click="onSave">保存</el-button>
267 <el-button type="primary" @click="onSubmit">提交</el-button> 267 <el-button type="primary" @click="onSubmit">提交</el-button>
268 <el-button type="primary" @click="registerCall">登记调用</el-button>
268 </div> 269 </div>
269 </div> 270 </div>
270 </div> 271 </div>
...@@ -275,7 +276,7 @@ ...@@ -275,7 +276,7 @@
275 import Qlxz from "../../../components/formMenu/qlxz_simple"; 276 import Qlxz from "../../../components/formMenu/qlxz_simple";
276 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 277 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
277 import {getQjZdjbxxDetailById} from "../../../api/zd" 278 import {getQjZdjbxxDetailById} from "../../../api/zd"
278 import {submit} from "../../../api/common" 279 import {submit,registerCall} from "../../../api/common"
279 export default { 280 export default {
280 name:'zrz', 281 name:'zrz',
281 components:{ 282 components:{
...@@ -353,9 +354,59 @@ ...@@ -353,9 +354,59 @@
353 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 354 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
354 loading:false, 355 loading:false,
355 source:'', 356 source:'',
357 geoAttributes:{
358 OBJECTID:null,
359 YSDM:"",
360 BDCDYH:"",
361 ZDDM:"",
362 ZRZH:"",
363 XMMC:"",
364 JZWMC:"",
365 JGRQ:"",
366 JZWGD:"",
367 ZZDMJ:0,
368 ZYDMJ:0,
369 YCJZMJ:0,
370 SCJZMJ:0,
371 ZCS:0,
372 DSCS:0,
373 DXCS:0,
374 DXSD:0,
375 GHYT:"",
376 FWJG:"",
377 ZTS:0,
378 JZWJBYT:"",
379 DAH:"",
380 BZ:"",
381 ZT:"",
382 YWZT:"",
383 BLID:"",
384 XMID:"",
385 BGZT:"",
386 BGRQ:"",
387 BGID:"",
388 BBLX:"",
389 QSZT:"",
390 CUTID :"",
391 BHQKID:"",
392 DJZQDM:"",
393 ZDTZM:"",
394 BSM:"",
395 }
356 } 396 }
357 }, 397 },
358 methods: { 398 methods: {
399 registerCall(){
400 let data={
401 type:'zrz',
402 bsm:this.$route.query.bsm
403 }
404 registerCall(data).then(res=>{
405 if (res.success) {
406 this.$message.success("登记成功")
407 }
408 })
409 },
359 addYtInfo(){ 410 addYtInfo(){
360 this.form.fwytList.push({ 411 this.form.fwytList.push({
361 glbsm:'', 412 glbsm:'',
...@@ -421,8 +472,22 @@ ...@@ -421,8 +472,22 @@
421 }) 472 })
422 this.loading=false; 473 this.loading=false;
423 } 474 }
475
476 //保存到空间库里面
477 var self = this;
478 for(var key in this.geoAttributes){
479 if(key == "BSM"){
480 self.geoAttributes[key] = this.bsm
481 }else{
482 var formKay = key.toLowerCase();
483 self.geoAttributes[key] = self.formData[formKay];
484 }
485 }
486 self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
487 console.log("属性保存完成!!");
488 });
424 } 489 }
425 490
426 }, 491 },
427 onSubmit(){ 492 onSubmit(){
428 let data={ 493 let data={
......