Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c24f1b28 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 4d8b44b8 c695d202
Inline Side-by-side
Showing 12 changed files with 40 additions and 49 deletions
...@@ -103,7 +103,7 @@ ol, ul { list-style:none; } ...@@ -103,7 +103,7 @@ ol, ul { list-style:none; }
103 >.is-top{ 103 >.is-top{
104 position: -webkit-fixed; 104 position: -webkit-fixed;
105 position: fixed; 105 position: fixed;
106 top: 60px; 106 top: 72px;
107 z-index: 999; 107 z-index: 999;
108 width: 100%; 108 width: 100%;
109 margin-bottom: 0; 109 margin-bottom: 0;
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <li @click="exportToShp">ESRI Shape</li> 69 <li @click="exportToShp">ESRI Shape</li>
70 </ul> 70 </ul>
71 </li> 71 </li>
72 <li v-show="isZD" @click="drsx">导入属性</li> 72 <li @click="drsx">导入属性</li>
73 <li v-show="!isZD">导入楼盘</li> 73 <li v-show="!isZD">导入楼盘</li>
74 <li>重叠分析</li> 74 <li>重叠分析</li>
75 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li> 75 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-row> 69 <el-row>
70 <el-col :span="24"> 70 <el-col :span="24">
71 <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px"> 71 <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
72 <el-form-item class="demo-form-inline" label="查询范围"> 72 <el-form-item class="demo-form-inline" label="单元范围">
73 <el-checkbox-group v-model="queryData.dylxs" @change="query"> 73 <el-checkbox-group v-model="queryData.dylxs" @change="query">
74 <el-checkbox label="zd" name="type">宗地</el-checkbox> 74 <el-checkbox label="zd" name="type">宗地</el-checkbox>
75 <el-checkbox label="dz" name="type">多幢</el-checkbox> 75 <el-checkbox label="dz" name="type">多幢</el-checkbox>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <div class="main-button"> 8 <div class="main-button">
9 <el-upload 9 <el-upload
10 class="upload-demo" 10 class="upload-demo"
11 :action="uploadUrl" 11 action="/api/tx/excelGeo/import"
12 :data="sxdrData" 12 :data="sxdrData"
13 :on-success="uploadSuccess" 13 :on-success="uploadSuccess"
14 :show-file-list="false" 14 :show-file-list="false"
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
47 }, 47 },
48 data() { 48 data() {
49 return { 49 return {
50 uploadUrl: '',
51 isVisible: false, 50 isVisible: false,
52 sxdrData: { 51 sxdrData: {
53 bsm: '', 52 bsm: '',
...@@ -65,7 +64,6 @@ ...@@ -65,7 +64,6 @@
65 }, 64 },
66 reset() { 65 reset() {
67 this.errorData = []; 66 this.errorData = [];
68 this.uploadUrl = '';
69 this.sxdrData = {bsm: ''}; 67 this.sxdrData = {bsm: ''};
70 }, 68 },
71 close() { 69 close() {
...@@ -97,13 +95,6 @@ ...@@ -97,13 +95,6 @@
97 }, 95 },
98 dylx(val) { 96 dylx(val) {
99 this.sxdrData.type=val; 97 this.sxdrData.type=val;
100 switch (val) {
101 case "zd":
102 this.uploadUrl = "/api/tx/excelGeo/import";
103 break;
104 default:
105 break;
106 }
107 }, 98 },
108 bsm(val) { 99 bsm(val) {
109 this.sxdrData.bsm = val; 100 this.sxdrData.bsm = val;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 v-for="(item, index) in headTop" 26 v-for="(item, index) in headTop"
27 :key="index + '1'" 27 :key="index + '1'"
28 :class="{ 'is-active': item.select }" 28 :class="{ 'is-active': item.select }"
29 :style="{'height':item.name == '首页' && item.select ? '70'+'px' : '71'+'px'}"
29 @click="selectTopItems(index)" 30 @click="selectTopItems(index)"
30 > 31 >
31 <i :class="item.icon"></i> 32 <i :class="item.icon"></i>
...@@ -335,6 +336,7 @@ export default { ...@@ -335,6 +336,7 @@ export default {
335 } 336 }
336 }, 337 },
337 selectTopItems(ind) { 338 selectTopItems(ind) {
339 console.log(this.headTop);
338 if (ind == 1) { 340 if (ind == 1) {
339 //点击新建，弹框 341 //点击新建，弹框
340 this.dialogVisible = true; 342 this.dialogVisible = true;
...@@ -430,19 +432,22 @@ export default { ...@@ -430,19 +432,22 @@ export default {
430 .el-header { 432 .el-header {
431 background-color: #fff; 433 background-color: #fff;
432 padding: 0 !important; 434 padding: 0 !important;
435 height: 72px!important;
433 .header-top { 436 .header-top {
434 height: 60px; 437 height: 72px;
435 border-bottom: 1px solid#EAEAEA; 438 border-bottom: 1px solid#EAEAEA;
436 box-sizing: border-box; 439 box-sizing: border-box;
437 .top-items { 440 .top-items {
438 cursor: pointer; 441 cursor: pointer;
439 height: 60px; 442 height: 72px;
440 padding: 0 30px; 443 padding: 0 30px;
441 font-size: 18px; 444 font-size: 18px;
442 line-height: 60px; 445 line-height: 72px;
443 float: left; 446 float: left;
444 position: relative; 447 position: relative;
445 color: #4a4a4a; 448 color: #4a4a4a;
449 // border-left: 1px solid #EAEAEA;
450 border-right: 1px solid #EAEAEA;
446 i { 451 i {
447 margin-right: 6px; 452 margin-right: 6px;
448 font-size: 18px; 453 font-size: 18px;
...@@ -451,15 +456,13 @@ export default { ...@@ -451,15 +456,13 @@ export default {
451 } 456 }
452 .hamburger { 457 .hamburger {
453 font-size: 16px; 458 font-size: 16px;
454 line-height: 60px; 459 line-height: 72px;
455 color: #000; 460 color: #000;
456 } 461 }
457 } 462 }
458 .top-items.is-active { 463 .top-items.is-active {
459 color: #006cff; 464 color: #006cff;
460 border-left: 1px solid #EAEAEA; 465 height: 71px;
461 border-right: 1px solid #EAEAEA;
462 height: 58px;
463 border-bottom: 1px solid #FFF; 466 border-bottom: 1px solid #FFF;
464 } 467 }
465 } 468 }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 <el-tabs v-model="activeName" class="tabs"> 2 <el-tabs v-model="activeName" class="tabs">
3 <el-tab-pane label="添加" name="tj"> 3 <el-tab-pane label="添加" name="tj">
4 <div class="main"> 4 <div class="main">
5 <p class="tips">查询条件</p> 5 <!-- <p class="tips">查询条件</p> -->
6 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 6 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
7 <p class="tips">查询列表</p> 7 <!-- <p class="tips">查询列表</p> -->
8 <div class="dataGrid" ref="dataGrid"> 8 <div class="dataGrid" ref="dataGrid">
9 <el-table 9 <el-table
10 :data="tableData" 10 :data="tableData"
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <template v-if="isCxlz"> 3 <template v-if="isCxlz">
4 <p class="tips">查询条件</p> 4 <!-- <p class="tips">查询条件</p> -->
5 <div class="search"> 5 <div class="search">
6 <el-row> 6 <el-row>
7 <el-col :span="24" style="margin-left: -10px;"> 7 <el-col :span="24" style="margin-left: -10px;">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 </el-col> 49 </el-col>
50 </el-row> 50 </el-row>
51 </div> 51 </div>
52 <p class="tips">查询列表</p> 52 <!-- <p class="tips">查询列表</p> -->
53 <el-table :data="Data" :height="tableHeight"> 53 <el-table :data="Data" :height="tableHeight">
54 <td class="xh">序号</td> 54 <td class="xh">序号</td>
55 <td class="cz">操作</td> 55 <td class="cz">操作</td>
...@@ -525,7 +525,10 @@ export default { ...@@ -525,7 +525,10 @@ export default {
525 //改变syclx，更新楼盘表数据 525 //改变syclx，更新楼盘表数据
526 scyclx(n){ 526 scyclx(n){
527 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData 527 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
528 } 528 },
529 selectedZt(n){
530 this.legendToggleFlag = true;
531 },
529 }, 532 },
530 }; 533 };
531 </script> 534 </script>
...@@ -677,10 +680,7 @@ table:hover { ...@@ -677,10 +680,7 @@ table:hover {
677 color: #fff; 680 color: #fff;
678 border-bottom: 1px solid #e6e6e6; 681 border-bottom: 1px solid #e6e6e6;
679 } 682 }
680 .dyzt { 683 .dyzt,
681 height: 81px;
682 line-height: 81px;
683 }
684 .fwxz, 684 .fwxz,
685 .fwyt { 685 .fwyt {
686 height: 122px; 686 height: 122px;
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <template v-if="isFwsxbg"> 3 <template v-if="isFwsxbg">
4 <p class="tips">查询条件</p> 4 <!-- <p class="tips">查询条件</p> -->
5 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 5 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
6 <p class="tips">查询列表</p> 6 <!-- <p class="tips">查询列表</p> -->
7 <div class="dataGrid" ref="dataGrid"> 7 <div class="dataGrid" ref="dataGrid">
8 <el-table 8 <el-table
9 :data="tableData" 9 :data="tableData"
...@@ -561,7 +561,10 @@ export default { ...@@ -561,7 +561,10 @@ export default {
561 //改变syclx，更新楼盘表数据 561 //改变syclx，更新楼盘表数据
562 scyclx(n){ 562 scyclx(n){
563 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData 563 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
564 } 564 },
565 selectedZt(n){
566 this.legendToggleFlag = true;
567 },
565 }, 568 },
566 }; 569 };
567 </script> 570 </script>
...@@ -630,10 +633,7 @@ export default { ...@@ -630,10 +633,7 @@ export default {
630 color: #fff; 633 color: #fff;
631 border-bottom: 1px solid #e6e6e6; 634 border-bottom: 1px solid #e6e6e6;
632 } 635 }
633 .dyzt { 636 .dyzt,
634 height: 81px;
635 line-height: 81px;
636 }
637 .fwxz, 637 .fwxz,
638 .fwyt { 638 .fwyt {
639 height: 122px; 639 height: 122px;
......
...@@ -508,7 +508,10 @@ export default { ...@@ -508,7 +508,10 @@ export default {
508 //改变syclx，更新楼盘表数据 508 //改变syclx，更新楼盘表数据
509 scyclx(n){ 509 scyclx(n){
510 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData 510 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
511 } 511 },
512 selectedZt(n){
513 this.legendToggleFlag = true;
514 },
512 }, 515 },
513 } 516 }
514 </script> 517 </script>
...@@ -561,10 +564,7 @@ export default { ...@@ -561,10 +564,7 @@ export default {
561 color: #fff; 564 color: #fff;
562 border-bottom: 1px solid #e6e6e6; 565 border-bottom: 1px solid #e6e6e6;
563 } 566 }
564 .dyzt { 567 .dyzt,
565 height: 81px;
566 line-height: 81px;
567 }
568 .fwxz, 568 .fwxz,
569 .fwyt { 569 .fwyt {
570 height: 122px; 570 height: 122px;
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 <el-tabs v-model="activeName" class="tabs"> 2 <el-tabs v-model="activeName" class="tabs">
3 <el-tab-pane label="更正" name="gz"> 3 <el-tab-pane label="更正" name="gz">
4 <div class="main"> 4 <div class="main">
5 <p class="tips">查询条件</p> 5 <!-- <p class="tips">查询条件</p> -->
6 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 6 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
7 <p class="tips">查询列表</p> 7 <!-- <p class="tips">查询列表</p> -->
8 <div class="dataGrid" ref="dataGrid"> 8 <div class="dataGrid" ref="dataGrid">
9 <el-table 9 <el-table
10 :data="tableData" 10 :data="tableData"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 <el-tabs v-model="activeName" class="tabs"> 2 <el-tabs v-model="activeName" class="tabs">
3 <el-tab-pane label="综合查询" name="zhcx"> 3 <el-tab-pane label="综合查询" name="zhcx">
4 <div class="main"> 4 <div class="main">
5 <p class="tips">查询条件</p> 5 <!-- <p class="tips">查询条件</p> -->
6 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 6 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
7 <p class="tips">查询列表</p> 7 <!-- <p class="tips">查询列表</p> -->
8 <div class="dataGrid" ref="dataGrid"> 8 <div class="dataGrid" ref="dataGrid">
9 <el-table 9 <el-table
10 :data="tableData" 10 :data="tableData"
......
...@@ -853,10 +853,7 @@ export default { ...@@ -853,10 +853,7 @@ export default {
853 color: #fff; 853 color: #fff;
854 border-bottom: 1px solid #e6e6e6; 854 border-bottom: 1px solid #e6e6e6;
855 } 855 }
856 .dyzt { 856 .dyzt,
857 height: 81px;
858 line-height: 81px;
859 }
860 .fwxz, 857 .fwxz,
861 .fwyt { 858 .fwyt {
862 height: 122px; 859 height: 122px;
......