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

zhangxiao

2024-08-07 f106cd80d14b83c484b6a1147b5bc9772d15b4f8

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

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

@@ -198,14 +198,15 @@
                  :data="form.prompt_config.parameters"
                  style="width: 100%"
                >
                  <template #key="{ record }">
                  <template #key="{ record, rowIndex }">
                    <a-input v-model="record.key" placeholder="" />
<!--                    <a-input v-model="form.prompt_config.parameters[rowIndex].key" />-->
                  </template>
                  <template #optional="{ record }">
                    <a-switch v-model="record.optional" size="small" />
                  </template>
                  <template #action="{ record }">
                    <a-button type="text" @click="deleteParameters(record)" style="margin-left: 0px" size="small">
                    <a-button type="text" @click="deleteParameters(record)" style="margin-left: 0" size="small">
                      <template #icon>
                        <icon-delete  />
                      </template>
@@ -491,7 +492,7 @@
    setLoading(true)
    try {
      const data = await dialogSet(formNew);
      console.log(data, 'data');
      // console.log(data, 'data');
      if (data.code == 0){
        Message.success(title);
        handleCancel();
@@ -514,9 +515,9 @@
const editClick = (data) => {
  visible.value = true;
  nextTick(()=>{
    console.log(props.formData,'传入数据');
    // console.log(props.formData,'传入数据');
    Object.assign(form, props.formData);
    console.log(form,'表单数据');
    // console.log(form,'表单数据');
  })
};

@@ -542,7 +543,7 @@
const queryModel = async (params) => {
  try {
    const data = await queryModelList(params);
    console.log(data.data, '大模型列表');
    // console.log(data.data, '大模型列表');
    modelList.value = data.data;
    rankModelList.value = {
      BAAI: [data.data.BAAI[1]],
@@ -560,10 +561,10 @@
  setLoading(true);
  try {
    const { data } = await queryKbList(params);
    console.log(data, 'data');
    // console.log(data, 'data');
    nextTick(() => {
      tabs.value = data;
      console.log(tabs.value, 'tabs');
      // console.log(tabs.value, 'tabs');
    });
  } catch (err) {
    // you can report use errorHandler or other

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

@@ -254,7 +254,7 @@
  const queryModel = async (params) => {
    try {
      const data = await queryModelList(params);
      console.log(data.data, '大模型列表');
      // console.log(data.data, '大模型列表');
      modelList.value = data.data;
    } catch (err) {
      // you can report use errorHandler or other

 src/views/dmx/knowledgeLib/config.vue

@@ -193,7 +193,8 @@
import { Message } from "@arco-design/web-vue";
import { queryModelList,kbUpdate } from "@/api/kbList";
import message from "@arco-design/web-vue/es/message";

import useLoading from "@/hooks/loading";
const { loading,setLoading } = useLoading(true);

const props =  defineProps(['kbtenantInfo'])
const emit =  defineEmits(['cancleConfig','saveConfig'])
@@ -255,10 +256,7 @@
    },
  ],
}


let visible = ref(false);
let loading = ref(false);
const formRef = ref(null);
const modelList = ref({});
const file = ref();

 src/views/dmx/knowledgeLib/index.vue

@@ -24,8 +24,9 @@
                <icon-more  :style="{position: 'absolute',top:'10px',right:'20px'}"/>
                <template #content>
                  <a-popconfirm content="确定删除吗?" @ok="deleteKnowledge(tab.id)" type="warning">
                    <span style="cursor: pointer;color: #0960bd;font-size: 12px"><icon-delete />删除</span>
                    <span style="cursor: pointer;color: #4977ba;font-size: 12px"><icon-delete style="font-size: 14px"/>删除</span>
                  </a-popconfirm>
<!--                  <span style="cursor: pointer;color: #0960bd;font-size: 12px" @click="deleteKnowledge(tab.id)"><icon-delete />删除</span>-->
                </template>
              </a-popover>
            </div>