Explorar el Código

🤣增加任务调度内置看板页面

zuohuaijun hace 3 años
padre
commit
cf8f578d2f

+ 7 - 7
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -17,20 +17,20 @@
     <PackageReference Include="AngleSharp" Version="0.17.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.4" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.4" />
-    <PackageReference Include="Furion.Pure" Version="4.8.4" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.4.4" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.4.4" />
+    <PackageReference Include="Furion.Pure" Version="4.8.4.4" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.0" />
-    <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4" />
-    <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4" />
+    <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.1" />
+    <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.12" />
     <PackageReference Include="NEST" Version="7.17.5" />
     <PackageReference Include="NETCore.MailKit" Version="2.1.0" />
-    <PackageReference Include="NewLife.Redis" Version="5.0.2022.1201" />
+    <PackageReference Include="NewLife.Redis" Version="5.1.2023.101" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.21.1" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.15.2" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.3.42" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.3.43-preview02" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.24" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 14 - 0
Web/src/router/route.ts

@@ -48,6 +48,20 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 		},
 		children: [],
 	},
+	{
+		path: '/platform/job/dashboard',
+		name: 'jobDashboard',
+		component: () => import('/@/views/system/job/dashboard.vue'),
+		meta: {
+			title: '任务看板',
+			isLink: import.meta.env.VITE_API_URL + '/schedule',
+			isHide: true,
+			isKeepAlive: true,
+			isAffix: false,
+			isIframe: true,
+			icon: 'ele-Clock',
+		},
+	},
 ];
 
 /**

+ 11 - 0
Web/src/views/system/job/dashboard.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="layout-padding"></div>
+</template>
+
+<script setup lang="ts" name="jobDashboard"></script>
+
+<style lang="scss">
+.layout-padding {
+	margin: 8px;
+}
+</style>

+ 11 - 1
Web/src/views/system/job/index.vue

@@ -30,7 +30,8 @@
 							<el-button icon="ele-Connection" @click="persistAll" />
 						</el-tooltip>
 					</el-button-group>
-					<el-button icon="ele-Coin" @click="openJobCluster" type="danger" plain> 集群控制 </el-button>
+					<el-button icon="ele-Coin" @click="openJobCluster" plain> 集群控制 </el-button>
+					<el-button icon="ele-Grid" @click="openJobDashboard" plain> 任务看板 </el-button>
 				</el-form-item>
 			</el-form>
 		</el-card>
@@ -179,6 +180,7 @@
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent, onUnmounted } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
+import { useRouter } from 'vue-router';
 import mittBus from '/@/utils/mitt';
 import { Timer } from '@element-plus/icons-vue';
 import EditJobDetail from '/@/views/system/job/component/editJobDetail.vue';
@@ -193,6 +195,7 @@ export default defineComponent({
 	name: 'sysJob',
 	components: { Timer, EditJobDetail, EditJobTrigger, JobCluster },
 	setup() {
+		const router = useRouter();
 		const editJobDetailRef = ref();
 		const editJobTriggerRef = ref();
 		const editJobClusterRef = ref();
@@ -337,6 +340,12 @@ export default defineComponent({
 		const openJobCluster = () => {
 			editJobClusterRef.value.openDrawer();
 		};
+		// 打开任务看板
+		const openJobDashboard = () => {
+			router.push({
+				path: '/platform/job/dashboard',
+			});
+		};
 		return {
 			editJobDetailRef,
 			editJobTriggerRef,
@@ -360,6 +369,7 @@ export default defineComponent({
 			cancelSleep,
 			persistAll,
 			openJobCluster,
+			openJobDashboard,
 			...toRefs(state),
 		};
 	},