Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2cba134d by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents a3c7422a 510af90b
Expand all
Inline Side-by-side
Showing 24 changed files with 159 additions and 65 deletions
VUE_APP_api = 'https://192.168.2.111:8006'
VUE_APP_api1 = 'https://127.0.0.1:8006'
VUE_APP_api2 = 'https://192.168.2.9:8006'
VUE_APP_api3 = 'https://192.168.2.11: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"
VUE_APP_VERSION = 'psh'
......
......@@ -11,3 +11,14 @@ export function getQjLqDetailById(data) {
}
})
}
/**
* 保存林权信息
*/
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
},
})
}
/**
* 更新权利人共有公用情况
......
import request from '@/plugin/axios'
/**
* 查询土地承包经营权、农用地其他使用权调查表基本信息
*/
export function getQjTdcbjyqNydqtsyqdcDetailByZdbsm(data) {
return request({
url: '/zd/qjTdcbjyqNydqtsyqdc/getQjTdcbjyqNydqtsyqdcDetailByZdbsm',
method: 'get',
params: {
zdbsm: data,
}
})
}
/**
* 保存权籍_土地承包经营权、农用地其他使用权调查基本信息
*/
export function saveOrUpdateQjTdcbjyqNydqtsyqdc(data) {
return request({
url: '/zd/qjTdcbjyqNydqtsyqdc/saveOrUpdateQjTdcbjyqNydqtsyqdc',
method: 'post',
data: data,
})
}
......@@ -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>
<template v-if="lq == ''">
<td colspan="2"><span class="table-title">权利人信息</span></td>
<td colspan="2">共有方式</td>
<td colspan="8">
</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,6 +660,7 @@
}
},
getQlrInfo(bsm){
if(this.lq == ""){
getQlrInfoByGlbsm(bsm).then((res)=>{
if(res.code){
if(res.result!=null){
......@@ -661,6 +673,24 @@
}
}
})
}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>
......
......@@ -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>
......
......@@ -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="不动产权证号">
......
......@@ -55,6 +55,9 @@ const store = new Vuex.Store({
newZdbsm:'',
isWorkFlow:false, // 判断是否工作流数据
lcgzShow:false,//是否待办箱的数据，显示流程追踪
familyList:[], //家庭关系分类
syttlx:[],//水域滩涂类型
yzyfs:[] //养殖业方式
},
modules: {
user,
......
......@@ -321,6 +321,10 @@ export default {
s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions;
s.jgOptions = s.jgOptions.length == 0 ?await this.getDicData("房屋结构") : s.jgOptions;
s.gmjjhyflbsmList = s.gmjjhyflbsmList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.gmjjhyflbsmList;
s.familyList = s.familyList.length == 0 ?await this.getDicData("家庭成员") : s.familyList;
s.syttlx = s.syttlx.length == 0 ?await this.getDicData("水域滩涂类型") : s.syttlx;
s.yzyfs = s.yzyfs.length == 0 ?await this.getDicData("养殖业方式") : s.yzyfs;
},
async getDicData(name) {
return await getDdicByMC(name).then((res)=> {
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -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: {
......@@ -294,18 +296,20 @@ export default {
formData: {
mjdw: "",
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() {},
......@@ -340,9 +345,25 @@ export default {
getQjLqDetailById(bsm).then((res) => {
if (res.success) {
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: {},
......
......@@ -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="不动产权证号">
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -817,6 +817,7 @@ export default {
item.style.border = '';
item.className = '';
});
this.bsms=bsms;
//清除选中户
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
......
......@@ -5,7 +5,6 @@ let Timestamp = new Date().getTime();
function resolve(dir) {
return path.join(__dirname, dir)
}
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
module.exports = {
publicPath: './',
......@@ -20,7 +19,6 @@ module.exports = {
.set('@libs', resolve('src/libs'))
.set('@router', resolve('src/router'))
.set('@components', resolve('src/components'))
.set('@assets', resolve('src/assets'))
},
pluginOptions: {
'style-resources-loader': {
......@@ -33,17 +31,8 @@ module.exports = {
filename: `js/[name].${Timestamp}.js`,
chunkFilename: `js/[name].${Timestamp}.js`
},
plugins: [
// 去除console和debugger
// new UglifyJsPlugin({
// uglifyOptions: {
// compress: {
// drop_console: true,
// drop_debugger: true,
// },
// },
// parallel: true,
// }),
devtool: 'source-map'
// plugins: [
// new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例
// onEnd: {
// mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹
......@@ -52,20 +41,16 @@ module.exports = {
// ]
// }
// })
]
// ]
},
devServer: {
host: "192.168.2.61",
host: "0.0.0.0",
port: 8008,
port: 8006,
https: false,
hotOnly: false,
proxy: {
"/api": {
// target: 'https://192.168.2.119:8006', //泽平
// target: process.env.VUE_APP_api1, //本地
target: process.env.VUE_APP_api, //赵千
// target: process.env.VUE_APP_api4, //赵千
target: process.env.VUE_APP_api2,
changeOrigin: true,
pathRewrite: {
"^/api": "/",
......