Branch_d40a2540
yujialong 1 year ago
parent a7a979f0f4
commit 71bc842ecd
  1. 2
      src/layouts/header/index.vue
  2. 10
      src/pages/achievement/show/index.vue
  3. 65
      src/pages/assessment/list/index.vue
  4. 2
      src/pages/project/add/index.vue
  5. 4
      src/pages/project/list/index.vue
  6. 50
      src/pages/station/preview/index.vue

@ -153,7 +153,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(`${Setting.isTest ? 'ws' : 'wss'}://${Setting.isDev ? '192.168.31.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;

@ -55,8 +55,8 @@
<li> <li>
<label>学生班级</label> <label>学生班级</label>
<el-input v-if="editing" <el-input v-if="editing"
v-model="infoData.workNumber"></el-input> v-model="infoData.className"></el-input>
<span v-else>{{ infoData.workNumber }}</span> <span v-else>{{ infoData.className }}</span>
</li> </li>
<li> <li>
<label>指导老师</label> <label>指导老师</label>
@ -146,8 +146,7 @@
v-html="scope.row.referenceAnswer"></div> v-html="scope.row.referenceAnswer"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="!project" <el-table-column prop="userAnswer"
prop="userAnswer"
label="学生答案"> label="学生答案">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if='scope.row.lcRuleRecords'> <div v-if='scope.row.lcRuleRecords'>
@ -166,7 +165,8 @@
style='white-space: pre-wrap'></div> style='white-space: pre-wrap'></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="runResult" <el-table-column v-if="!project"
prop="runResult"
label="学生运行结果" label="学生运行结果"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">

@ -50,16 +50,12 @@
</li> </li>
<li> <li>
<label>课程</label> <label>课程</label>
<el-select v-model="curriculumId" <el-cascader v-model="mallIds"
placeholder="请选择" :options="curs"
@change="initData"> :props="{ checkStrictly: true, value: 'id' }"
<el-option label="不限" popper-class="course-cas"
value=""></el-option> @expand-change="curChange"
<el-option v-for="item in curriculumList" @change="curChange"></el-cascader>
:key="item.cid"
:label="item.goodsName"
:value="item.cid"></el-option>
</el-select>
</li> </li>
</ul> </ul>
</div> </div>
@ -272,12 +268,15 @@ export default {
curriculumId: "", curriculumId: "",
keyWord: "", // keyWord: "", //
searchTimer: null, searchTimer: null,
mallIds: [],
curs: [],
form: { form: {
type: "", type: "",
status: "", status: "",
startTime: "", startTime: "",
endTime: "", endTime: "",
month: "" month: "",
}, },
pageNum: +this.$route.query.page || 1, // pageNum: +this.$route.query.page || 1, //
pageSize: 10, // 10 pageSize: 10, // 10
@ -326,8 +325,7 @@ export default {
clearInterval(this.ticker); clearInterval(this.ticker);
this.ticker = null; this.ticker = null;
}); });
this.getData(1); this.getCourse();
this.getschoolCourse();
}, },
methods: { methods: {
pickerInput () { pickerInput () {
@ -368,12 +366,16 @@ export default {
}, },
getData (counddown) { getData (counddown) {
this.listLoading = true; this.listLoading = true;
const { mallIds } = this
const cur = this.curs.find(e => e.mallId == mallIds[0])
let data = { let data = {
...this.form, ...this.form,
keyWord: this.keyWord, keyWord: this.keyWord,
pageNum: this.pageNum, pageNum: this.pageNum,
pageSize: this.pageSize, pageSize: this.pageSize,
curriculumId: this.curriculumId cid: cur.cid,
mallId: mallIds[0],
systemId: mallIds[1]
}; };
this.$post(this.api.pageByCondition, data).then(res => { this.$post(this.api.pageByCondition, data).then(res => {
this.listData = res.list; this.listData = res.list;
@ -409,16 +411,37 @@ export default {
}, },
initData () { initData () {
this.$refs.table.clearSelection(); this.$refs.table.clearSelection();
this.pageNum = 1; this.pageNum = 1
this.getData(); this.getData();
}, },
getschoolCourse () { //
this.$get(this.api.schoolCourse).then(res => { //
this.curriculumList = res.data; async getCourse () {
}).catch(err => { const { data } = await this.$get(this.api.getSystemIdBySchool)
console.log(err); const res = await this.$get(this.api.getSchoolEffectiveCourse)
}); if (res.data.length) {
res.data.map(e => {
e.id = e.mallId
e.label = e.curriculumName
e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) //
})
this.curs = res.data
this.mallIds = [res.data[0].mallId, data[0].id]
this.pageNum = 1
this.getData(1)
console.log("🚀 ~ file: index.vue:431 ~ getSystemData ~ res.data:", this.mallIds)
}
}, },
//
curChange (val) {
const id = val[0]
if (val.length === 1) {
//
this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id]
}
this.initData()
},
add () { add () {
this.$router.push("add"); this.$router.push("add");
}, },

@ -23,7 +23,7 @@
<el-form label-width="80px" <el-form label-width="80px"
:disabled="isDetail"> :disabled="isDetail">
<div class="flex"> <div class="flex">
<el-form-item label="系统"> <el-form-item label="课程">
<el-cascader v-if="projectManage.founder" <el-cascader v-if="projectManage.founder"
v-model="mallIds" v-model="mallIds"
:options="curs" :options="curs"

@ -187,7 +187,7 @@
v-model="copyForm.projectName"></el-input> v-model="copyForm.projectName"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="!curRow.projectManage.founder" <el-form-item v-if="!curRow.projectManage.founder"
label="系统"> label="课程">
<el-cascader v-model="copyMallId" <el-cascader v-model="copyMallId"
:options="curs" :options="curs"
:props="{ checkStrictly: true, value: 'id' }" :props="{ checkStrictly: true, value: 'id' }"
@ -505,7 +505,7 @@ export default {
} }
// //
if (fromSystem && !form.mallId) { if (fromSystem && !form.mallId) {
util.warningMsg("请选择系统"); util.warningMsg("请选择课程");
return; return;
} }
row.projectManage.projectName = form.projectName row.projectManage.projectName = form.projectName

@ -26,9 +26,11 @@
frameborder="0"></iframe> frameborder="0"></iframe>
<template v-if="showMask"> <template v-if="showMask">
<div class="mask" <div class="mask"
style="width:100%;background: #393A3D;height: 30px;top: 53px;"></div> style="top: 0;width:100%;height: 48px;"></div>
<div class="mask" <div class="mask"
style="width:100%;background: #393A3D;height: 30px;top: 53px;"></div> style="top: 53px;width:100%;height: 30px;"></div>
<div class="mask"
style="bottom: 0;right: 0;width:280px;height: 22px;background-color: #444;"></div>
</template> </template>
<template v-if="showMask1"> <template v-if="showMask1">
<div class="word-mask" <div class="word-mask"
@ -537,7 +539,7 @@ export default {
} }
}, },
mounted () { mounted () {
this.init()
}, },
methods: { methods: {
goBack () { goBack () {
@ -549,8 +551,6 @@ export default {
this.insertScript(); this.insertScript();
this.getData(); this.getData();
this.addRecord() this.addRecord()
this.getNote()
this.getComment()
}, },
async getData () { async getData () {
let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`); let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
@ -771,8 +771,10 @@ export default {
return ext; return ext;
}, },
// tab // tab
tabChange (item) { tabChange ({ id }) {
this.active = item.id this.active = id
id == 2 && this.getNote()
id == 4 && this.getComment()
}, },
// / // /
studySection (item) { studySection (item) {
@ -791,10 +793,10 @@ export default {
// //
if (this.overdue || showDia) { if (this.overdue || showDia) {
this.curLink = `${chapterName}${row.name}`; // + this.curLink = `${chapterName}${row.name}`; // +
this.playauth = ""; this.playauth = ''
this.coverUrl = ""; this.coverUrl = ''
this.pdfSrc = ""; this.pdfSrc = ''
this.iframeSrc = ""; this.iframeSrc = ''
this.isPPT = false; this.isPPT = false;
this.isWord = false; this.isWord = false;
this.isExcel = false; this.isExcel = false;
@ -829,23 +831,9 @@ export default {
this.pdfSrc = row.fileUrl; this.pdfSrc = row.fileUrl;
} else { } else {
this.$get(`${this.api.curriculumGetSubsection}/${row.id}`).then(res => { this.$get(`${this.api.curriculumGetSubsection}/${row.id}`).then(res => {
if (row.fileType == "pptx") { if (row.fileType == "pptx") this.isPPT = true
this.isPPT = true; if (row.fileType == "doc" || row.fileType == "docx") this.isWord = true
this.isWord = false; if (row.fileType == "xls" || row.fileType == "xlsx") this.isExcel = true
this.isExcel = false;
} else if (row.fileType == "doc" || row.fileType == "docx") {
this.isPPT = false;
this.isWord = true;
this.isExcel = false;
} else if (row.fileType == "xls" || row.fileType == "xlsx") {
this.isExcel = true;
this.isPPT = false;
this.isWord = false;
} else {
this.isPPT = false;
this.isWord = false;
this.isExcel = false;
}
if (this.isPPT) { if (this.isPPT) {
this.showMask = true; this.showMask = true;
} else { } else {
@ -869,16 +857,16 @@ export default {
} }
}, },
closePlayer () { closePlayer () {
this.playAuth = ""; this.playAuth = ''
this.player.pause(); this.player.pause();
}, },
closeIframe () { closeIframe () {
this.iframeSrc = ""; this.iframeSrc = ''
this.showMask = false; this.showMask = false;
this.showMask1 = false; this.showMask1 = false;
}, },
closePdf () { closePdf () {
this.pdfSrc = ""; this.pdfSrc = ''
this.currentPage = 1; this.currentPage = 1;
}, },
changePdfPage (val) { changePdfPage (val) {

Loading…
Cancel
Save