vue2-client 1.8.54 → 1.8.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.54",
+  "version": "1.8.56",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/pages/DynamicStatistics/DataTabs.vue

@@ -1,15 +1,11 @@
 <template>
   <a-row class="data-content">
-    <a-tabs v-model="dataTypeActiveKey">
-      <a-tab-pane :key="'0'" tab="表格">
-        <DynamicTable :table-data="pane.content"></DynamicTable>
-      </a-tab-pane>
-      <a-tab-pane :key="'1'" tab="图表">
-        <div class="chart-card">
-          <ChartSelector :rawData="pane.content"/>
-        </div>
-      </a-tab-pane>
-    </a-tabs>
+    <a-row>
+      <DynamicTable :table-data="pane.content"></DynamicTable>
+    </a-row>
+    <a-row>
+      <ChartSelector :rawData="pane.content" v-if="pane?.content?.length"/>
+    </a-row>
     <EvaluationArea :uuid="pane.key" v-if="pane.key"/>
   </a-row>
 </template>
@@ -49,15 +45,18 @@ export default {
   font-weight: bold;
   color: #333;
 }
+
 .chart-card {
   margin-top: 20px;
 }
+
 .data-content {
-  height: 100%;
+  min-height: 100%;
   background-color: #fff;
   padding: 20px;
   border-radius: 8px;
 }
+
 :deep(.ant-tabs-bar) {
   margin-bottom: 0px;
 }

package/src/pages/DynamicStatistics/DynamicTable.vue

@@ -56,7 +56,7 @@ export default {
           totalWidth = totalWidth + 180
         }
         // 设置表格高度为固定值
-        this.scrollYHeight = 'calc(100vh - 30rem)'
+        this.scrollYHeight = 'calc(100vh - 35rem)'
         // 横向滚动长度大于所有宽度，才能实现固定表头
         this.scrollXWidth = totalWidth
       } catch (error) {

package/src/pages/DynamicStatistics/QuestionHistoryAndFavorites.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card class="question-history" id="question-history" size="small" :bordered="false">
-    <a-tabs v-model="activeKey" :tabBarStyle="{ textAlign: 'center' }">
+  <a-card class="question-history" id="question-history" size="small" :bordered="false" :bodyStyle="{ height:'100%', overflowY: 'scroll'}">
+    <a-tabs v-model="activeKey" :tabBarStyle="{ textAlign: 'center',height:'100%',postion:'' }" tabPosition="top">
       <a-tab-pane key="1" tab="对话历史">
         <a-list item-layout="horizontal" :data-source="questions">
           <a-list-item
@@ -64,8 +64,8 @@
 </template>
 
 <script>
-import { indexedDB } from '@/utils/indexedDB'
-import { formatDate } from '@/utils/util'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+import { formatDate } from '@vue2-client/utils/util'
 
 export default {
   props: {

package/src/pages/DynamicStatistics/SearchBar.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="search-bar">
     <a-auto-complete
+      v-model="searchInput"
       class="search-input"
       placeholder="请输入查询的内容"
       option-label-prop="title"
@@ -15,6 +16,7 @@
         </a-select-option>
       </template>
       <a-input
+        class="contentInput"
         v-model="searchInput"
         placeholder="请输入查询的内容"
         @pressEnter="onSearch(searchInput)">
@@ -31,7 +33,7 @@
 
 <script>
 import FavoriteList from './FavoriteList.vue'
-import { post } from '@/services/api'
+import { post } from '@vue2-client/services/api'
 
 export default {
   name: 'SearchBar',
@@ -85,29 +87,8 @@ export default {
         type: 'ai-evaluation',
         content: '11'
       }).then(res => {
-        // todo docker 接口没更新 模拟数据
-        res.data = [
-          {
-            f_input_date: '2024-02-27 20:22:54',
-            id: 1,
-            f_json: '{"date":"2024-02-27 20:21:51","evaluation":true,"question":"查询近三个月各销售人员的销售情况","data":[],"uuid":"461fb4d7-1cc3-4959-82b7-899c6b66a25a","isFavorite":true}',
-            f_type: 'ai-evaluation'
-          },
-          {
-            f_input_date: '2024-02-27 20:22:54',
-            id: 1,
-            f_json: '{"date":"2024-02-27 20:21:51","evaluation":true,"question":"查询近三个月各销售人员的销售情况","data":[],"uuid":"461fb4d7-1cc3-4959-82b7-899c6b66a25a","isFavorite":true}',
-            f_type: 'ai-evaluation'
-          },
-          {
-            f_input_date: '2024-02-27 20:22:54',
-            id: 1,
-            f_json: '{"date":"2024-02-27 20:21:51","evaluation":true,"question":"查询近三个月各销售人员的销售情况","data":[],"uuid":"461fb4d7-1cc3-4959-82b7-899c6b66a25a","isFavorite":true}',
-            f_type: 'ai-evaluation'
-          }
-        ]
         // 提取 json 中的 question， 并去重
-        this.dataSource = res.data.map(item => JSON.parse(item.f_json).question)
+        this.dataSource = res.map(item => JSON.parse(item.f_json).question)
           .filter((item, index, arr) => arr.indexOf(item) === index)
           .map(item => ({ category: item }))
       })
@@ -134,20 +115,14 @@ export default {
 .search-bar {
   display: flex;
   justify-content: center;
-  padding: 25px 0;
-  margin-bottom: 20px;
-
-  :deep(.ant-input) {
-    padding: 4px 80px 4px 40px;
-    height: 48px;
-    font-size: 16px;
-  }
+  align-items: center; /* 添加这一行来实现垂直居中 */
+  height:100%;
 
   .btn_group {
     padding-left: 6px;
 
     :deep(.ant-btn) {
-      height: 100%;
+      height: 3rem;
       color: #4F93FE;
     }
 
@@ -159,9 +134,16 @@ export default {
   :deep(.ant-select-selection--single) {
     height: 100%;
   }
+  :deep(.search__field__mirror) {
+    height: 100%;
+  }
+  .contentInput{
+    height: 48px;
+    width: 35rem;
+    background-color: #fff;
+    padding: 4px 80px 4px 40px;
+    font-size: 16px;
+  }
 }
 
-.search-input {
-  width: 40%;
-}
 </style>

package/src/pages/DynamicStatistics/index.vue

@@ -2,11 +2,11 @@
   <div class="dynamic-statistics">
     <div class="data-nav-card-back">
       <div class="data-nav-card">
-        <a-row type="flex" align="middle" class="search-title-card">
-          <img class="search-title-logo" src="@vue2-client/assets/img/logo.png"/>
-          <span class="search-title-text">数据检索平台</span>
-        </a-row>
         <div class="search-card">
+          <div class="search-title-card">
+            <img class="search-title-logo" src="@vue2-client/assets/img/logo.png"/>
+            <span class="search-title-text">数据检索平台</span>
+          </div>
           <div class="blue-overlay"></div>
           <div class="search-card-main">
             <!-- 搜索栏组件 -->
@@ -46,7 +46,7 @@ import DataTabs from './DataTabs.vue'
 // import { post } from '@vue2-client/services/api'
 import { formatDate } from '@vue2-client/utils/util'
 import QuestionHistoryAndFavorites from './QuestionHistoryAndFavorites.vue'
-import { post } from '@/services/api'
+import { post } from '@vue2-client/services/api'
 
 export default {
   name: 'DynamicStatistics',
@@ -89,6 +89,33 @@ export default {
         }]
       }).then(res => {
         this.loading = false
+        // res = [
+        //   {
+        //     name: '张三',
+        //     money: Math.floor(Math.random() * 100) + 1,
+        //     age: Math.floor(Math.random() * 100) + 1
+        //   },
+        //   {
+        //     name: '张三2',
+        //     money: Math.floor(Math.random() * 100) + 1,
+        //     age: Math.floor(Math.random() * 100) + 1
+        //   },
+        //   {
+        //     name: '张三3',
+        //     money: Math.floor(Math.random() * 100) + 1,
+        //     age: Math.floor(Math.random() * 100) + 1
+        //   },
+        //   {
+        //     name: '张三3',
+        //     money: Math.floor(Math.random() * 100) + 1,
+        //     age: Math.floor(Math.random() * 100) + 1
+        //   },
+        //   {
+        //     name: '张三3',
+        //     money: Math.floor(Math.random() * 100) + 1,
+        //     age: Math.floor(Math.random() * 100) + 1
+        //   }
+        // ]
         if (Array.isArray(res)) {
           this.addTab(uuid, value, res, false)
         } else {
@@ -162,6 +189,9 @@ export default {
       height: 65px;
       width: 94%;
       margin: 0 auto;
+      position: absolute;
+      top: 30%;
+      left:5%;
 
       .search-title-logo {
         width: 60px;
@@ -175,9 +205,10 @@ export default {
     }
 
     .search-card {
+
       width: 100%;
-      //height: 200px;
-      background-image: url('/public/img/dynamicStatistics/dynamicStatisticsBack.jpg');
+      height: 100%;
+      background-image: url('/public/img/dynamicStatistics/1080.jpg');
       background-size: cover;
       position: relative;
     }
@@ -186,7 +217,7 @@ export default {
   .data-main-card {
     //width: 75%;
     height: 79%;
-    padding: 40px 25px 20px 25px;
+    padding: 15px 15px 15px 15px;
     background-color: #f5f7fb;
   }
 
@@ -196,7 +227,11 @@ export default {
     left: 0;
     width: 100%;
     height: 100%;
-    background-color: rgba(#4F93FE, 0.8) // 这里设置蓝色蒙版的颜色和透明度
+    //background-color: rgba(#4F93FE, 0.8) // 这里设置蓝色蒙版的颜色和透明度
+  }
+
+  .search-card-main{
+    height: 100%;
   }
 }
 .spingclass {