فهرست منبع

Merge branch 'fix-wyf' into 'dev'

fix: 应急管理加类型的修改,总览加滚动条,安全态势图例调整容量 &  演练问题分析文案修改

See merge request product-group-fe/sfy-safety-group/sfy-safety!373
ai0197(吴云丰) 1 ماه پیش
والد
کامیت
3e104cf85f

+ 1 - 1
src/views/emergency/emergency-drill/configs/plan/form.ts

@@ -201,7 +201,7 @@ export const DRILL_RECORD_FORM_CONFIG: FormConfig[] = [
       maxlength: 2000,
       showWordLimit: true,
       autosize: { minRows: 5 },
-      placeholder: '请描述演练问题分析,不超过2000字',
+      placeholder: '请描述演练问题分析,没有问题请填写“无”,不超过2000字',
     },
   },
   {

+ 20 - 1
src/views/emergency/overview/components/EmergencySupplies.vue

@@ -87,11 +87,30 @@
 
     .supply-list {
       width: 100%;
-      height: calc(100% - 102px);
+      height: calc(100% - 100px);
       padding: 0 10px;
       display: grid;
       grid-template-columns: repeat(2, 1fr);
       grid-gap: 10px;
+      overflow-y: auto;
+
+      /* 自定义滚动条样式 */
+      &::-webkit-scrollbar {
+        width: 6px;
+      }
+
+      // &::-webkit-scrollbar-track {
+      //   background: #f1f1f1;
+      //   border-radius: 3px;
+      // }
+
+      &::-webkit-scrollbar-thumb {
+        border-radius: 3px;
+      }
+
+      // &::-webkit-scrollbar-thumb:hover {
+      //   background: #a8a8a8;
+      // }
 
       .supply-item {
         background: linear-gradient(90deg, #dbfaff 0%, #f5faff 100%);

+ 6 - 3
src/views/institute-safety/components/CardEmergencyManage.vue

@@ -103,7 +103,7 @@
         align: 'left',
         itemWidth: 6,
         itemHeight: 6,
-        itemGap: 10,
+        itemGap: 9,
         icon: 'circle',
         formatter: (name: string) => {
           const itemIndex = variousTypeSuppliesRatio.value.findIndex((item) => item.suppliesTypeName === name);
@@ -120,6 +120,8 @@
       series: [
         {
           type: 'pie',
+          left: '30',
+          top: '0',
           radius: ['60%', '90%'],
           center: ['20%', '50%'],
           avoidLabelOverlap: false,
@@ -259,7 +261,8 @@
   }
 
   .chart {
-    height: 100px;
-    margin: 34px 24px 24px 20px;
+    height: 130px;
+    margin-right: 20px;
+    // margin: 34px 24px 24px 20px;
   }
 </style>