Bladeren bron

[Style 0000] 省局状态相关的文本颜色预设更新

houzekong 2 maanden geleden
bovenliggende
commit
9c102fdf58

+ 7 - 5
src/enums/jeecgEnum.ts

@@ -23,11 +23,13 @@ export enum JDragConfigEnum {
 }
 
 export enum StatusColorEnum {
-  blue = '#1890ff',
-  green = '#208840',
-  gold = '#faad14',
-  red = '#f5222d',
+  blue = '#1677FF',
+  green = '#52C41A',
+  gold = '#D48806',
+  red = '#FF4D4F',
   gray = '#8c8c8c',
   black = '#000000',
-  purple = '#c3b7f3',
+  purple = '#531DAB',
+  orange = '#D46B08',
+  yellow = '#FAAD14',
 }

+ 7 - 6
src/views/dashboard/basicInfo/minesInfo/minesInfo.data.ts

@@ -3,6 +3,7 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Ref } from 'vue';
 import { StatusColorEnum } from '/@/enums/jeecgEnum';
+import { isEmpty } from 'lodash-es';
 
 // 1. 颜色映射(修正原拼写错误,统一规则)
 // export const StatusColorEnum: Record<string, string> = {
@@ -80,9 +81,9 @@ export function getColumns(dynamicStatusMap: Ref<ProductionStatusMap>): BasicCol
       width: 100,
       customRender: ({ record }) => {
         // 空值/异常值处理
-        const status = String(record.accessStatus || '');
-        if (!status || status === 'undefined' || status === 'null') {
-          return h('span', { style: { color: StatusColorEnum.black } }, '/');
+        const status = String(record.accessStatus);
+        if (isEmpty(status)) {
+          return h('span', '-');
         }
         const text = status === '1' ? '接入' : '未接入';
         const textColor = status === '1' ? StatusColorEnum.green : StatusColorEnum.gold;
@@ -94,9 +95,9 @@ export function getColumns(dynamicStatusMap: Ref<ProductionStatusMap>): BasicCol
       dataIndex: 'status',
       width: 100,
       customRender: ({ record }) => {
-        const status = String(record.status || '');
-        if (!status || status === 'undefined' || status === 'null') {
-          return h('span', { style: { color: StatusColorEnum.black } }, '/');
+        const status = String(record.status);
+        if (isEmpty(status)) {
+          return h('span', '-');
         }
         const text = status === '1' ? '在线' : '离线';
         const textColor = status === '1' ? StatusColorEnum.green : StatusColorEnum.red;

+ 4 - 4
src/views/monitor/sealedMonitor/monitor.data.ts

@@ -6,6 +6,7 @@ import { ModuleDataChart } from '/@/components/Configurable/types';
 import { h } from 'vue';
 import { StatusColorEnum } from '/@/enums/jeecgEnum';
 import { getDictItemsByCode } from '/@/utils/dict';
+import { get } from 'lodash-es';
 
 const riskMap = {
   '1': '低风险',
@@ -59,13 +60,12 @@ export const columns: BasicColumn[] = [
     width: 100,
     customRender({ text }) {
       // 从动态映射取值,兜底未知状态
-      const color = { '0': StatusColorEnum.green, '1': StatusColorEnum.blue }[text] || StatusColorEnum.red;
       const label = dictMap.find((item) => item.value == text)?.label || '-';
       // 渲染带颜色的文字
       return h(
         'span',
         {
-          style: { color },
+          color: get({ '0': StatusColorEnum.green, '1': StatusColorEnum.blue }, text),
         },
         label
       );
@@ -562,9 +562,9 @@ function getTagColor(level: string) {
     case '4':
       return StatusColorEnum.red;
     case '3':
-      return StatusColorEnum.purple;
-    case '2':
       return StatusColorEnum.gold;
+    case '2':
+      return StatusColorEnum.yellow;
     case '1':
       return StatusColorEnum.blue;
     case '0':