Merge branch 'dev'
Showing
5 changed files
with
10 additions
and
8 deletions
... | @@ -53,11 +53,9 @@ | ... | @@ -53,11 +53,9 @@ |
53 | }, | 53 | }, |
54 | watch: { | 54 | watch: { |
55 | isShow (newValue) { | 55 | isShow (newValue) { |
56 | this.editItem = this.loadViewFn(this.editItem) | ||
57 | document.body.appendChild(this.$el); | ||
58 | this.$nextTick(() => { | 56 | this.$nextTick(() => { |
59 | // this.editItem = this.loadViewFn(this.editItem) | 57 | this.editItem = this.loadViewFn(this.editItem) |
60 | // document.body.appendChild(this.$el); | 58 | document.body.appendChild(this.$el); |
61 | this.myShow = newValue | 59 | this.myShow = newValue |
62 | }) | 60 | }) |
63 | } | 61 | } | ... | ... |
... | @@ -8,6 +8,7 @@ | ... | @@ -8,6 +8,7 @@ |
8 | margin: 0 auto; | 8 | margin: 0 auto; |
9 | display: flex; | 9 | display: flex; |
10 | flex-wrap: wrap; | 10 | flex-wrap: wrap; |
11 | height: 100%; | ||
11 | 12 | ||
12 | .title { | 13 | .title { |
13 | width: 100%; | 14 | width: 100%; |
... | @@ -259,7 +260,8 @@ | ... | @@ -259,7 +260,8 @@ |
259 | .rollTable { | 260 | .rollTable { |
260 | margin-top: -2px; | 261 | margin-top: -2px; |
261 | display: block; | 262 | display: block; |
262 | height: calc(100vh - 185px); | 263 | height: 100%; |
264 | // height: calc(100vh - 185px); | ||
263 | overflow-y: scroll; | 265 | overflow-y: scroll; |
264 | margin-left: 2px; | 266 | margin-left: 2px; |
265 | } | 267 | } | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -8,6 +8,7 @@ | ... | @@ -8,6 +8,7 @@ |
8 | margin: 0 auto; | 8 | margin: 0 auto; |
9 | display: flex; | 9 | display: flex; |
10 | flex-wrap: wrap; | 10 | flex-wrap: wrap; |
11 | height: 100%; | ||
11 | 12 | ||
12 | .title { | 13 | .title { |
13 | width: 100%; | 14 | width: 100%; |
... | @@ -258,7 +259,8 @@ | ... | @@ -258,7 +259,8 @@ |
258 | .rollTable { | 259 | .rollTable { |
259 | margin-top: -2px; | 260 | margin-top: -2px; |
260 | display: block; | 261 | display: block; |
261 | height: calc(100vh - 185px); | 262 | height: calc(100% - 60px); |
263 | // height: calc(100vh - 185px); | ||
262 | overflow-y: scroll; | 264 | overflow-y: scroll; |
263 | margin-left: 2px; | 265 | margin-left: 2px; |
264 | } | 266 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-13 10:37:29 | 4 | * @LastEditTime: 2023-10-13 13:38:21 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
... | @@ -196,7 +196,7 @@ | ... | @@ -196,7 +196,7 @@ |
196 | qlxxCol: datas.qlxxCol(), | 196 | qlxxCol: datas.qlxxCol(), |
197 | }; | 197 | }; |
198 | }, | 198 | }, |
199 | mounted () { | 199 | created () { |
200 | sendThis(this) | 200 | sendThis(this) |
201 | this.init() | 201 | this.init() |
202 | }, | 202 | }, | ... | ... |
-
Please register or sign in to post a comment