From 2a7bda171d7e0221b173f897cb7a64059f4eb5eb Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期五, 09 八月 2024 20:09:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/utils/index.ts | 2 ++
src/views/dmx/IntelligentAgent/index.vue | 3 ++-
src/views/dmx/knowledgeLib/test.vue | 3 +--
src/views/dmx/knowledgeLib/index.vue | 23 +++++++++++------------
src/assets/style/global.less | 2 +-
src/views/dmx/knowledgeLib/config.vue | 2 +-
6 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/assets/style/global.less b/src/assets/style/global.less
index 7085488..9423ac3 100644
--- a/src/assets/style/global.less
+++ b/src/assets/style/global.less
@@ -113,5 +113,5 @@
.arco-form .arco-slider{
- display: flex;
+ display: flex!important;
}
\ No newline at end of file
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f4d32d8..9af4f41 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -67,4 +67,6 @@
})
}
+
+export const documentHeight:number = window.innerHeight - 320;
export default null;
diff --git a/src/views/dmx/IntelligentAgent/index.vue b/src/views/dmx/IntelligentAgent/index.vue
index a428dff..4643bb3 100644
--- a/src/views/dmx/IntelligentAgent/index.vue
+++ b/src/views/dmx/IntelligentAgent/index.vue
@@ -133,7 +133,8 @@
import EventBus from '@/utils/EventBus';
import AgentConfig from "@/views/dmx/IntelligentAgent/components/agentConfig.vue";
import logo from "../../../assets/images/model.png";
- let documentHeight = window.innerHeight - 320
+ import { documentHeight } from "@/utils";
+// console.log(documentHeight,'楂樺害');
let count = 5;
const activeKey = ref(1);
const addAgents = ref();
diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue
index 2ef615a..0fb3804 100644
--- a/src/views/dmx/knowledgeLib/config.vue
+++ b/src/views/dmx/knowledgeLib/config.vue
@@ -402,7 +402,7 @@
justify-content: space-between;
height: 100%;
overflow: auto;
- //background: #626aea;
+ border-radius: 8px;
background: var(--color-bg-2);
padding-top: 80px;
diff --git a/src/views/dmx/knowledgeLib/index.vue b/src/views/dmx/knowledgeLib/index.vue
index 38f1e7e..87016f9 100644
--- a/src/views/dmx/knowledgeLib/index.vue
+++ b/src/views/dmx/knowledgeLib/index.vue
@@ -11,7 +11,7 @@
<addKnow @getknowledge="getknowledge" @getKbdetail="getKbdetail"></addKnow>
</div>
<a-spin :loading="listloading" class="lf-container-down">
- <a-scrollbar style="height:56rem;overflow: auto;">
+ <a-scrollbar style="overflow: auto;" :style="{height: documentHeight + 70 + 'px'}">
<div
class="tab"
v-for="(tab, index) in tabs"
@@ -33,10 +33,10 @@
</a-scrollbar>
</a-spin>
</div>
- <div class="rt-container" v-if="tabs.length > 0">
+ <div class="rt-container" v-if="tabs.length > 0" >
<a-tabs :active-key="activeKey" @change="handleTabChange">
<a-tab-pane key="1" :title= "t('dmx.list.DataSet')">
- <div class="rt-container-main">
+ <div class="rt-container-main" :style="{height: documentHeight + 70 + 'px'}">
<a-card ref="account" class="general-card" title="" style="padding-top: 20px">
<a-row>
<a-col :flex="1" :span="12">
@@ -157,7 +157,8 @@
:bordered="false"
:size="size"
@page-change="onPageChange"
- :scroll="{ y: 580 }"
+ :max-height='documentHeight'
+ :scroll="{ y: documentHeight }"
>
<template #name="{ record }">
<!-- <icon-file style="color: #0960bd;margin-right: 4px;" />-->
@@ -251,12 +252,12 @@
</div>
</a-tab-pane>
<a-tab-pane key="2" :title="t('dmx.list.test')">
- <div class="rt-container-main">
+ <div class="rt-container-main" :style="{height: documentHeight + 70 + 'px'}">
<test ref="testForm"></test>
</div>
</a-tab-pane>
<a-tab-pane key="3" :title="t('dmx.list.disposition')">
- <div class="rt-container-main">
+ <div class="rt-container-main" :style="{height: documentHeight + 70 + 'px'}">
<config ref="configForm" :kbtenantInfo="kbtenantInfo" @cancleConfig="cancleConfig" @saveConfig="saveConfig"></config>
</div>
</a-tab-pane>
@@ -336,7 +337,7 @@
import excel from '@/views/dmx/knowledgeLib/components/excel.vue'
import txtPdf from '@/views/dmx/knowledgeLib/components/txtPdf.vue'
import { Message, Modal } from "@arco-design/web-vue";
- import { parseTime } from "@/utils";
+import { documentHeight, parseTime } from "@/utils";
import { deleteLlm } from "@/api/model";
type SizeProps = 'mini' | 'small' | 'medium' | 'large';
type Column = TableColumnData & { checked?: true };
@@ -872,13 +873,12 @@
.main-container{
display: flex;
width: 100%;
- height: 100%;
.lf-container{
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-evenly;
- //background: #ffffff;
+ border-radius: 8px;
background: var(--color-bg-2);
width: 200px;
.lf-container-top{
@@ -890,7 +890,6 @@
flex-direction: column;
box-sizing: border-box;
width: 90%;
- //height: 56rem;
border: 1px solid var(--color-fill-3);
border-radius: 8px;
//padding: 10px;
@@ -938,9 +937,9 @@
//background: #626aea;
margin-left: 20px;
width: calc(100% - 200px);
- height: 56rem;
+ overflow: hidden;
.rt-container-main{
- height: 76vh;
+ overflow: auto;
}
.details{
position: absolute;
diff --git a/src/views/dmx/knowledgeLib/test.vue b/src/views/dmx/knowledgeLib/test.vue
index b340e87..4dae6dc 100644
--- a/src/views/dmx/knowledgeLib/test.vue
+++ b/src/views/dmx/knowledgeLib/test.vue
@@ -189,14 +189,13 @@
display: flex;
justify-content: space-between;
height: 100%;
- //background: #626aea;
&-lf{
width: 30%;
height: 100%;
//border: 1px solid var(--color-fill-3);
background: var(--color-bg-2);
border-radius: 10px;
- overflow: hidden;
+ overflow: auto;
&-top{
width: 100%;
height: 60px;
--
Gitblit v1.8.0