dev_2022-06-14
yujialong 2 years ago
parent af85874783
commit 3b64da0a79
  1. 4
      src/assets/css/main.css
  2. 4
      src/setting.js
  3. 7
      src/utils/api.js
  4. 13
      src/views/match/add/index.vue
  5. 12
      src/views/match/list/index.vue
  6. 6
      src/views/match/manage/index.vue
  7. 20
      src/views/match/manage/matchDetail.vue
  8. 2
      src/views/match/manage/notice.vue
  9. 5
      src/views/order/Order.vue
  10. 1
      src/views/system/staff.vue

@ -71,6 +71,10 @@ li {
color: #585858;
border-left: 3px solid #9278ff;
}
.el-upload-list{
width: 100%;
max-width: 400px;
}
.page {
position: relative;
padding: 24px;

@ -9,8 +9,8 @@ let jumpPath = `${location.origin}/judgmentPoint`
let host = `${location.origin}:9000/`
if (isDev) {
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = 'http://121.37.12.51:9000/'
host = 'http://192.168.31.151:9000/'// 榕
host = 'http://121.37.12.51:9000/'
// host = 'http://192.168.31.151:9000/'// 榕
// host = 'http://192.168.31.137:9000/'// 赓
} else if (isPro) {
jumpPath = "http://www.huorantech.cn/judgmentPoint/";

@ -9,7 +9,7 @@ export default {
logins: `users/users/user/login`, //登录
verification: `${host}users/users/user/captcha`,// 验证码图片 保留host
bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机
sendPhoneOrEmailCode: `${host1}users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
getUserRolesPermissionMenu: `users/user-role/getUserRolesPermissionMenu`,
staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板
@ -268,10 +268,10 @@ export default {
modifyPartnerAccount: `nakadai/partnerAccount/modifyPartnerAccount`,
partnerAccountDetail: `nakadai/partnerAccount/partnerAccountDetail`,
partnerAccountList: `nakadai/partnerAccount/partnerAccountList`,
savePartnerAccount: `${host1}nakadai/partnerAccount/savePartnerAccount`,
savePartnerAccount: `nakadai/partnerAccount/savePartnerAccount`,
generateInvitationCode: `nakadai/partnerAccount/generateInvitationCode`,
generationQrCode: `nakadai/partnerAccount/generationQrCode`,
queryUserInfoByPhone: `${host1}nakadai/partner-team/queryUserInfoByPhone`,
queryUserInfoByPhone: `nakadai/partner-team/queryUserInfoByPhone`,
getAllTeam: `nakadai/partnerClassification/getAllTeam`,
partnerRemoval: `nakadai/partnerAccount/partnerRemoval`,
generateTransferCode: `nakadai/partnerAccount/generateTransferCode`,
@ -306,6 +306,7 @@ export default {
addAnnouncement: `occupationlab/contest/announcement/addAnnouncement`,
amendmentAnnouncement: `occupationlab/contest/announcement/amendmentAnnouncement`,
deleteAnnouncement: `occupationlab/contest/announcement/deleteAnnouncement`,
disableAnnouncement: `occupationlab/contest/announcement/disableAnnouncement`,
queryAnnouncementByContestId: `occupationlab/contest/announcement/queryAnnouncementByContestId`,
queryAnnouncementDetails: `occupationlab/contest/announcement/queryAnnouncementDetails`,
deleteAnnouncementAnnex: `occupationlab/contestAnnouncementAnnex/delete`,

@ -116,7 +116,6 @@
:on-error="uploadError"
:before-upload="beforeUpload"
:on-success="uploadAnnexSuccess"
:before-remove="beforeRemove"
:limit="5"
:on-exceed="handleExceedAnnex"
:action="this.api.fileupload"
@ -372,7 +371,14 @@ export default {
},
//
beforeUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 10
if (!isLt2M) util.warningMsg('请上传小于10MB的附件!')
if (isLt2M) {
this.fileName = file.name
return true
} else {
return false
}
},
uploadError(err, file, fileList) {
this.$message({
@ -395,10 +401,7 @@ export default {
}).catch(res => {})
},
handleAnnexRemove(file, fileList) {
debugger
this.$del(`${this.api.fileDeletion}?keys=${this.coverUrl}`).then(res => {
this.carouselUrl = ''
}).catch(res => {})
this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
},
//
previewFile(item) {

@ -103,6 +103,7 @@
<script>
import util from "@/libs/util";
import Setting from "@/setting";
export default {
name: "match",
@ -210,9 +211,8 @@ export default {
})
},
methods: {
getData() {
getList() {
const { form } = this
// this.timer = setInterval(() => {
this.$post(this.api.contestPageConditionQueryByNakadai, {
pageNum: this.page,
pageSize: this.pageSize,
@ -230,7 +230,13 @@ export default {
this.getData()
}
}).catch(res => {})
// }, 1000)
},
getData() {
this.getList()
if (!Setting.isDev) {
clearInterval(this.timer)
this.timer = setInterval(this.getList, 1000)
}
},
initData() {
this.page = 1;

@ -3,7 +3,7 @@
<div>
<el-card shadow="hover" class="m-b-20">
<div class="flex-between">
<el-page-header @back="back" :content="'赛事管理'"></el-page-header>
<el-page-header @back="back" :content="name + '/管理'"></el-page-header>
</div>
</el-card>
<div class="page" style="margin-bottom: 24px">
@ -32,6 +32,7 @@ export default {
name: "matchManage",
data() {
return {
name: '',
active: this.$route.query.tab || "first",
tabs: {
first: "大赛详情",
@ -47,6 +48,9 @@ export default {
notice,
MatchSignup
},
mounted() {
// console.log(33, this.$refs.detail.form)
},
methods: {
back() {
this.handleSave(0) && this.$router.back()

@ -52,6 +52,9 @@
</el-upload>
</el-form-item>
<el-form-item label="比赛范围">
<div>
<el-radio v-model="form.competitionScope" :label="0" disabled>本校内</el-radio>
</div>
<div>
<el-radio v-model="form.competitionScope" :label="1">全平台</el-radio>
</div>
@ -109,7 +112,6 @@
:on-error="uploadError"
:before-upload="beforeUpload"
:on-success="uploadAnnexSuccess"
:before-remove="beforeRemove"
:limit="5"
:on-exceed="handleExceedAnnex"
:action="this.api.fileupload"
@ -201,7 +203,7 @@ export default {
lazyLoad (node, resolve) {
const { level, value } = node
//
console.log('lazy', node)
console.log('lazy', node, that.range)
if (!level) {
that.$get(that.api.queryProvince).then(({ list }) => {
const data = []
@ -292,6 +294,7 @@ export default {
methods: {
getData() {
this.$post(`${this.api.getContest}?contestId=${this.form.id}`).then(({ contest }) => {
this.$parent.name = contest.name
this.signupTime = [contest.signUpStartTime, contest.signUpEndTime]
this.playTime = [contest.playStartTime, contest.playEndTime]
this.sponsorList = contest.sponsor.split(",")
@ -322,6 +325,7 @@ export default {
range.push(item)
})
this.range = range
console.log("🚀 ~ file: matchDetail.vue ~ line 327 ~ this.$post ~ this.range", this.range)
}
// name
@ -329,7 +333,7 @@ export default {
if (rangeName) {
const range = []
rangeName.map(e => {
range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
range.push(e.type ? (e.cityName || e.provinceName) : e.schoolName)
})
this.rangeName = range.join(',')
}
@ -356,6 +360,7 @@ export default {
rangeSubmit() {
// id
const data = []
console.log(55, this.range)
this.range.map(e => {
data.push({
contestId: this.form.id || '',
@ -405,11 +410,17 @@ export default {
this.form.contestAnnexList.push(data)
//
id && this.$post(this.api.saveAnnex, data).then(res => {}).catch(res => {})
console.log(44, this.form)
},
//
beforeUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 10
if (!isLt2M) util.warningMsg('请上传小于10MB的附件!')
if (isLt2M) {
this.fileName = file.name
return true
} else {
return false
}
},
uploadError(err, file, fileList) {
this.$message({
@ -432,6 +443,7 @@ export default {
}).catch(res => {})
},
handleAnnexRemove(file, fileList) {
console.log("🚀 ~ file: matchDetail.vue ~ line 435 ~ handleAnnexRemove ~ file, fileList", file, fileList)
this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
const id = this.form.contestAnnexList.find(e => e.fileName === file.name).id
this.$post(`${this.api.deleteAnnex}?id=${id}`).then(res => {}).catch(res => {})

@ -103,7 +103,7 @@ export default {
});
},
switchOff(val, row, index) {
this.$put(`${this.api.disableApplicant}/${row.id}/${val}`)
this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`)
.then(res => {
})
.catch(err => {

@ -66,7 +66,7 @@
</div>
</div>
<el-table :data="orderData" class="table" ref="table" stripe header-align="center"
@selection-change="handleSelectionChange" :row-key="getRowKeys">
@selection-change="handleSelectionChange" row-key="orderId">
<el-table-column type="selection" width="55" align="center"
:reserve-selection="true"></el-table-column>
<el-table-column type="index" width="100" label="序号" align="center">
@ -270,9 +270,6 @@ export default {
//
handleRenew(row) {
},
getRowKeys(row) {
return row.orderId;
},
handleSelectionChange(val) {
if (val.length > 0) {

@ -110,6 +110,7 @@
<el-table-column prop="phone" label="手机号" align="center" width="120"></el-table-column>
<el-table-column prop="staffArchitectureName" label="所在部门" align="center" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="roleName" label="授权角色" align="center" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="lastLoginTime" label="最后登录时间" align="center" width="130"></el-table-column>
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button type="text" v-auth="'/system:后台账号:查看'" @click="queryStaff(scope.row,true)">查看</el-button>

Loading…
Cancel
Save