饮用水框架页面

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

@@ -19,6 +19,7 @@
         row-key="drinkingWaterId"
         :datasource="datasource"
         :columns="columns"
+        :total="count"
         :where="where"
         :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)"

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

@@ -52,7 +52,6 @@
   // 水质达标情况
   import waterQualityUp from "./waterQualityUp.vue";
   //综合营养指数
-
   import waterNutritional from "./waterNutritional.vue"
 
 

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

@@ -73,13 +73,13 @@ export default {
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},
-        {title:"水源地名称",dataIndex:"place",},
+        {title:"水源地名称",dataIndex:"sourceWaterName",},
         {title:"期数",dataIndex:"sourceWaterName",},
         {title:"水源地性质",dataIndex:"waterSourceProperty",},
         {title:"断面水质",align: 'center',children: [
-              {title: "本月", dataIndex: ""},
-              {title: "上月", dataIndex: ""},
-              {title: "去年同期", dataIndex: ""},
+              {title: "本月", dataIndex: "waterQualityCategory"},
+              {title: "上月", dataIndex: "waterQualityCategoryMom"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
             ]
         },
         {title:"主要污染指标",dataIndex:"",},
@@ -89,7 +89,7 @@ export default {
       // 表格列配置
       
     
-      // 表格搜索条件
+      // 表格搜索条件 
       where: {
         checked: 1,
       },

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

@@ -72,12 +72,12 @@ export default {
       datasource:{},
       selection: [],
       columns:[
-        {title:"断面名称",dataIndex:"city",},
-        {title:"时间",dataIndex:"place",},
-        {title:"水质目标",dataIndex:"sourceWaterName",},
-        {title:"水质类别",dataIndex:"waterSourceProperty",},
-        {title: "达标情况", dataIndex: ""},
-        {title: "达标率", dataIndex: ""},
+        {title:"断面名称",dataIndex:"sectionName",},
+        {title:"时间",dataIndex:"time",},
+        {title:"水质目标",dataIndex:"waterTarget",},
+        {title:"水质类别",dataIndex:"waterQualityCategory",},
+        {title: "达标情况", dataIndex: "standard"},
+        {title: "达标率", dataIndex: "standardRate"},
         // {title:"达标情况",align: 'center',children: [
         //       {title: "达标情况", dataIndex: ""},
         //       {title: "达标率", dataIndex: ""},
@@ -112,7 +112,12 @@ export default {
                 this.$message.error(res.data.msg);
                 this.datasource = []
             }else{
-                this.datasource = res.data.data
+              let newData = []
+              const resData = res.data.data || {}
+              for(let i in resData){
+                newData.push(resData[i])
+              }
+              this.datasource = newData
             }
         }).catch(()=>{
                 this.loading = false;