井筒优化

src/main/resources/mapping/cquery/WellInfoCQuery.xml

@@ -154,9 +154,11 @@
         select *
         from by_dwr.fact_dwr_wl_ach_borehole_inter bi
         where bi.well_id = #{well_id}
+        order by zone_no
     </select>
     <select id="selectTestHistoryList" resultType="java.util.HashMap">
-        select *
+        select TO_CHAR(testing_date , 'YYYY-MM-dd') testing_date,
+               well_id, well_common_name, testing_name, anal_coy, construction_description
         from by_dm.dws_dm_test_history th
         where th.well_id = #{well_id}
     </select>
@@ -169,7 +171,7 @@
     <select id="getLastTestHistory" resultType="java.util.HashMap">
         select
             TO_CHAR(testing_date , 'YYYY-MM-dd') testing_date,
-            well_id, well_common_name, testing_name, anal_coy, construction_description, description
+            well_id, well_common_name, testing_name, anal_coy, construction_description
         from by_dm.dws_dm_test_history th
         where th.well_id = #{well_id}
         order by th.testing_date desc limit 1

vue/src/views/wellinfo/columns.ts

@@ -1,6 +1,4 @@
 export const boreholeInterColumns=[
-  {title: '井筒id', dataIndex: 'wellbore_id', key: 'wellbore_id', width: 120},
-  {title: '层位id', dataIndex: 'zone_id', key: 'zone_id', width: 120},
   {title: '层号(序号)', dataIndex: 'zone_no', key: 'zone_no', width: 120},
   {title: '裸眼井解释成果类型', dataIndex: 'borehole_inter_type_name', key: 'borehole_inter_type_name', width: 120},
   {title: '起始深度', dataIndex: 'start_depth', key: 'start_depth', width: 120},

vue/src/views/wellinfo/detail.vue

@@ -133,14 +133,27 @@
           <a-descriptions-item label="井筒生命阶段：">{{ dataModel.phase }}</a-descriptions-item>
           <a-descriptions-item label="通用井筒名：">{{ dataModel.wellbore_common_name }}</a-descriptions-item>
           <a-descriptions-item label="目的层：">{{ dataModel.target_formation }}</a-descriptions-item>
-          <a-descriptions-item label="审定测量深度：">{{ dataModel.authorized_md }}</a-descriptions-item>
-          <a-descriptions-item label="审定真垂直深度：">{{ dataModel.authorized_tvd }}</a-descriptions-item>
+          <a-descriptions-item label="审定测量深度：">
+            {{ dataModel.authorized_md }}
+            <template v-if="dataModel.authorized_md">m</template>
+          </a-descriptions-item>
+          <a-descriptions-item label="审定真垂直深度：">{{ dataModel.authorized_tvd }}
+            <template v-if="dataModel.authorized_tvd">m</template>
+          </a-descriptions-item>
 
-          <a-descriptions-item label="井底测量深度：">{{ dataModel.bh_md }}</a-descriptions-item>
+          <a-descriptions-item label="井底测量深度：">{{ dataModel.bh_md }}
+            <template v-if="dataModel.bh_md">m</template>
+          </a-descriptions-item>
           <a-descriptions-item label="井底位置描述信息：" :span="2">{{ dataModel.geo_description_bh }}</a-descriptions-item>
-          <a-descriptions-item label="井底真垂直深度：">{{ dataModel.bh_tvd }}</a-descriptions-item>
-          <a-descriptions-item label="相对于参考面的造斜点深度：">{{ dataModel.ko_md }}</a-descriptions-item>
-          <a-descriptions-item label="实际造斜点真垂直深度：">{{ dataModel.ko_tvd }}</a-descriptions-item>
+          <a-descriptions-item label="井底真垂直深度：">{{ dataModel.bh_tvd }}
+            <template v-if="dataModel.bh_tvd">m</template>
+          </a-descriptions-item>
+          <a-descriptions-item label="相对于参考面的造斜点深度：">{{ dataModel.ko_md }}
+            <template v-if="dataModel.ko_md">m</template>
+          </a-descriptions-item>
+          <a-descriptions-item label="实际造斜点真垂直深度：">{{ dataModel.ko_tvd }}
+            <template v-if="dataModel.ko_tvd">m</template>
+          </a-descriptions-item>
           <a-descriptions-item label="地质单元：">{{ dataModel.project_name }}</a-descriptions-item>
           <a-descriptions-item label="单元类型：">{{ dataModel.project_type }}</a-descriptions-item>
           <a-descriptions-item label="单元等级：">{{ dataModel.project_level }}</a-descriptions-item>