From ac0a6c0e77860efb406f2c81c989361d2929124c Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 12 八月 2024 10:43:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/dmx/IntelligentAgent/components/agentConfig.vue | 4 ++--
src/views/dmx/IntelligentAgent/components/custom-settings.vue | 2 +-
src/views/dmx/model/components/custom-settings.vue | 2 +-
src/store/modules/user/index.ts | 4 ++++
src/views/dmx/knowledgeLib/tool.vue | 2 +-
config/vite.config.dev.ts | 1 +
src/views/dmx/agent/components/custom-settings.vue | 2 +-
src/views/dmx/knowledgeLib/config.vue | 9 ++++++---
src/views/dmx/setting/components/custom-settings.vue | 2 +-
9 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/config/vite.config.dev.ts b/config/vite.config.dev.ts
index a719586..8701dba 100644
--- a/config/vite.config.dev.ts
+++ b/config/vite.config.dev.ts
@@ -15,6 +15,7 @@
'/base': {
// target: 'http://aiotlink.com:8189',
target: 'http://192.168.20.116:8089',
+ // target: 'http://192.168.20.158:8089',
changeOrigin: true,
ws: true,
// rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 51faef3..faa226d 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -9,6 +9,7 @@
import { removeRouteListener } from '@/utils/route-listener';
import { UserState } from './types';
import useAppStore from '../app';
+import router from "@/router";
const useUserStore = defineStore('user', {
@@ -100,6 +101,9 @@
try {
await userLogout();
} finally {
+ router.push({
+ name: "login",
+ });
this.logoutCallBack();
}
},
diff --git a/src/views/dmx/IntelligentAgent/components/agentConfig.vue b/src/views/dmx/IntelligentAgent/components/agentConfig.vue
index 944d094..4c23cd3 100644
--- a/src/views/dmx/IntelligentAgent/components/agentConfig.vue
+++ b/src/views/dmx/IntelligentAgent/components/agentConfig.vue
@@ -51,7 +51,7 @@
<Upload
:action="uploadAction"
:limit="1"
- :url="form.icon"
+ :url="httpUrl + form.icon"
@update:fileList="updateFileList"
@success="handleSuccess"
></Upload>
@@ -314,7 +314,7 @@
let presence_penalty = ref(true);
let frequency_penalty = ref(true);
let max_tokens = ref(true);
-
+const httpUrl = localStorage.getItem('httpUrl');
const height = ref('calc(500px)');
const props = defineProps(['typeAngint', 'formData']);
diff --git a/src/views/dmx/IntelligentAgent/components/custom-settings.vue b/src/views/dmx/IntelligentAgent/components/custom-settings.vue
index 808f80f..206ab0b 100644
--- a/src/views/dmx/IntelligentAgent/components/custom-settings.vue
+++ b/src/views/dmx/IntelligentAgent/components/custom-settings.vue
@@ -230,7 +230,7 @@
.list-wrap {
position: relative;
- ::v-deep .block-title {
+ .block-title {
height: 36px;
lin-height: 36px;
}
diff --git a/src/views/dmx/agent/components/custom-settings.vue b/src/views/dmx/agent/components/custom-settings.vue
index 808f80f..206ab0b 100644
--- a/src/views/dmx/agent/components/custom-settings.vue
+++ b/src/views/dmx/agent/components/custom-settings.vue
@@ -230,7 +230,7 @@
.list-wrap {
position: relative;
- ::v-deep .block-title {
+ .block-title {
height: 36px;
lin-height: 36px;
}
diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue
index 0fb3804..5e6af51 100644
--- a/src/views/dmx/knowledgeLib/config.vue
+++ b/src/views/dmx/knowledgeLib/config.vue
@@ -1,5 +1,5 @@
<template>
- <div class="main-container">
+ <div ref="scrollContainer" class="main-container">
<div style="position: absolute;top: 0;left: 0;width: 100%;padding: 0 20px">
<h4 style="margin-bottom: 10px"></h4>
<div style="color: #666666;">鍦ㄨ繖閲屾洿鏂版偍鐨勭煡璇嗗簱璇︾粏淇℃伅锛屽挨鍏舵槸瑙ｆ瀽鏂规硶銆�</div>
@@ -18,7 +18,7 @@
v-if="avatarShow"
:action="uploadAction"
:limit="1"
- :url="form.avatar"
+ :url="httpUrl + form.avatar"
@update:fileList="updateFileList"
@success="handleSuccess"
></Upload>
@@ -160,7 +160,7 @@
import message from "@arco-design/web-vue/es/message";
import useLoading from "@/hooks/loading";
const { loading,setLoading } = useLoading(true);
-
+const scrollContainer = ref();
const props = defineProps(['kbtenantInfo'])
const emit = defineEmits(['cancleConfig','saveConfig'])
// 瑙ｆ瀽鏂规硶鍒楄〃
@@ -230,6 +230,7 @@
const uploadAction = '/api/v1/llm/upload'; // 鏇挎崲涓轰綘鐨勪笂浼燗PI
const fileList = ref([]);
const imageUrls = ref([]);
+const httpUrl = localStorage.getItem('httpUrl');
const updateFileList = (newFileList) => {
fileList.value = newFileList;
@@ -368,6 +369,8 @@
setTimeout(() => {
avatarShow.value = true;
},100);
+ scrollContainer.value.scrollTop = 0;
+
}
defineExpose({
diff --git a/src/views/dmx/knowledgeLib/tool.vue b/src/views/dmx/knowledgeLib/tool.vue
index 572b6d0..69f493d 100644
--- a/src/views/dmx/knowledgeLib/tool.vue
+++ b/src/views/dmx/knowledgeLib/tool.vue
@@ -669,7 +669,7 @@
.parser {
width: 100%;
- ::v-deep .arco-btn-outline:hover,
+ .arco-btn-outline:hover,
.arco-btn-outline,
.arco-btn-outline[type='button'] {
color: #2a2a2b;
diff --git a/src/views/dmx/model/components/custom-settings.vue b/src/views/dmx/model/components/custom-settings.vue
index 666fd89..63a473b 100644
--- a/src/views/dmx/model/components/custom-settings.vue
+++ b/src/views/dmx/model/components/custom-settings.vue
@@ -230,7 +230,7 @@
.list-wrap{
position: relative;
- ::v-deep .block-title{
+ .block-title{
height: 36px;
lin-height: 36px;
}
diff --git a/src/views/dmx/setting/components/custom-settings.vue b/src/views/dmx/setting/components/custom-settings.vue
index 666fd89..63a473b 100644
--- a/src/views/dmx/setting/components/custom-settings.vue
+++ b/src/views/dmx/setting/components/custom-settings.vue
@@ -230,7 +230,7 @@
.list-wrap{
position: relative;
- ::v-deep .block-title{
+ .block-title{
height: 36px;
lin-height: 36px;
}
--
Gitblit v1.8.0