Merge branch 'yinyongshui'

src/views/water/drinking-water/statistic/city/situation.vue

@@ -123,7 +123,7 @@ export default {
       bill: {},
       editableData:[],
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {key: "index",title:"序号",dataIndex: "index",width: 48,align: "center",customRender: ({ index }) => index + 1,},

src/views/water/drinking-water/statistic/city/waterCount.vue

@@ -64,6 +64,7 @@ export default {
   data() {
     return {
       data: [],
+      datasource:[],
       locale,
       bill: {},
       // 表格数据接口

src/views/water/drinking-water/statistic/city/waterNutritional.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"监测时间",dataIndex:"monitorTime",},

src/views/water/drinking-water/statistic/city/waterQuality.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},

src/views/water/drinking-water/statistic/city/waterQualityCount.vue

@@ -69,7 +69,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"年份",dataIndex:"year",},

src/views/water/drinking-water/statistic/city/waterQualityUp.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"断面名称",dataIndex:"sectionName",},

src/views/water/drinking-water/statistic/countryside/waterQuality.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},

src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue

@@ -69,7 +69,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"年份",dataIndex:"year",},

src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"断面名称",dataIndex:"sectionName",},

src/views/water/drinking-water/statistic/county/situation.vue

@@ -124,7 +124,7 @@ export default {
       bill: {},
       editableData:[],
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {key: "index",title:"序号",dataIndex: "index",width: 48,align: "center",customRender: ({ index }) => index + 1,},

src/views/water/drinking-water/statistic/county/waterCount.vue

@@ -63,6 +63,7 @@ export default {
     },
   data() {
     return {
+      datasource:[],
       data: [],
       locale,
       bill: {},

src/views/water/drinking-water/statistic/county/waterQuality.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},

src/views/water/drinking-water/statistic/county/waterQualityCount.vue

@@ -69,7 +69,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"年份",dataIndex:"year",},

src/views/water/drinking-water/statistic/county/waterQualityUp.vue

@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"断面名称",dataIndex:"sectionName",},