代码更新

# Conflicts:
#	src/view/largeScreen2/index.vue

src/api/equipment/alarmRecord.js

@@ -4,6 +4,10 @@ export const getAlarmRecordListByPage = (data) => {
   return service({
     url: '/device/getAlarmRecordListByPage',
     method: 'post',
-    data: data
+    data: {
+      ...data,
+      orderKey: 'CreatedAt',
+      order: 'desc'
+    }
   })
 }

src/api/equipment/list.js

@@ -36,7 +36,11 @@ export const getAlarmRecordListByPage = (data) => {
   return service({
     url: '/device/getAlarmRecordListByPage',
     method: 'post',
-    data: data
+    data: {
+      ...data,
+      orderKey: 'CreatedAt',
+      order: 'desc'
+    }
   })
 }
 

src/api/masterStation/equipment.js

@@ -36,7 +36,11 @@ export const getAlarmRecordListByPage = (data) => {
   return service({
     url: '/device/getAlarmRecordListByPage',
     method: 'post',
-    data: data
+    data: {
+      ...data,
+      orderKey: 'CreatedAt',
+      order: 'desc'
+    }
   })
 }
 

src/api/securityControl/alarmList.js

@@ -20,6 +20,10 @@ export const getAlarmRecordListByPage = (data) => {
   return service({
     url: '/device/getAlarmRecordListByPage',
     method: 'post',
-    data: data
+    data: {
+      ...data,
+      orderKey: 'CreatedAt',
+      order: 'desc'
+    }
   })
 }

src/style/element_visiable.scss

@@ -118,6 +118,44 @@ body:not(.login-light-mode) {
     color: var(--tech-text);
   }
 
+  .el-button:not(.el-button--primary):not(.el-button--success):not(.el-button--warning):not(.el-button--danger):not(.el-button--info):not(.is-link):not(.is-text) {
+    --el-button-bg-color: rgba(2, 8, 23, 0.72);
+    --el-button-border-color: rgba(0, 212, 255, 0.42);
+    --el-button-text-color: #e9fbff;
+    --el-button-hover-bg-color: rgba(0, 212, 255, 0.18);
+    --el-button-hover-border-color: rgba(0, 212, 255, 0.72);
+    --el-button-hover-text-color: #ffffff;
+    --el-button-active-bg-color: rgba(0, 212, 255, 0.24);
+    --el-button-active-border-color: rgba(0, 212, 255, 0.82);
+    --el-button-active-text-color: #ffffff;
+    --el-button-disabled-bg-color: rgba(15, 23, 42, 0.48);
+    --el-button-disabled-border-color: rgba(0, 212, 255, 0.16);
+    --el-button-disabled-text-color: rgba(220, 243, 255, 0.5);
+
+    color: var(--el-button-text-color) !important;
+    font-weight: 700;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.82);
+    background: var(--el-button-bg-color) !important;
+    border-color: var(--el-button-border-color) !important;
+
+    .el-icon {
+      color: currentColor;
+    }
+
+    &:hover,
+    &:focus {
+      color: var(--el-button-hover-text-color) !important;
+      background: var(--el-button-hover-bg-color) !important;
+      border-color: var(--el-button-hover-border-color) !important;
+    }
+
+    &:active {
+      color: var(--el-button-active-text-color) !important;
+      background: var(--el-button-active-bg-color) !important;
+      border-color: var(--el-button-active-border-color) !important;
+    }
+  }
+
   .el-input__inner::placeholder,
   .el-textarea__inner::placeholder {
     color: rgba(220, 243, 255, 0.56);

src/view/largeScreen2/ttes.js

@@ -147,7 +147,7 @@ export const getDeviceStatOption = (deviceTypes) => {
     series: [
       {
         type: 'pie',
-        radius: ['45%', '70%'],
+        radius: ['42%', '68%'],
         center: ['50%', '50%'],
         avoidLabelOverlap: false,
         itemStyle: pieItemStyle,
@@ -155,7 +155,7 @@ export const getDeviceStatOption = (deviceTypes) => {
           show: true,
           position: 'center',
           formatter: `{total|${total}}\n{name|设备总数}`,
-          rich: createCenterLabelRich(18, 12)
+          rich: createCenterLabelRich(16, 10)
         },
         labelLine: {
           show: false

src/view/masterStation/equipment/components/list/index.vue

@@ -101,7 +101,7 @@
   import { ElMessage, ElMessageBox } from 'element-plus'
   import { MoreFilled } from '@element-plus/icons-vue'
 
-  const props = defineProps({
+  defineProps({
     modelValue: {
       type: Object,
       default: () => ({})
@@ -241,6 +241,7 @@
     background: transparent;
   }
 
+
   .device-grid {
     display: grid;
     grid-template-columns: repeat(auto-fill, minmax(330px, 1fr));