Commit edbbb9ac authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 6990f1a0 32ed00c7
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
+ 创建目标</el-button + 创建目标</el-button
> >
</div> </div>
<div class="mid_content"> <div class="mid_content" style="height: auto;">
<div class="goal_box" v-for="(val, i) in dataList" :key="i"> <div class="goal_box" v-for="(val, i) in dataList" :key="i">
<div class="goal_title"> <div class="goal_title">
<img src="../../../../assets/images/u17641.svg" alt="" /> <img src="../../../../assets/images/u17641.svg" alt="" />
...@@ -556,7 +556,7 @@ export default { ...@@ -556,7 +556,7 @@ export default {
},//看板查询条件 },//看板查询条件
query:{ query:{
page:1, page:1,
size:8, size:-1,
assessmentScope:1//考核范围(1.部门,2.个人) assessmentScope:1//考核范围(1.部门,2.个人)
},//目标管理查询条件 },//目标管理查询条件
StatQuery:{ StatQuery:{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment