Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

zhangxiao

2024-08-09 273935281037c6d1ec0e556a17a40552aab00bce

Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

 src/router/routes/modules/authority.ts

@@ -9,7 +9,7 @@
    locale: 'menu.authority',
    requiresAuth: true,
    icon: 'icon-lock',
    order: 1,
    order: 5,
  },
  children: [
    {

 src/router/routes/modules/dmx.ts

@@ -10,6 +10,7 @@
    icon: 'icon-user',
    requiresAuth: true,
    order: 0,
    hideInMenu:false
  },
  children: [
    {

 src/router/routes/modules/intelligentAgent.ts

New file
@@ -0,0 +1,27 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';
const session: AppRouteRecordRaw = {
    path: '/intelligentAgent',
    name: 'intelligentAgent',
    component: DEFAULT_LAYOUT,
    meta: {
        locale: '智能体管理',
        requiresAuth: true,
        icon: 'icon-robot',
        order: 4,
        hideInMenu:false
    },
    children:[
        {
            path: '/intelligentAgent',
            name: 'intelligentAgent',
            component: () => import('@/views/dmx/IntelligentAgent/index.vue'),
            meta: {
                requiresAuth: true,
                hideInMenu:true,
                roles: ['*'],
            },
        },
    ]
};
export default session;

 src/router/routes/modules/knowledgeLib.ts

New file
@@ -0,0 +1,27 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';
const session: AppRouteRecordRaw = {
    path: '/knowledgeLib',
    name: 'knowledgeLib',
    component: DEFAULT_LAYOUT,
    meta: {
        locale: '知识库管理',
        requiresAuth: true,
        icon: 'icon-storage',
        order: 2,
        hideInMenu:false
    },
    children:[
        {
            path: '/knowledgeLib',
            name: 'knowledgeLib',
            component: () => import('@/views/dmx/knowledgeLib/index.vue'),
            meta: {
                requiresAuth: true,
                hideInMenu:true,
                roles: ['*'],
            },
        },
    ]
};
export default session;

 src/router/routes/modules/model.ts

New file
@@ -0,0 +1,27 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';
const session: AppRouteRecordRaw = {
    path: '/model',
    name: 'model',
    component: DEFAULT_LAYOUT,
    meta: {
        locale: '模型管理',
        requiresAuth: true,
        icon: 'icon-relation',
        order: 3,
        hideInMenu:false
    },
    children:[
        {
            path: '/model',
            name: 'model',
            component: () => import('@/views/dmx/model/index.vue'),
            meta: {
                requiresAuth: true,
                hideInMenu:true,
                roles: ['*'],
            },
        },
    ]
};
export default session;

 src/router/routes/modules/session.ts

@@ -1,36 +1,27 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';
const session: AppRouteRecordRaw = {
    path: '/session',
    name: 'session',
    path: '/sessionManager',
    name: 'sessionManager',
    component: DEFAULT_LAYOUT,
    meta: {
        locale: 'menu.session',
        requiresAuth: true,
        icon: 'icon-voice',
        order: 3,
        order: 1,
        hideInMenu:false
    },
    children:[
        {
            path:'sessionManager',
            path:'/sessionManager',
            name:"sessionManager",
            meta:{
                locale: '会话管理',
                requiresAuth: true,
                hideInMenu:true,
                roles: ['*'],
                activeMenu:'session'
            },
            component:()=>import('@/views/session/sessionManager/index.vue'),
        },
        {
            path:'sessionRecordsManager',
            name:"sessionRecordsManager",
            meta:{
                locale: '会话记录',
                requiresAuth: true,
                roles: ['*'],
            },
            component:()=>import('@/views/session/sessionRecordsManager/index.vue'),
            component:()=>import('@/views/sessionManager/index.vue'),
        }
    ]
};

 src/views/dmx/IntelligentAgent/components/agentConfig.vue

@@ -32,7 +32,7 @@
  >
    <a-row class="">
      <a-col :span="24">
        <a-tabs type="capsule" size="large" v-model="keyLarge" @tab-click="console.log(keyLarge)">
        <a-tabs type="capsule" size="large"  :active-key="activeKey" @change="handleTabChange">
          <a-tab-pane key="1" title="助理设置">
            <a-divider style="margin-bottom: 20px;margin-top: 0" />
            <div style="width: 100%;" :style="{height:height}">
@@ -220,33 +220,33 @@
                  </a-select>
                </a-form-item>
                <a-form-item label="温度">
                  <a-switch size="small" />
                  <a-switch size="small" v-model="temperature" />
                  <a-space direction="vertical" size="large">
                    <a-slider v-model="form.llm_setting.temperature" :step="0.01" :min="0" :max="1" :style="{ width: '350px', marginLeft: '20px' }" show-input />
                    <a-slider :disabled="!temperature" v-model="form.llm_setting.temperature" :step="0.01" :min="0" :max="1" :style="{ width: '350px', marginLeft: '20px' }" show-input />
                  </a-space>
                </a-form-item>
                <a-form-item label="top P">
                  <a-switch  size="small" />
                  <a-switch  size="small" v-model="top_p"  />
                  <a-space direction="vertical" size="large">
                    <a-slider v-model="form.llm_setting.top_p" :step="0.01" :min="0" :max="1"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                    <a-slider :disabled="!top_p" v-model="form.llm_setting.top_p" :step="0.01" :min="0" :max="1"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                  </a-space>
                </a-form-item>
                <a-form-item label="出席处罚">
                  <a-switch size="small" />
                  <a-switch size="small" v-model="presence_penalty"  />
                  <a-space direction="vertical" size="large">
                    <a-slider v-model="form.llm_setting.presence_penalty" :step="0.01" :min="0" :max="1"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                    <a-slider :disabled="!presence_penalty" v-model="form.llm_setting.presence_penalty" :step="0.01" :min="0" :max="1"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                  </a-space>
                </a-form-item>
                <a-form-item label="频率处罚">
                  <a-switch size="small" />
                  <a-switch size="small" v-model="frequency_penalty"  />
                  <a-space direction="vertical" size="large">
                    <a-slider v-model="form.llm_setting.frequency_penalty" :step="0.01" :min="0" :max="1"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                    <a-slider :disabled="!frequency_penalty" v-model="form.llm_setting.frequency_penalty" :step="0.01" :min="0" :max="1"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                  </a-space>
                </a-form-item>
                <a-form-item label="最大token数">
                  <a-switch size="small" />
                  <a-switch size="small" v-model="max_tokens"  />
                  <a-space direction="vertical" size="large">
                    <a-slider v-model="form.llm_setting.max_tokens"  :min="0" :max="2048"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                    <a-slider :disabled="!max_tokens" v-model="form.llm_setting.max_tokens"  :min="0" :max="2048"  :style="{ width: '350px', marginLeft: '20px' }" show-input />
                  </a-space>
                </a-form-item>
              </a-form>
@@ -274,7 +274,7 @@
const formRef = ref();
const formRef1 = ref();
const formRef2 = ref();
const keyLarge = ref('1');
const activeKey = ref('1');
const form = reactive({
  name: "",
  icon: "",
@@ -309,6 +309,13 @@
  rerank_id:'',
  top_k:1024,
});
let temperature = ref(true);
let top_p = ref(true);
let presence_penalty = ref(true);
let frequency_penalty = ref(true);
let max_tokens = ref(true);


const height = ref('calc(500px)');
const props = defineProps(['typeAngint', 'formData']);
const emit = defineEmits(['queryList']);
@@ -405,6 +412,7 @@
  //   post: '',// 岗位
  //   txt: '',// 备注
  // });
  activeKey.value= '1'
  formRef.value.resetFields();
  formRef1.value.resetFields();
  formRef2.value.resetFields();
@@ -495,6 +503,11 @@

}

function handleTabChange(key) {
  // 处理标签改变事件
  console.log('Changed to tab:', key);
  activeKey.value=key;
}

const queryModel = async (params) => {
  try {

 src/views/dmx/knowledgeLib/index.vue

@@ -34,7 +34,7 @@
          </a-spin>
      </div>
      <div class="rt-container" v-if="tabs.length > 0">
        <a-tabs :activeKey="activeKey" @change="handleTabChange">
        <a-tabs :active-key="activeKey" @change="handleTabChange">
          <a-tab-pane key="1" :title= "t('dmx.list.DataSet')">
            <div class="rt-container-main">
              <a-card  ref="account" class="general-card" title="" style="padding-top: 20px">
@@ -643,7 +643,7 @@
  const reset = () => {
    formModel.value = generateFormModel();
  };
  function handleTabChange(key: string) {
  function handleTabChange(key) {
    // 处理标签改变事件
    console.log('Changed to tab:', key);
    activeKey.value=key;

 src/views/dmx/model/index.vue

@@ -127,7 +127,7 @@
                <!-- <addModel></addModel> -->
                <a-button
                  type="primary"
                  :loading="loading2"
                  :loading="loading"
                  @click="handleAddModel"
                >
                  <template #icon>

 src/views/session/sessionManager/index.vue

File was deleted

 src/views/sessionManager/components/addSession.vue

 src/views/sessionManager/index.vue

File was renamed from src/views/session/sessionRecordsManager/index.vue
@@ -322,7 +322,7 @@
  import { Message } from '@arco-design/web-vue';
  import { EventSourceParserStream } from 'eventsource-parser/stream';
  import moment from 'moment';
  import AddSession from '@/views/session/sessionManager/components/addSession.vue';
  import AddSession from '@/views/sessionManager/components/addSession.vue';
  import {
    chatApi,
    getDialogListApi,