diff --git a/src/components/pdf/index.vue b/src/components/pdf/index.vue index bd70a17..fd13359 100644 --- a/src/components/pdf/index.vue +++ b/src/components/pdf/index.vue @@ -54,7 +54,7 @@ export default { methods: { closePdf() { this.$emit("update:visible", false); - this.$emit("update:src", ""); + // this.$emit("update:src", ""); this.currentPage = 1; }, changePdfPage(val) { diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 0309a5d..d9614b7 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -69,7 +69,7 @@ export default { }, methods: { ...mapMutations("user", [ - 'SET_CUSTOMERNAME' + 'SET_CUSTOMERNAME', 'setUserId' ]), ...mapActions("user", [ "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName" @@ -86,8 +86,9 @@ export default { // 获取用户信息 getUserInfo() { this.$get(this.api.queryUserInfoDetails).then(res => { - const {userAvatars, userName} = res.result.hrUserInfo || {} + const {userAvatars, userName, userId} = res.result.hrUserInfo || {} userAvatars && this.setAvatar(userAvatars); + this.setUserId(userId) this.setUserName(userName); if (!userName && !this.customerName) { this.$get(this.api.isClient).then(res => { diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index 306f55f..5eb1dea 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -80,7 +80,7 @@
- 依据国家政策法规，需绑定手机号进行实网络实名才可登录使用本平台 + 依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index df964f5..05cf654 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -460,12 +460,16 @@ export default { util.cookies.set("startTime", this.curRow.startTime) util.cookies.set("stopTime", this.curRow.stopTime) util.cookies.set("systemId", curriculumId); + util.cookies.set('fromManager', '', -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:8080/#/' + href = 'http://192.168.31.125:8085/#/' } else { href = `${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统 } diff --git a/src/pages/info/details/index.vue b/src/pages/info/details/index.vue index ecb5116..d25042b 100644 --- a/src/pages/info/details/index.vue +++ b/src/pages/info/details/index.vue @@ -110,6 +110,7 @@ export default { } } .content{ + padding: 0 150px; line-height: 1.8; font-size: 16px; text-indent: 2em; diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue index e3c2c37..7d7c5e7 100644 --- a/src/pages/record/show/index.vue +++ b/src/pages/record/show/index.vue @@ -114,7 +114,7 @@ - + - + @@ -179,7 +182,8 @@ export default { editing: false, loadIns: null, loading: false, - project:false + project:false, + userScores: [] }; }, components: { @@ -212,6 +216,7 @@ export default { } form.assessmentId && (this.breadPath = ['实验记录', '实验报告']) const data = report.data + this.userScores = userScores // 如果没有data，则添加，否则，直接使用 if (!data) { this.handleList(userScores) @@ -220,7 +225,7 @@ export default { data: JSON.stringify(userScores) }).then(res => {}).catch(err => {}) } else { - this.handleList(JSON.parse(data)) + this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data)) } }).catch(res => {}) }, @@ -242,9 +247,12 @@ export default { this.expData = list }, exportPage() { - const form = JSON.parse(JSON.stringify(this.form)) + const form = Object.assign(this.form, this.infoData) const list = JSON.parse(JSON.stringify(this.expData)) list.map((e, i) => { + const item = this.userScores.find(n => n.judgmentId == e.judgmentId) + if (item && item.runThePicture) e.runThePicture = item.runThePicture + if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList e.id = i + 1 if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/( |&|%s)/g, '').replace(/>/g, '>').replace(/]+>/g, '').replace(/( |&|%s)/g, '').replace(/>/g, '>').replace(/
+

@@ -105,6 +106,8 @@

该课程订阅期限已到期，请联系院校管理员续费

 + + @@ -116,10 +119,10 @@ import pdf from "vue-pdf"; import "quill/dist/quill.core.css"; import "quill/dist/quill.snow.css"; import "quill/dist/quill.bubble.css"; -import bus from "@/libs/bus"; import breadcrumb from '@/components/breadcrumb' +import pdfDia from '@/components/pdf' export default { - components: { pdf, breadcrumb }, + components: { pdf, breadcrumb, pdfDia }, data() { return { startTime: Date.now(), // 页面进来的时间 @@ -277,8 +280,6 @@ export default { this.coverUrl = row.fileUrl; } else if (row.fileType == "pdf") { this.pdfSrc = row.fileUrl; - console.log("🚀 ~ file: index.vue ~ line 246 ~ preview ~ this.pdfSrc", this.pdfSrc) - this.pdfVisible = true; } else { this.$get(`${this.api.curriculumGetSubsection}/${row.id}`).then(res => { if (row.fileType == "pptx") { @@ -340,6 +341,10 @@ export default { loadPdfHandler(e) { this.currentPage = 1; }, + // pdf全屏 + fullScreen() { + this.pdfVisible = true + }, // 选择项目 selectProject(item) { this.curProject = item.projectId @@ -407,13 +412,12 @@ export default { let token = util.local.get(Setting.tokenKey); let roleId = this.roleId == 4 ? 0 : 1; let userName = window.btoa(encodeURIComponent(this.userName)); - if (systemId == 11) { // 银行系统 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) { // 众筹系统 - window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}`); + window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`); } else if (systemId == 21) { window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`); } else if (systemId == 22) { @@ -659,6 +663,13 @@ $height: 700px; } } .pdf{ + position: relative; + .full { + position: absolute; + top: 7px; + right: 10px; + cursor: pointer; + } .arrow{ padding: 10px 0; display: flex; diff --git a/src/setting.js b/src/setting.js index d584556..8dd1134 100644 --- a/src/setting.js +++ b/src/setting.js @@ -11,7 +11,7 @@ const isZxy = url.includes('izhixinyun'); //是否是智信云 let systemPath = `${location.origin}/banksystem` let host = `${location.origin}/` -let uploadURL = `http://121.37.12.51/` +let uploadURL = `${location.origin}/` let title = isZxy ? '智信云' : (isHh || isCH) ? @@ -25,9 +25,10 @@ if (isPro) { } else if (isDev) { // 本地 systemPath = `http://${location.hostname}:8093` + uploadURL = `http://121.37.12.51/` host = "http://121.37.12.51/"; // 测试服 // host = 'https://www.occupationlab.com/' // 正式服 - host = "http://192.168.31.51:9000/"; // 榕 + // host = "http://192.168.31.51:9000/"; // 榕 // host = "http://192.168.31.116:9000/"; // 赓 } @@ -50,7 +51,7 @@ const Setting = { tokenExpires: 1296000000, // token在localStorage的时间(毫秒) tokenKey: "oc_client_token", // localStorage里保存的token的key storeKey: "oc_client_store", // localStorage里保存的vuex的key - initialPassword: "111aaa", // 默认密码 + initialPassword: "1122aa", // 默认密码 isDev, isTest, isPro, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 678bbb8..4611cd5 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -52,6 +52,9 @@ export default { SET_LOG: (state) => { state.logView = true }, + setUserId: (state, userId) => { + state.userId = userId + }, }, actions: { login({ state, commit }, userInfo) {