From 860d3131ae1ad0cef029a66cc0655def526aad53 Mon Sep 17 00:00:00 2001
From: GoldenZqqq <1361001127@qq.com>
Date: Mon, 14 Oct 2024 15:17:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8E=E6=96=87=E5=AD=97=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/model/index_new.vue | 61 +++++++++++++++++++------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/bpm/model/index_new.vue b/src/views/bpm/model/index_new.vue
index 4f2ba3c3d..66613e065 100644
--- a/src/views/bpm/model/index_new.vue
+++ b/src/views/bpm/model/index_new.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <div class="flex justify-between pl-20px items-center">
-      <h3 class="font-extrabold">表单管理</h3>
+      <h3 class="font-extrabold">流程模型</h3>
       <!-- 搜索工作栏 -->
       <el-form
         class="-mb-15px flex"
@@ -25,7 +25,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="openForm('create')" v-hasPermi="['bpm:model:create']">
-            <Icon icon="ep:plus" class="mr-5px" /> 新建流程
+            <Icon icon="ep:plus" class="mr-5px" /> 新建模型
           </el-button>
         </el-form-item>
 
@@ -37,12 +37,12 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item>
-                  <Icon icon="ep:circle-plus" size="13" class="mr-5px" />
-                  新建分组
+                  <Icon icon="ep:circle-plus" :size="13" class="mr-5px" />
+                  新建分类
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <Icon icon="fa:sort-amount-desc" size="13" class="mr-5px" />
-                  分组排序
+                  <Icon icon="fa:sort-amount-desc" :size="13" class="mr-5px" />
+                  分类排序
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -66,7 +66,7 @@
               >
                 <Icon icon="ep:arrow-down-bold" color="#999" />
               </div>
-              <div class="ml-auto mr-30px">
+              <div class="ml-auto mr-45px">
                 <el-button link type="info" class="mr-10px" @click.stop="handleSort">
                   <Icon icon="fa:sort-amount-desc" class="mr-5px" />
                   排序
@@ -85,14 +85,15 @@
             </template>
 
             <el-table
-              :header-cell-style="{ backgroundColor: isDark ? '' : '#edeff0' }"
+              :header-cell-style="{ backgroundColor: isDark ? '' : '#edeff0', paddingLeft: '10px' }"
+              :cell-style="{ paddingLeft: '10px' }"
               v-loading="loading"
               :data="list"
             >
               <el-table-column label="流程名" prop="name" min-width="150">
                 <template #default="scope">
                   <div class="flex items-center">
-                    <el-image :src="scope.row.icon" class="h-32px w-32px mr-10px rounded" />
+                    <el-image :src="scope.row.icon" class="h-38px w-38px mr-10px rounded" />
                     {{ scope.row.name }}
                   </div>
                 </template>
@@ -141,20 +142,22 @@
               </el-table-column>
               <el-table-column label="最后发布" prop="deploymentTime" min-width="250">
                 <template #default="scope">
-                  <span v-if="scope.row.processDefinition">
-                    {{ formatDate(scope.row.processDefinition.deploymentTime) }}
-                  </span>
-                  <el-tag v-if="scope.row.processDefinition" class="ml-10px">
-                    v{{ scope.row.processDefinition.version }}
-                  </el-tag>
-                  <el-tag v-else type="warning">未部署</el-tag>
-                  <el-tag
-                    v-if="scope.row.processDefinition?.suspensionState === 2"
-                    type="warning"
-                    class="ml-10px"
-                  >
-                    已停用
-                  </el-tag>
+                  <div class="flex items-center">
+                    <span v-if="scope.row.processDefinition" class="w-150px">
+                      {{ formatDate(scope.row.processDefinition.deploymentTime) }}
+                    </span>
+                    <el-tag v-if="scope.row.processDefinition">
+                      v{{ scope.row.processDefinition.version }}
+                    </el-tag>
+                    <el-tag v-else type="warning">未部署</el-tag>
+                    <el-tag
+                      v-if="scope.row.processDefinition?.suspensionState === 2"
+                      type="warning"
+                      class="ml-10px"
+                    >
+                      已停用
+                    </el-tag>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column label="操作" width="200" fixed="right">
@@ -436,6 +439,9 @@ onMounted(async () => {
 
 <style lang="scss" scoped>
 :deep() {
+  .el-card {
+    border-radius: 8px;
+  }
   .el-form--inline .el-form-item {
     margin-right: 10px;
   }
@@ -452,5 +458,14 @@ onMounted(async () => {
     font-size: 20px;
     font-weight: 500;
   }
+  .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+  .el-table__cell {
+    border-bottom: none !important;
+  }
+  .el-table__row {
+    height: 68px;
+  }
 }
 </style>

From 7ea5cf55891d97dbc065c44f37e8e4cf00247ab5 Mon Sep 17 00:00:00 2001
From: GGbond <mhangggggg@outlook.com>
Date: Thu, 11 Jun 2026 14:56:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(infra):=20=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/infra/job/index.ts    |  6 ++++++
 src/views/infra/job/index.vue | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/api/infra/job/index.ts b/src/api/infra/job/index.ts
index 033b2cbe8..e312e8c68 100644
--- a/src/api/infra/job/index.ts
+++ b/src/api/infra/job/index.ts
@@ -61,3 +61,9 @@ export const runJob = (id: number) => {
 export const getJobNextTimes = (id: number) => {
   return request.get({ url: '/infra/job/get_next_times?id=' + id })
 }
+
+
+// 同步定时任务到 Quartz
+export const syncJob = () => {
+  return request.post({ url: '/infra/job/sync' })
+}
\ No newline at end of file
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
index 29460030c..72f339beb 100644
--- a/src/views/infra/job/index.vue
+++ b/src/views/infra/job/index.vue
@@ -68,6 +68,9 @@
         <el-button type="info" plain @click="handleJobLog()" v-hasPermi="['infra:job:query']">
           <Icon icon="ep:zoom-in" class="mr-5px" /> 执行日志
         </el-button>
+        <el-button type="warning" plain @click="handleSyncJob()" :loading="syncLoading">
+          <Icon icon="ep:refresh" class="mr-5px" /> 同步任务
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -174,6 +177,7 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const syncLoading = ref(false) // 同步的加载中
 
 /** 查询列表 */
 const getList = async () => {
@@ -214,6 +218,20 @@ const handleExport = async () => {
   }
 }
 
+/** 同步任务到 Quartz */
+const handleSyncJob = async () => {
+  try {
+    await message.confirm('确认要同步所有任务到调度器?', t('common.reminder'))
+    syncLoading.value = true
+    await JobApi.syncJob()
+    message.success('同步成功')
+    await getList()
+  } catch {
+  } finally {
+    syncLoading.value = false
+  }
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {