+
名称
+
+
年份
+
+ (select.year = e)"
+ >
+
关键字
+
+
+
+
+
+
+ 名称
+
+ 年份
+
+ (select.year = e)"
+ >
+
+ 关键字
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ select.page = e;
+ getList()
+ }"
+ show-elevator
+ show-sizer
+ @on-page-size-change="e => {
+ select.page_size = e;
+ select.page = 1;
+ getList()
+ }" />
+
+
+
+
+
+
+
diff --git a/src/views/achievements/point.vue b/src/views/achievements/point.vue
index 46b1d5c..0224684 100644
--- a/src/views/achievements/point.vue
+++ b/src/views/achievements/point.vue
@@ -150,21 +150,22 @@ export default {
},
async getList() {
+ this.list = [];
this.pos = this.pos1 = 0;
this.spanArr = [];
this.spanArr1 = [];
const res = await index(this.select)
this.total = res.total
- this.list = res.data
+ let temp = res.data
- for(let i in this.list){
+ for(let i in temp){
if(i === 0){
this.spanArr.push(1);
this.pos = 0;
this.spanArr1.push(1);
this.pos1 = 0;
}else{
- if(this.list[i]?.target_type_detail?.name === this.list[i-1]?.target_type_detail?.name){
+ if(temp[i]?.target_type_detail?.name === temp[i-1]?.target_type_detail?.name){
this.spanArr[this.pos] += 1;
this.spanArr.push(0)
}else{
@@ -172,7 +173,7 @@ export default {
this.pos = i;
}
- if(this.list[i]?.target_type2_detail?.name === this.list[i-1]?.target_type2_detail?.name){
+ if(temp[i]?.target_type2_detail?.name === temp[i-1]?.target_type2_detail?.name){
this.spanArr1[this.pos1] += 1;
this.spanArr1.push(0)
}else{
@@ -181,6 +182,7 @@ export default {
}
}
}
+ this.list = temp;
// let arr = [];
// let getProp = (data,name) => {
// if(!name || !data){
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 2fba9ba..dcb28f0 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -32,15 +32,15 @@
(select.type = e[e.length - 1] || '')"
+ style="width: 200px"
+ @change="handleTypePick"
/>
@@ -168,6 +168,7 @@