lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

This commit is contained in:
18571350067 2022-03-30 10:28:30 +08:00
parent 87ca7fb28a bf42fd1d64
commit 35707c1d13
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/project/form/ProjectCourseList.vue
View File

@ -45,7 +45,7 @@
<a-button type="primary" size="default" @click="toPrep" style="margin-right: 8px;">上一步</a-button> <a-button type="primary" size="default" @click="toPrep" style="margin-right: 8px;">上一步</a-button>
<a-button v-if="['2','4'].includes(form.trainWay) || form.projectType != 0 " type="primary" size="default" @click="toNext">下一步</a-button> <a-button v-if="['2','4'].includes(form.trainWay) || form.projectType != 0 " type="primary" size="default" @click="toNext">下一步</a-button>
<a-button v-if="['1','3'].includes(form.trainWay) && form.projectType == 0 " type="primary" size="default" @click="toSaveOrIssue('save')" style="margin-right: 8px;">保存</a-button> <a-button v-if="['1','3'].includes(form.trainWay) && form.projectType == 0 " type="primary" size="default" @click="toSaveOrIssue('save')" style="margin-right: 8px;">保存</a-button>
<a-button v-if="['1','3'].includes(form.trainWay) && form.projectType == 0 " type="primary" size="default" @click="toSaveOrIssue('issue')">发布</a-button> <a-button v-if="['1','3'].includes(form.trainWay) || form.projectType != 0 " type="primary" size="default" @click="toSaveOrIssue('issue')">发布</a-button>
</a-col> </a-col>
<a-drawer title="课程预览" :destroyOnClose="true" placement="right" width="1200" :closable="true" :visible="courseVisible" @close="drawerClose"> <a-drawer title="课程预览" :destroyOnClose="true" placement="right" width="1200" :closable="true" :visible="courseVisible" @close="drawerClose">
<courseware-list :courseId="selectCourseId"></courseware-list> <courseware-list :courseId="selectCourseId"></courseware-list>

2
src/views/project/form/ProjectPersonForm.vue
View File

@ -59,7 +59,7 @@
<a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button> <a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button>
<a-button v-if="['2','4'].includes(form.trainWay)" type="primary" size="default" @click="toNext">下一步</a-button> <a-button v-if="['2','4'].includes(form.trainWay)" type="primary" size="default" @click="toNext">下一步</a-button>
<a-button v-if="['1','3'].includes(form.trainWay)" type="primary" size="default" @click="toSaveOrIssue('save')" style="margin-right: 8px;">保存</a-button> <a-button v-if="['1','3'].includes(form.trainWay)" type="primary" size="default" @click="toSaveOrIssue('save')" style="margin-right: 8px;">保存</a-button>
<a-button v-if="['1','3'].includes(form.trainWay)" type="primary" size="default" @click="toSaveOrIssue('issue')">发布</a-button> <a-button v-if="['1','3'].includes(form.trainWay) || form.projectType != 0" type="primary" size="default" @click="toSaveOrIssue('issue')">发布</a-button>
</a-col> </a-col>
</a-card> </a-card>
</template> </template>

3
src/views/project/form/ProjectTestPaperFormationStrategy.vue
View File

@ -54,7 +54,7 @@
<a-col :span="24" style="text-align: center;"> <a-col :span="24" style="text-align: center;">
<a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button> <a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button>
<a-button type="primary" size="default" @click="toSave" style="margin-right: 8px;">保存</a-button> <a-button type="primary" size="default" @click="toSave" style="margin-right: 8px;">保存</a-button>
<a-button type="primary" size="default" @click="toIssue">发布</a-button> <a-button v-if="form.projectType != 0" type="primary" size="default" @click="toIssue">发布</a-button>
</a-col> </a-col>
</a-card> </a-card>
</template> </template>
@ -63,7 +63,6 @@
// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等） // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
// 例如：import 《组件名称》 from '《组件路径》' // 例如：import 《组件名称》 from '《组件路径》'
import { getQuestionNumByCourseIds } from '@/api/course/question/question' import { getQuestionNumByCourseIds } from '@/api/course/question/question'
import Item from '@/components/AvatarList/Item'
export default { export default {
// import引入的组件需要注入到对象中才能使用 // import引入的组件需要注入到对象中才能使用