修改

src/entity/core/history.entity.ts

@@ -4,36 +4,35 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'history' },
 })
 export class History extends BaseModel {
-  @prop({ required: false, index: false, zh: '作业ID', esType: 'work_id' })
+  @prop({ required: false, index: false, zh: '作业ID' })
   work_id: string;
-  @prop({ required: false, index: false, zh: '作业名称', esType: 'work_name' })
+  @prop({ required: false, index: false, zh: '作业名称' })
   work_name: string;
-  @prop({ required: false, index: false, zh: '用户', esType: 'user_name' })
+  @prop({ required: false, index: false, zh: '用户' })
   user_name: string;
-  @prop({ required: false, index: false, zh: '组织', esType: 'organization' })
+  @prop({ required: false, index: false, zh: '组织' })
   organization: string;
-  @prop({ required: false, index: false, zh: '状态', esType: 'status' })
+  @prop({ required: false, index: false, zh: '状态' })
   status: string;
-  @prop({ required: false, index: false, zh: '分区', esType: 'partition' })
+  @prop({ required: false, index: false, zh: '分区' })
   partition: string;
   @prop({
     required: false,
     index: false,
     zh: '运行节点',
-    esType: 'node',
     default: '---',
   })
   node: string;
-  @prop({ required: false, index: false, zh: '运行时长', esType: 'time' })
+  @prop({ required: false, index: false, zh: '运行时长' })
   time: string;
-  @prop({ required: false, index: false, zh: 'CPU总核', esType: 'cpu_total' })
+  @prop({ required: false, index: false, zh: 'CPU总核' })
   cpu_total: string;
-  @prop({ required: false, index: false, zh: 'GPU卡数', esType: 'cpu_num' })
+  @prop({ required: false, index: false, zh: 'GPU卡数' })
   cpu_num: string;
-  @prop({ required: false, index: false, zh: '节点数量', esType: 'num' })
+  @prop({ required: false, index: false, zh: '节点数量' })
   num: string;
-  @prop({ required: false, index: false, zh: '提交时间', esType: 'submission_time' })
+  @prop({ required: false, index: false, zh: '提交时间' })
   submission_time: string;
-  @prop({ required: false, index: false, zh: '工作目录', esType: 'work_menu' })
+  @prop({ required: false, index: false, zh: '工作目录' })
   work_menu: string;
 }

src/entity/core/node.entity.ts

@@ -4,18 +4,18 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'node' },
 })
 export class Node extends BaseModel {
-  @prop({ required: false, index: false, zh: '节点名称', esType: 'name' })
+  @prop({ required: false, index: false, zh: '节点名称' })
   name: string;
-  @prop({ required: false, index: false, zh: '节点类型', esType: 'type' })
+  @prop({ required: false, index: false, zh: '节点类型'})
   type: string;
-  @prop({ required: false, index: false, zh: 'CPU已用/总数', esType: 'cpu_num' })
+  @prop({ required: false, index: false, zh: 'CPU已用/总数'})
   cpu_num: string;
-  @prop({ required: false, index: false, zh: 'GPU已用/总数', esType: 'gpu_num' })
+  @prop({ required: false, index: false, zh: 'GPU已用/总数' })
   gpu_num: string;
-  @prop({ required: false, index: false, zh: '分区', esType: 'partition' })
+  @prop({ required: false, index: false, zh: '分区' })
   partition: string;
-  @prop({ required: false, index: false, zh: '运行状态', esType: 'status' })
+  @prop({ required: false, index: false, zh: '运行状态' })
   status: string;
-  @prop({ required: false, index: false, zh: '当前作业数', esType: 'work_num' })
+  @prop({ required: false, index: false, zh: '当前作业数' })
   work_num: string;
 }

src/entity/core/operate.entity.ts

