Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

主题整合bug

Browse Source
This commit is contained in:
zhanglipeng
2020-11-26 15:21:11 +08:00
parent 49e07332d6
commit f11278bce2
10 changed files with 105 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/benyi/themeweekplan/data.vue
View File

@ -274,7 +274,7 @@ import {
} from "@/api/benyi/themeweekplanitem";
import { listWeekplan, getWeekplan } from "@/api/benyi/themeweekplan";
import { listActivityByThemeId } from "@/api/benyi/activity";
import { listActivityById } from "@/api/benyi/activity";
import { listMonthplan } from "@/api/benyi/thememonthplan";
import { listMonthplanitem } from "@/api/benyi/thememonthplanitem";
@ -390,7 +390,7 @@ export default {
},
//主题活动
getThemeActivityList(themeid) {
listActivityByThemeId(themeid).then((response) => {
listActivityById(themeid).then((response) => {
//console.log(response.rows);
this.themeactivityOptions = response.rows;
});

2
ruoyi-ui/src/views/benyi/themeweekplan/index.vue
View File

@ -43,7 +43,7 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-col :xs="24" :ms="12" :md="4">
<el-form-item label="所属周次" prop="zc">
<el-input-number
v-model="queryParams.zc"

12
ruoyi-ui/src/views/benyi/themeweekplan/table.vue
View File

@ -69,7 +69,7 @@ import {
} from "@/api/benyi/themeweekplanitem";
import { listWeekplan, getWeekplan } from "@/api/benyi/themeweekplan";
import { listActivityByThemeId } from "@/api/benyi/activity";
import { listActivityById } from "@/api/benyi/activity";
import { listMonthplan } from "@/api/benyi/thememonthplan";
import { listMonthplanitem } from "@/api/benyi/thememonthplanitem";
import { listThemeByIds, listThemeByActivityIds } from "@/api/benyi/theme";
@ -150,6 +150,7 @@ export default {
queryParams_MonPlan: {
xnxq: undefined,
month: undefined,
classid:undefined,
status: "2",
},
queryParams_MonPlanItem: {
@ -214,15 +215,15 @@ export default {
},
//主题活动
getThemeActivityList(themeid) {
listActivityByThemeId(themeid).then((response) => {
console.log(response.rows);
listActivityById(themeid).then((response) => {
// console.log(response.rows);
this.themeactivityOptions = response.rows;
});
},
//获取周教学计划详情
getThemeWeekPlan(themeweekplanid) {
getWeekplan(themeweekplanid).then((response) => {
//(response);
console.log(response.data.classid);
this.queryParams.wpid = response.data.id;
this.title = response.data.name;
this.zc = response.data.zc;
@ -235,8 +236,9 @@ export default {
//查找活动id
this.queryParams_MonPlan.month = response.data.month;
this.queryParams_MonPlan.xnxq = response.data.xnxq;
this.queryParams_MonPlan.classid=response.data.classid;
listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
//console.log(resMonPlan.rows);
console.log(resMonPlan.rows);
//获取的月主题
var monththemeids = resMonPlan.rows[0].themes;