领域检索优化

vue/package-lock.json

@@ -46,7 +46,6 @@
         "vue-demi": "^0.14.6",
         "vue-i18n": "9.2.2",
         "vue-router": "^4.1.6",
-        "vue-tour": "^2.0.0",
         "vue-types": "~4.2.1",
         "xlsx": "~0.18.5"
       },
@@ -3040,7 +3039,7 @@
     },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
-      "resolved": "https://registry.npmmirror.com/@popperjs/core/-/core-2.11.8.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "license": "MIT",
       "funding": {
@@ -12793,7 +12792,7 @@
     },
     "node_modules/jump.js": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/jump.js/-/jump.js-1.0.2.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/jump.js/-/jump.js-1.0.2.tgz",
       "integrity": "sha512-oUkJJ/Y4ATU5qjkXBntCZSKctbSyS3ewe2jrLaUu/cc9jsQiAn0fnTUxQnZz3mJdDdem1Q279zrD6h3n+Cgxtg==",
       "license": "MIT"
     },
@@ -16029,7 +16028,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.7.1.tgz",
       "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
@@ -20606,7 +20605,7 @@
     },
     "node_modules/v3-tour": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/v3-tour/-/v3-tour-3.1.2.tgz",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/v3-tour/-/v3-tour-3.1.2.tgz",
       "integrity": "sha512-9/iBfrdO68dseQPmYo6T7PK+S7evBetZR5dkwz28kw+RisRMon899eNB+QVBeQpqY4qfF99oXYfxOJHpLR7O5A==",
       "license": "MIT",
       "dependencies": {
@@ -20859,48 +20858,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/vue-tour": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/vue-tour/-/vue-tour-2.0.0.tgz",
-      "integrity": "sha512-vhKzqdhunQ3EoO1733UxhOB389u3EKv2X8JqYhX4tIq4ilqlZtnY3azPFBYPFmnAqHn5RyZBrP2CpqSaxTs8og==",
-      "license": "MIT",
-      "dependencies": {
-        "@popperjs/core": "^2.9.1",
-        "hash-sum": "^2.0.0",
-        "jump.js": "^1.0.2",
-        "vue": "^2.6.12"
-      }
-    },
-    "node_modules/vue-tour/node_modules/@vue/compiler-sfc": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
-      "dependencies": {
-        "@babel/parser": "^7.23.5",
-        "postcss": "^8.4.14",
-        "source-map": "^0.6.1"
-      },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
-      }
-    },
-    "node_modules/vue-tour/node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "license": "MIT"
-    },
-    "node_modules/vue-tour/node_modules/vue": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz",
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
-      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-sfc": "2.7.16",
-        "csstype": "^3.1.0"
-      }
-    },
     "node_modules/vue-tsc": {
       "version": "0.40.13",
       "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.40.13.tgz",

vue/package.json

@@ -69,7 +69,6 @@
     "vue-demi": "^0.14.6",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.1.6",
-    "vue-tour": "^2.0.0",
     "vue-types": "~4.2.1",
     "xlsx": "~0.18.5"
   },

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

