#

src/components/components/cocoFlowDia.vue

@@ -6,11 +6,12 @@
             class="dialog_diy"
             :close-on-click-modal="false"
             :fullscreen="markfullscreen"
+            :style="{ '--dialog-height': markfullscreen ? '100%' : '95%' }"
             :before-close="handleClose">
             <div slot="title">
                 <div class="markScore_diyTit">
                     <div>{{ lang.ssViewWork }}</div>
-                    <!-- <img  @click="markFullScreenBtn" style="cursor: pointer;height: 16px;" src="../../assets/icon/svgImg/nrk_fullscreen.svg" alt="" /> -->
+                    <img  @click="markFullScreenBtn" style="cursor: pointer;height: 16px;" src="../../assets/icon/svgImg/nrk_fullscreen.svg" alt="" />
                 </div>
             </div>
            
@@ -233,8 +234,10 @@ import { myMixin } from "@/mixins/mixin.js"
     .dialog_diy >>> .el-dialog{
         border-radius: 12px;
         overflow: hidden;
-        height: 95% !important;
+        height: var(--dialog-height, 95%) !important;
         margin: auto !important;
+        display: flex;
+        flex-direction: column;
     }
 
     .dialog_diy >>> .el-dialog__title{
@@ -260,11 +263,12 @@ import { myMixin } from "@/mixins/mixin.js"
         border-radius: 12px !important;
         overflow: auto;
         box-sizing: border-box;
-        min-height: 70vh;
-        max-height: calc(100vh - 90px);
+        flex: 1;
+        min-height: 0;
+        max-height: none;
         padding: 0 !important;
-        margin: 30px auto 0;
-        width: 99%;
+        margin: 0;
+        width: 100%;
     }
 
     .dialog_diy >>> .el-dialog__body::-webkit-scrollbar-thumb {
@@ -272,10 +276,10 @@ import { myMixin } from "@/mixins/mixin.js"
     }
 
     .markDialog{
-        height: 100%;
-        min-height: 600px;
+        height: auto;
+        min-height: 100%;
         display: flex;
-        padding:0 30px 30px;
+        padding:12px 30px 24px;
         box-sizing: border-box;
         flex-direction: column;
         gap: 30px;