From bea7b9b3000ca6c65740f2761d7c6c351e2f778a Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 11 Jun 2025 19:39:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1441426846482432]定时作业管理页增加一列显示作业是否已加载 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1441426846482432
---
 src/resources/assets/languages/page/en.json   |  3 +-
 src/resources/assets/languages/page/zh.json   |  3 +-
 .../pages/autoexec/manage/time-job-list.vue   |  5 +++
 .../deploy/schedule/schedule-job-manage.vue   | 40 +++++++++++++++++++
 .../pages/framework/schedule/job-manage.vue   |  8 ++++
 .../pages/report/sendjob/sendjob-manage.vue   |  5 +++
 6 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index 76cafa28..170cf71c 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1068,5 +1068,6 @@
   "cache": "Cache",
   "connectionsuccessful": "Connection successful",
   "driverjar": "Driver jar package",
-  "ignored": "Neglected"
+  "ignored": "Neglected",
+  "loaded": "Loaded"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index 917a1def..1d1d6fc3 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -1070,5 +1070,6 @@
   "cache": "缓存",
   "connectionsuccessful": "连接成功",
   "driverjar": "驱动jar包",
-  "ignored": "已忽略"
+  "ignored": "已忽略",
+  "loaded": "已加载"
 }
\ No newline at end of file
diff --git a/src/views/pages/autoexec/manage/time-job-list.vue b/src/views/pages/autoexec/manage/time-job-list.vue
index 8629d9c3..bd589d70 100644
--- a/src/views/pages/autoexec/manage/time-job-list.vue
+++ b/src/views/pages/autoexec/manage/time-job-list.vue
@@ -32,6 +32,10 @@
           <template slot="isActive" slot-scope="{ row }">
             <span>{{ getActiveName(row.isActive) }}</span>
           </template>
+          <template slot="isLoad" slot-scope="{ row }">
+            <span v-if="row.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
           <template slot="cron" slot-scope="{ row }">
             <div>
               <TsQuartz :value="row.cron" showType="read"></TsQuartz>
