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
Expand all
Inline Side-by-side
Showing 7 changed files with 50 additions and 98 deletions
...@@ -5,31 +5,14 @@ ...@@ -5,31 +5,14 @@
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 import { getDdicByMC } from "../src/api/common";
9 export default { 8 export default {
10 mounted() { 9 mounted() {
11 this.getDic();
12 window.addEventListener("unload", this.saveState); 10 window.addEventListener("unload", this.saveState);
13 }, 11 },
14 methods: { 12 methods: {
15 saveState() { 13 saveState() {
16 sessionStorage.setItem("state", JSON.stringify(this.$store.state)); 14 sessionStorage.setItem("state", JSON.stringify(this.$store.state));
17 }, 15 },
18 //请求字典数据
19 getDic() {
20 let s = this.$store.state;
21 s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList;
22 s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList;
23 s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList;
24 s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList;
25 s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList;
26 s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList;
27 },
28 getDicData(name) {
29 getDdicByMC(name).then((res) => {
30 return res.result;
31 });
32 },
33 }, 16 },
34 }; 17 };
35 </script> 18 </script>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <td colspan="3"> 61 <td colspan="3">
62 <el-select class="formSelect" v-model="formData.qlrlxbsm"> 62 <el-select class="formSelect" v-model="formData.qlrlxbsm">
63 <el-option 63 <el-option
64 v-for="item in qlrlxList" 64 v-for="item in $store.state.qlrlxList"
65 :key="item.bsm" 65 :key="item.bsm"
66 :label="item.mc" 66 :label="item.mc"
67 :value="item.bsm" 67 :value="item.bsm"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 <td colspan="3"> 75 <td colspan="3">
76 <el-select class="formSelect" v-model="formData.zjzlbsm"> 76 <el-select class="formSelect" v-model="formData.zjzlbsm">
77 <el-option 77 <el-option
78 v-for="item in zlzlList" 78 v-for="item in $store.state.zjzlList"
79 :key="item.bsm" 79 :key="item.bsm"
80 :label="item.mc" 80 :label="item.mc"
81 :value="item.bsm" 81 :value="item.bsm"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 <td colspan="3"> 103 <td colspan="3">
104 <el-select class="formSelect" v-model="formData.gjbsm"> 104 <el-select class="formSelect" v-model="formData.gjbsm">
105 <el-option 105 <el-option
106 v-for="item in gjList" 106 v-for="item in $store.state.gjList"
107 :key="item.bsm" 107 :key="item.bsm"
108 :label="item.mc" 108 :label="item.mc"
109 :value="item.bsm" 109 :value="item.bsm"
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 <td colspan="3"> 115 <td colspan="3">
116 <el-select class="formSelect" v-model="formData.hjszssbsm"> 116 <el-select class="formSelect" v-model="formData.hjszssbsm">
117 <el-option 117 <el-option
118 v-for="item in ssList" 118 v-for="item in $store.state.ssList"
119 :key="item.bsm" 119 :key="item.bsm"
120 :label="item.mc" 120 :label="item.mc"
121 :value="item.bsm" 121 :value="item.bsm"
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 <td colspan="3"> 129 <td colspan="3">
130 <el-select class="formSelect" v-model="formData.xbbsm"> 130 <el-select class="formSelect" v-model="formData.xbbsm">
131 <el-option 131 <el-option
132 v-for="item in xbList" 132 v-for="item in $store.state.xbList"
133 :key="item.bsm" 133 :key="item.bsm"
134 :label="item.mc" 134 :label="item.mc"
135 :value="item.bsm" 135 :value="item.bsm"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 <td colspan="3"> 147 <td colspan="3">
148 <el-select class="formSelect" v-model="formData.sshy"> 148 <el-select class="formSelect" v-model="formData.sshy">
149 <el-option 149 <el-option
150 v-for="item in sshyList" 150 v-for="item in $store.state.sshyList"
151 :key="item.bsm" 151 :key="item.bsm"
152 :label="item.mc" 152 :label="item.mc"
153 :value="item.bsm" 153 :value="item.bsm"
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
176 <td colspan="3"> 176 <td colspan="3">
177 <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> 177 <el-select class="formSelect" v-model="formData.fr.zjzlbsm">
178 <el-option 178 <el-option
179 v-for="item in zjzlList" 179 v-for="item in $store.state.zjzlList"
180 :key="item.bsm" 180 :key="item.bsm"
181 :label="item.mc" 181 :label="item.mc"
182 :value="item.bsm" 182 :value="item.bsm"
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
222 <td colspan="3"> 222 <td colspan="3">
223 <el-select class="formSelect" v-model="item.zjzlbsm"> 223 <el-select class="formSelect" v-model="item.zjzlbsm">
224 <el-option 224 <el-option
225 v-for="item in zjzlList" 225 v-for="item in $store.state.zjzlList"
226 :key="item.bsm" 226 :key="item.bsm"
227 :label="item.mc" 227 :label="item.mc"
228 :value="item.bsm" 228 :value="item.bsm"
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
251 <td colspan="3"> 251 <td colspan="3">
252 <el-select class="formSelect" v-model="formData.gyfsbsm"> 252 <el-select class="formSelect" v-model="formData.gyfsbsm">
253 <el-option 253 <el-option
254 v-for="item in qlrlxList" 254 v-for="item in $store.state.qlrlxList"
255 :key="item.bsm" 255 :key="item.bsm"
256 :label="item.mc" 256 :label="item.mc"
257 :value="item.bsm" 257 :value="item.bsm"
...@@ -356,12 +356,6 @@ export default { ...@@ -356,12 +356,6 @@ export default {
356 zjh: "", 356 zjh: "",
357 zjzlbsm: "", 357 zjzlbsm: "",
358 }, 358 },
359 qlrlxList: this.$store.state.qlrlxList,
360 zjzlList: this.$store.state.zjzlList,
361 xbList: this.$store.state.xbList,
362 gjList: this.$store.state.gjList,
363 ssList: this.$store.state.ssList,
364 sshyList: this.$store.state.sshyList,
365 }; 359 };
366 }, 360 },
367 methods: { 361 methods: {
......
...@@ -211,14 +211,12 @@ export default { ...@@ -211,14 +211,12 @@ export default {
211 getDicData(){ 211 getDicData(){
212 getDdicByMC("土地用途") 212 getDdicByMC("土地用途")
213 .then((res) => { 213 .then((res) => {
214 console.log(res.result);
215 this.pzytList = res.result; 214 this.pzytList = res.result;
216 this.sjytList = res.result; 215 this.sjytList = res.result;
217 }) 216 })
218 .catch((error) => {}); 217 .catch((error) => {});
219 getDdicByMC("土地等级") 218 getDdicByMC("土地等级")
220 .then((res) => { 219 .then((res) => {
221 console.log(res.result);
222 this.djList = res.result; 220 this.djList = res.result;
223 }) 221 })
224 .catch((error) => {}); 222 .catch((error) => {});
......
...@@ -5,20 +5,22 @@ import user from './modules/user' ...@@ -5,20 +5,22 @@ 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: '',
13 xzqList: [], 12 qllxList:[],
14 djqList: [], 13 zdtzmList:[],
15 djzqList: [], 14 qlsdfsList:[],
16 zjzlList:[], 15 zjzlList:[],
17 gjList:[], 16 gjList:[],
18 ssList:[], 17 ssList:[],
19 qlrlxList:[], 18 qlrlxList:[],
20 xbList:[], 19 xbList:[],
21 sshyList:[], 20 sshyList:[],
21 xzqList: [],
22 djqList: [],
23 djzqList: [],
22 //创建自然幢时需要用到的临时存储信息 24 //创建自然幢时需要用到的临时存储信息
23 zrzbsm: '', 25 zrzbsm: '',
24 xmmc: '', 26 xmmc: '',
......
...@@ -83,8 +83,9 @@ ...@@ -83,8 +83,9 @@
83 </el-form-item> 83 </el-form-item>
84 <el-form-item label="特征码"> 84 <el-form-item label="特征码">
85 <el-select 85 <el-select
86 v-model="tzmCode" 86 v-model="zdtzm.value"
87 placeholder="地籍子区" 87 placeholder="宗地特征码"
88 @change="changeZdtzm(zdtzm.value)"
88 style="width:200px;" 89 style="width:200px;"
89 > 90 >
90 <el-option 91 <el-option
...@@ -203,8 +204,8 @@ export default { ...@@ -203,8 +204,8 @@ export default {
203 djzqbsm: this.djzqValue, 204 djzqbsm: this.djzqValue,
204 syqlxbsm: this.syqlxCode, 205 syqlxbsm: this.syqlxCode,
205 xmmc: this.zdProjectName, 206 xmmc: this.zdProjectName,
206 // zdtzmbsm: this.tzmCode, 207 zdtzmbsm: this.tzmCode,
207 zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010", 208 //zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
208 }; 209 };
209 insertQjZdjbxx(data) 210 insertQjZdjbxx(data)
210 .then((res) => { 211 .then((res) => {
...@@ -310,6 +311,12 @@ export default { ...@@ -310,6 +311,12 @@ export default {
310 this.syqlxCode = id; 311 this.syqlxCode = id;
311 console.log(this.syqlxCode); 312 console.log(this.syqlxCode);
312 }, 313 },
314 changeZdtzm(id){
315
316 this.tzmCode=id;
317 console.log(this.tzmCode);
318
319 },
313 close() { 320 close() {
314 this.$emit("closeDialog"); 321 this.$emit("closeDialog");
315 }, 322 },
......
...@@ -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)
......