Merge branch 'dev-ljx' into 'feature-hetong'

修改对话框标题位置和表格滑块样式

See merge request product-group-fe/sfy-safety-group/sfy-safety!281

src/views/disaster/overview/components/WeatherCard.vue

@@ -12,7 +12,7 @@
         </div>
         <div class="high-stable-weather">
           <img :src="fireIcon" alt="empty" class="icon-fire">
-          <span>本年度高温天气: {{ countHighTemperatureDays }} 天</span>
+          <span>本年度高温天气: {{ countHighTemperatureDays }}天</span>
         </div>
         <div class="weather-info">
 
@@ -45,7 +45,7 @@
 
           <!-- 表格 -->
           <div v-else class="dialog-content">
-            <el-table :data="historyTemperatureList" border stripe style="width: 100%;" max-height="calc(80vh - 120px)">
+            <el-table :data="historyTemperatureList" border stripe max-height="calc(80vh - 120px)">
               <el-table-column label="日期" align="center" width="170">
                 <template #default="scope">
                   {{ scope.row.dataTime ? scope.row.dataTime.slice(0, 10) : '--' }}
@@ -56,7 +56,7 @@
                   <span> {{ scope.row.maxTemperature ?? "--" }} </span>
                 </template>
               </el-table-column>
-              <el-table-column label="最低温度(℃)" prop="minTemperature" align="center" width="170">
+              <el-table-column label="最低温度(℃)" prop="minTemperature" align="center">
                 <template #default="scope">
                   <span> {{ scope.row.minTemperature ?? "--" }} </span>
                 </template>
@@ -379,21 +379,30 @@ onUnmounted(() => {
 
 }
 
-
-:deep(.weather-dialog) {
-  background-image: url('@/assets/images/weather-icons/dialoag-title-bg.png') !important;
-  background-size: cover !important;
-  background-repeat: no-repeat !important;
-  background-position: center !important;
-  background-color: #ffffff !important;
-  border-radius: 8px !important;
-  overflow: hidden !important;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15) !important;
-
+:deep(.el-dialog) {
+  background-image: url('@/assets/images/weather-icons/dialoag-title-bg.png');
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
+  border-radius: 8px;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+  
   .el-dialog__header {
-    padding: 16px 0px !important;
-    border: none !important;
+    padding-left: 0px;
+    padding-top: 0px;
+    border: none;
+    display: flex;
     position: relative;
+    align-items: center;
+    justify-content: flex-start;
+    width: 100%;
+  }
+
+  .el-dialog__headerbtn {
+    width: 16px;
+    height: 16px;
+    right: 0px;
+    top:5px;
   }
 
   .el-dialog__title {
@@ -406,50 +415,52 @@ onUnmounted(() => {
     font-style: normal;
   }
 
+  .el-dialog__close {
+    font-size: 16px;
+  }
+}
+
+:deep(.el-table) {
   .el-table__header {
     .el-table__cell {
-      font-family: 'PingFang SC' !important;
-      font-weight: bold !important;
-      font-size: 14px !important;
-      color: #000 !important;
-      line-height: 22px !important;
-      text-align: left !important;
-      font-style: normal !important;
+      font-family: 'PingFang SC';
+      font-weight: bold;
+      font-size: 14px;
+      color: #000;
+      line-height: 22px;
+      text-align: left;
+      font-style: normal;
     }
   }
 
   .el-table__body {
+    overflow: auto;
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+
     .el-table__cell {
-      font-family: 'PingFang SC' !important;
-      font-weight: 400 !important;
-      font-size: 14px !important;
-      color: #303133 !important;
-      line-height: 22px !important;
-      text-align: left !important;
-      font-style: normal !important;
+      font-family: 'PingFang SC';
+      font-weight: 400;
+      font-size: 14px;
+      color: #303133;
+      line-height: 22px;
+      text-align: left;
+      font-style: normal;
     }
-  }
 
-  .el-dialog__headerbtn {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    margin-top: 0;
-    margin-right: -15px;
   }
 
-  .el-dialog__close {
-    font-size: 16px !important;
-  }
+}
 
-  .no-data {
-    width: 100%;
-    padding: 40px 0;
-    text-align: center;
-  }
 
+.no-data {
+  width: 100%;
+  padding: 40px 0;
+  text-align: center;
 }
 
+
+
 .disaster-emergency-tips {
   flex: 1;
 }