合并代码
Showing
8 changed files
with
281 additions
and
46 deletions
... | @@ -93,3 +93,13 @@ export function updatePlc(data) { | ... | @@ -93,3 +93,13 @@ export function updatePlc(data) { |
93 | }) | 93 | }) |
94 | } | 94 | } |
95 | 95 | ||
96 | /** | ||
97 | * 批量修改室号 | ||
98 | */ | ||
99 | export function updateSh(data) { | ||
100 | return request({ | ||
101 | url: '/system/qjH/batchSh', | ||
102 | method: 'put', | ||
103 | data: data | ||
104 | }) | ||
105 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <el-dialog | 3 | <el-dialog |
4 | title="新增" | 4 | title="批量层" |
5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
6 | width="50%" | 6 | width="50%" |
7 | @close="close" | 7 | @close="close" |
... | @@ -162,14 +162,13 @@ | ... | @@ -162,14 +162,13 @@ |
162 | } | 162 | } |
163 | 163 | ||
164 | .inputtitle { | 164 | .inputtitle { |
165 | line-height: 40px; | 165 | line-height: 41px; |
166 | width: 95%; | 166 | width: 95%; |
167 | border: none; | 167 | border: none; |
168 | height: 98%; | ||
169 | outline: none; | ||
168 | } | 170 | } |
169 | 171 | ||
170 | /* .inputtitle:focus { | ||
171 | outline: none; | ||
172 | }*/ | ||
173 | 172 | ||
174 | .shop { | 173 | .shop { |
175 | margin-top: 20px; | 174 | margin-top: 20px; | ... | ... |
... | @@ -50,7 +50,7 @@ | ... | @@ -50,7 +50,7 @@ |
50 | <tr> | 50 | <tr> |
51 | <td colspan="2">户型</td> | 51 | <td colspan="2">户型</td> |
52 | <td colspan="2"> | 52 | <td colspan="2"> |
53 | <el-select> | 53 | <el-select class="selectTitle"> |
54 | <el-option | 54 | <el-option |
55 | v-for="i in hx" | 55 | v-for="i in hx" |
56 | :key="i.key" | 56 | :key="i.key" |
... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
61 | </td> | 61 | </td> |
62 | <td colspan="2">户型结构</td> | 62 | <td colspan="2">户型结构</td> |
63 | <td> | 63 | <td> |
64 | <el-select> | 64 | <el-select class="selectTitle"> |
65 | <el-option | 65 | <el-option |
66 | v-for="i in hx" | 66 | v-for="i in hx" |
67 | :key="i.key" | 67 | :key="i.key" |
... | @@ -82,7 +82,7 @@ | ... | @@ -82,7 +82,7 @@ |
82 | <td colspan="2"><input type="text" class="inputtitle"/></td> | 82 | <td colspan="2"><input type="text" class="inputtitle"/></td> |
83 | <td colspan="2">房屋类型</td> | 83 | <td colspan="2">房屋类型</td> |
84 | <td> | 84 | <td> |
85 | <el-select> | 85 | <el-select class="selectTitle"> |
86 | <el-option | 86 | <el-option |
87 | v-for="i in hx" | 87 | v-for="i in hx" |
88 | :key="i.key" | 88 | :key="i.key" |
... | @@ -95,7 +95,7 @@ | ... | @@ -95,7 +95,7 @@ |
95 | <tr> | 95 | <tr> |
96 | <td colspan="2">产别</td> | 96 | <td colspan="2">产别</td> |
97 | <td colspan="2"> | 97 | <td colspan="2"> |
98 | <el-select> | 98 | <el-select class="selectTitle"> |
99 | <el-option | 99 | <el-option |
100 | v-for="i in hx" | 100 | v-for="i in hx" |
101 | :key="i.key" | 101 | :key="i.key" |
... | @@ -112,7 +112,7 @@ | ... | @@ -112,7 +112,7 @@ |
112 | <tr> | 112 | <tr> |
113 | <td colspan="2">房屋性质</td> | 113 | <td colspan="2">房屋性质</td> |
114 | <td colspan="2"> | 114 | <td colspan="2"> |
115 | <el-select> | 115 | <el-select class="selectTitle"> |
116 | <el-option | 116 | <el-option |
117 | v-for="i in hx" | 117 | v-for="i in hx" |
118 | :key="i.key" | 118 | :key="i.key" |
... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
127 | <tr> | 127 | <tr> |
128 | <td colspan="2">房屋结构</td> | 128 | <td colspan="2">房屋结构</td> |
129 | <td colspan="5"> | 129 | <td colspan="5"> |
130 | <el-select> | 130 | <el-select class="selectTitle"> |
131 | <el-option | 131 | <el-option |
132 | v-for="i in hx" | 132 | v-for="i in hx" |
133 | :key="i.key" | 133 | :key="i.key" |
... | @@ -223,8 +223,7 @@ | ... | @@ -223,8 +223,7 @@ |
223 | 223 | ||
224 | }, | 224 | }, |
225 | cancel: function () { | 225 | cancel: function () { |
226 | this.$emit('close') | 226 | this.close() |
227 | this.isVisible = false | ||
228 | } | 227 | } |
229 | }, | 228 | }, |
230 | mounted() { | 229 | mounted() { |
... | @@ -256,17 +255,23 @@ | ... | @@ -256,17 +255,23 @@ |
256 | cursor: pointer; | 255 | cursor: pointer; |
257 | } | 256 | } |
258 | 257 | ||
259 | .el-select { | ||
260 | width: 98%; | ||
261 | } | ||
262 | |||
263 | .inputtitle { | 258 | .inputtitle { |
264 | line-height: 40px; | 259 | line-height: 40px; |
265 | width: 95%; | 260 | width: 95%; |
266 | border: none; | 261 | border: none; |
267 | outline: none; | 262 | outline: none; |
263 | height: 95%; | ||
264 | } | ||
265 | .selectTitle{ | ||
266 | width: 100%; | ||
267 | border-radius: 0; | ||
268 | -webkit-appearance: none; | ||
269 | -moz-appearance: none; | ||
270 | appearance: none; | ||
271 | border: none; | ||
272 | position: relative; | ||
273 | display: block; | ||
268 | } | 274 | } |
269 | |||
270 | .shop { | 275 | .shop { |
271 | text-align: center; | 276 | text-align: center; |
272 | margin-top: 20px; | 277 | margin-top: 20px; | ... | ... |
src/components/plsh/plSh.vue
0 → 100644
1 | <template> | ||
2 | <div class="main"> | ||
3 | <el-dialog | ||
4 | title="批量室号" | ||
5 | :visible.sync="isVisible" | ||
6 | width="50%" | ||
7 | @close="close" | ||
8 | :modal-append-to-body="false" | ||
9 | center> | ||
10 | <div> | ||
11 | <span class="xl" @click="xl">祥例</span> | ||
12 | <table border="1"> | ||
13 | <tr> | ||
14 | <td>室号前缀</td> | ||
15 | <td>单元号</td> | ||
16 | <td>分割符A</td> | ||
17 | <td>层号前自动补0</td> | ||
18 | <td>层</td> | ||
19 | <td>分割符B</td> | ||
20 | <td>户号</td> | ||
21 | <td>室号后缀</td> | ||
22 | </tr> | ||
23 | <tr> | ||
24 | <td> | ||
25 | <input type="text" class="inputtitle" v-model="plshData.shqz"/> | ||
26 | </td> | ||
27 | <td> | ||
28 | <el-checkbox v-model="plshData.isSelectDyh"></el-checkbox> | ||
29 | </td> | ||
30 | <td> | ||
31 | <input type="text" class="inputtitle" v-model="plshData.fgfA"/> | ||
32 | </td> | ||
33 | <td> | ||
34 | <el-checkbox v-model="plshData.isChqbl"></el-checkbox> | ||
35 | </td> | ||
36 | <td> | ||
37 | <el-select v-model="plshData.c"> | ||
38 | <el-option | ||
39 | v-for="i in cs" | ||
40 | :key="i.key" | ||
41 | :label="i.label" | ||
42 | :value="i.value" | ||
43 | ></el-option> | ||
44 | </el-select> | ||
45 | </td> | ||
46 | <td> | ||
47 | <input type="text" class="inputtitle" v-model="plshData.fghB"/> | ||
48 | </td> | ||
49 | <td> | ||
50 | |||
51 | </td> | ||
52 | <td> | ||
53 | <input type="text" class="inputtitle" v-model="plshData.shhz"/> | ||
54 | </td> | ||
55 | </tr> | ||
56 | </table> | ||
57 | <div class="gz"> | ||
58 | <span>室号规则:[单元号][分割符A][层号][分割符A][室号前缀][室号][室号后缀]</span> | ||
59 | </div> | ||
60 | </div> | ||
61 | <div> | ||
62 | <el-dialog | ||
63 | title="祥例" | ||
64 | :visible.sync="xlVisible" | ||
65 | width="50%" | ||
66 | :modal-append-to-body="false" | ||
67 | > | ||
68 | <div class="xlgz"> | ||
69 | <span> | ||
70 | 样例1:10101 <span>(1单元01层01室)</span>([单元号][层号],勾选“层号自动补0”) | ||
71 | <br/> | ||
72 | 样例2:11301室<span>(1单元13层01室)</span>([单元号][层号][室号后缀]) | ||
73 | <br/> | ||
74 | 样例3:101<span>(1层01室)</span>([层号]) | ||
75 | <br/> | ||
76 | 样例4:1-101<span>(1单元-01层01室)</span>([单元号][层号][分隔符],勾选“层号之前增加分隔符”) | ||
77 | <br/> | ||
78 | 样例5:1-13-01<span>(1单元13层01室)</span>([单元号][层号][分隔符]) | ||
79 | <br/> | ||
80 | 样例6:1-01<span>(1单元13层01室)</span>([层号][分隔符],勾选“室号之前增加分隔符”) | ||
81 | </span> | ||
82 | </div> | ||
83 | </el-dialog> | ||
84 | </div> | ||
85 | <div class="shop"> | ||
86 | <el-button type="primary" @click="save">保存</el-button> | ||
87 | <el-button type="primary" @click="result">重置</el-button> | ||
88 | <el-button type="primary" @click="cancel">取消</el-button> | ||
89 | </div> | ||
90 | </el-dialog> | ||
91 | </div> | ||
92 | </template> | ||
93 | |||
94 | <script> | ||
95 | import {updateSh} from './../../api/zrz' | ||
96 | import {Message} from 'element-ui' | ||
97 | export default { | ||
98 | name: "plSh", | ||
99 | props: { | ||
100 | plShVisible: { | ||
101 | type: Boolean, | ||
102 | default: false | ||
103 | }, | ||
104 | bsms: { | ||
105 | type: Array | ||
106 | } | ||
107 | }, | ||
108 | data() { | ||
109 | return { | ||
110 | isVisible: false, | ||
111 | xlVisible: false, | ||
112 | plshData: { | ||
113 | shqz: '', | ||
114 | isSelectDyh: false, | ||
115 | fgfA: '', | ||
116 | isChqbl: false, | ||
117 | c: '', | ||
118 | fgfB: '', | ||
119 | shhz: '' | ||
120 | }, | ||
121 | cs: [ | ||
122 | { | ||
123 | key: '1', | ||
124 | label: '明义层', | ||
125 | value: '1' | ||
126 | }, { | ||
127 | key: '2', | ||
128 | label: '实际层', | ||
129 | value: '2' | ||
130 | } | ||
131 | ] | ||
132 | } | ||
133 | }, | ||
134 | methods: { | ||
135 | xl: function () { | ||
136 | this.xlVisible = true; | ||
137 | }, | ||
138 | close: function () { | ||
139 | this.$emit("close") | ||
140 | this.isVisible = false | ||
141 | this.result(); | ||
142 | }, | ||
143 | result: function () { | ||
144 | this.plshData = { | ||
145 | shqz: '', | ||
146 | isSelectDyh: false, | ||
147 | fgfA: '', | ||
148 | isChqbl: false, | ||
149 | c: '', | ||
150 | fgfB: '', | ||
151 | shhz: '' | ||
152 | } | ||
153 | }, | ||
154 | save: function () { | ||
155 | this.plshData['bsms'] = this.bsms | ||
156 | console.log(this.plshData) | ||
157 | updateSh(this.plshData).then(res=>{ | ||
158 | if (res.success){ | ||
159 | this.close(); | ||
160 | } else { | ||
161 | Message.error(res.message) | ||
162 | } | ||
163 | }) | ||
164 | }, | ||
165 | cancel: function () { | ||
166 | this.close() | ||
167 | } | ||
168 | }, | ||
169 | watch: { | ||
170 | plShVisible: function (val) { | ||
171 | this.isVisible = val | ||
172 | } | ||
173 | } | ||
174 | } | ||
175 | </script> | ||
176 | |||
177 | <style scoped lang="less"> | ||
178 | table { | ||
179 | margin-top: 10px; | ||
180 | background-color: #fff; | ||
181 | font-size: 14px; | ||
182 | width: 100%; | ||
183 | :hover { | ||
184 | cursor: pointer; | ||
185 | } | ||
186 | } | ||
187 | |||
188 | td { | ||
189 | text-align: center; | ||
190 | height: 36px; | ||
191 | min-width: 60px; | ||
192 | } | ||
193 | |||
194 | .xl { | ||
195 | color: blue; | ||
196 | float: right; | ||
197 | } | ||
198 | |||
199 | .xl:hover { | ||
200 | cursor: pointer; | ||
201 | } | ||
202 | |||
203 | .inputtitle { | ||
204 | line-height: 38px; | ||
205 | width: 90%; | ||
206 | border: none; | ||
207 | outline: none; | ||
208 | } | ||
209 | |||
210 | .shop { | ||
211 | text-align: center; | ||
212 | margin-top: 20px; | ||
213 | } | ||
214 | |||
215 | .gz { | ||
216 | color: #b2b2b2; | ||
217 | font-size: 12px; | ||
218 | margin-top: 40px; | ||
219 | } | ||
220 | |||
221 | .xlgz { | ||
222 | span { | ||
223 | font-size: 16px; | ||
224 | line-height: 22px; | ||
225 | span { | ||
226 | color: red; | ||
227 | } | ||
228 | } | ||
229 | } | ||
230 | </style> |
... | @@ -111,6 +111,12 @@ | ... | @@ -111,6 +111,12 @@ |
111 | default: function () { | 111 | default: function () { |
112 | return false | 112 | return false |
113 | } | 113 | } |
114 | }, | ||
115 | dylxs: { | ||
116 | type: Array, | ||
117 | default: function () { | ||
118 | return ['zd'] | ||
119 | } | ||
114 | } | 120 | } |
115 | }, | 121 | }, |
116 | mounted() { | 122 | mounted() { |
... | @@ -123,7 +129,6 @@ | ... | @@ -123,7 +129,6 @@ |
123 | this.queryData = { | 129 | this.queryData = { |
124 | bdcdyh: "", | 130 | bdcdyh: "", |
125 | bdcqzh: "", | 131 | bdcqzh: "", |
126 | dylxs: ['zd'], | ||
127 | qlrmc: "", | 132 | qlrmc: "", |
128 | qszt: "2", | 133 | qszt: "2", |
129 | xmmc: "", | 134 | xmmc: "", |
... | @@ -133,6 +138,7 @@ | ... | @@ -133,6 +138,7 @@ |
133 | this.getData(this.queryData) | 138 | this.getData(this.queryData) |
134 | }, | 139 | }, |
135 | getData: function (data) { | 140 | getData: function (data) { |
141 | data['dylxs'] = this.dylxs; | ||
136 | getSearchList(data).then(res => { | 142 | getSearchList(data).then(res => { |
137 | this.Data = res.result.records | 143 | this.Data = res.result.records |
138 | }) | 144 | }) | ... | ... |
... | @@ -335,7 +335,7 @@ | ... | @@ -335,7 +335,7 @@ |
335 | </div> | 335 | </div> |
336 | </el-dialog> | 336 | </el-dialog> |
337 | 337 | ||
338 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" | 338 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" |
339 | @close="close"></query-data> | 339 | @close="close"></query-data> |
340 | <div class="header-button"> | 340 | <div class="header-button"> |
341 | <el-button type="primary" @click="save">保存</el-button> | 341 | <el-button type="primary" @click="save">保存</el-button> |
... | @@ -505,7 +505,7 @@ | ... | @@ -505,7 +505,7 @@ |
505 | </div> | 505 | </div> |
506 | </el-dialog> | 506 | </el-dialog> |
507 | 507 | ||
508 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" | 508 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" |
509 | @close="close"></query-data> | 509 | @close="close"></query-data> |
510 | <div class="header-button"> | 510 | <div class="header-button"> |
511 | <el-button type="primary" @click="save">保存</el-button> | 511 | <el-button type="primary" @click="save">保存</el-button> | ... | ... |
... | @@ -77,7 +77,7 @@ | ... | @@ -77,7 +77,7 @@ |
77 | <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> | 77 | <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> |
78 | </tr> | 78 | </tr> |
79 | </table> | 79 | </table> |
80 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" | 80 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" |
81 | @close="close"></query-data> | 81 | @close="close"></query-data> |
82 | </div> | 82 | </div> |
83 | </el-tab-pane> | 83 | </el-tab-pane> |
... | @@ -117,7 +117,7 @@ | ... | @@ -117,7 +117,7 @@ |
117 | <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> | 117 | <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> |
118 | </tr> | 118 | </tr> |
119 | </table> | 119 | </table> |
120 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" | 120 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" |
121 | @close="close"></query-data> | 121 | @close="close"></query-data> |
122 | </div> | 122 | </div> |
123 | </el-tab-pane> | 123 | </el-tab-pane> | ... | ... |
... | @@ -18,32 +18,11 @@ | ... | @@ -18,32 +18,11 @@ |
18 | <el-button class="radioBtn" label="2" border>实预测转换</el-button> | 18 | <el-button class="radioBtn" label="2" border>实预测转换</el-button> |
19 | <el-button class="radioBtn" label="3" border>批量户</el-button> | 19 | <el-button class="radioBtn" label="3" border>批量户</el-button> |
20 | <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> | 20 | <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> |
21 | <el-button class="radioBtn" label="5" border>批量室号</el-button> | 21 | <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button> |
22 | <el-button class="radioBtn" label="6" border>批量坐落</el-button> | 22 | <el-button class="radioBtn" label="6" border>批量坐落</el-button> |
23 | <el-button class="radioBtn" label="7" border>批量单元号</el-button> | 23 | <el-button class="radioBtn" label="7" border>批量单元号</el-button> |
24 | </el-col> | 24 | </el-col> |
25 | </el-row> | 25 | </el-row> |
26 | <!-- <div > | ||
27 | <el-radio-group v-model="tabPosition"> | ||
28 | <el-radio-button label="sc">实测</el-radio-button> | ||
29 | <el-radio-button label="yc">预测</el-radio-button> | ||
30 | </el-radio-group> | ||
31 | <el-input | ||
32 | v-model="bdcdyh" | ||
33 | class="searchInput" | ||
34 | placeholder="输入不动产单元号" | ||
35 | ></el-input> | ||
36 | |||
37 | <div> | ||
38 | <el-button class="radioBtn" label="1" @click="create" border>创建楼盘</el-button> | ||
39 | <el-button class="radioBtn" label="2" border>实预测转换</el-button> | ||
40 | <el-button class="radioBtn" label="3" border>批量户</el-button> | ||
41 | <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> | ||
42 | <el-button class="radioBtn" label="5" border>批量室号</el-button> | ||
43 | <el-button class="radioBtn" label="6" border>批量坐落</el-button> | ||
44 | <el-button class="radioBtn" label="7" border>批量单元号</el-button> | ||
45 | </div> | ||
46 | </div> --> | ||
47 | </div> | 26 | </div> |
48 | <div | 27 | <div |
49 | class="tab-content" | 28 | class="tab-content" |
... | @@ -124,11 +103,13 @@ | ... | @@ -124,11 +103,13 @@ |
124 | </div> | 103 | </div> |
125 | </el-dialog> | 104 | </el-dialog> |
126 | <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c> | 105 | <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c> |
106 | <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh> | ||
127 | </div> | 107 | </div> |
128 | </template> | 108 | </template> |
129 | 109 | ||
130 | <script> | 110 | <script> |
131 | import PlC from "./../../../../components/plc/plC" | 111 | import PlC from "./../../../../components/plc/plC" |
112 | import PlSh from "./../../../../components/plsh/plSh" | ||
132 | import LineTree from "../../../../components/lineTree/lineTree"; | 113 | import LineTree from "../../../../components/lineTree/lineTree"; |
133 | import addLjz from "./ljz/index"; | 114 | import addLjz from "./ljz/index"; |
134 | import addZdy from "./zdy/index"; | 115 | import addZdy from "./zdy/index"; |
... | @@ -138,12 +119,13 @@ import { getLpbMenuTree } from "../../../../api/lpb"; | ... | @@ -138,12 +119,13 @@ import { getLpbMenuTree } from "../../../../api/lpb"; |
138 | 119 | ||
139 | export default { | 120 | export default { |
140 | name: "", | 121 | name: "", |
141 | components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC }, | 122 | components: { LineTree, addLjz, addZdy, addCh, lpbContent,PlC,PlSh }, |
142 | props: {}, | 123 | props: {}, |
143 | data() { | 124 | data() { |
144 | return { | 125 | return { |
145 | bsms:["123","321","231"], | 126 | bsms:["123","321","231"], |
146 | plcVisible:false, | 127 | plcVisible:false, |
128 | plShVisible:false, | ||
147 | tabPosition:'sc', | 129 | tabPosition:'sc', |
148 | radio1: "", | 130 | radio1: "", |
149 | radio2: "", | 131 | radio2: "", |
... | @@ -236,6 +218,9 @@ export default { | ... | @@ -236,6 +218,9 @@ export default { |
236 | plcClose(){ | 218 | plcClose(){ |
237 | this.plcVisible=false; | 219 | this.plcVisible=false; |
238 | }, | 220 | }, |
221 | plshClose(){ | ||
222 | this.plShVisible=false | ||
223 | }, | ||
239 | //获取高度计算lpb内容区高度 | 224 | //获取高度计算lpb内容区高度 |
240 | getHeight() { | 225 | getHeight() { |
241 | this.lpbContentHight = window.innerHeight - 276; | 226 | this.lpbContentHight = window.innerHeight - 276; | ... | ... |
-
Please register or sign in to post a comment