zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 部分页面调整

This commit is contained in:
caoqianming 2025-02-11 17:16:57 +08:00
parent 3b14148501
commit a4e125e31c
6 changed files with 36 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/router/index.js
View File

@ -12,6 +12,11 @@ import { beforeEach, afterEach } from './scrollBehavior';
const routes = systemRouter
//系统特殊路由
const routes_404 = {
path: "/:pathMatch(.*)*",
hidden: true,
component: () => import(/* webpackChunkName: "404" */ '@/layout/other/404'),
}
let routes_404_r = () => { }
const router = createRouter({
@ -79,12 +84,14 @@ router.beforeEach(async (to, from, next) => {
router.addRoute("layout", item)
});
routes_404_r = router.addRoute(routes_404);
if (to.matched.length == 0) {
router.push(to.fullPath);
}
isGetRouter = true;
next({ ...to, replace: true }); // 重新触发导航
return;
}catch (e) {
isGetRouter = false;
console.error('路由加载失败:', e);
next('/login');
return;
}
}

5
src/router/systemRouter.js
View File

@ -16,11 +16,6 @@ const routes = [
title: "登录"
}
},
{
path: "/:pathMatch(.*)*",
hidden: true,
component: () => import(/* webpackChunkName: "404" */ '@/layout/other/404'),
},
{
path: "/user_register",
component: () => import(/* webpackChunkName: "userRegister" */ '@/views/login/userRegister'),

2
src/views/sys/dept.vue
View File

@ -60,6 +60,7 @@
>
<el-popconfirm
title="确定删除吗？"
v-if="!scope.row.children"
@confirm="delDept(scope.row, scope.$index)"
>
<template #reference>
@ -68,7 +69,6 @@
type="danger"
size="small"
v-auth="'dept.delete'"
v-if="!scope.row.children"
>删除</el-button
>
</template>

4
src/views/sys/dict.vue
View File

@ -24,7 +24,7 @@
</el-tree>
</el-main>
<el-footer style="height:51px;">
<el-button type="primary" size="mini" icon="el-icon-plus" style="width: 100%;" @click="addDicType" v-auth="'dict.create'">字典分类</el-button>
<el-button type="primary" size="small" icon="el-icon-plus" style="width: 100%;" @click="addDicType" v-auth="'dict.create'">字典分类</el-button>
</el-footer>
</el-container>
</el-aside>
@ -36,7 +36,7 @@
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="listApi" row-key="id" :params="listApiParams" @selection-change="selectionChange" stripe :paginationLayout="'prev, pager, next'">
<scTable ref="table" :apiObj="listApi" row-key="id" :params="listApiParams" stripe :paginationLayout="'prev, pager, next'">
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="名称" prop="name" width="360"></el-table-column>

22
src/views/sys/task.vue
View File

@ -16,22 +16,22 @@
</ul>
<div class="bottom">
<div class="state">
<el-tag v-if="item.enabled" size="mini">启用</el-tag>
<el-tag v-if="!item.enabled" size="mini" type="danger">停用</el-tag>
<el-tag v-if="item.enabled" size="small">启用</el-tag>
<el-tag v-if="!item.enabled" size="small" type="danger">停用</el-tag>
</div>
<div class="handler">
<el-popconfirm title="确定立即执行吗？" @confirm="run(item)">
<template #reference>
<el-button type="primary" icon="el-icon-caret-right" size="mini" circle></el-button>
<el-button type="primary" icon="el-icon-caret-right" size="small" circle></el-button>
</template>
</el-popconfirm>
<el-dropdown trigger="click">
<el-button type="primary" icon="el-icon-more" size="mini" circle plain></el-button>
<el-button type="primary" icon="el-icon-more" size="small" circle plain></el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="editTask(item)" v-auth="'ptask.update'">编辑</el-dropdown-item>
<!-- <el-dropdown-item @click="editTask(item)" v-auth="'ptask.update'">编辑</el-dropdown-item> -->
<el-dropdown-item @click="logs(item)">日志</el-dropdown-item>
<el-dropdown-item @click="delTask(item)" divided v-auth="'ptask.delete'">删除</el-dropdown-item>
<!-- <el-dropdown-item @click="delTask(item)" divided v-auth="'ptask.delete'">删除</el-dropdown-item> -->
</el-dropdown-menu>
</template>
</el-dropdown>
@ -40,7 +40,7 @@
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="12" :xs="24">
<el-card class="task task-add" shadow="none" @click="addTask" v-auth="'ptask.create'">
<el-card class="task task-add" @click="addTask" v-auth="'ptask.create'">
<i class="el-icon-plus"></i>
<p>添加计划任务</p>
</el-card>
@ -77,8 +77,8 @@
</template>
</el-dialog>
<el-drawer title="计划任务日志" v-model="logsVisible" :size="600" direction="rtl" destroy-on-close>
<logs></logs>
<el-drawer title="计划任务日志" v-model="logsVisible" :size="800" direction="rtl" destroy-on-close>
<logs :ptask="ptask"></logs>
</el-drawer>
</template>
@ -118,6 +118,7 @@
visible: false,
isSaving: false,
logsVisible: false,
ptask: ""
}
},
mounted() {
@ -180,7 +181,8 @@
//取消
})
},
logs(){
logs(item){
this.ptask = item;
this.logsVisible = true
},
run(task){

86
src/views/sys/taskLogs.vue
View File

@ -1,96 +1,30 @@
<template>
<el-container>
<el-main style="padding:0 20px;">
<scTable ref="table" :data="data" stripe>
<el-table-column label="执行时间" prop="time" width="200"></el-table-column>
<el-table-column label="执行结果" prop="state" width="100">
<template #default="scope">
<span v-if="scope.row.state==200" style="color: #67C23A;"><i class="el-icon-success"></i> 成功</span>
<span v-else style="color: #F56C6C;"><i class="el-icon-error"></i> 异常</span>
</template>
</el-table-column>
<el-table-column label="执行日志" prop="logs" width="100" fixed="right">
<template #default="scope">
<el-button size="mini" @click="show(scope.row)" link>日志</el-button>
</template>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" :params="params">
<el-table-column label="任务ID" prop="task_id" width="300"></el-table-column>
<el-table-column label="执行时间" prop="date_created" width="160"></el-table-column>
<el-table-column label="执行状态" prop="status">
</el-table-column>
</scTable>
</el-main>
</el-container>
<el-drawer title="日志" v-model="logsVisible" :size="500" direction="rtl" destroy-on-close>
<el-main style="padding:0 20px 20px 20px;">
<pre style="font-size: 12px;color: #999;padding:20px;background: #333;font-family: consolas;line-height: 1.5;overflow: auto;">{{demoLog}}</pre>
</el-main>
</el-drawer>
</template>
<script>
export default {
props: {
ptask: {type: Object, default: () => {}}
},
data() {
return {
logsVisible: false,
demoLog: `2021-07-07 12:35:00 [com.xxl.job.core.thread.JobThread#run]-[124]-[Thread-308]
----------- xxl-job job execute start -----------
----------- Param:
2021-07-07 12:35:00 [com.heronshn.reservation.jobhandler.AqshMasterDataSendHandler#execute]-[31]-[Thread-308] aqshMasterDataSendHandler start
2021-07-07 12:35:00 [com.heronshn.reservation.data.service.impl.AqshVehicleServiceImpl#send]-[42]-[Thread-308] send 45
2021-07-07 12:35:00 [com.heronshn.reservation.data.service.impl.AqshVehicleServiceImpl#send]-[45]-[Thread-308] webapi http://127.0.0.1:48080
2021-07-07 12:35:00 [com.heronshn.reservation.jobhandler.AqshMasterDataSendHandler#execute]-[33]-[Thread-308] aqshMasterDataSendHandler vehicle end
2021-07-07 12:35:00 [com.heronshn.reservation.jobhandler.AqshMasterDataSendHandler#execute]-[35]-[Thread-308] aqshMasterDataSendHandler stop
2021-07-07 12:35:00 [com.xxl.job.core.thread.JobThread#run]-[158]-[Thread-308]
----------- xxl-job job execute end(finish) -----------
----------- ReturnT:ReturnT [code=200, msg=null, content=null]
2021-07-07 12:35:00 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[176]-[Thread-10]
----------- xxl-job job callback finish.
[Load Log Finish]`,
data: [
{
time: "2021-07-07 00:00:00",
state: "500",
logs: ""
},
{
time: "2021-07-06 00:00:00",
state: "200",
logs: ""
},
{
time: "2021-07-05 00:00:00",
state: "200",
logs: ""
},
{
time: "2021-07-04 00:00:00",
state: "200",
logs: ""
},
{
time: "2021-07-03 00:00:00",
state: "200",
logs: ""
},
{
time: "2021-07-02 00:00:00",
state: "200",
logs: ""
},
{
time: "2021-07-01 00:00:00",
state: "200",
logs: ""
}
]
apiObj: this.$API.system.task.result,
params: {task_name: this.ptask.task, periodic_task_name: this.ptask.name},
}
},
mounted() {
},
methods: {
show(){
this.logsVisible = true;
}
}
}
</script>