Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
29b479f3 by zhaoqian
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/Home.vue
2 parents 122b46d8 d9d23630
Inline Side-by-side
Showing 4 changed files with 52 additions and 75 deletions
......@@ -5,11 +5,13 @@ 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: '',
qllxList:[],
zdtzmList:[],
qlsdfsList:[],
zjzlList:[],
gjList:[],
ssList:[],
......
......@@ -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,9 +32,9 @@
<span>{{ item.name }}</span>
</div>
</div>
<div class="header-bottom">
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
</div>
</div> -->
<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
<Create @closeDialog="closeDialog"></Create>
</el-dialog>
......@@ -56,7 +56,7 @@ import { getTree,getDdicByMC } from "../api/common";
export default {
components: {
Navigation,
// Navigation,
LineTree,
Create,
},
......@@ -251,7 +251,9 @@ export default {
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.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList;
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)=> {
......
<template>
<div class="main">
<SearchHead @getSearchCondition="getData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -36,8 +36,7 @@
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="total"
@current-change="handleCurrentChange"
:current-page.sync="currentPage">
@current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
......@@ -54,11 +53,12 @@
props: {},
data() {
return {
total:0,
total: 0,
pageNo: 1,
pageSize: 10,
tableData: [],
tableHeight: "",
queryData: {}
};
},
created() {
......@@ -80,19 +80,24 @@
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getData({});
this.queryData.pageNo = val;
this.getData(this.queryData);
},
//获取子组件点击查询触发的事件
getData(obj) {
console.log(obj);
//将obj作为参数调用接口查询表格数据
obj['pageNo'] = this.pageNo
obj['pageSize'] = this.pageSize
getSearchList(obj).then(res => {
getData(data) {
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total=res.result.total
this.total = res.result.total
})
},
//获取子组件点击查询触发的事件
geQuerytData(obj) {
this.queryData = obj
//将obj作为参数调用接口查询表格数据
this.queryData['pageSize'] = this.pageSize
this.pageNo = 1
this.queryData['pageNo'] = 1
this.getData(this.queryData)
},
//点击办理
handleClick(row) {
let path = "";
......
......@@ -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)
......