Merge remote-tracking branch 'origin/master'

src/main/java/com/bowintek/smartsearch/controller/WellInfoController.java

@@ -205,7 +205,7 @@ public class WellInfoController {
         String watermarkText = accountService.getUserByUserID(accountService.getLoginUserID()).getName() +" "+ dateUtils.dateToStr(new Date());
         getParams.put("isShow", "0");//(isShow != null && 1 == isShow) ? "1":"0");
         getParams.put("watermarkText", watermarkText);
-
+        System.out.println("downFile getParams:"+getParams);
 
         String reData = remoteHelper.getJson(getParams, appConfig.hdfshelperurl + "read", "UTF-8");
         byte[] bytes = Base64.getMimeDecoder().decode(reData);

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

@@ -76,6 +76,8 @@
         fact_mon.inj_vol_mon water_prod_mon,
         well_stt.well_coordinates_x x,
         well_stt.well_coordinates_y y,
+        well_stt.geo_offset_east,
+        well_stt.geo_offset_nonth,
         intr.well_state
         FROM
         by_dwr.fact_dwr_well_basic_information well

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

@@ -195,6 +195,7 @@
     top: 60px;
     z-index: 100;
     display: flex;
+    align-items: center;
   }
 
   .chart-map-item{

vue/src/main.ts

@@ -11,7 +11,6 @@ import { setupStore } from '@/store';
 import { setupI18n } from '@/locales';
 import { setupAntd, setupAssets, setupGlobalMethods, setupCustomComponents } from '@/plugins';
 // import 'ant-design-vue/dist/antd.css';
-import "./styles/variables.less"
 
 if (process.env.NODE_ENV === 'production') {
   const { mockXHR } = require('./mock');

vue/src/views/wellinfo/detail.vue

@@ -125,6 +125,8 @@
                 </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-item label="x轴">{{ dataModel.geo_offset_east }}</a-descriptions-item>
+                <a-descriptions-item label="y轴">{{ dataModel.geo_offset_nonth }}</a-descriptions-item>
               </a-descriptions>
               <a-divider type="vertical" class="info-title" dashed>井A1信息</a-divider>
               <a-descriptions bordered>

vue/src/views/wellinfo/index.vue

@@ -158,7 +158,7 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row class="edit-operation" style="width:600px;float:right;"  data-v-step="3">
+          <a-row class="edit-operation" style="width:600px;float:right;margin-top: 10px;"  data-v-step="3">
             <a-col :span="24"  :style="showOverlay && curStepVal==3?'text-align: right;z-index:1000;background:white;':'text-align: right;'">
               <a-checkbox-group v-model:value="showColumnType" @change="onCheckboxChange">
                 <a-row>
@@ -434,9 +434,9 @@ export default defineComponent({
         target:'[data-v-step="2"]',
         header:{
           title:'<div class="rightTriangle" style="position:absolute;left:23.5em;top:1em;"></div>' +
-                '<div class="tipsTitle" style="position:relative;left:-5.3em;">引导2/5:</div>',
+                '<div class="tipsTitle" style="position:relative;left:-4.7em;">引导2/5:</div>',
         },
-        content:'<div class="tipsContent" style="position:relative;left:-5.7em;">点击"☰"按钮展开更多查询</div>',
+        content:'<div class="tipsContent" style="position:relative;left:-5em;">点击"☰"按钮展开更多查询</div>',
         params:{
           placement:'left'
         }
@@ -544,7 +544,6 @@ export default defineComponent({
         return false;
       }
       showQuery.value = curVal;
-      showQuery.value = false;
     }
 
     const replaceFields = {