From 690554178df8471e9d2c2000eefaf6cb696ffee4 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Tue, 30 May 2023 15:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AD=A6=E4=BA=92=E5=8A=A8=E3=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 38 +- src/assets/img/like-up.png | Bin 0 -> 285 bytes src/assets/img/like.png | Bin 408 -> 475 bytes src/layouts/header/index.vue | 281 +++++---- src/pages/achievement/teach/index.vue | 3 +- src/pages/expSystem/backstage/addModel.vue | 14 +- src/pages/expSystem/backstage/model.vue | 580 ++++++++++-------- src/pages/expSystem/backstage/modelType.vue | 4 +- src/pages/expSystem/backstage/sourceModel.vue | 48 +- src/pages/expSystem/backstage/sourceType.vue | 13 +- src/pages/product/show/index.vue | 2 +- src/pages/station/preview/index.vue | 203 ++++-- src/setting.js | 2 +- 13 files changed, 723 insertions(+), 465 deletions(-) create mode 100644 src/assets/img/like-up.png diff --git a/src/api/index.js b/src/api/index.js index 7179a55..47bb0d6 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -35,6 +35,15 @@ export default { deleteNotes: `nakadai/curriculumNotes/deleteNotes`, updateNote: `nakadai/curriculumNotes/updateNote`, + // 教学互动 + addCommentStation: `nakadai/comment/addComment`, + commentTreeList: `nakadai/comment/commentTreeList`, + deleteAComment: `nakadai/comment/deleteAComment`, + commentAndLike: `nakadai/commentLike/commentAndLike`, + unlike: `nakadai/commentLike/unlike`, + messageNotificationList: `nakadai/notify/messageNotificationList`, + noticeRead: `nakadai/notify/noticeRead`, + // 权限管理 getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`, @@ -395,9 +404,36 @@ export default { referenceFindById: `nakadai/nakadai/model/reference/demo/findById`, modelFindById: `nakadai/nakadai/model/demo/findById`, queryTheModelOfOurSchool: `nakadai/nakadai/model/reference/demo/queryTheModelOfOurSchool`, - sourceModelClassification: `nakadai/nakadai/model/category/sourceModelClassification`, getAllModelListBySys: `nakadai/nakadai/model/demo/getAllModelListBySys`, runPythonCode: `nakadai/nakadai/model/demo/runPythonCode`, + saveSysModelDemo: `nakadai/nakadai/model/demo/saveSysModelDemo`, + updateSysModelDemo: `nakadai/nakadai/model/demo/updateSysModelDemo`, + deleteSourceModelCategory: `nakadai/nakadai/model/category/deleteSourceModelCategory`, + categorySave: `nakadai/nakadai/model/category/save`, + sourceModelClassification: `nakadai/nakadai/model/category/sourceModelClassification`, + updateSourceModelCategory: `nakadai/nakadai/model/category/updateSourceModelCategory`, + builtInModelClassification: `nakadai/nakadai/model/category/builtInModelClassification`, + InstitutionSourceModel: `nakadai/nakadai/model/demo/InstitutionSourceModel`, + bulkDisable: `nakadai/nakadai/model/demo/bulkDisable`, + deleteSysModelDemo: `nakadai/nakadai/model/demo/deleteSysModelDemo`, + sysModelDemoList: `nakadai/nakadai/model/demo/sysModelDemoList`, + + deleteModelClass: `nakadai/nakadai/model/reference/deleteModelClass`, + modelClassList: `nakadai/nakadai/model/reference/modelClassList`, + saveReferenceCategory: `nakadai/nakadai/model/reference/saveReferenceCategory`, + updateModelClass: `nakadai/nakadai/model/reference/updateModelClass`, + checkIsShowBySystemId: `nakadai/nakadai/model/reference/checkIsShowBySystemId`, + modifyIsShowState: `nakadai/nakadai/model/reference/modifyIsShowState`, + editProvinceCity: `nakadai/nakadai/partner-team/editProvinceCity`, + editPartnerTeamRates: `nakadai/nakadai/partner-team/editPartnerTeamRates`, + teamPartnerList: `nakadai/nakadai/partnerAccount/teamPartnerList`, + + delModelInfoBySystemId: `nakadai/nakadai/model/reference/demo/delModelInfoBySystemId`, + deleteReferenceDemo: `nakadai/nakadai/model/reference/demo/deleteReferenceDemo`, + saveReferenceDemo: `nakadai/nakadai/model/reference/demo/saveReferenceDemo`, + referenceDemoList: `nakadai/nakadai/model/reference/demo/referenceDemoList`, + getAllModelList: `nakadai/nakadai/model/reference/demo/getAllModelList`, + synchronizationMdel: `nakadai/nakadai/model/reference/demo/synchronizationMdel`, // 教师评语 addComment: `evaluation/cevaluation/comment/addComment`, diff --git a/src/assets/img/like-up.png b/src/assets/img/like-up.png new file mode 100644 index 0000000000000000000000000000000000000000..f46d61970b84abcf2120b8c8aecc936a110bf66d GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}*F9YvLoEF7 zPO;`YWWdu_-`%KeP{6InV9UgOz2N9H&aFwF>@5w^28J6hYZvgk9pQ58yTuop8GNXv zou~8fPf6iAl_!TSB_cTrL=<{;RejCoE)WWmc%GyAig%UchftT&4!4giiPx$l}SWFR5(wilQC#hQ51&1|D{TVZX!i!Cl});tsq#65fL361RdP$YI%=FP;aNE zgTAywOJ3;gpoeRZs6d7&zAvmjfnzdrF*HO7|-Gvqbe@Qg#Px$Qb|NXR5(wq)W1u^Kp4jH?|XG~Q8y7672E_T7r}NDDGmy{Xcs3J2X*pC?h+JN zK@j}|q=K8$+3Mn;n-pA~#e%cYSDMf^AW4mSQ!c!Gc<*^H5&mgOs^fGFDAC}VK(5ki zlOd-ADDOZ3cnAfYRFkk|XkVu=oZ-tPR?mT6d|Am3InAS3d?|#G(2tX)?2y$X1jWe? zPM=Wj@ntg`6m?T3#{!-_U{w=VHGFEICPBRqaAQpB|OOiV4690AUHv&XM(I=hgk+v zj(2p5;VmQdN{%@^sr??>)ggMQ;Y(i>Z71w(9XXw)!5)E3{}tLs8O4|NI8;G-Y>&Tn z71BR CNvf~_ diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 174e091..e314cb2 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -1,131 +1,178 @@ \ No newline at end of file diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue index bf1141b..f7fcbde 100644 --- a/src/pages/achievement/teach/index.vue +++ b/src/pages/achievement/teach/index.vue @@ -397,7 +397,8 @@ export default { }, // 导出实验报告 exportReport () { - this.listData.forEach(async e => { + const list = this.multipleSelection.length ? this.multipleSelection : this.listData + list.forEach(async e => { const { report, userScores } = await this.$get(`${this.api.reportDetail}?reportId=${e.reportId}`) const list = userScores list.map((e, i) => { diff --git a/src/pages/expSystem/backstage/addModel.vue b/src/pages/expSystem/backstage/addModel.vue index bae108e..10d6399 100644 --- a/src/pages/expSystem/backstage/addModel.vue +++ b/src/pages/expSystem/backstage/addModel.vue @@ -8,12 +8,10 @@
发布 草稿
@@ -116,8 +114,9 @@ export default { }, // 获取分类 getType () { - this.$post(this.api.sourceModelClassification).then(res => { - const { data } = res + this.$post(this.api.sourceModelClassification, { + founder: 1 + }).then(({ data }) => { // 没有子级，删除children属性 const handleLeaf = list => { list.map(e => { @@ -129,7 +128,7 @@ export default { }) } handleLeaf(data) - this.categoryList = data[0].children + this.categoryList = data if (this.id) { this.getData() } else { @@ -154,7 +153,8 @@ export default { modelName, modelDemo, postStatus, - systemId: this.systemId + systemId: this.systemId, + founder: 1 } if (id) { data.id = id @@ -165,7 +165,7 @@ export default { this.submiting = false }) } else { - this.$post(this.api.saveAcademyModelDemo, data).then(res => { + this.$post(this.api.saveSysModelDemo, data).then(res => { this.$message.success('新增成功') fromBack || this.$router.back() }).catch(res => { diff --git a/src/pages/expSystem/backstage/model.vue b/src/pages/expSystem/backstage/model.vue index 6ff578b..896d1d1 100644 --- a/src/pages/expSystem/backstage/model.vue +++ b/src/pages/expSystem/backstage/model.vue @@ -1,281 +1,327 @@ \ No newline at end of file diff --git a/src/pages/expSystem/backstage/modelType.vue b/src/pages/expSystem/backstage/modelType.vue index 43bdb6c..f423872 100644 --- a/src/pages/expSystem/backstage/modelType.vue +++ b/src/pages/expSystem/backstage/modelType.vue @@ -169,7 +169,9 @@ export default { // 添加分类和模型 async addData (id) { // 查询源模型分类 - this.$post(this.api.sourceModelClassification).then(res => { + this.$post(this.api.sourceModelClassification, { + founder: 1 + }).then(res => { const { data } = res const systemId = this.systemId const promises = [] diff --git a/src/pages/expSystem/backstage/sourceModel.vue b/src/pages/expSystem/backstage/sourceModel.vue index 60bc0b0..7598383 100644 --- a/src/pages/expSystem/backstage/sourceModel.vue +++ b/src/pages/expSystem/backstage/sourceModel.vue @@ -133,27 +133,29 @@ export default { const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类 this.isTopLevel = !curNode.level // 如果是首级，要调另一个接口 - if (!curNode.level) { - this.$post(this.api.getAllModelListBySys, { - modelName: this.keyword, - pageNum: this.page, - pageSize: this.pageSize - }).then(res => { - this.listData = res.data.records - this.total = res.data.total - }).catch(res => { }) - } else { - this.$post(this.api.queryTheModelOfOurSchool, { - modelName: this.keyword, - pageNum: this.page, - pageSize: this.pageSize, - categoryId: curNode.id, - systemId: this.systemId - }).then(res => { - this.listData = res.data.records - this.total = res.data.total - }).catch(res => { }) - } + // if (!curNode.level) { + // this.$post(this.api.getAllModelListBySys, { + // modelName: this.keyword, + // pageNum: this.page, + // pageSize: this.pageSize, + // founder: 1 + // }).then(res => { + // this.listData = res.data.records + // this.total = res.data.total + // }).catch(res => { }) + // } else { + this.$post(this.api.InstitutionSourceModel, { + modelName: this.keyword, + pageNum: this.page, + pageSize: this.pageSize, + categoryId: curNode.id, + systemId: this.systemId, + founder: 1 + }).then(res => { + this.listData = res.data.records + this.total = res.data.total + }).catch(res => { }) + // } }, initData () { this.$refs.table.clearSelection() @@ -201,11 +203,11 @@ export default { }, // 查看 show (row) { - this.$router.push(`/addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&show=1`) + this.$router.push(`addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&show=1`) }, // 编辑 edit (row) { - this.$router.push(`/addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&postStatus=${row.postStatus}`) + this.$router.push(`addModel?categoryId=${this.$refs.tree.$refs.tree.getCurrentKey()}&id=${row.id}&postStatus=${row.postStatus}`) }, del (row) { this.$confirm("确定要删除吗？", "提示", { diff --git a/src/pages/expSystem/backstage/sourceType.vue b/src/pages/expSystem/backstage/sourceType.vue index c0b9e69..a27859b 100644 --- a/src/pages/expSystem/backstage/sourceType.vue +++ b/src/pages/expSystem/backstage/sourceType.vue @@ -1,6 +1,12 @@