井筒-优化

src/main/resources/META-INF/MANIFEST.MF

@@ -1,44 +1,45 @@
 Manifest-Version: 1.0
 Main-Class: com.bowintek.practice.PracticeApplication
-Class-Path: mybatis-spring-2.0.7.jar reactor-core-3.4.21.jar lettuce-cor
- e-6.1.9.RELEASE.jar spring-data-keyvalue-2.7.2.jar jackson-databind-2.1
- 3.3.jar jackson-datatype-jdk8-2.13.3.jar spring-boot-starter-data-redis
- -2.7.2.jar spring-boot-starter-jdbc-2.7.2.jar lucene-queries-4.7.2.jar 
- snakeyaml-1.30.jar netty-handler-4.1.79.Final.jar jackson-module-parame
- ter-names-2.13.3.jar jackson-core-2.13.3.jar poi-4.0.0.jar spring-webmv
- c-5.3.22.jar commons-collections4-4.2.jar fastjson-1.2.47.jar spring-be
- ans-5.3.22.jar commons-lang3-3.5.jar httpasyncclient-4.1.5.jar netty-re
- solver-4.1.79.Final.jar spring-boot-starter-json-2.7.2.jar lombok-1.18.
- 20.jar spring-boot-autoconfigure-2.7.2.jar reactive-streams-1.0.4.jar a
- spectjrt-1.9.7.jar spring-expression-5.3.22.jar jul-to-slf4j-1.7.36.jar
-  checker-qual-3.5.0.jar netty-codec-4.1.79.Final.jar parsson-1.0.0.jar 
- slf4j-api-1.7.36.jar xmlbeans-3.0.1.jar lucene-queryparser-4.7.2.jar to
- mcat-embed-core-9.0.65.jar opentelemetry-api-1.29.0.jar spring-jdbc-5.3
- .22.jar mysql-connector-java-8.0.29.jar spring-core-5.3.22.jar poi-ooxm
- l-4.0.0.jar pagehelper-spring-boot-starter-1.4.3.jar elasticsearch-java
- -8.11.1.jar mybatis-3.5.9.jar elasticsearch-rest-client-7.17.4.jar jsql
- parser-4.2.jar netty-common-4.1.79.Final.jar jakarta.annotation-api-1.3
- .5.jar spring-tx-5.3.22.jar netty-transport-4.1.79.Final.jar ikanalyzer
- -2012_u6.jar httpcore-4.4.15.jar mybatis-spring-boot-autoconfigure-2.2.
- 2.jar jakarta.json-api-2.0.1.jar log4j-to-slf4j-2.17.2.jar spring-boot-
- 2.7.2.jar druid-spring-boot-starter-1.2.11.jar pagehelper-spring-boot-a
- utoconfigure-1.4.3.jar spring-data-redis-2.7.2.jar commons-beanutils-1.
- 9.4.jar log4j-api-2.17.2.jar lucene-sandbox-4.7.2.jar httpclient-4.5.9.
- jar jsr305-3.0.2.jar HikariCP-4.0.3.jar tomcat-embed-websocket-9.0.65.j
- ar spring-boot-starter-web-2.7.2.jar postgresql-42.3.6.jar commons-coll
- ections-3.2.2.jar logback-classic-1.2.11.jar logback-core-1.2.11.jar po
- i-ooxml-schemas-4.0.0.jar spring-boot-devtools-2.7.2.jar netty-buffer-4
- .1.79.Final.jar pagehelper-5.3.1.jar commons-pool2-2.11.1.jar spring-bo
- ot-starter-2.7.2.jar spring-data-commons-2.7.2.jar commons-codec-1.15.j
- ar spring-aop-5.3.22.jar curvesapi-1.04.jar spring-boot-starter-tomcat-
- 2.7.2.jar opentelemetry-context-1.29.0.jar aspectjweaver-1.9.7.jar spri
- ng-web-5.3.22.jar commons-logging-1.2.jar aspose-words-15.8.0-jdk16.jar
-  postgresql-42.3.4.jar java-jwt-3.9.0.jar jackson-annotations-2.13.3.ja
- r lucene-analyzers-common-4.7.2.jar tomcat-embed-el-9.0.65.jar json-201
- 90722.jar druid-1.2.11.jar jackson-datatype-jsr310-2.13.3.jar mybatis-s
- pring-boot-starter-2.2.2.jar commons-compress-1.18.jar spring-oxm-5.3.2
- 2.jar httpcore-nio-4.4.15.jar spring-context-support-5.3.22.jar spring-
- context-5.3.22.jar netty-transport-native-unix-common-4.1.79.Final.jar 
- commons-net-3.6.jar poi-scratchpad-4.0.0.jar spring-jcl-5.3.22.jar spri
- ng-boot-starter-logging-2.7.2.jar lucene-core-4.7.2.jar
+Class-Path: spring-beans-5.3.22.jar spring-web-5.3.22.jar poi-ooxml-4.0.
+ 0.jar opentelemetry-api-1.29.0.jar aspectjrt-1.9.7.jar druid-spring-boo
+ t-starter-1.2.11.jar lucene-core-4.7.2.jar tomcat-embed-el-9.0.65.jar p
+ agehelper-5.3.1.jar mysql-connector-java-8.0.29.jar jakarta.json-api-2.
+ 0.1.jar mybatis-spring-boot-starter-2.2.2.jar logback-classic-1.2.11.ja
+ r spring-boot-starter-web-2.7.2.jar jackson-annotations-2.13.3.jar comm
+ ons-collections4-4.2.jar spring-context-support-5.3.22.jar reactive-str
+ eams-1.0.4.jar mybatis-spring-boot-autoconfigure-2.2.2.jar spring-webmv
+ c-5.3.22.jar spring-data-commons-2.7.2.jar elasticsearch-java-8.11.1.ja
+ r pagehelper-spring-boot-starter-1.4.3.jar jsqlparser-4.2.jar netty-tra
+ nsport-4.1.79.Final.jar httpclient-4.5.9.jar spring-context-5.3.22.jar 
+ commons-lang3-3.5.jar jackson-datatype-jsr310-2.13.3.jar spring-jdbc-5.
+ 3.22.jar spring-data-redis-2.7.2.jar spring-tx-5.3.22.jar httpasyncclie
+ nt-4.1.5.jar commons-beanutils-1.9.4.jar parsson-1.0.0.jar spring-boot-
+ devtools-2.7.2.jar netty-transport-native-unix-common-4.1.79.Final.jar 
+ spring-core-5.3.22.jar pagehelper-spring-boot-autoconfigure-1.4.3.jar j
+ sr305-3.0.2.jar spring-boot-2.7.2.jar commons-pool2-2.11.1.jar ikanalyz
+ er-2012_u6.jar reactor-core-3.4.21.jar spring-data-keyvalue-2.7.2.jar s
+ pring-boot-starter-data-redis-2.7.2.jar spring-jcl-5.3.22.jar jakarta.a
+ nnotation-api-1.3.5.jar spring-expression-5.3.22.jar opentelemetry-cont
+ ext-1.29.0.jar log4j-to-slf4j-2.17.2.jar spring-boot-starter-json-2.7.2
+ .jar lucene-sandbox-4.7.2.jar commons-net-3.6.jar java-jwt-3.9.0.jar lo
+ g4j-api-2.17.2.jar spring-boot-starter-2.7.2.jar commons-collections-3.
+ 2.2.jar httpcore-4.4.15.jar lucene-queryparser-4.7.2.jar aspose-words-1
+ 5.8.0-jdk16.jar postgresql-42.3.6.jar lettuce-core-6.1.9.RELEASE.jar to
+ mcat-embed-core-9.0.65.jar fastjson-1.2.47.jar netty-common-4.1.79.Fina
+ l.jar druid-1.2.11.jar aspectjweaver-1.9.7.jar postgresql-42.3.4.jar ch
+ ecker-qual-3.5.0.jar spring-boot-starter-jdbc-2.7.2.jar elasticsearch-r
+ est-client-7.17.4.jar spring-aop-5.3.22.jar poi-scratchpad-4.0.0.jar ja
+ ckson-databind-2.13.3.jar netty-resolver-4.1.79.Final.jar lucene-querie
+ s-4.7.2.jar commons-codec-1.15.jar jackson-core-2.13.3.jar lucene-analy
+ zers-common-4.7.2.jar spring-boot-starter-logging-2.7.2.jar netty-handl
+ er-4.1.79.Final.jar HikariCP-4.0.3.jar mybatis-3.5.9.jar jul-to-slf4j-1
+ .7.36.jar spring-oxm-5.3.22.jar curvesapi-1.04.jar slf4j-api-1.7.36.jar
+  poi-ooxml-schemas-4.0.0.jar jackson-module-parameter-names-2.13.3.jar 
+ tomcat-embed-websocket-9.0.65.jar netty-buffer-4.1.79.Final.jar poi-4.0
+ .0.jar logback-core-1.2.11.jar lombok-1.18.20.jar commons-compress-1.18
+ .jar spring-boot-starter-tomcat-2.7.2.jar jackson-datatype-jdk8-2.13.3.
+ jar xmlbeans-3.0.1.jar spring-boot-autoconfigure-2.7.2.jar aspose-cells
+ -18.9.jar snakeyaml-1.30.jar commons-logging-1.2.jar mybatis-spring-2.0
+ .7.jar json-20190722.jar httpcore-nio-4.4.15.jar netty-codec-4.1.79.Fin
+ al.jar
 

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

