5eab16e7 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 4e928d97 3f1fb4a7
......@@ -12,7 +12,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@antv/g6": "^4.0.2",
"@antv/g6": "^4.0.3",
"axios": "^0.19.0",
"core-js": "^2.6.5",
"e-icon-picker": "^1.0.7",
......
......@@ -8,7 +8,7 @@
"fillSymbol": {
"defaultSymbol": {
"type": "simple-fill",
"color": [ 0,233, 245, 0.8 ],
"color": [ 0,233, 245, 0.4 ],
"style": "solid",
"outline": {
"color": "#00e9f5",
......@@ -17,7 +17,7 @@
},
"highlightSymbol": {
"type": "simple-fill",
"color": [ 245,3, 37, 0.8 ],
"color": [ 245,3, 37, 0.4 ],
"style": "solid",
"outline": {
"color": "#f50325",
......
[{
"layerName": "ZDJBXX",
"layerLabel": "宗地",
"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",
"id": "8"
"id":8,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
"ZDDM": "宗地代码",
"BDCDYH": "不动产单元号",
"ZDTZM": "宗地特征码",
"ZL": "坐落",
"ZDMJ": "宗地面积",
"MJDW": "面积单位",
"YT": "用途",
"DJ": "等级",
"JG": "价格",
"QLLX": "权利类型",
"QLXZ": "权利性质",
"QLSDFS": "权利设定方式",
"RJL": "容积率",
"JZMD": "建筑密度",
"JZXG": "建筑限高",
"ZDSZD": "宗地四至-东",
"ZDSZN": "宗地四至-南",
"ZDSZX": "宗地四至-西",
"ZDSZB": "宗地四至-北",
"TFH": "图幅号",
"DJH": "地籍号",
"DAH": "档案号",
"BZ": "备注",
"ZT": "状态",
"YWZT": "业务状态",
"XMMC": "项目名称",
"BGRQ": "变更日期",
"TDZH": "土地证号"
}
},
{
"layerName": "ZRZ",
"layerLabel": "自然幢",
"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",
"id": "10"
"id": 10,
"fieldAliases": {
"YSDM": "要素代码",
"BDCDYH": "不动产单元号",
"ZDDM": "宗地代码",
"ZRZH": "自然幢号",
"XMMC": "项目名称",
"JZWMC": "建筑物名称",
"JGRQ": "竣工日期",
"JZWGD": "建筑物高度",
"ZZDMJ": "幢占地面积",
"ZYDMJ": "幢用地面积",
"YCJZMJ": "预测建筑面积",
"SCJZMJ": "实测建筑面积",
"ZCS": "总层数",
"DSCS": "地上层数",
"DXCS": "地下层数",
"DXSD": "地下深度",
"GHYT": "规划用途",
"FWJG": "房屋结构",
"ZTS": "总套数",
"JZWJBYT": "建筑物基本用途",
"DAH": "档案号",
"BZ": "备注",
"ZT": "状态",
"YWZT": "业务状态",
"BSM": "标识码"
}
},
{
"layerName": "DJQ",
"layerLabel": "地籍区",
"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",
"id": "13"
"id": 13,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
"DJQDM": "地籍区代码",
"DJQMC": "地籍区名称"
}
},
{
"layerName": "DJZQ",
"layerLabel": "地籍子区",
"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",
"id": "14"
"id": 14,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
"DJZQDM": "地籍子区代码",
"DJZQMC": "地籍子区名称"
}
},
{
"layerName": "XJZQ",
"layerLabel": "行政区",
"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",
"id": "19"
"id": 19,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
"XZQDM": "行政区代码",
"XZQMC": "行政区名称",
"XZQMJ": "行政区面积"
}
}
]
\ No newline at end of file
......
......@@ -242,4 +242,10 @@ ol, ul { list-style:none; }
}
.creat:hover:focus{
opacity: .8!important;
}
.iconfontEdit{
cursor: pointer;
}
.iconfontEdit:hover{
color: rgb(0, 108, 255);
}
\ No newline at end of file
......
......@@ -6,6 +6,7 @@ import layers from '@/assets/json/layers.json'
import queryUtils from "@libs/map/queryUtils";
import identifyUtils from '@/libs/map/IdentifyUtils'
import {loadModules} from "esri-loader"
import featureUpdate from "@libs/map/featureUpdate";
import arcgisParser from 'terraformer-arcgis-parser'
import wktParse from 'terraformer-wkt-parser'
......@@ -199,11 +200,38 @@ export default {
if(callBacFunction && typeof callBacFunction == "function"){
callBacFunction(isJoint,message);
}
})
},true)
}).catch(err => {
console.log(err);
throw (err);
})
},
//保存或者编辑属性信息
updAttributes(bsm,type,attributes,callBackFunction){
var layer = null;
if(type == 'zd'){
layer = this.getLayerByName("ZDJBXX");
}else{
layer = this.getLayerByName("ZRZ");
}
var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
featureUrl += "/"+layer.id;
this.queryGeoByBsm(bsm,type,function (features) {
if(features && features.length > 0){
attributes.OBJECTID = features[0].attributes.OBJECTID;
features[0].attributes = attributes;
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]]";
features[0].geometry.spatialReference = {
wkt:wkt
}
featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction);
}else{
var graphic = {
attributes:attributes
}
featureUpdate.methods.addGraphic(featureUrl,graphic,callBackFunction) ;
}
});
}
}
......
......@@ -3,7 +3,7 @@ import {loadModules} from 'esri-loader'
export default {
methods: {
identify(url,layerIds,geometry ,callBackFunction){
identify(url,layerIds,geometry,callBackFunction,returnGeometry,layerOption,tolerance,mapExtent){
var self = this;
loadModules([
"esri/tasks/IdentifyTask",
......@@ -20,10 +20,11 @@ export default {
if(layerIds){
identifyParameters.layerIds = layerIds;
}
identifyParameters.layerOption = "all";
identifyParameters.tolerance = 3;
identifyParameters.mapExtent = geometry.extent;
identifyParameters.returnGeometry = true;
identifyParameters.layerOption = layerOption ? layerOption : "all";
identifyParameters.tolerance = tolerance ? tolerance : 3;
identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent;
identifyParameters.returnGeometry = returnGeometry ? returnGeometry : false;
//identifyParameters.returnFieldName = false;
identifyParameters.spatialReference = geometry.spatialReference;
identifyTask.execute(identifyParameters).then(result => {
if(callBackFunction && typeof callBackFunction == 'function'){
......
......@@ -87,15 +87,36 @@ export default {
},
delGraphic(url,graphic,callBackFunction){
loadModules([
"esri/layers/FeatureLayer"
"esri/layers/FeatureLayer",
"esri/Graphic",
"esri/geometry/Point",
"esri/geometry/Polygon",
"esri/geometry/Polyline"
]).then(([
FeatureLayer
FeatureLayer,
Graphic,
Point,
Polygon,
Polyline
])=>{
var featureLayer = new FeatureLayer({
url:url
})
var geo = null;
if(graphic.geometry.type == 'point'){
geo = new Point(graphic.geometry);
}else if(graphic.geometry.type == 'polyline'){
geo = new Polyline(graphic.geometry);
}else if(graphic.geometry.type == 'polygon'){
geo = new Polygon(graphic.geometry);
}
var delGraphic = new Graphic({
attributes:graphic.attributes,
geometry:geo
});
featureLayer.applyEdits({
deleteFeatures:[graphic]
deleteFeatures:[delGraphic]
}).then(function (res){
if(callBackFunction && typeof callBackFunction == 'function'){
callBackFunction(res);
......
import {loadModules} from 'esri-loader'
export default {
methods:{
findByPro(url,layerIds,searchFields,searchText,returnGeometry,callBackFunction){
loadModules([
"esri/tasks/FindTask",
"esri/tasks/support/FindParameters"
]).then(([
FindTask,
FindParameters
]) => {
var findTask = new FindTask({
url:url
}),
findParameters = new FindParameters();
findParameters.returnGeometry = returnGeometry ? returnGeometry : false;
findParameters.layerIds = layerIds;
findParameters.searchFields = searchFields;
findParameters.searchText = searchText;
findTask.execute(findParameters).then(function (result) {
if(callBackFunction){
callBackFunction(result);
}
});
}).catch(err => {
throw (err);
})
}
}
}
\ No newline at end of file
......@@ -177,6 +177,9 @@ export default {
"$store.state.zdbsm": function(bsm) {
this.getRightTree(bsm);
},
"$store.state.zrzbsm": function(bsm) {
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
},
"$store.state.treeData":function (val) {
console.log(val,'val');
......@@ -430,6 +433,8 @@ export default {
width: 100%;
height: 100vh;
position: relative;
min-width: 1500px;
overflow-x: auto;
.calcWidth{
width: calc(100% - 300px);
}
......
......@@ -9,15 +9,6 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
......@@ -37,7 +28,17 @@
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="办理" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit"></i>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="pagination">
......@@ -61,7 +62,7 @@
return {
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
qszt: ['1', '2'],
queryData: {},
formData: {
......
......@@ -64,13 +64,6 @@
<td class="zl">坐落</td>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="xzzrz(scope.row)" type="text" size="small"
>选择
</el-button>
</template>
</el-table-column>
<el-table-column prop="zddm" align="left" label="宗地代码">
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
......@@ -82,6 +75,16 @@
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="选择" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="xzzrz(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<!-- <el-button @click="xzzrz(scope.row)" type="text" size="small"
>选择
</el-button> -->
</template>
</el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer"> </span>
......
......@@ -9,14 +9,6 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
......@@ -41,7 +33,21 @@
{{ scope.row.addtime | timeFilter }}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="办理" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit"></i>
</el-tooltip>
<!-- <el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button>
<el-button type="text" size="small">定位</el-button> -->
</template>
</el-table-column>
</el-table>
<div class="pagination">
......@@ -72,7 +78,7 @@ export default {
qszt: ['2'],
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
tableData: [],
tableHeight: "100",
queryData: {},
......@@ -80,7 +86,7 @@ export default {
},
created() {},
mounted() {
this.getData({});
this.getData({pageSize:this.pageSize});
// console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
this.$nextTick(() => {
this.tableHeight =
......
......@@ -98,11 +98,10 @@
</el-tab-pane>
<el-tab-pane class="eltabspane" label="自然幢" name="zrz">
<el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline">
<el-form-item label="项目名称" prop="xmmc">
<el-form-item label="项目名称" class="w100" prop="xmmc">
<el-input
v-model="ruleForm1.xmmc"
placeholder="项目名称"
style="width:400px;"
></el-input>
</el-form-item>
</el-form>
......@@ -114,11 +113,10 @@
</el-tab-pane>
<el-tab-pane class="eltabspane" label="多幢" name="dz">
<el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline">
<el-form-item label="项目名称" prop="xmmc">
<el-form-item label="项目名称" class="w100" prop="xmmc">
<el-input
v-model="ruleForm2.xmmc"
placeholder="项目名称"
style="width:400px;"
></el-input>
</el-form-item>
</el-form>
......@@ -243,9 +241,15 @@ export default {
methods: {
// 重置
reset(){
this.$refs['ruleForm'].resetFields();
this.$refs["ruleForm1"].resetFields();
this.$refs["ruleForm2"].resetFields();
if(this.$refs['ruleForm']){
this.$refs['ruleForm'].resetFields();
}
if(this.$refs["ruleForm1"]){
this.$refs["ruleForm1"].resetFields();
}
if (this.$refs["ruleForm2"]) {
this.$refs["ruleForm2"].resetFields();
}
},
handleClick(tab, event) {
console.log(tab, event);
......@@ -290,7 +294,6 @@ export default {
this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
insertZrzjbxx(this.ruleForm1)
.then((res) => {
debugger
if (res.code == "200") {
this.$message({
message: "创建成功!",
......@@ -300,13 +303,13 @@ export default {
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.zrzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.close();
this.$router.push({
path: '/zrz', query:{
source: 1,
bsm:res.result.bsm
}
});
this.close();
} else {
this.$message.error("创建失败!");
}
......@@ -334,13 +337,13 @@ export default {
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.dzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.close();
this.$router.push({
path: '/dz', query:{
source: 1,
bsm:res.result.bsm
}
});
this.close();
} else {
this.$message.error("创建失败!");
}
......@@ -405,8 +408,8 @@ export default {
}
},
close() {
this.$emit("closeDialog");
this.reset();
this.$emit("closeDialog");
},
},
computed: {},
......
......@@ -9,15 +9,6 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>更正
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
......@@ -37,7 +28,24 @@
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人"> -->
<!-- </el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="更正" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit"></i>
</el-tooltip>
</template>
<!-- <template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>更正
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template> -->
</el-table-column>
</el-table>
<div class="pagination">
......@@ -63,7 +71,7 @@
qszt: ['1'],
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
formData: {
user: "",
region: "",
......
......@@ -9,22 +9,13 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small" @click="postionToMap(scope.row)">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
</el-table-column>
<el-table-column prop="bdcqzh" align="left" label="不动产权证号">
</el-table-column>
<el-table-column prop="dylx" align="left" width="120" label="类型">
<el-table-column prop="dylx" align="left" width="100" label="类型">
<template slot-scope="scope">
{{scope.row.dylx | bdcLxFilter}}
</template>
......@@ -37,7 +28,22 @@
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="办理" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
</el-tooltip>
<!-- <el-button type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button> -->
</template>
</el-table-column>
</el-table>
<div class="pagination">
......
......@@ -50,7 +50,7 @@ export default {
layer = new GraphicsLayer({
id:"highlightLayer"
})
view.map.add(layer);
view.map.add(layer,5);
}
var symbol = graphicSymbol.fillSymbol.highlightSymbol;
var graphic = features[0];
......@@ -66,6 +66,61 @@ export default {
}
});
},
//将查询结果展示在地图上
addSearchResultToMap(searchResult,viewId){
var view = maps[viewId],
self = this;
loadModules([
"esri/layers/GraphicsLayer"
]).then(([
GraphicsLayer
]) => {
if(!searchResult || searchResult.length == 0){
return;
}
for(var i = 0;i < searchResult.length;i++){
var layer = view.map.findLayerById("searchResult"+searchResult.layerName);
if(layer){
layer.removeAll();
}else{
layer = new GraphicsLayer({
id:"searchResult"+searchResult.layerName
})
view.map.add(layer);
}
var symbol = graphicSymbol.fillSymbol.highlightSymbol;
var features = searchResult[i].features;
for(var j = 0;j < features.length;j++){
features[j].symbol = symbol;
layer.add(features[j]);
}
}
}).catch(err=>{
console.log(err);
})
},
//缩放至当前对象
extentToGraphic(feature,highlightGraohic,viewId,callBackFunction){
var symbol = graphicSymbol.fillSymbol.highlightSymbol;
var highlightSymbol = graphicSymbol.fillSymbol.defaultSymbol;
if(highlightGraohic){
highlightGraohic.symbol = symbol;
}
feature.symbol = highlightSymbol;
var view = maps[viewId];
view.center = feature.geometry.type == 'point' ? feature.geometry : feature.geometry.extent.center;
if(callBackFunction && typeof callBackFunction == 'function'){
callBackFunction();
}
},
clearSearchLayer(viewId){
var view = maps[viewId],
layers = view.map.allLayers;
layers.filter(function (item) {
if(item.id.indexOf("searchResult") != -1){
item.removeAll();
}
});
}
}
}
\ No newline at end of file
......
......@@ -29,7 +29,11 @@ export default {
mixins:[draw,identifyUtils,measure],
data(){
return{
url:""
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",
selectResLayerId:"",
features:[],
resultLayers:[],
results:[]
}
},
methods:{
......@@ -51,11 +55,16 @@ export default {
var view = maps[this.viewId];
var self = this;
this.initDraw("point",this.viewId,null,function(geo){
self.identify(self.url,[],geo,function(result){
debugger
});
self.identify(self.url,[8,10],geo,function(res){
var resultes = res.results;
if(resultes && resultes.length > 0){
self.$parent.delIdentifyData(resultes);
self.$parent.dialogVisible = true;
}
},true,'all',3,view.extent);
});
},
zoomOut(){
var view = maps[this.viewId];
this.initDraw("rectangle",this.viewId,null,function(geo){
......
<template>
<div class="">历史回溯
<div id="mountNode"></div>
<div class="lshs-content">
<div class="slot">
<div><span class="tip-title">范围属性变更:</span></div>
<div><span class="tip-title">宗地分割:</span></div>
<div><span class="tip-title">宗地合并:</span></div>
</div>
<div id="mountNode" ref="containerWidth"></div>
</div>
</template>
......@@ -38,6 +43,8 @@ export default {
methods: {
initG6() {
const data = this.data;
const eWidth = this.$refs.containerWidth.clientWidth
console.log(eWidth+":width")
G6.registerNode(
'sql',
{
......@@ -75,13 +82,67 @@ export default {
},
'single-node',
);
G6.registerEdge(
'circle-running',
{
afterDraw(cfg, group) {
const shape = group.get('children')[0];
const startPoint = shape.getPoint(0);
const container = document.getElementById('mountNode');
const circle = group.addShape('circle', {
attrs: {
x: startPoint.x,
y: startPoint.y,
fill: '#1890ff',
r: 3,
},
name: 'circle-shape',
});
circle.animate(
(ratio) => {
const tmpPoint = shape.getPoint(ratio);
return {
x: tmpPoint.x,
y: tmpPoint.y,
};
},
{
repeat: true,
duration: 3000,
},
);
},
},
'line',
);
const tooltip = new G6.Tooltip({
offsetX: 10 + 10,
offsetY: 10 + 10,
itemTypes: ['node', 'edge'],
getContent: (e) => {
const outDiv = document.createElement('div');
outDiv.style.width = 'fit-content';
outDiv.innerHTML = `
<ul>
<li> ${e.item.getModel().conf[0].label}:${e.item.getModel().conf[0].value}</li>
<li> ${e.item.getModel().conf[1].label}:${e.item.getModel().conf[1].value}</li>
<li> ${e.item.getModel().conf[2].label}:${e.item.getModel().conf[2].value}</li>
<li> ${e.item.getModel().conf[3].label}:${e.item.getModel().conf[3].value}</li>
<li> ${e.item.getModel().conf[4].label}:${e.item.getModel().conf[4].value}</li>
</ul>`
;
return outDiv;
},
});
const container = document.getElementById('mountNode');
console.log(container)
const graph = new G6.Graph({
container: 'mountNode',
width:1000,
height:800,
height:1000,
layout: {
type: 'dagre',
nodesepFunc: (d) => {
......@@ -103,7 +164,7 @@ export default {
offset: 45,
endArrow: true,
lineWidth: 2,
stroke: '#C2C8D5',
stroke: 'rgba(78,142,230,0.45)',
},
},
nodeStateStyles: {
......@@ -113,31 +174,54 @@ export default {
},
},
plugins: [tooltip],
modes: {
default: [
'drag-canvas',
'zoom-canvas',
'click-select',
{
type: 'tooltip',
formatText(model) {
const cfg = model.conf;
const text = [];
cfg.forEach((row) => {
text.push(row.label + ':' + row.value + '<br>');
});
return text.join('\n');
},
offset: 30,
},
'drag-node',
'drag-canvas',
'zoom-canvas',
'click-select',
],
},
// modes: {
// default: [
// 'drag-canvas',
// 'zoom-canvas',
// 'click-select',
// {
// type: 'tooltip',
// formatText(model) {
// const cfg = model.conf;
// const text = [];
// cfg.forEach((row) => {
// text.push(row.label + ':' + row.value + '<br>');
// });
// return text.join('\n');
// },
// offset: -30,
// },
// ],
// },
fitView: true,
});
graph.data(data);
graph.render();
graph.on('node:mouseenter', e => {
graph.setItemState(e.item, 'active', true)
});
graph.on('node:mouseleave', e => {
graph.setItemState(e.item, 'active', false)
});
graph.on('edge:mouseenter', e => {
graph.setItemState(e.item, 'active', true)
});
graph.on('edge:mouseleave', e => {
graph.setItemState(e.item, 'active', false)
});
if (typeof window !== 'undefined')
window.onresize = () => {
if (!graph || graph.get('destroyed')) return;
......@@ -167,4 +251,21 @@ export default {
</script>
<style scoped lang="less">
.lshs-content{
width: 100%;
}
#mountNode{
width: 100%;
}
.slot{
margin-left: 50px;
margin-top: 20px;
width: 300px;
}
.tip-title{
font-weight: 700;
}
</style>
\ No newline at end of file
......
......@@ -108,7 +108,7 @@
<td colspan="2">宗地代码<i class="requisite">*</i></td>
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'" maxlength="19"
type="text"
type="text"
class="formInput percent80"
v-model="formData.zddm"
/>
......@@ -141,7 +141,7 @@
<td colspan="2">项目名称</td>
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'"
type="text"
type="text"
class="formInput "
v-model="formData.xmmc"
/>
......@@ -225,14 +225,14 @@
</td>
<td colspan="2">
<input
type="text"
type="text"
v-model="jzmd" :disabled="formData.qszt!='0'"
v-show="isInterval(formData.jyjzmd)"
class="formInput percent47"
/>
<span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span>
<input
type="text"
type="text"
v-model="formData.jzmd" :disabled="formData.qszt!='0'"
:class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'"
/>
......@@ -349,6 +349,7 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import geoUtils from "@components/lineTree/tx/js/geoUtils";
import {
getAllList,
getDdicByMC,
......@@ -410,9 +411,55 @@ export default {
formData: {},
dpdm:'', //宗地底盘代码
curZdbsm:'',
geoAttributes:{
OBJECTID:"",
BSM:"",
YSDM:"",
ZDDM:"",
BDCDYH:"",
ZDTZM :"",
ZL:"",
ZDMJ:0,
MJDW:"",
YT:"",
DJ:"",
JG:0,
QLLX:"",
QLXZ:"",
QLSDFS:"",
RJL:0,
JZMD:0,
JZXG:0,
ZDSZD:"",
ZDSZN :"",
ZDSZX :"",
ZDSZB :"",
TFH:"",
DJH:"",
DAH:"",
BZ :"",
ZT:"",
YWZT:"",
BLID:"",
XMMC:"",
XMID:"",
BGRQ:"",
BGID:"",
BGZT:"",
TDZH:"",
QSZT:0,
BBLX:0,
SFDB:0,
QLR :"",
CUTID:"",
BHQKID:"",
DJZQDM :"",
SYQLXID:"",
}
};
},
created() {
mixins:[geoUtils],
created() {
this.curZdbsm = this.$route.query.bsm;
},
mounted() {
......@@ -612,6 +659,26 @@ export default {
}
})
.catch((error) => {});
//保存到空间库里面
var self = this;
for(var key in this.geoAttributes){
if(key == "BSM"){
self.geoAttributes[key] = this.$store.state.zdbsm
}else if(key == 'QLSDFS'){
var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:"";
}else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
}
self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
console.log("属性保存完成!!");
});
}
......@@ -719,7 +786,7 @@ export default {
this.$store.state.zddm = val;
},
zdbsm:function (val) {
this.getZdjbxxData(val)
this.getZdjbxxData(val)
this.curZdbsm = val;
}
},
......
......@@ -21,7 +21,7 @@
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80" disabled></el-input>
<el-input v-model="form.bdcdyh" class="percent80"></el-input>
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
......@@ -37,25 +37,25 @@
</td>
<td colspan="2" align="center" >层号</td>
<td colspan="4" >
<el-input v-model="form.ch" disabled></el-input>
<el-input v-model="form.ch"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >实际层数</td>
<td colspan="4" >
<el-input v-model="form.sjcs" disabled></el-input>
<el-input v-model="form.sjcs"></el-input>
</td>
<td colspan="2" align="center" >实际层</td>
<td colspan="4" >
<el-input v-model="form.sjc" disabled></el-input>
<el-input v-model="form.sjc"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >所在单元</td>
<td colspan="4" >
<el-input v-model="form.zdymc" disabled></el-input>
<el-input v-model="form.zdymc"></el-input>
</td>
<td colspan="2" align="center" >房屋编号</td>
<td colspan="4" >
......
......@@ -353,6 +353,45 @@
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
loading:false,
source:'',
geoAttributes:{
OBJECTID:null,
YSDM:"",
BDCDYH:"",
ZDDM:"",
ZRZH:"",
XMMC:"",
JZWMC:"",
JGRQ:"",
JZWGD:"",
ZZDMJ:0,
ZYDMJ:0,
YCJZMJ:0,
SCJZMJ:0,
ZCS:0,
DSCS:0,
DXCS:0,
DXSD:0,
GHYT:"",
FWJG:"",
ZTS:0,
JZWJBYT:"",
DAH:"",
BZ:"",
ZT:"",
YWZT:"",
BLID:"",
XMID:"",
BGZT:"",
BGRQ:"",
BGID:"",
BBLX:"",
QSZT:"",
CUTID :"",
BHQKID:"",
DJZQDM:"",
ZDTZM:"",
BSM:"",
}
}
},
methods: {
......@@ -421,6 +460,20 @@
})
this.loading=false;
}
//保存到空间库里面
var self = this;
for(var key in this.geoAttributes){
if(key == "BSM"){
self.geoAttributes[key] = this.bsm
}else{
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
}
self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
console.log("属性保存完成!!");
});
}
},
......