1.系统名称：数据湖数据检索；2.井信息详情 定位井身结构；3.测井解释 全不选改成全选；4.预览加水印

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

@@ -203,7 +203,7 @@ public class WellInfoController {
         getParams.put("fileName", fileName);
         getParams.put("filePath", filePath);
         String watermarkText = accountService.getUserByUserID(accountService.getLoginUserID()).getName() +" "+ dateUtils.dateToStr(new Date());
-        getParams.put("isShow", (isShow != null && 1 == isShow) ? "1":"0");
+        getParams.put("isShow", "0");//(isShow != null && 1 == isShow) ? "1":"0");
         getParams.put("watermarkText", watermarkText);
 
 

src/main/java/com/bowintek/smartsearch/services/impl/QueryLogServiceImpl.java

@@ -9,6 +9,7 @@ import com.bowintek.smartsearch.vo.EsQueryLogVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -44,8 +45,9 @@ public class QueryLogServiceImpl implements QueryLogService {
     }
 
     @Override
+    @Cacheable(value = "esQueryLogList")
     public List<EsQueryLogVo> getQueryList(String queryText) {
-        synchronized (lockObject) {
+        /*synchronized (lockObject) {
             //用户输入查询时，从本地缓存加载数据
             long timeSpan = (new Date()).getTime() - cacheTime;
             if (timeSpan > 30 * 1000 || queryTextCache == null) {
@@ -56,7 +58,9 @@ public class QueryLogServiceImpl implements QueryLogService {
 
         List<EsQueryLogVo> rtnList = queryTextCache.stream()
                 .filter(log -> log.getQueryText().contains(queryText)).toList();
-        return rtnList;
+        return rtnList;*/
+        List<EsQueryLogVo> rtnList = getQueryGroupList(0, 10000, null).getList();
+        return rtnList.stream().filter(log -> log.getQueryText().contains(queryText)).toList();
     }
 
     @Override

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

@@ -154,7 +154,7 @@
             structure.well_coordinates_x x,
             structure.well_coordinates_y y
         FROM by_dwr.fact_dwr_well_basic_information well
-        inner join by_dwr.fact_dwr_well_structure structure on well.well_id = structure.well_id
+        left join by_dwr.fact_dwr_well_structure structure on well.well_id = structure.well_id
         where 1=1
         <if test="well_common_name!='' and well_common_name!=null">
             and well.well_common_name like Concat('%',#{well_common_name},'%')

src/main/resources/static/a4gis/index.html

@@ -850,10 +850,10 @@
 
     //获得vue iframe 传过来的数据
     window.addEventListener("message", function (event) {
-      console.log('child handle Message', event);
+      //console.log('child handle Message', event);
       if(event.data.action=="setSymbols"){
         let points = JSON.parse(event.data.datas);
-        console.log('child handle points', points);
+        //console.log('child handle points', points);
         setSymbols(points);
       }
       if(event.data.action=="setCenter"){

vue/package-lock.json

@@ -12856,10 +12856,9 @@
     },
     "node_modules/less": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmmirror.com/less/-/less-4.1.3.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/less/-/less-4.1.3.tgz",
       "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "copy-anything": "^2.0.1",
         "parse-node-version": "^1.0.1",
@@ -12883,10 +12882,9 @@
     },
     "node_modules/less-loader": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-11.0.0.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/less-loader/-/less-loader-11.0.0.tgz",
       "integrity": "sha512-9+LOWWjuoectIEx3zrfN83NAGxSUB5pWEabbbidVQVgZhN+wN68pOvuyirVlH1IK4VT1f3TmlyvAnCXh8O5KEw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4"
       },

vue/src/components/common/ColumnsSetting.vue

@@ -24,7 +24,7 @@
         <div style="width:100%;display: flex; justify-content: space-between">
           <div>
             <a-button key="back" @click="onCheckAll(true)">全选</a-button>
-            <a-button key="back" @click="onCheckAll(false)">全不选</a-button>
+            <a-button key="back" @click="onCheckAll(false)">反选</a-button>
           </div>
           <div>
             <a-button key="back" @click="onClose">取消</a-button>
@@ -53,13 +53,13 @@ function openModel() {
   checkedColumnsList.value = props.checkedTableColumns.map((item: any) => item.key);
 }
 
-// 全选 or 全不选
+// 全选 or 反选
 function onCheckAll(isChecked: boolean) {
   if (isChecked) {
     checkedColumnsList.value = props.tableColumns.map((item: any) => item.key);
   } else {
     checkedColumnsList.value = props.tableColumns.map((item: any) => {
-      if (item.isDisabled) {
+      if (checkedColumnsList.value.findIndex((x: any) => x == item.key)<0) {
         return item.key;
       }
     });

vue/src/components/file/previewVisibleFile.vue

@@ -10,18 +10,11 @@
         :src="imgUrl"
         :width="props.width"
     />
-    <div class="overlay">
-      <span style="color: white; margin-bottom: 10px" @click="openPreview(true)"
-      ><eye-outlined/>预览</span
-      >
-    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import {ref} from 'vue';
-import { EyeOutlined} from '@ant-design/icons-vue';
-
 
 const props = defineProps({
   width: {

vue/src/layout/header/index.vue

@@ -3,7 +3,7 @@
     <Layout.Header :style="headerStyle" class="layout-header">
       <Space :size="30">
         <img style="height: 52px;" src="~@/assets/images/logo-login.png" alt=""/>
-        <span style="font-size: 30px;margin-left:-10px;">华北油田智能检索</span>
+        <span style="font-size: 30px;margin-left:-10px;">数据湖数据检索</span>
       </Space>
       <Space :size="20">
         <!--      <Search />-->

vue/src/main.ts

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

vue/src/router/outsideLayout.ts

@@ -9,7 +9,7 @@ export const LoginRoute: RouteRecordRaw = {
   name: LOGIN_NAME,
   component: () => import(/* webpackChunkName: "login" */ '@/views/login/index.vue'),
   meta: {
-    title: '华北油田智能检索',
+    title: '数据湖数据检索',
   },
 };
 
@@ -18,7 +18,7 @@ export const wellInfoListRoute: RouteRecordRaw = {
   name: 'WELLINFO_LIST',
   component: () => import('@/views/wellinfo/index.vue'),
   meta: {
-    title: '华北油田智能检索-井筒列表',
+    title: '数据湖数据检索-井筒列表',
   },
 };
 
@@ -27,7 +27,7 @@ export const wellInfoMapRoute: RouteRecordRaw = {
   name: 'WELLINFO_MAP',
   component: () => import('@/views/wellinfo/map.vue'),
   meta: {
-    title: '华北油田智能检索-井地图',
+    title: '数据湖数据检索-井地图',
   },
 };
 

vue/src/styles/global.less

@@ -1,5 +1,6 @@
 @header-height: 64px;
 @footer-height: 70px;
+//@font-size-base: 26px; // 修改基础字体大小
 
 button:focus {
   outline: none;

vue/src/styles/variables.less

@@ -2,3 +2,4 @@
 
 @header-height: 64px;
 @footer-height: 70px;
+//@font-size-base: 26px; // 修改基础字体大小

vue/src/views/login/index.vue

@@ -3,7 +3,7 @@
     <div class="login-logo">
       <!-- <svg-icon name="logo" :size="45" />-->
       <img src="~@/assets/images/logo-login2.png" width="75" />
-      <h1 class="mb-0 ml-2 text-3xl font-bold" style="font-size: 2.675rem;">华北油田智能检索</h1>
+      <h1 class="mb-0 ml-2 text-3xl font-bold" style="font-size: 2.675rem;">数据湖数据检索</h1>
     </div>
     <a-form layout="horizontal" :model="state.formInline" @submit.prevent="handleSubmit" style="border: 1px solid #f0f0f0;width: 600px;height: 400px;padding: 100px;">
       <div style="width: 400px;height: 400px; border-radius: 10px;">

vue/src/views/wellinfo/detail.vue

@@ -112,10 +112,6 @@
                 <a-descriptions-item label="完钻层位：">{{ dataModel.completion_formation }}</a-descriptions-item>
                 <a-descriptions-item label="完井方式：">{{ dataModel.completion_method }}</a-descriptions-item>
                 <a-descriptions-item label="生产井段：">{{ dataModel.well_production_sections }}</a-descriptions-item>
-                <a-descriptions-item label="T₇⁴顶深：">{{
-                    dataModel.t74_top_depth == null ? "" : (dataModel.t74_top_depth + "m")
-                  }}
-                </a-descriptions-item>
                 <a-descriptions-item label="造斜点：">{{
                     dataModel.ko_azimuth == null ? "" : (dataModel.ko_azimuth + "m")
                   }}
@@ -187,9 +183,10 @@
                 <a-descriptions-item label="标准作业区名：">{{ dataModel.bz_dwmc }}</a-descriptions-item>
               </a-descriptions>
             </div>
-            <div style="flex:1;">
-              <a-divider type="vertical" class="info-title" style="margin-top: 0px" dashed>井身结构图片</a-divider>
-              <ChartImage ref="chartImageRef" style="margin-left: 10px"></ChartImage>
+            <div id="jsjgtp" style="flex:1;">
+              <a-divider type="vertical" class="info-title" style="margin-top: 0px" dashed>
+                井身结构图片（{{ dataModel.well_common_name }}）</a-divider>
+              <ChartImage ref="chartImageRef" :wellname="dataModel.well_common_name" style="margin-left: 10px"></ChartImage>
 
               <a-divider type="vertical" class="info-title" dashed>相关文档</a-divider>
               <div style="margin-left:10px;border:1px solid #f0f0f0;padding:5px;">
@@ -629,6 +626,7 @@ export default defineComponent({
       {id: '#jsjj', title: '井史简介', content: '井史简介'},
       {id: '#scdt', title: '生产动态', content: '生产动态'},
       {id: '#jbxx', title: '基本信息', content: '基本信息'},
+      {id: '#jsjgtp', title: '井身结构图片', content: '井身结构图片'},
       {id: '#csls', title: '测试历史', content: '测试历史'},
       {id: '#fxhy', title: '分析化验', content: '分析化验'},
       {id: '#zyjs', title: '作业简史（业务过程）', content: '作业简史（业务过程）'},

vue/vue.config.js

@@ -42,7 +42,9 @@ module.exports = defineConfig({
       less: {
         lessOptions: {
           javascriptEnabled: true,
-          modifyVars: {},
+          modifyVars: {
+            // 'font-size-base': '26px'
+          },
         },
         additionalData: `
           @import "ant-design-vue/lib/style/themes/default.less";
@@ -89,7 +91,7 @@ module.exports = defineConfig({
     }
 
     config.plugin('html').tap((args) => {
-      args[0].title = '华北油田智能检索';
+      args[0].title = '数据湖数据检索';
       return args;
     });