Browse Source

月份时间优化,初始显示优化

周壕 1 year ago
parent
commit
a5b6826022

+ 8 - 6
src/main/resources/mapping/cquery/FactWellCQuery.xml

@@ -35,14 +35,15 @@
             SUM(t.fluid_prod_mon) fluid,
             0 watercut
         FROM (  SELECT wm.well_id,
-                    wm.prod_date prod_time_str,
+                    to_char(to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d'), 'YYYY年MM月') prod_time_str,
                     COALESCE(wm.gas_prod_mon, 0) gas_prod_mon,
                     COALESCE(wm.oil_prod_mon, 0) oil_prod_mon,
                     COALESCE(wm.water_prod_mon, 0) water_prod_mon,
                     COALESCE(wm.fluid_prod_mon, 0) fluid_prod_mon
                 FROM by_dwr.fact_dwr_pc_pro_well_vol_m wm
-                WHERE wm.prod_date <![CDATA[ >= ]]>  #{startDay}
-                    and wm.prod_date <![CDATA[ <= ]]> #{endDay}
+                WHERE wm.prod_date is not null
+                    and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d')  <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
+                    and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d')  <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
         <if test="wellId!='' and wellId!=null">
             and wm.well_id=#{wellId}
         </if>
@@ -59,14 +60,15 @@
             SUM(t.fluid_prod_mon) fluid,
             0 watercut
         FROM (  SELECT wm.well_id,
-                    LEFT(prod_date,4 ) prod_time_str,
+                    SUBSTRING(prod_date, 1, 4) prod_time_str,
                     COALESCE(wm.gas_prod_mon, 0) gas_prod_mon,
                     COALESCE(wm.oil_prod_mon, 0) oil_prod_mon,
                     COALESCE(wm.water_prod_mon, 0) water_prod_mon,
                     COALESCE(wm.fluid_prod_mon, 0) fluid_prod_mon
                 FROM by_dwr.fact_dwr_pc_pro_well_vol_m wm
-                WHERE wm.prod_time <![CDATA[ >= ]]> #{startDay}
-                and wm.prod_time <![CDATA[ <= ]]> #{endDay}
+                WHERE wm.prod_date is not null
+                and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d')  <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
+                and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d')  <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
         <if test="wellId!='' and wellId!=null">
             and wm.well_id=#{wellId}
         </if>

+ 11 - 4
vue/src/components/basic/chart/chart-prod-dynamics.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script lang="ts">
-  import {defineComponent, computed, markRaw, ref, reactive} from 'vue';
+  import {defineComponent, computed, markRaw, ref, reactive, watch} from 'vue';
   import * as echarts from "echarts";
   import type {FormInstance} from 'ant-design-vue';
   import {get} from '@/api/common';
@@ -77,7 +77,7 @@
       }
     },
     setup(props, context){
-      console.log("ChartCell setup" , props, context);
+      console.log("ChartProdDynamics setup" , props, context);
 
       const wellId = computed(() => {
         return props.wellId ? props.wellId : null
@@ -98,8 +98,15 @@
       }
     },
     mounted(){
-      console.log("mounted" , this.id);
-      this.onFinish();
+      console.log("mounted wellId" , this.id, this.wellId);
+      if(this.wellId!=null) this.onFinish();
+
+      watch(
+        () => this.wellId,
+        () => {
+          if(this.wellId!=null) this.onFinish();
+        }
+      );
     },
     methods:{
       onFinish: async function (){