Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net6.0

Browse Source
This commit is contained in:
不做码农
2022-04-04 08:27:47 +08:00
parent 030db5b971 2bc336ebb2
commit 8fd6bba2d1
29 changed files with 1468 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
ZR.Vue/src/api/business/demo.js Normal file
View File

@@ -0,0 +1,78 @@
import request from '@/utils/request'
/**
* 演示分页查询
* @param {查询条件} data
*/
export function listDemo(query) {
return request({
url: 'business/Demo/list',
method: 'get',
params: query,
})
}
/**
* 新增演示
* @param data
*/
export function addDemo(data) {
return request({
url: 'business/Demo',
method: 'post',
data: data,
})
}
/**
* 修改演示
* @param data
*/
export function updateDemo(data) {
return request({
url: 'business/Demo',
method: 'PUT',
data: data,
})
}
/**
* 获取演示详情
* @param {Id}
*/
export function getDemo(id) {
return request({
url: 'business/Demo/' + id,
method: 'get'
})
}
/**
* 删除演示
* @param {主键} pid
*/
export function delDemo(pid) {
return request({
url: 'business/Demo/' + pid,
method: 'delete'
})
}
// 导出演示
export function exportDemo(query) {
return request({
url: 'business/Demo/export',
method: 'get',
params: query
})
}
//排序
export function changeSort(data) {
return request({
url: 'business/Demo/ChangeSort',
method: 'get',
params: data
})
}

70
ZR.Vue/src/api/business/genDemo.js Normal file
View File

@@ -0,0 +1,70 @@
import request from '@/utils/request'
/**
* 演示分页查询
* @param {查询条件} data
*/
export function listGenDemo(query) {
return request({
url: 'business/GenDemo/list',
method: 'get',
params: query,
})
}
/**
* 新增演示
* @param data
*/
export function addGenDemo(data) {
return request({
url: 'business/GenDemo',
method: 'post',
data: data,
})
}
/**
* 修改演示
* @param data
*/
export function updateGenDemo(data) {
return request({
url: 'business/GenDemo',
method: 'PUT',
data: data,
})
}
/**
* 获取演示详情
* @param {Id}
*/
export function getGenDemo(id) {
return request({
url: 'business/GenDemo/' + id,
method: 'get'
})
}
/**
* 删除演示
* @param {主键} pid
*/
export function delGenDemo(pid) {
return request({
url: 'business/GenDemo/' + pid,
method: 'delete'
})
}
// 导出演示
export function exportGenDemo(query) {
return request({
url: 'business/GenDemo/export',
method: 'get',
params: query
})
}

2
ZR.Vue/src/components/TopNav/index.vue
View File

@@ -97,7 +97,7 @@ export default {
if (routes.length === 0) {
activePath = this.currentIndex || this.defaultRouter();
console.log("activePath", activePath);
console.log("activePath", activePath);
this.activeRoutes(activePath);
}
return activePath;

41
ZR.Vue/src/layout/components/Sidebar/index.vue
View File

@@ -1,11 +1,12 @@
<template>
<div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<div :class="{'has-logo':showLogo}"
:style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<el-menu :default-active="activeMenu" :collapse="isCollapse" :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground" :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor" :unique-opened="true"
<el-menu :default-active="activeMenu" :collapse="isCollapse"
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
:text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor" :unique-opened="true"
:active-text-color="settings.theme" :collapse-transition="false" mode="vertical">
<sidebar-item v-for="(route, index) in sidebarRouters" :key="route.path + index" :item="route" :base-path="route.path" />
</el-menu>
</el-scrollbar>
@@ -13,34 +14,34 @@
</template>
<script>
import { mapGetters, mapState } from "vuex";
import Logo from "./Logo";
import SidebarItem from "./SidebarItem";
import variables from "@/assets/styles/variables.scss";
import { mapGetters, mapState } from 'vuex'
import Logo from './Logo'
import SidebarItem from './SidebarItem'
import variables from '@/assets/styles/variables.scss'
export default {
components: { SidebarItem, Logo },
computed: {
...mapState(["settings"]),
...mapGetters(["sidebarRouters", "sidebar"]),
...mapState(['settings']),
...mapGetters(['sidebarRouters', 'sidebar']),
activeMenu() {
const route = this.$route;
const { meta, path } = route;
const route = this.$route
const { meta, path } = route
// if set path, the sidebar will highlight the path you set
if (meta.activeMenu) {
return meta.activeMenu;
return meta.activeMenu
}
return path;
return path
},
showLogo() {
return this.$store.state.settings.sidebarLogo;
return this.$store.state.settings.sidebarLogo
},
variables() {
return variables;
return variables
},
isCollapse() {
return !this.sidebar.opened;
},
},
};
return !this.sidebar.opened
}
}
}
</script>