@@ -4,9 +4,10 @@
 
     <select id="getWellInfo" resultType="java.util.HashMap">
         select
-            well.well_id, well.well_common_name, well_purpose, well.well_type,  well.budgeted_md, well.completion_formation,
-            well.completion_method, well.org_id_a1, well.org_id_a2,  well.org_name_a2,well.project_id, well.project_name,
-            TO_CHAR(well.spud_date , 'YYYY-MM-dd') spud_date,TO_CHAR(well.end_drilling_date , 'YYYY-MM-dd') end_drilling_date,
+            well.*,
+            TO_CHAR(well.create_date , 'YYYY-MM-dd') create_date_fmt,
+            TO_CHAR(well.update_date , 'YYYY-MM-dd') update_date_fmt,
+            TO_CHAR(well.spud_date , 'YYYY-MM-dd') spud_date_fmt,TO_CHAR(well.end_drilling_date , 'YYYY-MM-dd') end_drilling_date_fmt,
                fact_daily.fluid_prod_daily,
                fact_daily.oil_prod_daily,
                fact_daily.water_cut,
@@ -54,14 +55,15 @@
             resultType="java.util.HashMap">
         select
         well.well_id, well.well_common_name, well_purpose, well.well_type,  well.end_drilling_date, well.budgeted_md, well.completion_formation,
