Skip to content

S
saas-manage
Commit bea75be0 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !58
parents a444ff77 4969e6d2
Showing with 539 additions and 109 deletions
src/common/api/axios.js
...@@ -71,15 +71,17 @@ axios.interceptors.response.use( ...@@ -71,15 +71,17 @@ axios.interceptors.response.use(
} }
return Promise.reject(res.data) return Promise.reject(res.data)
} else if (res.data.code === 500) { } else if (res.data.code === 500) {
Vue.prototype.$alert( Vue.prototype
'<div style="max-height:500px;overflow:auto">' + .$alert(
res.data.message + '<div style="max-height:500px;overflow:auto">' +
'</div>', res.data.message +
'错误提示', '</div>',
{ '错误提示',
dangerouslyUseHTMLString: true {
} dangerouslyUseHTMLString: true
) }
)
.catch(() => {})
} }
} else { } else {
if (res.status === 400) { if (res.status === 400) {
......
src/common/components/base/CustomForm.vue
<script> <script lang="jsx">
export default { export default {
name: 'CustomForm', name: 'CustomForm',
components: {}, components: {},
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
}, },
formLabelWidth: { formLabelWidth: {
type: String, type: String,
default: '50px' default: null
}, },
formItemWidth: { formItemWidth: {
type: String, type: String,
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
} }
}, },
created() { created() {
// console.log(104, this.formData) console.log(104, this.formLabelWidth)
}, },
render() { render() {
return ( return (
...@@ -124,6 +124,7 @@ export default { ...@@ -124,6 +124,7 @@ export default {
<el-input <el-input
v-model={this.formData[item.prop]} v-model={this.formData[item.prop]}
placeholder={item.placeholder || `请输入${item.name}`} placeholder={item.placeholder || `请输入${item.name}`}
show-password={item.password || false}
clearable></el-input> clearable></el-input>
)} )}
{item.type === 'textarea' && ( {item.type === 'textarea' && (
...@@ -131,17 +132,24 @@ export default { ...@@ -131,17 +132,24 @@ export default {
type="textarea" type="textarea"
v-model={this.formData[item.prop]} v-model={this.formData[item.prop]}
placeholder={item.placeholder || `请输入${item.name}`} placeholder={item.placeholder || `请输入${item.name}`}
maxlength={item.maxlength}
show-word-limit={!!item.maxlength}
clearable></el-input> clearable></el-input>
)} )}
{item.type === 'select' && ( {item.type === 'select' && (
<el-select <el-select
v-model={this.formData[item.prop]} v-model={this.formData[item.prop]}
{...{ attrs: item.attrs }}
onChange={(e) =>
item.events && item.events.onChange(this.formData, e)
}
placeholder={item.placeholder || `请选择${item.name}`} placeholder={item.placeholder || `请选择${item.name}`}
value-key={item.valueKey || 'value'}
clearable> clearable>
{item.options?.map((el, idx) => ( {item.options?.map((el, idx) => (
<el-option <el-option
label={el.label} label={el.label}
value={el.value} value={item.valueKey ? el : el.value}
key={idx}></el-option> key={idx}></el-option>
))} ))}
</el-select> </el-select>
...@@ -153,11 +161,13 @@ export default { ...@@ -153,11 +161,13 @@ export default {
placeholder="选择日期" placeholder="选择日期"
v-model={this.formData[item.prop]} v-model={this.formData[item.prop]}
clearable clearable
{...{ attrs: item.attrs }}
style="width: 100%;"></el-date-picker> style="width: 100%;"></el-date-picker>
)} )}
{item.type === 'radio' && {item.type === 'radio' &&
item.radioOptions?.map((el, idx) => ( item.radioOptions?.map((el, idx) => (
<el-radio <el-radio
{...{ attrs: item.attrs }}
v-model={this.formData[item.prop]} v-model={this.formData[item.prop]}
label={el.value} label={el.value}
key={idx}> key={idx}>
...@@ -167,7 +177,7 @@ export default { ...@@ -167,7 +177,7 @@ export default {
</el-form-item> </el-form-item>
))} ))}
{this.isCustomButton && ( {this.isCustomButton && (
<el-form-item> <el-form-item style="margin-right:5px">
<el-button <el-button
type="primary" type="primary"
onClick={this.search} onClick={this.search}
...@@ -179,7 +189,9 @@ export default { ...@@ -179,7 +189,9 @@ export default {
</el-button> </el-button>
</el-form-item> </el-form-item>
)} )}
{!this.isCustomButton && <slot name="btn"></slot>} {this.$slots.btn && (
<el-form-item> {this.$scopedSlots.btn()} </el-form-item>
)}
</el-form> </el-form>
) )
} }
......
src/main.js
...@@ -23,13 +23,9 @@ Vue.use(element) ...@@ -23,13 +23,9 @@ Vue.use(element)
Vue.use(vxeTable) Vue.use(vxeTable)
const clientWidth = document.body.clientWidth const clientWidth = document.body.clientWidth
const dpi = _.add( const dpi = _.add(_.ceil(_.divide(clientWidth / 1920)) + 0.5)
_.ceil(_.divide(clientWidth / 1920)) + 0.5,
)
let imagePath = '' let imagePath = ''
if ( if (md5(location.host) === '42f2b26039d7fd526b8a1d50bb329cbc') {
md5(location.host) === '42f2b26039d7fd526b8a1d50bb329cbc'
) {
localStorage.setItem('locationHost', location.host) localStorage.setItem('locationHost', location.host)
imagePath = zImgPath imagePath = zImgPath
} else if (zImgPath.indexOf('/erpimg') !== -1) { } else if (zImgPath.indexOf('/erpimg') !== -1) {
...@@ -41,14 +37,10 @@ Vue.prototype.setimgUrl = (url, options = {}) => { ...@@ -41,14 +37,10 @@ Vue.prototype.setimgUrl = (url, options = {}) => {
const { w, h, ...others } = options const { w, h, ...others } = options
let query = '' let query = ''
if (w) { if (w) {
query += query query += query ? '&w=' : 'w=' + _.floor(_.multiply(dpi * w))
? '&w='
: 'w=' + _.floor(_.multiply(dpi * w))
} }
if (h) { if (h) {
query += query query += query ? '&h=' : 'h=' + _.floor(_.multiply(dpi * h))
? '&h='
: 'h=' + _.floor(_.multiply(dpi * h))
} }
for (const key in others) { for (const key in others) {
query += `${query ? '&' : ''}${key}=${options[key]}` query += `${query ? '&' : ''}${key}=${options[key]}`
...@@ -70,6 +62,7 @@ router.afterEach((to, from) => { ...@@ -70,6 +62,7 @@ router.afterEach((to, from) => {
name: to.name, name: to.name,
path: to.fullPath, path: to.fullPath,
title: to.meta?.title || to.name, title: to.meta?.title || to.name,
meta: to.meta
}) })
store.commit('tags/setActive', to.name) store.commit('tags/setActive', to.name)
}) })
...@@ -87,5 +80,5 @@ router.beforeEach((to, form, next) => { ...@@ -87,5 +80,5 @@ router.beforeEach((to, form, next) => {
new Vue({ new Vue({
router, router,
store, store,
render: (h) => h(App), render: (h) => h(App)
}).$mount('#app') }).$mount('#app')
src/router/index.js
...@@ -79,6 +79,18 @@ const routes = [ ...@@ -79,6 +79,18 @@ const routes = [
meta: { title: '服务管理' } meta: { title: '服务管理' }
}, },
{ {
path: '/saas/sysSecuritySettings',
component: () => import('@/views/system/sysSecuritySettings.vue'),
name: 'system_security_settings',
meta: { title: '安全设置中心' }
},
{
path: '/saas/erpManagementList',
component: () => import('@/views/system/erpManagementList.vue'),
name: 'erpManagementList',
meta: { title: 'ERP启动列表' }
},
{
path: '/saas/countryCode', path: '/saas/countryCode',
component: () => import('@/views/system/countryCode.vue'), component: () => import('@/views/system/countryCode.vue'),
name: 'system_countryCode', name: 'system_countryCode',
...@@ -96,6 +108,7 @@ const routes = [ ...@@ -96,6 +108,7 @@ const routes = [
name: 'system_management', name: 'system_management',
meta: { title: '客户管理' } meta: { title: '客户管理' }
}, },
{ {
path: '/saas/user/recharge-record', path: '/saas/user/recharge-record',
component: () => import('@/views/user/rechargeRecord.vue'), component: () => import('@/views/user/rechargeRecord.vue'),
...@@ -151,6 +164,12 @@ const routes = [ ...@@ -151,6 +164,12 @@ const routes = [
meta: { title: '异常消息' } meta: { title: '异常消息' }
}, },
{ {
path: '/operation/asynchronousTask',
component: () => import('@/views/operation/asynchronousTask.vue'),
name: 'asynchronousTask',
meta: { title: '异步任务' }
},
{
path: '/saas/production/assistant/manage', path: '/saas/production/assistant/manage',
component: () => import('@/views/production/AssistantManage.vue'), component: () => import('@/views/production/AssistantManage.vue'),
name: 'production_assistant_manage', name: 'production_assistant_manage',
......
src/store/tags.js
const lastSavedTags = localStorage.getItem('tags') ? JSON.parse(localStorage.getItem('tags')) || [] : [] const HOME_TAG = { name: 'home', path: '/saas/home', title: '首页', id: 0 }
let tagId = lastSavedTags.reduce( const lastSavedTags = localStorage.getItem('tags')
(a, c) => Math.max(a, c.id), ? JSON.parse(localStorage.getItem('tags')) || []
0, : []
) let tagId = lastSavedTags.reduce((a, c) => Math.max(a, c.id), 0)
// 确保首页始终在第一位
function ensureHomeFirst(tags) {
const filtered = tags.filter((t) => t.name !== 'home')
return [HOME_TAG, ...filtered]
}
console.log(lastSavedTags) console.log(lastSavedTags)
/** /**
* @type {import('vuex').StoreOptions} * @type {import('vuex').StoreOptions}
...@@ -10,32 +15,29 @@ console.log(lastSavedTags) ...@@ -10,32 +15,29 @@ console.log(lastSavedTags)
const tags = { const tags = {
namespaced: true, namespaced: true,
state: { state: {
tags: lastSavedTags || [], tags: ensureHomeFirst(lastSavedTags),
activeTag: undefined, activeTag: undefined
}, },
getters: { getters: {
currentTag(state) { currentTag(state) {
return state.tags.find( return state.tags.find((e) => e.name === state.activeTag)
(e) => e.name === state.activeTag, }
)
},
}, },
mutations: { mutations: {
add(state, tag) { add(state, tag) {
// 禁止添加重复首页tag
if (tag.name === 'home') return HOME_TAG.id
const item = { const item = {
...tag, ...tag,
id: ++tagId, id: ++tagId
} }
const index = state.tags.findIndex( const index = state.tags.findIndex((t) => t.name === tag.name)
(t) => t.name === tag.name,
)
if (index === -1) { if (index === -1) {
state.tags.push(item) state.tags.push(item)
} }
localStorage.setItem( // 始终保证首页在第一位
'tags', state.tags = ensureHomeFirst(state.tags)
JSON.stringify(state.tags), localStorage.setItem('tags', JSON.stringify(state.tags))
)
return item.id return item.id
}, },
setActive(state, name) { setActive(state, name) {
...@@ -43,9 +45,9 @@ const tags = { ...@@ -43,9 +45,9 @@ const tags = {
state.activeTag = name state.activeTag = name
}, },
remove(state, name) { remove(state, name) {
const index = state.tags.findIndex( // 禁止移除首页tag
(e) => e.name === name, if (name === 'home') return
) const index = state.tags.findIndex((e) => e.name === name)
if (index === -1) return if (index === -1) return
state.tags.splice(index, 1) state.tags.splice(index, 1)
...@@ -60,15 +62,12 @@ const tags = { ...@@ -60,15 +62,12 @@ const tags = {
} }
} }
localStorage.setItem( localStorage.setItem('tags', JSON.stringify(state.tags))
'tags',
JSON.stringify(state.tags),
)
}, },
removeAllTags(state) { removeAllTags(state) {
state.tags = [] state.tags = []
}, }
}, }
} }
export default tags export default tags
src/views/home/HomeView.vue
...@@ -22,18 +22,29 @@ export default { ...@@ -22,18 +22,29 @@ export default {
name: 'HomeView', name: 'HomeView',
components: { components: {
NavMenu, NavMenu,
HomeHeader, HomeHeader
}, },
computed: { computed: {
...mapState('tags', ['tags']), ...mapState('tags', ['tags']),
cacheView() { cacheView() {
// 在router中meta.keepAlive设置为true才能开启缓存
const arr = [] const arr = []
return arr.concat(this.tags.map((item) => item.name)) return arr.concat(
}, this.tags
.map((item) => {
if (item.meta && item.meta.keepAlive) {
return item.name
}
return null
})
.filter((el) => el !== null)
)
}
}, },
data() { data() {
return {} return {}
}, }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/home/navMenu.vue
...@@ -229,55 +229,7 @@ export default { ...@@ -229,55 +229,7 @@ export default {
index: '/saas/taskManage', index: '/saas/taskManage',
children: [] children: []
}, },
{
id: 2,
path: '',
label: '系统管理',
icon: 'el-icon-setting',
index: '/system',
children: [
{
id: 1,
path: '',
label: '用户管理',
icon: 'el-icon-s-order',
index: 'user',
children: []
},
{
id: 2,
path: '',
label: '角色管理',
icon: 'el-icon-s-order',
index: 'user',
children: []
},
{
id: 3,
path: '',
label: '定时任务',
icon: 'el-icon-message-solid',
index: '/saas/timed_task',
children: []
},
{
id: 4,
path: '',
label: '公告管理',
icon: 'el-icon-s-promotion',
index: '/saas/announceManage',
children: []
},
{
id: 5,
path: '',
label: '服务管理',
icon: 'el-icon-s-order',
index: '/saas/services',
children: []
}
]
},
{ {
id: 5, id: 5,
path: '', path: '',
...@@ -384,6 +336,14 @@ export default { ...@@ -384,6 +336,14 @@ export default {
children: [] children: []
}, },
{ {
id: 6_2,
path: '',
label: '异步任务',
icon: 'el-icon-postcard',
index: '/operation/asynchronousTask',
children: []
},
{
id: 9, id: 9,
path: '', path: '',
label: 'sql执行工具', label: 'sql执行工具',
...@@ -433,6 +393,63 @@ export default { ...@@ -433,6 +393,63 @@ export default {
icon: 'el-icon-suitcase-1', icon: 'el-icon-suitcase-1',
index: '/saas/production/assistant/manage', index: '/saas/production/assistant/manage',
children: [] children: []
},
{
id: 9,
path: '',
label: '系统管理',
icon: 'el-icon-setting',
index: '/system',
children: [
{
id: 1,
path: '',
label: '用户管理',
icon: 'el-icon-s-order',
index: 'user',
children: []
},
{
id: 2,
path: '',
label: '角色管理',
icon: 'el-icon-s-order',
index: 'user',
children: []
},
{
id: 3,
path: '',
label: '定时任务',
icon: 'el-icon-message-solid',
index: '/saas/timed_task',
children: []
},
{
id: 4,
path: '',
label: '公告管理',
icon: 'el-icon-s-promotion',
index: '/saas/announceManage',
children: []
},
{
id: 5,
path: '',
label: '服务管理',
icon: 'el-icon-s-order',
index: '/saas/services',
children: []
},
{
id: 7,
path: '',
label: '安全设置中心',
icon: 'el-icon-lock',
index: '/saas/sysSecuritySettings',
children: []
}
]
} }
], ],
msg_list: [], msg_list: [],
......
src/views/operation/asynchronousTask.vue 0 → 100644
<template>
<div class="recharge-record card">
<div class="search">
<CustomForm
:formConfig="queryformConfig"
v-model="queryFormData"
:isCustomButton="false"
:isFlex="false">
<template slot="btn">
<el-button type="primary" icon="el-icon-search" @click="search">
查询
</el-button>
</template>
</CustomForm>
</div>
<div class="table_wrap" v-loading="loading">
<table-vue
:sourceData="sourceData"
ref="multipleTable"
:tableColumns="usersTableColumns"></table-vue>
</div>
<div class="pagination">
<el-pagination
layout="sizes, total, prev, pager, next, jumper"
background
:total="paginationOptions.total"
:page-size="paginationOptions.pageSize"
:current-page="paginationOptions.currentPage"
@size-change="sizeChange"
@current-change="onCurrentChange"></el-pagination>
</div>
</div>
</template>
<script>
import axios from '../../common/api/axios'
import CustomForm from '@/common/components/base/CustomForm.vue'
import { mapState } from 'vuex'
import tableVue from '@/common/components/base/tableView.vue'
export default {
name: 'asynchronousTask',
components: {
tableVue,
CustomForm
},
data() {
return {
is_title: 1,
ishowForm: false,
select: '',
sourceData: [],
serviceNameList: { sysService: '系统服务同步' },
formData: {},
queryFormData: {},
queryformConfig: [
{
prop: 'timeRange',
type: 'datePicker',
dateType: 'datetimerange',
name: ' 提交时间',
attrs: {
'start-placeholder': '开始时间',
'end-placeholder': '结束时间',
'value-format': 'yyyy-MM-dd HH:mm:ss',
'default-time': ['00:00:00', '23:59:59']
}
},
{
prop: 'runStatus',
type: 'select',
name: '状态',
options: [
{ label: '进行中', value: 0 },
{ label: '完成', value: 1 },
{ label: '失败', value: 2 }
]
}
],
dialogVisible: false,
formId: null,
paginationOptions: {
pageSize: 100,
currentPage: 1,
total: 0
},
details: [],
loading: false
}
},
async created() {
// await this.getServiceNameList()
this.getList()
},
computed: {
...mapState(['reqMenu', 'employee']),
usersTableColumns() {
return [
{
label: '任务类型',
key: 'taskType',
render: (item) => <span>{this.serviceNameList[item.taskType]}</span>
},
{
label: '任务标题',
key: 'taskTitle',
width: ''
},
{
label: '异常信息',
key: 'exceptionMsg',
width: ''
},
{
label: '状态',
key: 'runStatus',
width: '',
render: (item) => (
<span class={['text', this.getColor(item.runStatus)]}>
{item.runStatus === 0
? '进行中'
: item.runStatus === 1
? '完成'
: '失败'}
</span>
)
},
{
label: '操作人',
key: 'operatorName',
width: '100'
},
{
label: '提交时间',
key: 'submitTime',
width: ''
},
{
label: '开始时间',
key: 'startTime',
width: ''
},
{
label: '结束时间',
key: 'endTime',
width: '100'
},
{
label: '相关操作',
key: '',
fixed: 'right',
width: '130',
render: (item) =>
(item.runStatus !== 1 && (
<div>
<span
title="重新发送"
class="icon-view resendMsg"
onClick={() => this.resendMsg(item.id)}>
<i class="el-icon-s-promotion"></i>
</span>
</div>
)) ||
''
}
]
}
},
methods: {
sizeChange(value) {
this.paginationOptions.pageSize = value
this.getList()
},
onCurrentChange(value) {
this.paginationOptions.currentPage = value
this.getList()
},
selectionChange(selection) {
if (selection.length > 0) {
this.select = selection
}
},
search() {
if (this.queryFormData.timeRange && this.queryFormData.timeRange.length) {
this.queryFormData.minSubmitTime = this.queryFormData.timeRange[0]
this.queryFormData.maxSubmitTime = this.queryFormData.timeRange[1]
}
this.getList()
},
// 查询
getList() {
this.loading = true
const { pageSize, currentPage } = this.paginationOptions
axios
.post('sys/syncTaskLog/list_page ', {
pageSize,
currentPage,
...this.queryFormData
})
.then((res) => {
if (res.code === 200) {
this.sourceData = res.data.records
this.paginationOptions.total = res.data.total
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true
})
}
this.loading = false
})
},
async resendMsg(id) {
const params = { id }
try {
this.$confirm('确认发送？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
await axios.get('sys/syncTaskLog/retry_send', { params })
this.$message.success('发送成功')
this.getList()
})
.catch(() => {
this.$message.warning('取消发送')
})
} catch (error) {
console.log(error)
this.$message.warning(error.message)
} finally {
this.loading = false
}
},
getColor(status) {
if (status === 0) {
return 'afootStatus'
} else if (status === 1) {
return 'successStatus'
} else {
return 'failStatus'
}
}
}
}
</script>
<style scoped lang="less">
.wraper {
display: flex;
flex-direction: column;
height: 100%;
}
.table_wrap {
flex: 1;
padding: 0;
}
.circle {
display: inline-block;
height: 10px;
width: 10px;
border-radius: 5px;
margin-right: 5px;
}
.my-table .first {
background-color: red !important;
color: #fff !important;
}
::v-deep.switchStyle .el-switch__label {
position: absolute;
display: none;
color: #fff;
span {
font-size: 12px !important;
}
}
.el-switch__core {
background-color: rgba(166, 166, 166, 1);
}
::v-deep.switchStyle .el-switch__label--left {
z-index: 9;
left: 20px;
}
::v-deep.switchStyle .el-switch__label--right {
z-index: 9;
right: 20px;
}
::v-deep.switchStyle .el-switch__label.is-active {
display: block;
}
::v-deep.switchStyle.el-switch .el-switch__core,
.el-switch .el-switch__label {
width: 50px !important;
}
.resendMsg {
background-color: #ff9900;
&:hover {
background-color: #ffd36a;
}
}
.text {
color: #fff;
border-radius: 4px;
padding: 1px 5px;
}
.afootStatus {
background-color: #409eff;
}
.successStatus {
background-color: #67c23a;
}
.failStatus {
background-color: #f56c6c;
}
.recharge-record {
height: 100%;
overflow: hidden;
display: flex;
flex-direction: column;
&::v-deep {
.el-table .el-table__cell {
padding: 6px 0;
}
.el-input__inner {
padding: 0 4px;
}
.el-input--small .el-input__inner {
height: 30px;
line-height: 30px;
}
.el-icon-time:before {
content: '';
}
.el-dialog__footer {
text-align: center;
.el-button--small {
padding: 9px 50px;
}
}
.el-dialog__body {
padding: 10px 20px;
}
.el-icon-edit:before {
color: #ff9800;
font-weight: bold;
}
.el-range-editor--small .el-range-separator {
line-height: 31px;
}
.header-row-class-name th {
background-color: #f8f8f9;
}
.el-input-group__append {
padding-left: 0;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment