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/3] =?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 12b955911a9ba0d82e9c80eef8b424fa482153c1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 24 Jun 2025 10:01:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=AE=B0=E5=BD=95=E6=94=AF=E6=8C=81=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E3=80=81=E7=BB=93=E6=9E=9C=E3=80=81=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1436241948540928]集成调用记录支持入参、结果、错误信息的内容进行过滤 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1436241948540928
---
 src/resources/assets/languages/page/en.json    |  3 ++-
 src/resources/assets/languages/page/zh.json    |  3 ++-
 .../integration/integration-audit.vue          | 18 ++++++++++++++++--
 .../pages/framework/integration/param-edit.vue |  9 +++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index cea9303f..6386134e 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1071,5 +1071,6 @@
   "ignored": "Neglected",
   "loaded": "Loaded",
   "dictionary": "dictionary",
-  "healthcheckresult": "Inspection results"
+  "healthcheckresult": "Inspection results",
+  "paramkeyword": "Participate in search"
 }
\ 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 aaa28897..0c9f0517 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -1073,5 +1073,6 @@
   "ignored": "已忽略",
   "loaded": "已加载",
   "dictionary": "字典",
-  "healthcheckresult": "检查结果"
+  "healthcheckresult": "检查结果",
+  "paramkeyword": "入参搜索"
 }
\ No newline at end of file
diff --git a/src/views/pages/framework/integration/integration-audit.vue b/src/views/pages/framework/integration/integration-audit.vue
index 438b2892..4e427480 100644
--- a/src/views/pages/framework/integration/integration-audit.vue
+++ b/src/views/pages/framework/integration/integration-audit.vue
@@ -8,7 +8,7 @@
     >
       <template v-slot>
         <Row class="mb-md">
-          <Col span="8"></Col>
+          <!-- <Col span="8"></Col> -->
           <Col span="4">
             <UserSelect
               v-model="userSelectSetting.value"
@@ -29,11 +29,19 @@
           <Col span="8">
             <TimeSelect
               v-model="timeSelectSetting.value"
-              class="bg-op radius-sm"
+              class="mr-md bg-op radius-sm"
               v-bind="timeSelectSetting"
               @change="handleChange"
             ></TimeSelect>
           </Col>
+          <Col span="8">
+            <TsFormInput
+              v-model.trim="paramKeyword"
+              :placeholder="$t('page.paramkeyword')"
+              class="bg-op radius-sm"
+              @change="handleChange"
+            ></TsFormInput>
+          </Col>
         </Row>
         <div ref="tableMain">
           <TsTable
@@ -101,6 +109,7 @@
 <script>
 import UserSelect from '@/resources/components/UserSelect/UserSelect.vue';
 import TsFormSelect from '@/resources/plugins/TsForm/TsFormSelect';
+import TsFormInput from '@/resources/plugins/TsForm/TsFormInput';
 import TimeSelect from '@/resources/components/TimeSelect/TimeSelect.vue';
 export default {
   name: '',
@@ -109,6 +118,7 @@ export default {
     IntegrationAuditDetail: () => import('./integration-audit-detail.vue'),
     UserSelect,
     TsFormSelect,
+    TsFormInput,
     TimeSelect
   },
   props: {
@@ -122,6 +132,7 @@ export default {
       detailData: {},
       auditData: {},
       contentHeight: '100',
+      paramKeyword: '',
       userSelectSetting: {
         // 用户选择
         groupList: ['user'],
@@ -251,6 +262,9 @@ export default {
       }
       params.userUuidList = this.userSelectSetting.value ? [this.userSelectSetting.value] : []; // 用户
       params.statusList = this.selectSetting.value ? (this.selectSetting.value == 'all' ? [] : [this.selectSetting.value]) : []; // 状态
+      if (this.paramKeyword) {
+        params.paramKeyword = this.paramKeyword;
+      }
       if (!this.timeSelectSetting.value) {
         // 为空设置默认值
         this.timeSelectSetting.value = {
diff --git a/src/views/pages/framework/integration/param-edit.vue b/src/views/pages/framework/integration/param-edit.vue
index c3e0d1e4..fc85c7ce 100644
--- a/src/views/pages/framework/integration/param-edit.vue
+++ b/src/views/pages/framework/integration/param-edit.vue
@@ -26,6 +26,7 @@
             <th style="width:20%">{{ $t('term.framework.paramtype') }}</th>
             <th style="width:20%">{{ $t('term.report.datatype.name') }}</th>
             <th style="width:10%">{{ $t('page.require') }}</th>
+            <th style="width:10%">{{ $t('term.cmdb.searchable') }}</th>
             <th style="width:30%">{{ $t('page.description') }}</th>
             <th v-if="allowEditParam == 1">
               <a href="javascript:void(0)" style="margin-right:5px" @click="addParam">
@@ -68,6 +69,14 @@
                 :false-value="0"
               ></i-switch>
             </td>
+            <td>
+              <i-switch
+                v-if="item.mode == 'input'"
+                v-model="item.isSearchAble"
+                :true-value="1"
+                :false-value="0"
+              ></i-switch>
+            </td>
             <td>
               <TsFormInput v-model="item.description" :maxlength="200" transfer></TsFormInput>
             </td>
-- 
Gitee


From cb3b37a628f0f89492b1b7d48dce61e3557f5764 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 24 Jun 2025 10:04:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=AE=B0=E5=BD=95=E6=94=AF=E6=8C=81=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E3=80=81=E7=BB=93=E6=9E=9C=E3=80=81=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1436241948540928]集成调用记录支持入参、结果、错误信息的内容进行过滤 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1436241948540928
---
 src/views/pages/framework/integration/integration-audit.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/pages/framework/integration/integration-audit.vue b/src/views/pages/framework/integration/integration-audit.vue
index 4e427480..ca3e8690 100644
--- a/src/views/pages/framework/integration/integration-audit.vue
+++ b/src/views/pages/framework/integration/integration-audit.vue
@@ -8,7 +8,6 @@
     >
       <template v-slot>
         <Row class="mb-md">
-          <!-- <Col span="8"></Col> -->
           <Col span="4">
             <UserSelect
               v-model="userSelectSetting.value"
-- 
Gitee