-               well.completion_method, well.org_id_a1, well.org_id_a2,  well.org_name_a2,well.project_id, well.project_name,
+        well.completion_method, well.org_id_a1, well.org_id_a2,  well.org_name_a2,well.project_id, well.project_name,
         TO_CHAR(well.spud_date , 'YYYY-MM-dd') spud_date,TO_CHAR(well.end_drilling_date , 'YYYY-MM-dd') end_drilling_date,
-               station.name  org_name_a1,
+        station.name  org_name_a1,
         TO_CHAR(fact_daily.oil_prod_begin_date , 'YYYY-MM-dd') oil_prod_begin_date,
         TO_CHAR(fact_daily.oil_prod_recent_date , 'YYYY-MM-dd') oil_prod_recent_date,
-        fact_daily.current_state,fact_daily.water_cut,
-        fact_mon.oil_prod_mon,fact_mon.gas_prod_mon,fact_mon.gas_prod_year,fact_mon.oil_prod_year
-        ,fact_mon.water_prod_mon,fact_mon.water_prod_year,
+        fact_daily.current_state,fact_daily.water_cut,fact_daily.oil_prod_cum oil_prod_year,
+        fact_daily.gas_prod_cum gas_prod_year,
+        fact_daily.inj_vol_cum water_prod_year,
+        fact_mon.oil_prod_mon,fact_mon.gas_prod_mon,fact_mon.inj_vol_mon water_prod_mon,
         well_stt.well_coordinates_x x,
         well_stt.well_coordinates_y y,
         intr.well_state
