Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2f62c379 by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/zrz/lpb/bjlp/index.vue
2 parents 4ca4142e 2f680e51
Expand all
Inline Side-by-side
Showing 22 changed files with 755 additions and 230 deletions
1
2 @font-face {font-family: "iconfont";
3 src: url('//at.alicdn.com/t/font_8d5l8fzk5b87iudi.eot?t=1501489744354'); /* IE9*/
4 src: url('//at.alicdn.com/t/font_8d5l8fzk5b87iudi.eot?t=1501489744354#iefix') format('embedded-opentype'), /* IE6-IE8 */
5 url('//at.alicdn.com/t/font_8d5l8fzk5b87iudi.woff?t=1501489744354') format('woff'), /* chrome, firefox */
6 url('//at.alicdn.com/t/font_8d5l8fzk5b87iudi.ttf?t=1501489744354') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
7 url('//at.alicdn.com/t/font_8d5l8fzk5b87iudi.svg?t=1501489744354#iconfont') format('svg'); /* iOS 4.1- */
8 }
9
10 .iconfont {
11 font-family:"iconfont" !important;
12 font-size:16px;
13 font-style:normal;
14 -webkit-font-smoothing: antialiased;
15 -moz-osx-font-smoothing: grayscale;
16 }
17
18 .icon-tuichu:before { content: "\e604"; }
19
20 .icon-fanhui:before { content: "\e608"; }
21
22 .icon-facebook:before { content: "\e60e"; }
23
24 .icon-twitter:before { content: "\e60f"; }
25
26 .icon-xiangyou:before { content: "\e609"; }
27
28 .icon-right:before { content: "\e60a"; }
29
30 .icon-fanhui1:before { content: "\e60b"; }
31
32 .icon-fenxiang:before { content: "\e632"; }
33
34 .icon-xiangxia:before { content: "\e605"; }
35
36 .icon-xiangxia1:before { content: "\e606"; }
37
38 .icon-xiangxia2:before { content: "\e607"; }
39
40 .icon-suofang:before { content: "\e677"; }
41
42 .icon-chexiao:before { content: "\e688"; }
43
44 .icon-esc:before { content: "\e629"; }
45
46 .icon-chexiao1:before { content: "\e675"; }
47
48 .icon-iconfont:before { content: "\e631"; }
49
50 .icon-suoding:before { content: "\e633"; }
51
52 .icon-bianji:before { content: "\e636"; }
53
54 .icon-shoucang2:before { content: "\e638"; }
55
56 .icon-xinjian:before { content: "\e639"; }
57
58 .icon-shoucang1:before { content: "\e63a"; }
59
60 .icon-gongkai:before { content: "\e63b"; }
61
62 .icon-gouwuche1:before { content: "\e63c"; }
63
64 .icon-zhongwen:before { content: "\e63f"; }
65
66 .icon-shangchuan:before { content: "\e640"; }
67
68 .icon-yingwen:before { content: "\e641"; }
69
70 .icon-gouwuche2:before { content: "\e642"; }
71
72 .icon-shanchu:before { content: "\e643"; }
73
74 .icon-xiazai:before { content: "\e644"; }
75
76 .icon-sousuo:before { content: "\e645"; }
77
78 .icon-dashang:before { content: "\e634"; }
79
80 .icon-xiangmu:before { content: "\e635"; }
81
82 .icon-fuzhidaima1:before { content: "\e646"; }
83
84 .icon-wofaqi:before { content: "\e647"; }
85
86 .icon-xiangmuchengyuan:before { content: "\e648"; }
87
88 .icon-gengduo:before { content: "\e649"; }
89
90 .icon-wocanyu:before { content: "\e64a"; }
91
92 .icon-lishi:before { content: "\e64b"; }
93
94 .icon-piliang:before { content: "\e64c"; }
95
96 .icon-shijian:before { content: "\e64d"; }
97
98 .icon-gonggao:before { content: "\e652"; }
99
100 .icon-weixin:before { content: "\e653"; }
101
102 .icon-weibo:before { content: "\e654"; }
103
104 .icon-gerenzhanghu:before { content: "\e637"; }
105
106 .icon-tianjiachengyuan:before { content: "\e63d"; }
107
108 .icon-soutubiao:before { content: "\e63e"; }
109
110 .icon-souren:before { content: "\e655"; }
111
112 .icon-yuzhanghao:before { content: "\e656"; }
113
114 .icon-biaoqing:before { content: "\e657"; }
115
116 .icon-qq:before { content: "\e658"; }
117
118 .icon-weibo1:before { content: "\e659"; }
119
120 .icon-zuoxuan:before { content: "\e65a"; }
121
122 .icon-fangda2:before { content: "\e65b"; }
123
124 .icon-zuo2:before { content: "\e65c"; }
125
126 .icon-suoxiao:before { content: "\e65d"; }
127
128 .icon-you2:before { content: "\e65e"; }
129
130 .icon-suoxiao2:before { content: "\e65f"; }
131
132 .icon-youxuan2:before { content: "\e660"; }
133
134 .icon-zuo:before { content: "\e661"; }
135
136 .icon-zuoxuan2:before { content: "\e662"; }
137
138 .icon-shang:before { content: "\e663"; }
139
140 .icon-shang2:before { content: "\e664"; }
141
142 .icon-youxuan:before { content: "\e665"; }
143
144 .icon-xia2:before { content: "\e666"; }
145
146 .icon-fangda:before { content: "\e667"; }
147
148 .icon-xia:before { content: "\e668"; }
149
150 .icon-you:before { content: "\e669"; }
151
152 .icon-zhuanrang:before { content: "\e66a"; }
153
154 .icon-dianzan:before { content: "\e66b"; }
155
156 .icon-huifu:before { content: "\e66c"; }
157
158 .icon-saoyisao:before { content: "\e66d"; }
159
160 .icon-shuoming:before { content: "\e600"; }
161
162 .icon-jinggao:before { content: "\e601"; }
163
164 .icon-jieshi:before { content: "\e602"; }
165
166 .icon-youxiang:before { content: "\e603"; }
167
168 .icon-guanbi:before { content: "\e60c"; }
169
170 .icon-qunzhu:before { content: "\e60d"; }
171
172 .icon-fuzhichenggong:before { content: "\e611"; }
173
174 .icon-weijiaru:before { content: "\e612"; }
175
176 .icon-daishenhe:before { content: "\e613"; }
177
178 .icon-shenhetongguo:before { content: "\e614"; }
179
180 .icon-shenhejujue:before { content: "\e615"; }
181
182 .icon-xinjiantubiaoku:before { content: "\e616"; }
183
184 .icon-tubiaoku:before { content: "\e617"; }
185
186 .icon-gouwuche:before { content: "\e618"; }
187
188 .icon-huidingbu:before { content: "\e619"; }
189
190 .icon-dianzan1:before { content: "\e61a"; }
191
192 .icon-morentouxiang:before { content: "\e610"; }
193
194 .icon-paixu:before { content: "\e61b"; }
195
196 .icon-wenjian:before { content: "\e61c"; }
197
198 .icon-github:before { content: "\e61d"; }
199
200 .icon-yuzhanghao1:before { content: "\e61e"; }
201
202 .icon-weibo2:before { content: "\e61f"; }
203
204 .icon-you1:before { content: "\e620"; }
205
206 .icon-zuo1:before { content: "\e621"; }
207
208 .icon-shang1:before { content: "\e622"; }
209
210 .icon-iconfont1:before { content: "\e623"; }
211
212 .icon-gonggaodayi:before { content: "\e625"; }
213
214 .icon-gongnengjieshao:before { content: "\e626"; }
215
216 .icon-tubiaohuizhi:before { content: "\e627"; }
217
218 .icon-daimayingyong:before { content: "\e628"; }
219
220 .icon-zhifubao:before { content: "\e624"; }
221
222 .icon-alibaba:before { content: "\e62a"; }
223
224 .icon-xiaomi:before { content: "\e62b"; }
225
226 .icon-zhongguodianxin:before { content: "\e62c"; }
227
228 .icon-tianmao:before { content: "\e62d"; }
229
230 .icon-alimama:before { content: "\e62e"; }
231
232 .icon-zhubajie:before { content: "\e62f"; }
233
234 .icon-tengxunwang:before { content: "\e630"; }
235
236 .icon-aliyun:before { content: "\e64e"; }
237
238 .icon-taobaowang:before { content: "\e64f"; }
239
240 .icon-anzhuo:before { content: "\e650"; }
241
242 .icon-ios:before { content: "\e651"; }
243
244 .icon-pcduan:before { content: "\e670"; }
245
246 .icon-qingchu:before { content: "\e673"; }
247
248 .icon-huizhiguize:before { content: "\e66e"; }
249
250 .icon-zhizuoliucheng:before { content: "\e66f"; }
251
252 .icon-fuzhidaima:before { content: "\e671"; }
253
254 .icon-fankui1:before { content: "\e672"; }
255
256 .icon-weitijiao:before { content: "\e674"; }
257
258 .icon-chexiao2:before { content: "\e676"; }
259
...\ No newline at end of file ...\ No newline at end of file
1 { 1 {
2 "id": "2105925", 2 "id": "2242995",
3 "name": "不动产项目", 3 "name": "权籍系统 ICO",
4 "font_family": "iconfont", 4 "font_family": "iconfont",
5 "css_prefix_text": "icon", 5 "css_prefix_text": "icon",
6 "description": "权籍及互联网+不动产登记项目", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "8554264", 9 "icon_id": "18620628",
10 "name": "导入CAD", 10 "name": "CAD",
11 "font_class": "tubiao_daoruCAD", 11 "font_class": "CAD",
12 "unicode": "e630", 12 "unicode": "e770",
13 "unicode_decimal": 58928 13 "unicode_decimal": 59248
14 },
15 {
16 "icon_id": "18620518",
17 "name": "excel",
18 "font_class": "excel",
19 "unicode": "e768",
20 "unicode_decimal": 59240
14 }, 21 },
15 { 22 {
16 "icon_id": "3747068", 23 "icon_id": "18620520",
17 "name": "地球", 24 "name": "pdf",
18 "font_class": "diqiu1", 25 "font_class": "pdf",
19 "unicode": "e60c", 26 "unicode": "e774",
20 "unicode_decimal": 58892 27 "unicode_decimal": 59252
21 }, 28 },
22 { 29 {
23 "icon_id": "12694038", 30 "icon_id": "18620521",
24 "name": "属性管理", 31 "name": "txt",
25 "font_class": "shuxingguanli", 32 "font_class": "txt",
26 "unicode": "e610", 33 "unicode": "e775",
27 "unicode_decimal": 58896 34 "unicode_decimal": 59253
28 }, 35 },
29 { 36 {
30 "icon_id": "605008", 37 "icon_id": "18620522",
31 "name": "zip", 38 "name": "zip",
32 "font_class": "uploadicon03", 39 "font_class": "zip",
33 "unicode": "e71a", 40 "unicode": "e776",
34 "unicode_decimal": 59162 41 "unicode_decimal": 59254
35 }, 42 },
36 { 43 {
37 "icon_id": "13254178", 44 "icon_id": "18620523",
38 "name": "cad-fill", 45 "name": "导入CAD",
39 "font_class": "cad-fill", 46 "font_class": "daoruCAD",
40 "unicode": "e7d8", 47 "unicode": "e777",
41 "unicode_decimal": 59352 48 "unicode_decimal": 59255
42 }, 49 },
43 { 50 {
44 "icon_id": "2325940", 51 "icon_id": "18618421",
45 "name": "文本文档", 52 "name": "地图",
46 "font_class": "wenbenwendang", 53 "font_class": "ditu",
47 "unicode": "e645", 54 "unicode": "e772",
48 "unicode_decimal": 58949 55 "unicode_decimal": 59250
49 }, 56 },
50 { 57 {
51 "icon_id": "14476526", 58 "icon_id": "18618422",
52 "name": "excel", 59 "name": "信息",
53 "font_class": "excel", 60 "font_class": "xinxi",
54 "unicode": "e66e", 61 "unicode": "e773",
55 "unicode_decimal": 58990 62 "unicode_decimal": 59251
56 }, 63 },
57 { 64 {
58 "icon_id": "2676724", 65 "icon_id": "18618397",
59 "name": "放大", 66 "name": "添加",
60 "font_class": "fangda", 67 "font_class": "tianjia",
61 "unicode": "e6de", 68 "unicode": "e771",
62 "unicode_decimal": 59102 69 "unicode_decimal": 59249
63 }, 70 },
64 { 71 {
65 "icon_id": "9655540", 72 "icon_id": "18605314",
66 "name": "缩小", 73 "name": "测距",
67 "font_class": "suoxiao", 74 "font_class": "ceju",
68 "unicode": "e66d", 75 "unicode": "e769",
69 "unicode_decimal": 58989 76 "unicode_decimal": 59241
70 }, 77 },
71 { 78 {
72 "icon_id": "430199", 79 "icon_id": "18605315",
73 "name": "面测量", 80 "name": "测面积",
74 "font_class": "mianceliang", 81 "font_class": "cemianji",
75 "unicode": "e90f", 82 "unicode": "e76a",
76 "unicode_decimal": 59663 83 "unicode_decimal": 59242
77 }, 84 },
78 { 85 {
79 "icon_id": "1177695", 86 "icon_id": "18605316",
80 "name": "打印 (1)", 87 "name": "查询属性",
81 "font_class": "dayin1", 88 "font_class": "chaxunshuxing",
82 "unicode": "e665", 89 "unicode": "e76b",
83 "unicode_decimal": 58981 90 "unicode_decimal": 59243
84 }, 91 },
85 { 92 {
86 "icon_id": "1719347", 93 "icon_id": "18605317",
87 "name": "地球", 94 "name": "拉框缩小",
88 "font_class": "diqiu", 95 "font_class": "lakuangsuoxiao",
89 "unicode": "e7b9", 96 "unicode": "e76c",
90 "unicode_decimal": 59321 97 "unicode_decimal": 59244
91 }, 98 },
92 { 99 {
93 "icon_id": "5650846", 100 "icon_id": "18605318",
94 "name": "测距", 101 "name": "清除",
95 "font_class": "ceju", 102 "font_class": "qingchu",
96 "unicode": "e604", 103 "unicode": "e76d",
97 "unicode_decimal": 58884 104 "unicode_decimal": 59245
105 },
106 {
107 "icon_id": "18605319",
108 "name": "全图",
109 "font_class": "quantu",
110 "unicode": "e76e",
111 "unicode_decimal": 59246
112 },
113 {
114 "icon_id": "18605320",
115 "name": "拉框放大",
116 "font_class": "lakuangfangda",
117 "unicode": "e76f",
118 "unicode_decimal": 59247
119 },
120 {
121 "icon_id": "18593403",
122 "name": "批量单元号",
123 "font_class": "piliangdanyuanhao",
124 "unicode": "e75d",
125 "unicode_decimal": 59229
126 },
127 {
128 "icon_id": "18593404",
129 "name": "创建楼盘",
130 "font_class": "chuangjianloupan",
131 "unicode": "e75e",
132 "unicode_decimal": 59230
133 },
134 {
135 "icon_id": "18593405",
136 "name": "批量层",
137 "font_class": "piliangceng",
138 "unicode": "e75f",
139 "unicode_decimal": 59231
140 },
141 {
142 "icon_id": "18593406",
143 "name": "批量户",
144 "font_class": "pilianghu",
145 "unicode": "e760",
146 "unicode_decimal": 59232
147 },
148 {
149 "icon_id": "18593407",
150 "name": "批量坐落",
151 "font_class": "piliangzuola",
152 "unicode": "e761",
153 "unicode_decimal": 59233
154 },
155 {
156 "icon_id": "18593408",
157 "name": "批量室号",
158 "font_class": "piliangshihao",
159 "unicode": "e762",
160 "unicode_decimal": 59234
161 },
162 {
163 "icon_id": "18593409",
164 "name": "实预测转换",
165 "font_class": "shiyucezhuanhuan",
166 "unicode": "e763",
167 "unicode_decimal": 59235
168 },
169 {
170 "icon_id": "18593370",
171 "name": "首页",
172 "font_class": "shouye",
173 "unicode": "e75c",
174 "unicode_decimal": 59228
175 },
176 {
177 "icon_id": "18590441",
178 "name": "办理",
179 "font_class": "banli",
180 "unicode": "e75a",
181 "unicode_decimal": 59226
182 },
183 {
184 "icon_id": "18590442",
185 "name": "定位",
186 "font_class": "dingwei",
187 "unicode": "e75b",
188 "unicode_decimal": 59227
189 },
190 {
191 "icon_id": "18587822",
192 "name": "搜索",
193 "font_class": "sousuo",
194 "unicode": "e753",
195 "unicode_decimal": 59219
196 },
197 {
198 "icon_id": "18587823",
199 "name": "变更",
200 "font_class": "biangeng",
201 "unicode": "e754",
202 "unicode_decimal": 59220
203 },
204 {
205 "icon_id": "18587824",
206 "name": "缩进",
207 "font_class": "suojin",
208 "unicode": "e755",
209 "unicode_decimal": 59221
210 },
211 {
212 "icon_id": "18587825",
213 "name": "展开",
214 "font_class": "zhankai",
215 "unicode": "e756",
216 "unicode_decimal": 59222
217 },
218 {
219 "icon_id": "18587826",
220 "name": "更正",
221 "font_class": "gengzheng",
222 "unicode": "e757",
223 "unicode_decimal": 59223
224 },
225 {
226 "icon_id": "18587827",
227 "name": "新建",
228 "font_class": "xinjian",
229 "unicode": "e758",
230 "unicode_decimal": 59224
98 }, 231 },
99 { 232 {
100 "icon_id": "15736919", 233 "icon_id": "18587828",
101 "name": "属性", 234 "name": "综合查询",
102 "font_class": "shuxing", 235 "font_class": "zonghechaxun",
103 "unicode": "e62a", 236 "unicode": "e759",
104 "unicode_decimal": 58922 237 "unicode_decimal": 59225
105 } 238 }
106 ] 239 ]
107 } 240 }
......
...@@ -140,6 +140,9 @@ ol, ul { list-style:none; } ...@@ -140,6 +140,9 @@ ol, ul { list-style:none; }
140 .el-dialog__body{ 140 .el-dialog__body{
141 padding-bottom: 25px!important; 141 padding-bottom: 25px!important;
142 } 142 }
143 .el-dialog__header{
144 border-bottom: 1px solid #F1F1F1;
145 }
143 // 自定义右键菜单样式 146 // 自定义右键菜单样式
144 .contextmenu { 147 .contextmenu {
145 margin: 0; 148 margin: 0;
...@@ -218,4 +221,25 @@ ol, ul { list-style:none; } ...@@ -218,4 +221,25 @@ ol, ul { list-style:none; }
218 border: 1px solid #FA6400!important; 221 border: 1px solid #FA6400!important;
219 background-color: #fff!important; 222 background-color: #fff!important;
220 color: #FA6400!important; 223 color: #FA6400!important;
224 }
225 .import{
226 background-color: #00CACD!important;
227 border-color: #00CACD!important;
228 }
229 .cancel{
230 background-color: #F79700!important;
231 border-color: #F79700!important;
232 }
233 .creat{
234 background-color: #0091FF!important;
235 border-color: #0091FF!important;
236 }
237 .import:hover:focus{
238 opacity: .8!important;
239 }
240 .cancel:hover:focus{
241 opacity: .8!important;
242 }
243 .creat:hover:focus{
244 opacity: .8!important;
221 } 245 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 type="text" 134 type="text"
135 style="top: -1px;" 135 style="top: -1px;"
136 :disabled="formData.qszt!='0'" 136 :disabled="formData.qszt!='0'"
137 placeholder="请输入" 137
138 v-model="childItem.pzytdm" 138 v-model="childItem.pzytdm"
139 class="formInput" 139 class="formInput"
140 /> 140 />
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 <input 143 <input
144 type="text" 144 type="text"
145 :disabled="formData.qszt!='0'" 145 :disabled="formData.qszt!='0'"
146 placeholder="请输入" 146
147 v-model="childItem.sjytdm" 147 v-model="childItem.sjytdm"
148 class="formInput" 148 class="formInput"
149 /> 149 />
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
152 <input 152 <input
153 type="text" 153 type="text"
154 :disabled="formData.qszt!='0'" 154 :disabled="formData.qszt!='0'"
155 placeholder="请输入" 155
156 v-model="childItem.syqx" 156 v-model="childItem.syqx"
157 class="formInput" 157 class="formInput"
158 /> 158 />
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 <input 130 <input
131 type="text" 131 type="text"
132 style="top: -1px;" 132 style="top: -1px;"
133 placeholder="请输入" 133
134 v-model="childItem.pzytdm" 134 v-model="childItem.pzytdm"
135 class="formInput" 135 class="formInput"
136 /> 136 />
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 <li> 138 <li>
139 <input 139 <input
140 type="text" 140 type="text"
141 placeholder="请输入" 141
142 v-model="childItem.sjytdm" 142 v-model="childItem.sjytdm"
143 class="formInput" 143 class="formInput"
144 /> 144 />
......
...@@ -89,15 +89,15 @@ ...@@ -89,15 +89,15 @@
89 <li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li> 89 <li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li>
90 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li> 90 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li>
91 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li> 91 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li>
92 <li v-show="zdData.type == 'ljz'" @click="deleteLjz">删除逻辑幢</li> 92 <li v-show="zdData.type == 'ljz'" @click="deleteLjz">删除</li>
93 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除幢单元</li> 93 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除</li>
94 </ul> 94 </ul>
95 95
96 <el-dialog title="导入图形" :visible.sync="improtDialog"> 96 <el-dialog title="导入图形" :visible.sync="improtDialog">
97 <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 97 <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
98 </el-dialog> 98 </el-dialog>
99 <!-- 添加定着物弹框 --> 99 <!-- 添加定着物弹框 -->
100 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> 100 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
101 <Create @closeDialog="closeDialog" :auth="true"></Create> 101 <Create @closeDialog="closeDialog" :auth="true"></Create>
102 </el-dialog> 102 </el-dialog>
103 </div> 103 </div>
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 <el-header> 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" v-show="!isActive"></i> 21 <i class="iconfont iconsuojin" v-show="!isActive"></i>
22 <i class="fa fa-indent" v-show="isActive"></i> 22 <i class="iconfont iconzhankai" v-show="isActive"></i>
23 </div> 23 </div>
24 <div 24 <div
25 class="top-items" 25 class="top-items"
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
33 </div> 33 </div>
34 34
35 <div class="top-items tuOrShu" > 35 <div class="top-items tuOrShu" >
36 <i class="iconfont icondiqiu1" title="图形管理" v-if="!isMap" @click="goMap"></i> 36 <i class="iconfont iconditu" title="图形管理" v-if="!isMap" @click="goMap"></i>
37 <i class="iconfont iconshuxingguanli" title="属性管理" v-else @click="goBack"></i> 37 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
38 </div> 38 </div>
39 </div> 39 </div>
40 <!-- <div class="header-bottom"> 40 <!-- <div class="header-bottom">
41 <Navigation ref="navigation"></Navigation> 41 <Navigation ref="navigation"></Navigation>
42 </div> --> 42 </div> -->
43 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> 43 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
44 <Create @closeDialog="closeDialog" :auth="false"></Create> 44 <Create @closeDialog="closeDialog" :auth="false"></Create>
45 </el-dialog> 45 </el-dialog>
46 </el-header> 46 </el-header>
...@@ -188,28 +188,28 @@ export default { ...@@ -188,28 +188,28 @@ export default {
188 let list = [ 188 let list = [
189 { 189 {
190 name: "首页", 190 name: "首页",
191 icon: "fa fa-home", 191 icon: "iconfont iconshouye",
192 path: "/panel", 192 path: "/panel",
193 }, 193 },
194 { 194 {
195 name: "新建", 195 name: "新建",
196 icon: "fa fa-plus-square", 196 icon: "iconfont iconxinjian",
197 path: "/create", 197 path: "/create",
198 }, 198 },
199 { 199 {
200 name: "添加", 200 name: "添加",
201 icon: "fa fa-plus-circle", 201 icon: "iconfont icontianjia",
202 path: "/add", 202 path: "/add",
203 }, 203 },
204 { name: "更正", icon: "fa fa-pencil-square", path: "/modify" }, 204 { name: "更正", icon: "iconfont icongengzheng", path: "/modify" },
205 { 205 {
206 name: "变更", 206 name: "变更",
207 icon: "fa fa-exchange", 207 icon: "iconfont iconbiangeng",
208 path: "/change", 208 path: "/change",
209 }, 209 },
210 { 210 {
211 name: "综合查询", 211 name: "综合查询",
212 icon: "fa fa-search", 212 icon: "iconfont iconzonghechaxun",
213 path: "/search", 213 path: "/search",
214 }, 214 },
215 ]; 215 ];
...@@ -436,6 +436,9 @@ export default { ...@@ -436,6 +436,9 @@ export default {
436 color: #4a4a4a; 436 color: #4a4a4a;
437 i { 437 i {
438 margin-right: 6px; 438 margin-right: 6px;
439 font-size: 18px;
440 position: relative;
441 top: 1px;
439 } 442 }
440 .hamburger { 443 .hamburger {
441 font-size: 16px; 444 font-size: 16px;
......
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
209 import Qlxz from "../../../components/formMenu/qlxz_simple"; 209 import Qlxz from "../../../components/formMenu/qlxz_simple";
210 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; 210 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
211 import {getQjZdjbxxDetailById} from "../../../api/zd" 211 import {getQjZdjbxxDetailById} from "../../../api/zd"
212 import {submit} from "../../../api/common"
212 export default { 213 export default {
213 name:'zrz', 214 name:'zrz',
214 components:{ 215 components:{
...@@ -416,6 +417,17 @@ ...@@ -416,6 +417,17 @@
416 }, 417 },
417 onSubmit(){ 418 onSubmit(){
418 console.log(this.form) 419 console.log(this.form)
420 let data={
421 glbsm:this.bsm,
422 status:1,
423 type:"dz"
424 }
425 submit(data).then((res)=>{
426 if(res.code===200){
427 this.$message.success("提交完成！");
428 this.getDzDetailByBsm(this.$route.query.bsm)
429 }
430 })
419 }, 431 },
420 getZddm(zdbsm){ 432 getZddm(zdbsm){
421 getQjZdjbxxDetailById(zdbsm).then((res)=>{ 433 getQjZdjbxxDetailById(zdbsm).then((res)=>{
......
...@@ -8,48 +8,56 @@ ...@@ -8,48 +8,56 @@
8 @tab-click="handleClick"> 8 @tab-click="handleClick">
9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd"> 9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd">
10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline"> 10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline">
11 <el-form-item label="行政区划" required prop="xzqbsm"> 11 <el-form-item label="行政区划" class="w100" required prop="xmmc">
12 <el-select v-model="ruleForm.xzqbsm" style="width:100px;" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)"> 12 <el-col :span="7">
13 <el-option 13 <el-form-item required prop="xzqbsm">
14 v-for="item in xzq" 14 <el-select v-model="ruleForm.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)">
15 :key="item.bsm" 15 <el-option
16 :label="item.mc" 16 v-for="item in xzq"
17 :value="item.bsm"> 17 :key="item.bsm"
18 </el-option> 18 :label="item.mc"
19 </el-select> 19 :value="item.bsm">
20 </el-form-item> 20 </el-option>
21 <el-form-item prop="djqbsm"> 21 </el-select>
22 <el-select v-model="ruleForm.djqbsm" style="width:130px;" placeholder="地籍区" @change="changeDjq(ruleForm.djqbsm)"> 22 </el-form-item>
23 <el-option 23 </el-col>
24 v-for="item in djq" 24 <el-col :span="1">&nbsp;</el-col>
25 :key="item.bsm" 25 <el-col :span="7">
26 :label="item.mc" 26 <el-form-item prop="djqbsm">
27 :value="item.bsm"> 27 <el-select v-model="ruleForm.djqbsm" placeholder="地籍区" @change="changeDjq(ruleForm.djqbsm)">
28 </el-option> 28 <el-option
29 </el-select> 29 v-for="item in djq"
30 :key="item.bsm"
31 :label="item.mc"
32 :value="item.bsm">
33 </el-option>
34 </el-select>
35 </el-form-item>
36 </el-col>
37 <el-col :span="1">&nbsp;</el-col>
38 <el-col :span="8">
39 <el-form-item prop="djzqbsm" style="margin-right:0">
40 <el-select v-model="ruleForm.djzqbsm" placeholder="地籍子区">
41 <el-option
42 v-for="item in djzq"
43 :key="item.bsm"
44 :label="item.mc"
45 :value="item.bsm">
46 </el-option>
47 </el-select>
48 </el-form-item>
49 </el-col>
30 </el-form-item> 50 </el-form-item>
31 <el-form-item prop="djzqbsm"> 51 <el-form-item label="项目名称" class="w100" required prop="xmmc">
32 <el-select v-model="ruleForm.djzqbsm" style="width:150px;" placeholder="地籍子区">
33 <el-option
34 v-for="item in djzq"
35 :key="item.bsm"
36 :label="item.mc"
37 :value="item.bsm">
38 </el-option>
39 </el-select>
40 </el-form-item>
41 <el-form-item label="项目名称" required prop="xmmc">
42 <el-input 52 <el-input
43 v-model="ruleForm.xmmc" 53 v-model="ruleForm.xmmc"
44 placeholder="项目名称" 54 placeholder="项目名称"
45 style="width:400px;"
46 ></el-input> 55 ></el-input>
47 </el-form-item> 56 </el-form-item>
48 <el-form-item label="所有权类型" required prop="syqlxbsm"> 57 <el-form-item label="所有权类型" class="w100" required prop="syqlxbsm">
49 <el-select 58 <el-select
50 v-model="ruleForm.syqlxbsm" 59 v-model="ruleForm.syqlxbsm"
51 placeholder="所有权类型" 60 placeholder="所有权类型"
52 style="width:300px;"
53 > 61 >
54 <el-option 62 <el-option
55 v-for="item in syqlx" 63 v-for="item in syqlx"
...@@ -60,11 +68,10 @@ ...@@ -60,11 +68,10 @@
60 </el-option> 68 </el-option>
61 </el-select> 69 </el-select>
62 </el-form-item> 70 </el-form-item>
63 <el-form-item label="特征码" required prop="zdtzmbsm"> 71 <el-form-item label="特征码" class="w100" required prop="zdtzmbsm">
64 <el-select 72 <el-select
65 v-model="ruleForm.zdtzmbsm" 73 v-model="ruleForm.zdtzmbsm"
66 placeholder="宗地特征码" 74 placeholder="宗地特征码"
67 style="width:200px;"
68 > 75 >
69 <el-option 76 <el-option
70 v-for="item in $store.state.zdtzmList" 77 v-for="item in $store.state.zdtzmList"
...@@ -75,16 +82,22 @@ ...@@ -75,16 +82,22 @@
75 </el-option> 82 </el-option>
76 </el-select> 83 </el-select>
77 </el-form-item> 84 </el-form-item>
78 <el-form-item class="handleBtn">
79 <el-button type="primary">导入图形</el-button>
80 <el-button type="primary" @click="newZd">创建</el-button>
81 <el-button type="primary" @click="close">取消</el-button>
82 </el-form-item>
83 </el-form> 85 </el-form>
86 <div class="handleBtn">
87 <el-button type="primary" class="w98 import">导入图形</el-button>
88 <el-button type="primary" class="w98 creat" @click="newZd">创建</el-button>
89 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
90 </div>
91 </el-tab-pane>
92 <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">
93 <div class="handleBtn">
94 <el-button type="primary" class="w98 import">导入图形</el-button>
95 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
96 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
97 </div>
84 </el-tab-pane> 98 </el-tab-pane>
85 <!-- <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane> -->
86 <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> 99 <el-tab-pane class="eltabspane" label="自然幢" name="zrz">
87 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject"> 100 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline">
88 <el-form-item label="项目名称" prop="xmmc"> 101 <el-form-item label="项目名称" prop="xmmc">
89 <el-input 102 <el-input
90 v-model="ruleForm1.xmmc" 103 v-model="ruleForm1.xmmc"
...@@ -92,15 +105,15 @@ ...@@ -92,15 +105,15 @@
92 style="width:400px;" 105 style="width:400px;"
93 ></el-input> 106 ></el-input>
94 </el-form-item> 107 </el-form-item>
95 <el-form-item class="handleBtn">
96 <el-button type="primary">导入图形</el-button>
97 <el-button type="primary" @click="newZrz">创建</el-button>
98 <el-button type="primary" @click="close">取消</el-button>
99 </el-form-item>
100 </el-form> 108 </el-form>
109 <div class="handleBtn">
110 <el-button type="primary" class="w98 import">导入图形</el-button>
111 <el-button type="primary" class="w98 creat" @click="newZrz">创建</el-button>
112 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
113 </div>
101 </el-tab-pane> 114 </el-tab-pane>
102 <el-tab-pane class="eltabspane" label="多幢" name="dz"> 115 <el-tab-pane class="eltabspane" label="多幢" name="dz">
103 <el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="dzProject"> 116 <el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline">
104 <el-form-item label="项目名称" prop="xmmc"> 117 <el-form-item label="项目名称" prop="xmmc">
105 <el-input 118 <el-input
106 v-model="ruleForm2.xmmc" 119 v-model="ruleForm2.xmmc"
...@@ -108,15 +121,27 @@ ...@@ -108,15 +121,27 @@
108 style="width:400px;" 121 style="width:400px;"
109 ></el-input> 122 ></el-input>
110 </el-form-item> 123 </el-form-item>
111 <el-form-item class="handleBtn">
112 <el-button type="primary">导入图形</el-button>
113 <el-button type="primary" @click="newDz">创建</el-button>
114 <el-button type="primary" @click="close">取消</el-button>
115 </el-form-item>
116 </el-form> 124 </el-form>
125 <div class="handleBtn">
126 <el-button type="primary" class="w98 import">导入图形</el-button>
127 <el-button type="primary" class="w98 creat" @click="newDz">创建</el-button>
128 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
129 </div>
130 </el-tab-pane>
131 <el-tab-pane class="eltabspane" label="林权" name="lq">
132 <div class="handleBtn">
133 <el-button type="primary" class="w98 import">导入图形</el-button>
134 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
135 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
136 </div>
137 </el-tab-pane>
138 <el-tab-pane class="eltabspane" label="构筑物" name="gzw">
139 <div class="handleBtn">
140 <el-button type="primary" class="w98 import">导入图形</el-button>
141 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
142 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
143 </div>
117 </el-tab-pane> 144 </el-tab-pane>
118 <!-- <el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane>
119 <el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane> -->
120 </el-tabs> 145 </el-tabs>
121 </template> 146 </template>
122 <script> 147 <script>
...@@ -324,6 +349,12 @@ export default { ...@@ -324,6 +349,12 @@ export default {
324 }); 349 });
325 350
326 }, 351 },
352 todo(){
353 this.$message({
354 message: "待开发",
355 type: "warning",
356 });
357 },
327 getXzqList() { 358 getXzqList() {
328 getAllList() 359 getAllList()
329 .then((res) => { 360 .then((res) => {
...@@ -382,33 +413,65 @@ export default { ...@@ -382,33 +413,65 @@ export default {
382 .eltabs { 413 .eltabs {
383 height: 366px; 414 height: 366px;
384 width: 100%; 415 width: 100%;
385 } 416 position: relative;
386 .eltabspane { 417 margin-left: 20px;
387 height: 100%; 418 margin-top: 20px;
388 width: 100%; 419 .eltabspane {
389 padding: 20px; 420 height: 100%;
390 .el-form--inline .el-form-item__label{ 421 width: 100%;
391 width: 100px; 422 .el-form--inline .el-form-item__label{
423 width: 100px;
424 }
425 .el-form-item{
426 margin-bottom: 20px;
427 }
428 .w100{
429 width: calc(100% - 40px);
430 .el-form-item{
431 margin-bottom: 0!important;
432 .el-form-item__content{
433 width: 100%;
434 }
435 }
436 .el-form-item__content{
437 width: calc(100% - 100px);
438 .el-select{
439 width: 100%;
440 }
441 }
442 }
443 .handleBtn{
444 width: 314;
445 position: absolute;
446 bottom: 0;
447 left: 50%;
448 margin-left: -250px;
449 .w98{
450 width: 98px;
451 }
452 }
453 .el-form{
454 margin-top: 10px;
455 box-sizing: border-box;
456 padding-left: 40px;
457 }
392 } 458 }
393 .el-form-item{ 459 .el-tabs__content{
394 margin-bottom: 20px; 460 height: 100%;
395 } 461 }
396 .handleBtn{ 462 /deep/.el-tabs__item {
397 width: 90%; 463 font-size: 16px !important;
398 .el-form-item__content{ 464 color: #333;
399 float: right; 465 width: 140px;
400 } 466 height: 50px;
467 line-height: 50px;
468 text-align: center!important;
469 border-color: #E4E4E4!important;
470 }
471 /deep/ .is-active{
472 background-color: #E5F4FF;
473 color: #358BFF;
401 } 474 }
402 } 475 }
403 476
404 #tabs .el-tabs__item {
405 font-size: 18px !important;
406 color: #333;
407 width: 100px;
408 height: 60px;
409 line-height: 80px;
410 }
411 .zrzProject {
412 margin-top: 80px;
413 }
414 </style> 477 </style>
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 this.$router.push({ 162 this.$router.push({
163 path: path, 163 path: path,
164 query: { 164 query: {
165 bsm: res.result, 165 bsm: row.glbsm,
166 source: 2 166 source: 2
167 } 167 }
168 }); 168 });
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
108 <td colspan="2">宗地代码<i class="requisite">*</i></td> 108 <td colspan="2">宗地代码<i class="requisite">*</i></td>
109 <td colspan="4" class="psr"> 109 <td colspan="4" class="psr">
110 <input :disabled="formData.qszt!='0'" maxlength="19" 110 <input :disabled="formData.qszt!='0'" maxlength="19"
111 type="text" placeholder="请输入" 111 type="text"
112 class="formInput percent80" 112 class="formInput percent80"
113 v-model="formData.zddm" 113 v-model="formData.zddm"
114 /> 114 />
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 <tr> 120 <tr>
121 <td colspan="2">地籍号</td> 121 <td colspan="2">地籍号</td>
122 <td colspan="4"> 122 <td colspan="4">
123 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.djh" /> 123 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.djh" />
124 </td> 124 </td>
125 125
126 <td colspan="2">不动产单元号<i class="requisite">*</i></td> 126 <td colspan="2">不动产单元号<i class="requisite">*</i></td>
...@@ -136,12 +136,12 @@ ...@@ -136,12 +136,12 @@
136 <tr> 136 <tr>
137 <td colspan="2">坐落<i class="requisite">*</i></td> 137 <td colspan="2">坐落<i class="requisite">*</i></td>
138 <td colspan="4"> 138 <td colspan="4">
139 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.zl" /> 139 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zl" />
140 </td> 140 </td>
141 <td colspan="2">项目名称</td> 141 <td colspan="2">项目名称</td>
142 <td colspan="4" class="psr"> 142 <td colspan="4" class="psr">
143 <input :disabled="formData.qszt!='0'" 143 <input :disabled="formData.qszt!='0'"
144 type="text" placeholder="请输入" 144 type="text"
145 class="formInput " 145 class="formInput "
146 v-model="formData.xmmc" 146 v-model="formData.xmmc"
147 /> 147 />
...@@ -162,20 +162,20 @@ ...@@ -162,20 +162,20 @@
162 </td> 162 </td>
163 <td colspan="2">价格(元)</td> 163 <td colspan="2">价格(元)</td>
164 <td colspan="4" class="psr"> 164 <td colspan="4" class="psr">
165 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.jg" /> 165 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jg" />
166 </td> 166 </td>
167 </tr> 167 </tr>
168 <tr> 168 <tr>
169 <td colspan="2" rowspan="2">所在图幅号</td> 169 <td colspan="2" rowspan="2">所在图幅号</td>
170 <td colspan="2">比例尺</td> 170 <td colspan="2">比例尺</td>
171 <td colspan="8" class="psr"> 171 <td colspan="8" class="psr">
172 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.blc" /> 172 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.blc" />
173 </td> 173 </td>
174 </tr> 174 </tr>
175 <tr> 175 <tr>
176 <td colspan="2">图幅号</td> 176 <td colspan="2">图幅号</td>
177 <td colspan="8" class="psr"> 177 <td colspan="8" class="psr">
178 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.tfh" /> 178 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.tfh" />
179 </td> 179 </td>
180 </tr> 180 </tr>
181 <tr> 181 <tr>
...@@ -193,21 +193,21 @@ ...@@ -193,21 +193,21 @@
193 </td> 193 </td>
194 <td colspan="2"> 194 <td colspan="2">
195 <input 195 <input
196 type="text" placeholder="请输入" :disabled="formData.qszt!='0'" 196 type="text" :disabled="formData.qszt!='0'"
197 v-model="rjl" 197 v-model="rjl"
198 v-show="isInterval(formData.jyrjl)" 198 v-show="isInterval(formData.jyrjl)"
199 class="formInput percent47" 199 class="formInput percent47"
200 /> 200 />
201 <span class="percent4" v-show="isInterval(formData.jyrjl)">-</span> 201 <span class="percent4" v-show="isInterval(formData.jyrjl)">-</span>
202 <input 202 <input
203 type="text" placeholder="请输入" :disabled="formData.qszt!='0'" 203 type="text" :disabled="formData.qszt!='0'"
204 v-model="formData.rjl" 204 v-model="formData.rjl"
205 :class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'" 205 :class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'"
206 /> 206 />
207 </td> 207 </td>
208 <td colspan="2">容积说明</td> 208 <td colspan="2">容积说明</td>
209 <td colspan="4" class="psr"> 209 <td colspan="4" class="psr">
210 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.rjsm" /> 210 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjsm" />
211 </td> 211 </td>
212 </tr> 212 </tr>
213 <tr> 213 <tr>
...@@ -225,21 +225,21 @@ ...@@ -225,21 +225,21 @@
225 </td> 225 </td>
226 <td colspan="2"> 226 <td colspan="2">
227 <input 227 <input
228 type="text" placeholder="请输入" 228 type="text"
229 v-model="jzmd" :disabled="formData.qszt!='0'" 229 v-model="jzmd" :disabled="formData.qszt!='0'"
230 v-show="isInterval(formData.jyjzmd)" 230 v-show="isInterval(formData.jyjzmd)"
231 class="formInput percent47" 231 class="formInput percent47"
232 /> 232 />
233 <span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span> 233 <span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span>
234 <input 234 <input
235 type="text" placeholder="请输入" 235 type="text"
236 v-model="formData.jzmd" :disabled="formData.qszt!='0'" 236 v-model="formData.jzmd" :disabled="formData.qszt!='0'"
237 :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'" 237 :class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'"
238 /> 238 />
239 </td> 239 </td>
240 <td colspan="2">建筑密度说明</td> 240 <td colspan="2">建筑密度说明</td>
241 <td colspan="4" class="psr"> 241 <td colspan="4" class="psr">
242 <input type="text" :disabled="formData.qszt!='0'" placeholder="请输入" class="formInput" v-model="formData.jzmdsm" /> 242 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzmdsm" />
243 </td> 243 </td>
244 </tr> 244 </tr>
245 <tr> 245 <tr>
...@@ -257,46 +257,46 @@ ...@@ -257,46 +257,46 @@
257 </td> 257 </td>
258 <td colspan="2"> 258 <td colspan="2">
259 <input 259 <input
260 type="text" placeholder="请输入" :disabled="formData.qszt!='0'" 260 type="text" :disabled="formData.qszt!='0'"
261 v-model="jzxg" 261 v-model="jzxg"
262 v-show="isInterval(formData.jyjzxg)" 262 v-show="isInterval(formData.jyjzxg)"
263 class="formInput percent47" 263 class="formInput percent47"
264 /> 264 />
265 <span class="percent4" v-show="isInterval(formData.jyjzxg)">-</span> 265 <span class="percent4" v-show="isInterval(formData.jyjzxg)">-</span>
266 <input 266 <input
267 type="text" placeholder="请输入" :disabled="formData.qszt!='0'" 267 type="text" :disabled="formData.qszt!='0'"
268 v-model="formData.jzxg" 268 v-model="formData.jzxg"
269 :class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'" 269 :class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'"
270 /> 270 />
271 </td> 271 </td>
272 <td colspan="2">建筑限高说明</td> 272 <td colspan="2">建筑限高说明</td>
273 <td colspan="4" class="psr"> 273 <td colspan="4" class="psr">
274 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm" /> 274 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm" />
275 </td> 275 </td>
276 </tr> 276 </tr>
277 <tr> 277 <tr>
278 <td colspan="2" rowspan="4">宗地四至</td> 278 <td colspan="2" rowspan="4">宗地四至</td>
279 <td colspan="2">北至<i class="requisite">*</i></td> 279 <td colspan="2">北至<i class="requisite">*</i></td>
280 <td colspan="8" class="psr"> 280 <td colspan="8" class="psr">
281 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszb" /> 281 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszb" />
282 </td> 282 </td>
283 </tr> 283 </tr>
284 <tr> 284 <tr>
285 <td colspan="2">东至<i class="requisite">*</i></td> 285 <td colspan="2">东至<i class="requisite">*</i></td>
286 <td colspan="8" class="psr"> 286 <td colspan="8" class="psr">
287 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszd" /> 287 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszd" />
288 </td> 288 </td>
289 </tr> 289 </tr>
290 <tr> 290 <tr>
291 <td colspan="2">南至<i class="requisite">*</i></td> 291 <td colspan="2">南至<i class="requisite">*</i></td>
292 <td colspan="8" class="psr"> 292 <td colspan="8" class="psr">
293 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszn" /> 293 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszn" />
294 </td> 294 </td>
295 </tr> 295 </tr>
296 <tr> 296 <tr>
297 <td colspan="2">西至<i class="requisite">*</i></td> 297 <td colspan="2">西至<i class="requisite">*</i></td>
298 <td colspan="8" class="psr"> 298 <td colspan="8" class="psr">
299 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszx" /> 299 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszx" />
300 </td> 300 </td>
301 </tr> 301 </tr>
302 <tr> 302 <tr>
...@@ -307,33 +307,33 @@ ...@@ -307,33 +307,33 @@
307 <tr> 307 <tr>
308 <td colspan="2" rowspan="2">批准面积(㎡)</td> 308 <td colspan="2" rowspan="2">批准面积(㎡)</td>
309 <td colspan="2" rowspan="2"> 309 <td colspan="2" rowspan="2">
310 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.pzmj" /> 310 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.pzmj" />
311 </td> 311 </td>
312 <td colspan="2" rowspan="2">宗地面积(㎡)</td> 312 <td colspan="2" rowspan="2">宗地面积(㎡)</td>
313 <td colspan="2" rowspan="2"> 313 <td colspan="2" rowspan="2">
314 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdmj" /> 314 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdmj" />
315 </td> 315 </td>
316 <td colspan="2">建筑占地总面积</td> 316 <td colspan="2">建筑占地总面积</td>
317 <td colspan="2"> 317 <td colspan="2">
318 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzzdzmj" /> 318 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzzdzmj" />
319 </td> 319 </td>
320 </tr> 320 </tr>
321 <tr> 321 <tr>
322 <td colspan="2">建筑面积(㎡)</td> 322 <td colspan="2">建筑面积(㎡)</td>
323 <td colspan="2"> 323 <td colspan="2">
324 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzzmj" /> 324 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzzmj" />
325 </td> 325 </td>
326 </tr> 326 </tr>
327 <tr> 327 <tr>
328 <td colspan="2">共有/共用权利人情况</td> 328 <td colspan="2">共有/共用权利人情况</td>
329 <td colspan="10"> 329 <td colspan="10">
330 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.gygyqlrqk" /> 330 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.gygyqlrqk" />
331 </td> 331 </td>
332 </tr> 332 </tr>
333 <tr> 333 <tr>
334 <td colspan="2" rowspan="2">说明</td> 334 <td colspan="2" rowspan="2">说明</td>
335 <td colspan="10" rowspan="2"> 335 <td colspan="10" rowspan="2">
336 <input type="text" placeholder="请输入" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm" /> 336 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm" />
337 </td> 337 </td>
338 </tr> 338 </tr>
339 </table> 339 </table>
...@@ -591,6 +591,7 @@ export default { ...@@ -591,6 +591,7 @@ export default {
591 submit(data).then((res)=>{ 591 submit(data).then((res)=>{
592 if(res.code===200){ 592 if(res.code===200){
593 this.$message.success("提交完成！") 593 this.$message.success("提交完成！")
594 this.getZdjbxxData(this.$store.state.zdbsm);
594 } 595 }
595 }) 596 })
596 }, 597 },
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 @blur="inputBlur" 15 @blur="inputBlur"
16 @change="inputChange" 16 @change="inputChange"
17 class="searchInput" 17 class="searchInput"
18 placeholder="输入不动产单元号" 18 placeholder="输入不动产单元号或室号"
19 ><i 19 ><i
20 slot="suffix" 20 slot="suffix"
21 class="el-input__icon el-icon-search" 21 class="el-input__icon el-icon-search"
...@@ -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 ><i class="fa fa-building-o"></i>创建楼盘</el-button 29 ><i class="iconfont iconchuangjianloupan"></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 ><i class="fa fa-building-o"></i>实预测转换</el-button 32 ><i class="iconfont iconshiyucezhuanhuan"></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 ><i class="fa fa-building-o"></i> 批量户</el-button 39 ><i class="iconfont iconpilianghu"></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 ><i class="fa fa-building-o"></i>批量层</el-button 46 ><i class="iconfont iconpiliangceng"></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 ><i class="fa fa-building-o"></i>批量室号</el-button 53 ><i class="iconfont iconpiliangshihao"></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 ><i class="fa fa-building-o"></i>批量坐落</el-button 60 ><i class="iconfont iconpiliangzuola"></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 ><i class="fa fa-building-o"></i>批量单元号</el-button 63 ><i class="iconfont iconpiliangdanyuanhao"></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="hcxlz" 69 @click="hcxlzVisible = true"
70 ><i class="fa fa-building-o"></i>户重新落宗</el-button 70 ><i class="iconfont fa-building-o"></i>户重新落宗</el-button
71 > 71 >
72 </div> 72 </div>
73 </el-col> 73 </el-col>
...@@ -449,17 +449,25 @@ export default { ...@@ -449,17 +449,25 @@ export default {
449 plshClose() { 449 plshClose() {
450 this.plShVisible = false; 450 this.plShVisible = false;
451 }, 451 },
452 //改变是预测数据类型 452 //改变实预测数据类型
453 scyclxChange(val){ 453 scyclxChange(val){
454 //清空已选中层户 454 //清空已选中层户
455 this.cbsmList = []; 455 this.cbsmList = [];
456 this.bsms = []; 456 this.bsms = [];
457 console.log(this.$refs.lpbContent.$refs.hBsm,'this.$refs.lpbContent'); 457 console.log(this.$refs.lpbContent.$refs.cBsm,'this.$refs.lpbContent.$refs.cBsm');
458 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{ 458 this.$nextTick(()=>{
459 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
459 if (item.className == "tdSelect") { 460 if (item.className == "tdSelect") {
460 item.className = ""; 461 item.className = "";
461 } 462 }
463 });
464 this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
465 console.log(item.className,'item.className');
466 item.className = "floor";
467 });
462 }) 468 })
469 //获取图例数据
470 this.getDyztBsmList();
463 }, 471 },
464 //获取高度计算lpb内容区高度 472 //获取高度计算lpb内容区高度
465 getHeight() { 473 getHeight() {
...@@ -757,6 +765,10 @@ export default { ...@@ -757,6 +765,10 @@ export default {
757 .radioBtn { 765 .radioBtn {
758 margin-left: 16px; 766 margin-left: 16px;
759 padding:12px 14px; 767 padding:12px 14px;
768 i{
769 font-size: 13px;
770 padding-right: 4px;
771 }
760 /deep/.el-radio-button__inner { 772 /deep/.el-radio-button__inner {
761 border: 1px solid #dcdfe6; 773 border: 1px solid #dcdfe6;
762 border-radius: 4px; 774 border-radius: 4px;
......
1 <template> 1 <template>
2 <div class="lpbContent-wrap" ref="lpbContentWrap"> 2 <div class="lpbContent-wrap" ref="lpbContentWrap">
3 <div :class="lpbData.ljzs.length == 0 ? 'column-reverse lpbContent':'lpbContent'" ref="lpbContent" v-loading='loading'> 3 <div :class="lpbData.ljzs.length == 0 ? 'column-reverse lpbContent':'lpbContent'" ref="lpbContent" v-loading='loading'>
4 <div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'" :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0"> 4 <div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'" v-show="lpbData.ljzs.length>0">
5 <!-- 循环逻辑幢数据 --> 5 <!-- 循环逻辑幢数据 -->
6 <div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex"> 6 <div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex">
7 <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> 7 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
8 <!-- 循环逻辑幢下的幢单元 --> 8 <!-- 循环逻辑幢下的幢单元 -->
9 <div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" > 9 <div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" >
10 <!-- 循环幢单元下的层户 --> 10 <!-- 循环幢单元下的层户 -->
11 <!-- <div class="chTable-wrap"> --> 11 <!-- <div class="chTable-wrap"> -->
12 <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 12 <table class="chTable psr" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
14 <!-- 显示层数 --> 14 <!-- 显示层数 -->
15 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td> 15 <td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
16 <!-- 显示户 --> 16 <!-- 显示户 -->
17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
18 </tr> 18 </tr>
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
24 </div> 24 </div>
25 </div> 25 </div>
26 <!-- 循环逻辑幢下的层户 --> 26 <!-- 循环逻辑幢下的层户 -->
27 <div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0"> 27 <div class="ljz-ch" :style="{'height':'auto'}" v-if="ljzs.cs.length>0">
28 <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)<0? 0:(ljzzdyHeight+40-1-ljzs.cs.length*65) +'px'}" border="1" cellspacing="0" cellpadding="0"> 28 <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)<0? 0:(ljzzdyHeight+40-1-ljzs.cs.length*65) +'px'}" border="1" cellspacing="0" cellpadding="0">
29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm"> 29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
30 <!-- 显示层数 --> 30 <!-- 显示层数 -->
31 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td> 31 <td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
32 <!-- 显示户 --> 32 <!-- 显示户 -->
33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
34 </tr> 34 </tr>
35 </table> 35 </table>
36 </div> 36 </div>
37 </div> 37 <!-- </div> -->
38 38
39 <!-- 逻辑幢名称 --> 39 <!-- 逻辑幢名称 -->
40 <div class="ljz-name name"> 40 <div class="ljz-name name">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 53 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
54 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 54 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
55 <!-- 显示层数 --> 55 <!-- 显示层数 -->
56 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td> 56 <td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
57 <!-- 显示户 --> 57 <!-- 显示户 -->
58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
59 </tr> 59 </tr>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" > 65 <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
66 <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex"> 66 <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
67 <!-- 显示层数 --> 67 <!-- 显示层数 -->
68 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td> 68 <td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
69 <!-- 显示户 --> 69 <!-- 显示户 -->
70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> 70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
71 </tr> 71 </tr>
...@@ -184,6 +184,7 @@ export default { ...@@ -184,6 +184,7 @@ export default {
184 getLpb(zrzbsm,scyclx).then((res) => { 184 getLpb(zrzbsm,scyclx).then((res) => {
185 if (res.code == 200) { 185 if (res.code == 200) {
186 this.loading = false; 186 this.loading = false;
187 res.result.ljzs = res.result.ljzs.sort(this.compare('place')).reverse();
187 this.lpbData = res.result == null ? this.lpbData : res.result; 188 this.lpbData = res.result == null ? this.lpbData : res.result;
188 this.$nextTick(()=>{ 189 this.$nextTick(()=>{
189 //渲染楼盘表 190 //渲染楼盘表
...@@ -197,6 +198,13 @@ export default { ...@@ -197,6 +198,13 @@ export default {
197 } 198 }
198 }); 199 });
199 }, 200 },
201 compare(property){
202 return function(a,b){
203 var value1 = a[property];
204 var value2 = b[property];
205 return value1 - value2;
206 }
207 },
200 //按照bdcdyh或shbw筛选户 208 //按照bdcdyh或shbw筛选户
201 lpbDataMap(sh) { 209 lpbDataMap(sh) {
202 //清除之前选中户 210 //清除之前选中户
...@@ -241,7 +249,12 @@ export default { ...@@ -241,7 +249,12 @@ export default {
241 highest = 0; 249 highest = 0;
242 } 250 }
243 } else { 251 } else {
244 // this.zdyWidth = 124; 252 //有且仅有独立层户
253 if(this.$refs.hBsm != undefined){
254 this.$refs.hBsm.forEach((item) => {
255 this.zdyWidth += item.offsetWidth + 21;
256 });
257 }
245 } 258 }
246 259
247 //计算逻辑幢下的幢单元和层户的高度 260 //计算逻辑幢下的幢单元和层户的高度
...@@ -507,12 +520,13 @@ export default { ...@@ -507,12 +520,13 @@ export default {
507 .ljz-wrap { 520 .ljz-wrap {
508 height: auto; 521 height: auto;
509 overflow: hidden; 522 overflow: hidden;
510 margin-bottom: 20px;
511 .ljz { 523 .ljz {
512 float: left; 524 margin-bottom: 20px;
513 margin-right: 20px; 525 display: table;
514 // position: relative; 526 // position: relative;
515 .ljz-zdy-wrap { 527 // .ljz-zdy-wrap {
528 // width: auto;
529 // display: table;
516 .ljz-zdy { 530 .ljz-zdy {
517 height: auto; 531 height: auto;
518 margin-right: 20px; 532 margin-right: 20px;
...@@ -530,6 +544,9 @@ export default { ...@@ -530,6 +544,9 @@ export default {
530 // bottom: 40px; 544 // bottom: 40px;
531 // } 545 // }
532 } 546 }
547 div:last-child{
548 margin-right: 0;
549 }
533 .ljz-ch { 550 .ljz-ch {
534 float: left; 551 float: left;
535 } 552 }
...@@ -540,9 +557,9 @@ export default { ...@@ -540,9 +557,9 @@ export default {
540 display: flex; 557 display: flex;
541 flex-direction: column-reverse; 558 flex-direction: column-reverse;
542 } 559 }
543 } 560 // }
544 .ljz-name { 561 .ljz-name {
545 width: 100%; 562 width: calc(100% - 32px);
546 height: 40px; 563 height: 40px;
547 background-color: darkorange; 564 background-color: darkorange;
548 } 565 }
...@@ -578,7 +595,7 @@ export default { ...@@ -578,7 +595,7 @@ export default {
578 } 595 }
579 } 596 }
580 .zdy-name { 597 .zdy-name {
581 width: 100%; 598 width: calc;
582 height: 40px; 599 height: 40px;
583 background-color: rosybrown; 600 background-color: rosybrown;
584 } 601 }
...@@ -591,7 +608,7 @@ export default { ...@@ -591,7 +608,7 @@ export default {
591 608
592 // 公共部分样式 start 609 // 公共部分样式 start
593 .chTable { 610 .chTable {
594 position: relative; 611 // position: relative;
595 tr { 612 tr {
596 .floor { 613 .floor {
597 background-color: blanchedalmond; 614 background-color: blanchedalmond;
...@@ -615,7 +632,7 @@ export default { ...@@ -615,7 +632,7 @@ export default {
615 .name { 632 .name {
616 line-height: 40px; 633 line-height: 40px;
617 text-align: center; 634 text-align: center;
618 display: inline-block; 635 display: table-footer-group;
619 } 636 }
620 // end 637 // end
621 } 638 }
......
...@@ -432,7 +432,8 @@ ...@@ -432,7 +432,8 @@
432 } 432 }
433 submit(data).then((res)=>{ 433 submit(data).then((res)=>{
434 if(res.code===200){ 434 if(res.code===200){
435 this.$message.success("提交完成！") 435 this.$message.success("提交完成！");
436 this.getZrzDetailByBsm(this.$route.query.bsm)
436 } 437 }
437 }) 438 })
438 }, 439 },
......