c30c2bea by tianhaohao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents e17a424a 219c12d6
000000000018{"ver":3,"count":6,"type":[0,0,1,1,1,1]}
\ No newline at end of file
000000000011{"pt1":["402653184.000000","402653184.000000","0.000000"],"pt2":["671088640.000000","671088640.000000","0.000000"],"DToWMat":[753185.903479,0.000000,0.000000,0.000000,0.000000,753185.903479,0.000000,0.000000,0.000000,0.000000,753185.903479,0.000000,425022805.333341,457786392.134663,0.000000,1.000000],"ver":3,"layout":["Layout1","Layout2"],"viewangle":0.000000}
\ No newline at end of file
000000000013{"list":[{"name":"0","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":75,"zerolayer":1},{"name":"2","off":0,"color":"#FFFF00","colorvalue":50397183,"id":123,"zerolayer":0},{"name":"4","off":0,"color":"#00FFFF","colorvalue":67108608,"id":124,"zerolayer":0},{"name":"ASDIM0","off":0,"color":"#00FF00","colorvalue":50396928,"id":125,"zerolayer":0},{"name":"ASD_BAR","off":0,"color":"#FF0000","colorvalue":50331903,"id":126,"zerolayer":0},{"name":"AXIS","off":0,"color":"#00FF00","colorvalue":50396928,"id":127,"zerolayer":0},{"name":"BOUT","off":0,"color":"#00FFFF","colorvalue":67108608,"id":128,"zerolayer":0},{"name":"D","off":0,"color":"#00FF00","colorvalue":50396928,"id":129,"zerolayer":0},{"name":"DEFPOINTS","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":130,"zerolayer":0},{"name":"DIM","off":0,"color":"#00FF00","colorvalue":50396928,"id":131,"zerolayer":0},{"name":"F","off":0,"color":"#CC0000","colorvalue":50331852,"id":132,"zerolayer":0},{"name":"GJ","off":0,"color":"#0000FF","colorvalue":67043328,"id":133,"zerolayer":0},{"name":"JG-梁实线130","off":0,"color":"#00FFFF","colorvalue":67108608,"id":135,"zerolayer":0},{"name":"JG-梁虚线130","off":0,"color":"#00FFFF","colorvalue":67108608,"id":136,"zerolayer":0},{"name":"JG-说明字31","off":0,"color":"#FFBF7F","colorvalue":58703871,"id":137,"zerolayer":0},{"name":"JG-图名31","off":0,"color":"#FFBF7F","colorvalue":58703871,"id":134,"zerolayer":0},{"name":"OTHER","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":138,"zerolayer":0},{"name":"PUB_DIM","off":0,"color":"#00FF00","colorvalue":50396928,"id":139,"zerolayer":0},{"name":"PUB_TEXT","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":140,"zerolayer":0},{"name":"PUB_TITLE","off":0,"color":"#00FFFF","colorvalue":67108608,"id":141,"zerolayer":0},{"name":"T","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":142,"zerolayer":0},{"name":"TEXT","off":0,"color":"#00FF00","colorvalue":50396928,"id":143,"zerolayer":0},{"name":"TITLE","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":144,"zerolayer":0},{"name":"TK","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":145,"zerolayer":0},{"name":"ZXX","off":0,"color":"#990000","colorvalue":50331801,"id":146,"zerolayer":0},{"name":"标高","off":0,"color":"#FF0000","colorvalue":50331903,"id":152,"zerolayer":0},{"name":"粗可见","off":0,"color":"#00BFFF","colorvalue":67092224,"id":154,"zerolayer":0},{"name":"挡土墙","off":0,"color":"#FF00FF","colorvalue":67043583,"id":149,"zerolayer":0},{"name":"道路中线","off":0,"color":"#FF0000","colorvalue":50331903,"id":156,"zerolayer":0},{"name":"铺地","off":0,"color":"#0000FF","colorvalue":67043328,"id":157,"zerolayer":0},{"name":"文字","off":0,"color":"#00FF00","colorvalue":50396928,"id":150,"zerolayer":0},{"name":"细可见","off":0,"color":"#990000","colorvalue":50331801,"id":155,"zerolayer":0},{"name":"小品","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":148,"zerolayer":0},{"name":"中可见","off":0,"color":"#FFBF00","colorvalue":50380799,"id":147,"zerolayer":0},{"name":"种植土","off":0,"color":"#C0C0C0","colorvalue":62963904,"id":153,"zerolayer":0},{"name":"柱子","off":0,"color":"#808080","colorvalue":58753152,"id":151,"zerolayer":0}],"size":36,"isSketch":0}
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
000000000018{"ver":3,"count":6,"type":[0,0,1,1,1,1]}
\ No newline at end of file
000000000011{"pt1":["402653184.000000","402653184.000000","0.000000"],"pt2":["671088640.000000","671088640.000000","0.000000"],"DToWMat":[753185.903479,0.000000,0.000000,0.000000,0.000000,753185.903479,0.000000,0.000000,0.000000,0.000000,753185.903479,0.000000,425022805.333341,457786392.134663,0.000000,1.000000],"ver":3,"layout":["Layout1","Layout2"],"viewangle":0.000000}
\ No newline at end of file
000000000013{"list":[{"name":"0","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":75,"zerolayer":1},{"name":"2","off":0,"color":"#FFFF00","colorvalue":50397183,"id":123,"zerolayer":0},{"name":"4","off":0,"color":"#00FFFF","colorvalue":67108608,"id":124,"zerolayer":0},{"name":"ASDIM0","off":0,"color":"#00FF00","colorvalue":50396928,"id":125,"zerolayer":0},{"name":"ASD_BAR","off":0,"color":"#FF0000","colorvalue":50331903,"id":126,"zerolayer":0},{"name":"AXIS","off":0,"color":"#00FF00","colorvalue":50396928,"id":127,"zerolayer":0},{"name":"BOUT","off":0,"color":"#00FFFF","colorvalue":67108608,"id":128,"zerolayer":0},{"name":"D","off":0,"color":"#00FF00","colorvalue":50396928,"id":129,"zerolayer":0},{"name":"DEFPOINTS","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":130,"zerolayer":0},{"name":"DIM","off":0,"color":"#00FF00","colorvalue":50396928,"id":131,"zerolayer":0},{"name":"F","off":0,"color":"#CC0000","colorvalue":50331852,"id":132,"zerolayer":0},{"name":"GJ","off":0,"color":"#0000FF","colorvalue":67043328,"id":133,"zerolayer":0},{"name":"JG-梁实线130","off":0,"color":"#00FFFF","colorvalue":67108608,"id":135,"zerolayer":0},{"name":"JG-梁虚线130","off":0,"color":"#00FFFF","colorvalue":67108608,"id":136,"zerolayer":0},{"name":"JG-说明字31","off":0,"color":"#FFBF7F","colorvalue":58703871,"id":137,"zerolayer":0},{"name":"JG-图名31","off":0,"color":"#FFBF7F","colorvalue":58703871,"id":134,"zerolayer":0},{"name":"OTHER","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":138,"zerolayer":0},{"name":"PUB_DIM","off":0,"color":"#00FF00","colorvalue":50396928,"id":139,"zerolayer":0},{"name":"PUB_TEXT","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":140,"zerolayer":0},{"name":"PUB_TITLE","off":0,"color":"#00FFFF","colorvalue":67108608,"id":141,"zerolayer":0},{"name":"T","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":142,"zerolayer":0},{"name":"TEXT","off":0,"color":"#00FF00","colorvalue":50396928,"id":143,"zerolayer":0},{"name":"TITLE","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":144,"zerolayer":0},{"name":"TK","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":145,"zerolayer":0},{"name":"ZXX","off":0,"color":"#990000","colorvalue":50331801,"id":146,"zerolayer":0},{"name":"标高","off":0,"color":"#FF0000","colorvalue":50331903,"id":152,"zerolayer":0},{"name":"粗可见","off":0,"color":"#00BFFF","colorvalue":67092224,"id":154,"zerolayer":0},{"name":"挡土墙","off":0,"color":"#FF00FF","colorvalue":67043583,"id":149,"zerolayer":0},{"name":"道路中线","off":0,"color":"#FF0000","colorvalue":50331903,"id":156,"zerolayer":0},{"name":"铺地","off":0,"color":"#0000FF","colorvalue":67043328,"id":157,"zerolayer":0},{"name":"文字","off":0,"color":"#00FF00","colorvalue":50396928,"id":150,"zerolayer":0},{"name":"细可见","off":0,"color":"#990000","colorvalue":50331801,"id":155,"zerolayer":0},{"name":"小品","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":148,"zerolayer":0},{"name":"中可见","off":0,"color":"#FFBF00","colorvalue":50380799,"id":147,"zerolayer":0},{"name":"种植土","off":0,"color":"#C0C0C0","colorvalue":62963904,"id":153,"zerolayer":0},{"name":"柱子","off":0,"color":"#808080","colorvalue":58753152,"id":151,"zerolayer":0}],"size":36,"isSketch":0}
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
000000000018{"ver":3,"count":8,"type":[0,0,1,1,1,1,1,1]}
\ No newline at end of file
000000000011{"pt1":["402682990.708291","473440463.010280","7451677.072646"],"pt2":["671058833.291709","600301360.989720","7451677.072646"],"DToWMat":[1490.335415,0.000000,0.000000,0.000000,0.000000,1490.335415,0.000000,0.000000,0.000000,0.000000,1490.335415,0.000000,402682990.708291,473440463.010280,0.000000,1.000000],"ver":3,"layout":["Layout1","Layout2"],"viewangle":0.000000}
\ No newline at end of file
000000000013{"list":[{"name":"0","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":75,"zerolayer":1},{"name":"2","off":0,"color":"#FFFF00","colorvalue":50397183,"id":123,"zerolayer":0},{"name":"4","off":0,"color":"#00FFFF","colorvalue":67108608,"id":124,"zerolayer":0},{"name":"ASDIM0","off":0,"color":"#00FF00","colorvalue":50396928,"id":125,"zerolayer":0},{"name":"ASD_BAR","off":0,"color":"#FF0000","colorvalue":50331903,"id":126,"zerolayer":0},{"name":"AXIS","off":0,"color":"#00FF00","colorvalue":50396928,"id":127,"zerolayer":0},{"name":"BOUT","off":0,"color":"#00FFFF","colorvalue":67108608,"id":128,"zerolayer":0},{"name":"D","off":0,"color":"#00FF00","colorvalue":50396928,"id":129,"zerolayer":0},{"name":"DEFPOINTS","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":130,"zerolayer":0},{"name":"DIM","off":0,"color":"#00FF00","colorvalue":50396928,"id":131,"zerolayer":0},{"name":"F","off":0,"color":"#CC0000","colorvalue":50331852,"id":132,"zerolayer":0},{"name":"GJ","off":0,"color":"#0000FF","colorvalue":67043328,"id":133,"zerolayer":0},{"name":"JG-梁实线130","off":0,"color":"#00FFFF","colorvalue":67108608,"id":135,"zerolayer":0},{"name":"JG-梁虚线130","off":0,"color":"#00FFFF","colorvalue":67108608,"id":136,"zerolayer":0},{"name":"JG-说明字31","off":0,"color":"#FFBF7F","colorvalue":58703871,"id":137,"zerolayer":0},{"name":"JG-图名31","off":0,"color":"#FFBF7F","colorvalue":58703871,"id":134,"zerolayer":0},{"name":"OTHER","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":138,"zerolayer":0},{"name":"PUB_DIM","off":0,"color":"#00FF00","colorvalue":50396928,"id":139,"zerolayer":0},{"name":"PUB_TEXT","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":140,"zerolayer":0},{"name":"PUB_TITLE","off":0,"color":"#00FFFF","colorvalue":67108608,"id":141,"zerolayer":0},{"name":"T","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":142,"zerolayer":0},{"name":"TEXT","off":0,"color":"#00FF00","colorvalue":50396928,"id":143,"zerolayer":0},{"name":"TITLE","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":144,"zerolayer":0},{"name":"TK","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":145,"zerolayer":0},{"name":"ZXX","off":0,"color":"#990000","colorvalue":50331801,"id":146,"zerolayer":0},{"name":"标高","off":0,"color":"#FF0000","colorvalue":50331903,"id":152,"zerolayer":0},{"name":"粗可见","off":0,"color":"#00BFFF","colorvalue":67092224,"id":154,"zerolayer":0},{"name":"挡土墙","off":0,"color":"#FF00FF","colorvalue":67043583,"id":149,"zerolayer":0},{"name":"道路中线","off":0,"color":"#FF0000","colorvalue":50331903,"id":156,"zerolayer":0},{"name":"铺地","off":0,"color":"#0000FF","colorvalue":67043328,"id":157,"zerolayer":0},{"name":"文字","off":0,"color":"#00FF00","colorvalue":50396928,"id":150,"zerolayer":0},{"name":"细可见","off":0,"color":"#990000","colorvalue":50331801,"id":155,"zerolayer":0},{"name":"小品","off":0,"color":"#FFFFFF","colorvalue":67108863,"id":148,"zerolayer":0},{"name":"中可见","off":0,"color":"#FFBF00","colorvalue":50380799,"id":147,"zerolayer":0},{"name":"种植土","off":0,"color":"#C0C0C0","colorvalue":62963904,"id":153,"zerolayer":0},{"name":"柱子","off":0,"color":"#808080","colorvalue":58753152,"id":151,"zerolayer":0}],"size":36,"isSketch":0}
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
/*
* @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器
* @Autor: renchao
* @LastEditTime: 2023-05-31 15:30:02
* @LastEditTime: 2023-06-01 09:20:24
*/
import axios from 'axios'
import { Message } from 'element-ui'
......@@ -38,7 +38,7 @@ service.interceptors.request.use(
return Promise.reject(error);
}
)
window.__isNeedLogin = true
// response interceptor
service.interceptors.response.use(
response => {
......@@ -60,7 +60,7 @@ service.interceptors.response.use(
//todo: 需要解决 一个页面多个请求,刷新后此处会触发多次
if (window.__isNeedLogin) {
window.__isNeedLogin = false
this.$message.error('token失效,请重新登录');
Message.error('token失效,请重新登录');
let locationUrl = window.location.protocol + '//' + window.location.host + window.location.pathname;
localStorage.removeItem('token')
if (window._config.casEnable) {
......
<!--
功能:初始化功能描述
作者:calliope
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-01 09:58:47
-->
<template>
<canvas id="mxcad">
......@@ -16,7 +17,7 @@
// 创建控件对象
Mx.MxFun.createMxObject({
canvasId: "mxcad", // canvas元素的id
cadFile: "./cad.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
cadFile: "/buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
// cadFile: "test2.dwg", // socket通信方式请直接提供图纸名称 如:text.dwg
callback: (mxDraw, {
canvas,
......
<template>
<div class="ywsq" id="ywsq">
<div class="ywsq-left">
<p v-for="(item, index) in sqywlxList" @click="sqywlxClick(item)" :key="index"
:class="{ 'active': selectType == item.type }">{{ item.name }}</p>
<el-collapse disabled v-model="activeNames">
<el-collapse-item title="业务申请" name="1">
<ul class="item-list">
<li v-for="(item, index) in sqywQllxList" :key="index" @click="qllxClick(index)"
:class="item.check ? 'active' : ''">
{{ item.nodename }}</li>
</ul>
</el-collapse-item>
</el-collapse>
</div>
<div class="ywsq-right">
<!-- 常办业务 -->
<div v-show="selectType == 'collect'" class="right-situation el-card">
<div class="right-title">常办业务列表</div>
<ul>
<li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in collectList" :key="index"
@dblclick="dblclick(collectList, index, item)" @click="selectSqywClick(collectList, index)">
<p v-if="item.nodetype == 'djqx'">{{ item.djywmc }}<br>{{ item.nodename }}</p>
<dt v-else>{{ item.djywmc }}</dt>
<p class="active" @click.stop="handleCollection(item)">
<i class="el-icon-star-off"></i>
</p>
</li>
</ul>
</div>
<!-- 一并申请 -->
<div v-if="selectType == 'together'" class="right-title">一并申请</div>
<!-- 登记簿补录 -->
<div v-if="selectType == 'amend'" class="right-title">登记簿补录</div>
<!-- 业务申请 -->
<template v-if="selectType == 'apply'">
<div class="right-type el-card box-card is-always-shadow">
<div class="right-title">登记类型</div>
<ul class="type-content">
<li :class="item.selected ? 'cactive' : ''" @dblclick="item.sffqlc == 1 && dblclick(djlxList, index, item)"
@click="selectSqywClick(djlxList, index)" v-for="(item, index) in djlxList" :key="index">
<p>
{{ item.nodename }}
</p>
<p v-if="item.sffqlc == 1" :class="item.userCollect == 1 ? 'active' : ''"
@click.stop="handleCollection(item)">
<i class="el-icon-star-off"></i>
</p>
</li>
</ul>
</div>
<div class="right-situation el-card box-card is-always-shadow">
<div class="right-title">登记情形</div>
<ul>
<li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
@dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
<dt>{{ item.nodename }}</dt>
<p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)">
<i class="el-icon-star-off"></i>
</p>
</li>
</ul>
</div>
</template>
<div class="submit-button">
<el-button type="primary" :disabled="btnDisabled" @click="dialogClick">选择不动产</el-button>
</div>
</div>
</div>
</template>
<script>
import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
export default {
data () {
return {
//申请业务类型集合
sqywlxList: [
{ name: "常办业务", type: "collect" },
{ name: "一并申请", type: "together" },
{ name: "登记簿补录", type: "amend" }
],
//类型默认选择常办业务
selectType: "collect",
//堆叠框选中第一个
activeNames: ['1'],
//收藏业务集合
collectList: [],
//申请权利类型集合
sqywQllxList: [],
//登记类型集合
djlxList: [],
//申请权利类型集合
djqxList: [],
//选中业务的参数
selectParam: {},
//选择按钮显示或隐藏
btnDisabled: true,
}
},
created () {
this.getDataList();
},
methods: {
getDataList () {
//获取收藏信息集合
getCollectBiz().then(res => {
this.collectList = res.result;
this.collectList.forEach(item => {
this.$set(item, 'selected', false);
});
});
//获取申请权利信息集合
getleftMenu().then(res => {
this.sqywQllxList = res.result;
})
},
//申请业务类型菜单事件
sqywlxClick (item) {
this.btnDisabled = true;
this.selectType = item.type;
this.sqywQllxList.forEach(item => {
if (item.check) item.check = false;
})
},
//权利类型菜单事件
qllxClick (index) {
this.btnDisabled = true;
this.sqywQllxList.forEach(item => {
if (item.check) item.check = false;
})
this.sqywQllxList[index].check = true;
this.selectType = "apply";
this.djlxList = [];
this.djqxList = [];
this.getNextNode(this.sqywQllxList[index].bsmSqyw);
},
//选择申请业务事件
selectSqywClick (data, index) {
data.forEach(item => {
item.selected = false;
});
data[index].selected = true;
if (data[index].sffqlc == "1") {
this.selectParam = data[index];
this.btnDisabled = false;
} else {
this.btnDisabled = true;
this.getNextNode(data[index].bsmSqyw);
}
},
//获取下个节点类型数据
getNextNode (bsmSqyw) {
getNextNode(bsmSqyw).then(res => {
if (res.result.djqx) {
this.djqxList = res.result.djqx;
this.djqxList.forEach(item => {
this.$set(item, 'selected', false);
});
}
if (res.result.djlx) {
this.djlxList = res.result.djlx;
this.djlxList.forEach(item => {
this.$set(item, 'selected', false);
});
}
})
},
//双击事件
dblclick (data, index, item) {
localStorage.setItem('ywbl', JSON.stringify(item));
this.selectSqywClick(data, index);
this.dialogClick();
},
//打开弹框内容
dialogClick () {
this.openDialog();
},
//收藏操作
handleCollection (item) {
let that = this
if (item.userCollect == '2') {
addCollectBiz(item.bsmSqyw).then(res => {
if (res.code == 200) {
item.userCollect = '1'
that.$message({
message: '收藏成功!',
type: 'success'
})
that.getDataList()
}
})
} else {
this.$confirm('此操作将取消收藏, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteCollectBiz(item.bsmSqyw).then(res => {
if (res.code == 200) {
item.userCollect = '2'
that.$message({
message: '取消收藏成功!',
type: 'success'
})
that.getDataList()
}
})
})
}
},
handleSelect (item) {
this.busList.forEach(item => {
item.cselect = false
})
item.cselect = !item.cselect
},
// 登记类型
handleDjlxSelect (item) {
this.djlxList.forEach(item => {
item.cselect = false
})
this.btnDisabled = true
item.cselect = true;
this.djqxObj = item;
if (item.sffqlc == '1') {
this.btnDisabled = false
this.bsmSqyw = item.bsmSqyw
this.djywbm = item.djywbm;
} else {
this.getNextNode(item.bsmSqyw, false)
}
this.djqxList = []
},
handleDjqxItem (item) {
this.djlxList.forEach(item => {
item.cselect = false
})
if (item.sffqlc == 1) {
this.djywbm = item.djywbm
this.bsmSqyw = item.bsmSqyw
item.cselect = true
this.openDialog()
this.btnDisabled = true
}
},
handleSelectItem (item, list) {
this.handleSelectYw(item, list)
this.openDialog()
},
// 选择不动产信息
bthSelectClick () {
this.openDialog()
},
openDialog () {
let title = "申请业务:" + this.selectParam?.djywmc ? this.selectParam?.djywmc : '';
this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "80%")
},
loadView (view) {
return r => require.ensure([], () => r(require(`./components/${view}/${view}.vue`)))
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/mixin.scss";
@import "./ywsq.scss";
/deep/.el-collapse-item__content {
padding-bottom: 0;
}
/deep/.el-collapse-item__wrap {
border-bottom: none;
}
</style>
\ No newline at end of file