会话机制

src/api/dataChart.js

@@ -3,7 +3,7 @@ import http from '@/utils/request'
 
 // vanna 问答
 export function getAsk (data) {
-  return http.post('/vanna/v0/ask', data)
+  return http.post('/vanna/v0/ask_agent', data)
 }
 
 // 提交到正确训练集

src/store/modules/user.js

@@ -6,9 +6,11 @@ import { setToken, deleteToken } from '@/utils/auth'
 
 // const defaultSingleSignOn = localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0' // 默认单点登录
 
+const userInfo = localStorage.getItem('userInfo')
+
 const state = {
   singleSignOn: localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0', // 单点登录
-  userInfo: {}
+  userInfo: userInfo ? JSON.parse(userInfo) : {}
 }
 
 const mutations = {
@@ -39,7 +41,7 @@ const actions = {
         commit('SET_SINGLE_SIGN_ON', 0)
         setToken(data.token)
         // const { username, name, id, employeeCode } = data.user
-        commit('SET_USERINFO', data.user)
+        commit('SET_USERINFO', data)
         resolve()
       }).catch(err => { reject(err) })
     })

src/views/dataBook/components/mGraph.vue

@@ -84,21 +84,21 @@ const NODES_SIZE = {
   width: 30,
   height: 30
 }
-const LINE_COLOR_MAP = {
-  包含: '#F44336', // red
-  影响: '#E91E63', // pink
-  依赖: '#3F51B5', // indigo
-  来源: '#4CAF50', // green
-  引用: '#9C27B0', // purple
-  继承: '#673AB7', // deep-purple
-  标记: '#2196F3', // blue
-  使用: '#03A9F4', // light-blue
-  关联: '#00BCD4', // cyan
-  拥有: '#009688', // teal
-  下级: '#8BC34A', // light-green
-  上级: '#CDDC39', // lime
-  联动: '#FF9800' // orange
-}
+// const LINE_COLOR_MAP = {
+//   包含: '#F44336', // red
+//   影响: '#E91E63', // pink
+//   依赖: '#3F51B5', // indigo
+//   来源: '#4CAF50', // green
+//   引用: '#9C27B0', // purple
+//   继承: '#673AB7', // deep-purple
+//   标记: '#2196F3', // blue
+//   使用: '#03A9F4', // light-blue
+//   关联: '#00BCD4', // cyan
+//   拥有: '#009688', // teal
+//   下级: '#8BC34A', // light-green
+//   上级: '#CDDC39', // lime
+//   联动: '#FF9800' // orange
+// }
 export default {
   name: 'details-graph',
   components: { RelationGraph, MEmpty },
@@ -314,9 +314,9 @@ export default {
           Object.assign(ele, this.config[ele.node_type])
         })
 
-        data.lines.forEach(ele => {
-          ele.color = LINE_COLOR_MAP[ele.text]
-        })
+        // data.lines.forEach(ele => {
+        //   ele.color = LINE_COLOR_MAP[ele.text]
+        // })
         this.$nextTick(() => {
           this.$refs.graphRef.setOptions(this.graphOptions, async (graphInstance) => {
             if (!this.$refs.graphRef || !this.$refs.graphRef.setJsonData) {

src/views/dataChart/dataChartEditChat.vue

@@ -22,7 +22,7 @@
               {{ item.type === 1 ? 'AI助手' : '游客' }}
               <template v-if="item.type === 1">
                 <v-btn
-                  v-if="item.content?.sql"
+                  v-if="item.content.sql"
                   class="ml-3"
                   small
                   elevation="0"
@@ -59,12 +59,12 @@
               </template>
               <template v-else>
                 <div>
-                  {{ item.content.summary }}
+                  {{ item.content.response }}
                 </div>
                 <div v-if="item.showSnackbar" class="pa-3 blue-grey lighten-3 mt-3">
                   {{ item.content.sql }}
                 </div>
-                <div class="mt-3" v-if="item.content.columns.length">
+                <div class="mt-3" v-if="item.content.records && item.content.records.columns.length">
                   <div>
                     <v-menu
                       v-model="item.showMenu"
@@ -85,7 +85,7 @@
                         <div class="pa-3">
                           <v-autocomplete
                             v-model="item.model.typeAxis"
-                            :items="item.content.columns"
+                            :items="item.content.records.columns"
                             class="mb-3"
                             outlined
                             dense
@@ -95,7 +95,7 @@
 
                           <v-autocomplete
                             v-model="item.model.dataAxis"
-                            :items="item.content.columns"
+                            :items="item.content.records.columns"
                             class="mb-3"
                             outlined
                             dense
@@ -124,7 +124,7 @@
                           <thead>
                             <tr>
                               <th
-                                v-for="header in item.content.columns"
+                                v-for="header in item.content.records.columns"
                                 :key="header"
                                 class="text-left"
                               >{{ header }}</th>
@@ -132,11 +132,11 @@
                           </thead>
                           <tbody>
                             <tr
-                              v-for="(row, index) in item.content.rows"
+                              v-for="(row, index) in item.content.records.rows"
                               :key="index"
                             >
                               <td
-                                v-for="header in item.content.columns"
+                                v-for="header in item.content.records.columns"
                                 :key="header"
                                 class="text-left"
                               >{{ row[header] }}</td>
@@ -178,7 +178,7 @@
       </div>
     </div>
     <div class="pa-3 chart-content-chat-btn">
-      <div class="send d-flex align-center justify-center">
+      <div class="send">
         <div class="send-box">
           <v-textarea
             v-model="question"
@@ -196,6 +196,22 @@
             <v-icon>mdi-send</v-icon>
           </v-btn>
         </div>
+        <div>
+          <v-chip-group
+            active-class="primary--text"
+            column
+            v-model="routingMode"
+          >
+            <v-chip
+              v-for="chip in chips"
+              :key="chip.value"
+              small
+              :value="chip.value"
+            >
+              {{ chip.text }}
+            </v-chip>
+          </v-chip-group>
+        </div>
       </div>
     </div>
     <!-- <v-dialog
@@ -242,10 +258,16 @@ import {
   submitTrainingCorrect,
   submitTrainingError
 } from '@/api/dataChart'
+import { mapGetters } from 'vuex'
 export default {
   name: 'dataChartEditChat',
   data () {
     return {
+      routingMode: undefined,
+      chips: [
+        { text: '聊天模式', value: 'chat_direct' },
+        { text: '数据库模式', value: 'database_direct' }
+      ],
       loading: false,
       disabled: false,
       question: '',
@@ -260,10 +282,14 @@ export default {
             '赣州分公司下，餐饮类档口的日均订单量是多少？'
           ]
         }
-      ]
+      ],
+      conversationId: undefined
       // trueData: false
     }
   },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
   methods: {
     handleKeyCode (event) {
       if (event.keyCode === 13) {
@@ -310,8 +336,14 @@ export default {
       this.items.push(ask)
       this.question = ''
       try {
-        const { data } = await getAsk({ question })
+        const { data } = await getAsk({
+          question,
+          user_id: this.userInfo.id,
+          routing_mode: this.routingMode,
+          conversation_id: this.conversationId
+        })
         ask.content = data
+        this.conversationId = data.conversation_id
         this.scrollToBottom()
       } catch (error) {
         ask.content = error.message