Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 86190a7a e66b4045
Inline Side-by-side
Showing 9 changed files with 106 additions and 72 deletions
...@@ -767,7 +767,7 @@ export default { ...@@ -767,7 +767,7 @@ export default {
767 } 767 }
768 } 768 }
769 .qlxzModule { 769 .qlxzModule {
770 width: calc(100% - 101px); 770 width: calc(100% - 102px);
771 height: auto; 771 height: auto;
772 position: relative; 772 position: relative;
773 border-bottom: 1px solid #E6E6E6; 773 border-bottom: 1px solid #E6E6E6;
......
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
39 <span class="qsztFont" style="color: red; ">临</span> 39 <span class="qsztFont" style="color: red; ">临</span>
40 </span> 40 </span>
41 <span class="qsztImg" v-if="item.qszt=='1'" > 41 <span class="qsztImg" v-if="item.qszt=='1'" >
42 <span class="qsztFont" style="color: #00FF00; ">正</span> 42 <span class="qsztFont" style="color: #1AD6E1; ">正</span>
43 </span> 43 </span>
44 <span class="qsztImg" v-if="item.qszt=='2'" > 44 <span class="qsztImg" v-if="item.qszt=='2'" >
45 <span class="qsztFont" style="color: blue; ">现</span> 45 <span class="qsztFont" style="color: #45AEFD; ">现</span>
46 </span> 46 </span>
47 </template> 47 </template>
48 48
...@@ -77,7 +77,11 @@ ...@@ -77,7 +77,11 @@
77 ></div> 77 ></div>
78 <div 78 <div
79 v-if="item.children==null" 79 v-if="item.children==null"
80 class="reTree_icon reTree_expand_icon" 80 class="reTree_icon"
81 :class="{
82 reTree_default_icon: item.dm != 'G' && item.dm != 'J' && item.dm != 'Z',
83 reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z',
84 }"
81 :style="{ 85 :style="{
82 height: (size || 16 * 1.2) + 'px', 86 height: (size || 16 * 1.2) + 'px',
83 width: (size || 16 * 1.2) + 'px', 87 width: (size || 16 * 1.2) + 'px',
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 @changeDzVisible="changeDzVisible" 47 @changeDzVisible="changeDzVisible"
48 @changeGzwVisible="changeGzwVisible" 48 @changeGzwVisible="changeGzwVisible"
49 :list="item.children" 49 :list="item.children"
50 :visible="visible" 50 :visible="zrzVisible"
51 :size="size" 51 :size="size"
52 :islpb="islpb" 52 :islpb="islpb"
53 :formatData="formatData" 53 :formatData="formatData"
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 </div> 55 </div>
56 56
57 <ul 57 <ul
58 v-show="visible" 58 v-show="zrzVisible"
59 :style="{ left: left + 'px', top: top + 'px' }" 59 :style="{ left: left + 'px', top: top + 'px' }"
60 class="contextmenu" 60 class="contextmenu"
61 > 61 >
...@@ -169,6 +169,8 @@ export default { ...@@ -169,6 +169,8 @@ export default {
169 currentClickZdGeo:"", 169 currentClickZdGeo:"",
170 improtDialog:false, 170 improtDialog:false,
171 dialogVisible:false, 171 dialogVisible:false,
172 //控制自然幢右键菜单
173 zrzVisible:false,
172 //控制楼盘表 174 //控制楼盘表
173 lpbvisible: false, 175 lpbvisible: false,
174 lpbtop: 0, 176 lpbtop: 0,
...@@ -210,6 +212,13 @@ export default { ...@@ -210,6 +212,13 @@ export default {
210 document.body.removeEventListener("click", this.closeMenu); 212 document.body.removeEventListener("click", this.closeMenu);
211 } 213 }
212 }, 214 },
215 zrzVisible(value) {
216 if (value) {
217 document.body.addEventListener("click", this.closeMenu);
218 } else {
219 document.body.removeEventListener("click", this.closeMenu);
220 }
221 },
213 222
214 // createVisible(value) { 223 // createVisible(value) {
215 // if (value) { 224 // if (value) {
...@@ -270,7 +279,10 @@ export default { ...@@ -270,7 +279,10 @@ export default {
270 }, 279 },
271 // 改变菜单数据 280 // 改变菜单数据
272 changeVisible(data) { 281 changeVisible(data) {
273 this.visible = data; 282 this.zrzVisible = data;
283 this.lpbvisible = false;
284 this.dzVisible = false;
285 this.gzwVisible = false;
274 }, 286 },
275 changeZdData(data) { 287 changeZdData(data) {
276 this.zdData = data; 288 this.zdData = data;
...@@ -289,6 +301,9 @@ export default { ...@@ -289,6 +301,9 @@ export default {
289 }, 301 },
290 changeLpbVisible(data) { 302 changeLpbVisible(data) {
291 this.lpbvisible = data; 303 this.lpbvisible = data;
304 this.zrzVisible = false;
305 this.dzVisible = false;
306 this.gzwVisible = false;
292 }, 307 },
293 changeCreateVisible(data){ 308 changeCreateVisible(data){
294 this.createVisible = true; 309 this.createVisible = true;
...@@ -296,10 +311,16 @@ export default { ...@@ -296,10 +311,16 @@ export default {
296 //多幢 311 //多幢
297 changeDzVisible(data){ 312 changeDzVisible(data){
298 this.dzVisible = data; 313 this.dzVisible = data;
314 this.zrzVisible = false;
315 this.lpbvisible = false;
316 this.gzwVisible = false;
299 }, 317 },
300 //构筑物 318 //构筑物
301 changeGzwVisible(data){ 319 changeGzwVisible(data){
302 this.gzwVisible = data; 320 this.gzwVisible = data;
321 this.zrzVisible = false;
322 this.lpbvisible = false;
323 this.dzVisible = false;
303 }, 324 },
304 //添加定着物 325 //添加定着物
305 openCreateDialog(type){ 326 openCreateDialog(type){
...@@ -397,6 +418,7 @@ export default { ...@@ -397,6 +418,7 @@ export default {
397 }, 418 },
398 //关闭右键菜单 419 //关闭右键菜单
399 closeMenu(){ 420 closeMenu(){
421 this.zrzVisible = false;
400 this.lpbvisible = false; 422 this.lpbvisible = false;
401 this.dzVisible = false; 423 this.dzVisible = false;
402 this.gzwVisible = false; 424 this.gzwVisible = false;
......
...@@ -112,30 +112,30 @@ ...@@ -112,30 +112,30 @@
112 <td colspan="4"></td> 112 <td colspan="4"></td>
113 </tr> 113 </tr>
114 <tr> 114 <tr>
115 <td colspan="2" class="tdright">房屋结构</td> 115 <td colspan="2" class="tdright">东墙体归属</td>
116 <td colspan="5"> 116 <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
117 <el-select class="selectTitle" v-model="form.fwjgbsm"> 117 <td colspan="2" class="tdright">南墙体归属</td>
118 <el-option 118 <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
119 v-for="item in $store.state.jgOptions" 119 </tr>
120 :key="item.bsm" 120 <tr>
121 :label="item.mc" 121 <td colspan="2" class="tdright">西墙体归属</td>
122 :value="item.bsm"> 122 <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
123 </el-option> 123 <td colspan="2" class="tdright">北墙体归属</td>
124 </el-select> 124 <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
125 </td>
126 </tr> 125 </tr>
126
127 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 127 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
128 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright"> 128 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright">
129 <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> 129 <i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
130 <span>用途</span> 130 <span>房屋用途</span>
131 </td> 131 </td>
132 132
133 <td width="30" colspan="1" align="center" class="tdright"> 133 <td width="30" colspan="1" align="center" class="tdright">
134 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> 134 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
135 规划用途 135 规划用途
136 </td> 136 </td>
137 <td width="30" colspan="4" align="center" > 137 <td width="30" colspan="3" align="center" >
138 <el-select-tree 138 <el-select-tree style="width:100%"
139 v-if="show" 139 v-if="show"
140 :default-expand-all="defaultExpandAll" 140 :default-expand-all="defaultExpandAll"
141 :multiple="multiple" 141 :multiple="multiple"
...@@ -148,10 +148,10 @@ ...@@ -148,10 +148,10 @@
148 v-model="item1.fwytzdbsm" 148 v-model="item1.fwytzdbsm"
149 ></el-select-tree> 149 ></el-select-tree>
150 </td> 150 </td>
151 <td width="30" colspan="1" align="center" class="tdright">用途</td> 151 <td width="30" colspan="2" align="center" class="tdright">用途</td>
152 <td width="30" colspan="4" align="center" > 152 <td width="30" colspan="4" align="center" >
153 <el-select-tree 153 <el-select-tree style="width:100%"
154 v-if="show" 154 v-if="show"
155 :default-expand-all="defaultExpandAll" 155 :default-expand-all="defaultExpandAll"
156 :multiple="multiple" 156 :multiple="multiple"
157 :placeholder="placeholder" 157 :placeholder="placeholder"
...@@ -167,15 +167,15 @@ ...@@ -167,15 +167,15 @@
167 167
168 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 168 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
169 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright"> 169 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright">
170 <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> 170 <i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
171 <span>房屋结构</span> 171 <span>房屋结构</span>
172 </td> 172 </td>
173 <td colspan="1" align="center" > 173 <td colspan="1" align="center" >
174 <i class="iconfont iconicon-test" style="margin-right: 10px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> 174 <i class="iconfont iconicon-test" style="margin-right: 8px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
175 <span>删除</span> 175 <span>房屋结构</span>
176 </td> 176 </td>
177 <td colspan="9" > 177 <td colspan="9" >
178 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 178 <el-select style="width:100%" v-model="item1.fwjgzdbsm" placeholder="请选择" >
179 <el-option 179 <el-option
180 v-for="item in $store.state.jgOptions" 180 v-for="item in $store.state.jgOptions"
181 :key="item.bsm" 181 :key="item.bsm"
...@@ -192,18 +192,6 @@ ...@@ -192,18 +192,6 @@
192 </td> 192 </td>
193 </tr> 193 </tr>
194 194
195 <tr>
196 <td colspan="2" class="tdright">东墙体归属</td>
197 <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
198 <td colspan="2" class="tdright">南墙体归属</td>
199 <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
200 </tr>
201 <tr>
202 <td colspan="2" class="tdright">西墙体归属</td>
203 <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
204 <td colspan="2" class="tdright">北墙体归属</td>
205 <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
206 </tr>
207 </table> 195 </table>
208 </div> 196 </div>
209 <div class="shop"> 197 <div class="shop">
......
...@@ -58,17 +58,17 @@ ...@@ -58,17 +58,17 @@
58 </div> 58 </div>
59 <div class="xlgz"> 59 <div class="xlgz">
60 <span> 60 <span>
61 样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”) 61 样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
62 <br/> 62 <br/>
63 样例2：11301室<span>（1单元13层01室）</span>([单元号][层号][室号后缀]) 63 样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀])
64 <br/> 64 <br/>
65 样例3：101<span>(1层01室)</span>([层号]) 65 样例3：11<span>(1层01室)</span>([层号])
66 <br/> 66 <br/>
67 样例4：1-101<span>(1单元-01层01室)</span>([单元号][层号][分隔符]，勾选“层号之前增加分隔符”) 67 样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
68 <br/> 68 <br/>
69 样例5：1-13-01<span>(1单元13层01室)</span>([单元号][层号][分隔符]) 69 样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
70 <br/> 70 <br/>
71 样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”) 71 样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”)
72 </span> 72 </span>
73 </div> 73 </div>
74 </div> 74 </div>
......
...@@ -5,25 +5,28 @@ ...@@ -5,25 +5,28 @@
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="30%" 6 width="30%"
7 :before-close="close"> 7 :before-close="close">
8 <div class="main-button"> 8 <div class="wrap">
9 <el-upload 9 <div class="main-button">
10 class="upload-demo" 10 <el-upload
11 action="/api/tx/excelGeo/import" 11 class="upload-demo"
12 :data="sxdrData" 12 action="/api/tx/excelGeo/import"
13 :on-success="uploadSuccess" 13 :data="sxdrData"
14 :show-file-list="false" 14 :on-success="uploadSuccess"
15 multiple 15 :on-error="uploadError"
16 > 16 :show-file-list="false"
17 <el-button type="primary" icon="iconfont iconshangchuan">上传</el-button> 17 multiple
18 </el-upload> 18 >
19 <el-button type="primary" @click="downloadTemplate">下载模板</el-button> 19 <el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
20 </div> 20 </el-upload>
21 </div>
22 <el-button type="primary" class="download" @click="downloadTemplate">下载模板</el-button>
23 </div>
21 <ul> 24 <ul>
22 <li v-for="(item,index) in errorData" :key="index">{{item}}</li> 25 <li v-for="(item,index) in errorData" :key="index">{{item}}</li>
23 </ul> 26 </ul>
24 <span slot="footer" class="dialog-footer"> 27 <span slot="footer" class="dialog-footer">
25 <el-button @click="cancel">取 消</el-button> 28 <el-button @click="cancel">取 消</el-button>
26 <el-button type="primary" @click="confirm">确 定</el-button> 29 <!-- <el-button type="primary" @click="confirm">确 定</el-button> -->
27 </span> 30 </span>
28 </el-dialog> 31 </el-dialog>
29 </div> 32 </div>
...@@ -114,13 +117,27 @@ ...@@ -114,13 +117,27 @@
114 </script> 117 </script>
115 118
116 <style scoped lang="less"> 119 <style scoped lang="less">
117 .main-button { 120 .wrap{
118 display: -webkit-flex; 121 width: 100%;
119 display: flex; 122 height: 30px;
120 flex-direction: column-reverse; 123 position: relative;
121 flex-wrap: nowrap; 124 .main-button {
125 display: -webkit-flex;
126 display: flex;
127 flex-direction: column-reverse;
128 flex-wrap: nowrap;
129 position: absolute;
130 left: 165px;
131 top: 18px;
132 }
133 .download{
134 position: absolute;
135 left: 300px;
136 top: 18px;
137 }
122 } 138 }
123 139
140
124 ul { 141 ul {
125 margin-top: 20px; 142 margin-top: 20px;
126 li { 143 li {
......
...@@ -343,5 +343,8 @@ export default { ...@@ -343,5 +343,8 @@ export default {
343 .pagination { 343 .pagination {
344 padding: 18px; 344 padding: 18px;
345 } 345 }
346 .el-table{
347 border: 0!important;
348 }
346 } 349 }
347 </style> 350 </style>
......
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
534 } 534 }
535 this.$nextTick(()=>{ 535 this.$nextTick(()=>{
536 this.mainBoxWidth = this.$refs.mainBox.clientWidth; 536 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
537 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 300 537 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 230
538 }) 538 })
539 }, 539 },
540 methods: { 540 methods: {
......
...@@ -872,18 +872,18 @@ export default { ...@@ -872,18 +872,18 @@ export default {
872 box-sizing: border-box; 872 box-sizing: border-box;
873 padding: 0 20px; 873 padding: 0 20px;
874 /deep/.el-radio-button__inner { 874 /deep/.el-radio-button__inner {
875 border: 1px solid #00cacd; 875 border: 1px solid #3fa2e1;
876 color: #00cacd; 876 color: #3fa2e1;
877 } 877 }
878 /deep/.el-radio-button__inner:hover { 878 /deep/.el-radio-button__inner:hover {
879 color: #00cacd; 879 color: #3fa2e1;
880 } 880 }
881 /deep/.is-active .el-radio-button__inner { 881 /deep/.is-active .el-radio-button__inner {
882 color: #fff; 882 color: #fff;
883 } 883 }
884 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { 884 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
885 background-color: #00cacd; 885 background-color: #3fa2e1;
886 border-color: #00cacd; 886 border-color: #3fa2e1;
887 } 887 }
888 .searchInput { 888 .searchInput {
889 transition: 0.5s; 889 transition: 0.5s;
......