vue2-client 1.8.96 → 1.8.98

package/package.json

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

package/src/pages/DynamicStatistics/ChartSelector.vue

@@ -8,21 +8,30 @@
         </a-select>
       </a-col>
       <a-col>
-        数值列：
+        汇总数值列：
         <a-select v-model="selectedValues" mode="multiple" style="width: 200px" @change="updateCharts">
           <a-select-option v-for="option in valueOptions" :key="option" :value="option">{{ option }}</a-select-option>
         </a-select>
       </a-col>
+      <a-col>
+        对比项：
+        <a-select v-model="selectedProjectColumn" style="width: 200px" @change="updateCharts">
+          <a-select-option v-for="project in projectOptions" :key="project" :value="project">{{ project }}</a-select-option>
+        </a-select>
+      </a-col>
+
     </a-row>
     <a-divider/>
     <a-row align="middle" justify="space-around" :gutter="24">
-      <a-col :span="8">
-        <div ref="pieChart" class="chart-content"></div>
-      </a-col>
-      <a-col :span="8">
+      <a-col :span="24">
         <div ref="columnChart" class="chart-content"></div>
       </a-col>
-      <a-col :span="8">
+    </a-row>
+    <a-row align="middle" justify="space-around" :gutter="24">
+      <a-col :span="12">
+        <div ref="pieChart" class="chart-content"></div>
+      </a-col>
+      <a-col :span="12">
         <div id="lineChart" ref="lineChart" class="chart-content"></div>
       </a-col>
     </a-row>
@@ -38,7 +47,10 @@ export default {
       selectedGroup: null,
       groupOptions: [],
       valueOptions: [],
+      projectOptions: [],
       selectedValues: [], // 更新为数组，支持多选
+      selectedProjects: [],
+      selectedProjectColumn: undefined,
       pieChart: null,
       columnChart: null,
       lineChart: null,
@@ -54,9 +66,6 @@ export default {
           containLabel: true
         },
         legend: {},
-        color: ['#5DB1FF', '#59D4D4', '#FFD700', '#FF7F50', '#87CEFA',
-          '#32CD32', '#DA70D6', '#6495ED', '#DC143C', '#00FFFF',
-          '#00008B', '#008B8B', '#B8860B', '#A9A9A9']
       }
     }
   },
