提交 c535af5e 编写于 作者: 刘英杰's avatar 刘英杰

测试提交

上级 ef5a8053
# 所有环境默认 # 所有环境默认
# 页面 title # 页面 title
VUE_APP_TITLE=竞赛管理系统 VUE_APP_TITLE=竞赛管理
文件已添加
无法预览此类型文件
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "^7.2.0", "@babel/runtime": "^7.2.0",
"@vue-office/pdf": "^1.5.4", "@vue-office/pdf": "^1.5.4",
"animate.css": "^4.1.1",
"axios": "^0.18.0", "axios": "^0.18.0",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"dayjs": "^1.8.9", "dayjs": "^1.8.9",
...@@ -3117,6 +3118,11 @@ ...@@ -3117,6 +3118,11 @@
"integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==", "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
"dev": true "dev": true
}, },
"node_modules/animate.css": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
},
"node_modules/ansi-colors": { "node_modules/ansi-colors": {
"version": "3.2.4", "version": "3.2.4",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
...@@ -24602,6 +24608,11 @@ ...@@ -24602,6 +24608,11 @@
"integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==", "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
"dev": true "dev": true
}, },
"animate.css": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
},
"ansi-colors": { "ansi-colors": {
"version": "3.2.4", "version": "3.2.4",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "^7.2.0", "@babel/runtime": "^7.2.0",
"@vue-office/pdf": "^1.5.4", "@vue-office/pdf": "^1.5.4",
"animate.css": "^4.1.1",
"axios": "^0.18.0", "axios": "^0.18.0",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"dayjs": "^1.8.9", "dayjs": "^1.8.9",
......
...@@ -508,12 +508,20 @@ export function GetFlowDesignList(data) { ...@@ -508,12 +508,20 @@ export function GetFlowDesignList(data) {
export function GetFlowTaskList(data) { export function GetFlowTaskList(data) {
//待办流程 //待办流程
return request({ return request({
url: `/api/FlowView/api/FlowView/GetFlowTaskList?page_index=${data.page_index}&page_size=${data.page_size}`, url: `/api/FlowView/api/FlowView/GetFlowTaskList?page_index=${data.page_index}&page_size=${data.page_size}&flow_id=${data.flow_id}`,
method: 'get', method: 'get',
data data
}); });
} }
export function GetFlowIdSelect(data) {
//待办流程
return request({
url: `/api/FlowView/api/Flow/GetFlowIdSelect`,
method: 'get',
data
});
}
export function GetMyFlowTaskList(data) { export function GetMyFlowTaskList(data) {
//我的流程 //我的流程
...@@ -1095,3 +1103,231 @@ export function CertificateExportToExcel(data) { ...@@ -1095,3 +1103,231 @@ export function CertificateExportToExcel(data) {
}); });
} }
/**
* common
* 赛事批次和赛事目录
* **/
export function GetBatchList(data) {
//获取批次列表
return request({
url: `/api/Common/GetBatchList?page_index=${data.page_index}&page_size=${data.page_size}`,
method: 'get',
data,
});
}
export function BatchSave(data) {
//保存批次
return request({
url: `/api/Common/BatchSave`,
method: 'post',
data
});
}
export function BatchDel(data) {
//删除批次
return request({
url: `/api/Common/BatchDel?id=${data.id}`,
method: 'get',
data,
});
}
export function GetBatchBySelect(data) {
//获取批次下拉框
return request({
url: `/api/Common/GetBatchBySelect`,
method: 'get',
data,
});
}
export function GetTypeList(data) {
//赛事类型列表
return request({
url: `/api/Common/GetTypeList`,
method: 'get',
data,
});
}
export function GetTypeBySelect(data) {
//获取赛事类型下拉框
return request({
url: `/api/Common/GetTypeBySelect`,
method: 'get',
data,
});
}
export function TypeSave(data) {
//保存赛事类型
return request({
url: `/api/Common/TypeSave`,
method: 'post',
data,
});
}
export function TypeDel(data) {
//删除赛事类型
return request({
url: `/api/Common/TypeDel?id=${data.id}`,
method: 'get',
data,
});
}
export function GetLevelList(data) {
//获取赛事级别列表
return request({
url: `/api/Common/GetLevelList`,
method: 'get',
data,
});
}
export function GetLevelBySelect(data) {
//获取赛事下拉框
return request({
url: `/api/Common/GetLevelBySelect`,
method: 'get',
data,
});
}
export function LevelSave(data) {
//保存赛事级别
return request({
url: `/api/Common/LevelSave`,
method: 'post',
data,
});
}
export function LevelDel(data) {
//删除赛事级别
return request({
url: `/api/Common/LevelDel?id=${data.id}`,
method: 'get',
data,
});
}
export function GetReportImportTemplate(data) {
//赛事模板下载
return request({
url: `/api/CompetitionReport/api/CompetitionReport/GetReportImportTemplate`,
method: 'get',
data,
});
}
export function ReportImport(data) {
//模板导入
return request({
url: `/api/CompetitionReport/api/Competition/ReportImport`,
method: 'post',
data,
});
}
export function ReportChangeById(data) {
//赛事带出字段-根据id
return request({
url: `/api/CompetitionReport/api/CompetitionReport/ReportChangeById?id=${data.id}`,
method: 'get',
data,
});
}
export function GetCodeList(data) {
//获取赛项
return request({
url: `/api/CompetitionReport/api/Competition/GetCodeList?condition=${data.condition}&page_index=${data.page_index}&page_size=${data.page_size}`,
method: 'get',
data,
});
}
export function GetStudentListToMembers(data) {
//报名添加团队 学生列表
return request({
url: `/api/Team/api/Team/GetStudentListToMembers?condition=${data.condition}&page_index=${data.page_index}&page_size=${data.page_size}&signid=${data.signid}`,
method: 'get',
data,
});
}
export function GetTeacherListToMembers(data) {
//报名添加团队 教师列表
return request({
url: `/api/Team/api/Team/GetTeacherListToMembers?condition=${data.condition}&page_index=${data.page_index}&page_size=${data.page_size}&signid=${data.signid}`,
method: 'get',
data,
});
}
export function MembersIns(data) {
//报名团队添加成员
return request({
url: `/api/Team/api/Team/MembersIns`,
method: 'post',
data,
});
}
export function TeamAndMemberSel(data) {
//初始化团队成员
return request({
url: `/api/Team/api/Team/TeamAndMemberSel?signid=${data.signid}`,
method: 'get',
data,
});
}
export function TeamAndMemberIns(data) {
//创还能团队
return request({
url: `/api/Team/api/Team/TeamAndMemberIns`,
method: 'post',
data,
});
}
export function ReportChangeByCode(data) {
//初始化团队成员
return request({
url: `/api/CompetitionReport/api/CompetitionReport/ReportChangeByCode?code=${data.code}`,
method: 'get',
data,
});
}
export function GetUserRoleDeptInfo(data) {
//获取用户的权限和院系
return request({
url: `/api/UserInfo/api/UserInfo/GetUserRoleDeptInfo?userid=${data.userid}`,
method: 'get',
data,
});
}
export function UserRoleDeptSave(data) {
//保存用户权限和院系
return request({
url: `/api/UserInfo/api/UserInfo/UserRoleDeptSave`,
method: 'post',
data,
});
}
export function GetFlowLogList(data) {
//获取用户的权限和院系
return request({
url: `/api/FlowView/api/FlowView/GetFlowLogList?form_id=${data.form_id}`,
method: 'get',
data,
});
}
<template> <template>
<div class="i-quill" :class="classes"> <div class="i-quill" :class="classes">
<div ref="editor" :style="styles"></div> <div ref="editor" :style="styles"></div>
</div> </div>
</template> </template>
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
props: { props: {
value: { value: {
type: String, type: String,
default: '' default: '',
}, },
border: { border: {
type: Boolean, type: Boolean,
......
import {Modal, Message, Spin} from "view-design"; import {Message, Modal, Spin} from "view-design";
import Vue from "vue"; import Cookies from "js-cookie";
export function publicConfirm(publicFunction) { export function publicConfirm(publicFunction) {
// 公共弹窗删除 // 公共弹窗删除
...@@ -47,13 +47,12 @@ export function storageAddEventListener(fun) { ...@@ -47,13 +47,12 @@ export function storageAddEventListener(fun) {
} }
export async function myEncapsulationFunction(fun) { export async function myEncapsulationFunction(fun) {
// Spin.show() // Spin.show()
let res = await fun() let res = await fun()
try { try {
switch (res.code) { switch (res.code) {
case 1 : case 1 :
Message['success']({ Message['success']({
background: true, background: true,
content: res.msg content: res.msg
...@@ -77,3 +76,28 @@ export async function myEncapsulationFunction(fun) { ...@@ -77,3 +76,28 @@ export async function myEncapsulationFunction(fun) {
}); });
} }
} }
export function getInitListRequest(fun) {
try {
fun()
return false
} catch (e) {
Message['error']({
background: true,
content: e
})
return false
}
}
export function getUserRole() {
if (Cookies.get('admin-competition-userinfo')) {
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
return info ? info.role[0].split('').includes('员') : false
} else {
return false
}
}
<template> <template>
<div> <div>
<div class="i-layout-sider-logo" :class="{ 'i-layout-sider-logo-dark': siderTheme === 'dark' }"> <div class="i-layout-sider-logo" :class="{ 'i-layout-sider-logo-dark': siderTheme === 'dark' }">
<transition name="fade-quick"> <transition name="fade-quick">
<i-link to="/" v-show="!hideLogo"> <i-link to="/" v-show="!hideLogo">
<!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse"> <!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse">
<img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'"> <img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'">
<img src="@/assets/images/logo-dark.png" v-else> --> <img src="@/assets/images/logo-dark.png" v-else> -->
<h1>竞赛管理系统</h1> <h1>竞赛管理</h1>
</i-link> </i-link>
</transition> </transition>
</div>
<Menu
ref="menu"
class="i-layout-menu-side i-scrollbar-hide"
:class="{ 'i-layout-menu-side-collapse': menuCollapse }"
:theme="siderTheme"
:accordion="menuAccordion"
:active-name="activePath"
:open-names="openNames"
width="auto">
<template v-if="!menuCollapse" v-for="(item, index) in filterSider">
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index" />
<i-menu-side-submenu v-else :menu="item" :key="index" />
</template>
<template v-else>
<Tooltip :content="tTitle(item.title)" placement="right" v-if="item.children === undefined || !item.children.length" :key="index">
<i-menu-side-item :menu="item" hide-title />
</Tooltip>
<i-menu-side-collapse v-else :menu="item" :key="index" top-level />
</template>
</Menu>
</div> </div>
<Menu
ref="menu"
class="i-layout-menu-side i-scrollbar-hide"
:class="{ 'i-layout-menu-side-collapse': menuCollapse }"
:theme="siderTheme"
:accordion="menuAccordion"
:active-name="activePath"
:open-names="openNames"
width="auto">
<template v-if="!menuCollapse" v-for="(item, index) in filterSider">
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index"/>
<i-menu-side-submenu v-else :menu="item" :key="index"/>
</template>
<template v-else>
<Tooltip :content="tTitle(item.title)" placement="right"
v-if="item.children === undefined || !item.children.length" :key="index">
<i-menu-side-item :menu="item" hide-title/>
</Tooltip>
<i-menu-side-collapse v-else :menu="item" :key="index" top-level/>
</template>
</Menu>
</div>
</template> </template>
<script> <script>
import iMenuSideItem from './menu-item'; import iMenuSideItem from './menu-item';
import iMenuSideSubmenu from './submenu'; import iMenuSideSubmenu from './submenu';
import iMenuSideCollapse from './menu-collapse'; import iMenuSideCollapse from './menu-collapse';
import tTitle from '../mixins/translate-title'; import tTitle from '../mixins/translate-title';
import { mapState, mapGetters } from 'vuex'; import {mapState, mapGetters} from 'vuex';
// 元素是否在可视区域 // 元素是否在可视区域
function isElementInViewport (el) { function isElementInViewport(el) {
let rect = el.getBoundingClientRect(); let rect = el.getBoundingClientRect();
return (rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth)); return (rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth));
} }
export default { export default {
name: 'iMenuSide', name: 'iMenuSide',
mixins: [ tTitle ], mixins: [tTitle],
components: { iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse }, components: {iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse},
props: { props: {
hideLogo: { hideLogo: {
type: Boolean, type: Boolean,
default: false default: false
} }
}, },
computed: { computed: {
...mapState('admin/layout', [ ...mapState('admin/layout', [
'siderTheme', 'siderTheme',
'menuAccordion', 'menuAccordion',
'menuCollapse' 'menuCollapse'
]), ]),
...mapState('admin/menu', [ ...mapState('admin/menu', [
'activePath', 'activePath',
'openNames' 'openNames'
]), ]),
...mapGetters('admin/menu', [ ...mapGetters('admin/menu', [
'filterSider' 'filterSider'
]), ]),
}, },
watch: { watch: {
'$route': { '$route': {
handler () { handler() {
this.handleUpdateMenuState(); this.handleUpdateMenuState();
}, },
immediate: true immediate: true
}, },
// 在展开/收起侧边菜单栏时,更新一次 menu 的状态 // 在展开/收起侧边菜单栏时,更新一次 menu 的状态
menuCollapse () { menuCollapse() {
this.handleUpdateMenuState(); this.handleUpdateMenuState();
} }
}, },
methods: { methods: {
handleUpdateMenuState () { handleUpdateMenuState() {
this.$nextTick(() => { this.$nextTick(() => {
if (this.$refs.menu) { if (this.$refs.menu) {
this.$refs.menu.updateActiveName(); this.$refs.menu.updateActiveName();
if (this.menuAccordion) this.$refs.menu.updateOpened(); if (this.menuAccordion) this.$refs.menu.updateOpened();
// 聚焦当前项 // 聚焦当前项
this.$nextTick(() => { this.$nextTick(() => {
const $activeMenu = document.getElementsByClassName('ivu-menu-item ivu-menu-item-active ivu-menu-item-selected'); const $activeMenu = document.getElementsByClassName('ivu-menu-item ivu-menu-item-active ivu-menu-item-selected');
if ($activeMenu && $activeMenu.length && !isElementInViewport($activeMenu[0])) { if ($activeMenu && $activeMenu.length && !isElementInViewport($activeMenu[0])) {
const activeMenuTop = $activeMenu[0].getBoundingClientRect().top; const activeMenuTop = $activeMenu[0].getBoundingClientRect().top;
const $menu = this.$refs.menu.$el; const $menu = this.$refs.menu.$el;
setTimeout(() => { setTimeout(() => {
this.$ScrollTop($menu, { this.$ScrollTop($menu, {
to: activeMenuTop, to: activeMenuTop,
time: 0 time: 0
});
}, 300);
}
});
}
}); });
}, 300);
} }
});
} }
});
} }
}
}
</script> </script>
...@@ -41,14 +41,19 @@ import iFrame from '@/components/frame'; ...@@ -41,14 +41,19 @@ import iFrame from '@/components/frame';
// 参考 https://www.iviewui.com/docs/guide/theme // 参考 https://www.iviewui.com/docs/guide/theme
import './styles/index.less'; import './styles/index.less';
import './libs/iview-pro/iview-pro.css'; import './libs/iview-pro/iview-pro.css';
import 'animate.css';
import VuePDF from 'vue-pdf'; import VuePDF from 'vue-pdf';
import VueDocPreview from 'vue-doc-preview'; import VueDocPreview from 'vue-doc-preview';
import VueImagePreview from 'vue-image-preview'; import VueImagePreview from 'vue-image-preview';
import pdf from 'vue-pdf' import pdf from 'vue-pdf'
import Cookies from "js-cookie";
if (window) window.$t = (key, value) => i18n.t(key, value); if (window) window.$t = (key, value) => i18n.t(key, value);
Vue.prototype.protocolHost = 'https://asc.hnasct.cn' Vue.prototype.protocolHost = 'https://asc.hnasct.cn'
Vue.prototype.getUserRole = () => {
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
return info ? info.role[0].split('').includes('员') : false
}
Vue.use(plugins); Vue.use(plugins);
Vue.use(ViewUI, { Vue.use(ViewUI, {
......
import * as hooks from "@/hook";
const pre = '/eventCatalogue';
let value = () => {
return Number(hooks.getUserRole())
}
export default {
path: '3/',
title: '赛事审批',
header: 'home',
icon: 'md-checkmark-circle',
children: [
{
path: '/CompetitionSignForm?id=102&remark=CompetitionSign&entrance=flow',
title: '参赛报名',
},
{
path: `/flow-awaitDoneList`,
title: '待办流程',
auth: ['admin'],
},
{
path: `/flow-processedList`,
title: '已办流程',
auth: ['admin'],
},
{
path: `/flow-myFlowList`,
title: '我的流程'
}
]
}
import * as hooks from '@/hook/index'
const pre = '/eventCatalogue';
export default {
path: '7/',
title: '赛事目录',
header: 'home',
icon: 'md-list-box',
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `${pre}-directoryQuery`,
title: '目录查询',
},
{
path: `${pre}-eventApplication`,
title: '赛事申请'
},
]
}
const pre = '/eventStatistics';
export default {
path: '4/',
title: '赛事统计',
header: 'home',
icon: 'md-barcode',
auth: ['admin'],
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `/CompetitionSign`,
title: '报名列表',
},
]
}
...@@ -18,10 +18,10 @@ export default { ...@@ -18,10 +18,10 @@ export default {
path: `${pre}-processedList`, path: `${pre}-processedList`,
title: '已办流程' title: '已办流程'
}, },
{ // {
path: `${pre}-myFlowList`, // path: `${pre}-myFlowList`,
title: '我的流程' // title: '我的流程'
} // }
] ]
} }
......
import * as hooks from "@/hook";
const pre = '/gradeDeclaration';
export default {
path: '5/',
title: '成绩申报',
header: 'home',
icon: 'ios-open',
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `/CertificateForm?id=103&remark=Certificate&entrance=flow`,
title: '获奖材料上传',
},
{
path: `/BursaryForm?id=104&remark=Bursary&entrance=flow`,
title: '补助金申请',
},
]
}
const pre = '/systemConfiguration' const pre = '/systemConfiguration'
export default { const pre1 = '/flow';
import * as hooks from '@/hook/index'
let value = () => {
return Number(hooks.getUserRole())
}
export let config = {
path: '/', path: '/',
title: '系统配置', title: '系统配置',
header: 'home', header: 'home',
icon: 'md-flower', icon: 'md-flower',
// auth: ['ordinaryUser', 'admin'][Number(hooks.getUserRole() ? hooks.getUserRole() : false)],
// auth: ['ordinaryUser', 'admin'][1],
auth: ['admin'],
children: [ children: [
{
path: '/Bursary',
title: '补助金列表',
header: 'home',
icon: 'logo-usd'
},
{
path: '/Certificate',
title: '证书列表',
header: 'home',
icon: 'ios-paper'
},
{
path: '/competitionScore',
title: '竞赛成绩',
header: 'home',
icon: 'md-text'
},
{
path: '/9',
title: '流程集合',
header: 'home',
// icon: 'md-clock',
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `${pre1}-List`,
title: '流程列表'
},
// {
// path: `${pre1}-awaitDoneList`,
// title: '待办流程'
// },
// {
// path: `${pre1}-processedList`,
// title: '已办流程'
// },
// {
// path: `${pre1}-myFlowList`,
// title: '我的流程'
// }
]
},
{ {
path: `${pre}-flowDesign`, path: `${pre}-flowDesign`,
title: '流程设计管理', title: '流程设计管理',
}, },
{ // {
path: `${pre}-noticeManagement`, // path: `${pre}-noticeManagement`,
title: '竞赛公告管理', // title: '竞赛公告管理',
}, // },
{ {
path: `${pre}-approvalUserGroupManagement`, path: `${pre}-approvalUserGroupManagement`,
title: '审批用户组管理', title: '审批用户组管理',
...@@ -37,6 +90,7 @@ export default { ...@@ -37,6 +90,7 @@ export default {
path: `${pre}-log`, path: `${pre}-log`,
title: '日志', title: '日志',
// header:'home', // header:'home',
}
},
] ]
} }
import Vue from 'vue';
// 菜单,侧边栏 // 菜单,侧边栏
// import dashboard from './modules/dashboard' // import dashboard from './modules/dashboard'
import power from "./modules/power"; //权限 import power from "./modules/power"; //权限
...@@ -13,13 +14,20 @@ import coachingAppointment from "./modules/coachingAppointment"; //辅导预约 ...@@ -13,13 +14,20 @@ import coachingAppointment from "./modules/coachingAppointment"; //辅导预约
import faculty from "./modules/faculty"; //思政教职工 import faculty from "./modules/faculty"; //思政教职工
import politicalActivities from "./modules/politicalActivities"; //思政活动 import politicalActivities from "./modules/politicalActivities"; //思政活动
import teamManagement from "@/menu/modules/teamManagement"; import teamManagement from "@/menu/modules/teamManagement";
import systemConmfiguration from "@/menu/modules/systemConmfiguration"; import * as systemConmfiguration from "@/menu/modules/systemConmfiguration";
import Bursary from "@/menu/modules/Bursary"; import Bursary from "@/menu/modules/Bursary";
import Certificate from "@/menu/modules/Certificate"; import Certificate from "@/menu/modules/Certificate";
import CompetitionSign from "@/menu/modules/CompetitionSign"; import CompetitionSign from "@/menu/modules/CompetitionSign";
import flowassemble from "@/menu/modules/flowassemble"; import flowassemble from "@/menu/modules/flowassemble";
import competitionNotice from "@/menu/modules/competitionNotice"; import competitionNotice from "@/menu/modules/competitionNotice";
import competitionScore from "@/menu/modules/competitionScore"; import competitionScore from "@/menu/modules/competitionScore";
import eventCatalogue from "@/menu/modules/eventCatalogue";
import gradeDeclaration from "@/menu/modules/gradeDeclaration";
import eventStatistics from "@/menu/modules/eventStatistics";
import eventApproval from "@/menu/modules/eventApproval";
import * as hooks from "@/hook/index";
import {config} from "@/menu/modules/systemConmfiguration";
// 系统 // 系统
// import log from './modules/log'; // import log from './modules/log';
...@@ -27,13 +35,15 @@ import competitionScore from "@/menu/modules/competitionScore"; ...@@ -27,13 +35,15 @@ import competitionScore from "@/menu/modules/competitionScore";
export default [ export default [
// dashboard, // dashboard,
// log, // log,
{ eventCatalogue,
path: '/welcome',
title: '竞赛列表', // {
header: 'home', // path: '/welcome',
icon: 'ios-ribbon', // title: '竞赛列表',
custom: 'i-icon-demo i-icon-demo-i18n', // header: 'home',
}, // icon: 'ios-ribbon',
// custom: 'i-icon-demo i-icon-demo-i18n',
// },暂时不显示(或者不显示)
// power, // power,
// commonResources, // commonResources,
// privateResources, // privateResources,
...@@ -46,14 +56,20 @@ export default [ ...@@ -46,14 +56,20 @@ export default [
// coachingAppointment, // coachingAppointment,
// faculty, // faculty,
// politicalActivities // politicalActivities
CompetitionSign, eventApproval,
Bursary, gradeDeclaration,
Certificate, eventStatistics,
competitionNotice,
teamManagement, // CompetitionSign, 放到赛事统计
competitionScore, // Bursary,放到系统配置中
flowassemble, // Certificate,放到系统配置中
systemConmfiguration, // competitionNotice,删除
// teamManagement,删除
// competitionScore,放到系统配置中
// flowassemble, 流程集合放到系统配置中
systemConmfiguration.config,
]
];
此差异已折叠。
<template>
<div>
<Card>
<template v-slot:extra>
<ButtonGroup shape="circle">
<Button class="buttonFocus" @click="batchModal = true ;formValidate ={} ">添加赛事批次</Button>
</ButtonGroup>
</template>
<br>
<br>
<Table :columns="columns" :data="data" :loading="loading">
<template #bed_time={row}>
<span v-if="row.bed_time">
{{ row.bed_time.split(' 00:00')[0] + ' ~ ' + row.end_time.split(' 00:00')[0] }}
</span>
</template>
<template v-slot:action="{row}">
<a @click="edit(row)">编辑</a>
<!-- <a @click="edit1(row)" style="margin-left: 15px;">详细</a>-->
<Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel">
<a style="margin-left: 15px;color: red">删除</a>
</Poptip>
</template>
</Table>
<div style="height: 60px;display: flex;align-items: center;">
<Page
:total="init.total"
v-model="init.page_index"
show-total
show-sizer
:page-size="init.page_size"
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
</div>
</Card>
<Modal
:width="50"
v-model="batchModal"
title="添加赛事学年"
>
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="110">
<FormItem label="学年名称" prop="competitionbatch_name">
<Input v-model="formValidate.competitionbatch_name" placeholder="请输入学年名称"></Input>
</FormItem>
<FormItem label="竞赛起止时间" prop="dateRange">
<DatePicker v-model="formValidate.dateRange" type="daterange" placement="bottom-end"
@on-change="obtainingAcademicYearTime" placeholder="请选择竞赛起止时间" style="width: 100%"/>
</FormItem>
<FormItem label="备注" prop="remark">
<Input v-model="formValidate.remark" type="textarea" :autosize="{minRows: 5,maxRows: 5}"
placeholder="请输入备注"></Input>
</FormItem>
</Form>
<template #footer>
<Button type="text" @click="batchModal =false">关闭</Button>
<Button type="primary" @click="handleSubmit('formValidate')">确定</Button>
</template>
</Modal>
</div>
</template>
<script>
import * as api from '../../../api/requestUtils'
import * as hooks from '../../../hook/index'
import {getInitListRequest, myEncapsulationFunction} from "../../../hook/index";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {},
data() {
//这里存放数据",
return {
loading: false,
batchModal: false,
formValidate: {
competitionbatch_name: '',
dateRange: '',
remark: '',
"bed_time": "",
"end_time": "",
},
ruleValidate: {
competitionbatch_name: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
dateRange: [
{required: true, type: 'array', message: '此项不能为空', trigger: 'change'}
],
remark1: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
},
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: '学年',
key: 'competitionbatch_name',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '竞赛起止时间',
slot: 'bed_time',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '备注',
key: 'remark',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '操作',
align: 'center',
minWidth: 120,
// fixed: 'right',
show: true,
slot: 'action'
}
],
data: [],
theme: 'light'
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
BatchDel() {
},
importFile() {
},
edit(row) {
this.batchModal = true
let dateRange = row.bed_time && row.end_time ? [row.bed_time.split(' 00:00')[0], row.end_time.split(' 00:00')[0]] : []
this.formValidate = {
...row,
dateRange,
}
},
cancel() {
},
delCompetition(row) {
myEncapsulationFunction(async () => {
const res = await api.BatchDel({id: row.competitionbatchid})
this.GetBatchList()
return res
})
},
obtainingAcademicYearTime(e) {
this.formValidate.bed_time = e[0]
this.formValidate.end_time = e[1]
console.log("🚀🚀🚀,", e)
},
importOk() {
},
saveBatch() {
hooks.myEncapsulationFunction(async () => {
// let data = {
// "competitionbatchid": "",
// "competitionbatch_name": this.formValidate.competitionbatch_name,
// "bed_time": this.formValidate.bed_time,
// "end_time": this.formValidate.end_time,
// "remark": this.formValidate.remark,
// }
console.log("🚀🚀formValidate🚀,", this.formValidate)
let data = this.formValidate
const res = await api.BatchSave(data)
this.GetBatchList()
return res
})
},
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid && this.formValidate.dateRange[0] !== '') {
this.saveBatch()
this.batchModal = false
} else {
this.$Message.error('请完善必选项');
}
})
},
handleReset(name) {
this.$refs[name].resetFields();
},
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.GetBatchList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.GetBatchList()
},
GetBatchList() {
hooks.getInitListRequest(async () => {
this.loading = true
let data = {
page_index: this.init.page_index,
page_size: this.init.page_size
}
const res = await api.GetBatchList(data)
this.data = res.response.data
this.init.total = res.response.data_count
this.loading = false
})
}
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
this.GetBatchList()
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
.buttonFocus:focus {
background-color: #2D8CF0;
color: white;
}
</style>
<template>
<Card>
<h1>测试中...</h1>
</Card>
</template>
<script>
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {},
data() {
//这里存放数据",
return {
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: 'Name',
key: 'name'
},
{
title: 'Age',
key: 'age'
},
{
title: 'Address',
key: 'address'
}
],
data: [
{
name: 'John Brown',
age: 18,
address: 'New York No. 1 Lake Park',
date: '2016-10-03'
},
{
name: 'Jim Green',
age: 24,
address: 'London No. 1 Lake Park',
date: '2016-10-01'
},
{
name: 'Joe Black',
age: 30,
address: 'Sydney No. 1 Lake Park',
date: '2016-10-02'
},
{
name: 'Jon Snow',
age: 26,
address: 'Ottawa No. 2 Lake Park',
date: '2016-10-04'
}
],
theme: 'light'
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.getCompetitionSignList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.getCompetitionSignList()
},
aaa(e) {
console.log("🚀🚀11111111111111111🚀,", e)
}
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
</style>
<template>
<Card>
<Menu mode="horizontal" theme="light" @on-select="aaa" active-name="1">
<MenuItem name="1">
<Icon type="ios-people"/>
赛事目录维护
</MenuItem>
<MenuItem name="2" v-if="getUserRole()">
<Icon type="ios-paper"/>
批次管理
</MenuItem>
</Menu>
<br>
<component v-if="componentState === 1"
is="eventMatalogMaintenance"></component>
<component v-if="componentState === 2 "
is="batchManagement"></component>
<keep-alive>
</keep-alive>
</Card>
</template>
<script>
import eventMatalogMaintenance from './components/eventMatalogMaintenance.vue'
import batchManagement from './components/batchManagement.vue'
import {getUserRole} from "@/hook";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {eventMatalogMaintenance, batchManagement},
data() {
//这里存放数据",
return {
componentState: 1,
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: 'Name',
key: 'name'
},
{
title: 'Age',
key: 'age'
},
{
title: 'Address',
key: 'address'
}
],
data: [
{
name: 'John Brown',
age: 18,
address: 'New York No. 1 Lake Park',
date: '2016-10-03'
},
{
name: 'Jim Green',
age: 24,
address: 'London No. 1 Lake Park',
date: '2016-10-01'
},
{
name: 'Joe Black',
age: 30,
address: 'Sydney No. 1 Lake Park',
date: '2016-10-02'
},
{
name: 'Jon Snow',
age: 26,
address: 'Ottawa No. 2 Lake Park',
date: '2016-10-04'
}
],
theme: 'light'
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.getCompetitionSignList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.getCompetitionSignList()
},
aaa(e) {
this.componentState = Number(e)
}
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
</style>
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
<h3>流程待办列表</h3> <h3>流程待办列表</h3>
</div> </div>
</template> </template>
<template #extra>
<Select style="width: 15vw" @on-change="flowSelectOnChnage" placeholder="请选择流程名称">
<Option v-for="(item,index) in flowSelect" :key="index" :value="item.id">{{ item.name }}</Option>
</Select>
</template>
<!-- <Button type="primary" class="ivu-ml-8" @click="add">--> <!-- <Button type="primary" class="ivu-ml-8" @click="add">-->
<!-- <Icon type="md-add"/>--> <!-- <Icon type="md-add"/>-->
<!-- 新增--> <!-- 新增-->
...@@ -69,6 +74,7 @@ export default { ...@@ -69,6 +74,7 @@ export default {
data() { data() {
return { return {
flowSelect: [],
formData: { formData: {
name: '', name: '',
url: '', url: '',
...@@ -149,21 +155,21 @@ export default { ...@@ -149,21 +155,21 @@ export default {
minWidth: 200, minWidth: 200,
}, },
{ {
title: '当前节点待办人员', title: '人员名单',
slot: 'todo', slot: 'todo',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ {
title: '参与人', title: '人员名单',
slot: 'partcipant', slot: 'partcipant',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ {
title: '发起人', title: '发起人工号',
key: 'starter', key: 'starter',
align: 'center', align: 'center',
show: true, show: true,
...@@ -237,6 +243,7 @@ export default { ...@@ -237,6 +243,7 @@ export default {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
total: 0, total: 0,
flow_id: '',
}, },
pageKey: 1 pageKey: 1
} }
...@@ -263,14 +270,33 @@ export default { ...@@ -263,14 +270,33 @@ export default {
// this.GetFlowTaskList() // this.GetFlowTaskList()
// } // }
// }); // });
this.GetFlowIdSelect()
}, },
methods: { methods: {
flowSelectOnChnage(e) {
this.init.flow_id = e
this.GetFlowTaskList()
},
GetFlowIdSelect() {
hook.getInitListRequest(() => {
api.GetFlowIdSelect().then((res) => {
res.response.map((cur, index) => {
if (cur.id === '102') {
res.response.unshift(cur)
res.response.splice(index + 1, 1)
}
})
this.flowSelect = res.response
})
})
},
// 查询 // 查询
async GetFlowTaskList() { async GetFlowTaskList() {
this.loading = true this.loading = true
let data = { let data = {
page_index: this.init.page_index, page_index: this.init.page_index,
page_size: this.init.page_size page_size: this.init.page_size,
flow_id: this.init.flow_id,
} }
const res = await api.GetFlowTaskList(data) const res = await api.GetFlowTaskList(data)
this.init.total = res.response.data_count this.init.total = res.response.data_count
......
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
{{ item.name }}({{ item.card }}) {{ item.name }}({{ item.card }})
</Tag> </Tag>
</template> </template>
<template #is_match_dept="{row}">
<Tag :color="['warning','success'][row.is_match_dept]">
{{ ['否', '是'][row.is_match_dept] }}
</Tag>
</template>
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<a @click="edit(row)">编辑</a> <a @click="edit(row)">编辑</a>
...@@ -48,8 +54,16 @@ ...@@ -48,8 +54,16 @@
<FormItem label="审批组名称" prop="name"> <FormItem label="审批组名称" prop="name">
<Input v-model="formValidate.name" placeholder="请输入审批组名称"></Input> <Input v-model="formValidate.name" placeholder="请输入审批组名称"></Input>
</FormItem> </FormItem>
<FormItem label="是否匹配院系关系" prop="is_match_dept">
<Select v-model="formValidate.is_match_dept" placeholder="请选择是否匹配院系关系">
<Option v-for="(item,index) in whetherItMatchesTheFacultyRelationship" :key="index" :value="item.value">{{
item.label
}}
</Option>
</Select>
</FormItem>
<FormItem label="成员" prop="user"> <FormItem label="成员" prop="user">
<Select multiple v-model="formValidate.user" placeholder="成员"> <Select filterable multiple v-model="formValidate.user" placeholder="成员">
<Option v-for="(item,index) in formValidate.userArray" :key="index" :value="item.id">{{ <Option v-for="(item,index) in formValidate.userArray" :key="index" :value="item.id">{{
item.name item.name
}} }}
...@@ -65,15 +79,25 @@ ...@@ -65,15 +79,25 @@
<Modal <Modal
v-model="editModal" v-model="editModal"
title="编辑" title="编辑"
width="50"
> >
<Form ref="formValidate1" :model="formValidate" :rules="ruleValidate" :label-width="80"> <Form ref="formValidate1" :model="formValidate" :rules="ruleValidate" :label-width="80">
<FormItem label="审批组名称" prop="name"> <FormItem label="审批组名称" prop="name">
<Input v-model="formValidate.name" placeholder="审批组名称"></Input> <Input v-model="formValidate.name" placeholder="审批组名称"></Input>
</FormItem> </FormItem>
<FormItem label="是否匹配院系关系" prop="is_match_dept">
<Select v-model="formValidate.is_match_dept" placeholder="请选择是否匹配院系关系">
<Option v-for="(item,index) in whetherItMatchesTheFacultyRelationship" :key="index" :value="item.value">{{
item.label
}}
</Option>
</Select>
</FormItem>
</Form> </Form>
<div style="display: flex;justify-content: center"> <div style="display: flex;justify-content: center">
<Transfer <Transfer
:list-style="{width:'350px',height:'350px'}"
filterable
:key="tramsferKey" :key="tramsferKey"
:data="GroupUserInfo.unmember" :data="GroupUserInfo.unmember"
:target-keys="GroupUserInfo.member" :target-keys="GroupUserInfo.member"
...@@ -98,14 +122,28 @@ export default { ...@@ -98,14 +122,28 @@ export default {
name: 'list', name: 'list',
data() { data() {
return { return {
whetherItMatchesTheFacultyRelationship: [
{
label: '否',
value: 0,
},
{
label: '是',
value: 1,
},
],
tramsferKey: 1, tramsferKey: 1,
GroupUserInfo: {}, GroupUserInfo: [],
formValidate: { formValidate: {
name: '', name: '',
user: [], user: [],
userArray: [], userArray: [],
is_match_dept: 0,
}, },
ruleValidate: { ruleValidate: {
is_match_dept: [
{type: 'number', required: true, message: '此项不能为空', trigger: 'change'},
],
name: [ name: [
{type: 'string', required: true, message: '此项不能为空', trigger: 'blur'}, {type: 'string', required: true, message: '此项不能为空', trigger: 'blur'},
], ],
...@@ -151,11 +189,18 @@ export default { ...@@ -151,11 +189,18 @@ export default {
show: true, show: true,
minWidth: 150, minWidth: 150,
}, },
{
title: '是否匹配院系关系',
slot: 'is_match_dept',
align: 'center',
show: true,
minWidth: 150,
},
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
minWidth: 100, minWidth: 100,
fixed: 'right',
show: true, show: true,
slot: 'action' slot: 'action'
} }
...@@ -196,6 +241,7 @@ export default { ...@@ -196,6 +241,7 @@ export default {
return item.name; return item.name;
}, },
handleChange(newTargetKeys, direction, moveKeys) { handleChange(newTargetKeys, direction, moveKeys) {
switch (direction) { switch (direction) {
case 'left': case 'left':
moveKeys.map((c, i) => { moveKeys.map((c, i) => {
...@@ -203,6 +249,7 @@ export default { ...@@ -203,6 +249,7 @@ export default {
this.GroupUserInfo.member.splice(this.GroupUserInfo.member.indexOf(c), 1) this.GroupUserInfo.member.splice(this.GroupUserInfo.member.indexOf(c), 1)
} }
}) })
break; break;
case 'right': case 'right':
this.GroupUserInfo.member = newTargetKeys this.GroupUserInfo.member = newTargetKeys
...@@ -238,6 +285,7 @@ export default { ...@@ -238,6 +285,7 @@ export default {
let data = { let data = {
groupname: this.formValidate.name, groupname: this.formValidate.name,
"member": this.formValidate.user, "member": this.formValidate.user,
is_match_dept: this.formValidate.is_match_dept
} }
const res = await api.FlowUserGroupSave(data) const res = await api.FlowUserGroupSave(data)
hook.publicMessage(res) hook.publicMessage(res)
...@@ -253,7 +301,8 @@ export default { ...@@ -253,7 +301,8 @@ export default {
let data = { let data = {
"groupid": this.GroupUserInfo.groupid, "groupid": this.GroupUserInfo.groupid,
"groupname": this.formValidate.name, "groupname": this.formValidate.name,
"member": this.GroupUserInfo.member "member": this.GroupUserInfo.member,
is_match_dept: this.formValidate.is_match_dept,
} }
const res = await api.FlowUserGroupSave(data) const res = await api.FlowUserGroupSave(data)
if (res.code !== 1) { if (res.code !== 1) {
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
:width="80" :width="80"
@on-visible-change="closeNodeModal" @on-visible-change="closeNodeModal"
:closable="false" :closable="false"
:styles="{top:'10px'}"
> >
<template #header> <template #header>
<div style=" display: flex;justify-content: space-between;align-items: center"> <div style=" display: flex;justify-content: space-between;align-items: center">
...@@ -172,6 +173,7 @@ ...@@ -172,6 +173,7 @@
v-model="addNodeModal" v-model="addNodeModal"
title="新增节点" title="新增节点"
width="40" width="40"
:styles="{top:'10px'}"
> >
<Form ref="formValidate1" :model="formValidate1" :rules="ruleValidate" :label-width="130"> <Form ref="formValidate1" :model="formValidate1" :rules="ruleValidate" :label-width="130">
<FormItem label="当前节点名称" prop="nodename"> <FormItem label="当前节点名称" prop="nodename">
...@@ -220,6 +222,7 @@ ...@@ -220,6 +222,7 @@
v-model="addNodeModal1" v-model="addNodeModal1"
title="编辑节点" title="编辑节点"
width="40" width="40"
:styles="{top:'10px'}"
> >
<Form ref="formValidate2" :model="formValidate2" :rules="ruleValidate" :label-width="130"> <Form ref="formValidate2" :model="formValidate2" :rules="ruleValidate" :label-width="130">
<FormItem label="当前节点名称" prop="nodename"> <FormItem label="当前节点名称" prop="nodename">
...@@ -645,10 +648,11 @@ export default { ...@@ -645,10 +648,11 @@ export default {
}) })
}, },
addNodeOk() { addNodeOk() {
const empty = () => { const empty = () => {
this.addNodeModal = false this.addNodeModal = false
let flow_id = this.formValidate1.flow_id
this.formValidate1 = {} this.formValidate1 = {}
this.formValidate1.flow_id = flow_id
} }
this.$refs['formValidate1'].validate(async (va) => { this.$refs['formValidate1'].validate(async (va) => {
if (va) { if (va) {
...@@ -702,8 +706,10 @@ export default { ...@@ -702,8 +706,10 @@ export default {
}, },
async addNodeOk1() { async addNodeOk1() {
const empty = () => { const empty = () => {
let flow_id = this.formValidate2.flow_id
this.addNodeModal1 = false this.addNodeModal1 = false
this.formValidate2 = {} this.formValidate2 = {}
this.formValidate2.flow_id = flow_id
} }
const res = await hook.myEncapsulationFunction(async () => { const res = await hook.myEncapsulationFunction(async () => {
let data = _.cloneDeep(this.formValidate2) let data = _.cloneDeep(this.formValidate2)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<a @click="update(row)">修改</a> <a @click="update(row)">修改</a>
<a style="color: red;margin-left: 10px;" @click="roleDelete(row)">删除</a> <a style="color: red;margin-left: 10px;" @click="roleDelete(row)">删除</a>
<!-- <Button type="primary" size="small" @click="update(row)">修改</Button>--> <!-- <Button type="primary" size="small" @click="update(row)">修改</Button>-->
<!-- <Button type="error" size="small" @click="roleDelete(row)" style="margin-left: 10px;">删除</Button>--> <!-- <Button type="error" size="small" @click="roleDelete(row)" style="margin-left: 10px;">删除</Button>-->
<Modal <Modal
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
@on-ok="modalOk(row)" @on-ok="modalOk(row)"
cancel-text="取消" cancel-text="取消"
ok-text="确认" ok-text="确认"
:mask-closable="false" :mask-closable="true"
> >
<Form :model="formTop" :label-width="80" ref="updateRoleValue"> <Form :model="formTop" :label-width="80" ref="updateRoleValue">
<!-- :rules="ruleValidate"--> <!-- :rules="ruleValidate"-->
...@@ -47,7 +48,6 @@ ...@@ -47,7 +48,6 @@
</Table> </Table>
<div style="width: 100%;height: 70px;display: flex;align-items: center;"> <div style="width: 100%;height: 70px;display: flex;align-items: center;">
<Page show-total <Page show-total
show-sizer show-sizer
show-elevator show-elevator
:total="total" :total="total"
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</template> </template>
<template v-slot:action="{row}"> <template v-slot:action="{row}">
<!-- <Button type="info" size="small" @click="edit(row)">编辑</Button>--> <!-- <Button type="info" size="small" @click="edit(row)">编辑</Button>-->
<a @click="edit(row) " style="margin-right: 1vw;">编辑</a>
<Poptip confirm transfer title="你确定删除吗?" @on-ok="del(row)" @on-cancel="cancel"> <Poptip confirm transfer title="你确定删除吗?" @on-ok="del(row)" @on-cancel="cancel">
<a style="color: red;">删除</a> <a style="color: red;">删除</a>
</Poptip> </Poptip>
...@@ -54,49 +55,11 @@ ...@@ -54,49 +55,11 @@
<!-- 新增修改 --> <!-- 新增修改 -->
</Card> </Card>
<Modal <Modal
width="50%" :width="50"
:styles="{top: '20px'}" :styles="{top: '20px'}"
v-model="modal" v-model="modal"
title="添加用户" title="添加用户"
> >
<!-- <div>-->
<!-- <Tabs type="card">-->
<!-- <TabPane label="添加学生">-->
<!-- <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">-->
<!-- <FormItem label="学生" prop="student">-->
<!-- <Select transfer filterable v-model="formValidate.student" @on-change="studentSelect" multiple placeholder="请选择">-->
<!-- <Option v-for="(item,index) in promiseAllArray[1]" :value="item.id" :key="index">{{item.name}}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem>-->
<!-- <Button type="primary" @click="handleSubmit('s')">提交</Button>-->
<!-- <Button @click="handleReset('s')" style="margin-left: 8px">重置</Button>-->
<!-- </FormItem>-->
<!-- </Form>-->
<!-- </TabPane>-->
<!-- <TabPane label="添加教师">-->
<!-- <Form ref="formValidate1" :model="formValidate" :rules="ruleValidate" :label-width="80">-->
<!-- <FormItem label="教师" prop="teacher">-->
<!-- <Select clearable transfer filterable v-model="formValidate.teacher" placeholder="请选择">-->
<!-- <Option v-for="(item,index) in promiseAllArray[0]" :value="item.id" :key="index">{{item.name}}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="权限" prop="role">-->
<!-- <Select transfer filterable v-model="formValidate.role" @on-change="studentSelect1" multiple placeholder="请选择">-->
<!-- <Option :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[2]" :value="item.id" :key="index">{{item.name}}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem>-->
<!-- <Button type="primary" @click="handleSubmit('t')">提交</Button>-->
<!-- <Button @click="handleReset('t')" style="margin-left: 8px">重置</Button>-->
<!-- </FormItem>-->
<!-- </Form>-->
<!-- </TabPane>-->
<!-- </Tabs>-->
<!-- </div>-->
<!-- <template #footer>-->
<!-- {{null}}-->
<!-- </template>-->
<div> <div>
<Tabs type="card"> <Tabs type="card">
<TabPane label="添加学生"> <TabPane label="添加学生">
...@@ -138,16 +101,8 @@ ...@@ -138,16 +101,8 @@
<Button type="primary" @click="handleSubmit('s')">提交</Button> <Button type="primary" @click="handleSubmit('s')">提交</Button>
</div> </div>
</TabPane> </TabPane>
<TabPane label="添加教师"> <TabPane label="添加教师">
<div style="display: flex;"> <div style="display: flex;">
<!-- <Select transfer filterable v-model="formValidate.role" @on-change="studentSelect1" multiple-->
<!-- placeholder="请选择">&ndash;&gt;-->
<!-- <Option :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[2]" :value="item.id"-->
<!-- :key="index">{{ item.name }}-->
<!-- </Option>-->
<!-- </Select>-->
<CheckboxGroup style="margin-bottom: 5px" v-model="modalSelect1.checkboxValue"> <CheckboxGroup style="margin-bottom: 5px" v-model="modalSelect1.checkboxValue">
<Checkbox :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[0]" :label="item.id" <Checkbox :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[0]" :label="item.id"
:key="index" :key="index"
...@@ -205,6 +160,35 @@ ...@@ -205,6 +160,35 @@
{{ null }} {{ null }}
</template> </template>
</Modal> </Modal>
<Modal
v-model="editModal"
title="编辑">
<Form ref="formValidate3" :model="formValidate3" :rules="ruleValidate3" :label-width="80">
<FormItem label="姓名" prop="name">
<Input disabled v-model="formValidate3.name" placeholder="姓名"></Input>
</FormItem>
<FormItem label="工号" prop="card_name">
<Input disabled v-model="formValidate3.card_name" placeholder="姓名"></Input>
</FormItem>
<FormItem label="用户权限" prop="roleid">
<Select multiple v-model="formValidate3.roleid" placeholder="用户权限">
<Option v-for="(item,index) in promiseAllArray[0]" :key="index" :value="item.id">{{ item.name }}</Option>
</Select>
</FormItem>
<FormItem label="院系" prop="dept_id">
<Select multiple v-model="formValidate3.dept_id" placeholder="院系">
<Option v-for="(item,index) in modalSelect1.deptSelectArray" :key="index" :value="item.id">{{
item.name
}}
</Option>
</Select>
</FormItem>
</Form>
<template v-slot:footer>
<Button type="text" @click="editModal = false">取消</Button>
<Button type="primary" @click="editSave">确定</Button>
</template>
</Modal>
</div> </div>
</template> </template>
...@@ -218,6 +202,23 @@ export default { ...@@ -218,6 +202,23 @@ export default {
data() { data() {
return { return {
formValidate3: {
"userid": "",
"name": "",
"card_name": "",
"roleid": [],
"dept_id": [],
},
ruleValidate3: {
roleid: [
{type: 'array', required: true, message: '该项不能为空', trigger: 'change'}
],
dept_id: [
{type: 'array', required: true, message: '该项不能为空', trigger: 'change'}
],
},
editModal: false,
modalKey: 0,
pageSizeOpts: [10, 20, 30, 40, 100, 200], pageSizeOpts: [10, 20, 30, 40, 100, 200],
modalSelect1: { modalSelect1: {
deptValue: [], deptValue: [],
...@@ -402,7 +403,22 @@ export default { ...@@ -402,7 +403,22 @@ export default {
this.GetDeptSeletct() this.GetDeptSeletct()
}, },
methods: { methods: {
editSave() {
this.$refs['formValidate3'].validate((vali) => {
if (vali) {
hook.myEncapsulationFunction(async () => {
const res = await api.UserRoleDeptSave(this.formValidate3)
this.getData()
this.editModal = false
return res
})
}
})
},
TabsAciton() {
console.log("🚀🚀🚀12312312,")
this.modalKey++
},
async modalAction() { async modalAction() {
this.modal = true this.modal = true
this.modalSelect.sArray = [] this.modalSelect.sArray = []
...@@ -577,19 +593,28 @@ export default { ...@@ -577,19 +593,28 @@ export default {
"role": this.modalSelect1.checkboxValue, "role": this.modalSelect1.checkboxValue,
"tid": this.modalSelect1.tArray "tid": this.modalSelect1.tArray
} }
if (!!this.modalSelect1.deptValue.length) { const res1 = await api.TeacherBatchIns(data1)
const res1 = await api.TeacherBatchIns(data1) if (res1.code !== 1) {
if (res1.code !== 1) { this.$Message.error(res1.msg_detail)
this.$Message.error(res1.msg_detail)
} else {
hook.publicMessage(res1)
await this.getData()
this.modal = false
this.modalSelect1.tArray = []
}
} else { } else {
this.$Message.error('未选择院系') hook.publicMessage(res1)
await this.getData()
this.modal = false
this.modalSelect1.tArray = []
} }
// if (!!this.modalSelect1.deptValue.length) {
// const res1 = await api.TeacherBatchIns(data1)
// if (res1.code !== 1) {
// this.$Message.error(res1.msg_detail)
// } else {
// hook.publicMessage(res1)
// await this.getData()
// this.modal = false
// this.modalSelect1.tArray = []
// }
// } else {
// this.$Message.error('未选择院系')
// }
break; break;
...@@ -674,6 +699,10 @@ export default { ...@@ -674,6 +699,10 @@ export default {
}, },
// 修改 // 修改
edit(row) { edit(row) {
this.editModal = true
hook.getInitListRequest(() => {
api.GetUserRoleDeptInfo({userid: row.userid}).then(res => this.formValidate3 = res.response)
})
console.log("🚀🚀🚀,", row) console.log("🚀🚀🚀,", row)
}, },
// 删除 // 删除
......
...@@ -149,9 +149,9 @@ ...@@ -149,9 +149,9 @@
<th v-if="item[0]==='fileList'" class="colTitle">{{ item[2] }}</th> <th v-if="item[0]==='fileList'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='fileList'" class="colContent"> <td v-if="item[0]==='fileList'" class="colContent">
<!-- :href="ite.path" target="_blank" --> <!-- @click="aFun(ite) :href="ite.path" target="_blank" -->
<a class="aText" @click="aFun(ite)" <a class="aText" :href="ite.path" target="_blank"
style="display: flex;flex-wrap: wrap;justify-content: center" style="display: flex;flex-wrap: wrap;justify-content: center"
v-for="(ite,inde) in item[1]" v-for="(ite,inde) in item[1]"
:key="inde"> :key="inde">
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
</div> </div>
<template #footer> <template #footer>
<Button type="text" @click="importModal =false">关闭</Button> <Button type="text" @click="importModal =false">关闭</Button>
<!-- <Button type="primary" @click="importOk">确定</Button>--> <!-- <Button type="primary" @click="importOk">确定</Button>-->
</template> </template>
</Modal> </Modal>
<!-- :value="`competition/upfiles/attachment/asc666_2023_9_1695643952260190208 - 副本 (2).xlsx`"--> <!-- :value="`competition/upfiles/attachment/asc666_2023_9_1695643952260190208 - 副本 (2).xlsx`"-->
...@@ -204,7 +204,6 @@ ...@@ -204,7 +204,6 @@
<VueDocPreview <VueDocPreview
style="height:calc(100vh-45px);" style="height:calc(100vh-45px);"
v-if="src && fileType ==='office'" v-if="src && fileType ==='office'"
:value="src" :value="src"
:url="src" :url="src"
language="JavaScript" language="JavaScript"
...@@ -490,14 +489,14 @@ export default { ...@@ -490,14 +489,14 @@ export default {
}, },
aFun(e) { aFun(e) {
const fun = (e, url) => { const fun = (e, url) => {
this.src = window.location.protocol + window.location.host + url.path
this.src = 'https://asc.hnasct.cn' + url.path
this.fileType = e this.fileType = e
this.drawerPreview = true this.drawerPreview = true
} }
if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf') { if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf') {
fun('image', e) fun('image', e)
} else if (e.suffix === '.doc' || e.suffix === '.docx' || e.suffix === '.xls' } else if (e.suffix === '.doc' || e.suffix === '.docx' || e.suffix === '.xls'
|| e.suffix === '.xlsx') { || e.suffix === '.xlsx') {
fun('office', e) fun('office', e)
......
...@@ -5,6 +5,7 @@ import Setting from '@/setting'; ...@@ -5,6 +5,7 @@ import Setting from '@/setting';
import dayjs from "dayjs"; import dayjs from "dayjs";
import * as api from '../../api/requestUtils' import * as api from '../../api/requestUtils'
import {Message, Notice} from 'view-design'; import {Message, Notice} from 'view-design';
import router from "@/router";
// 创建一个错误 // 创建一个错误
function errorCreate(msg) { function errorCreate(msg) {
...@@ -53,12 +54,12 @@ const refreshToken = async () => { ...@@ -53,12 +54,12 @@ const refreshToken = async () => {
if (flag === 1) { if (flag === 1) {
flag = 2 flag = 2
let currentTime = dayjs(dayjs().valueOf()) let currentTime = dayjs(dayjs().valueOf())
let refreshTime = dayjs(dayjs(util.cookies.get('refreshTime')).valueOf()) let refreshTime = dayjs(dayjs(util.cookies.get('competition-refreshTime')).valueOf())
if (refreshTime.diff(currentTime) <= 2 * 60 * 60) { if (refreshTime.diff(currentTime) <= 2 * 60 * 60) {
try { try {
const res = await api.RefreshToken() const res = await api.RefreshToken()
util.cookies.set('token', res.response.token_content) util.cookies.set('competition-token', res.response.token_content)
util.cookies.set('refreshTime', res.response.expires) util.cookies.set('competition-refreshTime', res.response.expires)
} catch (e) { } catch (e) {
console.error('1') console.error('1')
} finally { } finally {
...@@ -72,7 +73,7 @@ service.interceptors.request.use( ...@@ -72,7 +73,7 @@ service.interceptors.request.use(
config => { config => {
// 在请求发送之前做一些处理 // 在请求发送之前做一些处理
// const token = util.cookies.get('token'); // const token = util.cookies.get('token');
let token = util.cookies.get('token') let token = util.cookies.get('competition-token')
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改 // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
config.headers['Authorization'] = 'Bearer ' + token; config.headers['Authorization'] = 'Bearer ' + token;
config.headers['X-Token'] = token; config.headers['X-Token'] = token;
...@@ -126,9 +127,10 @@ service.interceptors.response.use( ...@@ -126,9 +127,10 @@ service.interceptors.response.use(
error.message = '请求错误'; error.message = '请求错误';
break; break;
case 401: case 401:
error.message = '未授权,请登录'; // error.message = '未授权,请登录';
util.cookies.remove('token'); util.cookies.remove('competition-token');
util.cookies.remove('userinfo'); util.cookies.remove('competition-userinfo');
router.replace({name: '403'})
break; break;
case 403: case 403:
error.message = '拒绝访问'; error.message = '拒绝访问';
......
...@@ -13,6 +13,17 @@ import routes from './routes'; ...@@ -13,6 +13,17 @@ import routes from './routes';
Vue.use(VueRouter); Vue.use(VueRouter);
// 截取url中的token
function getUrlKey(name) {
return (
decodeURIComponent(
(new RegExp("[?|&]" + name + "=" + "([^&;]+?)(&|#|;|$)").exec(
location.href
) || [, ""])[1].replace(/\+/g, "%20")
) || null
);
}
// 导出路由 在 main.js 里使用 // 导出路由 在 main.js 里使用
const router = new VueRouter({ const router = new VueRouter({
routes, routes,
...@@ -30,34 +41,33 @@ router.beforeEach(async (to, from, next) => { ...@@ -30,34 +41,33 @@ router.beforeEach(async (to, from, next) => {
// 判断是否需要登录才可以进入 // 判断是否需要登录才可以进入
if (to.matched.some(_ => _.meta.auth)) { if (to.matched.some(_ => _.meta.auth)) {
// 这里依据 token 判断是否登录,可视情况修改 // 这里依据 token 判断是否登录,可视情况修改
const token = util.cookies.get('token'); const token = util.cookies.get('competition-token');
if (token && token !== 'undefined') { const urlKey = getUrlKey('token');
next(); if (urlKey) {
} else {
console.log("🚀🚀2---------2222🚀,")
let token = ''
if (Cookies.get('token') && Cookies.get('token') !== 'undefined' || Cookies.get('token') && Cookies.get('token') !== 'null') {
token = Cookies.get('token')
console.log("🚀🚀Cookies🚀,", token)
} else {
token = localStorage.getItem('token')
// Cookies.set('token', token)
console.log("🚀🚀localStorage🚀,", token)
}
await store.dispatch('admin/account/ascLogin', { await store.dispatch('admin/account/ascLogin', {
"token": token "token": urlKey
}, {root: true}); }, {root: true});
next(); next();
}
// 没有登录的时候跳转到登录界面 // else if (token === '' && urlKey) {
// 携带上登陆成功之后需要跳转的页面完整路径 // // console.log("🚀🚀2---------2222🚀,")
// next({ // await store.dispatch('admin/account/ascLogin', {
// name: 'login', // "token": urlKey
// query: { // }, {root: true});
// redirect: to.fullPath // next();
// } // // 没有登录的时候跳转到登录界面
// }); // // 携带上登陆成功之后需要跳转的页面完整路径
// // next({
// // name: 'login',
// // query: {
// // redirect: to.fullPath
// // }
// // });
// }
else if (token) {
next();
} else {
next({name: '403'});
} }
} else { } else {
// 不需要身份校验 直接通过 // 不需要身份校验 直接通过
......
import BasicLayout from '@/layouts/basic-layout'; import BasicLayout from '@/layouts/basic-layout';
const meta = { const meta = {
...@@ -10,8 +9,8 @@ export default { ...@@ -10,8 +9,8 @@ export default {
name: '', name: '',
meta, meta,
component: BasicLayout, component: BasicLayout,
directive:{ directive: {
name:'Certificate' name: 'Certificate'
}, },
children: [ children: [
{ {
......
import BasicLayout from '@/layouts/basic-layout'; import BasicLayout from '@/layouts/basic-layout';
const meta = { const meta = {
...@@ -10,8 +9,8 @@ export default { ...@@ -10,8 +9,8 @@ export default {
name: '', name: '',
meta, meta,
component: BasicLayout, component: BasicLayout,
directive:{ directive: {
name:'CompetitionSign' name: 'CompetitionSign'
}, },
children: [ children: [
{ {
...@@ -22,7 +21,11 @@ export default { ...@@ -22,7 +21,11 @@ export default {
title: '报名列表', title: '报名列表',
closable: false closable: false
}, },
component: () => import('@/pages/CompetitionSign/index.vue') component: () => import('@/pages/CompetitionSign/index.vue'),
// beforeEnter: (to, from, next) => {
// window.open('/CompetitionSignForm?id=102&remark=CompetitionSign&entrance=flow', '_blank');
// next(false); // Prevent Vue Router from navigating
// },
} }
] ]
}; };
import BasicLayout from '@/layouts/basic-layout';
const pre = '/eventCatalogue';
const meta = {
auth: true
};
export default {
path: '/',
name: '',
meta,
component: BasicLayout,
children: [
{
path: `${pre}-directoryQuery`,
name: `directoryQuery`,
meta: {
...meta,
title: '目录查询',
closable: false,
},
component: () => import('@/pages/eventCatalogue/index.vue')
},
{
path: `${pre}-eventApplication`,
name: `eventApplication`,
meta: {
...meta,
title: '参赛申请',
closable: false
},
component: () => import('@/pages/eventCatalogue/eventApplication.vue'),
}
]
};
...@@ -20,6 +20,8 @@ import CompetitionSign from "@/router/modules/CompetitionSign"; ...@@ -20,6 +20,8 @@ import CompetitionSign from "@/router/modules/CompetitionSign";
import flowAssemble from "@/router/modules/flowAssemble"; import flowAssemble from "@/router/modules/flowAssemble";
import competitionNotice from "@/router/modules/competitionNotice"; import competitionNotice from "@/router/modules/competitionNotice";
import competitionScore from "@/router/modules/competitionScore"; import competitionScore from "@/router/modules/competitionScore";
import eventCatalogue from "@/router/modules/eventCatalogue";
/** /**
* 在主框架内显示 * 在主框架内显示
...@@ -29,19 +31,30 @@ const frameIn = [ ...@@ -29,19 +31,30 @@ const frameIn = [
{ {
path: '/', path: '/',
redirect: { redirect: {
name: 'welcome' name: 'directoryQuery'
}, },
// component: () => import('@/pages/SSO.vue'),
component: BasicLayout, component: BasicLayout,
children: [ children: [
// {
// path: 'welcome',
// name: 'welcome',
// meta: {
// title: '竞赛列表',
// auth: true,
// closable: false
// },
// component: () => import('@/pages/welcome/index.vue')
// },
{ {
path: 'welcome', path: '/eventCatalogue-directoryQuery',
name: 'welcome', name: 'directoryQuery',
meta: { meta: {
title: '竞赛列表', title: '目录查询',
auth: true, auth: true,
closable: false closable: false
}, },
component: () => import('@/pages/welcome/index.vue') component: () => import('@/pages/eventCatalogue/index.vue')
}, },
{ {
path: 'log', path: 'log',
...@@ -99,7 +112,7 @@ const frameIn = [ ...@@ -99,7 +112,7 @@ const frameIn = [
flowAssemble, flowAssemble,
competitionNotice, competitionNotice,
competitionScore, competitionScore,
eventCatalogue,
]; ];
/** /**
......
...@@ -9,7 +9,7 @@ const Setting = { ...@@ -9,7 +9,7 @@ const Setting = {
* 基础配置 * 基础配置
* */ * */
// 网页标题的后缀 // 网页标题的后缀
titleSuffix: '竞赛管理系统', titleSuffix: '竞赛管理',
// 路由模式,可选值为 history 或 hash // 路由模式,可选值为 history 或 hash
routerMode: 'hash', routerMode: 'hash',
// 应用的基路径 // 应用的基路径
......
...@@ -5,9 +5,10 @@ import util from '@/libs/util'; ...@@ -5,9 +5,10 @@ import util from '@/libs/util';
import router from '@/router'; import router from '@/router';
import Setting from '@/setting'; import Setting from '@/setting';
import * as api from '../../../../api/requestUtils' import * as api from '../../../../api/requestUtils'
import { AccountLogin, AccountRegister } from '@api/account'; import * as hooks from '@/hook'
import {AccountLogin, AccountRegister} from '@api/account';
import { Modal } from 'view-design'; import {Modal} from 'view-design';
export default { export default {
namespaced: true, namespaced: true,
...@@ -19,42 +20,60 @@ export default { ...@@ -19,42 +20,60 @@ export default {
* @param {Object} param password {String} 密码 * @param {Object} param password {String} 密码
* @param {Object} param route {Object} 登录成功后定向的路由对象 任何 vue-router 支持的格式 * @param {Object} param route {Object} 登录成功后定向的路由对象 任何 vue-router 支持的格式
*/ */
ascLogin({ dispatch }, { ascLogin({dispatch}, {
token token
} = {}) { } = {}) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
await api.SSOPC({ await api.SSOPC({
token:token token: token
}) })
.then(async res => { .then(async res => {
if(res.code !== 1){ if (res.code !== 1) {
await router.push({ await router.push({
name: '403', name: '403',
}) })
}else if(res.response.access_token.token_content){ } else if (res.response.access_token.token_content) {
// 设置 cookie 一定要存 uuid 和 token 两个 cookie // 设置 cookie 一定要存 uuid 和 token 两个 cookie
// 整个系统依赖这两个数据进行校验和存储 // 整个系统依赖这两个数据进行校验和存储
// uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复 // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
// token 代表用户当前登录状态 建议在网络请求中携带 token // token 代表用户当前登录状态 建议在网络请求中携带 token
// 如有必要 token 需要定时更新,默认保存一天,可在 setting.js 中修改 // 如有必要 token 需要定时更新,默认保存一天,可在 setting.js 中修改
// 如果你的 token 不是通过 cookie 携带,而是普通字段,也可视情况存储在 localStorage // 如果你的 token 不是通过 cookie 携带,而是普通字段,也可视情况存储在 localStorage
util.cookies.set('token', res.response.access_token.token_content); // 这个util的cookie会自带admin前缀 util.cookies.set('competition-token', res.response.access_token.token_content); // 这个util的cookie会自带admin前缀
util.cookies.set('refreshTime', res.response.access_token.expires); util.cookies.set('competition-refreshTime', res.response.access_token.expires);
// console.log("dsadass"+res.response.access_token.token_content); // console.log("dsadass"+res.response.access_token.token_content);
// util.cookies.set('token', res.token); // util.cookies.set('token', res.token);
await api.GetTokenInfo().then(async res => { // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置 await api.GetTokenInfo().then(async res => { // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
// console.log("GetTokenInfo方法获取用户信息",res.response); // console.log("GetTokenInfo方法获取用户信息",res.response);
util.cookies.set('userinfo', res.response);
// store 赋值 // store 赋值
// await dispatch('admin/user/set', res.response, { root: true }); // await dispatch('admin/user/set', res.response, { root: true });
// await dispatch('load', { loadOpenedTabs: Setting.page.loadOpenedTabs }); // await dispatch('load', { loadOpenedTabs: Setting.page.loadOpenedTabs });
let aaa = ''
await new Promise((resolve) => {
util.cookies.set('competition-userinfo', res.response);
// localStorage.setItem('menu', hooks.getUserRole())
aaa = hooks.getUserRole()
resolve()
})
// 获取动态菜单 // 获取动态菜单
if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, { root: true }); if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true});
// let Role = '管理员' // let Role = '管理员'
// let split = res.response.role[0].split('"') // let split = res.response.role[0].split('"')
// if(split.indexOf(Role)!== -1){ // if(split.indexOf(Role)!== -1){
resolve() var info = {
name: 'asc666',
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
access: [aaa ? 'admin' : "xxx"]
}
// await
dispatch('admin/user/set', info, {root: true});
// 用户登录后从持久化数据加载一系列的设置
dispatch('load');
// 结束
// resolve();
resolve()
// }else{ // }else{
// router.push({ // router.push({
// name:'403', // name:'403',
...@@ -72,35 +91,35 @@ export default { ...@@ -72,35 +91,35 @@ export default {
} }
}) })
.catch(err => { .catch(err => {
console.log("🚀🚀🚀,",err) console.log("🚀🚀🚀,", err)
reject(err); reject(err);
}) })
// util.cookies.set('uuid', 'asc666'); // util.cookies.set('uuid', 'asc666');
// util.cookies.set('token', 'rooooo'); // util.cookies.set('token', 'rooooo');
// 设置 vuex 用户信息 // 设置 vuex 用户信息
var info = { // var info = {
name: 'asc666', // name: 'asc666',
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar', // avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
access: ['admin'] // access: [localStorage.getItem('menu') ? 'admin' : "xxx"]
} // }
// await // // await
dispatch('admin/user/set', info, { root: true }); // dispatch('admin/user/set', info, {root: true});
// 用户登录后从持久化数据加载一系列的设置 // // 用户登录后从持久化数据加载一系列的设置
dispatch('load'); // dispatch('load');
// 结束 // // 结束
resolve(); // resolve();
}) })
}, },
/** /**
* @description 退出登录 * @description 退出登录
* */ * */
logout({ commit, dispatch }, { confirm = false, vm } = {}) { logout({commit, dispatch}, {confirm = false, vm} = {}) {
async function logout() { async function logout() {
// 删除cookie // 删除cookie
util.cookies.remove('token'); util.cookies.remove('token');
util.cookies.remove('uuid'); util.cookies.remove('uuid');
// 清空 vuex 用户信息 // 清空 vuex 用户信息
await dispatch('admin/user/set', {}, { root: true }); await dispatch('admin/user/set', {}, {root: true});
// 跳转路由 // 跳转路由
// router.push({ // router.push({
// name: 'login' // name: 'login'
...@@ -145,7 +164,7 @@ export default { ...@@ -145,7 +164,7 @@ export default {
* @param {Object} param mobile {String} 手机号码 * @param {Object} param mobile {String} 手机号码
* @param {Object} param captcha {String} 验证码 * @param {Object} param captcha {String} 验证码
*/ */
register({ dispatch }, { register({dispatch}, {
mail = '', mail = '',
password = '', password = '',
mobile = '', mobile = '',
...@@ -165,7 +184,7 @@ export default { ...@@ -165,7 +184,7 @@ export default {
util.cookies.set('uuid', res.uuid); util.cookies.set('uuid', res.uuid);
util.cookies.set('token', res.token); util.cookies.set('token', res.token);
// 设置 vuex 用户信息 // 设置 vuex 用户信息
await dispatch('admin/user/set', res.info, { root: true }); await dispatch('admin/user/set', res.info, {root: true});
// 用户登录后从持久化数据加载一系列的设置 // 用户登录后从持久化数据加载一系列的设置
await dispatch('load'); await dispatch('load');
// 结束 // 结束
...@@ -183,19 +202,19 @@ export default { ...@@ -183,19 +202,19 @@ export default {
* @param {Object} dispatch vuex dispatch * @param {Object} dispatch vuex dispatch
* @param {Object} loadOpenedTabs 是否加载页签信息 * @param {Object} loadOpenedTabs 是否加载页签信息
*/ */
load({ state, dispatch }, { loadOpenedTabs = true } = {}) { load({state, dispatch}, {loadOpenedTabs = true} = {}) {
return new Promise(async resolve => { return new Promise(async resolve => {
// 加载用户登录信息 // 加载用户登录信息
await dispatch('admin/user/load', null, { root: true }); await dispatch('admin/user/load', null, {root: true});
// 持久化数据加载上次退出时的多页列表 // 持久化数据加载上次退出时的多页列表
await dispatch('admin/page/openedLoad', { loadOpenedTabs }, { root: true }); await dispatch('admin/page/openedLoad', {loadOpenedTabs}, {root: true});
// end // end
resolve(); resolve();
}) })
} }
}, },
setCookie (name, value, time) { setCookie(name, value, time) {
var d = new Date() var d = new Date()
d.setTime(d.getTime() + time) d.setTime(d.getTime() + time)
var expires = 'expires=' + d.toUTCString() var expires = 'expires=' + d.toUTCString()
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或