huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

添加websocket（赛事、创业）

Browse Source
alioss
yujialong 2 years ago
parent 48ec1e6c3b
commit 9fcff50232
8 changed files with 1394 additions and 1248 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/index.js
  2. 63
      src/layouts/header/index.vue
  3. 27
      src/pages/activity/list/index.vue
  4. 37
      src/pages/activity/manage/list/index.vue
  5. 948
      src/pages/ass/list/index.vue
  6. 5
      src/pages/match/details/index.vue
  7. 1553
      src/pages/match/list/index.vue
  8. 2
      src/pages/station/preview/index.vue

1
src/api/index.js
Unescape View File

@ -17,6 +17,7 @@ export default {
deleteProfile : `users/users/userInfo/deleteProfile`, deleteProfile : `users/users/userInfo/deleteProfile`,
getUserRolesPermissionMenu: `${host}users/users/user-role/getUserRolesPermissionMenu`, getUserRolesPermissionMenu: `${host}users/users/user-role/getUserRolesPermissionMenu`,
fileUploadNakadai: `${host}nakadai/nakadai/oss/fileUpload`, fileUploadNakadai: `${host}nakadai/nakadai/oss/fileUpload`,
refreshPageNotification : `nakadai/message/refreshPageNotification`,
platformLogList: `nakadai/nakadai/log/platformLogList`, platformLogList: `nakadai/nakadai/log/platformLogList`,
logNotification: `nakadai/nakadai/log/logNotification`, logNotification: `nakadai/nakadai/log/logNotification`,

63
src/layouts/header/index.vue
Unescape View File

@ -71,6 +71,7 @@ import Setting from "@/setting";
import util from "@/libs/util"; import util from "@/libs/util";
import navbar from "../navbar"; import navbar from "../navbar";
import axios from 'axios' import axios from 'axios'
import Bus from '@/libs/bus'
export default { export default {
data () { data () {
return { return {
@ -97,7 +98,6 @@ export default {
this.getUserInfo(); this.getUserInfo();
this.getNotice() this.getNotice()
} }
this.$once('hook:beforeDestroy', function () { this.$once('hook:beforeDestroy', function () {
clearInterval(this.noticeTimer) clearInterval(this.noticeTimer)
}) })
@ -118,25 +118,66 @@ export default {
} }
}).catch(res => { }); }).catch(res => { });
}, },
// socket连接成功
open () {
console.log("socket连接成功");
},
// socket连接失败
error () {
console.log("连接错误");
},
// 接收消息
getMessage (msg) {
console.log("==websocket接收数据==");
console.log(JSON.parse(msg.data));
const { content } = JSON.parse(msg.data)
// 1赛事、2创业、3考核、4模型。-号拼接携带id
if (content == 1) {
Bus.$emit('matchSocket')
} else if (content == 2) {
Bus.$emit('activitySocket')
} else if (content == 4) {
Bus.$emit('modelSocket')
} else {
this.getNotice()
}
},
// 关闭socket
close () {
console.log("socket已经关闭");
},
initSocket ({ id, account }) {
// 实例化socket
// this.socket = new WebSocket(`ws://${Setting.isDev ? '192.168.31.51' : location.host}:9100/nakadai/websocket/${id}/${account}`)
this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
// 监听socket连接
this.socket.onopen = this.open;
// 监听socket错误信息
this.socket.onerror = this.error;
// 监听socket消息
this.socket.onmessage = this.getMessage;
},
// 获取消息 // 获取消息
getNotice () { getNotice () {
if (!Setting.isDev) { this.$get(this.api.messageNotificationList, {
this.noticeTimer = setInterval(() => { type: 2
this.$get(this.api.messageNotificationList, { }).then(res => {
type: 2 this.notices = res.notificationList
}).then(res => { }).catch(res => { });
this.notices = res.notificationList
}).catch(res => { });
}, 5000)
}
}, },
// 前往评论列表 // 前往评论列表
toComment (item) { async toComment (item) {
await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${item.notifyId}`) // 该通知置为已读
this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`) this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`)
}, },
// 获取用户信息 // 获取用户信息
getUserInfo () { getUserInfo () {
this.$get(this.api.queryUserInfoDetails).then(res => { this.$get(this.api.queryUserInfoDetails).then(res => {
this.initSocket(res.result.userAccount)
const { userAvatars, userName, userId } = res.result.hrUserInfo || {} const { userAvatars, userName, userId } = res.result.hrUserInfo || {}
userAvatars && this.setAvatar(userAvatars); userAvatars && this.setAvatar(userAvatars);
this.setUserId(userId) this.setUserId(userId)

27
src/pages/activity/list/index.vue
Unescape View File

@ -141,11 +141,11 @@ import { mapState, mapMutations } from "vuex";
import { Loading } from "element-ui"; import { Loading } from "element-ui";
import Setting from "@/setting" import Setting from "@/setting"
import util from "@/libs/util" import util from "@/libs/util"
import Bus from '@/libs/bus'
export default { export default {
data () { data () {
return { return {
timer: null, timer: null,
redisTimer: null,
token: util.local.get(Setting.tokenKey), token: util.local.get(Setting.tokenKey),
statusList: ["待报名", "取消报名", "马上报名", "报名截止", "已结束"], statusList: ["待报名", "取消报名", "马上报名", "报名截止", "已结束"],
endList: ["报名开始", "报名截止", "报名截止", "项目开始", "项目结束"], endList: ["报名开始", "报名截止", "报名截止", "项目开始", "项目结束"],
@ -200,17 +200,21 @@ export default {
} }
}, },
mounted () { mounted () {
// websocket实时刷新
Bus.$on('activitySocket', () => {
this.getData()
})
this.getData() this.getData()
this.$once('hook:beforeDestroy', function () { this.$once('hook:beforeDestroy', function () {
this.clearTimer() this.clearTimer()
clearInterval(this.redisTimer)
}) })
}, },
methods: { methods: {
...mapMutations('match', [ ...mapMutations('match', [
'SET_TYPE' 'SET_TYPE'
]), ]),
getList () { getData () {
this.clearTimer() this.clearTimer()
const { form } = this const { form } = this
const data = { const data = {
@ -281,27 +285,10 @@ export default {
}) })
this.timerList = [] this.timerList = []
}, },
getData () {
// this.loadIns = Loading.service()
this.getList()
if (!Setting.isDev) {
clearInterval(this.redisTimer)
this.redisTimer = setInterval(this.getRedis, 1000)
}
},
initData () { initData () {
this.page = 1 this.page = 1
this.getData() this.getData()
}, },
// 获取redis缓存
getRedis () {
this.$post(this.api.getRedisCacheActivity).then(({ data }) => {
if (data) {
localStorage.getItem('activityTimestampClient') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
localStorage.setItem('activityTimestampClient', data)
}
}).catch(res => { })
},
changeType (type) { changeType (type) {
const { form } = this const { form } = this
form.competitionScope = 3 form.competitionScope = 3

37
src/pages/activity/manage/list/index.vue
Unescape View File

@ -155,6 +155,7 @@ import Setting from "@/setting";
import { mapMutations } from "vuex"; import { mapMutations } from "vuex";
import { Loading } from 'element-ui' import { Loading } from 'element-ui'
import breadcrumb from '@/components/breadcrumb' import breadcrumb from '@/components/breadcrumb'
import Bus from '@/libs/bus'
export default { export default {
components: { breadcrumb }, components: { breadcrumb },
data () { data () {
@ -211,7 +212,6 @@ export default {
playingStages: [] playingStages: []
}, },
timer: null, timer: null,
redisTimer: null,
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
text: '此刻', text: '此刻',
@ -249,18 +249,21 @@ export default {
} }
}, },
mounted () { mounted () {
// websocket实时刷新
Bus.$on('activitySocket', () => {
this.getData()
})
this.getData() this.getData()
this.$once('hook:beforeDestroy', function () { this.$once('hook:beforeDestroy', function () {
clearInterval(this.timer) clearInterval(this.timer)
clearInterval(this.redisTimer)
}) })
}, },
methods: { methods: {
...mapMutations('activity', [ ...mapMutations('activity', [
'setPage' 'setPage'
]), ]),
getList () { getData () {
// const load = Loading.service()
const { form } = this const { form } = this
this.$post(this.api.myActivities, { this.$post(this.api.myActivities, {
pageNum: this.page, pageNum: this.page,
@ -308,33 +311,12 @@ export default {
this.getData() this.getData()
} }
} }
}).catch(res => { }).catch(res => { })
// load.close()
})
},
getData () {
this.getList()
}, },
initData () { initData () {
this.page = 1; this.page = 1;
this.getData(); this.getData();
}, },
// 获取redis缓存
getRedis () {
this.$post(this.api.getRedisCacheActivity).then(({ data }) => {
if (data) {
localStorage.getItem('activityTimestampClient') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
localStorage.setItem('activityTimestampClient', data)
}
}).catch(res => { })
},
getData () {
this.getList()
if (!Setting.isDev) {
clearInterval(this.redisTimer)
this.redisTimer = setInterval(this.getRedis, 1000)
}
},
add () { add () {
this.$router.push("add"); this.$router.push("add");
}, },
@ -392,7 +374,7 @@ export default {
if (date == "0000-00-00 00:00:00") return "---"; if (date == "0000-00-00 00:00:00") return "---";
return date; return date;
}, },
switchOff (val, row) { async switchOff (val, row) {
this.$post(this.api.disabledEventsActivity, { this.$post(this.api.disabledEventsActivity, {
activityId: row.id, activityId: row.id,
isOpen: val, isOpen: val,
@ -400,6 +382,7 @@ export default {
}).then(res => { }).catch(err => { }).then(res => { }).catch(err => {
row.isOpen = val ? 0 : 1 row.isOpen = val ? 0 : 1
}) })
await this.$post(`${this.api.refreshPageNotification}?content=2`)
}, },
} }
}; };

948
src/pages/ass/list/index.vue
Unescape View File

@ -1,140 +1,201 @@
<template> <template>
<!-- 考核列表 --> <!-- 考核列表 -->
<div class="wrap"> <div class="wrap">
<div class="page" style="padding-bottom: 0;margin-bottom: 12px"> <div class="page"
<h6 class="l-title"> style="padding-bottom: 0;margin-bottom: 12px">
<img src="@/assets/img/ass1.png" alt=""> <h6 class="l-title">
考核筛选 <img src="@/assets/img/ass1.png"
</h6> alt="">
<ul class="filter"> 考核筛选
<li> </h6>
<label>考核时间：</label> <ul class="filter">
<el-radio-group size="small" v-model="form.month"> <li>
<el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border> <label>考核时间：</label>
{{ item.name }} <el-radio-group size="small"
</el-radio> v-model="form.month">
</el-radio-group> <el-radio v-for="(item,index) in dateList"
<el-date-picker :key="index"
size="small" :label="item.id"
v-model="date" border>
align="right" {{ item.name }}
unlink-panels type="daterange" </el-radio>
start-placeholder="开始日期" </el-radio-group>
end-placeholder="结束日期" <el-date-picker size="small"
format="yyyy-MM-dd" v-model="date"
value-format="yyyy-MM-dd" align="right"
clearable unlink-panels
style="width: 300px" type="daterange"
></el-date-picker> start-placeholder="开始日期"
</li> end-placeholder="结束日期"
</ul> format="yyyy-MM-dd"
<ul class="filter"> value-format="yyyy-MM-dd"
<li> clearable
<label>课程名称：</label> style="width: 300px"></el-date-picker>
<el-select size="small" v-model="form.curriculumId" @change="initData"> </li>
<el-option label="不限" value=""></el-option> </ul>
<el-option <ul class="filter">
v-for="(item,index) in courseList" <li>
:key="index" <label>课程名称：</label>
:label="item.sysName" <el-select size="small"
:value="item.sysId" v-model="form.curriculumId"
></el-option> @change="initData">
</el-select> <el-option label="不限"
</li> value=""></el-option>
<li> <el-option v-for="(item,index) in courseList"
<label>实验班级：</label> :key="index"
<el-select size="small" v-model="form.classId" @change="initData"> :label="item.sysName"
<el-option label="不限" value=""></el-option> :value="item.sysId"></el-option>
<el-option </el-select>
v-for="(item,index) in classList" </li>
:key="index" <li>
:label="item.className" <label>实验班级：</label>
:value="item.id" <el-select size="small"
></el-option> v-model="form.classId"
</el-select> @change="initData">
</li> <el-option label="不限"
<li> value=""></el-option>
<label>实验状态：</label> <el-option v-for="(item,index) in classList"
<el-select size="small" v-model="form.status" @change="initData"> :key="index"
<el-option :label="item.className"
v-for="(item,index) in statusList" :value="item.id"></el-option>
:key="index" :label="item.name" </el-select>
:value="item.value" </li>
></el-option> <li>
</el-select> <label>实验状态：</label>
</li> <el-select size="small"
<li> v-model="form.status"
<label>搜索：</label> @change="initData">
<el-input placeholder="请输入考核名称" v-model="form.keyWord" clearable></el-input> <el-option v-for="(item,index) in statusList"
</li> :key="index"
</ul> :label="item.name"
</div> :value="item.value"></el-option>
<div class="page"> </el-select>
<el-table v-loading="listLoading" :data="listData" class="table" stripe header-align="center"> </li>
<el-table-column type="index" width="60" label="序号" align="center"> <li>
<template slot-scope="scope"> <label>搜索：</label>
{{ scope.$index + (page - 1) * pageSize + 1 }} <el-input placeholder="请输入考核名称"
</template> v-model="form.keyWord"
</el-table-column> clearable></el-input>
<el-table-column prop="sysName" label="课程名称" align="center" show-overflow-tooltip></el-table-column> </li>
<el-table-column prop="experimentalName" label="考核名称" align="center" show-overflow-tooltip></el-table-column> </ul>
<el-table-column prop="className" label="实验班级" align="center"></el-table-column> </div>
<el-table-column prop="experimentalNum" width="90" label="实验人数" align="center"></el-table-column> <div class="page">
<el-table-column prop="experimentDuration" width="90" label="考试时长" align="center"></el-table-column> <el-table v-loading="listLoading"
<el-table-column prop="createTime" width="160" label="创建时间" align="center"></el-table-column> :data="listData"
<el-table-column prop="startTime" width="160" label="起始时间" align="center"></el-table-column> class="table"
<el-table-column prop="stopTime" width="160" label="结束时间" align="center"></el-table-column> stripe
<el-table-column label="倒计时" width="90" align="center"> header-align="center">
<template slot-scope="scope"> <el-table-column type="index"
<span>{{ timeFilter(scope.row) }}</span> width="60"
</template> label="序号"
</el-table-column> align="center">
<el-table-column label="考核状态" width="90" align="center"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.$index + (page - 1) * pageSize + 1 }}
<span class="ellipsis">{{ status[scope.row.status] }}</span> </template>
</template> </el-table-column>
</el-table-column> <el-table-column prop="sysName"
<!-- <el-table-column label="实验状态" align="center">--> label="课程名称"
<!-- <template slot-scope="scope" v-if="scope.row.show">--> align="center"
<!-- <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>--> show-overflow-tooltip></el-table-column>
<!-- </template>--> <el-table-column prop="experimentalName"
<!-- </el-table-column>--> label="考核名称"
<el-table-column width="100" label="操作" align="center"> align="center"
<template slot-scope="scope"> show-overflow-tooltip></el-table-column>
<!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)--> <el-table-column prop="className"
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 0" type="text" disabled>未参加</el-button> label="实验班级"
<el-button v-if="(scope.row.status == 2 && scope.row.stuState == 1) || (scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId == null)" type="text" disabled> align="center"></el-table-column>
未提交 <el-table-column prop="experimentalNum"
</el-button> width="90"
<el-button v-if="scope.row.status != 2 && (scope.row.stuState == 0 || scope.row.stuState == 1)" type="text" label="实验人数"
@click="entry(scope.row)" :disabled="scope.row.status !== 1">进入 align="center"></el-table-column>
</el-button> <el-table-column prop="experimentDuration"
<el-button v-if="scope.row.status == 1 && scope.row.stuState == 2" type="text" disabled>已提交</el-button> width="90"
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId" type="text" label="考试时长"
@click="show(scope.row)">查看成绩 align="center"></el-table-column>
</el-button> <el-table-column prop="createTime"
</template> width="160"
</el-table-column> label="创建时间"
</el-table> align="center"></el-table-column>
<div class="pagination"> <el-table-column prop="startTime"
<el-pagination width="160"
background label="起始时间"
layout="total, prev, pager, next" align="center"></el-table-column>
:total="totals" <el-table-column prop="stopTime"
@current-change="handleCurrentChange" width="160"
:current-page="page" label="结束时间"
></el-pagination> align="center"></el-table-column>
</div> <el-table-column label="倒计时"
</div> width="90"
align="center">
<el-dialog title="请输入邀请码" :visible.sync="icVisible" width="30%" @close="closeIc" center <template slot-scope="scope">
:close-on-click-modal="false"> <span>{{ timeFilter(scope.row) }}</span>
<el-input v-model="invitationCode" placeholder="邀请码" maxlength="6"></el-input> </template>
<div slot="footer" class="dialog-footer"> </el-table-column>
<el-button type="primary" @click="saveIc">确 定</el-button> <el-table-column label="考核状态"
</div> width="90"
</el-dialog> align="center">
<template slot-scope="scope">
<span class="ellipsis">{{ status[scope.row.status] }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="实验状态" align="center">-->
<!-- <template slot-scope="scope" v-if="scope.row.show">-->
<!-- <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="100"
label="操作"
align="center">
<template slot-scope="scope">
<!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 0"
type="text"
disabled>未参加</el-button>
<el-button v-if="(scope.row.status == 2 && scope.row.stuState == 1) || (scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId == null)"
type="text"
disabled>
未提交
</el-button>
<el-button v-if="scope.row.status != 2 && (scope.row.stuState == 0 || scope.row.stuState == 1)"
type="text"
@click="entry(scope.row)"
:disabled="scope.row.status !== 1">进入
</el-button>
<el-button v-if="scope.row.status == 1 && scope.row.stuState == 2"
type="text"
disabled>已提交</el-button>
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId"
type="text"
@click="show(scope.row)">查看成绩
</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background
layout="total, prev, pager, next"
:total="totals"
@current-change="handleCurrentChange"
:current-page="page"></el-pagination>
</div>
</div> </div>
<el-dialog title="请输入邀请码"
:visible.sync="icVisible"
width="30%"
@close="closeIc"
center
:close-on-click-modal="false">
<el-input v-model="invitationCode"
placeholder="邀请码"
maxlength="6"></el-input>
<div slot="footer"
class="dialog-footer">
<el-button type="primary"
@click="saveIc">确 定</el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
@ -143,325 +204,326 @@ import Setting from "@/setting";
import util from "@/libs/util"; import util from "@/libs/util";
export default { export default {
name: "ass", name: "ass",
data() { data () {
return { return {
tickerArr: [], tickerArr: [],
classList: [], classList: [],
courseList: [], courseList: [],
host: Setting.apiBaseURL, host: Setting.apiBaseURL,
status: ["待开始", "进行中", "已结束"], status: ["待开始", "进行中", "已结束"],
statusList: [{ statusList: [{
name: "不限", name: "不限",
value: "" value: ""
}, { }, {
name: "待开始", name: "待开始",
value: 0 value: 0
}, { }, {
name: "进行中", name: "进行中",
value: 1 value: 1
}, { }, {
name: "已结束", name: "已结束",
value: 2 value: 2
}], }],
stuState: ["未考", "在考", "已考"], stuState: ["未考", "在考", "已考"],
listData: [], listData: [],
date: [], date: [],
form: { form: {
keyWord: '', keyWord: '',
month: "", month: "",
startTime: "", startTime: "",
endTime: "", endTime: "",
status: "", status: "",
curriculumId: "", curriculumId: "",
classId: "" classId: ""
}, },
dateList: [ dateList: [
{ {
id: "", id: "",
name: "不限" name: "不限"
},
{
id: 1,
name: "近一个月"
},
{
id: 3,
name: "近三个月"
},
{
id: 6,
name: "近六个月"
}
],
page: 1,
pageSize: 10,
totals: 0,
listLoading:false,// 列表加载
icVisible: false,
invitationCode: "",
searchTimer: null,
curRow: {},
ticker: null, // 倒计时定时器
item:{
},
projectId:null,
url:'',
cid:null,
systemId:null,
assessmentId:'',
classId:'',
stopTime:'',
sss:1,
datassdata:0,
};
},
computed: {
...mapState("user", [
"userId", "schoolId", "studentId", "userName"
])
},
watch: {
"form.month": function(val) {
if (val) {
let unit = 24 * 60 * 60 * 1000;
this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
} else {
this.date = [];
}
}, },
date: function(val) { {
if (val) { id: 1,
this.form.startTime = val[0]; name: "近一个月"
this.form.endTime = val[1]; },
} else { {
this.form.startTime = ""; id: 3,
this.form.endTime = ""; name: "近三个月"
}
this.initData();
}, },
'form.keyWord': function(val) { {
clearTimeout(this.searchTimer); id: 6,
this.searchTimer = setTimeout(() => { name: "近六个月"
this.initData();
}, 500);
} }
],
page: 1,
pageSize: 10,
totals: 0,
listLoading: false,// 列表加载
icVisible: false,
invitationCode: "",
searchTimer: null,
curRow: {},
ticker: null, // 倒计时定时器
item: {
},
projectId: null,
url: '',
cid: null,
systemId: null,
assessmentId: '',
classId: '',
stopTime: '',
sss: 1,
datassdata: 0,
};
},
computed: {
...mapState("user", [
"userId", "schoolId", "studentId", "userName"
])
},
watch: {
"form.month": function (val) {
if (val) {
let unit = 24 * 60 * 60 * 1000;
this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
} else {
this.date = [];
}
}, },
mounted() { date: function (val) {
// 页面离开的时候销毁手机和邮箱验证码定时器 if (val) {
this.$once("hook:beforeDestroy", function() { this.form.startTime = val[0];
this.sss = 0 this.form.endTime = val[1];
clearInterval(this.ticker); } else {
this.ticker = null; this.form.startTime = "";
}); this.form.endTime = "";
this.getData(); }
this.getCourseData(); this.initData();
this.getClassData();
}, },
methods: { 'form.keyWord': function (val) {
timeFilter(countDown) { clearTimeout(this.searchTimer);
if (countDown.countDown > 0) { this.searchTimer = setTimeout(() => {
let h = Math.floor(countDown.countDown / (60 * 60)); this.initData();
let m = Math.floor(countDown.countDown % (60 * 60) / 60); }, 500);
let s = Math.floor(countDown.countDown % (60 * 60) % 60); }
return `${h > 9 ? h : `0${h}`}:${m > 9 ? m : `0${m}`}:${s > 9 ? s : `0${s}`}`; },
} else { mounted () {
if (countDown.status == 1){ // 页面离开的时候销毁手机和邮箱验证码定时器
this.$post(`${this.api.collectPaper}?id=${countDown.assessmentId}`).then(res => { this.$once("hook:beforeDestroy", function () {
}) this.sss = 0
}else{ clearInterval(this.ticker);
this.ticker = null;
} });
return "00:00:00"; this.getData();
} this.getCourseData();
}, this.getClassData();
beginTimer() { },
this.ticker = setInterval(() => { methods: {
if(this.sss == 0){ timeFilter (countDown) {
this.ticker = null; if (countDown.countDown > 0) {
clearInterval(this.ticker); let h = Math.floor(countDown.countDown / (60 * 60));
}else{ let m = Math.floor(countDown.countDown % (60 * 60) / 60);
for (let i = 0; i < this.listData.length; i++) { let s = Math.floor(countDown.countDown % (60 * 60) % 60);
const item = this.listData[i]; return `${h > 9 ? h : `0${h}`}:${m > 9 ? m : `0${m}`}:${s > 9 ? s : `0${s}`}`;
if (item.countDown > 0) { } else {
item.countDown--; if (countDown.status == 1) {
} else { this.$post(`${this.api.collectPaper}?id=${countDown.assessmentId}`).then(res => {
if (item.status == 0 && item.type == 2) { // 待开始-定时发布 })
item.status = 1; } else {
item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
} else if (item.status == 1) {
// item.status = 2;
}
}
item.show = true;
this.$set(this.listData, i, item);
}
} }
}, 1000); return "00:00:00";
}, }
getData() { },
this.listLoading = true; beginTimer () {
this.sss = 0 this.ticker = setInterval(() => {
this.listData.splice(0); if (this.sss == 0) {
if (this.ticker) { this.ticker = null;
clearInterval(this.ticker); clearInterval(this.ticker);
} } else {
let data = { for (let i = 0; i < this.listData.length; i++) {
...this.form, const item = this.listData[i];
pageNum: this.page, if (item.countDown > 0) {
pageSize: this.pageSize item.countDown--;
};
this.$post(this.api.pageStuAssessment, data).then(res => {
this.listData = res.list;
for (var i=0;i<this.listData.length;i++){
if (this.listData[i].reportId == undefined){
this.listData[i].reportId = null
}
}
this.totals = res.total;
this.listData.forEach(i => {
i.show = false;
if (i.status == 2) { // 已结束
i.countDown = 0;
} else {
if (i.type == 2) { // 定时发布
if (i.status == 0) {
// 待开始
i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
} else if (i.status == 1) {
// 进行中
i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
}
} else if (i.type == 1) { // 手动发布
if (i.status == 0) {
// 待开始
i.countDown = 0;
} else if (i.status == 1) {
// 进行中
i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
}
}
}
});
this.sss = 1;
// if(this.datassdata == 0){
// this.datassdata = this.datassdata+1
this.beginTimer()
// }
this.listLoading = false;
}).catch(err => {
this.listLoading = false;
});
},
initData() {
this.sss = 0
this.page = 1;
this.getData();
},
getCourseData() {
this.$get(this.api.getPythonSysByStuAccountId).then(res => {
this.courseList = res.list;
}).catch(err => {
});
},
getClassData() {
this.$post(this.api.myClassByStudent).then(({ data }) => {
this.classList = data.filter(e => e)
}).catch(err => {
});
},
handleCurrentChange(val) { // 切换页码
this.page = val;
this.sss = 0
this.getData();
},
entry(row) { // 进入考核
this.item = row
this.assessmentId =this.item.assessmentId
this.classId = this.item.classId
if (row.status == 0) {
return util.warningMsg("该实验尚未开始");
} else if (row.status == 2) {
return util.warningMsg("该实验已经结束");
} else { } else {
this.curRow = row; if (item.status == 0 && item.type == 2) { // 待开始-定时发布
if (row.isEnableCode == 0) { // 是否启用邀请码(0、未启用 1、启用) item.status = 1;
this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => { item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
this.curRow.curriculumId = res.info.systemId } else if (item.status == 1) {
this.projectId = res.projectId // item.status = 2;
this.url = res.url }
this.cid = res.info.cid
this.systemId = res.info.systemId
var date = res.assessmentInfo.stopTime;
date = date.substring(0,19);
date = date.replace(/-/g,'/');
this.stopTime = new Date(date).getTime();
this.goSubSystem();
}).catch(res => {
});
} else {
this.icVisible = true
}
} }
}, item.show = true;
show(row) { // 查看成绩 this.$set(this.listData, i, item);
this.$router.push(`/record/show?reportId=${row.reportId}`); }
},
saveIc() { }
if (!this.invitationCode) return util.warningMsg("请输入邀请码"); }, 1000);
if (!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码"); },
this.$post(`${this.api.enterExam}?assessmentId=${this.item.assessmentId}&classId=${this.item.classId}&invitationCode=${this.invitationCode}`).then(res => { getData () {
util.successMsg("验证成功！"); this.listLoading = true;
this.icVisible = false; this.sss = 0
this.projectId = res.projectId this.listData.splice(0);
this.url = res.url if (this.ticker) {
this.cid = res.info.cid clearInterval(this.ticker);
this.systemId = res.info.systemId }
setTimeout(() => { let data = {
this.goSubSystem(); ...this.form,
}, 1000); pageNum: this.page,
}).catch(res => { pageSize: this.pageSize
}); };
}, this.$post(this.api.pageStuAssessment, data).then(res => {
closeIc() { this.listData = res.list;
this.invitationCode = ""; for (var i = 0; i < this.listData.length; i++) {
}, if (this.listData[i].reportId == undefined) {
goSubSystem() { this.listData[i].reportId = null
let token = util.local.get(Setting.tokenKey) }
const classId = this.classId }
const classItem = this.classList.find(e => e.id == classId) this.totals = res.total;
let curriculumId = this.curRow.curriculumId this.listData.forEach(i => {
util.cookies.set("token", token) i.show = false;
util.cookies.set("assessmentId", this.assessmentId) if (i.status == 2) { // 已结束
util.cookies.set("classId", classId) i.countDown = 0;
util.cookies.set("className", classItem ? encodeURI(classItem.className) : '') } else {
util.cookies.set("projectId", this.projectId) if (i.type == 2) { // 定时发布
util.cookies.set("courseId", this.cid) if (i.status == 0) {
util.cookies.set("curriculumName", escape(this.curRow.sysName)); // 待开始
util.cookies.set("startTime", this.curRow.startTime) i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
util.cookies.set("stopTime", this.curRow.stopTime) } else if (i.status == 1) {
util.cookies.set("systemId", this.systemId); // 进行中
util.cookies.set('fromManager', '', -1) i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
util.cookies.set('competitionId', '', -1) }
let href = '' } else if (i.type == 1) { // 手动发布
if (curriculumId == 11){ if (i.status == 0) {
href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`; // 待开始
} else if (curriculumId == 12) { i.countDown = 0;
// 众筹系统 } else if (i.status == 1) {
window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${this.curRow.classId}`); // 进行中
} else { i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
if(process.env.NODE_ENV === 'development') { }
href = 'http://192.168.31.125:8085/#/'
} else {
href = `${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
}
} }
if (!href) return util.errorMsg("该考核非Python考核，请选择其他考核"); }
location.href = href; });
this.sss = 1;
// if(this.datassdata == 0){
// this.datassdata = this.datassdata+1
this.beginTimer()
// }
this.listLoading = false;
}).catch(err => {
this.listLoading = false;
});
},
initData () {
this.sss = 0
this.page = 1;
this.getData();
},
getCourseData () {
this.$get(this.api.getPythonSysByStuAccountId).then(res => {
this.courseList = res.list;
}).catch(err => {
});
},
getClassData () {
this.$post(this.api.myClassByStudent).then(({ data }) => {
this.classList = data.filter(e => e)
}).catch(err => {
});
},
handleCurrentChange (val) { // 切换页码
this.page = val;
this.sss = 0
this.getData();
},
entry (row) { // 进入考核
this.item = row
this.assessmentId = this.item.assessmentId
this.classId = this.item.classId
if (row.status == 0) {
return util.warningMsg("该实验尚未开始");
} else if (row.status == 2) {
return util.warningMsg("该实验已经结束");
} else {
this.curRow = row;
if (row.isEnableCode == 0) { // 是否启用邀请码(0、未启用 1、启用)
this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => {
this.curRow.curriculumId = res.info.systemId
this.projectId = res.projectId
this.url = res.url
this.cid = res.info.cid
this.systemId = res.info.systemId
var date = res.assessmentInfo.stopTime;
date = date.substring(0, 19);
date = date.replace(/-/g, '/');
this.stopTime = new Date(date).getTime();
this.goSubSystem();
}).catch(res => {
});
} else {
this.icVisible = true
}
}
},
show (row) { // 查看成绩
this.$router.push(`/record/show?reportId=${row.reportId}`);
},
saveIc () {
if (!this.invitationCode) return util.warningMsg("请输入邀请码");
if (!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码");
this.$post(`${this.api.enterExam}?assessmentId=${this.item.assessmentId}&classId=${this.item.classId}&invitationCode=${this.invitationCode}`).then(res => {
util.successMsg("验证成功！");
this.icVisible = false;
this.projectId = res.projectId
this.url = res.url
this.cid = res.info.cid
this.systemId = res.info.systemId
setTimeout(() => {
this.goSubSystem();
}, 1000);
}).catch(res => {
});
},
closeIc () {
this.invitationCode = "";
},
goSubSystem () {
let token = util.local.get(Setting.tokenKey)
const classId = this.classId
const classItem = this.classList.find(e => e.id == classId)
let curriculumId = this.curRow.curriculumId
util.cookies.set("token", token)
util.cookies.set("assessmentId", this.assessmentId)
util.cookies.set("classId", classId)
util.cookies.set("className", classItem ? encodeURI(classItem.className) : '')
util.cookies.set("projectId", this.projectId)
util.cookies.set("courseId", this.cid)
util.cookies.set("curriculumName", escape(this.curRow.sysName));
util.cookies.set("startTime", this.curRow.startTime)
util.cookies.set("stopTime", this.curRow.stopTime)
util.cookies.set("systemId", this.systemId);
util.cookies.set('fromManager', '', -1)
util.cookies.set('competitionId', '', -1)
util.cookies.set('isSubmit', '', -1)
let href = ''
if (curriculumId == 11) {
href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
} else if (curriculumId == 12) {
// 众筹系统
window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${this.curRow.classId}`);
} else {
if (process.env.NODE_ENV === 'development') {
href = 'http://192.168.31.125:8085/#/'
} else {
href = `${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
} }
}
if (!href) return util.errorMsg("该考核非Python考核，请选择其他考核");
location.href = href;
} }
}
}; };
</script> </script>