@@ -80,7 +89,11 @@ export default {
   methods: {
     initData () {
       this.initializeOptions()
-      this.selectedGroup = this.groupOptions[0]
+      if (this.groupOptions.includes('year')) {
+        this.selectedGroup = 'year'
+      } else {
+        this.selectedGroup = this.groupOptions[0]
+      }
       if (this.valueOptions.length > 0) {
         this.selectedValues = [this.valueOptions[0]] // 默认选择第一个数值列
       }
@@ -89,12 +102,13 @@ export default {
     initializeOptions () {
       if (this.rawData.length > 0) {
         const row = this.rawData[0]
-        this.groupOptions = Object.keys(row).filter(key => typeof row[key] === 'string' ||
+        const columns = Object.keys(row)
+        this.groupOptions = columns.filter(key => typeof row[key] === 'string' ||
           this.isYearArray(this.rawData, key))
-        this.valueOptions = Object.keys(row).filter(key => {
+        this.valueOptions = columns.filter(key => {
           return !isNaN(parseFloat(row[key])) && isFinite(row[key]) && !this.isYear(row[key])
         })
-        console.warn(this.valueOptions)
+        this.projectOptions = columns.filter(key => typeof row[key] === 'string')
       }
     },
     isYearArray (arr, key) {
@@ -123,7 +137,6 @@ export default {
     },
     renderPieChart () {
       const transformedData = this.transformDataForChart('pie')
-      console.log(transformedData)
       const options = {
         series: [
           {
@@ -149,16 +162,41 @@ export default {
         )
       )
     },
+    getProjectList () {
+      let selectedProjects
+      if (this.selectedProjectColumn) {
+        selectedProjects = [...new Set(this.rawData.map(item => item[this.selectedProjectColumn]))]
+      } else {
+        selectedProjects = []
+      }
+      return selectedProjects
+    },
     renderColumnChart () {
+      const selectedProjects = this.getProjectList()
+      let items
+      if (selectedProjects.length > 0) {
+        items = selectedProjects
+      } else {
+        items = this.selectedValues
+      }
       const transformedData = this.transformDataForChart()
       const options = {
+        dataZoom: [
+          {
+            type: 'inside'
+          },
+          {
+            type: 'slider'
+          }
+        ],
+        legend: false,
         dataset: {
-          dimensions: ['category', ...this.selectedValues],
+          dimensions: ['category', ...items],
           source: transformedData
         },
         xAxis: { type: 'category' },
         yAxis: {},
-        series: this.selectedValues.map(item => {
+        series: items.map(item => {
           return { type: 'bar' }
         })
       }
@@ -174,7 +212,6 @@ export default {
     },
     renderLineChart () {
       const transformedData = this.transformDataForChart('line')
-      console.log(transformedData)
       const options = {
         tooltip: {
           trigger: 'axis'
@@ -244,17 +281,41 @@ export default {
           data: this.rawData.map(item => item[valueKey]),
         }))
       } else {
-        // 柱状图数据转换逻辑：为每个分组条件和选中的数值列创建条目
+        const selectedProjects = this.getProjectList()
         const transformedData = []
-        this.rawData.forEach(item => {
-          const tempData = {
-            category: item[this.selectedGroup]
-          }
-          this.selectedValues.forEach(valueKey => {
-            tempData[valueKey] = item[valueKey]
+        if (selectedProjects.length > 0 && this.selectedValues.length > 0) {
+          // 柱状图的数据转换逻辑
+          const categoryMap = {}
+          this.rawData.forEach(item => {
+            const category = item[this.selectedGroup]
+            const key = item[this.selectedProjectColumn]
+            if (item[this.selectedValues[0]] > 0) {
+              if (!categoryMap[category]) {
+                categoryMap[category] = {}
+              }
+              categoryMap[category][key] = item[this.selectedValues[0]]
+            }
           })
-          transformedData.push(tempData)
-        })
+
+          Object.keys(categoryMap).forEach(category => {
+            const tempData = { category }
+            Object.keys(categoryMap[category]).forEach(key => {
+              tempData[key] = categoryMap[category][key]
+            })
+            transformedData.push(tempData)
+          })
+        } else {
+          // 柱状图数据转换逻辑：为每个分组条件和选中的数值列创建条目
+          this.rawData.forEach(item => {
+            const tempData = {
+              category: item[this.selectedGroup]
+            }
+            this.selectedValues.forEach(valueKey => {
+              tempData[valueKey] = item[valueKey]
+            })
+            transformedData.push(tempData)
+          })
+        }
         return transformedData
       }
     },
@@ -264,7 +325,7 @@ export default {
 <style lang="less" scoped>
 .chart-card {
   .chart-content {
-    height: 250px;
+    height: 400px;
   }
 }
 </style>

package/src/pages/DynamicStatistics/QuestionHistoryAndFavorites.vue

@@ -5,19 +5,19 @@
         <a-list item-layout="horizontal" :data-source="questions">
           <a-list-item
             slot="renderItem"
-            :class="item.sql ? (item.uuid === currentuuid ? 'question-history-active' : 'question-history-inactive') : (item.uuid === currentuuid ? 'question-history-active-bug' : 'question-history-inactive-bug')"
-            slot-scope="item,index"
-            @click="handleOpenFavorite(item)">
+            :class="renderItem.sql ? (renderItem.uuid === currentuuid ? 'question-history-active' : 'question-history-inactive') : (renderItem.uuid === currentuuid ? 'question-history-active-bug' : 'question-history-inactive-bug')"
+            slot-scope="renderItem,index"
+            @click="handleOpenFavorite(renderItem)">
             <a-list-item-meta
-              :title="item.question"
-              :description="item.date"
+              :title="renderItem.question"
+              :description="renderItem.date"
             />
             <a-space>
               <a-tooltip title="查看元数据">
                 <a-icon
-                  v-if="item.data"
+                  v-if="renderItem.data"
                   type="eye"
-                  @click.stop="openMetaDataModal(item)"/>
+                  @click.stop="openMetaDataModal(renderItem)"/>
               </a-tooltip>
               <span>&emsp;</span>
               <a-tooltip title="删除对话">
@@ -25,20 +25,20 @@
                   type="delete"
                   theme="filled"
                   class="delClass"
-                  @click.stop="delQuestion(item,index)"/>
+                  @click.stop="delQuestion(renderItem,index)"/>
               </a-tooltip>
               <span>&emsp;</span>
-              <a-tooltip :title="item.isFavorite ? '取消收藏' : '收藏'" v-if="item.sql">
+              <a-tooltip :title="renderItem.isFavorite ? '取消收藏' : '收藏'" v-if="renderItem.sql">
                 <a-icon
                   type="star"
-                  :class="item.isFavorite ? 'startActive' : 'startInactive'"
-                  @click.stop="toFavorites(item,index)"
-                  :theme=" item.isFavorite ? 'filled': 'twoTone'"
+                  :class="renderItem.isFavorite ? 'startActive' : 'startInactive'"
+                  @click.stop="toFavorites(renderItem,index)"
+                  :theme=" renderItem.isFavorite ? 'filled': 'twoTone'"
                   two-tone-color="#FFD700"/>
               </a-tooltip>
               <a-tooltip title="重新查询" v-else>
                 <a-icon
-                  @click.stop="reTrySearch(item, index)"
+                  @click.stop="reTrySearch(renderItem, index)"
                   type="sync"
                   class="reSearch"
                   title="重新查询"/>
@@ -51,26 +51,26 @@
         <a-list item-layout="horizontal" :data-source="favorites">
           <a-list-item
             slot="renderItem"
-            slot-scope="item, index"
-            :class="item.uuid === currentuuid ? 'question-history-active' : 'question-history-inactive'"
-            @click="handleOpenFavorite(item)">
+            slot-scope="renderItem, index"
+            :class="renderItem.uuid === currentuuid ? 'question-history-active' : 'question-history-inactive'"
+            @click="handleOpenFavorite(renderItem)">
             <a-list-item-meta
-              :title="item.question"
-              :description="item.date"
+              :title="renderItem.question"
+              :description="renderItem.date"
             />
             <a-space>
               <a-tooltip title="查看元数据">
                 <a-icon
-                  v-if="item.data"
+                  v-if="renderItem.data"
                   type="eye"
-                  @click.stop="openMetaDataModal(item)"/>
+                  @click.stop="openMetaDataModal(renderItem)"/>
               </a-tooltip>
               <span>&emsp;</span>
               <a-icon
                 type="star"
-                :class="item.isFavorite ? 'startActive' : 'startInactive'"
-                @click.stop="delFavorites(item,index)"
-                :theme=" item.isFavorite ? 'filled': 'twoTone'"
+                :class="renderItem.isFavorite ? 'startActive' : 'startInactive'"
+                @click.stop="delFavorites(renderItem,index)"
+                :theme=" renderItem.isFavorite ? 'filled': 'twoTone'"
                 two-tone-color="#FFD700"/>
             </a-space>
           </a-list-item>
@@ -108,6 +108,9 @@
         <a-descriptions-item label="sql">
           {{ item.sql }}
         </a-descriptions-item>
+        <a-descriptions-item label="oldSql">
+          {{ item.oldSql }}
+        </a-descriptions-item>
         <a-descriptions-item label="查询日期">
           {{ item.date }}
         </a-descriptions-item>

package/src/pages/DynamicStatistics/index.vue

@@ -120,6 +120,7 @@ export default {
       }).then(res => {
         this.loading = false
         const sql = res.sql ? res.sql.replace(/'/g, "''") : null
+        const oldSql = res.old_sql ? res.old_sql.replace(/'/g, "''") : null
         const questionInfo = {
           uuid: uuid,
           question: value,
@@ -129,6 +130,7 @@ export default {
           relationTable: res.relation_table,
           similarTable: res.similar_table,
           sql: sql,
+          oldSql: oldSql,
           date: formatDate('now'),
           data: res.result,
           isFavorite: false

package/src/utils/routerUtil.js

@@ -350,8 +350,9 @@ function parsefunc (func) {
       route.router = row.link.split('$')[1]
       route.params = row.link.split('$')[0]
     }
-    if (route.router.includes('?hideInMenu')) {
-      route.router = route.router.replace('?hideInMenu', '')
+    if (route.router.includes('?')) {
+      // 把问号后面的都删了
+      route.router = route.router.split('?')[0]
     }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)