diff --git a/src/api/index.js b/src/api/index.js index 1be6090..1742eb8 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,7 +1,7 @@ import Setting from "@/setting"; const host = Setting.apiBaseURL const uploadURL = Setting.upload.apiURL; -const host1 = "http://121.37.12.51:8080/" +const host1 = "https://www.occupationlab.com:8080/" const host2 = 'http://192.168.31.137:9000/' export default { @@ -46,7 +46,7 @@ export default { saveOrg: `occupationlab/occupationlab/architecture/save`, // 新增组织架构 updateOrg: `occupationlab/occupationlab/architecture/update`, // 编辑组织架构 deleteOrg: `occupationlab/occupationlab/architecture/delete`, // 删除组织架构 - studentTemplate: `http://121.37.12.51/template/学生导入模板.xlsx`, // 学生导入模板 + studentTemplate: `https://www.occupationlab.com/template/学生导入模板.xlsx`, // 学生导入模板 // 测评管理 questionsList: `occupationlab/occupationlab/questions/list`, // 题库列表查询 @@ -55,7 +55,7 @@ export default { questionsDetail: `occupationlab/occupationlab/questions/detail`, // 查看当前题库信息 questionsDelete: `occupationlab/occupationlab/questions/delete`, // 根据主键删除 questionsIsDisable: `occupationlab/occupationlab/questions/isDisable`, // 是否禁用试题 - questionsTemplate: `http://121.37.12.51/template/试题导入模板.xlsx`, //excel模板文件下载 + questionsTemplate: `https://www.occupationlab.com/template/试题导入模板.xlsx`, //excel模板文件下载 questionsImport: `${host}occupationlab/occupationlab/questions/importQuestion`, // 批量导入题库 questionsExportFailure: `${host}occupationlab/occupationlab/questions/exportFailure`, // 批量导入题库失败数据导出 questionsInfo: `occupationlab/occupationlab/questions/info`, // 测评规则信息的展示 @@ -230,7 +230,7 @@ export default { modifyStaff: `occupationlab/occupationlab/staff/modifyStaff`, //编辑员工 delStaff: `occupationlab/occupationlab/staff/delStaff`, //删除员工 staffList: `occupationlab/occupationlab/staff/staffList`, //员工列表 - staffTemplate: `http://121.37.12.51/template/员工用户导入模板.xlsx`, //员工用户导入模板 + staffTemplate: `https://www.occupationlab.com/template/员工用户导入模板.xlsx`, //员工用户导入模板 exportFailureStaff: `${host}occupationlab/occupationlab/staff/exportFailure`, //批量导入员工失败数据导出 importStaff: `${host}occupationlab/occupationlab/staff/importStaff`, //批量导入员工 // 角色管理 diff --git a/src/components/pdf/index.vue b/src/components/pdf/index.vue index 00899d9..fd13359 100644 --- a/src/components/pdf/index.vue +++ b/src/components/pdf/index.vue @@ -9,12 +9,15 @@ :modal="false" :append-to-body="true">
- +

- + {{ currentPage }} / {{ pageCount }} - +

{ let { hrUserInfo } = res.result if (hrUserInfo) { - const { userAvatars, userName } = hrUserInfo + const { userAvatars, userName, userId } = hrUserInfo + this.setUserId(userId) userAvatars && this.setAvatar(userAvatars) this.setUserName(userName) } else { diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index 0e8b7ad..6125b7d 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -37,7 +37,7 @@
- 依据国家政策法规，需绑定手机号进行实网络实名才可登录使用本平台 + 依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue index 0985330..c2de969 100644 --- a/src/pages/achievement/show/index.vue +++ b/src/pages/achievement/show/index.vue @@ -90,7 +90,7 @@
- + - + @@ -152,7 +155,8 @@ export default { editing: false, loadIns: null, loading: false, - project:false + project:false, + userScores: [] }; }, mounted() { @@ -176,6 +180,7 @@ export default { userName: form.userName } const data = report.data + this.userScores = userScores // 如果没有data，则添加，否则，直接使用 if (!data) { this.handleList(userScores) @@ -184,7 +189,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 => {}) }, @@ -206,11 +211,14 @@ 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(/]+>/g, '').replace(/( |&|%s)/g, '').replace(/>/g, '>').replace(/
+

@@ -100,6 +101,8 @@

+ +
@@ -111,10 +114,9 @@ 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 pdfDia from '@/components/pdf' export default { - components: { pdf }, + components: { pdf, pdfDia }, data() { return { courseId: this.$route.query.courseId, @@ -262,7 +264,6 @@ export default { this.coverUrl = row.fileUrl; } else if (row.fileType == "pdf") { this.pdfSrc = row.fileUrl; - this.pdfVisible = true; } else { this.$get(`${this.api.curriculumGetSubsection}/${row.id}`).then(res => { if (row.fileType == "pptx") { @@ -328,6 +329,10 @@ export default { loadPdfHandler(e) { this.currentPage = 1; }, + // pdf全屏 + fullScreen() { + this.pdfVisible = true + }, // 选择项目 selectProject(item) { this.curProject = item.projectId @@ -401,7 +406,7 @@ export default { location.href = `${Setting.bankPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true&manager=1` } 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) { @@ -625,6 +630,14 @@ $height: 700px; } } .pdf{ + position: relative; + margin-top: 0 !important; + .full { + position: absolute; + top: 7px; + right: 10px; + cursor: pointer; + } .arrow{ padding: 10px 0; display: flex; diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue index 561bcb1..d871e0e 100644 --- a/src/pages/student/list/index.vue +++ b/src/pages/student/list/index.vue @@ -572,7 +572,7 @@ export default { architectureId: this.architectureId, level: this.orgLevel, keyWord: this.keyWord, - pageNum: 1, + pageNum: this.page, pageSize: this.pageSize }; this.$post(this.api.organizationalStudentList, params).then(res => { @@ -679,7 +679,7 @@ export default { }, resetPassword(row) { // 重置密码 this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => { - this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=111aaa`).then(res => { + this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=1122aa`).then(res => { util.successMsg("重置成功"); }).catch(res => { }); diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue index 3063830..0df5c9c 100644 --- a/src/pages/system/list/staff.vue +++ b/src/pages/system/list/staff.vue @@ -300,7 +300,7 @@ export default { }, resetPassword(row) { // 重置密码 this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => { - this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=111aaa`).then(res => { + this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=1122aa`).then(res => { util.successMsg("重置成功"); }).catch(res => { }); diff --git a/src/setting.js b/src/setting.js index 3f2fc32..118ebf2 100644 --- a/src/setting.js +++ b/src/setting.js @@ -12,23 +12,22 @@ const isTest = url.includes('121.37.12.51'); //中台测试服 let bankPath = `${location.origin}/banksystem` // 银行系统地址 let jumpPath = `${location.origin}/judgmentPoint` let host = `${location.origin}/` -let uploadURL = `http://121.37.12.51/` +let uploadURL = `${location.origin}/` let title = (isHh || isCH) ? '教师管理端' : '职站服务端管理系统' -if (isPro || isZxy) { - if (isPro) bankPath = `https://www.huorantech.cn/banksystem` +if (isPro) { + bankPath = `https://www.huorantech.cn/banksystem` // 职站生产 uploadURL = `https://www.huorantech.cn/` jumpPath = `https://www.huorantech.cn/judgmentPoint/` } else if (isDev) { jumpPath = `http://${location.hostname}:8087/` bankPath = `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/'; // 赓 -} else if (isZxy) { - uploadURL = `https://izhixinyun.com/` } const Setting = { @@ -68,7 +67,7 @@ const Setting = { /** * 默认密码 */ - initialPassword: "111aaa", + initialPassword: "1122aa", /** * 多语言配置 * */ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4181b56..ca7b2b4 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -15,7 +15,7 @@ export default { title: "", logoUrl: "", avatar: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png", - userId: 3, + userId: '', userName: "", roleId: "", dataTime: "", @@ -62,6 +62,9 @@ export default { SET_LOG: (state) => { state.logView = true }, + setUserId: (state, userId) => { + state.userId = userId + }, }, actions: { login({ state, commit }, userInfo) {