lab_xuhui 发布系统代码 [ibiz-task，任务调度]

app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts

@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
 				next_time: commonLogic.appcommonhandle("下次调度时间",null),
 				status: commonLogic.appcommonhandle("状态",null),
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
+				update_time: commonLogic.appcommonhandle("更新时间",null),
 				last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts

@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
 				next_time: commonLogic.appcommonhandle("下次调度时间",null),
 				status: commonLogic.appcommonhandle("状态",null),
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
+				update_time: commonLogic.appcommonhandle("更新时间",null),
 				last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts

@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
 				next_time: commonLogic.appcommonhandle("下次调度时间",null),
 				status: commonLogic.appcommonhandle("状态",null),
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
+				update_time: commonLogic.appcommonhandle("更新时间",null),
 				last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),

app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue

@@ -133,6 +133,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('update_time')">
+                <el-table-column show-overflow-tooltip :prop="'update_time'" :label="$t('entities.jobsinfo.main_grid.columns.update_time')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.jobsinfo.main_grid.columns.update_time')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.update_time"></app-format-data>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('last_time_format')">
                 <el-table-column show-overflow-tooltip :prop="'last_time_format'" :label="$t('entities.jobsinfo.main_grid.columns.last_time_format')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -785,6 +797,15 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'update_time',
+            label: '更新时间',
+            langtag: 'entities.jobsinfo.main_grid.columns.update_time',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'last_time_format',
             label: '上次执行时间',
@@ -1509,7 +1530,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['id','app','remark','handler','cron','last_time','next_time','status','timeout','last_time_format'];
+        let allColumns:Array<any> = ['id','app','remark','handler','cron','last_time','next_time','status','timeout','update_time','last_time_format'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1598,6 +1619,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 next_time:'',
                 status:'',
                 timeout:'',
+                update_time:'',
                 last_time_format:'',
                 children: children
             }
@@ -1634,6 +1656,7 @@ export default class MainBase extends Vue implements ControlInterface {
             next_time:'',
             status:'',
             timeout:'',
+            update_time:'',
             last_time_format:'',
             children: child
         }
@@ -1690,6 +1713,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 next_time:'',
                 status:'',
                 timeout:'',
+                update_time:'',
                 last_time_format:'',
                 children: children,
             }

app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts

@@ -71,6 +71,11 @@ export default class MainModel {
           prop: 'timeout',
           dataType: 'INT',
         },
+        {
+          name: 'update_time',
+          prop: 'update_time',
+          dataType: 'DATETIME',
+        },
         {
           name: 'last_time_format',
           prop: 'last_time_format',