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 0c92abf79b6da0f16477bc295ca14b97ffb3116e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 28 Aug 2025 12:18:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E4=BF=9D=E5=AD=98=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=90=8E=E7=AB=AF=E6=B2=A1=E6=9C=89=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=A7=86=E5=9B=BE=E5=90=8D=E9=87=8D=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=96=B0=E5=A2=9E=E7=9A=84=E9=87=8D=E5=90=8D?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=BC=9A=E8=A6=86=E7=9B=96=E6=97=A7=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1466722568077312]视图设置-保存视图时，后端没有校验视图名重复，导致新增的重名视图会覆盖旧视图 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1466722568077312
---
 src/views/pages/cmdb/resourceentity/mapping-setting.vue     | 2 +-
 src/views/pages/cmdb/resourceentity/resourceentity-edit.vue | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
index 4099182c..ce07249f 100644
--- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
@@ -151,7 +151,7 @@ export default {
       this.fieldList.forEach(item => {
         this.list.push({
           field: item.value,
-          type: ''
+          type: 'empty'
         });
       });
     },
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
index 02592a0f..f2652164 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
@@ -6,6 +6,7 @@
     <template v-slot>
       <Loading :loadingShow="loadingShow" type="fix"></Loading>
       <TsForm
+        ref="form"
         v-model="resourceEntityData"
         :item-list="formConfig"
       >
@@ -214,6 +215,7 @@ export default {
     save() {
       // console.log(JSON.stringify(this.resourceEntityData, null, 2));
       let isValid = true;
+      isValid = this.$refs.form.valid() && isValid;
       isValid = this.$refs.ciSetting.valid() && isValid;
       isValid = this.$refs.mappingSetting.valid() && isValid;
       if (!isValid) {
-- 
Gitee