@@ -4,18 +4,18 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'operate' },
 })
 export class Operate extends BaseModel {
-  @prop({ required: false, index: false, zh: '操作IP', esType: 'operator_ip' })
+  @prop({ required: false, index: false, zh: '操作IP' })
   operator_ip: string;
-  @prop({ required: false, index: false, zh: '操作者', esType: 'work_id' })
+  @prop({ required: false, index: false, zh: '操作者' })
   operator_name: string;
-  @prop({ required: false, index: false, zh: '操作时间', esType: 'time' })
+  @prop({ required: false, index: false, zh: '操作时间' })
   time: string;
-  @prop({ required: false, index: false, zh: '模块名称', esType: 'module_name' })
+  @prop({ required: false, index: false, zh: '模块名称' })
   module_name: string;
-  @prop({ required: false, index: false, zh: '操作', esType: 'operation' })
+  @prop({ required: false, index: false, zh: '操作' })
   operation: string;
-  @prop({ required: false, index: false, zh: '操作结果', esType: 'result' })
+  @prop({ required: false, index: false, zh: '操作结果' })
   result: string;
-  @prop({ required: false, index: false, zh: '操作详情', esType: 'detail' })
+  @prop({ required: false, index: false, zh: '操作详情' })
   detail: string;
 }

src/entity/core/partition.entity.ts

@@ -4,18 +4,18 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'partition' },
 })
 export class Partition extends BaseModel {
-  @prop({ required: false, index: false, zh: '分区名称', esType: 'name' })
+  @prop({ required: false, index: false, zh: '分区名称' })
   name: string;
-  @prop({ required: false, index: false, zh: '当前作业数', esType: 'work_num' })
+  @prop({ required: false, index: false, zh: '当前作业数' })
   work_num: string;
-  @prop({ required: false, index: false, zh: '节点数', esType: 'num' })
+  @prop({ required: false, index: false, zh: '节点数' })
   num: string;
-  @prop({ required: false, index: false, zh: 'CPU核数', esType: 'cpu_num' })
+  @prop({ required: false, index: false, zh: 'CPU核数' })
   cpu_num: string;
-  @prop({ required: false, index: false, zh: 'GPU核数', esType: 'gpu_num' })
+  @prop({ required: false, index: false, zh: 'GPU核数'})
   gpu_num: string;
-  @prop({ required: false, index: false, zh: '节点', esType: 'node' })
+  @prop({ required: false, index: false, zh: '节点' })
   node: Array<any>;
-  @prop({ required: false, index: false, zh: '描述', esType: 'remark' })
+  @prop({ required: false, index: false, zh: '描述' })
   remark: string;
 }

src/entity/core/performance.entity.ts

@@ -4,13 +4,12 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'performance' },
 })
 export class Performance extends BaseModel {
-  @prop({ required: false, index: false, zh: '节点名称', esType: 'node_name' })
+  @prop({ required: false, index: false, zh: '节点名称' })
   node_name: string;
   @prop({
     required: false,
     index: false,
     zh: '管理IP',
-    esType: 'work_id',
     default: '---',
   })
   admin_ip: string;
@@ -18,7 +17,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: '系统IP',
-    esType: 'work_id',
     default: '---',
   })
   system_ip: string;
@@ -26,7 +24,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: '开关机状态',
-    esType: 'switch',
     default: '---',
   })
   switch: string;
@@ -34,7 +31,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: 'CPU利用率',
-    esType: 'cpu_utilize',
     default: '---',
   })
   cpu_utilize: string;
@@ -42,8 +38,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: 'GPU利用率',
-    esType: 'gpu_utilize',
-
     default: '---',
   })
   gpu_utilize: string;
@@ -51,7 +45,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: '内存利用率',
-    esType: 'memory',
     default: '---',
   })
   memory: string;
@@ -59,7 +52,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: '网络端口收发速度',
-    esType: 'speed',
     default: '---/---',
   })
   speed: string;
@@ -67,7 +59,6 @@ export class Performance extends BaseModel {
     required: false,
     index: false,
     zh: '负载',
-    esType: 'load',
     default: '---',
   })
   load: string;

