From 07f7cf6b66bc6c357d9762a0c9401713356747c3 Mon Sep 17 00:00:00 2001
From: 710356044 <710356044@qq.com>
Date: Thu, 25 Nov 2021 20:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=B0=B4=E6=B0=B4=E6=9C=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../water/drinking-water/statistic/base.vue   | 31 ++++++++++++++-----
 .../water/drinking-water/statistic/colums.js  |  3 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/base.vue b/src/views/water/drinking-water/statistic/base.vue
index e717ebd..61a34b2 100644
--- a/src/views/water/drinking-water/statistic/base.vue
+++ b/src/views/water/drinking-water/statistic/base.vue
@@ -74,13 +74,18 @@
         :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)"
       >
-        <template #action="{text,record}">
-          <span>
+        <template #waterCode="{text,record}">
+          
+          <span >  
             {{
-              record.reportTime.getMonth()==null ||record.reportTime.getMonth().getMonth()==1 || record.reportTime.getMonth().getMonth() == 2 ||record.reportTime.getMonth() == 3 ||record.reportTime.getMonth()==12
+              
+              record.reportTime.substr(5,2)=="01" || record.reportTime.substr(5,2) == "02" ||record.reportTime.substr(5,2) == "03" ||record.reportTime.substr(5,2)=="12"
             ? text="K": 
-              record.reportTime.getMonth()==4 || record.reportTime.getMonth() == 5 ||record.reportTime.getMonth()==10||record.reportTime.getMonth()==11
-            ? text="P": text="F"
+              record.reportTime.substr(5,2)=="04" || record.reportTime.substr(5,2) == "05" ||record.reportTime.substr(5,2)=="10"||record.reportTime.substr(5,2)=="11"
+            ? text="P": 
+            record.reportTime.substr(5,2)=="06" || record.reportTime.substr(5,2) == "07" ||record.reportTime.substr(5,2)=="08"||record.reportTime.substr(5,2)=="09"
+            ? text="F":text="无采样时间"
+
             }}
           </span>
         </template>
@@ -104,7 +109,7 @@ import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { tableColumns } from "./colums";
 // import moment from "moment";
 //   import utils from "./utils";
-const columns =tableColumns;
+// const columns =tableColumns;
 
         // {
         //   title: "创建人",
@@ -126,7 +131,19 @@ export default {
       // 表格数据接口
       url: pageDrinkingWaterStatisticUrl,
       selection: [],
-      columns,
+      columns:[
+        // { 
+        //   title: "水期代码", 
+        // dataIndex: "waterPhaseCode",
+        // sorter: true, 
+        // slots:{customRender:'waterCode' }
+        // },
+        ...tableColumns,
+      ],
+        
+        
+      
+      
       // 表格列配置
       
       // palceOptions: [],
diff --git a/src/views/water/drinking-water/statistic/colums.js b/src/views/water/drinking-water/statistic/colums.js
index 738d4f0..a08217c 100644
--- a/src/views/water/drinking-water/statistic/colums.js
+++ b/src/views/water/drinking-water/statistic/colums.js
@@ -1,6 +1,5 @@
 import moment from "moment"
 const tableColumns = [
-    
     { title: "断面名称", dataIndex: "place", sorter: true, },
     { title: "断面代码", dataIndex: "sectionCode", sorter: true, },
     { title: "水源名称", dataIndex: "sourceWaterName", sorter: true, },
@@ -11,7 +10,7 @@ const tableColumns = [
     { title: "本月取水量", dataIndex: "waterWithdrawal", sorter: true, },
     { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
     { title: "水期代码", dataIndex: "waterPhaseCode",sorter: true, 
-        scopedSlots:{customRender:'action' }
+        slots:{customRender:'waterCode' }
     },
     { title: "水温", dataIndex: "waterTemperature", sorter: true, },
     // {title: "采样时间",dataIndex: "monitorTime",sorter: true,},