From 8742aa1ca9a96e75c18d4f9e3c52bddd8e190898 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 05 八月 2024 11:38:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/dmx/IntelligentAgent/components/editAgent.vue | 74 ++++++------------
src/views/dmx/knowledgeLib/test.vue | 4
src/views/dmx/knowledgeLib/tool.vue | 88 ++++++++++++++++-----
package.json | 6
src/views/dmx/knowledgeLib/index.vue | 15 ++-
src/views/dmx/knowledgeLib/config.vue | 2
6 files changed, 105 insertions(+), 84 deletions(-)
diff --git a/package.json b/package.json
index ffd9425..eadf093 100644
--- a/package.json
+++ b/package.json
@@ -16,15 +16,15 @@
},
"lint-staged": {
"*.{js,ts,jsx,tsx}": [
- "prettier --write"
+
],
"*.vue": [
- "prettier --write"
+
],
"*.{less,css}": [
- "prettier --write"
+
]
},
"pnpm": {
diff --git a/src/views/dmx/IntelligentAgent/components/editAgent.vue b/src/views/dmx/IntelligentAgent/components/editAgent.vue
index 6e140ad..8cd8458 100644
--- a/src/views/dmx/IntelligentAgent/components/editAgent.vue
+++ b/src/views/dmx/IntelligentAgent/components/editAgent.vue
@@ -19,57 +19,31 @@
title-align="start"
fullscreen
>
- <div class="main-container">
- <div class="main-container-lf">
- <div style="padding: 10px; font-size: 16px; background: #eeeeee"
- >鏅鸿兘浣撻厤缃�</div
- >
- <div style="display: flex; width: 100%" :style="{ height: height }">
- <div style="width: 50%; height: 100%">
- <div style="padding: 10px; font-size: 12px; color: #2a2a2b"
- >鏅鸿兘浣撶敾鍍�</div
- >
- <div>
- <a-textarea
- v-model="system"
- placeholder=""
- disabled
- style="height: 400px; background: #ffffff; color: #666666"
- />
- </div>
+ <div class="main-container">
+ <div class="main-container-lf">
+ <div style="padding: 10px;font-size: 16px;">鏅鸿兘浣撻厤缃�</div>
+ <div style="display: flex;width: 100%;" :style="{height:height}">
+ <div style="width: 50%;height: 100%">
+ <div style="padding: 10px;font-size: 12px;color: #2a2a2b;">鏅鸿兘浣撶敾鍍�</div>
+ <div>
+ <a-textarea v-model="system" placeholder="" disabled style="height: 400px;color: #666666" />
</div>
- <div style="background: #eeeeee; width: 50%">
- <a-form
- ref="formRef"
- :rules="rules"
- :model="form"
- @submit="handleSubmit"
- layout="vertical"
- >
- <a-collapse :default-active-key="['1']">
- <a-collapse-item
- header="鍩虹淇℃伅"
- key="0"
- v-if="typeAngint == 'edit'"
- >
- <a-input
- v-model="form.name"
- placeholder="璇疯緭鍏ユ櫤鑳戒綋鍚嶇О"
- style="width: 200px; margin-top: 10px"
- />
- </a-collapse-item>
- <a-collapse-item header="AI妯″瀷閰嶇疆" key="1">
- <a-space direction="vertical" size="large">
- <a-select
- :size="'large'"
- v-model="form.llm_id"
- :style="{ width: '25rem' }"
- placeholder="璇烽�夋嫨 ..."
- >
- <a-optgroup
- :label="index"
- v-for="(item, index) in modelList"
- :key="index"
+
+ </div>
+ <div style="width: 50%;border: 1px solid var(--color-neutral-3);">
+ <a-form ref="formRef" :rules="rules" :model="form" @submit="handleSubmit" layout="vertical" >
+ <a-collapse :default-active-key="['1']">
+ <a-collapse-item header="鍩虹淇℃伅" key="0" v-if="typeAngint == 'edit'">
+ <a-input v-model="form.name" placeholder="璇疯緭鍏ユ櫤鑳戒綋鍚嶇О" style="width:200px;margin-top: 10px" />
+ </a-collapse-item>
+ <a-collapse-item header="AI妯″瀷閰嶇疆" key="1">
+ <a-space direction="vertical" size="large">
+ <a-select :size="'large'" v-model="form.llm_id" :style="{width:'25rem'}" placeholder="璇烽�夋嫨 ...">
+ <a-optgroup :label="index" v-for="(item,index) in modelList" :key=index>
+ <a-option
+ v-for="(obj) in item"
+ :key='obj.fid'
+ :value="obj.llm_id"
>
<a-option
v-for="obj in item"
diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue
index 0d63a1c..68974a9 100644
--- a/src/views/dmx/knowledgeLib/config.vue
+++ b/src/views/dmx/knowledgeLib/config.vue
@@ -432,7 +432,7 @@
height: 100%;
overflow: auto;
//background: #626aea;
- background: #ffffff;
+ //background: #ffffff;
padding-top: 80px;
&-lf {
diff --git a/src/views/dmx/knowledgeLib/index.vue b/src/views/dmx/knowledgeLib/index.vue
index a1af5df..3635d71 100644
--- a/src/views/dmx/knowledgeLib/index.vue
+++ b/src/views/dmx/knowledgeLib/index.vue
@@ -369,7 +369,7 @@
<!-- </div>-->
<!-- <a-divider style="margin-top: 10px" />-->
<!-- </div>-->
- </div>
+ <!-- </div> -->
</div>
<a-modal title=" " v-model:visible="visible" :footer="false" fullscreen>
<!-- <docx v-if="documenttype=='docx'" previewSrc="http://192.168.20.116:1080/v1/document/get/405c3efa4d8c11ef97560242ac120006"></docx>-->
@@ -871,7 +871,7 @@
flex-direction: column;
align-items: center;
justify-content: space-evenly;
- background: #ffffff;
+ background: var(--color-neutral-3);
width: 200px;
.lf-container-top {
display: flex;
@@ -883,7 +883,7 @@
box-sizing: border-box;
width: 90%;
//height: 56rem;
- border: 1px solid #eeeeee;
+ border: 1px solid var(--color-neutral-3);
//padding: 10px;
margin-bottom: 10px;
//.tabs{
@@ -896,7 +896,7 @@
box-sizing: border-box;
margin: 10px 10px;
padding: 0 10px;
- color: rgba(0, 0, 0, 0.88);
+ //color: var(--color-text-1);
font-size: 14px;
height: 40px;
line-height: 40px;
@@ -908,6 +908,7 @@
}
.tab:hover {
border: 1px solid #ffffff;
+ color: #000000;
background: #e8e8ea;
box-shadow: 0 1px 2px -2px rgba(0, 0, 0, 0.16),
0 3px 6px 0 rgba(0, 0, 0, 0.12),
@@ -916,7 +917,11 @@
.tab.active {
border: 1px solid #e8e8ea;
background: #e8e8ea;
+ color: #000000;
cursor: pointer;
+ box-shadow: 0 1px 2px -2px rgba(0, 0, 0, 0.16),
+ 0 3px 6px 0 rgba(0, 0, 0, 0.12),
+ 0 5px 12px 4px rgba(0, 0, 0, 0.09);
}
}
}
@@ -935,7 +940,7 @@
left: 0;
width: 100%;
height: 100%;
- background: #ffffff;
+ //background: #ffffff;
.details-header {
display: flex;
justify-content: space-between;
diff --git a/src/views/dmx/knowledgeLib/test.vue b/src/views/dmx/knowledgeLib/test.vue
index 69df71d..4738315 100644
--- a/src/views/dmx/knowledgeLib/test.vue
+++ b/src/views/dmx/knowledgeLib/test.vue
@@ -206,7 +206,7 @@
width: 30%;
height: 100%;
//border: 1px solid #cccccc;
- background: #ffffff;
+ //background: #ffffff;
border-radius: 10px;
overflow: hidden;
&-top {
@@ -253,7 +253,7 @@
height: 100%;
//background: #626aea;
//border: 1px solid #cccccc;
- background: #ffffff;
+ //background: #ffffff;
border-radius: 10px;
}
}
diff --git a/src/views/dmx/knowledgeLib/tool.vue b/src/views/dmx/knowledgeLib/tool.vue
index 50da491..fd4e192 100644
--- a/src/views/dmx/knowledgeLib/tool.vue
+++ b/src/views/dmx/knowledgeLib/tool.vue
@@ -272,20 +272,35 @@
/>
</div>
</div>
+ </div>
+ <a-divider style="margin-top: 10px" />
+ <div class="groupMain">
+ <a-checkbox-group v-model="data" @change="handleChange" >
+ <div class="groupList">
+ <a-checkbox value="1"></a-checkbox>
+ <div class="groupList-content" @click="groupListContentClick('1')" @dblclick="contentClick(1)">
+ 鑰� stable version 鏄渶鏂扮ǔ瀹氱増锛岀粡杩囧厖鍒嗘祴璇曞拰楠岃瘉锛宐ug 杈冨皯锛�
+ 閫傚悎鐢ㄤ簬鐢熶骇鐜銆傚叾鐗堟湰鍙烽�氬父涓哄弻鏁帮紝濡� 1.26銆俵egacy versions
+ 鍒欐槸涔嬪墠鍙戝竷鐨勭ǔ瀹氱増锛屽浜庨渶瑕�
+ 鐗瑰畾鏃х増鏈殑鍏煎鎬ф垨瀹夊叏鎬ф敮鎸佺殑鐢ㄦ埛鏈夌敤锛屼絾涓�鑸笉
+ 鎺ㄨ崘鐢ㄤ簬鏂伴」鐩紝闄ら潪鏈夌壒娈婇渶姹傘�傚湪瀹為檯浣跨敤涓紝濡傛灉杩芥眰鏈�鏂板姛鑳�
+ 涓旀効鎰忛潰瀵瑰彲鑳藉瓨鍦ㄧ殑涓�浜涗笉绋冲畾鍥犵礌锛屽彲浠ュ皾璇曚娇鐢ㄤ富绾跨増鏈繘琛屾祴璇曞拰鐮旂┒锛涘鏋滄槸鐢ㄤ簬鐢熶骇鐜
+ </div>
+ <div class="groupList-right">
+ <a-switch v-model="switchType" checked-value="1" unchecked-value="0" @change="handleChangeStatus()"/>
+ </div>
+ </div>
- <div
- class="groupList"
- :style="{ background: keyBg == '2' ? '#eff8ff' : 'white' }"
- >
- <a-checkbox value="1"></a-checkbox>
- <div
- class="groupList-content"
- @click="groupListContentClick('2')"
- @dblclick="contentClick(1)"
- >
- 鑰� stable version 鏄渶鏂扮ǔ瀹氱増锛岀粡杩囧厖鍒嗘祴璇曞拰楠岃瘉锛宐ug 杈冨皯锛�
- 閫傚悎鐢ㄤ簬鐢熶骇鐜銆傚叾鐗堟湰鍙烽�氬父涓哄弻鏁帮紝濡� 1.26銆俵egacy versions
- 鍒欐槸涔嬪墠鍙戝竷鐨勭ǔ瀹氱増锛屽浜庨渶瑕�
+ <div class="groupList">
+ <a-checkbox value="1"></a-checkbox>
+ <div class="groupList-content" @click="groupListContentClick('2')" @dblclick="contentClick(1)">
+ 鑰� stable version 鏄渶鏂扮ǔ瀹氱増锛岀粡杩囧厖鍒嗘祴璇曞拰楠岃瘉锛宐ug 杈冨皯锛�
+ 閫傚悎鐢ㄤ簬鐢熶骇鐜銆傚叾鐗堟湰鍙烽�氬父涓哄弻鏁帮紝濡� 1.26銆俵egacy versions
+ 鍒欐槸涔嬪墠鍙戝竷鐨勭ǔ瀹氱増锛屽浜庨渶瑕�
+ </div>
+ <div class="groupList-right">
+ <a-switch v-model="switchType" checked-value="1" unchecked-value="0" @change="handleChangeStatus()"/>
+ </div>
</div>
<div class="groupList-right">
<a-switch
@@ -471,16 +486,43 @@
</script>
<style scoped lang="less">
- .parser {
- width: 100%;
- ::v-deep .arco-btn-outline:hover,
- .arco-btn-outline,
- .arco-btn-outline[type='button'] {
- color: #2a2a2b;
- border: 1px solid #2a2a2b;
- }
- .button {
- //color: #2a2a2b!important;
+.parser{
+ width: 100%;
+ ::v-deep .arco-btn-outline:hover, .arco-btn-outline, .arco-btn-outline[type='button']{
+ color: #2a2a2b;
+ border: 1px solid #2a2a2b;
+ }
+ .button{
+ //color: #2a2a2b!important;
+ }
+}
+.groupMain{
+ width: 100%;
+ height: 500px;
+ overflow: auto;
+ display: flex;
+ justify-content: center;
+ .groupList{
+ display: flex;
+ padding: 24px;
+ border-radius: 8px;
+ //background: #eff8ff;
+ border: 1px solid var(--color-neutral-3);
+ margin-bottom: 20px;
+ overflow: auto;
+ .groupList-content{
+ width: 700px;
+ //height: 100px;
+ overflow: auto;
+ box-sizing: border-box;
+ margin: 0;
+ padding: 0;
+ color: var(--color-text-1);
+ font-size: 14px;
+ font-family: Inter;
+ position: relative;
+
+
}
}
.groupMain {
--
Gitblit v1.8.0