src/entity/core/realtime.entity.ts

@@ -4,31 +4,30 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'realtime' },
 })
 export class Realtime extends BaseModel {
-  @prop({ required: false, index: false, zh: '作业ID', esType: 'work_id' })
+  @prop({ required: false, index: false, zh: '作业ID' })
   work_id: string;
-  @prop({ required: false, index: false, zh: '作业名称', esType: 'work_name' })
+  @prop({ required: false, index: false, zh: '作业名称' })
   work_name: string;
-  @prop({ required: false, index: false, zh: '用户', esType: 'user_name' })
+  @prop({ required: false, index: false, zh: '用户' })
   user_name: string;
-  @prop({ required: false, index: false, zh: '组织', esType: 'organization' })
+  @prop({ required: false, index: false, zh: '组织' })
   organization: string;
-  @prop({ required: false, index: false, zh: '状态', esType: 'status' })
+  @prop({ required: false, index: false, zh: '状态' })
   status: string;
-  @prop({ required: false, index: false, zh: '运行时长', esType: 'time' })
+  @prop({ required: false, index: false, zh: '运行时长' })
   time: string;
-  @prop({ required: false, index: false, zh: '等待时长', esType: 'wait_time' })
+  @prop({ required: false, index: false, zh: '等待时长' })
   wait_time: string;
-  @prop({ required: false, index: false, zh: 'CPU(核)', esType: 'cpu' })
+  @prop({ required: false, index: false, zh: 'CPU(核)' })
   cpu: string;
-  @prop({ required: false, index: false, zh: 'GPU(个)', esType: 'gpu' })
+  @prop({ required: false, index: false, zh: 'GPU(个)' })
   gpu: string;
-  @prop({ required: false, index: false, zh: '分区', esType: 'partition' })
+  @prop({ required: false, index: false, zh: '分区' })
   partition: string;
   @prop({
     required: false,
     index: false,
     zh: '节点列表',
-    esType: 'node',
     default: '---',
   })
   node: string;

src/entity/system/organization.entity.ts

@@ -4,7 +4,7 @@ import { BaseModel } from '../../frame/BaseModel';
   schemaOptions: { collection: 'organization' },
 })
 export class Organization extends BaseModel {
-  @prop({ required: false, index: false, zh: '组织名称', esType: 'name' })
+  @prop({ required: false, index: false, zh: '组织名称' })
   name: string;
   @prop({
     required: false,
@@ -14,13 +14,12 @@ export class Organization extends BaseModel {
     default: '---',
   })
   manager: string;
-  @prop({ required: false, index: false, zh: '组成员数', esType: 'num' })
+  @prop({ required: false, index: false, zh: '组成员数' })
   num: number;
   @prop({
     required: false,
     index: false,
     zh: '最大运行作业数',
-    esType: 'max_work',
     default: '未设置',
   })
   max_work: string;
@@ -28,7 +27,6 @@ export class Organization extends BaseModel {
     required: false,
     index: false,
     zh: '最大使用核数',
-    esType: 'max_pit',
     default: '未设置',
   })
   max_pit: string;
@@ -40,18 +38,17 @@ export class Organization extends BaseModel {
     default: '未设置',
   })
   max_cpu: string;
-  @prop({ required: false, index: false, zh: '计费折扣', esType: 'money' })
+  @prop({ required: false, index: false, zh: '计费折扣' })
   money: string;
-  @prop({ required: false, index: false, zh: '存储配额(G)', esType: 'quota' })
+  @prop({ required: false, index: false, zh: '存储配额(G)' })
   quota: string;
   @prop({
     required: false,
     index: false,
-    zh: '已使用存储(G)',
     esType: 'storage',
   })
   storage: string;
-  @prop({ required: false, index: false, zh: '共享文件夹', esType: 'folder' })
+  @prop({ required: false, index: false, zh: '共享文件夹' })
   folder: string;
   @prop({
     required: false,