优化分类、布局、标签、字典、通知、多数据源、定时任务

src/settings/projectSetting.ts

@@ -40,7 +40,7 @@ const setting = {
     //菜单标题
     title: '云恒WMS',
     //菜单宽度
-    width: 220,
+    width: 200,
     // 折叠宽度 暂不支持修改
     minWidth: 48,
     //固定菜单

src/views/content/category/columns.ts

@@ -18,7 +18,7 @@ export const columns = [
     title: '分类备注',
     dataIndex: 'note',
     key: 'note',
-    width: 100,
+    width: 200,
   },
   {
     title: '创建人',

src/views/content/layout/edit.vue

@@ -11,8 +11,8 @@
       :model="formData"
       :label-col="{ style: { width: '85px' } }"
     >
-      <a-form-item label="描述" name="description">
-        <a-textarea v-model:value="formData.description" placeholder="请输入描述" />
+      <a-form-item label="位置描述" name="description">
+        <a-textarea v-model:value="formData.description" placeholder="请输入位置描述" />
       </a-form-item>
       <a-form-item
         label="位置编号"

src/views/content/layoutItem/edit.vue

@@ -40,13 +40,13 @@
         </a-select>
       </a-form-item>
       <a-form-item
-        label="推荐文章"
+        label="推荐内容"
         name="typeId"
-        :rules="{ required: true, message: '请选择推荐文章', trigger: 'blur' }"
+        :rules="{ required: true, message: '请选择推荐内容', trigger: 'blur' }"
       >
         <a-input
           v-model:value="formData.typeText"
-          placeholder="请选择推荐文章"
+          placeholder="请选择推荐内容"
           @click="getLayoutItem"
         />
       </a-form-item>

src/views/content/layoutItem/layout/notice/columns.ts

@@ -9,12 +9,12 @@ export const columns2 = [
     fixed: 'left',
   },
   {
-    title: '标题',
+    title: '通知标题',
     dataIndex: 'title',
     width: 200,
   },
   {
-    title: '类型',
+    title: '通知类型',
     dataIndex: 'type',
     customRender({ record }) {
       return h(
@@ -29,7 +29,7 @@ export const columns2 = [
     },
   },
   {
-    title: '状态',
+    title: '通知状态',
     dataIndex: 'status',
     customRender({ record }) {
       return h(

src/views/content/tag/columns.ts

@@ -11,7 +11,7 @@ export const columns = [
   {
     title: '标签名称',
     dataIndex: 'name',
-    width: 100,
+    width: 200,
   },
   {
     title: '排序',

src/views/data/dict/columnsItem.ts

@@ -10,17 +10,17 @@ export const columns = [
   {
     title: '字典名称',
     dataIndex: 'name',
-    width: 100,
+    width: 150,
   },
   {
     title: '字典编码',
     dataIndex: 'dictCode',
-    width: 100,
+    width: 150,
   },
   {
     title: '字典项值',
     dataIndex: 'value',
-    width: 100,
+    width: 150,
   },
   {
     title: '排序',

src/views/data/notice/columns.ts

@@ -1,5 +1,5 @@
 import { h } from 'vue';
-import { Tag } from 'ant-design-vue';
+import { Tag, Avatar } from 'ant-design-vue';
 
 export const columns = [
   {
@@ -9,12 +9,26 @@ export const columns = [
     width: 50,
   },
   {
-    title: '标题',
+    title: '通知标题',
     dataIndex: 'title',
     width: 300,
   },
   {
-    title: '类型',
+    title: '通知封面',
+    dataIndex: 'cover',
+    key: 'cover',
+    width: 100,
+    customRender({ record }) {
+      return h(Avatar, {
+        size: 48,
+        src: record.cover,
+        shape: 'square',
+        fit: 'fill',
+      });
+    },
+  },
+  {
+    title: '通知类型',
     dataIndex: 'type',
     width: 100,
     customRender({ record }) {
@@ -30,7 +44,7 @@ export const columns = [
     },
   },
   {
-    title: '状态',
+    title: '通知状态',
     dataIndex: 'status',
     width: 100,
     customRender({ record }) {

src/views/monitor/dataSource/columns.ts

@@ -67,7 +67,7 @@ export const columns = [
   {
     title: '备注',
     dataIndex: 'note',
-    width: 100,
+    width: 200,
   },
   {
     title: '创建人',

src/views/monitor/job/log/columns.ts

@@ -5,27 +5,38 @@ export const columns = [
   {
     title: 'ID',
     dataIndex: 'id',
+    fixed: 'left',
     width: 100,
   },
   {
     title: '任务名称',
     dataIndex: 'jobName',
+    width: 200,
   },
   {
     title: '任务组名',
     dataIndex: 'jobGroup',
+    width: 100,
   },
   {
     title: '任务触发器',
     dataIndex: 'jobTrigger',
+    width: 200,
   },
   {
-    title: '任务信息',
+    title: '任务日志信息',
     dataIndex: 'jobMessage',
+    width: 300,
+  },
+  {
+    title: '执行表达式',
+    dataIndex: 'cronExpression',
+    width: 150,
   },
   {
     title: '执行状态',
     dataIndex: 'status',
+    width: 100,
     customRender({ record }) {
       let typeText = '';
       switch (record.status) {
@@ -48,8 +59,24 @@ export const columns = [
     },
   },
   {
-    title: '执行时间',
+    title: '任务开始时间',
     dataIndex: 'startTime',
+    width: 180,
+  },
+  {
+    title: '任务结束时间',
+    dataIndex: 'startTime',
+    width: 180,
+  },
+  {
+    title: '任务执行时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+  {
+    title: '任务执行耗时',
+    dataIndex: 'consumeTime',
+    width: 120,
   },
   {
     title: '操作',

src/views/monitor/job/log/edit.vue

@@ -4,12 +4,22 @@
       <a-descriptions-item label="任务名称:">{{ formData.jobName }}</a-descriptions-item>
       <a-descriptions-item label="任务组名:">{{ formData.jobGroup }}</a-descriptions-item>
       <a-descriptions-item label="任务触发器:">{{ formData.jobTrigger }}</a-descriptions-item>
-      <a-descriptions-item label="任务信息:">{{ formData.jobMessage }}</a-descriptions-item>
-      <a-descriptions-item label="cron执行表达式:">{{
+      <a-descriptions-item label="任务日志信息:">{{ formData.jobMessage }}</a-descriptions-item>
+      <a-descriptions-item label="任务执行表达式:">{{
         formData.cronExpression
       }}</a-descriptions-item>
+      <a-descriptions-item label="请求状态">
+        <a-tag :color="formData.status ? 'danger' : 'success'">{{
+          formData.status ? '异常' : '正常'
+        }}</a-tag>
+      </a-descriptions-item>
       <a-descriptions-item label="任务开始时间:">{{ formData.startTime }}</a-descriptions-item>
       <a-descriptions-item label="任务结束时间:">{{ formData.endTime }}</a-descriptions-item>
+      <a-descriptions-item label="任务执行时间:">{{ formData.createTime }}</a-descriptions-item>
+      <a-descriptions-item label="任务执行耗时:">{{ formData.consumeTime }}ms</a-descriptions-item>
+      <a-descriptions-item label="执行异常信息:" :span="3">{{
+        formData.exceptionInfo
+      }}</a-descriptions-item>
     </a-descriptions>
     <template #footer>
       <span class="dialog-footer">
@@ -31,9 +41,13 @@
     jobGroup: '',
     jobTrigger: '',
     jobMessage: '',
+    status: '',
     cronExpression: '',
     startTime: '',
     endTime: '',
+    createTime: '',
+    consumeTime: '',
+    exceptionInfo: '',
   });
 
   const emit = defineEmits(['update:visible']);

src/views/monitor/job/log/index.vue

@@ -14,7 +14,7 @@
         <template #tableTitle>
           <a-button type="danger" @click="handleDelete()" :disabled="!selectionData.length">
             <template #icon>
-                <DeleteOutlined />
+              <DeleteOutlined />
             </template>
             删除
           </a-button>