@@ -54,8 +54,9 @@
     },
     mounted(){
       console.log("mounted chart-cell" , this.id);
-      if(this.wellId!=null && this.wellId!=undefined && this.wellId.trim().length>0)
+      if(this.wellId!=null && this.wellId!=undefined && this.wellId.trim().length>0){
         this.readerChart();
+      }
 
       watch(
         () => this.wellId,
@@ -123,7 +124,8 @@
           this.chart = markRaw(echarts.init(document.getElementById('popover-'+this.getChartId()) as HTMLElement));
         if(this.chart!=null) {
           this.chart.setOption(option);
-          this.chart.resize();
+          setTimeout(   this.chart.resize(), 1000);
+
         }
       },
       chartDispose:function (){

vue/src/components/basic/es-result/chat-view.vue

@@ -1,17 +1,10 @@
 <template>
   <div>
-    <div class="search-title">分析化验 年报 | 月报</div>
+    <div class="search-title">年报 | 月报</div>
     <div class="search-view">
       <div class="search-view-chat">
         <div class="search-view-chat-img">
-        <ChartBase :timeType="('month')" :dataType="('gas')" :wellId="well_id"></ChartBase>
-        </div>
-        <div v-for="it in data" class="search-view-chat-info" >
-          <div>分析类型：<span v-html="it.item_code"></span></div>
-          <div>分析指标：<span v-html="it.item_name"></span></div>
-          <div>指标单位:<span v-html="it.meter_unit"></span></div>
-          <div>指标值: <span v-html="it.idx_value"></span></div>
-          <div>描述: <span v-html="it.description"></span></div>
+          <ChartBase :timeType="('month')" :dataType="('gas')" :wellId="well_id"></ChartBase>
         </div>
       </div>
     </div>
@@ -27,7 +20,7 @@ export default defineComponent({
   components: {ChartBase},
   props: {
     indexSetting: Object,
-    well_id:String,
+    well_id: String,
     data: Object,
   },
   setup(props) {
@@ -35,10 +28,10 @@ export default defineComponent({
     const title = props.indexSetting?.indexName;
     const fieldData = props.indexSetting?.fieldList;
     const data = props.data;
-    const well_id=props.well_id;
+    const well_id = props.well_id;
 
     return {
-      fieldData, data,title,well_id
+      fieldData, data, title, well_id
     };
   }
 });

vue/src/main.ts

@@ -38,7 +38,6 @@ async function setupApp() {
   // 挂载路由
   await setupRouter(app);
 
-  require('vue-tour/dist/vue-tour.css');
   app.use(VueTour);
   app.mount('#app');
 }

vue/src/views/esdomain/result.vue

@@ -66,8 +66,6 @@
               <div class="search-body-item">
                 <component is="cycleView" :indexSetting="it.indexSetting" :data="it" :key="it.key"></component>
                 <component is="tableView" :indexSetting="it.indexSetting" :data="it" :key="it.key"></component>
-                <component is="chatView" :indexSetting="it.indexSetting" :well_id="it.well_id"
-                           :data="it.dws_dm_analytical_assays_new" v-show="it.showMore" :key="it.key"></component>
                 <component is="listView" :indexSetting="it.indexSetting"
                            :fieldCode="'fact_dwr_brief_history_assignment'" :data="it.fact_dwr_brief_history_assignment"
                            v-show="it.showMore" :key="it.key"></component>
@@ -77,6 +75,8 @@
                            :data="it.dws_dm_analytical_assays_new" v-show="it.showMore" :key="it.key"></component>
                 <component is="docView" :indexSetting="it.indexSetting" :data="it.fact_dwr_well_data_index"
                            v-show="it.showMore" :key="it.key"></component>
+                <component is="chatView" :indexSetting="it.indexSetting" :well_id="it.well_id"
+                           :data="it.dws_dm_analytical_assays_new" v-show="it.showMore" :key="it.key"></component>
 
                 <a-divider orientation="center" @click="it.showMore=!it.showMore">
                   <template v-if="!it.showMore">
@@ -106,11 +106,11 @@
                 <div style="display: flex;background-color: #bfdedf;justify-content: space-around;padding: 5px;">
                   <span>井号</span>
                   <span>产油/注水</span>
-                  <span>最新生产日期</span>
+                  <span>最近生产日期</span>
                 </div>
               </template>
               <template #renderItem="{ item }">
-                <a-list-item style="display: flex;justify-content: space-around;padding: 5px auto;">
+                <a-list-item style="display: flex;justify-content: space-around;padding: 5px;">
                   <span style="color: red">{{ item }}</span>
                   <span>20/242.3</span>
                   <span>2024-08-04</span>
@@ -142,14 +142,14 @@
               </template>
             </a-list>
           </div>
-          <div class="search-sider-block">
+<!--          <div class="search-sider-block">
             <b>你可能要找的业务过程</b>
             <div class="search-sider-process">
               <template v-for="it in listData">
                 <span>{{ it }}</span>
               </template>
             </div>
-          </div>
+          </div>-->
         </div>
       </div>
     </a-spin>
@@ -449,7 +449,7 @@ export default defineComponent({
     flex-flow: wrap;
 
     .search-view-chat-img {
-      width: 300px;
+      width: 100%;
     }
 
     .search-chat {

vue/src/views/esdomain/well.vue

@@ -13,8 +13,6 @@
               <div class="search-body-item">
                 <component is="cycleView" :indexSetting="it.indexSetting" :data="it" :key="it.key"></component>
                 <component is="tableView" :indexSetting="it.indexSetting" :data="it" :key="it.key"></component>
-                <component is="chatView" :indexSetting="it.indexSetting" :well_id="it.well_id"
-                           :data="it.dws_dm_analytical_assays_new" :key="it.key"></component>
                 <component is="listView" :indexSetting="it.indexSetting"
                            :fieldCode="'fact_dwr_brief_history_assignment'" :data="it.fact_dwr_brief_history_assignment"
                            :key="it.key"></component>
@@ -24,6 +22,8 @@
                            :data="it.dws_dm_analytical_assays_new" :key="it.key"></component>
                 <component is="docView" :indexSetting="it.indexSetting" :data="it.fact_dwr_well_data_index"
                            :key="it.key"></component>
+                <component is="chatView" :indexSetting="it.indexSetting" :well_id="it.well_id"
+                           :data="it.dws_dm_analytical_assays_new" :key="it.key"></component>
               </div>
             </div>
           </template>