@@ -241,6 +243,8 @@
         select *
         from by_dm.dws_dm_test_history th
         where th.well_id = #{well_id}
+        order by testing_date desc
+        limit 100
     </select>
     <select id="selectTestHistorySummary" resultType="java.util.HashMap">
         select testing_name, count(1) as testing_num
@@ -258,6 +262,7 @@
         select *
         from by_dm.dws_dm_analytical_assays_new aa
         where aa.well_id = #{well_id}
+        limit 100
     </select>
     <select id="selectAnalyticalAssaysSummary" resultType="java.util.HashMap">
         SELECT item_code,

target/classes/META-INF/MANIFEST.MF

@@ -1,46 +1,45 @@
 Manifest-Version: 1.0
 Main-Class: com.bowintek.practice.PracticeApplication
-Class-Path: HikariCP-4.0.3.jar postgresql-42.3.4.jar java-jwt-3.9.0.jar 
- netty-common-4.1.79.Final.jar netty-codec-4.1.79.Final.jar httpcore-4.4
- .15.jar lucene-queryparser-4.7.2.jar commons-collections4-4.2.jar logba
- ck-core-1.2.11.jar httpclient-4.5.9.jar lettuce-core-6.1.9.RELEASE.jar 
- commons-pool2-2.11.1.jar spring-oxm-5.3.22.jar lucene-sandbox-4.7.2.jar
-  netty-handler-4.1.79.Final.jar spring-core-5.3.22.jar spring-jdbc-5.3.
- 22.jar log4j-api-2.17.2.jar opentelemetry-context-1.29.0.jar mysql-conn
- ector-java-8.0.29.jar commons-net-3.6.jar tomcat-embed-el-9.0.65.jar sn
- akeyaml-1.30.jar spring-boot-starter-tomcat-2.7.2.jar gson-2.9.0.jar my
- batis-3.5.9.jar spring-boot-2.7.2.jar jsr305-3.0.2.jar poi-4.0.0.jar ne
- tty-transport-4.1.79.Final.jar jackson-core-2.13.3.jar log4j-to-slf4j-2
- .17.2.jar httpcore-nio-4.4.15.jar jul-to-slf4j-1.7.36.jar tomcat-embed-
- core-9.0.65.jar parsson-1.0.0.jar mybatis-spring-boot-starter-2.2.2.jar
-  spring-context-support-5.3.22.jar spring-boot-starter-jdbc-2.7.2.jar s
- pring-boot-devtools-2.7.2.jar juh-4.1.2.jar jsqlparser-4.2.jar jackson-
- annotations-2.13.3.jar json-20190722.jar lucene-analyzers-common-4.7.2.
- jar pagehelper-spring-boot-autoconfigure-1.4.3.jar poi-ooxml-schemas-4.
- 0.0.jar poi-ooxml-4.0.0.jar tomcat-embed-websocket-9.0.65.jar jakarta.a
- nnotation-api-1.3.5.jar xmlbeans-3.0.1.jar spring-aop-5.3.22.jar spring
- -context-5.3.22.jar lucene-core-4.7.2.jar commons-collections-3.2.2.jar
-  jodconverter-local-4.4.6.jar pagehelper-5.3.1.jar commons-beanutils-1.
- 9.4.jar commons-compress-1.18.jar unoil-4.1.2.jar spring-webmvc-5.3.22.
- jar spring-boot-starter-json-2.7.2.jar lombok-1.18.20.jar spring-expres
- sion-5.3.22.jar jakarta.json-api-2.0.1.jar pagehelper-spring-boot-start
- er-1.4.3.jar spring-boot-starter-2.7.2.jar commons-codec-1.15.jar sprin
- g-tx-5.3.22.jar elasticsearch-java-8.11.1.jar postgresql-42.3.6.jar spr
- ing-data-keyvalue-2.7.2.jar spring-data-redis-2.7.2.jar spring-boot-sta
- rter-logging-2.7.2.jar spring-boot-autoconfigure-2.7.2.jar opentelemetr
- y-api-1.29.0.jar checker-qual-3.5.0.jar lucene-queries-4.7.2.jar elasti
- csearch-rest-client-7.17.4.jar curvesapi-1.04.jar druid-spring-boot-sta
- rter-1.2.11.jar netty-buffer-4.1.79.Final.jar spring-data-commons-2.7.2
- .jar aspectjweaver-1.9.7.jar spring-web-5.3.22.jar jackson-databind-2.1
- 3.3.jar druid-1.2.11.jar fastjson-1.2.47.jar netty-transport-native-uni
- x-common-4.1.79.Final.jar jackson-module-parameter-names-2.13.3.jar asp
- ectjrt-1.9.7.jar jackson-datatype-jdk8-2.13.3.jar slf4j-api-1.7.36.jar 
- spring-beans-5.3.22.jar httpasyncclient-4.1.5.jar reactor-core-3.4.21.j
- ar netty-resolver-4.1.79.Final.jar spring-jcl-5.3.22.jar ridl-4.1.2.jar
-  jackson-datatype-jsr310-2.13.3.jar mybatis-spring-boot-autoconfigure-2
- .2.2.jar mybatis-spring-2.0.7.jar aspose-words-15.8.0-jdk16.jar logback
- -classic-1.2.11.jar reactive-streams-1.0.4.jar jurt-4.1.2.jar jodconver
- ter-core-4.4.6.jar aspose-cells-18.9.jar poi-scratchpad-4.0.0.jar sprin
- g-boot-starter-data-redis-2.7.2.jar ikanalyzer-2012_u6.jar spring-boot-
- starter-web-2.7.2.jar commons-lang3-3.5.jar commons-logging-1.2.jar
+Class-Path: spring-beans-5.3.22.jar spring-web-5.3.22.jar poi-ooxml-4.0.
+ 0.jar opentelemetry-api-1.29.0.jar aspectjrt-1.9.7.jar druid-spring-boo
+ t-starter-1.2.11.jar lucene-core-4.7.2.jar tomcat-embed-el-9.0.65.jar p
+ agehelper-5.3.1.jar mysql-connector-java-8.0.29.jar jakarta.json-api-2.
+ 0.1.jar mybatis-spring-boot-starter-2.2.2.jar logback-classic-1.2.11.ja
+ r spring-boot-starter-web-2.7.2.jar jackson-annotations-2.13.3.jar comm
+ ons-collections4-4.2.jar spring-context-support-5.3.22.jar reactive-str
+ eams-1.0.4.jar mybatis-spring-boot-autoconfigure-2.2.2.jar spring-webmv
+ c-5.3.22.jar spring-data-commons-2.7.2.jar elasticsearch-java-8.11.1.ja
+ r pagehelper-spring-boot-starter-1.4.3.jar jsqlparser-4.2.jar netty-tra
+ nsport-4.1.79.Final.jar httpclient-4.5.9.jar spring-context-5.3.22.jar 
+ commons-lang3-3.5.jar jackson-datatype-jsr310-2.13.3.jar spring-jdbc-5.
+ 3.22.jar spring-data-redis-2.7.2.jar spring-tx-5.3.22.jar httpasyncclie
+ nt-4.1.5.jar commons-beanutils-1.9.4.jar parsson-1.0.0.jar spring-boot-
+ devtools-2.7.2.jar netty-transport-native-unix-common-4.1.79.Final.jar 
+ spring-core-5.3.22.jar pagehelper-spring-boot-autoconfigure-1.4.3.jar j
+ sr305-3.0.2.jar spring-boot-2.7.2.jar commons-pool2-2.11.1.jar ikanalyz
+ er-2012_u6.jar reactor-core-3.4.21.jar spring-data-keyvalue-2.7.2.jar s
+ pring-boot-starter-data-redis-2.7.2.jar spring-jcl-5.3.22.jar jakarta.a
+ nnotation-api-1.3.5.jar spring-expression-5.3.22.jar opentelemetry-cont
+ ext-1.29.0.jar log4j-to-slf4j-2.17.2.jar spring-boot-starter-json-2.7.2
+ .jar lucene-sandbox-4.7.2.jar commons-net-3.6.jar java-jwt-3.9.0.jar lo
+ g4j-api-2.17.2.jar spring-boot-starter-2.7.2.jar commons-collections-3.
+ 2.2.jar httpcore-4.4.15.jar lucene-queryparser-4.7.2.jar aspose-words-1
+ 5.8.0-jdk16.jar postgresql-42.3.6.jar lettuce-core-6.1.9.RELEASE.jar to
+ mcat-embed-core-9.0.65.jar fastjson-1.2.47.jar netty-common-4.1.79.Fina
+ l.jar druid-1.2.11.jar aspectjweaver-1.9.7.jar postgresql-42.3.4.jar ch
+ ecker-qual-3.5.0.jar spring-boot-starter-jdbc-2.7.2.jar elasticsearch-r
+ est-client-7.17.4.jar spring-aop-5.3.22.jar poi-scratchpad-4.0.0.jar ja
+ ckson-databind-2.13.3.jar netty-resolver-4.1.79.Final.jar lucene-querie
+ s-4.7.2.jar commons-codec-1.15.jar jackson-core-2.13.3.jar lucene-analy
+ zers-common-4.7.2.jar spring-boot-starter-logging-2.7.2.jar netty-handl
+ er-4.1.79.Final.jar HikariCP-4.0.3.jar mybatis-3.5.9.jar jul-to-slf4j-1
+ .7.36.jar spring-oxm-5.3.22.jar curvesapi-1.04.jar slf4j-api-1.7.36.jar
+  poi-ooxml-schemas-4.0.0.jar jackson-module-parameter-names-2.13.3.jar 
+ tomcat-embed-websocket-9.0.65.jar netty-buffer-4.1.79.Final.jar poi-4.0
+ .0.jar logback-core-1.2.11.jar lombok-1.18.20.jar commons-compress-1.18
+ .jar spring-boot-starter-tomcat-2.7.2.jar jackson-datatype-jdk8-2.13.3.
+ jar xmlbeans-3.0.1.jar spring-boot-autoconfigure-2.7.2.jar aspose-cells
+ -18.9.jar snakeyaml-1.30.jar commons-logging-1.2.jar mybatis-spring-2.0
+ .7.jar json-20190722.jar httpcore-nio-4.4.15.jar netty-codec-4.1.79.Fin
+ al.jar
 