3
ZR.Vue/src/views/login.vue
View File

@@ -126,8 +126,7 @@ export default {
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.msgSuccess("登陆成功");
this.loading = true;
this.msgSuccess("登录成功");
this.$router.push({ path: this.redirect || "/" });
})
.catch((error) => {

110
ZR.Vue/src/views/monitor/job/index.vue
View File

@@ -77,46 +77,71 @@
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24" v-if="this.form.id">
<el-col :lg="24" v-if="this.form.id">
<el-form-item label="任务ID">
<div>{{form.id}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="任务名称" maxlength="200" prop="name">
<el-input v-model="form.name" placeholder="请输入任务名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="触发器类型" prop="triggerType">
<el-select v-model="form.triggerType" placeholder="请选择触发器类型" style="width:100%">
<el-option v-for="item in triggerTypeOptions" :key="item.value" :label="item.label" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="任务分组" maxlength="200" prop="jobGroup">
<el-select v-model="form.jobGroup" placeholder="请选择">
<el-option v-for="dict in jobGroupOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="程序集名称" maxlength="200" prop="assemblyName">
<el-input v-model="form.assemblyName" placeholder="请输入程序集名称" />
<el-col :lg="24">
<el-form-item label="任务类型" prop="taskType">
<el-radio-group v-model="form.taskType">
<el-radio :label="1">执行程序集</el-radio>
<el-radio :label="2">执行url</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="任务类名" maxlength="200" prop="className">
<el-input v-model="form.className" placeholder="请输入任务类名" />
<el-col :lg="24" v-if="form.taskType == 2">
<el-form-item label="apiUrl" prop="apiUrl">
<el-input v-model="form.apiUrl" placeholder="远程调用接口url">
<template slot="prepend">Http://</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<template v-else>
<el-col :lg="24">
<el-form-item label="程序集名称" maxlength="200" prop="assemblyName">
<el-input v-model="form.assemblyName" placeholder="请输入程序集名称" />
</el-form-item>
</el-col>
<el-col :lg="24">
<el-form-item label="任务类名" maxlength="200" prop="className">
<el-input v-model="form.className" placeholder="请输入任务类名" />
</el-form-item>
</el-col>
</template>
<el-col :lg="24">
<el-form-item label="传入参数" prop="jobParams">
<span slot="label">
<el-tooltip content="eg：{ token: abc123}" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
传入参数
</span>
<el-input v-model="form.jobParams" placeholder="传入参数" />
</el-form-item>
</el-col>
<el-col :span="24" v-show="form.triggerType == 1">
<el-col :lg="24" v-show="form.triggerType == 1">
<el-form-item label="间隔(Cron)" prop="cron">
<!-- <el-input placeholder="如10分钟执行一次：0/0 0/10 * * * ?" v-model="form.cron">
<el-link slot="append" href="https://qqe2.com/cron" type="primary" target="_blank" class="mr10">cron在线生成</el-link>
@@ -131,22 +156,28 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="开始日期" prop="beginTime">
<span slot="label">
<el-tooltip content="如果不写开始时间和结束时间，任务将以当前时间开始执行，到9999年结束" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
开始日期
</span>
<el-date-picker v-model="form.beginTime" style="width:100%" type="date" :picker-options="pickerOptions" placeholder="选择开始日期" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="结束日期" prop="endTime">
<el-date-picker v-model="form.endTime" style="width:100%" type="date" placeholder="选择结束日期" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item v-show="form.triggerType == 0" label="执行间隔(秒)" prop="intervalSecond">
<el-input-number v-model="form.intervalSecond" :max="9999999999" step-strictly controls-position="right" :min="1" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remark" />
</el-form-item>
@@ -178,6 +209,7 @@
<script>
import {
queryTasks,
getTasks,
createTasks,
updateTasks,
deleteTasks,
@@ -311,6 +343,9 @@ export default {
triggerType: [
{ required: true, message: '请选择触发器类型', trigger: 'blur' }
],
apiUrl: [
{ required: true, message: '请输入apiUrl地址', trigger: 'blur' }
],
cron: [{ validator: cronValidate, trigger: 'blur' }],
beginTime: [{ validator: beginTimeValidate, trigger: 'blur' }],
endTime: [{ validator: endTimeValidate, trigger: 'blur' }],
@@ -376,9 +411,11 @@ export default {
handleUpdate(row) {
this.reset()
this.form = row
this.open = true
this.title = '修改计划任务'
getTasks(row.id).then((res) => {
this.form = res.data
this.open = true
this.title = '修改计划任务'
})
},
/** 任务日志列表查询 */
handleJobLog(id, title) {
@@ -400,17 +437,14 @@ export default {
},
/** 确定后回传值 */
crontabFill(value) {
console.log(value)
console.log(value)
this.form.cron = value
},
// 启动按钮
handleStart(row) {
startTasks(row.id).then((response) => {
if (response.code === 200) {
this.$message({
message: response.msg,
type: 'success'
})
this.msgSuccess(response.msg)
this.open = false
this.getList()
}
@@ -420,10 +454,7 @@ export default {
handleStop(row) {
stopTasks(row.id).then((response) => {
if (response.code === 200) {
this.$message({
message: response.msg,
type: 'success'
})
this.msgSuccess(response.msg)
this.open = false
this.getList()
}
@@ -446,10 +477,7 @@ export default {
deleteTasks(jobInfo.id).then((response) => {
if (response.code === 200) {
this.getList()
this.$message({
message: '删除成功',
type: 'success'
})
this.msgSuccess('删除成功')
}
})
})
@@ -466,10 +494,7 @@ export default {
}).then((res) => {
runTasks(jobInfo.id).then((res) => {
if (res.code === 200) {
this.$message({
message: '执行成功',
type: 'success'
})
this.msgSuccess('执行成功')
this.getList()
}
})
@@ -482,10 +507,7 @@ export default {
if (this.form.id !== undefined) {
updateTasks(this.form).then((response) => {
if (response.code === 200) {
this.$message({
message: '修改成功',
type: 'success'
})
this.msgSuccess('修改成功')
this.open = false
this.getList()
}
@@ -493,10 +515,7 @@ export default {
} else {
createTasks(this.form).then((response) => {
if (response.code === 200) {
this.$message({
message: '新增成功',
type: 'success'
})
this.msgSuccess('新增成功')
this.open = false
this.getList()
}
@@ -524,7 +543,8 @@ export default {
beginTime: undefined,
endTime: undefined,
intervalSecond: 1,
cron: undefined
cron: undefined,
taskType: 1
}
this.resetForm('form')
},

9
ZR.Vue/src/views/system/user/index.vue
View File

@@ -41,14 +41,10 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:user:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:user:remove']">删除</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
</el-col>
@@ -59,7 +55,6 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="编号" align="center" prop="userId" width="60" />
<el-table-column label="登录名" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />