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' ...@@ -5,11 +5,13 @@ import user from './modules/user'
5 import permission_routes from './modules/permission_routes' 5 import permission_routes from './modules/permission_routes'
6 import setTabs from './modules/setTabs' 6 import setTabs from './modules/setTabs'
7 7
8 Vue.use(Vuex) 8 Vue.use(Vuex);
9
10 const store = new Vuex.Store({ 9 const store = new Vuex.Store({
11 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : { 10 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
12 zdbsm: '', 11 zdbsm: '',
12 qllxList:[],
13 zdtzmList:[],
14 qlsdfsList:[],
13 zjzlList:[], 15 zjzlList:[],
14 gjList:[], 16 gjList:[],
15 ssList:[], 17 ssList:[],
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </div> 15 </div>
16 </el-aside> 16 </el-aside>
17 <el-container> 17 <el-container>
18 <el-header height="100px"> 18 <el-header>
19 <div class="header-top"> 19 <div class="header-top">
20 <div class="top-items" @click="toggleClick"> 20 <div class="top-items" @click="toggleClick">
21 <i class="fa fa-outdent hamburger" v-show="!isActive"></i> 21 <i class="fa fa-outdent hamburger" v-show="!isActive"></i>
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
32 <span>{{ item.name }}</span> 32 <span>{{ item.name }}</span>
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="header-bottom"> 35 <!-- <div class="header-bottom">
36 <Navigation ref="navigation"></Navigation> 36 <Navigation ref="navigation"></Navigation>
37 </div> 37 </div> -->
38 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> 38 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
39 <Create @closeDialog="closeDialog"></Create> 39 <Create @closeDialog="closeDialog"></Create>
40 </el-dialog> 40 </el-dialog>
...@@ -56,7 +56,7 @@ import { getTree,getDdicByMC } from "../api/common"; ...@@ -56,7 +56,7 @@ import { getTree,getDdicByMC } from "../api/common";
56 56
57 export default { 57 export default {
58 components: { 58 components: {
59 Navigation, 59 // Navigation,
60 LineTree, 60 LineTree,
61 Create, 61 Create,
62 }, 62 },
...@@ -251,7 +251,9 @@ export default { ...@@ -251,7 +251,9 @@ export default {
251 s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList; 251 s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList;
252 s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList; 252 s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList;
253 s.sshyList = s.sshyList.length == 0 ?await this.getDicData("所属行业") : s.sshyList; 253 s.sshyList = s.sshyList.length == 0 ?await this.getDicData("所属行业") : s.sshyList;
254 s.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList; 254 s.qllxList = s.qllxList.length == 0 ?await this.getDicData("权利类型") : s.qllxList;
255 s.zdtzmList = s.zdtzmList.length == 0 ?await this.getDicData("宗地（宗海）特征码") : s.sshyList;
256 s.qlsdfsList = s.qlsdfsList.length == 0 ?await this.getDicData("权利设定方式") : s.qlsdfsList;
255 }, 257 },
256 async getDicData(name) { 258 async getDicData(name) {
257 return await getDdicByMC(name).then((res)=> { 259 return await getDdicByMC(name).then((res)=> {
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <SearchHead @getSearchCondition="getData"></SearchHead> 3 <SearchHead @getSearchCondition="geQuerytData"></SearchHead>
4 <div class="dataGrid" ref="dataGrid"> 4 <div class="dataGrid" ref="dataGrid">
5 <el-table 5 <el-table
6 :data="tableData" 6 :data="tableData"
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
36 </el-table> 36 </el-table>
37 <div class="pagination"> 37 <div class="pagination">
38 <el-pagination background layout="prev, pager, next" :total="total" 38 <el-pagination background layout="prev, pager, next" :total="total"
39 @current-change="handleCurrentChange" 39 @current-change="handleCurrentChange">
40 :current-page.sync="currentPage">
41 </el-pagination> 40 </el-pagination>
42 </div> 41 </div>
43 </div> 42 </div>
...@@ -54,11 +53,12 @@ ...@@ -54,11 +53,12 @@
54 props: {}, 53 props: {},
55 data() { 54 data() {
56 return { 55 return {
57 total:0, 56 total: 0,
58 pageNo: 1, 57 pageNo: 1,
59 pageSize: 10, 58 pageSize: 10,
60 tableData: [], 59 tableData: [],
61 tableHeight: "", 60 tableHeight: "",
61 queryData: {}
62 }; 62 };
63 }, 63 },
64 created() { 64 created() {
...@@ -80,19 +80,24 @@ ...@@ -80,19 +80,24 @@
80 handleCurrentChange(val) { 80 handleCurrentChange(val) {
81 console.log(`当前页: ${val}`); 81 console.log(`当前页: ${val}`);
82 this.pageNo = val; 82 this.pageNo = val;
83 this.getData({}); 83 this.queryData.pageNo = val;
84 this.getData(this.queryData);
84 }, 85 },
85 //获取子组件点击查询触发的事件 86 getData(data) {
86 getData(obj) { 87 getSearchList(data).then(res => {
87 console.log(obj);
88 //将obj作为参数调用接口查询表格数据
89 obj['pageNo'] = this.pageNo
90 obj['pageSize'] = this.pageSize
91 getSearchList(obj).then(res => {
92 this.tableData = res.result.records 88 this.tableData = res.result.records
93 this.total=res.result.total 89 this.total = res.result.total
94 }) 90 })
95 }, 91 },
92 //获取子组件点击查询触发的事件
93 geQuerytData(obj) {
94 this.queryData = obj
95 //将obj作为参数调用接口查询表格数据
96 this.queryData['pageSize'] = this.pageSize
97 this.pageNo = 1
98 this.queryData['pageNo'] = 1
99 this.getData(this.queryData)
100 },
96 //点击办理 101 //点击办理
97 handleClick(row) { 102 handleClick(row) {
98 let path = ""; 103 let path = "";
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
2 <div class="main"> 2 <div class="main">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule"></Qlr> 4 <Qlr ref="qlrxxModule"></Qlr>
5
6 <!-- <el-button 5 <!-- <el-button
7 type="primary" 6 type="primary"
8 class="changeBtn" 7 class="changeBtn"
...@@ -28,7 +27,7 @@ ...@@ -28,7 +27,7 @@
28 @change="changeXzq(formData.xzqbsm)" 27 @change="changeXzq(formData.xzqbsm)"
29 > 28 >
30 <el-option 29 <el-option
31 v-for="item in xzqList" 30 v-for="item in $store.state.xzqList"
32 :key="item.xzqbsm" 31 :key="item.xzqbsm"
33 :label="item.xzqmc" 32 :label="item.xzqmc"
34 :value="item.xzqbsm" 33 :value="item.xzqbsm"
...@@ -44,7 +43,7 @@ ...@@ -44,7 +43,7 @@
44 @change="changeDjq(formData.djqbsm)" 43 @change="changeDjq(formData.djqbsm)"
45 > 44 >
46 <el-option 45 <el-option
47 v-for="item in djqList" 46 v-for="item in $store.state.djqList"
48 :key="item.bsm" 47 :key="item.bsm"
49 :label="item.mc" 48 :label="item.mc"
50 :value="item.bsm" 49 :value="item.bsm"
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
56 <td colspan="2"> 55 <td colspan="2">
57 <el-select class="formSelect" v-model="formData.djzqbsm"> 56 <el-select class="formSelect" v-model="formData.djzqbsm">
58 <el-option 57 <el-option
59 v-for="item in djzqList" 58 v-for="item in $store.state.djzqList"
60 :key="item.bsm" 59 :key="item.bsm"
61 :label="item.mc" 60 :label="item.mc"
62 :value="item.bsm" 61 :value="item.bsm"
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
70 <td colspan="4"> 69 <td colspan="4">
71 <el-select class="formSelect" v-model="formData.qllxbsm"> 70 <el-select class="formSelect" v-model="formData.qllxbsm">
72 <el-option 71 <el-option
73 v-for="item in qllxList" 72 v-for="item in $store.state.qllxList"
74 :key="item.bsm" 73 :key="item.bsm"
75 :label="item.mc" 74 :label="item.mc"
76 :value="item.bsm" 75 :value="item.bsm"
...@@ -82,7 +81,7 @@ ...@@ -82,7 +81,7 @@
82 <td colspan="4"> 81 <td colspan="4">
83 <el-select class="formSelect" v-model="formData.zdtzmbsm"> 82 <el-select class="formSelect" v-model="formData.zdtzmbsm">
84 <el-option 83 <el-option
85 v-for="item in zdtzmList" 84 v-for="item in $store.state.zdtzmList"
86 :key="item.bsm" 85 :key="item.bsm"
87 :label="item.mc" 86 :label="item.mc"
88 :value="item.bsm" 87 :value="item.bsm"
...@@ -96,7 +95,7 @@ ...@@ -96,7 +95,7 @@
96 <td colspan="4"> 95 <td colspan="4">
97 <el-select class="formSelect" v-model="formData.qlsdfs"> 96 <el-select class="formSelect" v-model="formData.qlsdfs">
98 <el-option 97 <el-option
99 v-for="item in qlsdfsList" 98 v-for="item in $store.state.qlsdfsList"
100 :key="item.bsm" 99 :key="item.bsm"
101 :label="item.mc" 100 :label="item.mc"
102 :value="item.bsm" 101 :value="item.bsm"
...@@ -152,7 +151,7 @@ ...@@ -152,7 +151,7 @@
152 <td colspan="4"> 151 <td colspan="4">
153 <el-select class="formSelect" v-model="formData.gmjjhyfl"> 152 <el-select class="formSelect" v-model="formData.gmjjhyfl">
154 <el-option 153 <el-option
155 v-for="item in gmjjhyflList" 154 v-for="item in $store.state.sshyList"
156 :key="item.value" 155 :key="item.value"
157 :label="item.label" 156 :label="item.label"
158 :value="item.value" 157 :value="item.value"
...@@ -180,8 +179,8 @@ ...@@ -180,8 +179,8 @@
180 </tr> 179 </tr>
181 <tr> 180 <tr>
182 <td colspan="2">容积率</td> 181 <td colspan="2">容积率</td>
183 <td colspan="4"> 182 <td colspan="2">
184 <el-select class="formSelect percent30" v-model="formData.rjl"> 183 <el-select class="formSelect" v-model="formData.rjl">
185 <el-option 184 <el-option
186 v-for="item in compareList" 185 v-for="item in compareList"
187 :key="item.value" 186 :key="item.value"
...@@ -190,7 +189,9 @@ ...@@ -190,7 +189,9 @@
190 > 189 >
191 </el-option> 190 </el-option>
192 </el-select> 191 </el-select>
193 <input type="text" class="formInput percent68"/> 192 </td>
193 <td colspan="2">
194 <input type="text" class="formInput"/>
194 </td> 195 </td>
195 <td colspan="2">容积说明</td> 196 <td colspan="2">容积说明</td>
196 <td colspan="4" class="psr"> 197 <td colspan="4" class="psr">
...@@ -199,8 +200,8 @@ ...@@ -199,8 +200,8 @@
199 </tr> 200 </tr>
200 <tr> 201 <tr>
201 <td colspan="2">建筑密度</td> 202 <td colspan="2">建筑密度</td>
202 <td colspan="4"> 203 <td colspan="2">
203 <el-select class="formSelect percent30" v-model="formData.jzmd"> 204 <el-select class="formSelect" v-model="formData.jzmd">
204 <el-option 205 <el-option
205 v-for="item in compareList" 206 v-for="item in compareList"
206 :key="item.value" 207 :key="item.value"
...@@ -209,7 +210,9 @@ ...@@ -209,7 +210,9 @@
209 > 210 >
210 </el-option> 211 </el-option>
211 </el-select> 212 </el-select>
212 <input type="text" class="formInput percent68"/> 213 </td>
214 <td colspan="2">
215 <input type="text" class="formInput"/>
213 </td> 216 </td>
214 <td colspan="2">建筑密度说明</td> 217 <td colspan="2">建筑密度说明</td>
215 <td colspan="4" class="psr"> 218 <td colspan="4" class="psr">
...@@ -218,8 +221,8 @@ ...@@ -218,8 +221,8 @@
218 </tr> 221 </tr>
219 <tr> 222 <tr>
220 <td colspan="2">建筑限高</td> 223 <td colspan="2">建筑限高</td>
221 <td colspan="4"> 224 <td colspan="2">
222 <el-select class="formSelect percent30" v-model="formData.jzxg"> 225 <el-select class="formSelect" v-model="formData.jzxg">
223 <el-option 226 <el-option
224 v-for="item in compareList" 227 v-for="item in compareList"
225 :key="item.value" 228 :key="item.value"
...@@ -228,6 +231,8 @@ ...@@ -228,6 +231,8 @@
228 > 231 >
229 </el-option> 232 </el-option>
230 </el-select> 233 </el-select>
234 </td>
235 <td colspan="2">
231 <input type="text" class="formInput percent68"/> 236 <input type="text" class="formInput percent68"/>
232 </td> 237 </td>
233 <td colspan="2">建筑限高说明</td> 238 <td colspan="2">建筑限高说明</td>
...@@ -321,14 +326,9 @@ ...@@ -321,14 +326,9 @@
321 props: {}, 326 props: {},
322 data() { 327 data() {
323 return { 328 return {
324 qllxList: [],
325 zdtzmList: [],
326 qlsdfsList: [],
327 gmjjhyflList: [],
328 xzqList: this.$store.state.xzqList,
329 djqList: this.$store.state.djqList,
330 djzqList: this.$store.state.djzqList,
331 compareList: [ 329 compareList: [
330 {label: "<", value: "<"},
331 {label: ">", value: ">"},
332 {label: "=", value: "="}, 332 {label: "=", value: "="},
333 {label: "<=", value: "<="}, 333 {label: "<=", value: "<="},
334 {label: ">=", value: ">="}, 334 {label: ">=", value: ">="},
...@@ -369,7 +369,6 @@ ...@@ -369,7 +369,6 @@
369 }; 369 };
370 }, 370 },
371 created() { 371 created() {
372 this.getDicData();
373 this.getZdjbxxData(); 372 this.getZdjbxxData();
374 }, 373 },
375 mounted() { 374 mounted() {
...@@ -407,37 +406,6 @@ ...@@ -407,37 +406,6 @@
407 getQlxzData() { 406 getQlxzData() {
408 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据 407 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
409 }, 408 },
410 //获取字典数据信息
411 getDicData() {
412 getDdicByMC("权利类型")
413 .then((res) => {
414 console.log(res.result);
415 this.qllxList = res.result;
416 })
417 .catch((error) => {
418 });
419 getDdicByMC("宗地（宗海）特征码")
420 .then((res) => {
421 console.log(res.result);
422 this.zdtzmList = res.result;
423 })
424 .catch((error) => {
425 });
426 getDdicByMC("权利设定方式")
427 .then((res) => {
428 console.log(res.result);
429 this.qlsdfsList = res.result;
430 })
431 .catch((error) => {
432 });
433 getDdicByMC("国民经济行业分类代码")
434 .then((res) => {
435 console.log(res.result);
436 this.gmjjhyflList = res.result;
437 })
438 .catch((error) => {
439 });
440 },
441 //行政区划选择 409 //行政区划选择
442 changeXzq(id) { 410 changeXzq(id) {
443 getListByXzqbsm(id) 411 getListByXzqbsm(id)
......