5
src/pages/match/details/index.vue
Unescape View File

@ -1425,6 +1425,7 @@ export default {
util.cookies.set('courseId', form.cid) util.cookies.set('courseId', form.cid)
util.cookies.set('curriculumName', escape(form.systemName)) util.cookies.set('curriculumName', escape(form.systemName))
util.cookies.set('systemId', form.systemId) util.cookies.set('systemId', form.systemId)
util.cookies.set('isSubmit', '', -1)
util.cookies.set('competitionId', this.form.id) util.cookies.set('competitionId', this.form.id)
util.cookies.set('stageId', form.stageId) util.cookies.set('stageId', form.stageId)
util.cookies.set('teamId', this.form.competitionRegistration.teamId) util.cookies.set('teamId', this.form.competitionRegistration.teamId)
@ -1442,7 +1443,7 @@ export default {
// 进入子系统 // 进入子系统
toSub () { toSub () {
const { form } = this const { form } = this
const { systemId, projectId, cid, stageId } = this.curStage const { systemId, projectId, cid, stageId, endTime } = this.curStage
const competitionId = form.id const competitionId = form.id
const teamId = form.competitionRegistration.teamId const teamId = form.competitionRegistration.teamId
let token = util.local.get(Setting.tokenKey); let token = util.local.get(Setting.tokenKey);
@ -1451,7 +1452,7 @@ export default {
location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true` location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
} else if (systemId == 12) { } else if (systemId == 12) {
// 众筹系统 // 众筹系统
window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`); window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&endTime=${endTime}`);
} else { } else {
// python系统 // python系统
this.toPython(this.curProject) this.toPython(this.curProject)

1553
src/pages/match/list/index.vue
View File

File diff suppressed because it is too large Load Diff

2
src/pages/station/preview/index.vue
Unescape View File

@ -684,7 +684,6 @@ export default {
this.active = 4 this.active = 4
const el = document.getElementById('comment' + this.commentId) const el = document.getElementById('comment' + this.commentId)
el && el.scrollIntoView(false) el && el.scrollIntoView(false)
await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${this.notifyId}`) // 从消息通知点进来的则加载完后调已读接口
this.commentId = '' this.commentId = ''
} }
}) })
@ -951,6 +950,7 @@ export default {
util.cookies.set('curriculumName', escape(this.curriculumName)) util.cookies.set('curriculumName', escape(this.curriculumName))
util.cookies.set('systemId', id) util.cookies.set('systemId', id)
util.cookies.set('mallId', this.mallId) util.cookies.set('mallId', this.mallId)
util.cookies.set('isSubmit', '', -1)
util.cookies.set('fromManager', '', -1) util.cookies.set('fromManager', '', -1)
util.cookies.set('competitionId', '', -1) util.cookies.set('competitionId', '', -1)
// 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统 // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统

Write Preview
Loading…
Cancel
Save