yujialong 7 months ago
parent 7d038719a5
commit b88a039d4e
  1. 56
      src/pages/achievement/list/project.vue
  2. 8
      src/pages/activity/manage/add/index.vue
  3. 2
      src/pages/activity/manage/list/index.vue
  4. 9
      src/pages/activity/manage/manage/notice.vue
  5. 2
      src/pages/assessment/add/index.vue
  6. 1
      src/pages/assessment/list/index.vue
  7. 2
      src/pages/course/add/index.vue
  8. 9
      src/pages/expSystem/backstage/sourceModel.vue
  9. 2
      src/pages/expSystem/backstage/sourceType.vue
  10. 2
      src/pages/information/addarticle/index.vue
  11. 2
      src/pages/match/add/index.vue
  12. 11
      src/pages/match/list/index.vue
  13. 2
      src/pages/match/manage/matchArchList.vue
  14. 7
      src/pages/match/manage/matchInfo.vue
  15. 14
      src/pages/match/manage/matchSignup.vue
  16. 2
      src/pages/product/list/index.vue
  17. 19
      src/pages/project/list/index.vue
  18. 4
      src/pages/station/list/index.vue
  19. 7
      src/pages/station/preview/index.vue
  20. 2
      src/store/modules/activity.js
  21. 2
      src/store/modules/expSystem.js

