Merge branch 'dev'
Showing
2 changed files
with
10 additions
and
4 deletions
... | @@ -14,6 +14,7 @@ | ... | @@ -14,6 +14,7 @@ |
14 | /deep/.el-menu-item { | 14 | /deep/.el-menu-item { |
15 | display: flex; | 15 | display: flex; |
16 | align-items: center; | 16 | align-items: center; |
17 | justify-content: space-between; | ||
17 | } | 18 | } |
18 | } | 19 | } |
19 | 20 | ||
... | @@ -210,7 +211,8 @@ | ... | @@ -210,7 +211,8 @@ |
210 | box-sizing: border-box; | 211 | box-sizing: border-box; |
211 | width: 70px; | 212 | width: 70px; |
212 | margin: 0 5px; | 213 | margin: 0 5px; |
213 | div{ | 214 | |
215 | div { | ||
214 | @include flex-center; | 216 | @include flex-center; |
215 | cursor: pointer; | 217 | cursor: pointer; |
216 | flex-direction: column; | 218 | flex-direction: column; |
... | @@ -218,7 +220,8 @@ | ... | @@ -218,7 +220,8 @@ |
218 | box-sizing: border-box; | 220 | box-sizing: border-box; |
219 | width: 70px; | 221 | width: 70px; |
220 | margin: 0 5px; | 222 | margin: 0 5px; |
221 | } | 223 | } |
224 | |||
222 | .icon { | 225 | .icon { |
223 | font-size: 10px; | 226 | font-size: 10px; |
224 | } | 227 | } |
... | @@ -239,4 +242,4 @@ | ... | @@ -239,4 +242,4 @@ |
239 | position: absolute; | 242 | position: absolute; |
240 | left: 0; | 243 | left: 0; |
241 | bottom: 0; | 244 | bottom: 0; |
242 | } | 245 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-21 13:11:04 | 4 | * @LastEditTime: 2023-10-13 17:03:52 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -116,6 +116,9 @@ | ... | @@ -116,6 +116,9 @@ |
116 | */ | 116 | */ |
117 | stepForm (index) { | 117 | stepForm (index) { |
118 | let that = this | 118 | let that = this |
119 | if (Object.keys(this.currentSelectProps).length == 0) { | ||
120 | return | ||
121 | } | ||
119 | this.currentSelectProps.type = "READ_ONLY" | 122 | this.currentSelectProps.type = "READ_ONLY" |
120 | getStepFormInfo(this.currentSelectProps).then((res) => { | 123 | getStepFormInfo(this.currentSelectProps).then((res) => { |
121 | if (res.code === 200) { | 124 | if (res.code === 200) { | ... | ... |
-
Please register or sign in to post a comment