Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
4b43d29a by xiaomiao
Options

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

2 parents f5d75d31 6a7adb82
Inline Side-by-side
Showing 13 changed files with 476 additions and 74 deletions
@union:registry=http://core.pashanhoo.com:8932/repository/npm-hosted/
\ No newline at end of file
......@@ -11,6 +11,7 @@
"@antv/g2": "^4.2.8",
"@babel/polyfill": "^7.12.1",
"@riophae/vue-treeselect": "^0.4.0",
"@union/gis-sdk": "^1.1.0",
"axios": "^0.21.1",
"bpmn-js": "^7.4.0",
"bpmn-js-properties-panel": "^0.37.2",
......@@ -83,4 +84,4 @@
"type": "git",
"url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
}
}
\ No newline at end of file
}
......
[
{
"label":"不动产",
"id":"1-1",
"alpha":100,
"children":[
{
"label":"行政区划",
"id": "XZQH",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/XZQH/MapServer",
"alpha":100,
"children":[
{
"label":"行政区",
"id": "XZQH_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/XZQH/MapServer",
"alpha":100
},
{
"label":"行政区界限",
"id": "XZQH_1",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/XZQH/MapServer",
"alpha":100
}
]
},
{
"label":"地籍分区",
"id": "DJFQ",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/DJFQ/MapServer",
"alpha":100,
"children":[
{
"label":"地籍区",
"id": "DJFQ_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/DJFQ/MapServer",
"alpha":100
},
{
"label":"地籍子区",
"id": "DJFQ_1",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/DJFQ/MapServer",
"alpha":100
}
]
},
{
"label":"不动产单元",
"id": "bdcDY",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100,
"children":[
{
"label":"界址点",
"id": "bdcDY_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"界址线",
"id": "bdcDY_1",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"林权",
"id": "bdcDY_2",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"自然幢",
"id": "ZRZ",
"name": "zrz",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"构筑物",
"id": "bdcDY_4",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"点状定着物",
"id": "bdcDY_5",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"线状定着物",
"id": "bdcDY_6",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
},
{
"label":"面状定着物",
"id": "bdcDY_7",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/bdcDY_610100/MapServer",
"alpha":100
},
{
"label":"宗地",
"id": "ZDJBXX",
"name": "zd",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100,
"fields": [ "YSDM", "ZDDM", "BDCDYH", "ZDTZM", "ZL", "ZDMJ", "MJDW", "QLLX", "QLXZ" ]
},
{
"label":"宗地历史",
"id": "ZDJBXXLS",
"name": "zdls",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100,
"fields": [ "YSDM", "ZDDM", "BDCDYH", "ZDTZM", "ZL", "ZDMJ", "MJDW", "QLLX", "QLXZ" ]
},
{
"label":"宗海",
"id": "ZHJBXX",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
"alpha":100
}
]
},
{
"label":"自然地理",
"id": "ZRDL",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
"alpha":100,
"children":[
{
"label":"水系",
"id": "ZRDL_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
"alpha":100
},
{
"label":"植被",
"id": "ZRDL_1",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
"alpha":100
},
{
"label":"辅助面",
"id": "ZRDL_2",
"url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
"alpha":100
}
]
}
]
},
{
"label":"厦门数据",
"id":"2-1",
"alpha":100,
"children":[
{
"label":"规划用地",
"id": "ghyd",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ghyd/MapServer",
"alpha":100,
"children":[
{
"label":"规划用地",
"id": "ghyd_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ghyd/MapServer",
"alpha":100,
"fields": [ "地块编号", "规划现状", "行政区", "维护文号", "规划用地性质代号", "规划用地性质名称", "所属管理单元", "所属编制单元" ]
}
]
},
{
"label":"基本农田",
"id": "jbnt",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/jbnt/MapServer",
"alpha":100,
"children":[
{
"label":"基本农田",
"id": "jbnt_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/jbnt/MapServer",
"alpha":100,
"fields": [ "编制单位", "权属单位代码", "权属单位名称", "座落单位代码", "座落单位名称", "地类名称", "基本农田面积" ]
}
]
},
{
"label":"行政区划",
"id": "xmxzq",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
"alpha":100,
"children":[
{
"label":"村级行政区划",
"id": "xmxzq_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
"alpha":100
},
{
"label":"镇级行政区划",
"id": "xmxzq_1",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
"alpha":100
},
{
"label":"区级行政区划",
"id": "xmxzq_2",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
"alpha":100
}
]
},
{
"label":"现状建筑",
"id": "xzjz",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xzjz/MapServer",
"alpha":100,
"children":[
{
"label":"现状建筑",
"id": "xzjz_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xzjz/MapServer",
"alpha":100,
"fields": [ "SJLY", "PRODATE", "GXSJ", "DWMC", "AQDJ", "DWDM", "ZXDX", "ZXDY" ]
}
]
},
{
"label":"用地",
"id": "ypyd",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
"alpha":100,
"children":[
{
"label":"用地",
"id": "ypyd_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
"alpha":100
},
{
"label":"选址",
"id": "ypyd_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
"alpha":100
},
{
"label":"红线",
"id": "ypyd_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
"alpha":100
},
{
"label":"道路",
"id": "ypyd_0",
"url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
"alpha":100
}
]
}
]
}
]
\ No newline at end of file
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-27 10:05:25
* @LastEditTime: 2023-08-09 14:32:38
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -280,3 +280,14 @@ export function startTogetherFlow (data) {
data
})
}
/**
* @description: 据不动产单元号查询宗地基本信息
* @param {*} data
* @author: renchao
*/
export function getZdInfo (bdcdyid) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/getZdInfo?bdcdyid=' + bdcdyid,
method: 'post'
})
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-24 14:11:31
* @LastEditTime: 2023-08-09 10:09:12
-->
<template>
<div class="from-clues">
......@@ -20,7 +20,7 @@
<el-col :span="18" class="btnColRight">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
<el-button @click="moreQueryClick()">高级查询</el-button>
<!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-12 14:20:58
-->
<template>
<div>
图形定位
<div class="gis">
<div class="gis-container" ref="main">
<div class="flex-transverse" ref="transverse">
<div id="arcgisMap0" class="flex-single"></div>
</div>
<div class="flex-vertical" ref="vertical"></div>
</div>
<el-card class="box-card">
<div v-for="( item, i ) in curr" :key="i" class="text item">
<el-row>
<el-col :span="10">
<div class="grid-content">{{ item.key }}</div>
</el-col>
<el-col :span="14">
<div class="grid-content">{{ item.value }}</div>
</el-col>
</el-row>
</div>
</el-card>
</div>
</template>
<script>
<script>
import apiWrapper from '@union/gis-sdk';
import layerJson from '@/api/json/layer.json';
import axios from 'axios';
import { log } from 'bpmn-js-token-simulation';
export default {
props: {
formData: {
type: Object,
default: {}
default: () => {
return {}
}
}
},
data () {
return {
curr: []
}
},
mounted () {
let doc = document.querySelector('.gis');
this.$nextTick(() => {
Object.assign(doc.style, { width: + doc.clientWidth + 'px', height: '700px' });
})
},
created () {
let { special2 } = apiWrapper.thematic, { wrapper } = apiWrapper, id = this.formData.bsmZd
wrapper.reduction(special2).then(() => {
let { children } = layerJson[0].children[2], i = 0, o, name, url, { Layer } = wrapper;
for (; o = children[i]; i++) if (o.id === 'ZDJBXX' && (name = o.name) === 'zd') { url = o.url + '/' + i; break; }
Layer.createLayer([{ type: 'FeatureServer', url, name, spatial: true, visible: false }]).then(() => {
this.positioning(id, name);
});
});
},
methods: {
positioning (id, name) {
let { Layer } = apiWrapper.wrapper;
Layer.attrGraph({
grap: id, name, where: { id }, sym: { color: [0, 139, 0, 100], outline: { color: [0, 139, 0, 150], width: 2 } },
callback: d => {
d.length ? this.analysis(id) : this.$message.error(' 暂无图形');
}
});
},
analysis (id) {
let { Views, Action } = apiWrapper.wrapper;
Views.grapsExtent(id);
setTimeout(() => { Action.gighlight({ name: id, about: 1000 }) }, 1500);
axios.get(window._config.services.management + '/bdcqjdc/rest/zd/qjZdjbxx/getQjZdjbxxDetailById', { params: { id } }).then(d => {
if (d.status !== 200) return;
let { result = {} } = d.data, data = [];
Object.keys(result).forEach(e => { result[e] && data.push({ key: e, value: result[e] }) });
this.curr.splice(0, ...data);
document.querySelector('.box-card').style.display = 'block';
});
}
}
}
</script>
<style scoped lang='scss'>
</style>
\ No newline at end of file
<style scoped lang="scss">
.gis-container {
display: -webkit-flex;
display: flex;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
width: 100%;
height: 100%;
}
.flex-transverse {
display: -webkit-flex;
display: flex;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
width: 100%;
height: 100%;
}
.flex-single {
width: 100%;
height: 100%;
background-color: white;
}
.box-card {
background-color: rgba(255, 255, 255, 0.5);
border-radius: 8px;
top: 30px;
right: 30px;
position: absolute;
width: 16%;
padding: 10px;
display: none;
}
.el-row {
margin-bottom: 20px;
}
.el-col {
border-radius: 4px;
}
.grid-content {
border-radius: 4px;
min-height: 20px;
font-family: "Helvetica Neue";
}
.row-bg {
padding: 10px 0;
background-color: #f9fafc;
}
</style>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-17 14:20:17
* @LastEditTime: 2023-08-09 14:41:17
*/
import { getPrintTemplateByCode } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
......@@ -36,7 +36,7 @@ export default {
batchButtonName: '',
// 受理申请信息
slsq: {},
dqhj:""
dqhj: ""
}
},
mounted () {
......@@ -58,7 +58,7 @@ export default {
stepExpandInfo(formdata).then((res) => {
if (res.code === 200) {
this.leftButtonList = res.result.button;
if (res.result.properties&&res.result.properties.length) {
if (res.result.properties && res.result.properties.length) {
this.dqhj = res.result.properties[0].value
}
this.rightButtonList = res.result.operation;
......@@ -160,8 +160,8 @@ export default {
if (res.code === 200) {
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: res.result[0],
onlyShow:false,
unitData:window.unitData
onlyShow: false,
unitData: window.unitData
}, '90%', true)
} else {
this.$message.error(res.message)
......@@ -173,7 +173,7 @@ export default {
break;
// 图形定位
case "B-TXDW":
this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', {}, '60%', true)
this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '80%', true)
break;
case "back": //退回按钮
this.$popupDialog("退回", "workflow/components/th", {
......@@ -273,15 +273,15 @@ export default {
});
});
},
//发送下一个环节
//发送下一个环节
/**
* @description: 发送下一个环节
* @param {*} obj
* @author: renchao
*/
sendToNext (obj) {
sendToNext (obj) {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:obj,
obj: obj,
bsmSlsq: this.bsmSlsq,
tabList: this.tabList
}, '800px', true)
......@@ -292,9 +292,9 @@ export default {
* @param {*} obj
* @author: renchao
*/
sendToEnd (obj) {
sendToEnd (obj) {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:"",
obj: "",
bsmSlsq: this.bsmSlsq,
tabList: this.tabList
}, '800px', true)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-25 16:15:39
* @LastEditTime: 2023-08-09 14:54:20
-->
<template>
<div class="container">
......@@ -35,7 +35,7 @@
</div>
<!-- 表单内容区域 -->
<div class="rightContainer">
<div class="count">
<div class="count">
当前流程所在环节:
<span>{{ this.zbhj }}</span>
</div>
......@@ -64,7 +64,7 @@
<script>
import WorkFlow from "./mixin/index"
import publicFlow from "./mixin/public.js"
import { getStepFormInfo, unClaimTask } from "@/api/workFlow.js"
import { getStepFormInfo, unClaimTask, getZdInfo } from "@/api/workFlow.js"
import { getForm } from "./flowform"
import NoticeBar from "@/components/NoticeBar/index"
// import ProcessViewer from "./components/processViewer.vue"
......@@ -108,7 +108,9 @@
clxxTab: {},
ableOperation: false,
//页面监听时间
_beforeUnload_time: ""
_beforeUnload_time: "",
// 宗地id
bsmZd: ''
}
},
mounted () {
......@@ -131,6 +133,13 @@
*/
getCurrentSelectProps (val) {
this.currentSelectProps = val
getZdInfo(val.bdcdyid).then(res => {
this.bsmZd = res?.result[0]?.bsmZd
})
// getZdInfo(val.bdcdyid).then(res => {
// this.bsmZd = res?.result[0]?.bsmZd
// })
},
/**
* @description: beforeunloadHandler
......@@ -204,36 +213,36 @@
this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
},
//选项卡切换事件
/**
* @description: 右侧表单选项卡事件
* @param {*} handleClick
* @author: renchao
*/
handleClick(a) {
let p = Object.keys(this.tabList[0]).filter(
(item) => item == "ableOperation"
);
if (p) {
this.ableOperation = this.tabList[a.index].ableOperation;
}
},
//选项卡切换事件
/**
* @description: 右侧表单选项卡事件
* @param {*} handleClick
* @author: renchao
*/
handleClick (a) {
let p = Object.keys(this.tabList[0]).filter(
(item) => item == "ableOperation"
);
if (p) {
this.ableOperation = this.tabList[a.index].ableOperation;
}
},
}
}
</script>
<style scoped lang="scss">
.rightContainer {
position: relative;
}
.count {
font-size: 14px;
position: absolute;
right: 25px;
top: 12px;
height: 30px;
span {
font-weight: 600;
color: #3498db;
.rightContainer {
position: relative;
}
.count {
font-size: 14px;
position: absolute;
right: 25px;
top: 12px;
height: 30px;
span {
font-weight: 600;
color: #3498db;
}
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-04-13 10:32:28
* @LastEditTime: 2023-08-09 10:36:14
-->
<template>
<div class="from-clues">
......@@ -21,7 +21,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-col :span="14" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
</el-form-item>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-04-18 14:28:42
* @LastEditTime: 2023-08-09 10:36:31
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -30,7 +30,7 @@ class data extends filter {
{
prop: "ywlx",
label: "业务类型",
width: '90'
width: '100'
},
{
prop: "cwdm",
......
......@@ -227,7 +227,7 @@
<qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!ableOperation"
:gyfs="ruleForm.slsq.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
......
......@@ -179,8 +179,8 @@
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
v-for="(item,index) in czrOptions"
:key="index"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
......
......@@ -222,16 +222,16 @@ class data extends filter {
)
}
},
{
prop: "zcs",
label: "总层数",
width: '70',
},
{
prop: "zts",
label: "总套数",
width: '70',
},
// {
// prop: "zcs",
// label: "总层数",
// width: '70',
// },
// {
// prop: "zts",
// label: "总套数",
// width: '70',
// },
{
prop: "zl",
label: "多幢坐落",
......