@@ -166,6 +170,7 @@ export default {
           // 选中列表表头字段
           { key: 'name', title: _this.$t('page.name') }, // 名称
           { key: 'isActive', title: _this.$t('page.status') }, // 状态
+          { key: 'isLoad', title: this.$t('page.loaded')},
           { key: 'cron', title: this.$t('term.autoexec.timingplan') }, // cron表达式
           { key: 'autoexecCombopName', title: this.$t('term.autoexec.relatecombinationtool') }, // 关联组合工具
           { key: 'execCount', title: this.$t('term.autoexec.executecount') }, // 执行次数
diff --git a/src/views/pages/deploy/schedule/schedule-job-manage.vue b/src/views/pages/deploy/schedule/schedule-job-manage.vue
index 174e233d..1e2d3aec 100644
--- a/src/views/pages/deploy/schedule/schedule-job-manage.vue
+++ b/src/views/pages/deploy/schedule/schedule-job-manage.vue
@@ -39,6 +39,10 @@
               <span v-if="row.isActive">{{ $t('page.enable') }}</span>
               <span v-else>{{ $t('page.disable') }}</span>
             </template>
+            <template slot="isLoad" slot-scope="{ row }">
+              <span v-if="row.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+              <span v-else class="text-grey">{{ $t('page.no') }}</span>
+            </template>
             <template slot="cron" slot-scope="{ row }">
               <div>
                 <TsQuartz :value="row.cron" showType="read"></TsQuartz>
@@ -69,6 +73,34 @@
                 {{ row.execCount }}
               </div>
             </template>
+            <template slot="jobStatus" slot-scope="{ row }">
+              <div v-if="!$utils.isEmpty(row.jobStatus)">
+                <div>
+                  <span class="text-grey">{{ $t('term.autoexec.starttoexecute') }}</span>
+                  <span>{{ row.jobStatus.execCount || '0' }}次</span>
+                </div>
+                <div v-if="row.jobStatus.beginTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.planstarttime') }}：</span>
+                  <span>{{ row.jobStatus.beginTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.endTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.planendtime') }}：</span>
+                  <span>{{ row.jobStatus.endTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.lastFireTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.lastactivetime') }}：</span>
+                  <span>{{ row.jobStatus.lastFireTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.lastFinishTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.lastcompletetime') }}：</span>
+                  <span>{{ row.jobStatus.lastFinishTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.nextFireTime != null">
+                  <span class="text-grey">{{ $t('page.nextactivationtime') }}：</span>
+                  <span>{{ row.jobStatus.nextFireTime | formatDate }}</span>
+                </div>
+              </div>
+            </template>
             <template v-slot:action="{ row }">
               <div class="tstable-action">
                 <ul class="tstable-action-ul">
@@ -130,6 +162,10 @@ export default {
           title: this.$t('page.status'),
           key: 'isActive'
         },
+        {
+          title: this.$t('page.loaded'),
+          key: 'isLoad'
+        },
         {
           title: this.$t('term.autoexec.timingplan'),
           key: 'cron'
@@ -164,6 +200,10 @@ export default {
           key: 'lcd',
           type: 'time'
         },
+        {
+          title: this.$t('term.autoexec.executionsituation'),
+          key: 'jobStatus'
+        },
         { key: 'action' }
       ],
       isListDeployJobDialogShow: false,
diff --git a/src/views/pages/framework/schedule/job-manage.vue b/src/views/pages/framework/schedule/job-manage.vue
index 9485deb3..594e11bb 100644
--- a/src/views/pages/framework/schedule/job-manage.vue
+++ b/src/views/pages/framework/schedule/job-manage.vue
@@ -44,6 +44,10 @@
             <span v-if="row.needAudit == 1" class="text-success">{{ $t('page.yes') }}</span>
             <span v-else class="text-grey">{{ $t('page.no') }}</span>
           </template>
+          <template slot="isLoad" slot-scope="{ row }">
+            <span v-if="row.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
           <template slot="execCount" slot-scope="{ row }">
             <div>{{ row.jobStatus.execCount }}</div>
           </template>
@@ -148,6 +152,10 @@ export default {
           title: this.$t('page.keeprecords'),
           key: 'needAudit'
         },
+        {
+          title: this.$t('page.loaded'),
+          key: 'isLoad'
+        },
         {
           title: this.$t('page.plantime'),
           key: 'cron'
diff --git a/src/views/pages/report/sendjob/sendjob-manage.vue b/src/views/pages/report/sendjob/sendjob-manage.vue
index ed7e5091..8fe56aeb 100644
--- a/src/views/pages/report/sendjob/sendjob-manage.vue
+++ b/src/views/pages/report/sendjob/sendjob-manage.vue
@@ -36,6 +36,10 @@
             </template>
           </template>
           <template v-slot:name="{row}"><span class="text-href" @click.stop="toEditPage('edit',row)">{{ row.name }}</span></template>
+          <template v-slot:isLoad="{row}">
+            <span v-if="row.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
           <template v-slot:cron="{row}">
             <TsQuartz :value="row.cron" showType="read" />
           </template>
@@ -118,6 +122,7 @@ export default {
         {title: this.$t('page.name'), key: 'name'},
         {title: this.$t('page.emailtitle'), key: 'emailTitle'},
         {title: this.$t('page.recipient'), key: 'toNameList'},
+        {title: this.$t('page.loaded'), key: 'isLoad'},
         {title: this.$t('page.executeplan'), key: 'cron'},
         {title: this.$t('page.status'), key: 'isActive'},
         {title: this.$t('term.report.nextsendingtime'), key: 'nextFireTime'},
-- 
Gitee


From 979491a103e4f1c9af88c2e1891fa43fa6d777df Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 4 Jul 2025 10:16:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E8=BD=BD=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1444848047980544]查看和下载日志页面 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444848047980544
---
 src/resources/api/framework/log/log.js        |   4 +-
 src/views/pages/framework/log/log-manage.vue  |  25 +++-
 .../pages/framework/log/loglevel-edit.vue     | 112 ++++++++++++++++++
 src/views/pages/framework/router.js           |   4 +-
 4 files changed, 136 insertions(+), 9 deletions(-)
 create mode 100644 src/views/pages/framework/log/loglevel-edit.vue

diff --git a/src/resources/api/framework/log/log.js b/src/resources/api/framework/log/log.js
index 37d4b3fc..0cb7852c 100644
--- a/src/resources/api/framework/log/log.js
+++ b/src/resources/api/framework/log/log.js
@@ -4,9 +4,11 @@ const log = {
   getLogFileNameList(params) {
     return axios.post('/api/rest/log/filename/list', params);
   },
-  
   getLogContent(params) {
     return axios.post('/api/rest/log/content/get', params);
+  },
+  updateLogLevel(params) {
+    return axios.post('/api/rest/logger/updatelevel', params);
   }
 };
 
diff --git a/src/views/pages/framework/log/log-manage.vue b/src/views/pages/framework/log/log-manage.vue
index 78cd102a..811d4c89 100644
--- a/src/views/pages/framework/log/log-manage.vue
+++ b/src/views/pages/framework/log/log-manage.vue
@@ -3,12 +3,13 @@
     <TsContain>
       <template v-slot:topLeft>
         <div class="action-group">
-          <div v-if="level != null" class="action-item">
-            <span class="mr-xs text-grey">{{ $t('page.loglevel') }}</span>
+          <span v-if="level != null" class="mr-xs text-grey">{{ $t('page.loglevel') }}</span>
+          <span v-if="searchParam.serverId != null && level != null" class="action-item" @click="editLogLevel()">
             <span>
               <b>{{ level }}</b>
             </span>
-          </div>
+            <span class="tsfont-edit"></span>
+          </span>
         </div>
       </template>
       <template v-slot:topRight>
@@ -49,6 +50,7 @@
         </div>
       </div>
     </TsContain>
+    <LogLevelEdit v-if="searchParam.serverId != null && isEditShow" :serverId="searchParam.serverId" @close="closeEditDialog"></LogLevelEdit>
   </div>
 </template>
 <script>
@@ -56,7 +58,8 @@ import download from '@/resources/mixins/download.js';
 export default {
   name: '',
   components: {
-    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect.vue')
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect.vue'),
+    LogLevelEdit: () => import('./loglevel-edit.vue')
   },
   mixins: [download],
   props: {},
@@ -82,7 +85,8 @@ export default {
         value: ''
       },
       logLines: [],
-      level: null
+      level: null,
+      isEditShow: false
     };
   },
   beforeCreate() {},
@@ -127,11 +131,11 @@ export default {
         this.searchParam.serverId = null;
         this.level = null;
       }
+      this.fileNameSelectSetting.value = null;
       this.getLogFileNameList();
     },
     getLogFileNameList() {
       let _this = this;
-      _this.fileNameSelectSetting.value = null;
       _this.fileNameSelectSetting.dataList = [];
       if (this.searchParam && this.searchParam.serverId != null) {
         this.$api.framework.log.getLogFileNameList(this.searchParam).then(res => {
@@ -188,6 +192,15 @@ export default {
         params: this.searchParam
       };
       this.download(param);
+    },
+    editLogLevel() {
+      this.isEditShow = true;
+    },
+    closeEditDialog(needRefresh) {
+      this.isEditShow = false;
+      if (needRefresh) {
+        this.getLogFileNameList();
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/framework/log/loglevel-edit.vue b/src/views/pages/framework/log/loglevel-edit.vue
new file mode 100644
index 00000000..2b528789
--- /dev/null
+++ b/src/views/pages/framework/log/loglevel-edit.vue
@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <TsDialog
+      v-bind="dialogConfig"
+      @on-close="close"
+      @on-ok="save"
+    >
+      <template v-slot>
+        <TsForm ref="form" :item-list="formConfig"></TsForm>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm.vue')
+  },
+  props: {
+    serverId: {
+      type: Number
+    }
+  },
+  data() {
+    return {
+      level: null,
+      dialogConfig: {
+        type: 'modal',
+        maskClose: false,
+        isShow: true,
+        title: this.$t('dialog.title.edittarget', { target: this.$t('page.loglevel') }),
+        width: 'mini',
+        height: '260px'
+      },
+      formConfig: [
+        {
+          type: 'select',
+          name: 'level',
+          label: this.$t('page.loglevel'),
+          dataList: [
+            {
+              value: 'TRACE',
+              text: 'TRACE'
+            },
+            {
+              value: 'DEBUG',
+              text: 'DEBUG'
+            },
+            {
+              value: 'INFO',
+              text: 'INFO'
+            },
+            {
+              value: 'WARN',
+              text: 'WARN'
+            },
+            {
+              value: 'ERROR',
+              text: 'ERROR'
+            },
+            {
+              value: 'OFF',
+              text: 'OFF'
+            }
+          ],
+          validateList: ['required'],
+          width: '200px',
+          onChange: level => {
+            this.level = level;
+          }
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    save() {
+      const form = this.$refs['form'];
+      if (form.valid()) {
+        let param = {
+          serverId: this.serverId,
+          level: this.level
+        };
+        this.$api.framework.log.updateLogLevel(param).then(res => {
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.savesuccess'));
+            this.close(true);
+          }
+        });
+      }
+    },
+    close(needRefresh) {
+      this.$emit('close', needRefresh);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js
index 6bd822aa..7e8531f3 100644
--- a/src/views/pages/framework/router.js
+++ b/src/views/pages/framework/router.js
@@ -755,7 +755,7 @@ let routerList = [
       ismenu: true,
       icon: 'tsfont-formstaticlist',
       authority: 'ADMIN',
-      type: 'others'
+      type: 'healthcheck'
     }
   },
   {
@@ -767,7 +767,7 @@ let routerList = [
       ismenu: true,
       icon: 'tsfont-history',
       authority: 'ADMIN',
-      type: 'others'
+      type: 'healthcheck'
     }
   }
 ];
-- 
Gitee