dev_202412
yujialong 1 month ago
parent 6df319cf51
commit b5aa906326
  1. 2
      src/components/Sidebar.vue
  2. 4
      src/views/Home.vue
  3. 4
      src/views/course/content/index.vue
  4. 2
      src/views/course/content/source.vue
  5. 6
      src/views/course/detail.vue
  6. 12
      src/views/match/add/set.vue
  7. 2
      src/views/serve/Configure.vue
  8. 6
      src/views/serve/projectList.vue

@ -152,7 +152,7 @@ export default {
max-width: 200px; max-width: 200px;
height: calc(100vh - 116px); height: calc(100vh - 116px);
overflow: auto; overflow: auto;
transition: .5s; // transition: .5s;
transform: translateX(-200px); transform: translateX(-200px);
&.show { &.show {

@ -80,8 +80,8 @@ export default {
width: calc(100vw - 208px); width: calc(100vw - 208px);
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
-webkit-transition: left 0.3s ease-in-out; // -webkit-transition: left 0.3s ease-in-out;
transition: left 0.3s ease-in-out; // transition: left 0.3s ease-in-out;
} }
.sidebar:not(.show) { .sidebar:not(.show) {

@ -405,7 +405,7 @@ export default {
} }
}, },
handleRemove () { handleRemove () {
Oss.del(this.fileUrl) // Oss.del(this.fileUrl)
this.fileUrl = '' this.fileUrl = ''
}, },
transferType (ext) { transferType (ext) {
@ -772,7 +772,7 @@ export default {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.$del(`${this.api.deleteSubsection}/${row.id}`).then(res => { this.$del(`${this.api.deleteSubsection}/${row.id}`).then(res => {
row.fileUrl && Oss.del(row.fileUrl) // row.fileUrl && Oss.del(row.fileUrl)
this.$message.success("删除成功") this.$message.success("删除成功")
this.getData() this.getData()
}).catch(res => { }) }).catch(res => { })

@ -174,7 +174,6 @@ export default {
methods: { methods: {
// //
init () { init () {
this.getCourse()
this.checked = [] this.checked = []
this.curType = '全部' this.curType = '全部'
this.sourceType = [ this.sourceType = [
@ -187,6 +186,7 @@ export default {
this.sourceType.forEach(e => { this.sourceType.forEach(e => {
e.check = false e.check = false
}) })
this.getCourse()
}, },
// //
async getCourse () { async getCourse () {

@ -215,7 +215,7 @@
</div> </div>
<div v-if="step !== 4" class="btns"> <div v-if="step !== 4" class="btns">
<el-button v-if="step === 2 || step === 3" type="primary" @click="prev">上一步</el-button> <el-button v-if="step === 2 || step === 3" type="primary" @click="prev">上一步</el-button>
<el-button v-if="step < 3" type="primary" @click="save(1)">下一步</el-button> <el-button v-if="step < 3" type="primary" @click="save(1)">保存并下一步</el-button>
<el-button type="primary" @click="save()">保存</el-button> <el-button type="primary" @click="save()">保存</el-button>
<el-button @click="back">返回</el-button> <el-button @click="back">返回</el-button>
</div> </div>
@ -934,7 +934,7 @@ export default {
cid: this.cid, cid: this.cid,
systemIdByAssessment: list systemIdByAssessment: list
}) })
this.step = 4 this.back()
} finally { } finally {
this.submiting = false this.submiting = false
load.close() load.close()
@ -944,7 +944,7 @@ export default {
}, },
// //
toStep (i) { toStep (i) {
this.step = i if (!this.isAdd || (this.cid && i < this.step)) this.step = i
}, },
// //
back () { back () {

@ -372,7 +372,17 @@ export default {
form, form,
curStep curStep
}) })
this.$router.push(`/projectList?systemId=${this.mallIds[1]}&show=1&name=${this.$refs.cur.getCheckedNodes()[0].label}`) let { systemId } = this
let name
if (systemId) {
const cur = this.services.find(e => e.systemId === systemId)
if (cur) name = cur.systemName
}
if (!this.courseSystem && this.mallIds.length > 1) {
systemId = this.mallIds[1]
name = this.$refs.cur.getCheckedNodes()[0].label
}
this.$router.push(`/projectList?systemId=${systemId}&custom=1&name=${name}`)
}, },
// //
timeChange (val) { timeChange (val) {

@ -170,7 +170,7 @@ export default {
}, },
getIntoProject (row) { getIntoProject (row) {
this.setReferrer() this.setReferrer()
this.$router.push(`/projectList?systemId=${row.systemId}&show=1&name=${row.systemName}`) this.$router.push(`/projectList?systemId=${row.systemId}&name=${row.systemName}`)
}, },
getIntoJudgement (row) { getIntoJudgement (row) {
this.setReferrer() this.setReferrer()

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-card v-if="showBack" shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<el-page-header :content="'实验项目管理 / ' + titleName" @back="back"></el-page-header> <el-page-header :content="'实验项目管理 / ' + titleName" @back="back"></el-page-header>
</el-card> </el-card>
@ -128,7 +128,7 @@ import qs from 'qs'
export default { export default {
data () { data () {
return { return {
showBack: Boolean(this.$route.query.show), fromCustom: Boolean(this.$route.query.custom), //
systemId: this.$route.query.systemId, systemId: this.$route.query.systemId,
titleName: this.$route.query.name, titleName: this.$route.query.name,
form: { form: {
@ -368,7 +368,7 @@ export default {
}).catch(err => { }) }).catch(err => { })
}, },
back () { // back () { //
this.$router.push(this.$store.state.referrer || '/configure') this.fromCustom ? this.$router.back() : this.$router.push(this.$store.state.referrer || '/configure')
} }
} }
}; };

Loading…
Cancel
Save