Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b588a832 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents ca888098 6b6b617c
Inline Side-by-side
Showing 9 changed files with 242 additions and 96 deletions
...@@ -19,30 +19,31 @@ ...@@ -19,30 +19,31 @@
19 "el-select-tree": "^1.0.26", 19 "el-select-tree": "^1.0.26",
20 "el-tree-select": "^3.1.10", 20 "el-tree-select": "^3.1.10",
21 "element-ui": "^2.13.2", 21 "element-ui": "^2.13.2",
22 "esri-loader": "^2.16.0",
22 "file-saver": "^2.0.2", 23 "file-saver": "^2.0.2",
23 "form-making": "^1.2.9", 24 "form-making": "^1.2.9",
24 "insert-css": "^2.0.0", 25 "insert-css": "^2.0.0",
25 "js-cookie": "^2.2.1", 26 "js-cookie": "^2.2.1",
26 "mockjs": "^1.1.0", 27 "mockjs": "^1.1.0",
27 "screenfull": "^5.0.2", 28 "screenfull": "^5.0.2",
29 "shapefile": "^0.6.6",
28 "style-resources-loader": "^1.3.3", 30 "style-resources-loader": "^1.3.3",
31 "terraformer-arcgis-parser": "^1.1.0",
32 "terraformer-wkt-parser": "^1.2.1",
29 "vue": "^2.6.10", 33 "vue": "^2.6.10",
30 "vue-cli-plugin-style-resources-loader": "^0.1.4", 34 "vue-cli-plugin-style-resources-loader": "^0.1.4",
31 "vue-quill-editor": "^3.0.6", 35 "vue-quill-editor": "^3.0.6",
32 "vue-router": "^3.0.3", 36 "vue-router": "^3.0.3",
33 "vuex": "^3.0.1", 37 "vuex": "^3.0.1",
34 "webpack-theme-color-replacer": "^1.3.14", 38 "webpack-theme-color-replacer": "^1.3.14",
35 "xlsx": "^0.16.6", 39 "xlsx": "^0.16.6"
36 "esri-loader": "^2.15.0",
37 "shapefile": "^0.6.6",
38 "terraformer-arcgis-parser": "^1.1.0",
39 "terraformer-wkt-parser": "^1.2.1"
40 }, 40 },
41 "devDependencies": { 41 "devDependencies": {
42 "@vue/cli-plugin-babel": "^3.11.0", 42 "@vue/cli-plugin-babel": "^3.11.0",
43 "@vue/cli-plugin-eslint": "^3.11.0", 43 "@vue/cli-plugin-eslint": "^3.11.0",
44 "@vue/cli-service": "^3.11.0", 44 "@vue/cli-service": "^3.11.0",
45 "babel-eslint": "^10.0.1", 45 "babel-eslint": "^10.0.1",
46 "babel-polyfill": "^6.26.0",
46 "eslint": "^5.16.0", 47 "eslint": "^5.16.0",
47 "eslint-plugin-vue": "^5.0.0", 48 "eslint-plugin-vue": "^5.0.0",
48 "less": "^3.0.4", 49 "less": "^3.0.4",
......
...@@ -37,6 +37,7 @@ if ( ...@@ -37,6 +37,7 @@ if (
37 } 37 }
38 }, false) 38 }, false)
39 } 39 }
40 import "babel-polyfill"
40 Vue.config.productionTip = false 41 Vue.config.productionTip = false
41 Vue.use(ElementUI) 42 Vue.use(ElementUI)
42 new Vue({ 43 new Vue({
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
49 </el-main> 49 </el-main>
50 </el-container> 50 </el-container>
51 </el-container> 51 </el-container>
52 <div class="treeModule-show" :class="{ 'w0': isActive }"></div>
52 </div> 53 </div>
53 </template> 54 </template>
54 <script> 55 <script>
...@@ -410,6 +411,7 @@ export default { ...@@ -410,6 +411,7 @@ export default {
410 .home-box { 411 .home-box {
411 width: 100%; 412 width: 100%;
412 height: 100vh; 413 height: 100vh;
414 position: relative;
413 .calcWidth{ 415 .calcWidth{
414 width: calc(100% - 300px); 416 width: calc(100% - 300px);
415 } 417 }
...@@ -441,15 +443,6 @@ export default { ...@@ -441,15 +443,6 @@ export default {
441 color: #000; 443 color: #000;
442 } 444 }
443 } 445 }
444 .top-items:not(:last-child)::after {
445 // content: "";
446 // width: 1px;
447 // height: 14px;
448 // background: #eaeaea;
449 // position: absolute;
450 // right: -1px;
451 // top: 24px;
452 }
453 .top-items.is-active { 446 .top-items.is-active {
454 color: #006cff; 447 color: #006cff;
455 border-left: 1px solid #EAEAEA; 448 border-left: 1px solid #EAEAEA;
...@@ -526,5 +519,23 @@ export default { ...@@ -526,5 +519,23 @@ export default {
526 // line-height: 160px; 519 // line-height: 160px;
527 padding: 0; 520 padding: 0;
528 } 521 }
522
523 .treeModule-show{
524 width: 290px;
525 height: calc(100% - 120px);
526 position: absolute;
527 top: 120px;
528 left: 0;
529 z-index: 1;
530 pointer-events: none;
531 -webkit-box-shadow: inset -14px 0px 16px red;
532 box-shadow: inset -23px 0px 16px #1d50dd;
533 transition: 0.3s;
534 display: none;
535 }
536 .w0{
537 display: block;
538 width: 64px;
539 }
529 } 540 }
530 </style> 541 </style>
......
...@@ -135,7 +135,13 @@ ...@@ -135,7 +135,13 @@
135 default: 135 default:
136 break; 136 break;
137 } 137 }
138 this.$router.push(path); 138 this.$router.push({
139 path: path,
140 query: {
141 bsm: row.glbsm,
142 source: 2
143 }
144 });
139 }, 145 },
140 }, 146 },
141 computed: {}, 147 computed: {},
......
...@@ -16,29 +16,29 @@ ...@@ -16,29 +16,29 @@
16 <th class="qlr">权利人</th> 16 <th class="qlr">权利人</th>
17 <th class="zl">坐落</th> 17 <th class="zl">坐落</th>
18 </tr> 18 </tr>
19 <tr v-if="Object.keys(bgqData)==0"> 19 <tr v-if="Object.keys(zdFgqData)==0">
20 <td colspan="7"> 20 <td colspan="7">
21 <span class="noData">暂无数据</span> 21 <span class="noData">暂无数据</span>
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr v-else> 24 <tr v-else>
25 <td class="xh">1</td> 25 <td class="xh">1</td>
26 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 26 <td class="zddm"><input type="text" class="formInput" v-model="zdFgqData.zddm"
27 readonly="readonly"/> 27 readonly="readonly"/>
28 </td> 28 </td>
29 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 29 <td class="bdcdyh"><input type="text" class="formInput" v-model="zdFgqData.bdcdyh"
30 readonly="readonly"/> 30 readonly="readonly"/>
31 </td> 31 </td>
32 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 32 <td class="xmmc"><input type="text" class="formInput" v-model="zdFgqData.xmmc"
33 readonly="readonly"/> 33 readonly="readonly"/>
34 </td> 34 </td>
35 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 35 <td class="bdcqzh"><input type="text" class="formInput" v-model="zdFgqData.bdcqzh"
36 readonly="readonly"/> 36 readonly="readonly"/>
37 </td> 37 </td>
38 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 38 <td class="qlr"><input type="text" class="formInput" v-model="zdFgqData.qlr"
39 readonly="readonly"/> 39 readonly="readonly"/>
40 </td> 40 </td>
41 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 41 <td class="zl"><input type="text" class="formInput" v-model="zdFgqData.zl"
42 readonly="readonly"/></td> 42 readonly="readonly"/></td>
43 </tr> 43 </tr>
44 </table> 44 </table>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <th class="xmmc">项目名称</th> 56 <th class="xmmc">项目名称</th>
57 <th class="zxx">幢信息</th> 57 <th class="zxx">幢信息</th>
58 </tr> 58 </tr>
59 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 59 <tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
60 <td class="cz"> 60 <td class="cz">
61 <el-button 61 <el-button
62 type="primary" 62 type="primary"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
146 </div> 146 </div>
147 147
148 <el-dialog 148 <el-dialog
149 v-if="fghData.newZdlist.length>0" 149 v-if="zdFghData.newZdlist.length>0"
150 title="提示" 150 title="提示"
151 :visible.sync="isopenXz" 151 :visible.sync="isopenXz"
152 width="50%" 152 width="50%"
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 <td>幢类型</td> 159 <td>幢类型</td>
160 <td>幢信息</td> 160 <td>幢信息</td>
161 </tr> 161 </tr>
162 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index"> 162 <tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
163 <td> 163 <td>
164 <el-select v-model="item.ztype" 164 <el-select v-model="item.ztype"
165 > 165 >
...@@ -208,29 +208,29 @@ ...@@ -208,29 +208,29 @@
208 <th class="qlr">权利人</th> 208 <th class="qlr">权利人</th>
209 <th class="zl">坐落</th> 209 <th class="zl">坐落</th>
210 </tr> 210 </tr>
211 <tr v-if="Object.keys(bgqData)==0"> 211 <tr v-if="Object.keys(dzFgqData)==0">
212 <td colspan="7"> 212 <td colspan="7">
213 <span class="noData">暂无数据</span> 213 <span class="noData">暂无数据</span>
214 </td> 214 </td>
215 </tr> 215 </tr>
216 <tr v-else> 216 <tr v-else>
217 <td class="xh">1</td> 217 <td class="xh">1</td>
218 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 218 <td class="zddm"><input type="text" class="formInput" v-model="dzFgqData.zddm"
219 readonly="readonly"/> 219 readonly="readonly"/>
220 </td> 220 </td>
221 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 221 <td class="bdcdyh"><input type="text" class="formInput" v-model="dzFgqData.bdcdyh"
222 readonly="readonly"/> 222 readonly="readonly"/>
223 </td> 223 </td>
224 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 224 <td class="xmmc"><input type="text" class="formInput" v-model="dzFgqData.xmmc"
225 readonly="readonly"/> 225 readonly="readonly"/>
226 </td> 226 </td>
227 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 227 <td class="bdcqzh"><input type="text" class="formInput" v-model="dzFgqData.bdcqzh"
228 readonly="readonly"/> 228 readonly="readonly"/>
229 </td> 229 </td>
230 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 230 <td class="qlr"><input type="text" class="formInput" v-model="dzFgqData.qlr"
231 readonly="readonly"/> 231 readonly="readonly"/>
232 </td> 232 </td>
233 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 233 <td class="zl"><input type="text" class="formInput" v-model="dzFgqData.zl"
234 readonly="readonly"/></td> 234 readonly="readonly"/></td>
235 </tr> 235 </tr>
236 </table> 236 </table>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
248 <th class="xmmc">项目名称</th> 248 <th class="xmmc">项目名称</th>
249 <th class="zxx">幢信息</th> 249 <th class="zxx">幢信息</th>
250 </tr> 250 </tr>
251 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 251 <tr v-for="(item,index) in dzFghData.newZdlist" :key="index">
252 <td class="cz"> 252 <td class="cz">
253 <el-button 253 <el-button
254 type="primary" 254 type="primary"
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
337 </div> 337 </div>
338 338
339 <el-dialog 339 <el-dialog
340 v-if="fghData.newZdlist.length>0" 340 v-if="zdFghData.newZdlist.length>0"
341 title="提示" 341 title="提示"
342 :visible.sync="isopenXz" 342 :visible.sync="isopenXz"
343 :modal-append-to-body="false" 343 :modal-append-to-body="false"
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
350 <td>幢类型</td> 350 <td>幢类型</td>
351 <td>幢信息</td> 351 <td>幢信息</td>
352 </tr> 352 </tr>
353 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index"> 353 <tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
354 <td> 354 <td>
355 <el-select v-model="item.ztype" 355 <el-select v-model="item.ztype"
356 > 356 >
...@@ -399,29 +399,29 @@ ...@@ -399,29 +399,29 @@
399 <th class="qlr">权利人</th> 399 <th class="qlr">权利人</th>
400 <th class="zl">坐落</th> 400 <th class="zl">坐落</th>
401 </tr> 401 </tr>
402 <tr v-if="Object.keys(bgqData)==0"> 402 <tr v-if="Object.keys(hFgqData)==0">
403 <td colspan="7"> 403 <td colspan="7">
404 <span class="noData">暂无数据</span> 404 <span class="noData">暂无数据</span>
405 </td> 405 </td>
406 </tr> 406 </tr>
407 <tr v-else> 407 <tr v-else>
408 <td class="xh">1</td> 408 <td class="xh">1</td>
409 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 409 <td class="zddm"><input type="text" class="formInput" v-model="hFgqData.zddm"
410 readonly="readonly"/> 410 readonly="readonly"/>
411 </td> 411 </td>
412 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 412 <td class="bdcdyh"><input type="text" class="formInput" v-model="hFgqData.bdcdyh"
413 readonly="readonly"/> 413 readonly="readonly"/>
414 </td> 414 </td>
415 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 415 <td class="xmmc"><input type="text" class="formInput" v-model="hFgqData.xmmc"
416 readonly="readonly"/> 416 readonly="readonly"/>
417 </td> 417 </td>
418 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 418 <td class="bdcqzh"><input type="text" class="formInput" v-model="hFgqData.bdcqzh"
419 readonly="readonly"/> 419 readonly="readonly"/>
420 </td> 420 </td>
421 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 421 <td class="qlr"><input type="text" class="formInput" v-model="hFgqData.qlr"
422 readonly="readonly"/> 422 readonly="readonly"/>
423 </td> 423 </td>
424 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 424 <td class="zl"><input type="text" class="formInput" v-model="hFgqData.zl"
425 readonly="readonly"/></td> 425 readonly="readonly"/></td>
426 </tr> 426 </tr>
427 </table> 427 </table>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
439 <th class="xmmc">项目名称</th> 439 <th class="xmmc">项目名称</th>
440 <th class="zxx">幢信息</th> 440 <th class="zxx">幢信息</th>
441 </tr> 441 </tr>
442 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 442 <tr v-for="(item,index) in hFghData.newZdlist" :key="index">
443 443
444 <td class="cz"> 444 <td class="cz">
445 <el-button 445 <el-button
...@@ -529,7 +529,7 @@ ...@@ -529,7 +529,7 @@
529 </div> 529 </div>
530 530
531 <el-dialog 531 <el-dialog
532 v-if="fghData.newZdlist.length>0" 532 v-if="zdFghData.newZdlist.length>0"
533 title="提示" 533 title="提示"
534 :visible.sync="isopenXz" 534 :visible.sync="isopenXz"
535 :modal-append-to-body="false" 535 :modal-append-to-body="false"
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
542 <td>幢类型</td> 542 <td>幢类型</td>
543 <td>幢信息</td> 543 <td>幢信息</td>
544 </tr> 544 </tr>
545 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index"> 545 <tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
546 <td> 546 <td>
547 <el-select v-model="item.ztype" 547 <el-select v-model="item.ztype"
548 > 548 >
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
595 595
596 export default { 596 export default {
597 name: "", 597 name: "",
598 components: {QueryData,zdQueryData}, 598 components: {QueryData, zdQueryData},
599 props: {}, 599 props: {},
600 data() { 600 data() {
601 return { 601 return {
...@@ -603,7 +603,9 @@ ...@@ -603,7 +603,9 @@
603 isopenXz: false, 603 isopenXz: false,
604 centerDialogVisible: false, 604 centerDialogVisible: false,
605 selectIndex: 0,// 当前选中序号 605 selectIndex: 0,// 当前选中序号
606 bgqData: {}, 606 zdFgqData: {}, // 宗地分割前数据
607 dzFgqData: {}, //多幢分割前数据
608 hFgqData: {}, // 户分割前数据
607 xzq: [], 609 xzq: [],
608 djq: [], 610 djq: [],
609 djzq: [], 611 djzq: [],
...@@ -680,7 +682,15 @@ ...@@ -680,7 +682,15 @@
680 userbsm: "", 682 userbsm: "",
681 fwlist: [] 683 fwlist: []
682 }, 684 },
683 fghData: { 685 zdFghData: {
686 oldZdbsm: "",
687 newZdlist: []
688 },
689 dzFghData: {
690 oldZdbsm: "",
691 newZdlist: []
692 },
693 hFghData: {
684 oldZdbsm: "", 694 oldZdbsm: "",
685 newZdlist: [] 695 newZdlist: []
686 }, 696 },
...@@ -701,7 +711,7 @@ ...@@ -701,7 +711,7 @@
701 console.log(node, 'node'); 711 console.log(node, 'node');
702 console.log(node.parent, 'node.parent') 712 console.log(node.parent, 'node.parent')
703 console.log(node.children, 'node.children') 713 console.log(node.children, 'node.children')
704 this.fghData.newZdlist[this.selectIndex].fwlist.push({ 714 this.zdFghData.newZdlist[this.selectIndex].fwlist.push({
705 zbsm: node.label, 715 zbsm: node.label,
706 ztype: '多幢' 716 ztype: '多幢'
707 } 717 }
...@@ -730,9 +740,23 @@ ...@@ -730,9 +740,23 @@
730 this.selectIndex = index 740 this.selectIndex = index
731 }, 741 },
732 save() { 742 save() {
733 console.log("save........") 743 switch (this.tabName) {
734 console.log(this.fghData) 744 case "zd":
735 zdfg(this.fghData).then(res => { 745 this.saveZd();
746 break
747 case "dz":
748 // 多幢保存
749 this.saveDz();
750 break
751 case "h":
752 this.saveH();
753 break
754 default:
755 break;
756 }
757 },
758 saveZd() {
759 zdfg(this.zdFghData).then(res => {
736 console.log(res) 760 console.log(res)
737 if (res.success) { 761 if (res.success) {
738 Message.success('保存成功') 762 Message.success('保存成功')
...@@ -741,7 +765,14 @@ ...@@ -741,7 +765,14 @@
741 } 765 }
742 }) 766 })
743 }, 767 },
744 getJbxx(id) { 768 saveDz() {
769
770 },
771 saveH() {
772
773 },
774 // 获取宗地基本信息
775 getZdJbxx(id) {
745 getQjZdjbxxDetailById(id).then(res => { 776 getQjZdjbxxDetailById(id).then(res => {
746 this.checkedData = res.result 777 this.checkedData = res.result
747 // 用户bsm暂时传空 778 // 用户bsm暂时传空
...@@ -767,8 +798,8 @@ ...@@ -767,8 +798,8 @@
767 this.djq = []; 798 this.djq = [];
768 this.djzq = []; 799 this.djzq = [];
769 if (index != undefined) { 800 if (index != undefined) {
770 this.fghData.newZdlist[index].djqbsm = '' 801 this.zdFghData.newZdlist[index].djqbsm = ''
771 this.fghData.newZdlist[index].djzqbsm = '' 802 this.zdFghData.newZdlist[index].djzqbsm = ''
772 } 803 }
773 getListByXzqbsm(id) 804 getListByXzqbsm(id)
774 .then((res) => { 805 .then((res) => {
...@@ -784,7 +815,7 @@ ...@@ -784,7 +815,7 @@
784 changeDjq(item, index) { 815 changeDjq(item, index) {
785 this.djzq = []; 816 this.djzq = [];
786 if (index != undefined) { 817 if (index != undefined) {
787 this.fghData.newZdlist[index].djzqbsm = '' 818 this.zdFghData.newZdlist[index].djzqbsm = ''
788 } 819 }
789 if (item == null) { 820 if (item == null) {
790 } else { 821 } else {
...@@ -801,7 +832,49 @@ ...@@ -801,7 +832,49 @@
801 } 832 }
802 }, 833 },
803 addRow() { 834 addRow() {
804 this.fghData.newZdlist.push({ 835 switch (this.tabName) {
836 case 'zd':
837 this.zdFghData.newZdlist.push({
838 xzqbsm: "",
839 djqbsm: "",
840 djzqbsm: "",
841 xmmc: "",
842 syqlxbsm: "",
843 zdtzmbsm: "",
844 userbsm: "",
845 fwlist: [
846 {
847 zbsm: "",
848 ztype: ""
849 }
850 ]
851 });
852 this.changeXzq(this.checkedData.xzqbsm)
853 this.changeDjq(this.checkedData.djqbsm)
854 this.$set(this.zdFghData.newZdlist, this.zdFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
855 break
856 case 'dz':
857 this.dzFghData.newZdlist.push({
858 xzqbsm: "",
859 djqbsm: "",
860 djzqbsm: "",
861 xmmc: "",
862 syqlxbsm: "",
863 zdtzmbsm: "",
864 userbsm: "",
865 fwlist: [
866 {
867 zbsm: "",
868 ztype: ""
869 }
870 ]
871 });
872 this.changeXzq(this.checkedData.xzqbsm)
873 this.changeDjq(this.checkedData.djqbsm)
874 this.$set(this.dzFghData.newZdlist, this.dzFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
875 break
876 case 'h':
877 this.hFghData.newZdlist.push({
805 xzqbsm: "", 878 xzqbsm: "",
806 djqbsm: "", 879 djqbsm: "",
807 djzqbsm: "", 880 djzqbsm: "",
...@@ -818,10 +891,26 @@ ...@@ -818,10 +891,26 @@
818 }); 891 });
819 this.changeXzq(this.checkedData.xzqbsm) 892 this.changeXzq(this.checkedData.xzqbsm)
820 this.changeDjq(this.checkedData.djqbsm) 893 this.changeDjq(this.checkedData.djqbsm)
821 this.$set(this.fghData.newZdlist, this.fghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) 894 this.$set(this.hFghData.newZdlist, this.hFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
895 break
896 default:
897 break
898 }
822 }, 899 },
823 delRow(index) { 900 delRow(index) {
824 this.fghData.newZdlist.splice(index, 1) 901 switch (this.tabName) {
902 case "zd":
903 this.zdFghData.newZdlist.splice(index, 1);
904 break;
905 case "dz":
906 this.dzFghData.newZdlist.splice(index, 1);
907 break;
908 case "h":
909 this.hFghData.newZdlist.splice(index, 1);
910 break;
911 default:
912 break
913 }
825 }, 914 },
826 close: function () { 915 close: function () {
827 this.centerDialogVisible = false; 916 this.centerDialogVisible = false;
...@@ -829,20 +918,43 @@ ...@@ -829,20 +918,43 @@
829 newAdd: function () { 918 newAdd: function () {
830 this.centerDialogVisible = true; 919 this.centerDialogVisible = true;
831 }, 920 },
832 addData: function (val) {
833 this.centerDialogVisible = false;
834 this.bgqData = val
835 },
836 getData: function (data) { 921 getData: function (data) {
837 this.bgqData = data 922 switch (this.tabName) {
923 case "zd":
924 this.zdFgqData = data;
925 break;
926 case "dz":
927 this.dzFgqData = data;
928 break;
929 case "h":
930 this.hFgqData = data;
931 break;
932 default:
933 break
934 }
935
838 }, 936 },
839 }, 937 },
840 computed: {}, 938 computed: {},
841 watch: { 939 watch: {
842 bgqData: { 940 zdFgqData: {
843 handler: function (item) { 941 handler: function (item) {
844 this.fghData.oldZdbsm = item.glbsm 942 this.zdFghData.oldZdbsm = item.zdbsm;
845 this.getJbxx(item.glbsm) 943 this.getZdJbxx(item.zdbsm);
944 },
945 deep: true
946 },
947 dzFgqData: {
948 handler: function (item) {
949 this.dzFgqData.oldZdbsm = item.glbsm;
950 this.getZdJbxx(item.glbsm);
951 },
952 deep: true
953 },
954 hFgqData: {
955 handler: function (item) {
956 this.hFgqData.oldZdbsm = item.glbsm;
957 this.getZdJbxx(item.glbsm);
846 }, 958 },
847 deep: true 959 deep: true
848 }, 960 },
...@@ -853,7 +965,7 @@ ...@@ -853,7 +965,7 @@
853 }, 965 },
854 deep: true 966 deep: true
855 } 967 }
856 }, 968 }
857 } 969 }
858 </script> 970 </script>
859 <style scoped lang="less"> 971 <style scoped lang="less">
......
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
372 return { 372 return {
373 tabName: 'zd', 373 tabName: 'zd',
374 centerDialogVisible: false, 374 centerDialogVisible: false,
375 bgqData: [], 375 zdFgqData: [],
376 hbhData: {}, 376 hbhData: {},
377 fgBoxWidth: 0, 377 fgBoxWidth: 0,
378 xzq: [], 378 xzq: [],
...@@ -462,10 +462,10 @@ ...@@ -462,10 +462,10 @@
462 }, 462 },
463 addData: function (val) { 463 addData: function (val) {
464 this.centerDialogVisible = false; 464 this.centerDialogVisible = false;
465 this.bgqData.push(val) 465 this.zdFgqData.push(val)
466 }, 466 },
467 getData: function (data) { 467 getData: function (data) {
468 this.bgqData.push(data) 468 this.zdFgqData.push(data)
469 }, 469 },
470 }, 470 },
471 computed: {}, 471 computed: {},
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-card> 42 </el-card>
43 </div> 43 </div>
44 <div class="notice" ref="notice"> 44 <div class="notice" ref="notice">
45 <el-card> 45 <el-card class="news">
46 <div slot="header" class="clearfix"> 46 <div slot="header" class="clearfix">
47 <span>通知公告</span> 47 <span>通知公告</span>
48 <span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span> 48 <span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
8 :before-remove="beforeRemove" 8 :before-remove="beforeRemove"
9 :on-success="uploadSuccess" 9 :on-success="uploadSuccess"
10 :on-error="uploadError" 10 :on-error="uploadError"
11 :show-file-list="false"
11 multiple 12 multiple
12 :limit="3" 13 :limit="3"
13 :on-exceed="handleExceed" 14 :on-exceed="handleExceed"
...@@ -107,10 +108,9 @@ ...@@ -107,10 +108,9 @@
107 }, 108 },
108 uploadSuccess(res, file, fileList) { 109 uploadSuccess(res, file, fileList) {
109 this.filesData.list = res.result; 110 this.filesData.list = res.result;
110 console.log(res, "res=========")
111 insertFile(this.filesData).then(res => { 111 insertFile(this.filesData).then(res => {
112 if (res.success) { 112 if (res.success) {
113 Message.warning("上传成功") 113 Message.success("上传成功")
114 this.getFileList(this.filesData.glbsm) 114 this.getFileList(this.filesData.glbsm)
115 } else { 115 } else {
116 Message.error(res.message) 116 Message.error(res.message)
......
...@@ -26,48 +26,48 @@ ...@@ -26,48 +26,48 @@
26 <el-col :span="16"> 26 <el-col :span="16">
27 <div class="fr"> 27 <div class="fr">
28 <el-button class="radioBtn" label="1" border @click="create" 28 <el-button class="radioBtn" label="1" border @click="create"
29 >创建楼盘</el-button 29 ><i class="fa fa-building-o"></i>创建楼盘</el-button
30 > 30 >
31 <el-button class="radioBtn" label="2" border @click="plScYcChange" 31 <el-button class="radioBtn" label="2" border @click="plScYcChange"
32 >实预测转换</el-button 32 ><i class="fa fa-building-o"></i>实预测转换</el-button
33 > 33 >
34 <el-button 34 <el-button
35 class="radioBtn" 35 class="radioBtn"
36 label="3" 36 label="3"
37 border 37 border
38 @click="openPl('h')" 38 @click="openPl('h')"
39 >批量户</el-button 39 ><i class="fa fa-building-o"></i> 批量户</el-button
40 > 40 >
41 <el-button 41 <el-button
42 class="radioBtn" 42 class="radioBtn"
43 label="4" 43 label="4"
44 border 44 border
45 @click="openPlC" 45 @click="openPlC"
46 >批量层</el-button 46 ><i class="fa fa-building-o"></i>批量层</el-button
47 > 47 >
48 <el-button 48 <el-button
49 class="radioBtn" 49 class="radioBtn"
50 label="5" 50 label="5"
51 border 51 border
52 @click="openPl('sh')" 52 @click="openPl('sh')"
53 >批量室号</el-button 53 ><i class="fa fa-building-o"></i>批量室号</el-button
54 > 54 >
55 <el-button 55 <el-button
56 class="radioBtn" 56 class="radioBtn"
57 label="6" 57 label="6"
58 border 58 border
59 @click="openPl('zl')" 59 @click="openPl('zl')"
60 >批量坐落</el-button 60 ><i class="fa fa-building-o"></i>批量坐落</el-button
61 > 61 >
62 <el-button class="radioBtn" label="7" border @click="addBdcdyh" 62 <el-button class="radioBtn" label="7" border @click="addBdcdyh"
63 >批量单元号</el-button 63 ><i class="fa fa-building-o"></i>批量单元号</el-button
64 > 64 >
65 <el-button 65 <el-button
66 class="radioBtn" 66 class="radioBtn"
67 label="7" 67 label="7"
68 border 68 border
69 @click="hcxlzVisible = true" 69 @click="hcxlzVisible = true"
70 >户重新落宗</el-button 70 ><i class="fa fa-building-o"></i>户重新落宗</el-button
71 > 71 >
72 </div> 72 </div>
73 </el-col> 73 </el-col>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 @click="handleChoosedH(item.bsms)" 141 @click="handleChoosedH(item.bsms)"
142 > 142 >
143 <td> 143 <td>
144 <i class="el-icon-star-on" :style="{ color: item.color }"></i 144 <i class="fa fa-circle" :style="{ color: item.color }"></i
145 >{{ item.name }} 145 >{{ item.name }}
146 </td> 146 </td>
147 <td>{{ item.ts }}</td> 147 <td>{{ item.ts }}</td>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 @click="handleChoosedH(item.bsms)" 168 @click="handleChoosedH(item.bsms)"
169 > 169 >
170 <td> 170 <td>
171 <i class="el-icon-star-on" :style="{ color: item.color }"></i 171 <i class="fa fa-circle" :style="{ color: item.color }"></i
172 >{{ item.name }} 172 >{{ item.name }}
173 </td> 173 </td>
174 <td>{{ item.ts }}</td> 174 <td>{{ item.ts }}</td>
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
198 @click="handleChoosedH(item.bsms)" 198 @click="handleChoosedH(item.bsms)"
199 > 199 >
200 <td> 200 <td>
201 <i class="el-icon-star-on" :style="{ color: item.color }"></i 201 <i class="fa fa-circle" :style="{ color: item.color }"></i
202 >{{ item.name }} 202 >{{ item.name }}
203 </td> 203 </td>
204 <td>{{ item.ts }}</td> 204 <td>{{ item.ts }}</td>
...@@ -314,55 +314,55 @@ export default { ...@@ -314,55 +314,55 @@ export default {
314 dyztList: [ 314 dyztList: [
315 { 315 {
316 name: "未确权", 316 name: "未确权",
317 color: "#2591FD", 317 color: "#83AAFE",
318 ts: "12", 318 ts: "12",
319 mj: "1633", 319 mj: "1633",
320 }, 320 },
321 { 321 {
322 name: "已确权", 322 name: "已确权",
323 color: "#2591FD", 323 color: "#6EDEE1",
324 ts: "22", 324 ts: "22",
325 mj: "3109", 325 mj: "3109",
326 }, 326 },
327 { 327 {
328 name: "已备案", 328 name: "已备案",
329 color: "#2591FD", 329 color: "#8ADC88",
330 ts: "3", 330 ts: "3",
331 mj: "409", 331 mj: "409",
332 }, 332 },
333 { 333 {
334 name: "预抵押", 334 name: "预抵押",
335 color: "#2591FD", 335 color: "#F2AD67",
336 ts: "11", 336 ts: "11",
337 mj: "1466", 337 mj: "1466",
338 }, 338 },
339 { 339 {
340 name: "在建抵押", 340 name: "在建抵押",
341 color: "#2591FD", 341 color: "#F191C8",
342 ts: "13", 342 ts: "13",
343 mj: "1792", 343 mj: "1792",
344 }, 344 },
345 { 345 {
346 name: "抵押", 346 name: "抵押",
347 color: "#2591FD", 347 color: "#FF8282",
348 ts: "14", 348 ts: "14",
349 mj: "13", 349 mj: "13",
350 }, 350 },
351 { 351 {
352 name: "查封", 352 name: "查封",
353 color: "#2591FD", 353 color: "#D7CECF",
354 ts: "9", 354 ts: "9",
355 mj: "1436", 355 mj: "1436",
356 }, 356 },
357 { 357 {
358 name: "异议", 358 name: "异议",
359 color: "#2591FD", 359 color: "#D4A3EB",
360 ts: "34", 360 ts: "34",
361 mj: "4342", 361 mj: "4342",
362 }, 362 },
363 { 363 {
364 name: "限制", 364 name: "限制",
365 color: "#2591FD", 365 color: "#A5A3FB",
366 ts: "2", 366 ts: "2",
367 mj: "285", 367 mj: "285",
368 }, 368 },
...@@ -614,34 +614,42 @@ export default { ...@@ -614,34 +614,42 @@ export default {
614 this.dyztList.splice(1,0,this.dyztList[8]); 614 this.dyztList.splice(1,0,this.dyztList[8]);
615 this.dyztList.pop(); 615 this.dyztList.pop();
616 this.dyztList.forEach(item=>{ 616 this.dyztList.forEach(item=>{
617 item.color = "#2591FD";
618 item.ts = item.bsms.length; 617 item.ts = item.bsms.length;
619 switch (item.name) { 618 switch (item.name) {
620 case 'Qqzt': 619 case 'Qqzt':
620 item.color = "#6EDEE1";
621 item.name = "已确权" 621 item.name = "已确权"
622 break; 622 break;
623 case 'Wqqzt': 623 case 'Wqqzt':
624 item.color = "#83AAFE";
624 item.name = "未确权" 625 item.name = "未确权"
625 break; 626 break;
626 case 'Bazt': 627 case 'Bazt':
628 item.color = "#8ADC88";
627 item.name = "已备案" 629 item.name = "已备案"
628 break; 630 break;
629 case 'Ydyzt': 631 case 'Ydyzt':
632 item.color = "#F2AD67";
630 item.name = "预抵押" 633 item.name = "预抵押"
631 break; 634 break;
632 case 'Zjgcdyzt': 635 case 'Zjgcdyzt':
636 item.color = "#F191C8";
633 item.name = "在建抵押" 637 item.name = "在建抵押"
634 break; 638 break;
635 case 'Dyzt': 639 case 'Dyzt':
640 item.color = "#FF8282";
636 item.name = "抵押" 641 item.name = "抵押"
637 break; 642 break;
638 case 'Cfzt': 643 case 'Cfzt':
644 item.color = "#D7CECF";
639 item.name = "查封" 645 item.name = "查封"
640 break; 646 break;
641 case 'Yyzt': 647 case 'Yyzt':
648 item.color = "#D4A3EB";
642 item.name = "异议" 649 item.name = "异议"
643 break; 650 break;
644 case 'Xzzt': 651 case 'Xzzt':
652 item.color = "#A5A3FB";
645 item.name = "限制" 653 item.name = "限制"
646 break; 654 break;
647 default: 655 default:
...@@ -698,6 +706,9 @@ export default { ...@@ -698,6 +706,9 @@ export default {
698 this.lpbContentwidth += 260; 706 this.lpbContentwidth += 260;
699 } 707 }
700 }, 708 },
709 selectedZt(n){
710 this.legendToggleFlag = true;
711 }
701 }, 712 },
702 }; 713 };
703 </script> 714 </script>
...@@ -736,7 +747,8 @@ export default { ...@@ -736,7 +747,8 @@ export default {
736 } 747 }
737 } 748 }
738 .radioBtn { 749 .radioBtn {
739 margin-left: 20px; 750 margin-left: 16px;
751 padding:12px 14px;
740 /deep/.el-radio-button__inner { 752 /deep/.el-radio-button__inner {
741 border: 1px solid #dcdfe6; 753 border: 1px solid #dcdfe6;
742 border-radius: 4px; 754 border-radius: 4px;
...@@ -857,5 +869,8 @@ export default { ...@@ -857,5 +869,8 @@ export default {
857 margin-top: 10vh!important; 869 margin-top: 10vh!important;
858 } 870 }
859 } 871 }
872 .fa{
873 padding-right: 4px;
874 }
860 } 875 }
861 </style> 876 </style>
......