@ -7,7 +7,7 @@
<li v-if="form.permissions"> <li v-if="form.permissions">
<label>时间</label> <label>时间</label>
<el-radio-group v-model="form.month" <el-radio-group v-model="form.month"
@change="monthChange"> @change="initData">
<el-radio v-for="(item,index) in dateList" <el-radio v-for="(item,index) in dateList"
:key="index" :key="index"
:label="item.id" :label="item.id"
@ -29,7 +29,7 @@
<li> <li>
<label>实验项目分类</label> <label>实验项目分类</label>
<el-radio-group v-model="form.permissions" <el-radio-group v-model="form.permissions"
@change="perChange"> @change="initData">
<el-radio v-for="(item,index) in projectType" <el-radio v-for="(item,index) in projectType"
:key="index" :key="index"
:label="item.id" :label="item.id"
@ -40,7 +40,7 @@
<label>班级</label> <label>班级</label>
<el-select v-model="form.classId" <el-select v-model="form.classId"
clearable clearable
@change="classChange"> @change="initData">
<el-option v-for="item in classList" <el-option v-for="item in classList"
:key="item.id" :key="item.id"
:label="item.className" :label="item.className"
@ -51,7 +51,7 @@
<li> <li>
<label>课程</label> <label>课程</label>
<el-select v-model="form.mallId" <el-select v-model="form.mallId"
@change="mallIdChange"> @change="initData">
<el-option v-for="(item, i) in curs" <el-option v-for="(item, i) in curs"
:key="i" :key="i"
:label="item.curriculumName" :label="item.curriculumName"
@ -160,12 +160,13 @@
<script> <script>
import util from "@/libs/util"; import util from "@/libs/util";
import qs from 'qs'
export default { export default {
name: "achievement", name: "achievement",
data () { data () {
return { return {
form: { form: {
classId: this.$route.query.class ? +this.$route.query.class : '', classId: +this.$route.query.classId || '',
mallId: +this.$route.query.mallId || '', mallId: +this.$route.query.mallId || '',
permissions: this.$route.query.permissions ? +this.$route.query.permissions : 0, permissions: this.$route.query.permissions ? +this.$route.query.permissions : 0,
month: +this.$route.query.month || '', month: +this.$route.query.month || '',
@ -309,49 +310,6 @@ export default {
this.loading = false this.loading = false
}); });
}, },
monthChange () {
this.$router.push({
path: 'list',
query: {
...this.$route.query,
month: val
}
})
this.initData()
},
//
perChange (val) {
this.$router.push({
path: 'list',
query: {
...this.$route.query,
permissions: val
}
})
this.initData()
},
//
classChange (val) {
this.$router.push({
path: 'list',
query: {
...this.$route.query,
classId: val
}
})
this.initData()
},
//
mallIdChange (val) {
this.$router.push({
path: 'list',
query: {
...this.$route.query,
mallId: val
}
})
this.initData()
},
initData () { initData () {
this.$refs.table.clearSelection(); this.$refs.table.clearSelection();
this.page = 1; this.page = 1;
@ -363,7 +321,7 @@ export default {
}, },
// //
entry (row) { entry (row) {
this.$store.commit('achievement/setReferrer', this.$route.fullPath) this.$store.commit('achievement/setReferrer', `${this.$route.path}?${qs.stringify(this.form)}&page=${this.page}`)
this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.form.mallId}&classId=${row.classId || ''}`) this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.form.mallId}&classId=${row.classId || ''}`)
}, },
handleDelete (row) { // handleDelete (row) { //

@ -400,16 +400,16 @@ export default {
this.submiting = true this.submiting = true
if (form.id) { if (form.id) {
this.$post(this.api.updateActivity, form).then(res => { this.$post(this.api.updateActivity, form).then(res => {
this.pass = true this.backList()
this.updateTime = 0
this.$router.back()
util.successMsg("修改成功"); util.successMsg("修改成功");
}).catch(err => { }).catch(err => {
this.submiting = false this.submiting = false
}); });
} else { } else {
this.$post(this.api.saveActivity, form).then(res => { this.$post(this.api.saveActivity, form).then(res => {
this.backList() this.pass = true
this.updateTime = 0
this.$router.push('manage')
util.successMsg("创建成功"); util.successMsg("创建成功");
}).catch(err => { }).catch(err => {
this.submiting = false this.submiting = false

@ -375,7 +375,7 @@ export default {
}, },
handleCurrentChange (val) { handleCurrentChange (val) {
this.page = val; this.page = val;
this.$router.push(`list?page=${val}`) this.$router.push(`manage?page=${val}`)
this.getData() this.getData()
}, },
transferTime (date, type) { transferTime (date, type) {

@ -76,7 +76,6 @@ export default {
return { return {
token: util.local.get(Setting.tokenKey), token: util.local.get(Setting.tokenKey),
id: this.$route.query.id, id: this.$route.query.id,
keyword: "",
listData: [], listData: [],
multipleSelection: [], multipleSelection: [],
page: +this.$route.query.page || 1, page: +this.$route.query.page || 1,
@ -84,14 +83,6 @@ export default {
totals: 0 totals: 0
}; };
}, },
watch: {
keyword: function (val) {
clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => {
this.getData();
}, 500);
}
},
mounted () { mounted () {
this.getData() this.getData()
}, },

@ -542,7 +542,7 @@ export default {
this.$post(this.api.saveAssessment, this.form).then(res => { this.$post(this.api.saveAssessment, this.form).then(res => {
this.updateTime = 0 this.updateTime = 0
util.successMsg("创建成功"); util.successMsg("创建成功");
cb ? cb() : this.backPage() cb ? cb() : this.$router.push('list')
}).catch(err => { }).catch(err => {
this.submiting = false this.submiting = false
}); });

@ -435,7 +435,6 @@ export default {
async getCourse () { async getCourse () {
const { data } = await this.$get(this.api.getSchoolEffectiveCourse) const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
this.curs.push(...data) this.curs.push(...data)
this.page = 1
this.getData(1) this.getData(1)
}, },
// //

@ -394,7 +394,7 @@ export default {
}).then(() => { }).then(() => {
this.$router.replace(`/course/contentSettings?id=${courseId}`); this.$router.replace(`/course/contentSettings?id=${courseId}`);
}).catch(() => { }).catch(() => {
cb ? cb() : this.$router.back() cb ? cb() : this.$router.push('list')
}); });
}).catch(err => { }).catch(err => {
this.submiting = false; this.submiting = false;

@ -3,7 +3,7 @@
<div class="side"> <div class="side">
<org ref="tree" <org ref="tree"
@initData="catetoryClick" @initData="catetoryClick"
@getData="getData"></org> @loadData="loadData"></org>
</div> </div>
<div class="right"> <div class="right">
@ -198,14 +198,17 @@ export default {
this.listData = res.data.records this.listData = res.data.records
this.total = res.data.total this.total = res.data.total
}, },
loadData (school) {
this.isSystem = school
this.getData()
},
// //
catetoryClick (school) { catetoryClick (school) {
this.isSystem = school this.isSystem = school
this.initData() this.initData()
}, },
initData (school) { initData (school) {
this.page = 1 this.handleCurrentChange(1)
this.getData()
}, },
// //
add () { add () {

@ -118,7 +118,7 @@ export default {
isSystem isSystem
} }
}).catch(err => { }) }).catch(err => { })
this.$emit('initData', +isSystem) this.$emit('loadData', +isSystem)
}) })
}, },
// //

@ -236,7 +236,7 @@ export default {
this.submiting = false; this.submiting = false;
util.successMsg("创建成功"); util.successMsg("创建成功");
this.updateTime = 0 this.updateTime = 0
cb ? cb() : this.$router.back() cb ? cb() : this.$router.push('list')
}) })
.catch(err => { .catch(err => {
this.submiting = false; this.submiting = false;

@ -270,7 +270,7 @@ export default {
this.editing = false this.editing = false
} }
} else { } else {
this.$router.push(`/match?page=${this.$store.state.match.page}`) this.backPage()
} }
}, },
back () { back () {

@ -382,8 +382,7 @@ export default {
}) })
}, },
initData () { initData () {
this.page = 1; this.handleCurrentChange(1)
this.getData();
}, },
// //
setCache () { setCache () {
@ -403,6 +402,14 @@ export default {
}).then(async () => { }).then(async () => {
await this.$post(`${this.api.copyCompetition}?competitionId=${row.id}`) await this.$post(`${this.api.copyCompetition}?competitionId=${row.id}`)
util.successMsg('复制成功') util.successMsg('复制成功')
this.form = {
keyword: '',
month: '',
publishStatus: '',
startTime: '',
endTime: '',
}
this.date = []
this.initData() this.initData()
}).catch(() => { }) }).catch(() => { })
}, },

