修改台账树

src/components/cockpit/monitoringPointList/index.vue

@@ -116,14 +116,14 @@ const tableStore: any = new TableStore({
         { title: '设备名称', field: 'devName', minWidth: 130, align: 'center' },
         { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' },
         { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' },
-        {
-            title: '监测类型',
-            field: 'position',
-            minWidth: '100',
-            formatter: (row: any) => {
-                return row.cellValue || '/'
-            }
-        },
+        // {
+        //     title: '监测类型',
+        //     field: 'position',
+        //     minWidth: '100',
+        //     formatter: (row: any) => {
+        //         return row.cellValue || '/'
+        //     }
+        // },
         // {
         //     title: '监测点状态',
         //     field: 'runStatus',

src/components/cockpit/sensitiveLoad/index.vue

@@ -83,7 +83,7 @@ const tableStore: any = new TableStore({
         },
 
         {
-            title: '敏感用户类型',
+            title: '用户类型',
             field: 'loadType',
             minWidth: '70',
             formatter: row => {

src/components/echarts/color.ts

@@ -1,6 +1,6 @@
 export let color = ['#07CCCA', '#00BFF5', '#FFBF00', '#77DA63', '#Ff6600', '#FF9100', '#5B6E96', '#66FFEC', '#B3B3B3',  '#9B59B6', '#3498DB',  '#2ECC71']
 export let color1 = [
-    '#00A8B5', // 青
+   
     '#3B7DD8', // 蓝
     '#5B5FC7', // 靛
     '#8B5CF6', // 紫
@@ -11,6 +11,7 @@ export let color1 = [
     '#00A878', // 翠绿
     '#7C9EB2', // 烟蓝
     '#6B7B8C', // 板岩灰
+    '#00A8B5', // 青
     '#A8A8A8'  // 灰
 ]
 export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a']

src/components/table/index.vue

@@ -74,7 +74,7 @@ import { useConfig } from '@/stores/config'
 import type TableStoreClass from '@/utils/tableStore'
 import { useRouter } from 'vue-router'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { buildExportBaseName } from '@/utils/echartMethod'
+import { buildExportBaseName,formatExportDateTime } from '@/utils/echartMethod'
 
 const config = useConfig()
 const tableRef = ref<VxeTableInstance>()
@@ -165,7 +165,7 @@ watch(
     () => tableStore.table.allFlag,
     newVal => {
         if (tableStore.table.allFlag) {
-            console.log('🚀 ~ tableStore.table.allData:', tableStore.table.allData)
+            // console.log('🚀 ~ tableStore.table.allData:', tableStore.table.allData)
 
             tableRef.value?.exportData({
                 filename: getTableExportFilename(), // 文件名字

src/components/tree/govern/APFTree.vue

@@ -52,7 +52,7 @@ const tree = ref<any[]>([])
 const treRef = ref<InstanceType<typeof ElTree>>()
 const filterText = ref('')
 
-const defaultProps = { children: 'children', label: 'name', value: 'id' }
+const defaultProps = { children: 'children', label: 'governName', value: 'id' }
 const decorators = createLineTreeDecorators(() => config.getColorVal('elementUiPrimary'))
 const filterNode = createTreeFilterNode()
 
@@ -78,11 +78,12 @@ function transformUserDevTree(data: Record<string, any[] | null>) {
                     ...device,
                     level: 2,
                     pid: userId,
-                    pname: userName
+                    pname: userName,
+                   
                 }
                 applyMeta(node, {
-                    icon: 'el-icon-Platform',
-                    color: statusColor(device.runStatus)
+                    icon: 'el-icon-Document',
+                    color: primary(), 
                 })
                 devices.push(node)
                 return node
@@ -91,7 +92,7 @@ function transformUserDevTree(data: Record<string, any[] | null>) {
 
         const userNode: any = {
             id: userId,
-            name: userName,
+            governName: userName,
             level: 1,
             ...(children ? { children } : {})
         }

src/components/tree/index.vue

@@ -205,7 +205,7 @@ defineExpose({ treeRef })
 
     :deep(.el-tree) {
         border: 1px solid var(--el-border-color);
-        border-radius: 4px;
+        // border-radius: 4px;
     }
 
     :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {