Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4e7c814f by 宋力
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 19398ba5 c075fdae
Inline Side-by-side
Showing 40 changed files with 714 additions and 202 deletions
VUE_APP_api = 'https://192.168.2.111:8006'
VUE_APP_api1 = 'https://127.0.0.1:8006'
VUE_APP_api4 = 'http://192.168.2.111:18080'
VUE_APP_api2 = 'https://192.168.2.145:8006'
VUE_APP_api3 = 'https://192.168.2.119:8006'
VUE_APP_api4 = 'http://192.168.2.146:8006'
VUE_APP_api5 = 'https://192.168.2.142:8006'
VUE_APP_name = '开发环境'
NODE_ENV="development"
......
import request from "@/plugin/axios";
/**
* 新增个性化配置信息
*/
export function insertGxh(data) {
return request({
url: '/gxh/insertGxh',
method: 'post',
data: data,
})
}
/**
* 修改个性化配置信息
*/
export function updateGxh(data) {
return request({
url: '/gxh/updateGxh',
method: 'post',
data: data,
})
}
/**
* 查询个性化配置信息
*/
export function getGxhList(data) {
return request({
url: '/gxh/getGxhList',
method: 'get',
params: {
title: data.title,
code: data.code,
pageNo: data.pageNo,
pageSize: data.pageSize,
}
})
}
// export function getGxhList(data) {
// return request({
// url: '/gxh/getGxhList',
// method: 'post',
// params: data
// })
// }
\ No newline at end of file
......@@ -10,4 +10,15 @@ export function getQjLqDetailById(data) {
id: data
}
})
}
\ No newline at end of file
}
/**
* 保存林权信息
*/
export function updateQjLq(data) {
return request({
url: '/system/qjLq/updateQjLq',
method: 'put',
data: data
})
}
......
......@@ -44,6 +44,19 @@ export function getQlrInfoByGlbsm(data) {
},
})
}
/**
* 根据glbsm和type查询qlr信息
*/
export function getQlrByGlbsmAndType(data) {
return request({
url: '/system/Qlr/getQlrByGlbsmAndType',
method: 'get',
params: {
glbsm:data.bsm,
type:data.type
},
})
}
/**
* 更新权利人共有公用情况
......
[{
"label":"专题树",
"id":"1",
"type":"layerGroup",
"type":"layerGroup",
"alpha":100,
"children":[
{
"label":"西安市",
"label":"西安市阎良区",
"id":"1-1",
"type":"layerGroup",
"alpha":100,
"children":[{
"label":"行政区划",
"id":"1-1-1",
"name": "testLayer",
"type":"layerGroup",
"alpha":100,
"children":[
{
"label":"行政区界限",
"id":"1-1-1-1",
"type":"layer",
"alpha": 100,
"name": "testLayer",
"layerId":0,
"type":"layer",
"layerId":20,
"children":null
},
{
"label":"行政区",
"id":"1-1-1-2",
"type":"layer",
"alpha": 100,
"name": "testLayer",
"layerId":1,
"layerId":19,
"children":null
}
]
......@@ -38,25 +34,21 @@
{
"label":"地籍分区",
"id":"1-1-2",
"name": "djfqLayer",
"type":"layerGroup",
"alpha":100,
"children":[
{
"label":"地籍区",
"id":"1-1-2-1",
"type":"layer",
"alpha": 100,
"name": "djfqLayer",
"layerId":0,
"layerId":13,
"children":null
},
{
"label":"地籍子区",
"id":"1-1-2-2",
"type":"layer",
"alpha": 100,
"name": "djfqLayer",
"layerId":1,
"layerId":14,
"children":null
}
]
......@@ -64,96 +56,77 @@
{
"label":"不动产单元",
"id":"1-1-3",
"name": "bdcdyLayer",
"type":"layerGroup",
"alpha":100,
"children":[
{
"label":"线状定着物",
"id":"1-1-3-1",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":0,
"layerId":7,
"children":null
},
{
"label":"宗海",
"id":"1-1-3-2",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":1,
"layerId":9,
"children":null
},
{
"label":"宗地",
"id":"1-1-3-3",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":2,
"layerId":8,
"children":null
},
{
"label":"林权",
"id":"1-1-3-4",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":3,
"layerId":5,
"children":null
},
{
"label":"构筑物",
"id":"1-1-3-5",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":4,
"layerId":2,
"children":null
},
{
"label":"面状定着物",
"id":"1-1-3-6",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":5,
"layerId":6,
"children":null
},
{
"label":"界址线",
"id":"1-1-3-7",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":6,
"layerId":4,
"children":null
},
{
"label":"点状定着物",
"id":"1-1-3-8",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":7,
"layerId":1,
"children":null
},
{
"label":"自然幢",
"id":"1-1-3-9",
"type":"layer",
"alpha": 100,
"name": "bdcdyLayer",
"layerId":8,
"layerId":10,
"children":null
},
{
"label":"界址点",
"id":"1-1-3-10",
"type":"layer",
"name": "bdcdyLayer",
"layerId":9,
"layerId":4,
"children":null
}
]
......@@ -161,31 +134,28 @@
{
"label":"自然地理",
"id":"1-1-4",
"name": "zrdlLayer",
"type":"layerGroup",
"alpha":100,
"children":[
{
"label":"辅助面",
"id":"1-1-4-1",
"type":"layer",
"name": "zrdlLayer",
"layerId":0,
"layerId":15,
"children":null
},
{
"label":"植被",
"id":"1-1-4-2",
"type":"layer",
"name": "zrdlLayer",
"layerId":1,
"layerId":17,
"children":null
},
{
"label":"水系",
"id":"1-1-4-3",
"type":"layer",
"name": "zrdlLayer",
"layerId":2,
"layerId":16,
"children":null
}
]
......
[{
"layerName": "ZDJBXX",
"layerName": "ZDJBXX",
"layerLabel": "宗地",
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/BDCDY/MapServer",
"id":2,
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id":8,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
......@@ -39,8 +39,8 @@
{
"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": 9,
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id": 10,
"fieldAliases": {
"YSDM": "要素代码",
"BDCDYH": "不动产单元号",
......@@ -72,8 +72,8 @@
{
"layerName": "DJQ",
"layerLabel": "地籍区",
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/DJFQ/MapServer",
"id": 1,
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id": 13,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
......@@ -84,8 +84,8 @@
{
"layerName": "DJZQ",
"layerLabel": "地籍子区",
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/DJFQ/MapServer",
"id": 0,
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id": 14,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
......@@ -96,8 +96,8 @@
{
"layerName": "XJZQ",
"layerLabel": "行政区",
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/XZQH/MapServer",
"id": 1,
"layerUrl": "https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id": 19,
"fieldAliases": {
"BSM": "标识码",
"YSDM": "要素代码",
......@@ -109,13 +109,13 @@
{
"layerName":"JZD",
"layerLabel":"界址点",
"layerUrl":"https://192.168.2.146:6443/arcgis/rest/services/qj/BDCDY/MapServer",
"id":9
"layerUrl":"https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id":3
},
{
"layerName":"JZX",
"layerLabel":"界址线",
"layerUrl":"https://192.168.2.146:6443/arcgis/rest/services/qj/BDCDY/MapServer",
"id":6
"layerUrl":"https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
"id":4
}
]
\ No newline at end of file
......
......@@ -12,7 +12,7 @@
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
宗地代码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
......
......@@ -176,10 +176,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......@@ -274,10 +274,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -11,10 +11,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -2,9 +2,14 @@
<div class="temp">
<table class="tempTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="2"><span class="table-title">权利人信息</span></td>
<td colspan="2">共有方式</td>
<td colspan="8">
<template v-if="lq == ''">
<td colspan="2"><span class="table-title">权利人信息</span></td>
<td colspan="2">共有方式</td>
</template>
<template v-else>
<td colspan="2">共有方式</td>
</template>
<td :colspan="lq == '' ? 8 : 10">
<el-row>
<el-col :span="14" class="fl" style="line-height:32px">
<el-radio-group v-model="gyfs" @change="updateGyfs">
......@@ -311,7 +316,7 @@
<script>
import {getDdicByMC} from "@api/common";
import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk} from "@api/qlr";
import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk,getQlrByGlbsmAndType} from "@api/qlr";
export default {
props: {
......@@ -338,7 +343,13 @@
lq:{
type: String,
default: "",
}
},
// lqData:{
// type: Array,
// default: () => {
// return [];
// },
// }
},
data() {
return {
......@@ -649,18 +660,37 @@
}
},
getQlrInfo(bsm){
getQlrInfoByGlbsm(bsm).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
if(this.tableData.length===0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}else {
this.gyfs=res.result[0].gyfsbsm;
}
if(this.lq == ""){
getQlrInfoByGlbsm(bsm).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
if(this.tableData.length===0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}else {
this.gyfs=res.result[0].gyfsbsm;
}
}
}
})
}else{
let params = {
bsm:bsm,
type:this.lq
}
})
getQlrByGlbsmAndType(params).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
if(this.tableData.length===0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}else {
this.gyfs=res.result[0].gyfsbsm;
}
}
}
})
}
}
},
created(){
......
......@@ -7,10 +7,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
@change="query"
></el-input>
</el-form-item>
......
......@@ -385,7 +385,7 @@ export default {
}
}
}
.iszrz{
.iszrz,.isgzw{
left: 0px!important;
text-indent: 96px;
}
......
......@@ -13,18 +13,11 @@
class="row-flex-start basic_banner"
:class="{
active_color: item.expand && item.children.length > 0,
lpb_basic_banner:islpb
}"
@click="itemClick(item)"
>
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">
<i v-if="!islpb" class="iconfont iconguoyou"></i>
<i v-if="islpb && !item.expand" class="iconfont iconxiala"></i>
<i v-if="islpb && item.expand" class="iconfont iconxialazhankai"></i>
{{ item.mc }}
</div>
<div
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div
class="reTree_icon"
:style="{
height: 10 + 'px',
......@@ -32,8 +25,10 @@
}"
:class="{
reTree_default_icon: item.children.length === 0,
reTree_collapse_icon: item.expand && item.children.length > 0,
reTree_expand_icon: !item.expand && item.children.length > 0,
reTree_collapse_icon: !islpb && item.expand && item.children.length > 0,
reTree_expand_icon: !islpb && !item.expand && item.children.length > 0,
lpbTree_collapse_icon: islpb && item.expand && item.children.length > 0,
lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
}"
></div>
</div>
......@@ -123,7 +118,7 @@
<el-dialog v-dialogDrag :close-on-click-modal="false" title="导入图形" :modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog">
<import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
</el-dialog>
<!-- 添加定着物弹框 -->
<!-- 添加定着物弹框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :modal="false" :visible.sync="dialogVisible" width="48%">
<Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create>
</el-dialog>
......@@ -572,7 +567,6 @@ export default {
this.$message.warning("不是临时数据，不能导入图形!!!");
return;
}
console.log(this.zdData);
var type = this.zdData.type;
if(type == "zd"){
BSM = this.zdData.zdbsm;
......@@ -580,7 +574,7 @@ export default {
BSM = this.zdData.bsm;
}
//当确定导入图形是 跳转到图形界面
this.queryGeoByBsm(BSM,type,function (features){
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0){
if(features[0].geometry && features[0].geometry.rings.length > 0){
self.$confirm('该条数据有地块信息，是否继续导入?', '提示', {
......
......@@ -381,7 +381,7 @@ export default {
if(valid){
//选择处理方式
var value = self.dealForm.method;
self.currntDealGraphic.attributes = {};
self.currntDealGraphic.attributes = {};
switch (value) {
case '1':self.currntDealGraphic.attributes.BGZT = 1;self.saveZd(self.currntDealGraphic);break;
case "2":self.getDifference(self.currntDealGraphic,self.overResults,self.delOverGeo);break;
......@@ -458,9 +458,8 @@ export default {
saveZd(graphic){
var self = this;
var points = null,lines = null,
layer = self.getLayerByName("ZDJBXX");
// var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
var featureUrl = layer.layerUrl;
layer = self.getLayerByName("ZDJBXX");
var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
featureUrl += "/"+layer.id;
if(self.geoInfo){
//替换 生成图像 高亮
......@@ -504,8 +503,8 @@ export default {
graphic.attributes = attributes;
self.addGraphic(featureUrl,graphic,function (res) {
var addRresult = res.addFeatureResults[0];
// if(addRresult.objectId){
// var OBJECTID = addRresult.objectId;
if(addRresult.objectId){
var OBJECTID = addRresult.objectId;
if(graphic.geometry) {
points = self.craetJZPoint(graphic);
self.savejzd(points)
......@@ -515,9 +514,9 @@ export default {
self.saveJzx(lines);
});
}
self.$message.success("保存成功!!!");
self.$message.success("保存成功!!!");
self.goMap();
// }
}
});
}
},
......
......@@ -198,7 +198,7 @@ export default {
if(!results || results.length == 0){
callBacFunction(true,"不在行政区内，请检查空间位置信息!!!");
}
for(var i = 0;i < results.length;i++){
for(var i = 0;i < results.length;i++){
var feature = results[i].feature;
var flag = geometryEngine.intersects(polygon,feature.geometry);
var withinFlag = geometryEngine.within(polygon,feature.geometry);
......
......@@ -5,7 +5,7 @@
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
宗地代码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
......
......@@ -14,10 +14,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -4,10 +4,11 @@
<el-row>
<el-col :span="18">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
maxlength="19"
@change="query"
></el-input>
</el-form-item>
......@@ -76,11 +77,10 @@
<el-checkbox label="zd" name="type">宗地</el-checkbox>
<el-checkbox label="dz" name="type">多幢</el-checkbox>
<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="gzw" name="type" v-show="type !== 'add'">构筑物</el-checkbox>
<el-checkbox label="lq" name="type" v-show="type !== 'add'">林权</el-checkbox>
<el-checkbox label="h" name="type" v-show="type !== 'add'">户</el-checkbox>
<!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="lq" name="type">林权</el-checkbox>
<el-checkbox label="zh" name="type">宗海</el-checkbox> -->
<!-- <el-checkbox label="zh" name="type">宗海</el-checkbox> -->
</el-checkbox-group>
</el-form-item>
</el-form>
......
......@@ -12,6 +12,7 @@
action="/api/tx/excelGeo/import"
:data="sxdrData"
:on-success="uploadSuccess"
:before-upload="uploadProgress"
:show-file-list="false"
multiple
>
......@@ -92,17 +93,21 @@
elemIF.style.display = "none";
document.body.appendChild(elemIF)
},
uploadProgress(){
vm.loadingShow('正在导入中')
},
uploadSuccess(res, file, fileList) {
this.errorData = [];
vm.loadingHide();
if (res.success) {
this.$message.success("上传成功")
this.$message.success("导入成功")
this.loading();
this.close()
} else {
if (res.result == null) {
this.$message.error(res.message)
} else {
this.$message.error("上传失败")
this.$message.error("导入失败")
this.errorData = res.result;
}
}
......
......@@ -11,10 +11,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -10,16 +10,16 @@ export default {
"esri/tasks/support/IdentifyParameters"
]).then(([
IdentifyTask,
IdentifyParameters
IdentifyParameters
]) => {
var identifyTask = new IdentifyTask({
url:url
}),
identifyParameters = new IdentifyParameters();
identifyParameters.geometry = geometry;
identifyParameters.geometry = geometry;
if(layerIds){
identifyParameters.layerIds = layerIds;
}
}
identifyParameters.layerOption = layerOption ? layerOption : "all";
identifyParameters.tolerance = tolerance ? tolerance : 3;
identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent;
......
......@@ -22,8 +22,6 @@ export default {
var featureLayer = new FeatureLayer({
url:url
})
console.log(featureLayer);
console.log(graphic);
var saveGraphics = [];
if(!Array.isArray(graphic)){
graphic = [graphic];
......@@ -45,10 +43,13 @@ export default {
});
saveGraphics.push(saveGraphic);
}
console.log(saveGraphic)
featureLayer.applyEdits({
addFeatures:saveGraphics
}).then(function (res){
addFeatures:saveGraphics,
// updateFeatures
}).then(function (res){
if(callBackFunction && typeof callBackFunction == 'function'){
console.log(res);
callBackFunction(res);
}
})
......@@ -149,6 +150,7 @@ export default {
featureLayer.applyEdits({
deleteFeatures:delGraphics
}).then(function (res){
console.log(res);
if(callBackFunction && typeof callBackFunction == 'function'){
callBackFunction(res);
}
......
import {loadCss,loadScript} from "esri-loader"
export function init(){
loadScript({ url:"http://192.168.2.146/arcgis_js_api/library/4.17/init.js"});
loadCss("http://192.168.2.146/arcgis_js_api/library/esri/css/main.css");
export function init(){
// loadScript({url:"http://192.168.2.38/4.16/init.js"});
// loadCss("http://192.168.2.38/4.16/esri/themes/light/main.css");
loadScript({ url:"http://192.168.2.146/arcgis_js_api/library/4.17/init.js"});
loadCss("http://192.168.2.146/arcgis_js_api/library/esri/css/main.css");
}
init();
\ No newline at end of file
......
......@@ -117,6 +117,12 @@ const constantRoutes = [
code: "1-3",
component: () => import("@/views/lq/index"),
},
{
path: "/zykfzddgxhgl",
name: "个性化管理",
code: "1-4",
component: () => import("@/views/manage/gxhgl/index"),
},
],
},
];
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -196,6 +196,8 @@
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
<div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
......@@ -204,6 +206,9 @@
<el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shdz" v-if="workFlowState">审核</el-button>
</div>
<div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
<el-button type="primary" @click="onSubmitWithoutWorkflow" :disabled="disabled" >提交</el-button>
</div>
</div>
</template>
......@@ -606,6 +611,22 @@
// }
// })
},
onSubmitWithoutWorkflow(){
console.log(this.form)
let data={
glbsm:this.bsm,
status:1,
type:"dz"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
this.getDzDetailByBsm(this.$route.query.bsm)
this.getTreeByBsm(this.$route.query.bsm,'dz','0,1,2')
}
})
},
getZddm(zdbsm){
getQjZdjbxxDetailById(zdbsm).then((res)=>{
if(res.code===200){
......
......@@ -22,6 +22,7 @@
:qszt="formData.qszt"
type="lq"
lq="1"
v-if="qlrShow"
></Qlr>
</td>
</tr>
......@@ -34,6 +35,7 @@
:qszt="formData.qszt"
type="lx"
lq="2"
v-if="qlrShow"
></Qlr>
</td>
</tr>
......@@ -85,7 +87,7 @@
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.djh"
v-model="formData.zlnd"
/>
</td>
......@@ -154,7 +156,7 @@
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.mj"
v-model="formData.syqmj "
/>
</td>
<td colspan="2" class="tdright">起源</td>
......@@ -191,11 +193,11 @@
<td colspan="2" class="tdright">林种</td>
<td colspan="10">
<el-radio-group class="fl" v-model="formData.lz">
<el-radio :label="1">防护林</el-radio>
<el-radio :label="2">用材林</el-radio>
<el-radio :label="3">经济林</el-radio>
<el-radio :label="4">薪炭林</el-radio>
<el-radio :label="5">特种用途体</el-radio>
<el-radio label="1">防护林</el-radio>
<el-radio label="2">用材林</el-radio>
<el-radio label="3">经济林</el-radio>
<el-radio label="4">薪炭林</el-radio>
<el-radio label="5">特种用途体</el-radio>
</el-radio-group>
</td>
</tr>
......@@ -220,7 +222,7 @@
@blur="inputBlur($event, false)"
maxlength="3"
onkeyup="value=value.replace(/[^\d]/g,'')"
v-model="formData.syqx"
v-model="formData.ldsyqx"
class="formInput"
/>
</td>
......@@ -274,14 +276,14 @@
</table>
<div class="header-button" :style="{ width: mainBoxWidth + 'px' }">
<el-button type="primary">保存</el-button>
<el-button type="primary" @click="updateQjLq">保存</el-button>
</div>
</div>
</template>
<script>
import Qlr from "@components/formMenu/qlr";
import { getQjLqDetailById } from "@api/lq"
import { getQjLqDetailById,updateQjLq } from "@api/lq"
export default {
name: "",
components: {
......@@ -293,19 +295,21 @@ export default {
disabled: false,
formData: {
mjdw: "",
zddm: "",
zddm: "",
zlnd:"",
dzwlx:"1",
bdcdyh: "",
zl: "",
xdm: "",
lb: "",
xb: "",
mj: "",
syqmj : "",
qy: "",
zs: "",
zysz: "",
lz: "",
ldsyqssj: "",
syqx: "",
ldsyqx: "",
ldsyjssj: "",
gyqk: "",
shyj: "",
......@@ -324,6 +328,7 @@ export default {
},
],
mainBoxWidth: 0,
qlrShow:false,
};
},
created() {},
......@@ -339,10 +344,26 @@ export default {
getLqData(bsm) {
getQjLqDetailById(bsm).then((res) => {
if (res.success) {
console.log(res, "林权信息");
console.log(res, "林权信息");
this.formData = res.result;
this.formData.dzwlx = "1";
this.qlrShow = true;
}
});
},
},
//生成宗地代码
generatorCode(){
},
//保存林权信息
updateQjLq(){
updateQjLq(this.formData).then((res) => {
if (res.success) {
console.log(res, "保存成功");
this.$message.success("保存成功")
}
});
}
},
computed: {},
watch: {},
......
<template>
<!-- <el-tabs v-model="activeName"> -->
<!-- <el-tab-pane label="个性化管理" name="zhcx"> -->
<div class="main">
<!-- <p class="tips">查询条件</p> -->
<el-form
:inline="true"
ref="ruleForm"
class="demo-form-inline"
>
<el-form-item label="个性化标题" class="w100" prop="syqlx">
<el-input
placeholder="输入个性化标题"
v-model="queryData.title"
@change="getData"
></el-input>
</el-form-item>
<el-form-item label="个性化代码" class="w100" prop="zdtzm">
<el-input
placeholder="输入个性化代码"
v-model="queryData.code"
@change="getData"
></el-input>
</el-form-item>
<el-form-item class="ml20">
<el-button type="primary" @click="getData" icon="el-icon-search"
>查询</el-button
>
<el-button
type="warning"
style="margin-left:60px"
@click="reset"
icon="el-icon-refresh"
>重置</el-button
>
</el-form-item>
<el-form-item style="margin-left:-20px">
<el-button
type="primary"
@click="gxhVisible = true"
icon="el-icon-plus"
>新增</el-button
>
<el-button
type="success"
style="margin-left:60px"
@click="save"
icon="el-icon-folder"
>保存</el-button
>
</el-form-item>
</el-form>
<!-- <p class="tips">查询列表</p> -->
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
:height="tableHeight"
>
<el-table-column
type="index"
width="80"
align="center"
label="序号"
>
</el-table-column>
<el-table-column prop="title" align="center" label="个性化标题">
</el-table-column>
<el-table-column prop="code" align="center" label="个性化代码">
</el-table-column>
<el-table-column prop="bz" align="center" label="备注">
</el-table-column>
<el-table-column prop="open" align="center" label="是否开启">
<template slot-scope="scope">
<el-switch
v-model="scope.row.open"
active-value="1"
inactive-value="0"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row)"
/>
</template>
</el-table-column>
<!-- <el-table-column width="80px" align="center" label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="删除" placement="top">
<i class="iconfont iconshanchu1" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
</template>
</el-table-column> -->
</el-table>
<div class="pagination">
<el-pagination
background
layout="prev, pager, next,total"
:total="total"
:current-page="pageNo"
:page-size="pageSize"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
<el-dialog
v-dialogDrag
:close-on-click-modal="false"
title="新增个性化配置"
:visible.sync="gxhVisible"
width="30%"
>
<el-form ref="form" class="addForm" :model="form" label-width="100px">
<el-form-item label="个性化标题">
<el-input v-model="form.title"></el-input>
</el-form-item>
<el-form-item label="个性化代码">
<el-input v-model="form.code"></el-input>
</el-form-item>
<el-form-item label="是否开启">
<el-switch v-model="form.open" active-value="1" inactive-value="0" ></el-switch>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.bz"></el-input>
</el-form-item>
</el-form>
<div class="btnGroup">
<el-button type="primary" @click="addGxhData">确定</el-button>
<el-button type="primary" @click="gxhVisible = false"
>取消</el-button>
</div>
</el-dialog>
</div>
</div>
<!-- </el-tab-pane> -->
<!-- </el-tabs> -->
</template>
<script>
import { getGxhList,updateGxh,insertGxh } from "@api/gxhgl";
export default {
name: "",
inject: ["getRightTree", "getTreeByBsm"],
components: {},
props: {},
data() {
return {
activeName: "zhcx",
type: "all",
total: 0,
pageNo: 1,
pageSize: 15,
tableData: [
{
title: "宗地坐落必填",
code: "ZDZLBT",
bz: "宗地坐落必填",
open: true,
},
{
title: "宗地附件材料显示",
code: "ZDFJCLXS",
bz: "宗地附件材料显示",
open: false,
},
],
tableHeight: 0,
queryData: {
title: "",
code: "",
},
gxhVisible: false,
//新增数据
form:{
title: "",
code: "",
open:false,
bz:''
},
//已修改的数据
hasChanged:[],
};
},
created() {},
mounted() {
this.getData(this.queryData);
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight || document.body.clientHeight) -
277;
});
},
methods: {
//获取数据
getData() {
this.queryData.pageSize = this.pageSize;
this.queryData.pageNo = this.pageNo;
getGxhList(this.queryData).then((res) => {
this.tableData = res.result.records
this.total = res.result.total
// 查询后重置修改项
this.hasChanged = [];
})
.catch((error) => {});
//调用查询接口 给tableData赋值 TODO
},
//新增个性化配置
addGxhData() {
//调用接口 新增个性化配置数据 传入this.form TODO
insertGxh(this.form).then((res) => {
if(res.code == 200){
this.$message.success("添加成功")
this.gxhVisible = false;
this.getData();
}
})
.catch((error) => {});
},
//重置查询条件
reset() {
this.queryData = {
title: "",
code: "",
pageSize:"15",
pageNo:"1",
}
},
//翻页
handleCurrentChange(val) {
this.pageNo = val;
this.getData();
},
// 是否开启
changeEnabled(data) {
if(this.hasChanged.some( i => i.bsm == data.bsm)){
this.hasChanged.filter(i => i.bsm == data.bsm)
}else{
this.hasChanged.push(data);
}
},
//保存修改后的数据
save(){
if(this.hasChanged.length < 1){
this.$message.warning("暂无数据修改")
}else{
//接口调用 hasChanged为已修改数据项数组 TODO
updateGxh(this.hasChanged).then((res) => {
if(res.code == 200){
this.$message.success("修改成功")
}
this.getData();
})
.catch((error) => {});
}
},
//删除
handleClick(row){
//调用删除个性化数据接口，row是整条记录，需要id或者bsm自取 TODO
}
},
computed: {},
watch: {},
};
</script>
<style scoped lang="less">
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #f4f9ff;
.el-form {
width: 100%;
border: 1px solid #e6e6e6;
background-color: white;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 10px 15px;
/deep/.el-form-item {
margin-bottom: 0;
}
/deep/.el-form-item__label {
width: 100px;
}
/deep/ .el-form-item__content {
width: 300px;
.el-select {
width: 100%;
}
}
}
.addForm{
border: 0;
/deep/.el-form-item {
margin-bottom: 10px;
}
/deep/ .el-form-item__content {
width: auto;
}
}
.tips {
color: #9b9b9b;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin: 0 0 18px 0;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.hbjDialog {
/deep/ .el-dialog {
margin-top: 10vh !important;
}
}
.btnGroup {
margin: 20px auto 0;
width: 230px;
.el-button+.el-button{
margin-left: 90px;
}
}
.ml20 {
margin-left: 20px;
}
.iconfont{
cursor: pointer;
}
}
</style>
......@@ -3,6 +3,7 @@
<el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
<el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
<el-tab-pane label="号段管理" name="hdgl"><hdgl></hdgl></el-tab-pane>
<el-tab-pane label="个性化管理" name="gxhgl"><gxhgl></gxhgl></el-tab-pane>
</el-tabs>
</template>
......@@ -10,10 +11,11 @@
import log from "./log"
import dictionary from "./dictionary"
import hdgl from "./hdgl";
import gxhgl from "./gxhgl";
export default {
name: "index",
components: {
log,dictionary,hdgl
log,dictionary,hdgl,gxhgl
},
data() {
return {
......
......@@ -6,10 +6,10 @@
<el-row>
<el-col :span="24" style="margin-left: -10px;">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -3,10 +3,10 @@
<el-row v-show="isSearch">
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -157,6 +157,11 @@
this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
path = "/gzw";
break;
case "lq":
this.$store.state.gzwbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,"lq",'0,1,2');
path = "/lq";
break;
default:
break;
}
......
......@@ -175,13 +175,9 @@ export default {
sideTools
},
data(){
return{
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: 'https://192.168.2.146:6443/arcgis/rest/services/qj/XZQH/MapServer', // 行政区划
bdcdyUrl: 'https://192.168.2.146:6443/arcgis/rest/services/qj/BDCDY/MapServer', // 不动产单元
djfqUrl: 'https://192.168.2.146:6443/arcgis/rest/services/qj/DJFQ/MapServer', // 地籍分区
zrdlUrl: 'https://192.168.2.146:6443/arcgis/rest/services/qj/JCDL/MapServer', // 自然地理
layerUrl:"https://192.168.2.146:6443/arcgis/rest/services/qj/backupService/MapServer",
dialogVisible:false,
selectResLayerId:null,
features:[],
......@@ -223,37 +219,29 @@ export default {
view.ui.move(["zoom"], "bottom-right");
loadModules([
"esri/layers/MapImageLayer"
]).then(([ MapImageLayer ])=>{
]).then(([
MapImageLayer
])=>{
var mapImageLayer = new MapImageLayer({
url:self.layerUrl,
id:"testLayer",
spatialReference:view.spatialReference
});
view.map.add(mapImageLayer, 1);
let bdcdyLayer = new MapImageLayer({
url:self.bdcdyUrl,
id:"bdcdyLayer",
spatialReference:view.spatialReference
});
view.map.add(bdcdyLayer);
let djfqLayer = new MapImageLayer({
url:self.djfqUrl,
id:"djfqLayer",
visible: false,
spatialReference:view.spatialReference
});
view.map.add(djfqLayer);
let zrdlLayer = new MapImageLayer({
url:self.zrdlUrl,
id:"zrdlLayer",
visible: false,
spatialReference:view.spatialReference
spatialReference:view.spatialReference,
sublayers:[
{
id:19,
visible:true
},
{
id:8,
visible:true
},
{
id:10,
visible:true
}
]
});
view.map.add(zrdlLayer);
view.map.add(mapImageLayer,1);
var query = self.$route.query;
if(query && JSON.stringify(query) != "{}"){
self.addGeoByBsm(query.bsm,query.type,self.viewId);
......@@ -367,13 +355,12 @@ export default {
self.features = [];
self.resultLayers = [];
this.heighGraphic = null;
//清除查询图层
//清除查询图层
this.clearSearchLayer(this.viewId);
this.totalResults = data.length;
this.totalResults = data.length;
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;
})
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -7,6 +7,7 @@
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="uploadProgress"
:on-success="uploadSuccess"
:on-error="uploadError"
:show-file-list="false"
......@@ -143,7 +144,11 @@
uploadError(err, file, fileList) {
console.log("上传文件失败", err)
},
uploadProgress(){
vm.loadingShow('正在上传中')
},
uploadSuccess(res, file, fileList) {
this.$message.success("上传成功")
this.getFileList();
},
handleRemove(file, fileList) {
......
......@@ -366,6 +366,8 @@
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
......@@ -375,6 +377,9 @@
<el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button>
</div>
<div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
<el-button type="primary" @click="submitZDxxWithoutWorkflow" :disabled="disabled">提交</el-button>
</div>
</div>
</template>
......@@ -900,6 +905,22 @@
// }
// })
},
//提交宗地基本信息
submitZDxxWithoutWorkflow() {
let data = {
glbsm: this.$store.state.zdbsm,
status: 1,
type: "zd"
}
submit(data).then((res) => {
if (res.code === 200) {
this.$message.success("提交成功！")
this.getZdjbxxData(this.curZdbsm);
this.$store.state.oldZdbsm = '';
this.getRightTree(this.curZdbsm,'0,1,2')
}
})
},
getQlrxxData() {
// console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
// console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -330,6 +330,7 @@
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="uploadProgress"
:on-success="uploadSuccess"
:on-error="uploadError"
:show-file-list="false"
......@@ -564,7 +565,11 @@ export default {
Message.error("上传文件失败")
console.log("上传文件失败", err)
},
uploadProgress(){
vm.loadingShow('正在上传中')
},
uploadSuccess(res, file, fileList) {
vm.loadingHide();
Message.success("上传成功")
this.uploadVisible = false;
},
......@@ -817,6 +822,7 @@ export default {
item.style.border = '';
item.className = '';
});
this.bsms=bsms;
//清除选中户
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
......
......@@ -275,6 +275,8 @@
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
......@@ -285,6 +287,9 @@
<el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button>
</div>
<div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
<el-button type="primary" @click="onSubmitWithoutWorkflow" :disabled="disabled" >提交</el-button>
</div>
</div>
</template>
......@@ -659,6 +664,23 @@
// }
// })
},
onSubmitWithoutWorkflow(){
let data={
glbsm:this.bsm,
status:1,
type:"zrz"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
this.getZrzDetailByBsm(this.$route.query.bsm);
this.$store.state.oldZdbsm = '';
this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2')
}else{
this.$message.error(res.message);
}
})
},
shzrz(){
let data = {
bdcdyh:this.form.bdcdyh,
......
......@@ -33,7 +33,6 @@ module.exports = {
},
devtool: 'source-map'
// plugins: [
// new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例
// onEnd: {
// mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹
......@@ -51,7 +50,7 @@ module.exports = {
hotOnly: false,
proxy: {
"/api": {
target: process.env.VUE_APP_api,
target: process.env.VUE_APP_api2,
changeOrigin: true,
pathRewrite: {
"^/api": "/",
......