From 69fc4e49b203196db6db16ba6da0c8f8c1963076 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Tue, 24 Dec 2024 17:21:07 +0800 Subject: [PATCH] fix --- src/utils/api.js | 5 + src/views/course/list.vue | 37 +++--- src/views/match/add/set.vue | 8 +- src/views/order/selectClient.vue | 54 ++------- src/views/resourse/index.vue | 131 +++++++++------------- src/views/resourse/upload.vue | 73 ++++++------ src/views/serve/projectList.vue | 30 ++--- src/views/shop/list.vue | 28 +++-- src/views/system/role.vue | 59 +++++----- src/views/theoreticalCourse/add/index.vue | 1 + 10 files changed, 195 insertions(+), 231 deletions(-) diff --git a/src/utils/api.js b/src/utils/api.js index 89fdf78..f119356 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -531,4 +531,9 @@ export default { saveMarketing: `nakadai/nakadai/mall/marketing/promotion/save`, updateMarketing: `nakadai/nakadai/mall/marketing/promotion/update`, bannerEnableOrDisable: `nakadai/nakadai/mall/marketing/promotion/bannerEnableOrDisable`, + + paginatedFootagesList: `nakadai/resourceLibrary/paginatedFootagesList`, + resourceDel: `nakadai/resourceLibrary/batchDeletion`, + resourceFind: `nakadai/resourceLibrary/findById`, + resourceSave: `nakadai/resourceLibrary/saveOrUpdate`, }; \ No newline at end of file diff --git a/src/views/course/list.vue b/src/views/course/list.vue index c891b60..be2566c 100644 --- a/src/views/course/list.vue +++ b/src/views/course/list.vue @@ -64,7 +64,7 @@ + @selection-change="handleSelectionChange" row-key="cid"> @@ -148,24 +148,23 @@ export default { this.getData(); }, methods: { - getRowKeys (row) { - return row.cid; - }, - // 获取列表数据 - getData () { - const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理') - let data = { - ...this.form, - pageNum: this.page, - pageSize: this.pageSize, - supplierId: sid ? sid.supplierId : '', - platformId: Setting.platformId - }; - this.$post(this.api.curriculumList, data).then(res => { - this.courseData = res.page.records; - this.totals = res.page.total; - this.loading = false; - }).catch(err => { }); + async getData () { + try { + const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理') + this.loading = true + const { page } = await this.$post(this.api.curriculumList, { + ...this.form, + pageNum: this.page, + pageSize: this.pageSize, + supplierId: sid ? sid.supplierId : '', + platformId: Setting.platformId + }) + this.courseData = page.records + this.totals = page.total + this.loading = false + } finally { + this.loading = false + } }, initData () { this.page = 1; diff --git a/src/views/match/add/set.vue b/src/views/match/add/set.vue index 826d055..4b93b0d 100644 --- a/src/views/match/add/set.vue +++ b/src/views/match/add/set.vue @@ -263,9 +263,11 @@ export default { }) res.serviceList.forEach(e => e.systemId = +e.systemId) this.services = res.serviceList - this.systemId = this.form.systemId || this.services[0].systemId - this.loadIns = Loading.service() - this.getProject() + if (this.services.length) { + this.systemId = this.form.systemId || this.services[0].systemId + this.getProject() + this.loadIns = Loading.service() + } }, // 课程系统切换 courseSystemChange (val) { diff --git a/src/views/order/selectClient.vue b/src/views/order/selectClient.vue index be7bf85..bf3fb56 100644 --- a/src/views/order/selectClient.vue +++ b/src/views/order/selectClient.vue @@ -98,7 +98,7 @@ @@ -242,11 +242,11 @@ export default { // checkbox交互 checkboxChenge (row) { this.listData.map(e => { - e.checked = false; + e.checked = false }); - row.checked = true; - this.checkedName = row.customerName; - this.checkedID = row.customerId; + row.checked = true + this.checkedName = row.customerName + this.checkedID = row.customerId }, clearSearch () { @@ -262,45 +262,9 @@ export default { margin-right: 20px; } -/deep/ .el-checkbox__inner { - border-radius: 50%; - width: 19px; - height: 19px; -} - -/deep/ .el-checkbox__input.is-checked .el-checkbox__inner, -.el-checkbox__input.is-indeterminate .el-checkbox__inner { - background: #FFF; - -} - -/deep/ .el-checkbox__inner::after { - transform: none; - transition: all .3s ease-in; - width: 0; - height: 0; - position: relative; - top: 50%; - left: 50%; - transform: translate(-46%, -48%); - border-radius: 50%; -} - -/deep/ .el-checkbox__input.is-checked .el-checkbox__inner::after { - width: 13px; - height: 13px; - background: #9278FF; - position: relative; - top: 50%; - left: 50%; - transform: translate(-46%, -48%); - display: block; - border-radius: 50%; - transition: all .3s ease-in; - border: 0; -} - -/deep/ .el-checkbox__input { - line-height: 0; +/deep/ .client-check { + .el-radio__label { + display: none; + } } \ No newline at end of file diff --git a/src/views/resourse/index.vue b/src/views/resourse/index.vue index 905e83c..3c4d0d3 100644 --- a/src/views/resourse/index.vue +++ b/src/views/resourse/index.vue @@ -24,7 +24,7 @@ end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable>
  • - +
    • @@ -32,13 +32,13 @@