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

更新首页

上级 467e6a2a
流水线 #22832 已失败 ,包含阶段
in 1 minute 和 34 second
default:
before_script:
- chcp 65001
stages:
- publish
build:
stage: publish
script:
- remove-item -Force -Recurse D:\ASC_web\A00051\competitioManagement\pc*
- xcopy "dist" "D:\ASC_web\A00051\competitioManagement\pc\" /s/e/y/
only:
- pc
无法预览此类型文件
// 菜单,顶栏 // 菜单,顶栏
export default [ export default [
{ // {
path: '/', // path: '/',
title: '首页', // title: '首页',
icon: 'ios-ribbon', // icon: 'ios-ribbon',
hideSider: false, // hideSider: false,
name: 'home' // name: 'home'
}, // },
// { // {
// path: '/log', // path: '/log',
// title: '日志', // title: '日志',
......
export default {
path: '/homePage',
title: '首页',
header: 'home',
icon: 'ios-radio-button-on'
}
...@@ -27,16 +27,16 @@ import eventStatistics from "@/menu/modules/eventStatistics"; ...@@ -27,16 +27,16 @@ import eventStatistics from "@/menu/modules/eventStatistics";
import eventApproval from "@/menu/modules/eventApproval"; import eventApproval from "@/menu/modules/eventApproval";
import * as hooks from "@/hook/index"; import * as hooks from "@/hook/index";
import {config} from "@/menu/modules/systemConmfiguration"; import {config} from "@/menu/modules/systemConmfiguration";
import homePage from "@/menu/modules/homePage";
// 系统 // 系统
// import log from './modules/log';
import header from "@/menu/header";
export default [ export default [
// dashboard, // dashboard,
// log, // log,
// homePage,
eventCatalogue, eventCatalogue,
// { // {
// path: '/welcome', // path: '/welcome',
// title: '竞赛列表', // title: '竞赛列表',
......
<template> <template>
<Card> <Card>
<h1>测试中...</h1> <h1>123测试中...</h1>
</Card> </Card>
</template> </template>
......
<template> <template>
<div class="container"> <div class="container">
<div class="header">
<div class="h_left">
</div>
<div class="h_content">
<template v-if="!flowInfo">
<!-- <Button @click="cancelFlow" type="error" style="margin-right: 20px">取消流程</Button>-->
<Button @click="$router.back()" type="primary" style="margin-right: 20px;width: 12vw;">返回</Button>
<Button @click="passFlow" type="primary" style="width: 12vw;margin-right: 20px;">通过审批</Button>
<Button @click="revocationFlow" type="warning" style="width: 12vw;">撤回流程</Button>
</template>
<template v-else-if="flowInfo==='流程详细信息'">
<h1>{{ flowInfo }}</h1>
</template>
</div>
<div class="h_right">
</div>
</div>
<div class="content"> <div class="content">
<Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'CompetitionReport'"> <Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'CompetitionReport'">
...@@ -341,12 +323,31 @@ ...@@ -341,12 +323,31 @@
</Timeline> </Timeline>
</div> </div>
</div> </div>
<div class="header">
<div class="h_left">
</div>
<div class="h_content">
<template v-if="!flowInfo">
<!-- <Button @click="cancelFlow" type="error" style="margin-right: 20px">取消流程</Button>-->
<Button @click="$router.back()" type="primary" style="margin-right: 20px;width: 12vw;">返回</Button>
<Button @click="passFlow" type="primary" style="width: 12vw;margin-right: 20px;">通过审批</Button>
<Button @click="revocationFlow" type="warning" style="width: 12vw;">退回流程</Button>
</template>
<template v-else-if="flowInfo==='流程详细信息'">
<!-- <h1>{{ flowInfo }}</h1>-->
<Button @click="$router.back()" type="primary" style="margin-right: 20px;width: 12vw;">返回</Button>
</template>
</div>
<div class="h_right">
</div>
</div>
<Modal <Modal
v-model="publicModal" v-model="publicModal"
title="审批意见" title="审批意见"
@on-ok="ok" @on-ok="ok"
@on-cancel="cancel"> @on-cancel="cancel">
<Input v-model="publicTextarea" type="textarea" :autosize="{minRows: 2,maxRows: 5}" <Input v-model="publicTextarea" type="textarea" :autosize="{minRows: 5,maxRows: 10}"
placeholder="请输入审批意见..."></Input> placeholder="请输入审批意见..."></Input>
</Modal> </Modal>
<Drawer title="团队详细" :closable="false" v-model="teamDrawer" width="40%"> <Drawer title="团队详细" :closable="false" v-model="teamDrawer" width="40%">
...@@ -384,7 +385,6 @@ ...@@ -384,7 +385,6 @@
<!-- </template>--> <!-- </template>-->
</Table> </Table>
</Drawer> </Drawer>
<Drawer width="90" closable v-model="drawerPreview"> <Drawer width="90" closable v-model="drawerPreview">
<template #header> <template #header>
<div style="width: 100%;mix-height:35px;max-height:auto;position: relative"> <div style="width: 100%;mix-height:35px;max-height:auto;position: relative">
...@@ -396,6 +396,7 @@ ...@@ -396,6 +396,7 @@
</a> </a>
</div> </div>
</template> </template>
<VueDocPreview <VueDocPreview
:key="viewFileUpdataKeys" :key="viewFileUpdataKeys"
v-if="src && fileType ==='office'" v-if="src && fileType ==='office'"
...@@ -410,6 +411,7 @@ ...@@ -410,6 +411,7 @@
v-if="src && fileType ==='image'" v-if="src && fileType ==='image'"
:src="src" :src="src"
></i-frame> ></i-frame>
</Drawer> </Drawer>
</div> </div>
...@@ -628,7 +630,7 @@ export default { ...@@ -628,7 +630,7 @@ export default {
if (pass.code === 1) { if (pass.code === 1) {
setTimeout(() => { setTimeout(() => {
localStorage.setItem('updataEvent', 'getDataEvent'); localStorage.setItem('updataEvent', 'getDataEvent');
window.close() this.$router.back()
}, 1500) }, 1500)
} }
break; break;
...@@ -638,7 +640,7 @@ export default { ...@@ -638,7 +640,7 @@ export default {
hook.publicMessage(Revocation) hook.publicMessage(Revocation)
setTimeout(() => { setTimeout(() => {
localStorage.setItem('updataEvent', 'getDataEvent'); localStorage.setItem('updataEvent', 'getDataEvent');
window.close() this.$router.back()
}, 1500) }, 1500)
} else { } else {
this.$Spin.hide() this.$Spin.hide()
...@@ -976,8 +978,10 @@ export default { ...@@ -976,8 +978,10 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: relative;
width: 100%; width: 100%;
height: 8%; height: 8%;
border-top: 5px #2D8CF0 solid;
.h_left, .h_right { .h_left, .h_right {
width: 20%; width: 20%;
...@@ -1002,6 +1006,8 @@ export default { ...@@ -1002,6 +1006,8 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
justify-content: center; justify-content: center;
overflow-y: auto;
.tableList { .tableList {
display: flex; display: flex;
......
...@@ -155,14 +155,14 @@ export default { ...@@ -155,14 +155,14 @@ 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,
......
...@@ -332,7 +332,8 @@ export default { ...@@ -332,7 +332,8 @@ export default {
}, },
// 修改 // 修改
approvalLisFun(row) { approvalLisFun(row) {
const url = this.$router.resolve({ // const url =
this.$router.push({
name: 'awaitDoneInformation', name: 'awaitDoneInformation',
query: { query: {
runid: row.runid, runid: row.runid,
...@@ -340,7 +341,7 @@ export default { ...@@ -340,7 +341,7 @@ export default {
flowInfo: '流程详细信息' flowInfo: '流程详细信息'
} }
}) })
window.open(url.href, '_blank') // window.open(url.href, '_blank')
// this.approvalDrawer = true // this.approvalDrawer = true
console.log("🚀🚀🚀,", row) console.log("🚀🚀🚀,", row)
}, },
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
action=""> action="">
<div style="padding: 20px 30px; width: 100%;"> <div style="padding: 20px 30px; width: 100%;">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>参赛文件</p> <p>备赛方案</p>
</div> </div>
</Upload> </Upload>
</div> </div>
...@@ -1000,6 +1000,7 @@ export default { ...@@ -1000,6 +1000,7 @@ export default {
is_choose: [{type: 'number', required: true, message: '该项不能为空', trigger: 'change'}], is_choose: [{type: 'number', required: true, message: '该项不能为空', trigger: 'change'}],
teamname: [{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}], teamname: [{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}],
}, },
preparationPlan: [],
formValidate: { formValidate: {
"flowid": "", "flowid": "",
"competitionname": "", "competitionname": "",
...@@ -1723,6 +1724,7 @@ export default { ...@@ -1723,6 +1724,7 @@ export default {
res.response.competition_sign.begin_time ? res.response.competition_sign.begin_time.split(' 00:00')[0] : '', res.response.competition_sign.begin_time ? res.response.competition_sign.begin_time.split(' 00:00')[0] : '',
res.response.competition_sign.end_time ? res.response.competition_sign.end_time.split(' 00:00')[0] : ''] res.response.competition_sign.end_time ? res.response.competition_sign.end_time.split(' 00:00')[0] : '']
this.formValidate.files_list = res.response.files_list this.formValidate.files_list = res.response.files_list
this.preparationPlan = res.response.files_list // 培训方案文件 仅标识
//------------------------------ //------------------------------
this.changecommitid = res.response.changecommitid this.changecommitid = res.response.changecommitid
this.flowid = res.response.flowid this.flowid = res.response.flowid
...@@ -1755,6 +1757,11 @@ export default { ...@@ -1755,6 +1757,11 @@ export default {
this.formValidate.files_list.splice(index, 1) this.formValidate.files_list.splice(index, 1)
} }
}) })
this.preparationPlan.map((cur, index) => {
if (cur.id === e.id) {
this.preparationPlan.splice(index, 1)
}
})
this.fileKey++ this.fileKey++
}, },
onError(response, file, fileList) { onError(response, file, fileList) {
...@@ -1783,7 +1790,8 @@ export default { ...@@ -1783,7 +1790,8 @@ export default {
let formData = new FormData(); let formData = new FormData();
formData.append(`file`, file); formData.append(`file`, file);
const res = await api.fileUpload('Project', formData); const res = await api.fileUpload('Project', formData);
this.formValidate.files_list.push(res.response) this.preparationPlan.push(res.response);
this.formValidate.files_list.push(res.response);
hook.publicMessage(res) hook.publicMessage(res)
this.fileKey++ this.fileKey++
return false return false
...@@ -1793,6 +1801,8 @@ export default { ...@@ -1793,6 +1801,8 @@ export default {
if (cur) { if (cur) {
// this.formValidate.competitionname = this.competitionnameValue // this.formValidate.competitionname = this.competitionnameValue
// this.$Spin.show() // this.$Spin.show()
if (!!this.preparationPlan.length) {
clearTimeout(this.timer) clearTimeout(this.timer)
this.timer = setTimeout(async () => { this.timer = setTimeout(async () => {
this.formValidate.flowid = this.flowid this.formValidate.flowid = this.flowid
...@@ -1804,6 +1814,9 @@ export default { ...@@ -1804,6 +1814,9 @@ export default {
// window.open("about:blank", "_top").close() // window.open("about:blank", "_top").close()
}, 1500) }, 1500)
}, 1000) }, 1000)
} else {
this.$Message.error('未上传培训方案,请上传培训方案')
}
} }
}) })
}, },
......
...@@ -351,7 +351,8 @@ export default { ...@@ -351,7 +351,8 @@ export default {
}, },
// 修改 // 修改
approvalLisFun(row) { approvalLisFun(row) {
const url = this.$router.resolve({ // const url =
this.$router.push({
name: 'awaitDoneInformation', name: 'awaitDoneInformation',
query: { query: {
runid: row.runid, runid: row.runid,
...@@ -359,7 +360,7 @@ export default { ...@@ -359,7 +360,7 @@ export default {
flowInfo: '流程详细信息' flowInfo: '流程详细信息'
} }
}) })
window.open(url.href, '_blank') // window.open(url.href, '_blank')
// this.approvalDrawer = true // this.approvalDrawer = true
console.log("🚀🚀🚀,", row) console.log("🚀🚀🚀,", row)
}, },
......
<template>
<div>
<Card>
<h1>欢迎使用竞赛系统</h1>
</Card>
</div>
</template>
<script>
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {},
data() {
//这里存放数据",
return {};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
</style>
...@@ -36,6 +36,16 @@ const frameIn = [ ...@@ -36,6 +36,16 @@ const frameIn = [
// component: () => import('@/pages/SSO.vue'), // component: () => import('@/pages/SSO.vue'),
component: BasicLayout, component: BasicLayout,
children: [ children: [
// {
// path: 'homePage',
// name: 'homePage',
// meta: {
// title: '首页',
// auth: true,
// closable: false
// },
// component: () => import('@/pages/homePage/index.vue')
// },
// { // {
// path: 'welcome', // path: 'welcome',
// name: 'welcome', // name: 'welcome',
......
...@@ -28,7 +28,6 @@ export default { ...@@ -28,7 +28,6 @@ export default {
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',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或