@ -494,7 +494,7 @@ export default {
}, },
handleCurrentChange (val) { // handleCurrentChange (val) { //
this.$router.push({ this.$router.push({
path: 'manage', path: 'archList',
query: { query: {
...this.$route.query, ...this.$route.query,
page: val page: val

@ -146,8 +146,8 @@
<td> <td>
<span v-if="item.score >= 0" <span v-if="item.score >= 0"
class="m-r-10">分数{{item.score}}</span> class="m-r-10">分数{{item.score}}</span>
<el-button type="text" <el-button v-if="form.completeCompetitionSetup.competitionType || (!form.completeCompetitionSetup.competitionType && item.resultsDetails === 0 && item.reportId)"
:disabled="item.resultsDetails === 1 || (form.completeCompetitionSetup.competitionType && !item.reportId) || (form.completeCompetitionSetup.competitionType === 0 && !item.reportId)" type="text"
@click="show(item)">查看成绩详情</el-button> @click="show(item)">查看成绩详情</el-button>
</td> </td>
</tr> </tr>
@ -268,7 +268,8 @@
<td>{{ item.timeSum }}min</td> <td>{{ item.timeSum }}min</td>
<td>{{ item.score }}</td> <td>{{ item.score }}</td>
<td> <td>
<el-button type="text" <el-button v-if="curRow.resultsDetails === 0 && item.reportId"
type="text"
@click="toReport(item)">查看</el-button> @click="toReport(item)">查看</el-button>
</td> </td>
</tr> </tr>

@ -449,12 +449,13 @@ export default {
} }
}, },
mounted () { mounted () {
this.initData() this.getData()
this.getInfo() this.getInfo()
this.getTeam() this.getTeam()
}, },
methods: { methods: {
init () { init () {
this.keyword = ''
this.initData() this.initData()
this.getTeam() this.getTeam()
this.getClient() this.getClient()
@ -496,8 +497,7 @@ export default {
}).catch(err => { }) }).catch(err => { })
}, },
initData () { initData () {
this.page = 1 this.handleCurrentChange(1)
this.getData()
}, },
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
@ -513,7 +513,7 @@ export default {
this.page = val; this.page = val;
this.getData(); this.getData();
}, },
switchOff (val, row, index) { switchOff (val, row) {
this.$put(`${this.api.disableRegistration}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { }); this.$put(`${this.api.disableRegistration}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { });
}, },
// //
@ -606,7 +606,6 @@ export default {
cancelUpload () { cancelUpload () {
this.uploading = false this.uploading = false
this.$refs.upload.abort() this.$refs.upload.abort()
this.keyword = ''
this.init() this.init()
this.importVisible = false this.importVisible = false
}, },
@ -880,9 +879,10 @@ export default {
// //
async batchDel () { async batchDel () {
const list = this.multipleSelection const list = this.multipleSelection
const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后,该团队下所有成员都会同步移除报名,已有的成绩也会一并删除,成绩排名将会受影响,是否确认删除?' : '删除后该参赛人员已有的成绩会一并删除,成绩排名将会受影响,是否确定要删除?') : '删除后参赛人员已有的成绩会一并删除,成绩排名将会受影响,是否确定删除全部报名人员?' const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后,该团队下所有成员都会同步移除报名,已有的成绩也会一并删除,成绩排名将会受影响,是否确认删除?' : '删除后该参赛人员已有的成绩会一并删除,成绩排名将会受影响,是否确定要删除?') : '删除后参赛人员已有的成绩会一并删除,成绩排名将会受影响,<span style="font-size: 15px;color: #f00">是否确定删除全部报名人员?</span>'
this.$confirm(tips, "提示", { this.$confirm(tips, "提示", {
type: "warning" type: "warning",
dangerouslyUseHTMLString: true
}).then(async () => { }).then(async () => {
if (list.length) { if (list.length) {
await this.$post(this.api.batchDeleteApplicants, { registrationVOS: list }) await this.$post(this.api.batchDeleteApplicants, { registrationVOS: list })

@ -295,7 +295,7 @@ export default {
this.getSubject() this.getSubject()
this.getLabel() this.getLabel()
this.getClass() this.getClass()
this.initData() this.getData()
}, },
methods: { methods: {
// banner // banner

@ -302,7 +302,6 @@ export default {
projectManage: {} projectManage: {}
}, // }, //
listDataAll: [], listDataAll: [],
isFirst: true
}; };
}, },
computed: { computed: {
@ -330,7 +329,6 @@ export default {
} }
this.getSystemData() this.getSystemData()
this.getData()
}, },
methods: { methods: {
...mapActions("project", [ ...mapActions("project", [
@ -338,14 +336,12 @@ export default {
]), ]),
getData () { getData () {
this.setSystemId(this.form.systemId); this.setSystemId(this.form.systemId);
if (this.isFirst) this.page = +this.$route.query.page || 1
let data = { let data = {
...this.form, ...this.form,
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}; };
this.$post(this.api.queryProjectManage, data).then(res => { this.$post(this.api.queryProjectManage, data).then(res => {
this.isFirst = false
this.listData = res.data.records; this.listData = res.data.records;
this.total = res.data.total; this.total = res.data.total;
}).catch(err => { }).catch(err => {
@ -372,7 +368,7 @@ export default {
e.children = all.filter(n => e.systemId.split(',').includes(n.id + '')) // e.children = all.filter(n => e.systemId.split(',').includes(n.id + '')) //
}) })
this.curs = data this.curs = data
this.curChange(this.cid) this.curChange(this.cid, 1)
} }
}).catch(err => { }) }).catch(err => { })
}, },
@ -459,12 +455,10 @@ export default {
this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.form.platformId}`).then(res => { this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.form.platformId}`).then(res => {
util.successMsg("更新启用状态成功"); util.successMsg("更新启用状态成功");
this.getData(); this.getData();
}).catch(err => { }).catch(err => { });
console.log(err);
});
}, },
// //
curChange (val) { curChange (val, first) {
const mallId = val[0] const mallId = val[0]
if (val.length === 1) { if (val.length === 1) {
// //
@ -473,7 +467,7 @@ export default {
this.form.mallId = mallId this.form.mallId = mallId
this.form.cid = this.curs.find(e => e.id === mallId).cid this.form.cid = this.curs.find(e => e.id === mallId).cid
this.form.systemId = this.cid[1] this.form.systemId = this.cid[1]
this.initData() first ? this.getData() : this.initData()
}, },
copyData (projectId) { // id copyData (projectId) { // id
this.copyVisible = true; this.copyVisible = true;
@ -530,6 +524,11 @@ export default {
i.projectId = '' i.projectId = ''
}); });
this.$post(`${this.api.copyProjectManage}`, row).then(res => { this.$post(`${this.api.copyProjectManage}`, row).then(res => {
this.form.projectName = ''
this.form.state = ''
this.form.permissions = ''
this.form.founder = 2
this.initData(); this.initData();
util.successMsg("复制实验项目成功"); util.successMsg("复制实验项目成功");
this.copyVisible = false; this.copyVisible = false;

@ -64,7 +64,7 @@ export default {
return { return {
isSq: Setting.isSq, isSq: Setting.isSq,
keyword: this.$route.query.keyword || '', keyword: this.$route.query.keyword || '',
active: 0, active: +this.$route.query.active || 0,
tabs: [ tabs: [
{ {
id: 0, id: 0,
@ -95,7 +95,7 @@ export default {
}).catch(err => { }); }).catch(err => { });
}, },
goPreview (item) { goPreview (item) {
this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}`); this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`);
}, },
// tab // tab
tabChange (item) { tabChange (item) {

@ -3,7 +3,7 @@
<el-card shadow="hover" <el-card shadow="hover"
class="m-b-20"> class="m-b-20">
<div class="flex-between"> <div class="flex-between">
<el-page-header @back="goBack" <el-page-header @back="back"
:content="curriculumName || courseName"></el-page-header> :content="curriculumName || courseName"></el-page-header>
</div> </div>
</el-card> </el-card>
@ -559,10 +559,11 @@ export default {
}, },
methods: { methods: {
goBack () { back () {
const { query } = this.$route
this.fromAdmin ? this.fromAdmin ?
this.$router.back() : this.$router.back() :
this.$router.push(`/station?keyword=${this.$route.query.keyword || ''}`) this.$router.push(`/station?keyword=${query.keyword || ''}&active=${query.active || 0}`)
}, },
init () { init () {
this.insertScript(); this.insertScript();

@ -1,5 +1,5 @@
/** /**
* 赛事相关 * 活动相关
* */ * */
export default { export default {
namespaced: true, namespaced: true,

@ -1,5 +1,5 @@
/** /**
* 赛事相关 * 实验系统相关
* */ * */
export default { export default {
namespaced: true, namespaced: true,

Loading…
Cancel
Save