vue/src/components/basic/chart/chart-prod-dynamics.vue

@@ -51,7 +51,7 @@
     </a-form>
     <div class="echarts-total">
       <template v-for="(it) in getTotals()">
-        <span style="color: #2f54eb; font-weight: bold;">{{it.name}}</span>&nbsp;：&nbsp;{{it.total}}{{it.unit}} &nbsp;&nbsp;&nbsp;&nbsp;
+        <span style="color: #2f54eb; font-weight: bold;">{{it.name}}</span>&nbsp;：&nbsp;{{it.total.toFixed(3)}}{{it.unit}} &nbsp;&nbsp;&nbsp;&nbsp;
       </template>
     </div>
     <div class="echart" :id="('chart-'+id)" :style="getChartStyle()"></div>

vue/src/views/wellinfo/columns.ts

@@ -52,9 +52,6 @@ export const analyticalAssaysColumns=[
   {title: '描述', dataIndex: 'description', key: 'description', width: 120}
 ]
 export const historyAssignmentColumns=[
-  {title: '井筒id', dataIndex: 'wellbore_id', key: 'wellbore_id', width: 120},
-  {title: '作业阶段id', dataIndex: 'event_id', key: 'event_id', width: 120},
-  {title: '试油试采id', dataIndex: 'test_id', key: 'test_id', width: 120},
   {title: '开始时间', dataIndex: 'start_time', key: 'start_time', width: 120},
   {title: '结束时间', dataIndex: 'end_time', key: 'end_time', width: 120},
   {title: '施工简述', dataIndex: 'constr_description', key: 'constr_description', width: 120},

vue/src/views/wellinfo/detail.vue

@@ -90,8 +90,8 @@
               {{ dataModel.well_common_name }}</a-descriptions-item>
             <a-descriptions-item label="井别：">{{ dataModel.well_purpose }}</a-descriptions-item>
             <a-descriptions-item label="井型：">{{ dataModel.well_type }}</a-descriptions-item>
-            <a-descriptions-item label="开钻日期：">{{ dataModel.spud_date }}</a-descriptions-item>
-            <a-descriptions-item label="完钻日期：">{{ dataModel.end_drilling_date }}</a-descriptions-item>
+            <a-descriptions-item label="开钻日期：">{{ dataModel.spud_date_fmt }}</a-descriptions-item>
+            <a-descriptions-item label="完钻日期：">{{ dataModel.end_drilling_date_fmt }}</a-descriptions-item>
             <a-descriptions-item label="设计井深：">{{
                 dataModel.budgeted_md == null ? "" : (dataModel.budgeted_md + "m")
               }}
@@ -114,8 +114,8 @@
                 dataModel.azimuth_angle == null ? "" : (dataModel.azimuth_angle + "°")
               }}
             </a-descriptions-item>
