Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-h5 into test

pages/architecture/resettleArchite/resettle2.vue

@@ -227,7 +227,7 @@ export default {
       // 筛选条件
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         stage: 1,
         stageStatus: null,
         childNode: '',
@@ -259,7 +259,7 @@ export default {
       // 选中的值
       stageName: '阶段一',
       statusName: '全部',
-      selectedStatusValue: '', // 当前选中的状态值
+      selectedStatusValue: 1, // 当前选中的状态值
 
       // 点位详情
       selectedPoint: {},
@@ -289,10 +289,11 @@ export default {
     init() {
       this.stageName = this.stageOptions[0][0].label
       this.queryParams.stage = this.stageOptions[0][0].value
-      // 设置默认状态为"全部"
-      this.selectedStatusValue = this.statusOptions[0][0].value
-      this.statusName = this.statusOptions[0][0].label
-      this.queryParams.stageStatus = this.selectedStatusValue || null
+      // 设置默认状态为"未完成"
+      const statusIndex = 1
+      this.selectedStatusValue = this.statusOptions[0][statusIndex].value
+      this.statusName = this.statusOptions[0][statusIndex].label
+      this.queryParams.stageStatus = this.selectedStatusValue
       this.loadPointList()
     },
 
@@ -307,15 +308,15 @@ export default {
 
         const res = await arc.getAzFrameworkList(this.queryParams)
 
-        if (res.code === 200 && res.data) {
-          const newData = res.data.rows || []
+        if (res.code === 200 && res.rows) {
+          const newData = res.rows || []
 
           if (this.currentPage === 1) {
             this.pointList = newData
           } else {
             this.pointList = [...this.pointList, ...newData]
           }
-          this.total = res.data.total || 0
+          this.total = res.total || 0
 
           // 优化hasMore判断逻辑
           this.hasMore =