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

fix

Browse Source
Branch_d40a2540
yujialong 1 year ago
parent 25a23d85d6
commit 5420b23e61
13 changed files with 383 additions and 329 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. 9
      src/api/index.js
  2. 29
      src/pages/achievement/info/course.vue
  3. 19
      src/pages/achievement/info/project.vue
  4. 4
      src/pages/achievement/list/project.vue
  5. 1
      src/pages/match/add/set.vue
  6. 187
      src/pages/match/manage/matchReport.vue
  7. 48
      src/pages/product/list/index.vue
  8. 4
      src/pages/project/add/index.vue
  9. 6
      src/pages/project/list/index.vue
  10. 3
      src/pages/screen/index.vue
  11. 3
      src/pages/station/preview/index.vue
  12. 2
      src/setting.js
  13. 3
      src/styles/page/station.scss

9
src/api/index.js
Unescape View File

@ -1,7 +1,7 @@
import Setting from "@/setting"; import Setting from "@/setting";
const host = Setting.apiBaseURL const host = Setting.apiBaseURL
const uploadURL = Setting.upload.apiURL; const uploadURL = Setting.upload.apiURL;
const host2 = 'http://192.168.31.52:9000/' const host2 = 'http://121.37.12.51/'
export default { export default {
queryToken: `liuwanr/userInfo/queryToken`, queryToken: `liuwanr/userInfo/queryToken`,
@ -411,9 +411,10 @@ export default {
detailsOfGoods: `nakadai/mall/detailsOfGoods`, detailsOfGoods: `nakadai/mall/detailsOfGoods`,
addLearningRecord: `nakadai/mallCourseLearningRecord/addLearningRecord`, addLearningRecord: `nakadai/mallCourseLearningRecord/addLearningRecord`,
// 课程管理三级联查 // 课程管理三级联查
courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //课程学科类别 courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`,
courseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //课程专业类 courseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`,
courseProfessional: `nakadai/nakadai/subject/courseProfessional`, //课程专业 courseProfessional: `nakadai/nakadai/subject/courseProfessional`,
subjectCategoryCited: `nakadai/nakadai/subject/subjectCategoryCited`,
// 营销推广 // 营销推广
listMarketing: `nakadai/nakadai/mall/marketing/promotion/pagingQueryList`, listMarketing: `nakadai/nakadai/mall/marketing/promotion/pagingQueryList`,

29
src/pages/achievement/info/course.vue
Unescape View File

@ -48,11 +48,11 @@
<div class="wrong"> <div class="wrong">
<div class="line"> <div class="line">
<span class="jud-name">错误率最高：{{ max.projectName }}</span> <span class="jud-name">错误率最高：{{ max.projectName }}</span>
<span>参加考试{{ max.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount}人做错，` : '' }}错误率{{ max.errorRate }}%</span> <span>参加考试{{ max.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || ''}人做错，` : '' }}错误率{{ max.errorRate }}%</span>
</div> </div>
<div class="line"> <div class="line">
<span class="jud-name">错误率最低：{{ min.projectName }}</span> <span class="jud-name">错误率最低：{{ min.projectName }}</span>
<span>参加考试{{ min.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount}人做错，` : '' }}错误率{{ min.errorRate }}%</span> <span>参加考试{{ min.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || ''}人做错，` : '' }}错误率{{ min.errorRate }}%</span>
</div> </div>
</div> </div>
<div class="chart" <div class="chart"
@ -259,6 +259,7 @@
</template> </template>
<script> <script>
import { Loading } from "element-ui";
import Setting from "@/setting"; import Setting from "@/setting";
import util from "@/libs/util"; import util from "@/libs/util";
import echarts from "echarts"; import echarts from "echarts";
@ -295,7 +296,7 @@ export default {
avgScore: 0, // 平均分 avgScore: 0, // 平均分
maxScore: 0, maxScore: 0,
minScore: 0, minScore: 0,
errorAnalysis: {}, errorAnalysis: [],
max: {}, max: {},
min: {}, min: {},
token: util.local.get(Setting.tokenKey), token: util.local.get(Setting.tokenKey),
@ -306,15 +307,16 @@ export default {
pageSizeDetail: 5, pageSizeDetail: 5,
totalDetail: 0, totalDetail: 0,
curRow: {}, curRow: {},
stageNumber: [] stageNumber: [],
loadIns: null
}; };
}, },
watch: { watch: {
keyword: function (val) { keyword: function (val) {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => { this.searchTimer = setTimeout(() => {
this.initData(); this.initData()
}, 500); }, 500)
} }
}, },
mounted () { mounted () {
@ -324,6 +326,9 @@ export default {
methods: { methods: {
// 成绩 // 成绩
async getData () { async getData () {
this.loadIns = Loading.service({
background: "rgba(255,255,255,.6)"
})
const per = +this.curTab const per = +this.curTab
const res = await this.$post(this.api.productReadScore, { const res = await this.$post(this.api.productReadScore, {
pageNum: this.page, pageNum: this.page,
@ -346,8 +351,9 @@ export default {
e.errorRate = (+e.errorRate).toFixed(2) e.errorRate = (+e.errorRate).toFixed(2)
}) })
this.errorAnalysis = err this.errorAnalysis = err
this.max = err[0] this.max = err[0] || {}
this.min = err[err.length - 1] this.min = err[err.length - 1] || {}
this.errorChart()
const { row } = this.$store.state.achievement const { row } = this.$store.state.achievement
row && this.$nextTick(() => { row && this.$nextTick(() => {
window.scrollTo(0, document.documentElement.scrollHeight) window.scrollTo(0, document.documentElement.scrollHeight)
@ -356,7 +362,6 @@ export default {
}) })
this.handlePage() this.handlePage()
this.getChart() this.getChart()
this.errorChart()
}, },
initData () { initData () {
this.page = 1 this.page = 1
@ -520,7 +525,7 @@ export default {
toReport (row) { toReport (row) {
this.$store.commit('achievement/setRow', this.curRow) this.$store.commit('achievement/setRow', this.curRow)
// 考核跳实验报告，练习跳项目维度的成绩详情 // 考核跳实验报告，练习跳项目维度的成绩详情
this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.goodsName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}`) this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.goodsName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}&mallId=${this.id}`)
}, },
getChart () { // 初始化折线图 getChart () { // 初始化折线图
const data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] const data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
@ -575,11 +580,13 @@ export default {
areaStyle: {}, areaStyle: {},
color: ["#8191fd"] color: ["#8191fd"]
}] }]
}); })
this.loadIns.close()
}, },
// 错误率统计图 // 错误率统计图
errorChart () { errorChart () {
const data = this.errorAnalysis const data = this.errorAnalysis
console.log("🚀 ~ file: course.vue:585 ~ errorChart ~ data:", data)
const maxFontLength = data.length > 13 ? 6 : 10 const maxFontLength = data.length > 13 ? 6 : 10
const option = { const option = {
tooltip: { tooltip: {

19
src/pages/achievement/info/project.vue
Unescape View File

@ -268,6 +268,7 @@
</template> </template>
<script> <script>
import { Loading } from "element-ui";
import Setting from "@/setting"; import Setting from "@/setting";
import util from "@/libs/util"; import util from "@/libs/util";
import echarts from "echarts"; import echarts from "echarts";
@ -281,6 +282,7 @@ export default {
permissions: +this.$route.query.permissions, permissions: +this.$route.query.permissions,
experimentalName: this.$route.query.projectName, experimentalName: this.$route.query.projectName,
id: this.$route.query.id, id: this.$route.query.id,
mallId: this.$route.query.mallId,
workNumber: this.$route.query.workNumber, workNumber: this.$route.query.workNumber,
keyword: "", keyword: "",
searchTimer: null, searchTimer: null,
@ -310,6 +312,7 @@ export default {
pageActivation: 1, pageActivation: 1,
pageSizeActivation: 10, pageSizeActivation: 10,
totalActivation: 0, totalActivation: 0,
loadIns: null
}; };
}, },
components: { components: {
@ -349,10 +352,13 @@ export default {
}, },
// 成绩 // 成绩
async getData () { async getData () {
this.loadIns = Loading.service({
background: "rgba(255,255,255,.6)"
})
// 考核和练习调不同接口 // 考核和练习调不同接口
const res = this.permissions ? const res = this.permissions ?
await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}`) : await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}&mallId=${this.mallId}`) :
await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}`) await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
this.listDataAll = res.page.records this.listDataAll = res.page.records
this.total = res.page.total this.total = res.page.total
this.avgScore = (+res.avgScore).toFixed(2) this.avgScore = (+res.avgScore).toFixed(2)
@ -369,7 +375,7 @@ export default {
// 活跃度 // 活跃度
async getActivity () { async getActivity () {
// 考核和练习调不同接口 // 考核和练习调不同接口
const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}`) const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
this.activations = message.records this.activations = message.records
this.totalActivation = message.total this.totalActivation = message.total
}, },
@ -393,7 +399,7 @@ export default {
// 考核和练习的接口不一样 // 考核和练习的接口不一样
let url = this.permissions let url = this.permissions
? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}` ? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}`
: `${this.api.exportPracticeInfo}?projectId=${this.id}` : `${this.api.exportPracticeInfo}?projectId=${this.id}&mallId=${this.mallId}`
// 有勾选，就带上勾选的id // 有勾选，就带上勾选的id
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
const ids = this.multipleSelection.map(e => e.reportId) const ids = this.multipleSelection.map(e => e.reportId)
@ -493,7 +499,7 @@ export default {
responseType: 'blob' responseType: 'blob'
}) })
} else { } else {
res = await axios.get(`${this.api.exportAllActivity}?projectId=${this.id}`, { res = await axios.get(`${this.api.exportAllActivity}?projectId=${this.id}&mallId=${this.mallId}`, {
headers: { headers: {
token: this.token token: this.token
}, },
@ -535,7 +541,8 @@ export default {
areaStyle: {}, areaStyle: {},
color: ["#8191fd"] color: ["#8191fd"]
}] }]
}); })
this.loadIns.close()
}, },
// 错误率统计图 // 错误率统计图
errorChart () { errorChart () {

4
src/pages/achievement/list/project.vue
Unescape View File

@ -268,7 +268,7 @@ export default {
getData () { getData () {
this.loadIns = Loading.service({ this.loadIns = Loading.service({
background: "rgba(255,255,255,.6)" background: "rgba(255,255,255,.6)"
}); })
const per = this.projectPermissions const per = this.projectPermissions
const { mallId } = this const { mallId } = this
const cur = this.curs.find(e => e.mallId == mallId) || {} const cur = this.curs.find(e => e.mallId == mallId) || {}
@ -353,7 +353,7 @@ export default {
}, },
// 进入实验记录 // 进入实验记录
entry (row) { entry (row) {
this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}`) this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.mallId}`)
}, },
handleDelete (row) { // 删除 handleDelete (row) { // 删除
this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", { this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {

1
src/pages/match/add/set.vue
Unescape View File

@ -176,6 +176,7 @@ export default {
// 查询项目 // 查询项目
const first = res.data[0] const first = res.data[0]
this.mallIds = [mallId || first.mallId, systemId || data[0].id] this.mallIds = [mallId || first.mallId, systemId || data[0].id]
this.form.mallId = mallId || first.mallId
this.form.cid = cid || first.cid this.form.cid = cid || first.cid
this.sysId = systemId || first.systemId this.sysId = systemId || first.systemId
this.loadIns = Loading.service() this.loadIns = Loading.service()

187
src/pages/match/manage/matchReport.vue
Unescape View File

@ -1,111 +1,157 @@
<template> <template>
<div class="wrap"> <div class="wrap">
<el-card shadow="hover" class="m-b-20"> <el-card shadow="hover"
<el-page-header @back="$router.back()" content="查看报告"></el-page-header> class="m-b-20">
<el-page-header @back="$router.back()"
content="查看报告"></el-page-header>
</el-card> </el-card>
<div class="content"> <div class="content">
<div class="text-right"> <div class="text-right">
<el-button type="primary" @click="exportPage">导出报告</el-button> <el-button type="primary"
@click="exportPage">导出报告</el-button>
</div> </div>
<h6 class="r-title">标准实验报告</h6> <h6 class="r-title">标准实验报告</h6>
<div class="info"> <div class="info">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/info1.png" alt=""> <img src="@/assets/img/info1.png"
alt="">
基本信息 基本信息
</h6> </h6>
<ul :class="['info-list', {edit: editing}]"> <ul :class="['info-list', {edit: editing}]">
<li> <li>
<label>学生姓名：</label> <label>学生姓名：</label>
<el-input v-if="editing" v-model="infoData.userName" disabled></el-input> <el-input v-if="editing"
v-model="infoData.userName"
disabled></el-input>
<span v-else>{{ infoData.userName }}</span> <span v-else>{{ infoData.userName }}</span>
</li> </li>
<li> <li>
<label>学生学号：</label> <label>学生学号：</label>
<el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input> <el-input v-if="editing"
v-model="infoData.workNumber"
disabled></el-input>
<span v-else>{{ infoData.workNumber }}</span> <span v-else>{{ infoData.workNumber }}</span>
</li> </li>
<li> <li>
<label>实验时间：</label> <label>实验时间：</label>
<el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input> <el-input v-if="editing"
v-model="infoData.submitTime"
disabled></el-input>
<span v-else>{{ infoData.submitTime }}</span> <span v-else>{{ infoData.submitTime }}</span>
</li> </li>
<li> <li>
<label>实验成绩：</label> <label>实验成绩：</label>
<el-input v-if="editing" v-model="infoData.score" disabled></el-input> <el-input v-if="editing"
<div v-else class="score-wrap"> v-model="infoData.score"
disabled></el-input>
<div v-else
class="score-wrap">
<em>{{ infoData.score }}</em> <em>{{ infoData.score }}</em>
<img src="@/assets/img/point.png" alt=""> <img src="@/assets/img/point.png"
alt="">
</div> </div>
</li> </li>
<li> <li>
<label>学生班级：</label> <label>学生班级：</label>
<el-input v-if="editing" v-model="infoData.className"></el-input> <el-input v-if="editing"
v-model="infoData.className"></el-input>
<span v-else>{{ infoData.className }}</span> <span v-else>{{ infoData.className }}</span>
</li> </li>
<li> <li>
<label>指导老师：</label> <label>指导老师：</label>
<el-input v-if="editing" v-model="infoData.instructor"></el-input> <el-input v-if="editing"
v-model="infoData.instructor"></el-input>
<span v-else>{{ infoData.instructor }}</span> <span v-else>{{ infoData.instructor }}</span>
</li> </li>
<li> <li>
<label>实验学时：</label> <label>实验学时：</label>
<el-input v-if="editing" v-model="infoData.period"></el-input> <el-input v-if="editing"
v-model="infoData.period"></el-input>
<span v-else>{{ infoData.period }}</span> <span v-else>{{ infoData.period }}</span>
</li> </li>
</ul> </ul>
<div class="m-b-20"> <div class="m-b-20">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/report2.png" alt=""> <img src="@/assets/img/report2.png"
alt="">
实验项目名称 实验项目名称
</h6> </h6>
<el-input v-if="editing" v-model="form.projectName" type="textarea"></el-input> <el-input v-if="editing"
<div v-else class="pre-wrap" v-html="form.projectName"></div> v-model="form.projectName"
type="textarea"></el-input>
<div v-else
class="pre-wrap"
v-html="form.projectName"></div>
</div> </div>
<div class="m-b-20"> <div class="m-b-20">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/report3.png" alt=""> <img src="@/assets/img/report3.png"
alt="">
实验目的 实验目的
</h6> </h6>
<div :class="['pre-wrap', {edit: editing}]" v-html="form.purpose"></div> <div :class="['pre-wrap', {edit: editing}]"
v-html="form.purpose"></div>
</div> </div>
<div class="m-b-20"> <div class="m-b-20">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/report4.png" alt=""> <img src="@/assets/img/report4.png"
alt="">
实验数据 实验数据
</h6> </h6>
<el-table :data="expData" class="table" border stripe header-align="center"> <el-table :data="expData"
<el-table-column type="index" label="序号" align="center" width="60"> class="table"
border
stripe
header-align="center">
<el-table-column type="index"
label="序号"
align="center"
width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column> <el-table-column prop="judgmentName"
<el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150"> label="判分点"
width="270"
align="center"></el-table-column>
<el-table-column v-if='project'
prop="judgmentName"
label="考核点"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(item, index) in scope.row.lcRuleRecords" :key="index"> <div v-for="(item, index) in scope.row.lcRuleRecords"
:key="index">
<span> <span>
<span>{{index+1}}. </span>{{item.name}} <span>{{index+1}}. </span>{{item.name}}
</span> </span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'> <el-table-column prop="ruleAnswer"
label="参考答案"
style='word-wrap: break-word'>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if='scope.row.lcRuleRecords'> <div v-if='scope.row.lcRuleRecords'>
<div v-for="(item, index) in scope.row.lcRuleRecords" :key="index"> <div v-for="(item, index) in scope.row.lcRuleRecords"
:key="index">
<span> <span>
<span>{{index+1}}. </span>{{item.ruleAnswer}} <span>{{index+1}}. </span>{{item.ruleAnswer}}
</span> </span>
</div> </div>
</div> </div>
<div v-else v-html="scope.row.referenceAnswer"></div> <div v-else
v-html="scope.row.referenceAnswer"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="userAnswer" label="学生答案"> <el-table-column prop="userAnswer"
label="学生答案">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if='scope.row.lcRuleRecords'> <div v-if='scope.row.lcRuleRecords'>
<div v-for="(item, index) in scope.row.lcRuleRecords" :key="index"> <div v-for="(item, index) in scope.row.lcRuleRecords"
:key="index">
<span v-if='item.userAnswer'> <span v-if='item.userAnswer'>
<span>{{index+1}}. </span>{{item.userAnswer}} <span>{{index+1}}. </span>{{item.userAnswer}}
</span> </span>
@ -114,22 +160,39 @@
</span> </span>
</div> </div>
</div> </div>
<div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div> <div v-else
v-html='scope.row.answer'
style='white-space: pre-wrap'></div>
<template v-if="scope.row.runThePictureList"> <template v-if="scope.row.runThePictureList">
<img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic" :src="img" alt=""> <img v-for="(img, i) in scope.row.runThePictureList"
:key="i"
width="200"
class="result-pic"
:src="img"
alt="">
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="score" label="得分" width="80" align="center"></el-table-column> <el-table-column prop="score"
label="得分"
width="80"
align="center"></el-table-column>
</el-table> </el-table>
</div> </div>
<div class="m-b-20"> <div class="m-b-20">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/report5.png" alt=""> <img src="@/assets/img/report5.png"
alt="">
实验总结与体会 实验总结与体会
</h6> </h6>
<quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" /> <quill v-if="editing"
<div v-else class="pre-wrap" v-html="form.summarize"></div> :border="true"
v-model="form.summarize"
:minHeight="150"
:height="150" />
<div v-else
class="pre-wrap"
v-html="form.summarize"></div>
</div> </div>
</div> </div>
</div> </div>
@ -139,7 +202,7 @@
<script> <script>
import util from "@/libs/util"; import util from "@/libs/util";
export default { export default {
data() { data () {
return { return {
reportId: this.$route.query.reportId, reportId: this.$route.query.reportId,
title: "实验报告", title: "实验报告",
@ -155,15 +218,15 @@ export default {
editing: false, editing: false,
loadIns: null, loadIns: null,
loading: false, loading: false,
project:false, project: false,
userScores: [] userScores: []
}; };
}, },
mounted() { mounted () {
this.getData() this.getData()
}, },
methods: { methods: {
getData() { // 查询详情 getData () { // 查询详情
this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => { this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
this.form = report this.form = report
this.expData = userScores this.expData = userScores
@ -177,6 +240,7 @@ export default {
laboratory: form.laboratory, laboratory: form.laboratory,
submitTime: form.submitTime, submitTime: form.submitTime,
score: form.score, score: form.score,
className: form.className,
userName: form.userName userName: form.userName
} }
const data = report.data const data = report.data
@ -187,14 +251,14 @@ export default {
this.$post(this.api.editExperimentalData, { this.$post(this.api.editExperimentalData, {
reportId, reportId,
data: JSON.stringify(userScores) data: JSON.stringify(userScores)
}).then(res => {}).catch(err => {}) }).then(res => { }).catch(err => { })
} else { } else {
this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data)) this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
} }
}).catch(res => {}) }).catch(res => { })
}, },
// 处理实验数据 // 处理实验数据
handleList(list) { handleList (list) {
this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
if (this.project) { if (this.project) {
list.map(e => { list.map(e => {
@ -210,7 +274,7 @@ export default {
} }
this.expData = list this.expData = list
}, },
exportPage() { exportPage () {
const form = Object.assign(this.form, this.infoData) const form = Object.assign(this.form, this.infoData)
const list = JSON.parse(JSON.stringify(this.expData)) const list = JSON.parse(JSON.stringify(this.expData))
list.map((e, i) => { list.map((e, i) => {
@ -230,8 +294,8 @@ export default {
experimentalData: list experimentalData: list
}).then(res => { }).then(res => {
console.log(res) console.log(res)
util.downloadFileDirect(`实验报告.docx`,new Blob([res])) util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
}).catch(res => {}) }).catch(res => { })
}, },
} }
}; };
@ -244,22 +308,24 @@ export default {
.text-right { .text-right {
text-align: right; text-align: right;
} }
code, kbd, samp{ code,
font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; kbd,
samp {
font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
word-wrap: break-word; word-wrap: break-word;
white-space: pre-wrap; white-space: pre-wrap;
} }
/deep/ pre{ /deep/ pre {
white-space: pre-wrap; /* css-3 */ white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
white-space: pre-wrap; /* Opera 4-6 */ white-space: pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */ white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* Internet Explorer 5.5+ */ word-wrap: break-word; /* Internet Explorer 5.5+ */
word-break:break-all; word-break: break-all;
overflow:hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
font-weight:400; font-weight: 400;
font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
} }
.content { .content {
padding: 16px 40px; padding: 16px 40px;
@ -275,7 +341,7 @@ code, kbd, samp{
} }
.info { .info {
padding: 20px 16px; padding: 20px 16px;
border: 1px solid #E1E6F2; border: 1px solid #e1e6f2;
} }
.l-title { .l-title {
display: flex; display: flex;
@ -309,7 +375,7 @@ code, kbd, samp{
span { span {
min-width: 150px; min-width: 150px;
padding: 0 10px 3px; padding: 0 10px 3px;
border-bottom: 1px solid #E1E6F2; border-bottom: 1px solid #e1e6f2;
} }
/deep/.el-input { /deep/.el-input {
width: 174px; width: 174px;
@ -318,7 +384,7 @@ code, kbd, samp{
.score-wrap { .score-wrap {
position: relative; position: relative;
min-width: 150px; min-width: 150px;
border-bottom: 1px solid #E1E6F2; border-bottom: 1px solid #e1e6f2;
em { em {
position: absolute; position: absolute;
top: -12px; top: -12px;
@ -326,7 +392,7 @@ code, kbd, samp{
font-family: din; font-family: din;
font-size: 30px; font-size: 30px;
font-weight: 600; font-weight: 600;
color: #0B1D30; color: #0b1d30;
} }
img { img {
position: absolute; position: absolute;
@ -334,16 +400,17 @@ code, kbd, samp{
left: 0; left: 0;
} }
} }
/deep/.el-textarea .el-textarea__inner, .pre-wrap { /deep/.el-textarea .el-textarea__inner,
.pre-wrap {
min-height: 72px; min-height: 72px;
padding: 10px 16px; padding: 10px 16px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
&.edit { &.edit {
color: #ABB3C6; color: #abb3c6;
border: 1px solid #CACFDB; border: 1px solid #cacfdb;
border-radius: 4px; border-radius: 4px;
background-color: #F6F7F9; background-color: #f6f7f9;
} }
} }
/deep/ .table th { /deep/ .table th {

48
src/pages/product/list/index.vue
Unescape View File

@ -379,46 +379,32 @@ export default {
// 获取学科类别 // 获取学科类别
async getSubject () { async getSubject () {
// 学科类别 // 学科类别
this.$get(this.api.courseDiscipline).then(({ list }) => { this.$get(this.api.subjectCategoryCited).then(({ list }) => {
list = list.filter(e => e.level > 1).slice(1) // 被引用了的才需要展示（level>1）
const result = [] const result = []
const promises = [] const promises = []
list = list.filter(e => e.disciplineId != 1)
list.map((e, i) => { list.map((e, i) => {
promises.push(new Promise((resolve, reject) => {
// 专业类 // 专业类
this.$get(this.api.courseProfessionalClass, { e.professionalClasses.map(e => {
disciplineId: e.disciplineId
}).then(({ list }) => {
list = list.filter(e => e.level > 1)
list.map(e => {
e.value = e.professionalClassId e.value = e.professionalClassId
e.label = e.professionalClassName e.label = e.professionalClassName
// 专业 // 专业
this.$get(this.api.courseProfessional, { e.professionals.map(e => {
professionalClassId: e.value
}).then(({ list }) => {
list = list.filter(e => e.level > 1)
list.map(e => {
e.value = e.professionalId e.value = e.professionalId
e.label = e.professionalName e.label = e.professionalName
}) })
if (list.length) e.children = list e.children = e.professionals
resolve()
}).catch(err => { })
}) })
result.push({ result.push({
val: [], val: [],
disciplineId: e.disciplineId, disciplineId: e.disciplineId,
name: e.disciplineName, name: e.disciplineName,
categoryName: e.disciplineName, categoryName: e.disciplineName,
list list: e.professionalClasses
}) })
}).catch(err => { })
}))
}) })
Promise.all(promises).then(_ => { Promise.all(promises).then(_ => {
console.log("🚀 ~ file: index.vue:378 ~ this.$get ~ result:", result) console.log("🚀 ~ file: index.vue:378 ~ this.$get ~ result:", result)
this.category = result this.category = result
@ -451,28 +437,6 @@ export default {
this.professionalId = val[1] || '' this.professionalId = val[1] || ''
this.initData() this.initData()
}, },
getProfessionalClassData (id) {
const i = id === 1 ? 1 : 0
this.$get(this.api.courseProfessionalClass, {
disciplineId: id || this.categoryId
}).then(({ list }) => {
this.professionalClassList = list.slice(i)
if (id) this.professionalCategoryId = list[i].professionalClassId
this.getProfessionalData(list[i].professionalClassId)
}).catch(err => { })
},
// 获取专业
getProfessionalData (id) {
const i = id === 1 ? 1 : 0
this.$get(this.api.courseProfessional, {
professionalClassId: id || this.professionalCategoryId
}).then(({ list }) => {
this.professionalList = list.slice(i)
if (id) this.professionalId = list[i].professionalId
this.handleCategoryName()
this.initData()
}).catch(err => { })
},
// 返回学科name // 返回学科name
handleCategoryName () { handleCategoryName () {
if (this.subjectList.length) { if (this.subjectList.length) {

4
src/pages/project/add/index.vue
Unescape View File

@ -47,7 +47,7 @@
placeholder="20个字符以内" placeholder="20个字符以内"
@blur="projectNameExistis"></el-input> @blur="projectNameExistis"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目权限"> <el-form-item label="项目用途">
<el-select v-model="projectManage.permissions" <el-select v-model="projectManage.permissions"
placeholder="请选择" placeholder="请选择"
@change="permissionChange"> @change="permissionChange">
@ -302,7 +302,7 @@ export default {
projectManage: { projectManage: {
founder: 1, // 创建人角色(0、系统 1、老师) founder: 1, // 创建人角色(0、系统 1、老师)
projectName: "", // 项目名称 projectName: "", // 项目名称
permissions: 0, // 项目权限(0、练习 1、考核 2、竞赛) permissions: 0, // 项目用途(0、练习 1、考核 2、竞赛)
systemId: this.$store.state.project.lastSystemId, // 系统id systemId: this.$store.state.project.lastSystemId, // 系统id
mallId: '', mallId: '',
hintOpen: 0, // 实验提示是否开启(0开启 1不开启 默认0) hintOpen: 0, // 实验提示是否开启(0开启 1不开启 默认0)

6
src/pages/project/list/index.vue
Unescape View File

@ -34,7 +34,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<label>权限</label> <label>用途</label>
<el-select v-model="queryData.permissions" <el-select v-model="queryData.permissions"
placeholder="请选择" placeholder="请选择"
@change="initData"> @change="initData">
@ -99,7 +99,7 @@
{{ founderKeys[scope.row.founder] }} {{ founderKeys[scope.row.founder] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="权限" <el-table-column label="用途"
min-width="120" min-width="120"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -225,7 +225,7 @@ export default {
platformId: 1, // 平台：职站:1 中台:3 platformId: 1, // 平台：职站:1 中台:3
founder: +this.$route.query.founder || 2, // 创建人角色(0:系统 1:老师 2:全部) founder: +this.$route.query.founder || 2, // 创建人角色(0:系统 1:老师 2:全部)
state: "", // 状态(0:草稿箱 1:已发布) state: "", // 状态(0:草稿箱 1:已发布)
permissions: "", // 项目权限(0:练习 1:考核 2:竞赛) permissions: "", // 项目用途(0:练习 1:考核 2:竞赛)
cid: '', cid: '',
mallId: '' mallId: ''
}, },

3
src/pages/screen/index.vue
Unescape View File

@ -475,6 +475,9 @@ export default {
// 活跃度排行榜 // 活跃度排行榜
this.$post(this.api.activityRanking).then(({ list }) => { this.$post(this.api.activityRanking).then(({ list }) => {
list.sort((a, b) => {
return +b.activityIndex - +a.activityIndex
})
this.actives = list this.actives = list
}).catch(res => { }) }).catch(res => { })
this.scrollTable() this.scrollTable()

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

@ -1300,7 +1300,8 @@ $height: 700px;
background-color: #fff; background-color: #fff;
.title { .title {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 16px; font-size: 15px;
font-weight: 400;
} }
.arches { .arches {
margin-top: 20px; margin-top: 20px;

2
src/setting.js
Unescape View File

@ -26,7 +26,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.217:9000/"; // 榕 // host = "http://192.168.31.217:9000/"; // 榕
// host = 'http://192.168.31.51:9000/'; // 赓 // host = 'http://192.168.31.51:9000/'; // 赓
} }

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

@ -26,6 +26,9 @@
color: rgba(0, 0, 0, 0.45); color: rgba(0, 0, 0, 0.45);
font-size: 14px; font-size: 14px;
} }
/deep/img {
max-width: 95%;
}
} }
.reply-name { .reply-name {
color: #9076ff; color: #9076ff;

Write Preview
Loading…
Cancel
Save