-            <a-descriptions-item label="井位坐标X：">{{ dataModel.well_coordinates_x }}</a-descriptions-item>
-            <a-descriptions-item label="井位坐标y：">{{ dataModel.well_coordinates_y }}</a-descriptions-item>
+            <a-descriptions-item label="井位坐标经度：">{{ dataModel.well_coordinates_x }}</a-descriptions-item>
+            <a-descriptions-item label="井位坐标纬度：">{{ dataModel.well_coordinates_y }}</a-descriptions-item>
           </a-descriptions>
           <a-divider type="vertical" class="info-title" dashed>井A1信息</a-divider>
           <a-descriptions bordered>
@@ -127,7 +127,7 @@
             <a-descriptions-item label="地理位置描述：" :span="3">{{ dataModel.geo_description }}</a-descriptions-item>
             <a-descriptions-item label="构造位置描述：" :span="3">{{ dataModel.structure_pos }}</a-descriptions-item>
             <a-descriptions-item label="创建/更新日期：">
-              {{ dataModel.update_date == null ? dataModel.create_date : dataModel.update_date }}
+              {{ dataModel.update_date_fmt == null ? dataModel.create_date_fmt : dataModel.update_date_fmt }}
             </a-descriptions-item>
             <a-descriptions-item label="井筒生命阶段：">{{ dataModel.phase }}</a-descriptions-item>
             <a-descriptions-item label="通用井筒名：">{{ dataModel.wellbore_common_name }}</a-descriptions-item>

vue/src/views/wellinfo/index.vue

@@ -98,7 +98,7 @@
           </a-row>
           <a-row :gutter="24" class="query-index-row" v-if="showQuery">
             <a-col :span="18">
-              <a-form-item name="spud_date_begin" label="地址单元:">
+              <a-form-item name="spud_date_begin" label="地质单元:">
                 <a-tree-select
                   v-model:value="formState.unitList"
                   show-search