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
Inline Side-by-side
Showing 32 changed files with 1238 additions and 410 deletions
......@@ -175,6 +175,18 @@ export function loadFile(url) {
}
})
}
/**
* 删除文件
*/
export function deleteFile(id) {
return request({
url:"/file/delete",
method:'delete',
params:{
id
}
})
}
/**
* 多个宗地代码获取树的数据信息
......@@ -186,3 +198,13 @@ export function getListMenu(data) {
data:data
})
}
/**
* 登记调用
*/
export function registerCall(data) {
return request({
url:'/system/basiccommon/registerCall',
method:'post',
data:data
})
}
......
......@@ -168,3 +168,14 @@ export function deleteZdy(id) {
}
})
}
/**
* 批量提交
*/
export function batchCommit(data) {
return request({
url:'/fw/lpbbatch/batchCommit',
method:'post',
data:data
})
}
......
......@@ -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 @@
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
......
......@@ -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);
}
......@@ -552,10 +557,8 @@ export default {
-webkit-box-shadow: inset -14px 0px 16px red;
box-shadow: inset -23px 0px 16px #1d50dd;
transition: 0.3s;
display: none;
}
.w0{
display: block;
width: 64px;
}
}
......
......@@ -199,6 +199,7 @@
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
......@@ -209,7 +210,7 @@
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
import {submit,registerCall} from "../../../api/common"
export default {
name:'zrz',
components:{
......@@ -289,6 +290,17 @@
}
},
methods: {
registerCall(){
let data={
type:'dz',
bsm:this.$route.query.bsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
}
})
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......@@ -533,4 +545,4 @@
}
}
}
</style>
\ No newline at end of file
</style>
......
......@@ -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>
......
......@@ -23,8 +23,9 @@
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdDzList.includes(item)}]"
>{{item.displays}}</li>
:class="[{'search':!zdDzList.includes(item)}]"
>{{item.displays}}
</li>
</ul>
</div>
<div class="zrz">
......@@ -33,7 +34,8 @@
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index"
:class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdZrzList.includes(item)}]">{{item.displays}}
:class="[{'oddborder':((index+1)%2) === 1},{'search':!zdZrzList.includes(item)}]">
{{item.displays}}
</li>
</ul>
</div>
......@@ -50,7 +52,7 @@
<th class="syqlx">所有权类型</th>
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
<th class="xzzxx">幢信息</th>
<th class="">选择</th>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
......@@ -116,14 +118,23 @@
<td class="xmmc">
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<td class="xzzxx">
<span>多幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex">{{dzItem}}</li>
<li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex"
@mouseenter="mouseenter($event,index,dzIndex,'dz')"
@mouseleave="mouseleave($event)">{{dzItem.xmmc}}
<span v-if="dzIndex<item.dz.length-1">,</span>
</li>
</ul>
<span>自然幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.zrz" :key="dzIndex">{{dzItem}}</li>
<li v-for="(zrzItem,zrzIndex) in item.zrz" :key="zrzIndex"
@mouseenter="mouseenter($event,index,zrzIndex,'zrz')"
@mouseleave="mouseleave($event)"
>{{zrzItem.xmmc}}
<span v-if="zrzIndex<item.zrz.length-1">,</span>
</li>
</ul>
</td>
<td class="">
......@@ -171,48 +182,6 @@
</tr>
</table>
</div>
<el-dialog
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
width="50%"
:modal-append-to-body="false"
center>
<div class="xz-container">
<div class="xz-main">
<table border="1">
<tr>
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
<el-option
v-for="i in ztypes"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="formInput"
v-model="item.zbsm"/>
</td>
</tr>
</table>
</div>
<div class="xz-sidebar">
<el-tree :data="zrzData" :props="defaultProps" @node-click="handleNodeClick"
node-key="id"
:default-expand-all="true"></el-tree>
</div>
</div>
</el-dialog>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
......@@ -238,7 +207,7 @@
<div class="zxx">
<div class="dz">
<div class="title">
<span class="title">多幢信息({{zdZxx.zrzList.length}}个)</span>
<span>多幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
......@@ -246,11 +215,11 @@
</div>
<div class="zrz">
<div class="title">
<span class="title">自然幢信息({{zdZxx.dzList.length}}个)</span>
<span class="">自然幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
:class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}}
</li>
</ul>
</div>
......@@ -267,7 +236,6 @@
<th class="syqlx">所有权类型</th>
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr v-for="(item,index) in dzFghData.newZdlist" :key="index">
<td class="cz">
......@@ -332,10 +300,6 @@
<td class="xmmc">
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<!-- {{item.fwlist.zbsm}}-->
<span @click="xzzrz(index)" class="xz">选择</span>
</td>
</tr>
<tr>
<td>
......@@ -352,51 +316,9 @@
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
<el-dialog
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
:modal-append-to-body="false"
width="50%"
center>
<div class="xz-container">
<div class="xz-main">
<table border="1">
<tr>
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
<el-option
v-for="i in ztypes"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="formInput"
v-model="item.zbsm"/>
</td>
</tr>
</table>
</div>
<div class="xz-sidebar">
<el-tree :data="zrzData" :props="defaultProps" @node-click="handleNodeClick"
:default-expand-all="true"></el-tree>
</div>
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
:isZdClose="true"
@close="close"></query-data>
......@@ -412,12 +334,12 @@
<div class="fgq">
<div class="data">
<ul>
<li><span>宗地代码:</span>{{zdFgqData.zddm}}</li>
<li><span>不动产单元号:</span>{{zdFgqData.bdcdyh}}</li>
<li><span>项目名称:</span>{{zdFgqData.xmmc}}</li>
<li><span>不动产权证号:</span>{{zdFgqData.bdcqzh}}</li>
<li><span>权利人:</span>{{zdFgqData.qlr}}</li>
<li><span>坐落:</span>{{zdFgqData.zl}}</li>
<li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
<li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
<li><span>项目名称:</span>{{hFgqData.xmmc}}</li>
<li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
<li><span>权利人:</span>{{hFgqData.qlr}}</li>
<li><span>坐落:</span>{{hFgqData.zl}}</li>
</ul>
</div>
<div class="zxx">
......@@ -435,7 +357,7 @@
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
:class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}}
</li>
</ul>
</div>
......@@ -452,7 +374,6 @@
<th class="syqlx">所有权类型</th>
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr v-for="(item,index) in hFghData.newZdlist" :key="index">
......@@ -518,10 +439,6 @@
<td class="xmmc">
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<!-- {{item.fwlist.zbsm}}-->
<span @click="xzzrz(index)" class="xz">选择</span>
</td>
</tr>
<tr>
<td>
......@@ -538,54 +455,11 @@
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
<el-dialog
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
:modal-append-to-body="false"
width="50%"
>
<div class="xz-container">
<div class="xz-main">
<table border="1">
<tr>
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
<el-option
v-for="i in ztypes"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="formInput"
v-model="item.zbsm"/>
</td>
</tr>
</table>
</div>
<div class="xz-sidebar">
<el-tree :data="zrzData" :props="defaultProps" @node-click="handleNodeClick"
:default-expand-all="true"></el-tree>
</div>
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
:isZdClose="true"
@close="close"></query-data>
:isZdClose="true" @close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
......@@ -616,9 +490,7 @@
data() {
return {
tabName: 'zd',
isopenXz: false,
centerDialogVisible: false,
selectIndex: 0,// 当前选中序号
zdFgqData: {}, // 宗地分割前数据
dzFgqData: {}, //多幢分割前数据
hFgqData: {}, // 户分割前数据
......@@ -637,50 +509,6 @@
children: 'children',
label: 'label'
},
zrzData: [{
id: 1,
label: '一级 1',
children: [{
id: 4,
label: '二级 1-1',
children: [{
id: 9,
label: '三级 1-1-1'
}, {
id: 10,
label: '三级 1-1-2'
}]
}]
}, {
id: 2,
label: '一级 2',
children: [{
id: 5,
label: '二级 2-1'
}, {
id: 6,
label: '二级 2-2'
}]
}, {
id: 3,
label: '一级 3',
children: [{
id: 7,
label: '二级 3-1'
}, {
id: 8,
label: '二级 3-2'
}]
}],
ztypes: [
{
label: '多幢',
value: '多幢'
}, {
label: '自然幢',
value: '自然幢'
}
],
syq: [
{
label: "国家所有",
......@@ -730,23 +558,72 @@
})
},
methods: {
mouseenter(event, index, dzIndex,type) {
let range = document.createRange();
range.selectNodeContents(event.target);
let selection = window.getSelection();
selection.removeAllRanges();
selection.addRange(range);
var self=this;
document.onkeydown = function (e){
let key = e || window.event || arguments.callee.caller.arguments[0];
if (key && (key.keyCode == '8' || key.code == 'Delete')) {
let dz={};
let len=self.zdFghData.newZdlist[index].fwlist.length-1;
switch (type) {
case "dz":
dz = self.zdFghData.newZdlist[index].dz[dzIndex];
// 删除数据
self.zdFghData.newZdlist[index].dz.splice(dzIndex, 1);
for (let i=0;i<len;i++){
let fw=self.zdFghData.newZdlist[index].fwlist[i];
if (fw.ztype=='dz'&& fw.zbsm == dz.bsm){
self.zdFghData.newZdlist[index].fwlist.splice(i, 1);
}
}
// 添加数据
self.zdDzList.push(dz)
return;
case "zrz":
dz = self.zdFghData.newZdlist[index].zrz[dzIndex];
// 删除数据
self.zdFghData.newZdlist[index].zrz.splice(dzIndex, 1);
for (let i=0;i<len;i++){
let fw=self.zdFghData.newZdlist[index].fwlist[i];
if (fw.ztype=='zrz' && fw.zbsm == dz.bsm){
self.zdFghData.newZdlist[index].fwlist.splice(i, 1);
}
}
// 添加数据
self.zdZrzList.push(dz)
return;
default:
return;
}
}
};
},
mouseleave(event) {
let selection = window.getSelection();
selection.removeAllRanges();
},
// 重置数据
result(){
result() {
switch (this.tabName) {
case "zd":
this.zdFghData={
this.zdFghData = {
oldZdbsm: "",
newZdlist: []
}
break
case "dz":
this.dzFghData={
this.dzFghData = {
oldZdbsm: "",
newZdlist: []
}
break
case "h":
this.hFghData={
this.hFghData = {
oldZdbsm: "",
newZdlist: []
}
......@@ -773,7 +650,7 @@
zbsm: command,
ztype: 'dz'
});
this.zdFghData.newZdlist[index].dz.push(item.xmmc)
this.zdFghData.newZdlist[index].dz.push(item)
this.zdDzList = this.zdDzList.filter(i => i.bsm !== command);
},
zrzHandleCommand(command, index) {
......@@ -782,7 +659,7 @@
zbsm: command,
ztype: 'zrz'
})
this.zdFghData.newZdlist[index].zrz.push(item.xmmc)
this.zdFghData.newZdlist[index].zrz.push(item)
this.zdZrzList = this.zdZrzList.filter(i => i.bsm !== command);
},
ZdgetDzXx(zdbsm) {
......@@ -801,28 +678,6 @@
}
);
},
/**
* 删除节点
*
*/
delNode(node, data) {
},
/**
* 添加节点
*
*/
addNode(data) {
},
/**
* 选择幢信息
* @param index 当前选中行
*/
xzzrz(index) {
this.isopenXz = true
this.selectIndex = index
},
save() {
switch (this.tabName) {
case "zd":
......@@ -842,7 +697,7 @@
saveZd() {
zdfg(this.zdFghData).then(res => {
if (res.success) {
this.$store.state.zdbsms=res.result;
this.$store.state.zdbsms = res.result;
this.$router.push({
path: '/zd',
query: {
......@@ -867,10 +722,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = []
this.checkedData.dz = [],
this.checkedData.zrz = [],
// fwlist 暂时传空
this.checkedData.fwlist = []
})
},
getDzZdjbxx(id) {
......@@ -878,10 +733,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = []
this.checkedData.dz = [],
this.checkedData.zrz = [],
// fwlist 暂时传空
this.checkedData.fwlist = []
})
},
getHZdxx(id) {
......@@ -889,10 +744,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = []
this.checkedData.dz = [],
this.checkedData.zrz = [],
// fwlist 暂时传空
this.checkedData.fwlist = []
})
},
getzdtzm() {
......@@ -1070,7 +925,6 @@
hFgqData: {
handler: function (item) {
this.hFgqData.oldZdbsm = item.glbsm;
console.log(item.glbsm, "户bsm")
this.getHZdxx(item.glbsm);
},
deep: true
......@@ -1146,8 +1000,9 @@
li {
padding: 5px;
line-height: 20px;
span{
color: #BBB;
span {
color: #000;
}
}
}
......@@ -1160,6 +1015,7 @@
.title {
color: red;
text-align: center;
padding: 5px 0;
}
.dz {
width: 33%;
......@@ -1191,7 +1047,7 @@
}
}
.border {
.oddborder {
border-right: 1px solid #000;
}
......@@ -1269,8 +1125,8 @@
height: 480px;
overflow: auto;
margin-top: 10px;
table{
margin: 0 20px ;
table {
margin: 0 20px;
}
}
.header-button {
......@@ -1304,6 +1160,14 @@
border-color: rgba(0, 202, 205, .8);
}
.xzzxx {
ul {
li {
display: inline-block;
}
}
}
.cz, .xh {
width: 100px;
}
......@@ -1311,7 +1175,8 @@
.xzq, .djq, .djzq {
width: 150px;
}
.nosearch{
.search {
color: #BBB !important;
}
</style>
......
......@@ -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 =
......
......@@ -18,7 +18,7 @@
<td>操作</td>
</tr>
<tr v-if="zdhbqData.length==0">
<td colspan="7">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -134,9 +134,10 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="">操作</td>
</tr>
<tr v-if="dzhbqData.length==0">
<td colspan="7">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -154,6 +155,7 @@
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz" @click="deleteData(index)"><span>删除</span></td>
</tr>
</table>
</div>
......@@ -229,7 +231,7 @@
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
......@@ -250,9 +252,10 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="">操作</td>
</tr>
<tr v-if="hhbqData.length==0">
<td colspan="7">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -270,6 +273,7 @@
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz" @click="deleteData(index)"><span>删除</span></td>
</tr>
</table>
</div>
......@@ -345,7 +349,7 @@
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" :isZdClose="true"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
......@@ -439,8 +443,6 @@
newzdzdtzmbsm: this.zdhbqData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(this.zdhbhData,"宗地合并后数据");
console.log(this.zdhbqData,"宗地合并前数据")
ZdHb(data).then(res=>{
if (res.success) {
this.$message.success("合并成功")
......@@ -559,15 +561,34 @@
this.centerDialogVisible = true;
},
getData: function (data) {
let arr=[];
switch (this.tabName) {
case "zd":
this.zdhbqData.push(data)
arr=this.zdhbqData.filter(i=>i.zddm==data.zddm);
if (arr.length>0) {
break
}
this.zdhbqData.push(data);
break
case "dz":
this.dzhbqData.push(data)
arr=this.dzhbqData.filter(i=>i.glbsm==data.glbsm);
if (arr.length>0) {
break
}
if (this.dzhbqData.includes(data)) {
break
}
this.dzhbqData.push(data);
break
case "h":
this.hhbqData.push(data)
arr=this.hhbqData.filter(i=>i.glbsm==data.glbsm);
if (arr.length>0) {
break
}
if (this.hhbqData.includes(data)) {
break
}
this.hhbqData.push(data);
break
default:
break;
......
......@@ -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,6 +56,7 @@
<hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
</div>
......@@ -104,6 +111,11 @@
this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户提交
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
......
......@@ -4,6 +4,46 @@
<mapTools :viewId="viewId"></mapTools>
</div>
<EsriMap :viewId = "viewId" :afterLoaderFunction="addLayer"></EsriMap>
<div class="searchDiv">
<el-input placeholder="请输入标识码" clearable v-model="inputBsm"> <el-button slot="append" type="primary" icon="el-icon-search" @click="doSearch"></el-button> </el-input>
<!--搜索弹出框-->
<div class="searchResult" v-show="dialogVisible">
<div class="-header">
<span class="title">地块信息</span>
<span class="closeButton">
<i class="close el-icon-close" @click="closeResultDialog"></i>
</span>
</div>
<el-card class="box-card">
<div slot="header" class="clearfix">
<!-- 图层选择-->
<span class="formTitle">图层选择:</span>
<el-select v-model="selectResLayerId" size="mini" @change="selectLayerChange" placeholder="请选择">
<el-option
v-for="(item,index) in resultLayers"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
</div>
<!-- 数据结果-->
<div class="text item" v-for="(item,index) in features" :key="index">
<P>
<span class="title"><i class="iconfont iconxinxi"></i> 基本信息</span>
<a href="#" @click="toMap(item)">缩放至</a>
</P>
<hr />
<div class="contentItem" v-for="(value,key,index) in item.attributes" :key="index">
<span class="key">{{key}}：</span>
<span class="value" :title="value">{{value}}</span>
</div>
</div>
</el-card>
</div>
</div>
</div>
</template>
<script>
......@@ -12,6 +52,9 @@ import MapTools from './mapWeight/mapTools'
import {loadModules} from 'esri-loader'
import {maps} from '@/libs/map/mapUtils'
import mapLayerManager from "./mapWeight/js/mapLayerManager";
import layers from '@/assets/json/layers.json'
import findTask from '@/libs/map/findTask'
export default {
components:{
EsriMap,
......@@ -20,10 +63,17 @@ export default {
data(){
return{
viewId:"testMap",
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"
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",
dialogVisible:false,
selectResLayerId:null,
features:[],
resultLayers:[],
results:[],
inputBsm:"",
heighGraphic:null
}
},
mixins:[mapLayerManager],
mixins:[mapLayerManager,findTask],
mounted(){
var query = this.$route.query;
if(query && JSON.stringify(query) != "{}"){
......@@ -34,6 +84,7 @@ export default {
addLayer(){
var self = this;
var view = maps[this.viewId];
view.ui.remove('zoom');
loadModules([
"esri/layers/MapImageLayer",
]).then(([
......@@ -60,7 +111,118 @@ export default {
}).catch(err => {
throw(err);
})
}
},
//缩放至
toMap(attr){
var self = this;
this.extentToGraphic(attr,this.heighGraphic,this.viewId,function () {
self.heighGraphic = attr;
});
},
//图层选择事件
selectLayerChange(){
var self = this;
var layerAndResult = this.results.filter(function (item) {
return item.layerId = self.selectResLayerId;
})
if(layerAndResult){
this.features = layerAndResult[0].features;
}
},
//属性查询
doSearch(){
var self = this;
if(!this.inputBsm){
return;
}else if(this.inputBsm.length != 19){
this.$message.warning("标识码格式输入有误!!!");
return;
}
this.findByPro(this.layerUrl,[8,10],'BSM',this.inputBsm,true,function (res) {
var resultes = res.results;
if(resultes && resultes.length > 0){
self.delIdentifyData(resultes);
if(!self.dialogVisible){
self.dialogVisible = true;
}
}else {
self.$message.warning("查询不到相关数据!!!");
}
});
},
//关闭查询结果
closeResultDialog(){
//关闭时清除查询结果 清除数据
this.results = [];
this.selectResLayerId =null;
this.features = [];
this.resultLayers = [];
this.heighGraphic = null;
//清除查询图层
this.clearSearchLayer(this.viewId);
this.dialogVisible = false;
},
//处理数据
delIdentifyData(data){
var self = this;
self.results = [];
self.selectResLayerId =null;
self.features = [];
self.resultLayers = [];
this.heighGraphic = null;
for(var i = 0;i < data.length;i++){
var layerId = data[i].layerId;
var layer = self.getLayerById(layerId);
var layerResult = self.results.filter(function (item) {
return item.layerId == layerId;
})
if(layerResult && layerResult.length > 0){
var feature = data[i].feature,
attributes = {},
fieldAliases = layer.fieldAliases;
for(var key in feature.attributes){
if(!feature.attributes[key]){
delete feature.attributes[key]
}
}
layerResult.features.push(feature);
}else{
if(layer){
this.resultLayers.push({
id:layerId,
label:layer.layerLabel
})
var layerAndResult = {
layerId:layerId,
features:[]
}
var feature = data[i].feature,
attributes = {},
fieldAliases = layer.fieldAliases;
for(var key in feature.attributes){
if(!feature.attributes[key]){
delete feature.attributes[key]
}
}
layerAndResult.features.push(feature);
self.results.push(layerAndResult);
}
}
}
this.addSearchResultToMap(this.results,this.viewId);
},
getLayerById(layerId){
var parseLayers = JSON.parse(JSON.stringify(layers));
var layer = parseLayers.filter(function (item) {
return item.id == layerId;
})
if(layer){
return layer[0];
}
return null;
},
//展示查询数据结果
}
}
......@@ -76,5 +238,86 @@ export default {
z-index: 99;
right: 5px;
}
.searchDiv{
position: absolute;
top: 12px;
left: 7px;
width: 35%;
max-height: 100%;
/deep/ .el-input-group__append{
background-color: #409eff;
color: white;
}
.searchResult{
margin-top: 3px;
background: white;
border-radius: 4px;
max-height: 80%;
.-header{
line-height: 32px;
padding: 3px 20px;
background-color: #519eff;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
.title{
font-size: 14px;
color: white;
font-weight: 600;
}
.closeButton{
float: right;
font-size: 16px;
color: black;
}
.closeButton :hover{
cursor:pointer
}
}
/deep/ .el-card__header {
padding: 10px 20px;
}
.formTitle{
margin-right: 5px;
font-size: 14px;
}
.item{
p{
margin: 0px 3px;
font-size: 14px;
.title{
}
a{
float: right;
color: #519eff
}
}
.contentItem{
display: flex;
font-size: 14px;
width: 100%;
line-height: 23px;
align-items: center;
.key{
width: 30%;
margin: 5px 3px;
text-align: right;
}
.value{
width: 70%;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
word-break:keep-all;
}
}
}
/deep/ .el-card__body{
max-height: 363px;
overflow: auto;
}
}
}
}
</style>
\ No newline at end of file
......
......@@ -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){
......
......@@ -33,7 +33,10 @@
<td class="lx">{{item.filepostfix}}</td>
<td class="cz">
<span @click="downloadFile(item.fileurl)">下载</span>
<span>/</span>
<span @click="loadFile(item.fileurl)">预览</span>
<span>/</span>
<span @click="deleteFile(item.bsm)">删除</span>
</td>
</tr>
</table>
......@@ -41,7 +44,7 @@
</template>
<script>
import {insertFile, getFileLis, downloadFile,loadFile} from "./../../../api/common"
import {insertFile, getFileLis, downloadFile,loadFile,deleteFile} from "./../../../api/common"
import {Message} from "element-ui"
export default {
......@@ -69,21 +72,29 @@
}
},
mounted() {
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
this.filesData.glbsm = this.$store.state.zdbsm
break;
case "自然幢":
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
default:
break
}
this.getFileList(this.filesData.glbsm)
this.getFileList()
},
methods: {
deleteFile(bsm){
this.$confirm('将删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteFile(bsm).then(res=>{
if (res.success) {
this.getFileList();
}else {
this.$message.error("删除失败")
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
loadFile(url){
loadFile(url).then(res=>{
if (res.success) {
......@@ -94,8 +105,20 @@
downloadFile(url) {
window.open(`/api/file/download?url=`+url);
},
getFileList(bsm) {
getFileLis(bsm).then(res => {
getFileList() {
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
this.filesData.glbsm = this.$store.state.zdbsm
break;
case "自然幢":
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
default:
break
}
getFileLis(this.filesData.glbsm ).then(res => {
if (res.success) {
this.list = res.result;
} else {
......
......@@ -6,7 +6,7 @@
<el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane>
<el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
</el-tabs>
</div>
......@@ -29,11 +29,15 @@ export default {
data() {
return {
activeName: "djdcb",
lshsVisible:false,
};
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
if (tab.name == 'lshs') {
this.lshsVisible = true;
}
},
},
created() {},
......
<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: 210,
offsetY: 210,
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,
width:eWidth,
height:1000,
layout: {
type: 'dagre',
nodesepFunc: (d) => {
......@@ -103,9 +164,15 @@ export default {
offset: 45,
endArrow: true,
lineWidth: 2,
stroke: '#C2C8D5',
stroke: 'rgba(78,142,230,0.45)',
},
},
// defaultEdge: {
// type: 'cubic-vertical',
// style: {
// stroke: '#F6BD16',
// },
// },
nodeStateStyles: {
selected: {
stroke: '#d9d9d9',
......@@ -113,31 +180,35 @@ 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',
],
},
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;
......@@ -156,6 +227,38 @@ export default {
getLshs(data).then((res)=>{
if(res.code===200){
_this.data=res.result;
_this.data = {"nodes":[
{"id":"836524edab33ab19bb0e0b4fd064cd77","dataType":"sql","name":"20201127宗地A",
"conf":[{"label":"宗地代码","value":"610102123666GA10002"},{"label":"项目名称","value":"20201127宗地A"},
{"label":"不动产单元号","value":"610102123666GA10002W00000000"},{"label":"坐落","value":"610102123666G10003W"},
{"label":"权利人","value":""}]},
{"id":"601130536a6bf6efc7a248af469e982c","dataType":"sql","name":"20201127宗地A222221",
"conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地A222221"},
{"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
{"id":"c0818d9e4286b35b8ee9b96d90b522aa","dataType":"sql","name":"20201127宗地A2222222",
"conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地A2222222"},
{"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
{"id":"601130536a6bf6efc7a248af469e982c1","dataType":"sql","name":"20201127宗地B",
"conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地B"},
{"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
{"id":"c0818d9e4286b35b8ee9b96d90b522aa1","dataType":"sql","name":"20201127宗地B1",
"conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地B1"},
{"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
{"id":"c0818d9e4286b35b8ee9b96d90b522aa12","dataType":"sql","name":"20201127宗地C",
"conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地C"},
{"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
],
"edges":[
{"source":"836524edab33ab19bb0e0b4fd064cd77","target":"601130536a6bf6efc7a248af469e982c"},
{"source":"836524edab33ab19bb0e0b4fd064cd77","target":"c0818d9e4286b35b8ee9b96d90b522aa"},
{"source":"c0818d9e4286b35b8ee9b96d90b522aa","target":"601130536a6bf6efc7a248af469e982c1"},
{"source":"c0818d9e4286b35b8ee9b96d90b522aa","target":"c0818d9e4286b35b8ee9b96d90b522aa1"},
{"source":"601130536a6bf6efc7a248af469e982c1","target":"c0818d9e4286b35b8ee9b96d90b522aa12"},
{"source":"c0818d9e4286b35b8ee9b96d90b522aa1","target":"c0818d9e4286b35b8ee9b96d90b522aa12"},
]};
this.initG6();
}
})
......@@ -167,4 +270,23 @@ export default {
</script>
<style scoped lang="less">
.lshs-content{
width: 100%;
height: 100%;
}
#mountNode{
/*height: calc(100% - 68px);*/
margin-top: -60px;
}
.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'"
/>
......@@ -341,6 +341,7 @@
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
</div>
......@@ -349,6 +350,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,
......@@ -356,6 +358,7 @@ import {
getListByPbsm,
submit,
getTree,
registerCall
} from "../../../api/common";
import {
getBdcdyh,
......@@ -410,15 +413,72 @@ 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() {
this.getZdjbxxData(this.$store.state.zdbsm);
},
methods: {
registerCall(){
let data={
type:'zd',
bsm:this.$store.state.zdbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
}
})
},
//根据zdbsm查询基本信息
getZdjbxxData(bsm) {
getQjZdjbxxDetailById(bsm)
......@@ -612,6 +672,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 +799,7 @@ export default {
this.$store.state.zddm = val;
},
zdbsm:function (val) {
this.getZdjbxxData(val)
this.getZdjbxxData(val)
this.curZdbsm = val;
}
},
......
......@@ -46,8 +46,8 @@ export default {
};
</script>
<style scoped lang="less">
// .content_box{
// box-sizing: border-box;
.content_box{
padding: 0 0 16px;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
......@@ -65,5 +65,5 @@ export default {
// width: 100%;
// height: 100%;
// }
// }
}
</style>
......
......@@ -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" >
......@@ -403,7 +403,8 @@
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz"
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit} from "./../../../../../api/common"
export default {
name:'zrz',
components:{
......@@ -697,6 +698,18 @@
}
})
},
onSubmit(bsm,yclx){
let data={
glbsm:bsm,
status:1,
type:"h"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
}
})
},
onReset(){
this.form.bdcdyh='', //不动产单元号
this.form.mjdwbsm='', //面积单位编号
......
......@@ -2,7 +2,7 @@
<div class="edit">
<div class="tab-header">
<el-row class="searchContent">
<el-col :span="8">
<el-col :span="6">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
......@@ -23,7 +23,7 @@
></i
></el-input>
</el-col>
<el-col :span="16">
<el-col :span="18">
<div class="fr">
<el-button class="radioBtn" label="1" border @click="create"
><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
......@@ -66,9 +66,16 @@
class="radioBtn"
label="7"
border
@click="hcxlzVisible = true"
@click="hcxlz"
><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
>
<el-button
class="radioBtn"
label="7"
border
@click="batchCommit"
><i class="iconfont iconhuzhongxinlazong"></i>批量提交</el-button
>
</div>
</el-col>
</el-row>
......@@ -252,8 +259,10 @@
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</el-dialog>
</div>
......@@ -272,7 +281,8 @@ import addZdy from "./zdy/index";
import addCh from "./ch/index";
import hbj from "./hbj/index";
import lpbContent from "./lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz } from "../../../../api/lpb";
import {registerCall} from "../../../../api/common";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
export default {
name: "",
......@@ -395,6 +405,28 @@ export default {
}, 100);
},
methods: {
registerCall(){
let data={
type:'h',
bsm:this.hbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
}
})
},
batchCommit(){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
return
}
batchCommit(this.bsms).then(res=>{
if (res.success) {
Message.success("提交成功")
}
})
},
hcxlz(){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
......@@ -574,6 +606,10 @@ export default {
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户保存
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
......
......@@ -65,6 +65,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
</td>
</tr>
</table>
......@@ -116,6 +119,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
</td>
</tr>
</table>
......@@ -172,6 +178,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
</td>
</tr>
</table>
......@@ -213,6 +222,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
</td>
</tr>
</table>
......@@ -784,6 +796,31 @@ export default {
line-height: 64px;
text-align: center;
cursor: pointer;
position: relative;
.hqszt{
display: inline-block;
width: 16px;
height: 16px;
font-size: 12px;
line-height: 16px;
position: absolute;
left: 6px;
top: 6px;
border: 1px solid;
border-radius: 8px;
}
.lin{
color:#F7B500;
border-color: #F7B500;
}
.zheng{
color: #1AD6E1;
border-color: #1AD6E1;
}
.xian{
color: #45AEFD;
border-color: #45AEFD;
}
}
.tdSelect {
border: 1px solid #006cff !important;
......
......@@ -265,6 +265,7 @@
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
</div>
......@@ -275,7 +276,7 @@
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
import {submit,registerCall} from "../../../api/common"
export default {
name:'zrz',
components:{
......@@ -353,9 +354,59 @@
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: {
registerCall(){
let data={
type:'zrz',
bsm:this.$route.query.bsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
}
})
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......@@ -421,8 +472,22 @@
})
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("属性保存完成!!");
});
}
},
onSubmit(){
let data={
......