43d91574 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 2158aacc c248f96e
......@@ -59,3 +59,14 @@ export function getHZdxx(bsm) {
})
}
/**
* 户合并
*/
export function hhb(data) {
return request({
url: '/bg/hSplitMerge/hHb',
method: 'post',
data: data
})
}
\ No newline at end of file
......
......@@ -523,6 +523,40 @@ export default {
this.outNum--;
}
},
reset(){
this.countList=[
{
id: Math.random(),
isInside: false,
hasNotBorder: false,
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
zhqlxzlx: "", //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质
list: [
{
pzdjbsm: "",
pzdjmc: "",
pzytdm: "",
pzytmc: "",
pzytmj: 0,
qlxzbsm: "",
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
sjytmc: "",
sjytmj: 0,
syqx: "",
tdsyjssj: "",
pickerStart:{},
pickerEnd:{},
tdsyqssj: "",
tdzh: "",
},
],
},
];
},
//内层操作
handleInClick(index, childIndex, type) {
let insideObj = {
......
......@@ -46,6 +46,7 @@
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
active_color: item.expand,
curPage:$route.query.bsm==item.bsm
}"
>
<img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
......@@ -404,4 +405,7 @@ export default {
position: relative;
top: 1px;
}
.curPage{
color: orange;
}
</style>
......
......@@ -73,6 +73,7 @@
<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
<li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
<li @click="deleteByBsm()">删除</li>
<li @click="deleteGeoByBsm()">删除图形</li>
</ul>
<ul
v-show="dzVisible"
......@@ -429,12 +430,51 @@ export default {
}
});
},
//删除图形
deleteGeoByBsm() {
var self = this;
var BSM = "";
var type = this.zdData.type;
if (type == "zd") {
BSM = this.zdData.zdbsm;
} else {
BSM = this.zdData.bsm;
}
//删除图形相关信息
var type = this.zdData.type;
this.queryGeoByBsm(BSM, type,function (features) {
if (features && features.length > 0 && features[0].geometry.rings.length > 0) {
var layer = null;
if (type == 'zd') {
layer = self.getLayerByName("ZDJBXX");
} else {
layer = self.getLayerByName("ZRZ");
}
var featureUrl = layer.layerUrl.replace("MapServer", "FeatureServer");
featureUrl += "/" + layer.id;
features[0].geometry = null;
self.updateGraphic(featureUrl, features, function (res) {
if(!res.updateFeatureResults[0].error){
self.$message.warning("删除成功!!!")
self.addGeoByBsm(BSM,type,"testMap");
}
});
}else {
self.$message.warning("暂无图形信息!!!")
}
});
},
/*
* 导入图形
* */
importGeo(){
var self = this;
var BSM = "";
if(this.zdData.qszt != '0'){
this.$message.warning("不是临时数据,不能导入图形!!!");
return;
}
//先这么写着 后面返回类型 根据类型判断
var type = this.zdData.type;
if(type == "zd"){
......
......@@ -249,7 +249,7 @@ export default {
var graphic = {
attributes:JSON.parse(JSON.stringify(attributes)),
geometry:{
rings:[[points.concat()]]
rings:[[points]]
}
}
features.push(graphic);
......@@ -340,7 +340,7 @@ export default {
},
txtChange(value){
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]]";
var graphics = self.txtResult.filter(item => {
var graphics = this.txtResult.filter(item => {
return item.attributes.name == value;
})
var graphic = graphics[0];
......@@ -371,7 +371,7 @@ export default {
}
});
}else {
self.zrzOverAnalys(this.propertyInfo.bsm,graphic,function (flag,mes) {
self.zrzOverAnalys(self.propertyInfo.bsm,graphic,function (flag,mes) {
if(flag){
self.$message.warning(mes);
return;
......@@ -578,7 +578,7 @@ export default {
featureUrl += "/"+layer.id;
if(self.geoInfo){
self.geoInfo.BSM = self.propertyInfo.bsm;
graphic.attributes = self.geoInfo;
graphic.attributes = self.geoInfo.attributes;
//替换 生成图像 高亮
self.updateGraphic(featureUrl,graphic,function (res) {
var addRresult = res.updateFeatureResults[0];
......
......@@ -234,10 +234,10 @@ export default {
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]]";
/* 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 = {
......@@ -348,7 +348,7 @@ export default {
var zdLayer = null,
zrzLayer = null;
zdLayer = self.getLayerByName("ZDJBXX");
zdLayer = self.getLayerByName("ZRZ");
zrzLayer = self.getLayerByName("ZRZ");
var layerIds = [];
layerIds.push(zdLayer.id);
layerIds.push(zrzLayer.id);
......@@ -358,11 +358,11 @@ export default {
var flag = false,
mesge = "";
if(results && results.length > 0){
for(var i = 1;i < results.length;i++){
for(var i = 0;i < results.length;i++){
var feature = results[i].feature,
layerName = results[i].layerName;
if(layerName == 'ZRZ'){
if(feature.attributes['标识码'] != bsm){
if(!feature.attributes['标识码'] || feature.attributes['标识码'] != bsm){
var interFlag = geometryEngine.intersects(polygon,feature.geometry);
if(interFlag){
flag = true;
......@@ -370,7 +370,7 @@ export default {
break;
}
}
}else {
}else if(layerName == 'ZDJBXX') {
var interFlag = geometryEngine.intersects(polygon,feature.geometry);
var withinFlag = geometryEngine.within(polygon,feature.geometry);
if(!withinFlag && interFlag){
......@@ -468,7 +468,7 @@ export default {
queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) {
var features = res.features;
if(features && features.length > 0){
if( !features[0].geometry ){
if( !features[0].geometry || features[0].geometry.rings.length == 0 ){
self.$message.success("暂无图形信息!!");
return;
}
......
......@@ -12,31 +12,31 @@
<tr>
<td>层建筑面积(㎡)</td>
<td>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
层套内建筑面积(㎡)
</td>
<td>
<el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input>
<el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
</tr>
<tr>
<td>层阳台面积(㎡)</td>
<td>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
层半墙面积(㎡)
</td>
<td>
<el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input>
<el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
</tr>
<tr>
<td>层共有建筑面积(㎡)</td>
<td>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
层分摊建筑面积(㎡)
......
......@@ -405,18 +405,38 @@
addQjTdytRequestList:[{
}], //土地用途新增实体列表
}]
}
};
this.$refs.qlxzModule.reset();
this.ytTitleRowspan=1; //用途的单元格垂直合并数量
this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
},
save: function () {
this.form['hbsms'] = this.bsms
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
for(let i=0;i< this.form.fwjgList.length;i++){
if(this.form.fwjgList[i].fwjgzdbsm===''){
this.form.fwjgList.splice(i,1);
}
}
for(let i=0;i< this.form.fwytList.length;i++){
if(this.form.fwytList[i].fwsjytbsm===''){
this.form.fwytList.splice(i,1);
}
}
for(let i=0;i< this.form.qlxzList.length;i++){
if(this.form.qlxzList[i].qlxzdm===''){
this.form.qlxzList.splice(i,1);
}
}
console.log("批量户信息")
console.log(this.form)
batchUpdateQjH(this.form).then((res)=>{
if(res.code===200){
this.lodding()
this.$message.success("保存成功!")
this.reset();
this.$nextTick(()=>{
this.reset();
})
this.close();
}
})
......
......@@ -84,7 +84,7 @@
<div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent"></lpbContent>
<lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
......@@ -211,6 +211,7 @@
<script>
import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
export default {
name:"",
components:{lpbContent},
......@@ -312,6 +313,7 @@ export default {
xmmc:'测试自然幢',
bdcqzh:'A12111111111111111',
dylx:'zrz',
zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b'
}
]
},
......@@ -329,6 +331,7 @@ export default {
//办理
handleClick(row){
this.isSearch = false;
this.zrzbsm = row.zrzbsm;
},
//分页
handleCurrentChange(val) {
......@@ -346,7 +349,26 @@ export default {
},
//实预测转换
scyclxChange(){
//清空已选中层户
// this.bsms = [];
this.$refs.lpbContent.hbsmList = [];
this.$nextTick(()=>{
//户
this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
item.style.borderColor = 'rgb(230, 230, 230)';
if (item.className == "tdSelect") {
item.className = "";
}
});
//层
this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
console.log(item.className,'item.className');
item.className = "floor";
});
})
//获取图例数据
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
},
inputChange() {
if (this.bdcdyh != "") {
......@@ -363,6 +385,89 @@ export default {
legendToggle() {
this.legendToggleFlag = !this.legendToggleFlag;
},
//获取各项单元状态统计数据
getDyztBsmList() {
let data = {
zrzbsm: this.$store.state.zrzbsm,
scyclx: this.scyclx,
};
getLpbTj(data).then((res) => {
if (res.code === 200) {
this.dyztList = res.result;
this.dyztList.splice(1,0,this.dyztList[8]);
this.dyztList.pop();
this.dyztList.forEach(item=>{
item.ts = item.bsms.length;
switch (item.name) {
case 'Qqzt':
item.color = "#6EDEE1";
item.name = "已确权"
break;
case 'Wqqzt':
item.color = "#83AAFE";
item.name = "未确权"
break;
case 'Bazt':
item.color = "#8ADC88";
item.name = "已备案"
break;
case 'Ydyzt':
item.color = "#F2AD67";
item.name = "预抵押"
break;
case 'Zjgcdyzt':
item.color = "#F191C8";
item.name = "在建抵押"
break;
case 'Dyzt':
item.color = "#FF8282";
item.name = "抵押"
break;
case 'Cfzt':
item.color = "#D7CECF";
item.name = "查封"
break;
case 'Yyzt':
item.color = "#D4A3EB";
item.name = "异议"
break;
case 'Xzzt':
item.color = "#A5A3FB";
item.name = "限制"
break;
default:
break;
}
})
}
});
},
// 获取房屋用途和房屋性质统计数据
getLpbFwytAndQlxz(){
let data = {
zrzbsm: this.$store.state.zrzbsm,
scyclx: this.scyclx,
};
getLpbFwytAndQlxz(data).then((res) => {
if (res.code === 200) {
// this.fwytList = res.result
this.fwytList = res.result.fwyt;
this.fwxzList = res.result.qlxz;
if(this.fwytList.length>0){
this.fwytList.forEach(item=>{
item.color = "#2591FD";
item.ts = item.bsms.length
})
}
if(this.fwxzList.length>0){
this.fwxzList.forEach(item=>{
item.color = "#2591FD";
item.ts = item.bsms.length
})
}
}
});
}
},
computed: {},
watch: {
......@@ -373,7 +478,18 @@ export default {
} else {
this.lpbContentwidth += 204;
}
},
},
//选择自然幢展示楼盘表后,查询右侧图例数据
isSearch(n){
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
}
},
//改变syclx,更新楼盘表数据
scyclx(n){
this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
}
},
}
</script>
......
......@@ -37,7 +37,7 @@
<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>
<span class="value" :title="value">{{value == 'Null' ?"":value}}</span>
</div>
</div>
</el-card>
......@@ -142,7 +142,6 @@ export default {
},
//图层选择事件
selectLayerChange(){
debugger
var self = this;
this.features = [];
var layerAndResult = this.results.filter(function (item) {
......
......@@ -30,10 +30,11 @@ export default {
console.log("没有找到图层,不能查询");
return;
}
var view = maps[viewId];
queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) {
var features = res.features;
if(features && features.length > 0){
if( !features[0].geometry ){
if( !features[0].geometry || features[0].geometry.rings.length == 0){
self.$message.success("暂无图形信息!!");
return;
}
......@@ -42,7 +43,6 @@ export default {
]).then( ([
GraphicsLayer
]) => {
var view = maps[viewId];
var layer = view.map.findLayerById("highlightLayer");
if(layer){
layer.removeAll();
......
......@@ -97,7 +97,7 @@
</div>
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent" :key="time"></lpbContent>
<lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
......@@ -635,7 +635,7 @@ export default {
if (res.code === 200) {
this.$message.success("生成完成!");
} else {
this.$message.warning("生成失败!");
this.$message.warning(res.message);
}
}
);
......
......@@ -62,7 +62,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -117,7 +117,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -133,7 +133,9 @@
<!-- 逻辑幢名称 -->
<div class="ljz-name name">
{{ ljzs.ljzmc }}
<p>
{{ ljzs.ljzmc }}
</p>
</div>
</div>
</div>
......@@ -177,7 +179,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -222,7 +224,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -257,6 +259,10 @@
向下添加层
</li>
<li v-show="rightClickFlag == 'c'" @click="handleDeleteC">删除层</li>
<!-- 合并 -->
<li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
<li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
</ul>
<!-- 层操作弹框 -->
<el-dialog
......@@ -299,11 +305,22 @@
</template>
<script>
import moveH from "./../../../../../components/moveH/moveH";
import { getLpb, insertUpDownC, deleteCByBsm } from "../../../../../api/lpb";
import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
import { hhb } from "@api/h";
import { Message } from 'element-ui';
export default {
name: "",
components: { moveH },
props: {},
props: {
isHbfg:{
type:Boolean,
default:false
},
zrzbsm:{
type:String,
default:''
}
},
data() {
return {
moveHvisible: false,
......@@ -344,13 +361,15 @@ export default {
},
formLabelWidth: "120px",
yclpbData:{},
sclpbData:{}
sclpbData:{},
fghbChoosedList:[],
canHb:''//判断合并类型
};
},
created() {},
mounted() {
this.getLpb(this.$store.state.zrzbsm, "0");
this.getLpb(this.$store.state.zrzbsm, "1");
this.getLpb(this.zrzbsm, "0");
this.getLpb(this.zrzbsm, "1");
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
......@@ -489,7 +508,7 @@ export default {
}
},
//户单击事件
handleTdClick(e, bsm) {
handleTdClick(e, bsm,hs) {
let self = this;
// 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件
clearTimeout(self.time);
......@@ -498,20 +517,38 @@ export default {
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className = "tdSelect"; //加边框
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
if(this.isHbfg){
this.fghbChoosedList.push(hs);
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
}else{
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
}
} else {
//选中→未选中
e.target.className = "";
this.deleteArrOption(this.hbsmList, bsm);
if(this.isHbfg){
this.deleteArrOption(this.fghbChoosedList, hs)
this.deleteArrOption(this.hbsmList, bsm);
}else{
this.deleteArrOption(this.hbsmList, bsm);
}
}
if(this.isHbfg){
}else{
this.$parent.getHbsm(this.hbsmList, false);
}
this.$parent.getHbsm(this.hbsmList, false);
}, 200);
},
//户双击事件
dbclick(bsm) {
clearTimeout(this.time);
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(bsm, true);
if (this.isHbfg) {
}else{
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(bsm, true);
}
},
//删除多重数组中的某一项
deleteArrOption(arr, item) {
......@@ -536,26 +573,53 @@ export default {
},
//户右键点击事件
openMenu(e, item, type) {
console.log(e, "e");
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
this.chData = item;
this.rightClickFlag = type;
this.lpbChVisible = true;
if (this.isHbfg) {
this.rightClickFlag = 'hb';
if (this.fghbChoosedList.length>1) {
this.lpbChVisible = true;
//判断选中户可以执行的合并类型
let chIsSame = this.fghbChoosedList.every((item)=> {
return item.ch == this.fghbChoosedList[0].ch;
});
let hhIsSame = this.fghbChoosedList.every((item)=> {
return item.hh == this.fghbChoosedList[0].hh;
});
this.$nextTick(()=>{
if(chIsSame){
this.canHb = 'zyhb'
}else if(hhIsSame){
this.canHb = 'sxhb'
}else{
this.canHb = ''
}
})
}
}else{
console.log(e, "e");
this.chData = item;
this.rightClickFlag = type;
this.lpbChVisible = true;
}
},
// 层选中事件
handleClickC(e, item) {
//判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className += " tdSelect"; //加边框
this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
} else {
//选中→未选中
e.target.className = "floor";
this.deleteArrOption(this.cbsmList, item.bsm);
if (this.isHbfg) {
}else{
//判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className += " tdSelect"; //加边框
this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
} else {
//选中→未选中
e.target.className = "floor";
this.deleteArrOption(this.cbsmList, item.bsm);
}
this.$parent.getCbsm(this.cbsmList);
}
this.$parent.getCbsm(this.cbsmList);
},
//关闭右键菜单
closeMenu() {
......@@ -638,6 +702,46 @@ export default {
qsztClick(){
},
//户合并
handleHb(type){
let olbBsms = '';
this.hbsmList.forEach((item,index)=>{
olbBsms+= index<this.hbsmList.length-1? item+',':item
})
if (type == this.canHb) {
this.$confirm("是否确认合并选中户?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
//确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
let params = {
"newuserbsm": "",
"oldBsms": olbBsms,
"scyclx": this.$parent.scyclx,
"ljzbsm": this.fghbChoosedList[0].ljzbsm,
"zdybsm": this.fghbChoosedList[0].zdybsm,
"zrzbsm": this.fghbChoosedList[0].zrzbsm
}
// console.log(params,'params');
hhb(params).then((res) => {
if(res.code == 200){
Message.success('合并成功');
// 清除选中户
this.clearChoosedH();
this.fghbChoosedList = [];
// 更新楼盘表
this.getLpb(this.zrzbsm, this.$parent.scyclx);
}
})
.catch(() => {});
})
.catch(() => {});
}else{
}
}
},
computed: {
createFlagChange() {
......@@ -687,12 +791,8 @@ export default {
//父组件中选择单元状态改变选中户的边框颜色
choosedList(n) {
this.$refs.hBsm.forEach((item) => {
// console.log(item.dataset.bsm,'item.dataset.bsm');
// console.log(this.choosedList,'this.choosedList');
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
// console.log(item.style.border,'item.style.border');
// console.log(this.borderColor,'this.borderColor');
item.style.border = '1px solid '+this.borderColor;
}
});
......@@ -741,7 +841,8 @@ export default {
bottom: 0;
position: absolute;
height: 40px;
background-color: rosybrown;
// background-color: rosybrown;
border:1px solid #E6E6E6
}
// .chTable-wrap{
// position: absolute;
......@@ -765,7 +866,12 @@ export default {
.ljz-name {
width: calc(100% - 32px);
height: 40px;
background-color: darkorange;
// background-color: darkorange;
p{
width: 100%;
height: 100%;
border:1px solid #E6E6E6
}
}
}
div:last-child {
......@@ -791,7 +897,8 @@ export default {
display: inline-table;
.zdy-name {
bottom: 0;
background-color: blanchedalmond;
// background-color: blanchedalmond;
border:1px solid #E6E6E6
}
}
.zdy-zdy:last-child {
......@@ -801,7 +908,8 @@ export default {
.zdy-name {
width: calc;
height: 40px;
background-color: rosybrown;
// background-color: rosybrown;
border:1px solid #E6E6E6
}
}
.column-reverse {
......@@ -876,13 +984,17 @@ export default {
.zrz {
height: 60px;
line-height: 60px;
background-color: darkgoldenrod;
background-color: #ffffff;
border:1px solid #E6E6E6;
position: relative;
bottom: 66px;
text-align: center;
transition: 0.5s;
}
.cantHb{
opacity: .5;
cursor: not-allowed;
}
.btnGroup {
margin: 20px auto 0;
width: 150px;
......
......@@ -280,6 +280,7 @@
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit,registerCall} from "../../../api/common"
import geoUtils from "@components/lineTree/tx/js/geoUtils";
export default {
name:'zrz',
components:{
......@@ -358,7 +359,6 @@
loading:false,
source:'',
geoAttributes:{
OBJECTID:null,
YSDM:"",
BDCDYH:"",
ZDDM:"",
......@@ -400,6 +400,7 @@
mainBoxWidth:0,
}
},
mixins:[geoUtils],
methods: {
registerCall(){
let data={
......@@ -540,7 +541,7 @@
type: "warning",
});
}else{
saveZrzInfo(this.form).then((res)=>{
saveZrzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成!")
}else {
......@@ -558,9 +559,12 @@
for(var key in this.geoAttributes){
if(key == "BSM"){
self.geoAttributes[key] = this.bsm
}else{
}else if(key == 'JGRQ'){
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
self.geoAttributes[key] = new Date(self.form[formKay]).getTime();
}else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.form[formKay];
}
}
self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
......