admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-lhk' into shenzhen-dev

Browse Source
This commit is contained in:
kun 2024-03-12 10:29:18 +08:00
commit 3fc27e7b9f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/projectFront/BIMBASECenter/singleProgressManagement.vue
View File

@ -284,7 +284,7 @@
> >
</quill-editor> </quill-editor>
</el-form-item> </el-form-item>
<el-form-item label="施工要点" prop="constructionKeyPoint"> <el-form-item label="质量控制要点" prop="constructionKeyPoint">
<quill-editor <quill-editor
v-model="riskTipInfo.constructionKeyPoint" v-model="riskTipInfo.constructionKeyPoint"
ref="myQuillEditor" ref="myQuillEditor"

4
src/views/projectFront/BIMCenter/overviewTwo.vue
View File

@ -239,15 +239,17 @@ export default {
@include flex; @include flex;
margin-top: 10px; margin-top: 10px;
.selected-box { .selected-box {
flex: 1%; flex: 1;
min-width: 208px; min-width: 208px;
min-height: 32px; min-height: 32px;
max-height: 100px;
border: 1px solid #c0c4cc; border: 1px solid #c0c4cc;
border-radius: 4px; border-radius: 4px;
@include flex; @include flex;
flex-wrap: wrap; flex-wrap: wrap;
padding-left: 6px; padding-left: 6px;
margin-right: 15px; margin-right: 15px;
overflow-y: scroll;
> div { > div {
@include flex; @include flex;
background-color: #f4f4f5; background-color: #f4f4f5;