Parcourir la source

单井信息详情产油量折线图查询数据不正确修改,井筒全息快照,删除趋势放大图的Y轴坐标轴标题,图表标题左对齐。

周壕 il y a 1 an
Parent
commit
8366ae1770

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

@@ -10,7 +10,7 @@
                 SUM(t.water_prod_daily) water,
                 SUM(t.water_cut) watercut
         FROM (  SELECT  wd.well_id,
-                        TO_CHAR(wd.prod_date , 'YYYY-MM-dd') prod_time_str,
+                        TO_CHAR(wd.prod_date , 'YYYY-MM-DD') prod_time_str,
                         COALESCE(wd.gas_prod_daily, 0)      gas_prod_daily,
                         COALESCE(wd.oil_prod_daily, 0)      oil_prod_daily,
                         COALESCE(wd.fluid_prod_daily, 0)      fluid_prod_daily,
@@ -35,15 +35,15 @@
             SUM(t.fluid_prod_mon) fluid,
             0 watercut
         FROM (  SELECT wm.well_id,
-                    to_char(to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d'), 'YYYY年MM月') prod_time_str,
+                    to_char(to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD'), '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 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')
+                    and to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD')  <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
+                    and to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD')  <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
         <if test="wellId!='' and wellId!=null">
             and wm.well_id=#{wellId}
         </if>
@@ -67,8 +67,8 @@
                     COALESCE(wm.fluid_prod_mon, 0) fluid_prod_mon
                 FROM by_dwr.fact_dwr_pc_pro_well_vol_m wm
                 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')
+                and to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD')  <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
+                and to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD')  <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
         <if test="wellId!='' and wellId!=null">
             and wm.well_id=#{wellId}
         </if>

+ 1 - 1
vue/src/components/basic/chart/chart-map.vue

@@ -48,7 +48,7 @@
     },
     setup(props, context){
       console.log("ChartMap setup" , props, context);
-      let iframeSrc = ref<string>("http://192.168.0.68:8077/a4gis/index.html");
+      let iframeSrc = ref<string>("http://localhost:8077/a4gis/index.html");
       let iframeRef = ref<any>();   // 和iframe标签的ref绑定
 
       const wellId = computed(() => {