feat: ✨ 计划作业-上次执行耗时 (#133)

Co-authored-by: tk <fiyne1a@dingtalk.com>

src/frontend/admin/package.json

@@ -11,14 +11,14 @@
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
         "@tinymce/tinymce-vue": "^5.1.1",
-        "ace-builds": "^1.33.2",
-        "axios": "^1.6.8",
+        "ace-builds": "^1.34.2",
+        "axios": "^1.7.2",
         "clipboard": "^2.0.11",
         "core-js": "^3.37.1",
         "cropperjs": "^1.6.2",
         "crypto-js": "^4.2.0",
         "echarts": "^5.5.0",
-        "element-plus": "^2.7.3",
+        "element-plus": "^2.7.4",
         "json-bigint": "^1.0.0",
         "json5-to-table": "^0.1.8",
         "markdown-it": "^14.1.0",
@@ -36,16 +36,16 @@
         "vue3-json-viewer": "^2.2.2",
         "vuedraggable": "^4.0.3",
         "vuex": "^4.1.0",
-        "xgplayer": "^3.0.17",
-        "xgplayer-hls": "^3.0.17"
+        "xgplayer": "^3.0.18",
+        "xgplayer-hls": "^3.0.18"
     },
     "devDependencies": {
-        "@vitejs/plugin-vue": "^5.0.4",
-        "prettier": "^3.2.5",
+        "@vitejs/plugin-vue": "^5.0.5",
+        "prettier": "^3.3.0",
         "prettier-plugin-organize-attributes": "^1.0.0",
-        "sass": "^1.77.2",
+        "sass": "^1.77.4",
         "terser": "^5.31.0",
-        "vite": "^5.2.11"
+        "vite": "^5.2.12"
     },
     "browserslist": [
         "> 1%",

src/frontend/admin/src/style/fix.scss

@@ -209,18 +209,14 @@
     border-left: 0;
 }
 
-.el-table.el-table--large {
+.el-table * {
+    font-size: 0.9rem;
+}
+
+.el-table.el-table--large * {
     font-size: 1rem;
 }
 
-.el-table.el-table--small {
-    font-size: 0.9rem;
-}
-
-.el-table {
-    font-size: 0.9rem;
-}
-
 .el-radio-button__inner {
     font-size: 0.9rem;
 }

src/frontend/admin/src/views/sys/job/index.vue

@@ -109,20 +109,33 @@
                     "
                     prop="httpMethod"
                     width="100" />
-                <el-table-column :label="$t('上次执行时间')" align="right" prop="lastExecTime" sortable="custom" width="120">
-                    <template #default="scope">
-                        <span v-if="scope.row.lastExecTime" v-time.tip="scope.row.lastExecTime"></span>
-                    </template>
+                <el-table-column :label="$t('上次执行')" align="center">
+                    <el-table-column :label="$t('状态')" align="center" prop="lastExecTime" sortable="custom" width="150">
+                        <template #default="scope">
+                            <div class="indicator">
+                                <sc-status-indicator :type="scope.row.lastStatusCode === 'ok' ? 'success' : 'danger'" />
+                                <span>{{
+                                    this.$GLOBAL.enums.httpStatusCodes[scope.row.lastStatusCode]
+                                        ? this.$GLOBAL.enums.httpStatusCodes[scope.row.lastStatusCode][1]
+                                        : scope.row.lastStatusCode
+                                }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="$t('时间')" align="right" prop="lastExecTime" sortable="custom" width="100">
+                        <template #default="scope">
+                            <span v-if="scope.row.lastExecTime" v-time.tip="scope.row.lastExecTime"></span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        :formatter="(row) => `${tool.groupSeparator(row.lastDuration.toFixed(0))} ms`"
+                        :label="$t('耗时')"
+                        align="right"
+                        prop="lastDuration"
+                        sortable="custom"
+                        width="100">
+                    </el-table-column>
                 </el-table-column>
-                <na-col-indicator
-                    :label="$t('上次执行状态')"
-                    :options="
-                        Object.entries(this.$GLOBAL.enums.httpStatusCodes).map((x) => {
-                            return { value: x[0], text: x[1][1], type: x[0] === 'ok' ? 'success' : null }
-                        })
-                    "
-                    prop="lastStatusCode"
-                    width="120" />
 
                 <el-table-column :label="$t('下次执行时间')" align="right" prop="nextExecTime" sortable="custom" width="170" />
                 <el-table-column :label="$t('启用')" align="center" prop="enabled" sortable="custom" width="80">
@@ -151,7 +164,8 @@
                             },
                         )
                     "
-                    :vue="this" />
+                    :vue="this"
+                    width="180" />
             </sc-table>
         </el-main>
     </el-container>
@@ -168,6 +182,7 @@ import saveDialog from './save'
 import table from '@/config/table'
 import naColOperation from '@/config/naColOperation'
 import ScSelectFilter from '@/components/scSelectFilter/index.vue'
+import tool from '@/utils/tool'
 
 export default {
     components: {
@@ -199,6 +214,9 @@ export default {
     },
     watch: {},
     computed: {
+        tool() {
+            return tool
+        },
         naColOperation() {
             return naColOperation
         },

src/frontend/admin/src/views/sys/job/save.vue

@@ -27,6 +27,9 @@
                     <el-form-item v-if="mode === 'view'" :label="$t('上次执行时间')" prop="lastExecTime">
                         <el-input v-model="form.lastExecTime" clearable />
                     </el-form-item>
+                    <el-form-item v-if="mode === 'view'" :label="$t('上次执行耗时（ms）')" prop="lastExecTime">
+                        <el-input v-model="form.lastDuration" clearable />
+                    </el-form-item>
                     <el-form-item v-if="mode === 'view'" :label="$t('下次执行时间')" prop="nextExecTime">
                         <el-input v-model="form.nextExecTime" clearable />
                     </el-form-item>