Merge remote-tracking branch 'origin/master'

src/views/atmosphere/air/statistic/city-county-place.vue

@@ -104,8 +104,8 @@ export default {
                 },
                 {
                     title: "一氧化碳", children: [
-                        {title: "本次", dataIndex: "coCurrent",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":text},
+                        {title: "本次", dataIndex: "coCurrent",align:"center",customRender:({text})=>text + ""},
-                        {title: "上年同期", dataIndex: "coSameTimeLastYear",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":text},
+                        {title: "上年同期", dataIndex: "coSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
                         {title: "增减（%）", dataIndex: "coChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":text},
                         {title: "排名（按浓度值）", dataIndex: "coRank",align:"center"},
                     ]
@@ -128,28 +128,28 @@ export default {
                 },
                 {
                     title: "综合指数", children: [
-                        {title: "本次", dataIndex: "comprehensiveAirQualityIndexCurrent",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(2)+"":text},
+                        {title: "本次", dataIndex: "comprehensiveAirQualityIndexCurrent",align:"center",customRender:({text})=>text + ""},
-                        {title: "上年同期", dataIndex: "comprehensiveAirQualityIndexSameTimeLastYear",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(2)+"":text},
+                        {title: "上年同期", dataIndex: "comprehensiveAirQualityIndexSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
                         {title: "增减（%）", dataIndex: "comprehensiveAirQualityIndexChangePercentage",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
                         {title: "排名（按浓度值）", dataIndex: "comprehensiveAirQualityIndexRank",align:"center"},
                     ]
                 },
-                // {
+                {
-                //     title: "优天数", children: [
+                    title: "优天数", children: [
-                //         {title: "本次", dataIndex: "excellentDaysCurrent",align:"center"},
+                        {title: "本次", dataIndex: "excellentDaysCurrent",align:"center",customRender:({text})=>text + ""},
-                //         {title: "上年同期", dataIndex: "excellentDaysSameTimeLastYear",align:"center"},
+                        {title: "上年同期", dataIndex: "excellentDaysSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
-                //         {title: "增减（%）", dataIndex: "excellentDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
+                        {title: "增减（%）", dataIndex: "excellentDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
-                //         // {title: "排名（按浓度值）", dataIndex: "excellentDaysRank",align:"center"},
+                        // {title: "排名（按浓度值）", dataIndex: "excellentDaysRank",align:"center"},
-                //     ]
+                    ]
-                // },
+                },
-                // {
+                {
-                //     title: "良天数", children: [
+                    title: "良天数", children: [
-                //         {title: "本次", dataIndex: "goodDaysCurrent",align:"center"},
+                        {title: "本次", dataIndex: "goodDaysCurrent",align:"center",customRender:({text})=>text + ""},
-                //         {title: "上年同期", dataIndex: "goodDaysSameTimeLastYear",align:"center"},
+                        {title: "上年同期", dataIndex: "goodDaysSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
-                //         {title: "增减（%）", dataIndex: "goodDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
+                        {title: "增减（%）", dataIndex: "goodDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
-                //         // {title: "排名（按浓度值）", dataIndex: "goodDaysRank",align:"center"},
+                        // {title: "排名（按浓度值）", dataIndex: "goodDaysRank",align:"center"},
-                //     ]
+                    ]
-                // },
+                },
                 // {
                 //     title: "轻度污染天数", children: [
                 //         {title: "本次", dataIndex: "lightPollutionDaysCurrent",align:"center"},

src/views/water/water-function-area/collect/water-bill.vue

@@ -102,6 +102,11 @@
     updateWaterFunctionAreaBill,
     verifyWaterFunctionAreaBill
   } from "@/api/ecology/water-function-area";
+  import {
+  removeRiverStationBill,
+  removeBatchRiverStationBill,
+  verifyRiverStationBill
+} from "@/api/ecology/river-station";
   import moment from "moment";
   export default {
     name: 'DrinkingCollectWaterBill',
@@ -244,27 +249,52 @@
       },
       verify(record,checked) {
         const hide = this.$message.loading('请求中..', 0);
-        verifyWaterFunctionAreaBill({
+        if(record.regionLevel == "1"){
-          nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
+          verifyWaterFunctionAreaBill({
-          checked
+            nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
-        }).then(res => {
+            checked
-          if (res.data.code == 0) {
+          }).then(res => {
-            record.checked = checked
+            if (res.data.code == 0) {
-            Modal.success({
+              record.checked = checked
-              title: "提示",
+              Modal.success({
-              content: checked?"审核成功":"撤回成功"
+                title: "提示",
-            });
+                content: checked?"审核成功":"撤回成功"
-          } else {
+              });
-            Modal.error({
+            } else {
-              title: "提示",
+              Modal.error({
-              content: res.data.msg
+                title: "提示",
-            });
+                content: res.data.msg
-          }
+              });
-        }).catch((e) => {
+            }
-          this.$message.error(e.message);
+          }).catch((e) => {
-        }).finally(() => {
+            this.$message.error(e.message);
-          hide();
+          }).finally(() => {
-        })
+            hide();
+          })
+        }else{
+          verifyRiverStationBill({
+            nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
+            checked
+          }).then(res => {
+            if (res.data.code == 0) {
+              record.checked = checked
+              Modal.success({
+                title: "提示",
+                content: checked?"审核成功":"撤回成功"
+              });
+            } else {
+              Modal.error({
+                title: "提示",
+                content: res.data.msg
+              });
+            }
+          }).catch((e) => {
+            this.$message.error(e.message);
+          }).finally(() => {
+            hide();
+          })
+        }
+        
       },
       save(record) {
 
@@ -304,6 +334,7 @@
       /* 删除单个 */
       remove(row) {
         const hide = this.$message.loading('请求中..', 0);
+        if(row.regionLevel == "1"){ //国家级
         removeWaterFunctionAreaBill(row.nationalLevelWaterFunctionAreaBillId).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
@@ -314,11 +345,8 @@
         }).catch(e => {
           this.$message.error(e.msg);
         }).finally(() => hide());
-      },
+      }else{
-      removeBatch() {
+        removeRiverStationBill(row.nationalLevelWaterFunctionAreaBillId).then(res => {
-        const ids = this.selectionList.map(item => item.nationalLevelWaterFunctionAreaBillId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchWaterFunctionAreaBill(ids).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
@@ -326,9 +354,42 @@
             this.$message.error(res.data.msg);
           }
         }).catch(e => {
-
           this.$message.error(e.msg);
         }).finally(() => hide());
+        } 
+      },
+      removeBatch() {
+        const hide = this.$message.loading('请求中..', 0);
+        const functionIds = [];
+        const waterIds = [];
+        this.selectionList.map(item => {
+          if (item.regionLevel == "1"){
+            functionIds.push(item.nationalLevelWaterFunctionAreaBillId);
+          }else{
+            waterIds.push(item.nationalLevelWaterFunctionAreaBillId);
+          }
+        });
+        removeBatchWaterFunctionAreaBill(functionIds).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+       removeBatchRiverStationBill(waterIds).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+
       },
 
     }