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

主题整合优化

Browse Source
This commit is contained in:
zhanglipeng 2021-08-15 10:31:16 +08:00
parent 249c2ef099
commit 5e294546fe
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ruoyi-ui/src/views/benyi/themestudy/index.vue
View File

@ -78,7 +78,7 @@
<script>
import { treeselect, getTheme } from "@/api/benyi/theme";
import { listActivity } from "@/api/benyi/activity";
import { listActivity, getActivity } from "@/api/benyi/activity";
import Editor from "@/components/Editor";
export default {
@ -119,6 +119,7 @@ export default {
},
// 查询参数
queryParams: {
id: undefined,
themeid: undefined,
},
};
@ -181,18 +182,24 @@ export default {
// 节点单击事件
handleNodeClick(data) {
this.id = data.id;
console.log(data.id);
if (data.id >= 9999) {
} else {
//console.log(data.id);
if (data.id >= 9999 && data.id < 99999) {
} else if (data.id >= 99999) {
//console.log("2jiedian");
this.id = this.id - 99999;
this.title = data.label;
this.getThemeDetails();
} else {
this.title = data.label;
this.getThemeDetail();
//console.log("最后节点");
}
// console.log(this.dayflowtaskList[date.id])
// this.getStandardList();
},
getThemeDetails() {
getTheme(this.id).then((response) => {
console.log(response);
//console.log(response);
if (response.code == "200") {
this.title1 = "主题网络";
this.title2 = "家园沟通";
@ -200,9 +207,10 @@ export default {
this.note = response.data.content;
this.communicate = response.data.communicate;
this.queryParams.themeid = response.data.id;
this.queryParams.id = "";
listActivity(this.queryParams).then((req) => {
console.log(req);
//console.log(req);
if (req.code == "200") {
this.activityList = req.rows;
}
@ -210,6 +218,20 @@ export default {
}
});
},
getThemeDetail() {
this.title1 = "";
this.title2 = "";
this.title3 = "活动方案";
this.queryParams.id = this.id;
this.queryParams.themeid = "";
//console.log(this.id);
listActivity(this.queryParams).then((req) => {
//console.log(req);
if (req.code == "200") {
this.activityList = req.rows;
}
});
},
},
};
</script>

1
ruoyi/src/main/resources/mybatis/benyi/ByThemeActivityMapper.xml
View File

@ -27,6 +27,7 @@
<select id="selectByThemeActivityList" parameterType="ByThemeActivity" resultMap="ByThemeActivityResult">
<include refid="selectByThemeActivityVo"/>
<where>
<if test="id != null ">and id = #{id}</if>
<if test="themeid != null ">and themeid = #{themeid}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''">and type = #{type}</if>

4
ruoyi/src/main/resources/mybatis/benyi/ByThemeMapper.xml
View File

@ -22,7 +22,9 @@
<sql id="selectByThemeVoTree">
select dict_value+9999 id, 0 parent_id,dict_label name,dict_sort sort from sys_dict_data where dict_type='sys_yebjlx' and dict_label !='托班（2-3岁）'
union all
select id, classid+9999, name, sort from by_theme
select id+99999, classid+9999, name, sort from by_theme
union all
select id,themeid+99999,name,sort from by_theme_activity
order by sort
</sql>