Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
10 changed files
with
47 additions
and
33 deletions
... | @@ -376,6 +376,18 @@ export default { | ... | @@ -376,6 +376,18 @@ export default { |
376 | flex: 1; | 376 | flex: 1; |
377 | width: 100%; | 377 | width: 100%; |
378 | display: flex; | 378 | display: flex; |
379 | .cghj{ | ||
380 | /deep/.el-card__header{ | ||
381 | padding: 13px 20px; | ||
382 | span{ | ||
383 | position: relative; | ||
384 | top: 5px; | ||
385 | } | ||
386 | img{ | ||
387 | width: 200px; | ||
388 | } | ||
389 | } | ||
390 | } | ||
379 | >div{ | 391 | >div{ |
380 | flex: 1; | 392 | flex: 1; |
381 | // flex-grow:1; | 393 | // flex-grow:1; | ... | ... |
... | @@ -7,21 +7,21 @@ | ... | @@ -7,21 +7,21 @@ |
7 | <td colspan="12" align="center" ><font size="4">层基本信息</font></td> | 7 | <td colspan="12" align="center" ><font size="4">层基本信息</font></td> |
8 | </tr> | 8 | </tr> |
9 | <tr height="30"> | 9 | <tr height="30"> |
10 | <td colspan="2" align="center" >层号</td> | 10 | <td colspan="2" align="center" class="tdright">层号</td> |
11 | <td colspan="4" > | 11 | <td colspan="4" > |
12 | <el-input v-model="form.ch"></el-input> | 12 | <el-input v-model="form.ch"></el-input> |
13 | </td> | 13 | </td> |
14 | <td colspan="2" align="center" >自然幢号</td> | 14 | <td colspan="2" align="center" class="tdright">自然幢号</td> |
15 | <td colspan="4" > | 15 | <td colspan="4" > |
16 | <el-input v-model="form.zrzh"></el-input> | 16 | <el-input v-model="form.zrzh"></el-input> |
17 | </td> | 17 | </td> |
18 | </tr> | 18 | </tr> |
19 | <tr height="30"> | 19 | <tr height="30"> |
20 | <td colspan="2" align="center" >实际层</td> | 20 | <td colspan="2" align="center" class="tdright">实际层</td> |
21 | <td colspan="4" > | 21 | <td colspan="4" > |
22 | <el-input v-model="form.sjc"></el-input> | 22 | <el-input v-model="form.sjc"></el-input> |
23 | </td> | 23 | </td> |
24 | <td colspan="2" align="center" >名义层</td> | 24 | <td colspan="2" align="center" class="tdright">名义层</td> |
25 | <td colspan="4" > | 25 | <td colspan="4" > |
26 | <el-input v-model="form.myc"></el-input> | 26 | <el-input v-model="form.myc"></el-input> |
27 | </td> | 27 | </td> |
... | @@ -29,44 +29,44 @@ | ... | @@ -29,44 +29,44 @@ |
29 | 29 | ||
30 | 30 | ||
31 | <tr height="30"> | 31 | <tr height="30"> |
32 | <td colspan="2" align="center" >层建筑面积(㎡)</td> | 32 | <td colspan="2" align="center" class="tdright">层建筑面积(㎡)</td> |
33 | <td colspan="4" > | 33 | <td colspan="4" > |
34 | <el-input v-model="form.cjzmj"></el-input> | 34 | <el-input v-model="form.cjzmj"></el-input> |
35 | </td> | 35 | </td> |
36 | <td colspan="2" align="center" >层套内建筑面积(㎡)</td> | 36 | <td colspan="2" align="center" class="tdright">层套内建筑面积(㎡)</td> |
37 | <td colspan="4" > | 37 | <td colspan="4" > |
38 | <el-input v-model="form.ctnjzmj"></el-input> | 38 | <el-input v-model="form.ctnjzmj"></el-input> |
39 | </td> | 39 | </td> |
40 | </tr> | 40 | </tr> |
41 | 41 | ||
42 | <tr height="30"> | 42 | <tr height="30"> |
43 | <td colspan="2" align="center" >层阳台面积(㎡)</td> | 43 | <td colspan="2" align="center" class="tdright">层阳台面积(㎡)</td> |
44 | <td colspan="4" > | 44 | <td colspan="4" > |
45 | <el-input v-model="form.cytmj"></el-input> | 45 | <el-input v-model="form.cytmj"></el-input> |
46 | </td> | 46 | </td> |
47 | <td colspan="2" align="center" >层半墙面积(㎡)</td> | 47 | <td colspan="2" align="center" class="tdright">层半墙面积(㎡)</td> |
48 | <td colspan="4" > | 48 | <td colspan="4" > |
49 | <el-input v-model="form.cbqmj"></el-input> | 49 | <el-input v-model="form.cbqmj"></el-input> |
50 | </td> | 50 | </td> |
51 | </tr> | 51 | </tr> |
52 | 52 | ||
53 | <tr height="30"> | 53 | <tr height="30"> |
54 | <td colspan="2" align="center" >层共有建筑面积(㎡)</td> | 54 | <td colspan="2" align="center" class="tdright">层共有建筑面积(㎡)</td> |
55 | <td colspan="4" > | 55 | <td colspan="4" > |
56 | <el-input v-model="form.cgyjzmj"></el-input> | 56 | <el-input v-model="form.cgyjzmj"></el-input> |
57 | </td> | 57 | </td> |
58 | <td colspan="2" align="center" >层分摊建筑面积(㎡)</td> | 58 | <td colspan="2" align="center" class="tdright">层分摊建筑面积(㎡)</td> |
59 | <td colspan="4" > | 59 | <td colspan="4" > |
60 | <el-input v-model="form.cftjzmj"></el-input> | 60 | <el-input v-model="form.cftjzmj"></el-input> |
61 | </td> | 61 | </td> |
62 | </tr> | 62 | </tr> |
63 | 63 | ||
64 | <tr height="30"> | 64 | <tr height="30"> |
65 | <td colspan="2" align="center" >层高</td> | 65 | <td colspan="2" align="center" class="tdright">层高</td> |
66 | <td colspan="4" > | 66 | <td colspan="4" > |
67 | <el-input v-model="form.cg"></el-input> | 67 | <el-input v-model="form.cg"></el-input> |
68 | </td> | 68 | </td> |
69 | <td colspan="2" align="center" >水平投影面积</td> | 69 | <td colspan="2" align="center" class="tdright">水平投影面积</td> |
70 | <td colspan="4" > | 70 | <td colspan="4" > |
71 | <el-input v-model="form.sptymj"></el-input> | 71 | <el-input v-model="form.sptymj"></el-input> |
72 | </td> | 72 | </td> | ... | ... |
... | @@ -15,32 +15,32 @@ | ... | @@ -15,32 +15,32 @@ |
15 | </td> | 15 | </td> |
16 | </tr> | 16 | </tr> |
17 | <tr height="30"> | 17 | <tr height="30"> |
18 | <td colspan="2" align="center">逻辑幢号</td> | 18 | <td colspan="2" align="center" class="tdright"><i class="requisite">*</i>逻辑幢号</td> |
19 | <td colspan="4"> | 19 | <td colspan="4"> |
20 | <input class="formInput" ref="ljzh" @blur="inputBlur($event)" v-model="form.ljzh" /> | 20 | <input class="formInput" ref="ljzh" @blur="inputBlur($event)" v-model="form.ljzh" /> |
21 | </td> | 21 | </td> |
22 | <td colspan="2" align="center">自然幢号</td> | 22 | <td colspan="2" align="center" class="tdright">自然幢号</td> |
23 | <td colspan="4"> | 23 | <td colspan="4"> |
24 | <el-input v-model="form.zrzh" maxlength="24" disabled></el-input> | 24 | <el-input v-model="form.zrzh" maxlength="24" disabled></el-input> |
25 | </td> | 25 | </td> |
26 | </tr> | 26 | </tr> |
27 | <tr height="30"> | 27 | <tr height="30"> |
28 | <td colspan="2" align="center">逻辑幢名称</td> | 28 | <td colspan="2" align="center" class="tdright"><i class="requisite">*</i>逻辑幢名称</td> |
29 | <td colspan="4"> | 29 | <td colspan="4"> |
30 | <input class="formInput" ref="ljzmc" @blur="inputBlur($event)" v-model="form.ljzmc" /> | 30 | <input class="formInput" ref="ljzmc" @blur="inputBlur($event)" v-model="form.ljzmc" /> |
31 | </td> | 31 | </td> |
32 | <td colspan="2" align="center">建筑物状态</td> | 32 | <td colspan="2" align="center" class="tdright">建筑物状态</td> |
33 | <td colspan="4"> | 33 | <td colspan="4"> |
34 | <el-input v-model="form.jzwzt"></el-input> | 34 | <el-input v-model="form.jzwzt"></el-input> |
35 | </td> | 35 | </td> |
36 | </tr> | 36 | </tr> |
37 | 37 | ||
38 | <tr height="30"> | 38 | <tr height="30"> |
39 | <td colspan="2" align="center">门牌号</td> | 39 | <td colspan="2" align="center" class="tdright">门牌号</td> |
40 | <td colspan="4"> | 40 | <td colspan="4"> |
41 | <el-input v-model="form.mph"></el-input> | 41 | <el-input v-model="form.mph"></el-input> |
42 | </td> | 42 | </td> |
43 | <td colspan="2" align="center">竣工日期</td> | 43 | <td colspan="2" align="center" class="tdright">竣工日期</td> |
44 | <td colspan="4"> | 44 | <td colspan="4"> |
45 | <el-date-picker | 45 | <el-date-picker |
46 | v-model="form.jgrq" | 46 | v-model="form.jgrq" |
... | @@ -53,33 +53,33 @@ | ... | @@ -53,33 +53,33 @@ |
53 | </tr> | 53 | </tr> |
54 | 54 | ||
55 | <tr height="30"> | 55 | <tr height="30"> |
56 | <td colspan="2" align="center">预测建筑面积(㎡)</td> | 56 | <td colspan="2" align="center" class="tdright">预测建筑面积(㎡)</td> |
57 | <td colspan="4"> | 57 | <td colspan="4"> |
58 | <el-input v-model="form.ycjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> | 58 | <el-input v-model="form.ycjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
59 | </td> | 59 | </td> |
60 | <td colspan="2" align="center">实测建筑面积(㎡)</td> | 60 | <td colspan="2" align="center" class="tdright">实测建筑面积(㎡)</td> |
61 | <td colspan="4"> | 61 | <td colspan="4"> |
62 | <el-input v-model="form.scjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> | 62 | <el-input v-model="form.scjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
63 | </td> | 63 | </td> |
64 | </tr> | 64 | </tr> |
65 | 65 | ||
66 | <tr height="30"> | 66 | <tr height="30"> |
67 | <td colspan="2" align="center">预测地下面积(㎡)</td> | 67 | <td colspan="2" align="center" class="tdright">预测地下面积(㎡)</td> |
68 | <td colspan="4"> | 68 | <td colspan="4"> |
69 | <el-input v-model="form.ycdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> | 69 | <el-input v-model="form.ycdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
70 | </td> | 70 | </td> |
71 | <td colspan="2" align="center">实测地下面积(㎡)</td> | 71 | <td colspan="2" align="center" class="tdright">实测地下面积(㎡)</td> |
72 | <td colspan="4"> | 72 | <td colspan="4"> |
73 | <el-input v-model="form.scdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> | 73 | <el-input v-model="form.scdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
74 | </td> | 74 | </td> |
75 | </tr> | 75 | </tr> |
76 | 76 | ||
77 | <tr height="30"> | 77 | <tr height="30"> |
78 | <td colspan="2" align="center">预测其他面积(㎡)</td> | 78 | <td colspan="2" align="center" class="tdright">预测其他面积(㎡)</td> |
79 | <td colspan="4"> | 79 | <td colspan="4"> |
80 | <el-input v-model="form.ycqtmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> | 80 | <el-input v-model="form.ycqtmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
81 | </td> | 81 | </td> |
82 | <td colspan="2" align="center">实测其他面积(㎡)</td> | 82 | <td colspan="2" align="center" class="tdright">实测其他面积(㎡)</td> |
83 | <td colspan="4"> | 83 | <td colspan="4"> |
84 | <el-input v-model="form.scqymj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> | 84 | <el-input v-model="form.scqymj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
85 | </td> | 85 | </td> |
... | @@ -95,9 +95,10 @@ | ... | @@ -95,9 +95,10 @@ |
95 | v-if="index === 0" | 95 | v-if="index === 0" |
96 | :rowspan="ytTitleRowspan" | 96 | :rowspan="ytTitleRowspan" |
97 | align="center" | 97 | align="center" |
98 | class="tdright" | ||
98 | > | 99 | > |
99 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> | 100 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> |
100 | <span>房屋用途</span> | 101 | <span style="position:relative;top:-6px"><i class="requisite">*</i>房屋用途</span> |
101 | </td> | 102 | </td> |
102 | <td colspan="1" align="center"> | 103 | <td colspan="1" align="center"> |
103 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> | 104 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> |
... | @@ -128,9 +129,10 @@ | ... | @@ -128,9 +129,10 @@ |
128 | v-if="index === 0" | 129 | v-if="index === 0" |
129 | :rowspan="fwjgTitleRowspan" | 130 | :rowspan="fwjgTitleRowspan" |
130 | align="center" | 131 | align="center" |
132 | class="tdright" | ||
131 | > | 133 | > |
132 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> | 134 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> |
133 | <span>房屋结构</span> | 135 | <span style="position:relative;top:-6px"><i class="requisite">*</i>房屋结构</span> |
134 | </td> | 136 | </td> |
135 | <td colspan="1" align="center"> | 137 | <td colspan="1" align="center"> |
136 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> | 138 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> |
... | @@ -152,25 +154,25 @@ | ... | @@ -152,25 +154,25 @@ |
152 | </tr> | 154 | </tr> |
153 | 155 | ||
154 | <tr height="30"> | 156 | <tr height="30"> |
155 | <td colspan="2" align="center">地下层数</td> | 157 | <td colspan="2" align="center" class="tdright">地下层数</td> |
156 | <td colspan="4"> | 158 | <td colspan="4"> |
157 | <el-input v-model="form.dxcs"></el-input> | 159 | <el-input v-model="form.dxcs"></el-input> |
158 | </td> | 160 | </td> |
159 | <td colspan="2" align="center">地上层数</td> | 161 | <td colspan="2" align="center" class="tdright">地上层数</td> |
160 | <td colspan="4"> | 162 | <td colspan="4"> |
161 | <el-input v-model="form.dscs"></el-input> | 163 | <el-input v-model="form.dscs"></el-input> |
162 | </td> | 164 | </td> |
163 | </tr> | 165 | </tr> |
164 | 166 | ||
165 | <tr height="30"> | 167 | <tr height="30"> |
166 | <td colspan="2" align="center">总层数</td> | 168 | <td colspan="2" align="center" class="tdright">总层数</td> |
167 | <td colspan="10"> | 169 | <td colspan="10"> |
168 | <el-input v-model="form.zcs"></el-input> | 170 | <el-input v-model="form.zcs"></el-input> |
169 | </td> | 171 | </td> |
170 | </tr> | 172 | </tr> |
171 | 173 | ||
172 | <tr height="30"> | 174 | <tr height="30"> |
173 | <td colspan="2" rowspan="2" align="center"> | 175 | <td colspan="2" rowspan="2" class="tdright"> |
174 | <span>备注</span> | 176 | <span>备注</span> |
175 | </td> | 177 | </td> |
176 | <td colspan="10" rowspan="2"> | 178 | <td colspan="10" rowspan="2"> | ... | ... |
-
Please register or sign in to post a comment