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

课程换成产品

Browse Source
alioss
yujialong 2 years ago
parent 6a87d478c5
commit 6de3eb9d23
6 changed files with 594 additions and 427 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. 8
      src/layouts/header/index.vue
  2. 10
      src/pages/ass/list/index.vue
  3. 956
      src/pages/index/list/index.vue
  4. 43
      src/pages/station/preview/index.vue
  5. 2
      src/setting.js
  6. 2
      src/styles/page/station.scss

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

@ -22,7 +22,8 @@
<div class="right"> <div class="right">
<template v-if="token || serverToken"> <template v-if="token || serverToken">
<el-popover placement="top" <el-popover v-if="!isIndex"
placement="top"
:disabled="!notices.length"> :disabled="!notices.length">
<p v-for="(item, i) in notices" <p v-for="(item, i) in notices"
:key="i" :key="i"
@ -150,7 +151,7 @@ export default {
}, },
initSocket ({ id, account }) { initSocket ({ id, account }) {
// 实例化socket // 实例化socket
this.socket = new WebSocket(`wss://${Setting.isDev ? '192.168.31.51' : location.host}/nakadai/websocket/${id}/${account}`) this.socket = new WebSocket(`wss://${Setting.isDev ? '121.37.12.51' : location.host}/nakadai/websocket/${id}/${account}`)
// this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`) // this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
// 监听socket连接 // 监听socket连接
this.socket.onopen = this.open; this.socket.onopen = this.open;
@ -172,12 +173,13 @@ export default {
// 前往评论列表 // 前往评论列表
async toComment (item) { async toComment (item) {
await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${item.notifyId}`) // 该通知置为已读 await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${item.notifyId}`) // 该通知置为已读
this.getNotice()
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) this.isIndex || 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)

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

@ -37,14 +37,14 @@
<li> <li>
<label>课程名称：</label> <label>课程名称：</label>
<el-select size="small" <el-select size="small"
v-model="form.curriculumId" v-model="form.mallId"
@change="initData"> @change="initData">
<el-option label="不限" <el-option label="不限"
value=""></el-option> value=""></el-option>
<el-option v-for="(item,index) in courseList" <el-option v-for="(item,index) in courseList"
:key="index" :key="index"
:label="item.sysName" :label="item.goodsName"
:value="item.sysId"></el-option> :value="item.mallId"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
@ -93,7 +93,7 @@
{{ scope.$index + (page - 1) * pageSize + 1 }} {{ scope.$index + (page - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sysName" <el-table-column prop="goodsName"
label="课程名称" label="课程名称"
align="center" align="center"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
@ -234,7 +234,7 @@ export default {
startTime: "", startTime: "",
endTime: "", endTime: "",
status: "", status: "",
curriculumId: "", mallId: "",
classId: "" classId: ""
}, },
dateList: [ dateList: [

956
src/pages/index/list/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -157,8 +157,8 @@
<div class="tab-content"> <div class="tab-content">
<div v-if="active === 1" <div v-if="active === 1"
class="page"> class="page">
<p class="intro" <div class="des"
v-html="briefIntroduction"></p> v-html="briefIntroduction"></div>
</div> </div>
<div v-if="active === 2" <div v-if="active === 2"
class="page"> class="page">
@ -208,15 +208,13 @@
:key="i"> :key="i">
<p class="sign">{{ item.createTime }}</p> <p class="sign">{{ item.createTime }}</p>
<div class="ver"> <div class="ver">
<div> {{ item.noteName }}
{{ item.noteName }} <span class="action">
<span class="action"> <i class="el-icon-edit-outline"
<i class="el-icon-edit-outline" @click="editNote(item)"></i>
@click="editNote(item)"></i> <i class="el-icon-delete"
<i class="el-icon-delete" @click="delNote(item)"></i>
@click="delNote(item)"></i> </span>
</span>
</div>
</div> </div>
<div class="des" <div class="des"
v-html="item.noteContent"></div> v-html="item.noteContent"></div>
@ -256,7 +254,7 @@
<i class="icon el-icon-chat-dot-square" <i class="icon el-icon-chat-dot-square"
@click="showReplay(item)"></i> @click="showReplay(item)"></i>
<!-- 当前用户是管理员 || 当前用户的account==该条评论的创建人accountId --> <!-- 当前用户是管理员 || 当前用户的account==该条评论的创建人accountId -->
<i v-if="item.currentRoleName.includes('管理员') || item.currentAccountId == item.createAccountId" <i v-if="(item.currentRoleName && item.currentRoleName.includes('管理员')) || item.currentAccountId == item.createAccountId"
class="icon el-icon-delete" class="icon el-icon-delete"
@click="delComment(item)"></i> @click="delComment(item)"></i>
<!-- <div class="like-wrap" <!-- <div class="like-wrap"
@ -310,7 +308,7 @@
<i class="icon el-icon-chat-dot-square" <i class="icon el-icon-chat-dot-square"
@click="showReplay(reply)"></i> @click="showReplay(reply)"></i>
<!-- 当前用户是管理员 || 当前用户的account==该条评论的创建人accountId --> <!-- 当前用户是管理员 || 当前用户的account==该条评论的创建人accountId -->
<i v-if="reply.currentRoleName.includes('管理员') || reply.currentAccountId == reply.createAccountId" <i v-if="(reply.currentRoleName && reply.currentRoleName.includes('管理员')) || reply.currentAccountId == reply.createAccountId"
class="icon el-icon-delete" class="icon el-icon-delete"
@click="delComment(reply)"></i> @click="delComment(reply)"></i>
<!-- <div class="like-wrap" <!-- <div class="like-wrap"
@ -578,11 +576,11 @@ export default {
// 查询是否过期 // 查询是否过期
getStatus () { getStatus () {
this.$get(this.api.whetherToRenewTheFee, { this.$get(this.api.whetherToRenewTheFee, {
cid: this.courseId mallId: this.mallId
}).then(({ isRenew }) => { }).then(({ isRenew }) => {
// 1正常显示资源，0显示续费 // 1正常显示资源，0显示续费
this.overdue = isRenew this.overdue = isRenew
this.getChapter(1) this.getChapter()
this.getProgress() this.getProgress()
}).catch(res => { }) }).catch(res => { })
}, },
@ -679,7 +677,6 @@ export default {
this.$nextTick(async () => { this.$nextTick(async () => {
if (this.curReplyId) { if (this.curReplyId) {
const el = document.querySelector('#comment' + this.curReplyId) const el = document.querySelector('#comment' + this.curReplyId)
console.log("🚀 ~ file: index.vue:681 ~ this.$nextTick ~ el:", el)
el && el.scrollIntoView(false) el && el.scrollIntoView(false)
} }
if (this.commentId) { if (this.commentId) {
@ -971,9 +968,7 @@ export default {
let userName = window.btoa(encodeURIComponent(this.userName)); let userName = window.btoa(encodeURIComponent(this.userName));
if (systemId == 11) { if (systemId == 11) {
// 银行系统 // 银行系统
sessionStorage.removeItem('projectId') location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true`
sessionStorage.removeItem('submited')
location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true`
} else if (systemId == 12) { } else if (systemId == 12) {
// 众筹系统 // 众筹系统
window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`); window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`);
@ -1001,10 +996,12 @@ $height: 700px;
border: 0; border: 0;
} }
.page { .page {
.intro { /deep/.des {
font-size: 14px; div,
color: #333; p,
line-height: 24px; span {
font-family: PingFangSC-Regular !important;
}
} }
} }
.l-title { .l-title {

2
src/setting.js
Unescape View File

@ -28,7 +28,7 @@ if (isPro) {
uploadURL = `http://121.37.12.51/` uploadURL = `http://121.37.12.51/`
host = "http://121.37.12.51/"; // 测试服 host = "http://121.37.12.51/"; // 测试服
// host = 'https://www.occupationlab.com/' // 正式服 // host = 'https://www.occupationlab.com/' // 正式服
// host = "http://192.168.31.152:9000/"; // 榕 host = "http://192.168.31.152:9000/"; // 榕
// host = "http://192.168.31.51:9000/"; // 赓 // host = "http://192.168.31.51:9000/"; // 赓
} }

2
src/styles/page/station.scss
Unescape View File

@ -121,7 +121,7 @@
align-items: center; align-items: center;
padding-bottom: 10px; padding-bottom: 10px;
margin: -22px 0 20px; margin: -22px 0 20px;
font-size: 18px; font-size: 20px;
color: #007eff; color: #007eff;
border-bottom: 1px dashed #bfbfbf; border-bottom: 1px dashed #bfbfbf;
} }

Write Preview
Loading…
Cancel
Save