Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue

@@ -63,14 +63,22 @@ export default {
           '--reverse-scale',
           ''
         ],
+        [
+          '--middle-scale',
+          ''
+        ],
       ];
 
       if (scaleX > scaleY) {
-        cssGlobalVariable[0][1] = `scaleX(${1 / scaleX * scaleY})`;
+        // cssGlobalVariable[0][1] = `scaleX(${1 / scaleX * scaleY})`;
+        cssGlobalVariable[0][1] = `scaleX(${1 - (scaleX - scaleY)})`;
         cssGlobalVariable[1][1] = `scaleY(${1 / scaleX})`;
+        cssGlobalVariable[2][1] = `scaleX(${1 - (scaleX - scaleY) / 2})`;
       } else {
-        cssGlobalVariable[0][1] = `scaleY(${1 / scaleY * scaleX})`;
+        // cssGlobalVariable[0][1] = `scaleY(${1 / scaleY * scaleX})`;
+        cssGlobalVariable[0][1] = `scaleX(${1 - (scaleY - scaleX)})`;
         cssGlobalVariable[1][1] = `scaleX(${1 / scaleY})`;
+        cssGlobalVariable[2][1] = `scaleX(${1 - (scaleY - scaleX) / 2})`;
       }
 
       cssGlobalVariable.forEach((data) => {
@@ -94,47 +102,35 @@ export default {
 body {
   .keep-ratio {
     transform: var(--keep-ratio);
-    transition: all .15s linear;
-
-    &[origin] {
-      transform-origin: attr(origin);
-    }
-
-    &-left {
-      transform-origin: left;
-    }
-
-    &-right {
-      transform-origin: right;
   }
 
-    &-bottom {
+  .reverse-ratio {
-      transform-origin: bottom;
+    transform: var(--reverse-scale);
   }
 
-    &-top {
+  .middle-ratio {
-      transform-origin: top;
+    transform: var(--middle-scale);
-    }
   }
 
-  .reverse-scale {
+  .keep-ratio,
-    transform: var(--reverse-scale);
+  .reverse-ratio,
+  .middle-ratio {
     transition: all .15s linear;
 
-    &-left {
+    &[origin="left"] {
       transform-origin: left;
     }
 
-    &-right {
+    &[origin="right"] {
       transform-origin: right;
     }
 
-    &-bottom {
+    &[origin="top"] {
-      transform-origin: bottom;
+      transform-origin: top;
     }
 
-    &-top {
+    &[origin="bottom"] {
-      transform-origin: top;
+      transform-origin: bottom;
     }
   }
 }

ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class='Descriptions' :style="getStyle()">
+  <div class='Descriptions keep-ratio' origin="left" :style="getStyle()">
     <div class="item" v-for="(item, index) in list" :key="`${item.key || item.label}${index}`"
       :style="[gridStyle(item, index), transformStyle(itemStyle)]">
       <div class="title text" :style="transformStyle(titleStyle)">

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <Card class='DisposalPlan' title="处置预案">
-		<canvas ref="FlowCanvasRef" />
+    <canvas ref="FlowCanvasRef" class="keep-ratio" />
   </Card>
 </template>
 

ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue

@@ -2,7 +2,7 @@
   <Card2 class='Auditlists' title="审核列表">
     <InputSearch style="width: 100%;" />
     <div class="body">
-      <ListItem v-for="item in list" :key="item.id" :data="item" />
+      <ListItem v-for="item in list" :key="item.id" :data="item" origin="left" class="middle-ratio" />
     </div>
     <div class="footer">
       <Pagination :total="90" />