Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
3a3b5f07 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 1365fc5f 68ffbd22
Inline Side-by-side
Showing 7 changed files with 96 additions and 129 deletions
......@@ -5,31 +5,14 @@
</template>
<script>
import { getDdicByMC } from "../src/api/common";
export default {
mounted() {
this.getDic();
window.addEventListener("unload", this.saveState);
},
methods: {
saveState() {
sessionStorage.setItem("state", JSON.stringify(this.$store.state));
},
//请求字典数据
getDic() {
let s = this.$store.state;
s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList;
s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList;
s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList;
s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList;
s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList;
s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList;
},
getDicData(name) {
getDdicByMC(name).then((res) => {
return res.result;
});
},
},
};
</script>
......
......@@ -61,7 +61,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.qlrlxbsm">
<el-option
v-for="item in qlrlxList"
v-for="item in $store.state.qlrlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -75,7 +75,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.zjzlbsm">
<el-option
v-for="item in zlzlList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -103,7 +103,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.gjbsm">
<el-option
v-for="item in gjList"
v-for="item in $store.state.gjList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -115,7 +115,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.hjszssbsm">
<el-option
v-for="item in ssList"
v-for="item in $store.state.ssList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -129,7 +129,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.xbbsm">
<el-option
v-for="item in xbList"
v-for="item in $store.state.xbList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -147,7 +147,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.sshy">
<el-option
v-for="item in sshyList"
v-for="item in $store.state.sshyList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -176,7 +176,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.fr.zjzlbsm">
<el-option
v-for="item in zjzlList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -222,7 +222,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="item.zjzlbsm">
<el-option
v-for="item in zjzlList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -251,7 +251,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.gyfsbsm">
<el-option
v-for="item in qlrlxList"
v-for="item in $store.state.qlrlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -356,12 +356,6 @@ export default {
zjh: "",
zjzlbsm: "",
},
qlrlxList: this.$store.state.qlrlxList,
zjzlList: this.$store.state.zjzlList,
xbList: this.$store.state.xbList,
gjList: this.$store.state.gjList,
ssList: this.$store.state.ssList,
sshyList: this.$store.state.sshyList,
};
},
methods: {
......
......@@ -211,14 +211,12 @@ export default {
getDicData(){
getDdicByMC("土地用途")
.then((res) => {
console.log(res.result);
this.pzytList = res.result;
this.sjytList = res.result;
})
.catch((error) => {});
getDdicByMC("土地等级")
.then((res) => {
console.log(res.result);
this.djList = res.result;
})
.catch((error) => {});
......
......@@ -5,20 +5,22 @@ import user from './modules/user'
import permission_routes from './modules/permission_routes'
import setTabs from './modules/setTabs'
Vue.use(Vuex)
Vue.use(Vuex);
const store = new Vuex.Store({
state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
zdbsm: '',
xzqList: [],
djqList: [],
djzqList: [],
qllxList:[],
zdtzmList:[],
qlsdfsList:[],
zjzlList:[],
gjList:[],
ssList:[],
qlrlxList:[],
xbList:[],
sshyList:[],
xzqList: [],
djqList: [],
djzqList: [],
//创建自然幢时需要用到的临时存储信息
zrzbsm: '',
xmmc: '',
......
......@@ -15,7 +15,7 @@
</div>
</el-aside>
<el-container>
<el-header height="100px">
<el-header>
<div class="header-top">
<div class="top-items" @click="toggleClick">
<i class="fa fa-outdent hamburger" v-show="!isActive"></i>
......@@ -32,35 +32,31 @@
<span>{{ item.name }}</span>
</div>
</div>
<div class="header-bottom">
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
</div>
<el-dialog
title="新建"
:visible.sync="dialogVisible"
width="40%"
>
</div> -->
<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
<Create @closeDialog="closeDialog"></Create>
</el-dialog>
</el-header>
<el-main>
<router-view/>
<router-view />
</el-main>
</el-container>
</el-container>
</div>
</template>
<script>
import util from "@/libs/util.js";
import Navigation from "../components/IvyElement/navigation";
import Create from "./panel/create/index";
import LineTree from "../components/lineTree/lineTree";
import {setTimeout} from "timers";
import {getTree} from "../api/common"
import util from "@/libs/util.js";
import Navigation from "../components/IvyElement/navigation";
import Create from "./panel/create/index";
import LineTree from "../components/lineTree/lineTree";
import { setTimeout } from "timers";
import { getTree,getDdicByMC } from "../api/common";
export default {
export default {
components: {
Navigation,
// Navigation,
LineTree,
Create,
},
......@@ -187,7 +183,7 @@
},
},
watch: {
"$route.path": function (newPath) {
"$route.path": function(newPath) {
//监测路由变化，高亮顶部导航
this.headTop.forEach((item, index) => {
item.select = false;
......@@ -195,13 +191,13 @@
item.select = true;
}
});
if(newPath == '/zd'){
this.getRightTree(this.$store.state.zdbsm)
if (newPath == "/zd") {
this.getRightTree(this.$store.state.zdbsm);
}
},
"$store.state.zdbsm": function (bsm) {
this.getRightTree(bsm)
}
"$store.state.zdbsm": function(bsm) {
this.getRightTree(bsm);
},
},
created() {
if (this.$route.meta) {
......@@ -223,7 +219,7 @@
icon: "fa fa-address-card-o",
path: "/add",
},
{name: "更正", icon: "fa fa-address-card-o", path: "/modify"},
{ name: "更正", icon: "fa fa-address-card-o", path: "/modify" },
{
name: "变更",
icon: "fa fa-address-card-o",
......@@ -243,14 +239,33 @@
// this.navSelect(indId);
// this.sortNavigation(this.navigationList, indId);
// }
this.getDic();
},
methods: {
//请求字典数据
async getDic() {
let s = this.$store.state;
s.zjzlList = s.zjzlList.length == 0 ?await this.getDicData("证件种类") : s.zjzlList;
s.gjList = s.gjList.length == 0 ?await this.getDicData("国家和地区") : s.gjList;
s.ssList = s.ssList.length == 0 ?await this.getDicData("省市") : s.ssList;
s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList;
s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList;
s.sshyList = s.sshyList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.sshyList;
s.qllxList = s.qllxList.length == 0 ?await this.getDicData("权利类型") : s.qllxList;
s.zdtzmList = s.zdtzmList.length == 0 ?await this.getDicData("宗地（宗海）特征码") : s.sshyList;
s.qlsdfsList = s.qlsdfsList.length == 0 ?await this.getDicData("权利设定方式") : s.qlsdfsList;
},
async getDicData(name) {
return await getDdicByMC(name).then((res)=> {
return res.result
});
},
getRightTree(bsm) {
getTree(bsm).then(res => {
getTree(bsm).then((res) => {
if (res.success) {
this.pd=res.result
this.pd = res.result;
}
})
});
},
sortNavigation(data, selectId) {
let headTop = this.headTop;
......@@ -309,12 +324,12 @@
//关闭新建子组件弹框
closeDialog() {
this.dialogVisible = false;
}
},
};
},
};
</script>
<style lang="less" scoped>
.home-box {
.home-box {
width: 100%;
height: 100vh;
.el-container {
......@@ -419,5 +434,5 @@
// line-height: 160px;
padding: 0;
}
}
}
</style>
......
......@@ -83,8 +83,9 @@
</el-form-item>
<el-form-item label="特征码">
<el-select
v-model="tzmCode"
placeholder="地籍子区"
v-model="zdtzm.value"
placeholder="宗地特征码"
@change="changeZdtzm(zdtzm.value)"
style="width:200px;"
>
<el-option
......@@ -203,8 +204,8 @@ export default {
djzqbsm: this.djzqValue,
syqlxbsm: this.syqlxCode,
xmmc: this.zdProjectName,
// zdtzmbsm: this.tzmCode,
zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
zdtzmbsm: this.tzmCode,
//zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
};
insertQjZdjbxx(data)
.then((res) => {
......@@ -310,6 +311,12 @@ export default {
this.syqlxCode = id;
console.log(this.syqlxCode);
},
changeZdtzm(id){
this.tzmCode=id;
console.log(this.tzmCode);
},
close() {
this.$emit("closeDialog");
},
......
......@@ -2,7 +2,6 @@
<div class="main">
<div class="formMenu">
<Qlr ref="qlrxxModule"></Qlr>
<!-- <el-button
type="primary"
class="changeBtn"
......@@ -28,7 +27,7 @@
@change="changeXzq(formData.xzqbsm)"
>
<el-option
v-for="item in xzqList"
v-for="item in $store.state.xzqList"
:key="item.xzqbsm"
:label="item.xzqmc"
:value="item.xzqbsm"
......@@ -44,7 +43,7 @@
@change="changeDjq(formData.djqbsm)"
>
<el-option
v-for="item in djqList"
v-for="item in $store.state.djqList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -56,7 +55,7 @@
<td colspan="2">
<el-select class="formSelect" v-model="formData.djzqbsm">
<el-option
v-for="item in djzqList"
v-for="item in $store.state.djzqList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -70,7 +69,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.qllxbsm">
<el-option
v-for="item in qllxList"
v-for="item in $store.state.qllxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -82,7 +81,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.zdtzmbsm">
<el-option
v-for="item in zdtzmList"
v-for="item in $store.state.zdtzmList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -96,7 +95,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.qlsdfs">
<el-option
v-for="item in qlsdfsList"
v-for="item in $store.state.qlsdfsList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -152,7 +151,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.gmjjhyfl">
<el-option
v-for="item in gmjjhyflList"
v-for="item in $store.state.sshyList"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -180,8 +179,8 @@
</tr>
<tr>
<td colspan="2">容积率</td>
<td colspan="4">
<el-select class="formSelect percent30" v-model="formData.rjl">
<td colspan="2">
<el-select class="formSelect" v-model="formData.rjl">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -190,7 +189,9 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">
<input type="text" class="formInput"/>
</td>
<td colspan="2">容积说明</td>
<td colspan="4" class="psr">
......@@ -199,8 +200,8 @@
</tr>
<tr>
<td colspan="2">建筑密度</td>
<td colspan="4">
<el-select class="formSelect percent30" v-model="formData.jzmd">
<td colspan="2">
<el-select class="formSelect" v-model="formData.jzmd">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -209,7 +210,9 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">
<input type="text" class="formInput"/>
</td>
<td colspan="2">建筑密度说明</td>
<td colspan="4" class="psr">
......@@ -218,8 +221,8 @@
</tr>
<tr>
<td colspan="2">建筑限高</td>
<td colspan="4">
<el-select class="formSelect percent30" v-model="formData.jzxg">
<td colspan="2">
<el-select class="formSelect" v-model="formData.jzxg">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -228,6 +231,8 @@
>
</el-option>
</el-select>
</td>
<td colspan="2">
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">建筑限高说明</td>
......@@ -321,14 +326,9 @@
props: {},
data() {
return {
qllxList: [],
zdtzmList: [],
qlsdfsList: [],
gmjjhyflList: [],
xzqList: this.$store.state.xzqList,
djqList: this.$store.state.djqList,
djzqList: this.$store.state.djzqList,
compareList: [
{label: "<", value: "<"},
{label: ">", value: ">"},
{label: "=", value: "="},
{label: "<=", value: "<="},
{label: ">=", value: ">="},
......@@ -369,7 +369,6 @@
};
},
created() {
this.getDicData();
this.getZdjbxxData();
},
mounted() {
......@@ -407,37 +406,6 @@
getQlxzData() {
console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
},
//获取字典数据信息
getDicData() {
getDdicByMC("权利类型")
.then((res) => {
console.log(res.result);
this.qllxList = res.result;
})
.catch((error) => {
});
getDdicByMC("宗地（宗海）特征码")
.then((res) => {
console.log(res.result);
this.zdtzmList = res.result;
})
.catch((error) => {
});
getDdicByMC("权利设定方式")
.then((res) => {
console.log(res.result);
this.qlsdfsList = res.result;
})
.catch((error) => {
});
getDdicByMC("国民经济行业分类代码")
.then((res) => {
console.log(res.result);
this.gmjjhyflList = res.result;
})
.catch((error) => {
});
},
//行政区划选择
changeXzq(id) {
getListByXzqbsm(id)
......