Compare commits

..

No commits in common. "64daeaeb563f2c2ab58567d99db7f9f86d466946" and "751220d22bd952a0fed74db124a2b6c3e9d9ac69" have entirely different histories.

9 changed files with 35 additions and 250 deletions

View File

@ -183,8 +183,6 @@ const handleSelectionChange = (selection: any[]) => {
//
const handleCurrentChange = (val: number) => {
//console.log("currentPage:", val)
//console.log("props.changePage:", props.changePage)
props.changePage(val)
}

View File

@ -9,7 +9,7 @@
<el-input-number v-else-if="item.type === 'number'" v-model="form[item.prop]"
:disabled="item.disabled" controls-position="right"></el-input-number>
<el-select v-else-if="item.type === 'select'" v-model="form[item.prop]" :disabled="item.disabled"
:placeholder="item.placeholder" clearable :multiple="item.multiple?true:false" filterable :allow-create="item.allowcreate?true:false" >
:placeholder="item.placeholder" clearable :multiple="item.multiple?true:false">
<el-option v-for="opt in item.opts" :label="opt.label" :value="opt.value"></el-option>
</el-select>
<el-date-picker v-else-if="item.type === 'date'" type="date" v-model="form[item.prop]"

View File

@ -16,8 +16,6 @@ export interface FormOptionList {
format?: string;
activeValue?: any;
multiple?: boolean;
allowcreate?: boolean;
filterable?: boolean;
inactiveValue?: any;
activeText?: string;
inactiveText?: string;

View File

@ -3,7 +3,7 @@
<TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
<div class="container">
<TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
:delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
:delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
<template #toolbarBtn>
<el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">上传文件</el-button>
</template>
@ -38,7 +38,6 @@ import TableDetail from '@/components/table-detail.vue';
import TableSearch from '@/components/table-search.vue';
import UploadFile from '@/components/upload-file.vue';
import { FormOption, FormOptionList } from '@/types/form-option';
import { pa } from 'element-plus/es/locale';
const page = reactive({
@ -47,7 +46,6 @@ const page = reactive({
total: 122,
})
const tableData = ref<File[]>([]);
const allData = ref<File[]>([]);
//
const query = reactive({
@ -71,19 +69,8 @@ const handleSearch = async () => {
return;
}
let result = await FindUserFileService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
//
@ -104,34 +91,14 @@ const getData = async () => {
type: "all"
}
let result = await FindUserFileService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
getData();
const changePage = (val: number) => {
page.index = val;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
getData();
};
//

View File

@ -3,7 +3,7 @@
<TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
<div class="container">
<TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
:delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :refresh="getData">
:delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :refresh="getData">
<template #toolbarBtn>
<el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
</template>
@ -58,19 +58,8 @@ const handleSearch = async () => {
id: parseInt(query.name)
}
let result = await FindFunctionService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
//
@ -90,7 +79,6 @@ const page = reactive({
total: 122,
})
const tableData = ref<Function[]>([]);
const allData = ref<Function[]>([]);
const model_select_opts = ref([]);
const getData = async () => {
let req={
@ -106,34 +94,14 @@ const getData = async () => {
})
}
let result = await FindFunctionService(req);
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
tableData.value = result.data;
page.total = 12;
};
getData();
const changePage = (val: number) => {
page.index = val;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
getData();
};

View File

@ -3,7 +3,7 @@
<TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
<div class="container">
<TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
:delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
:delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
<template #toolbarBtn>
<el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
</template>
@ -63,19 +63,8 @@ const handleSearch = async () => {
id: parseInt(query.name)
}
let result = await FindKnowledgeBaseService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
//
@ -95,7 +84,6 @@ const page = reactive({
total: 122,
})
const tableData = ref<KBase[]>([]);
const allData = ref<KBase[]>([]);
const file_ids_select_opts = ref([]);
const getData = async () => {
let req={
@ -116,10 +104,10 @@ const getData = async () => {
value: userFile.ID
})
}
allData.value = result.data;
tableData.value = result.data;
//id
for (let i = 0; i < allData.value.length; i++) {
let file_ids = JSON.parse(allData.value[i].FileIDs.toString())
for (let i = 0; i < tableData.value.length; i++) {
let file_ids = JSON.parse(tableData.value[i].FileIDs.toString())
let file_id_list = []
for (let j = 0; j < file_ids.length; j++) {
file_id_list.push(file_ids[j]["file_id"])
@ -134,37 +122,16 @@ const getData = async () => {
}
}
}
allData.value[i].FileNameList = file_name_list.join(",")
tableData.value[i].FileNameList = file_name_list.join(",")
// console.log("file_name_list:", file_name_list)
}
page.total = result.data.length;
page.index = 1;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
};
getData();
const changePage = (val: number) => {
page.index = val;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
getData();
};
//

View File

@ -3,7 +3,7 @@
<TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
<div class="container">
<TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
:delFunc="handleDelete" :changePage="changePage2" :currentPage="page.currentPage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
:delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
<template #toolbarBtn>
<el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
</template>
@ -38,7 +38,6 @@ import TableCustom from '@/components/table-custom.vue';
import TableDetail from '@/components/table-detail.vue';
import TableSearch from '@/components/table-search.vue';
import { FormOption, FormOptionList } from '@/types/form-option';
import { pa } from 'element-plus/es/locale';
//
@ -64,23 +63,8 @@ const handleSearch = async () => {
id: parseInt(query.name)
}
let result = await FindModelService(req);
if (result["data"]==null){
ElMessage.error("没有该模型");
return;
}
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
//
@ -99,62 +83,30 @@ const page = reactive({
index: 1,
size: 10,
total: 122,
pageSizes: [10, 20, 30, 40],
currentPage: 1,
})
const tableData = ref<Model[]>([]);
const allData = ref<Model[]>([]);
const getData = async () => {
let req={
token: localStorage.getItem('token'),
type: "UserID"
}
let result = await FindModelService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
getData();
const changePage = async (val: number) => {
console.log("page index:", page.index);
const changePage = (val: number) => {
page.index = val;
getData();
};
const changePage2 = async (val: number) => {
//console.log("page index:", page.index);
page.index = val;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
page.currentPage = val;
};
//
let options = ref<FormOption>({
labelWidth: '100px',
span: 12,
list: [
{ type: 'select', label: '类型', prop: 'Type', required: true, allowcreate:true, opts:[{label: '本地部署模型', value: 'ollama'},{label: '星火', value: 'spark'},{label: '豆包', value: 'doubao'}]},
{ type: 'select', label: '类型', prop: 'Type', required: true , opts:[{label: '本地部署模型', value: 'ollama'},{label: '星火', value: 'spark'},{label: '豆包', value: 'doubao'}]},
{ type: 'input', label: 'URL', prop: 'Url', required: true },
{ type: 'input', label: '参数', prop: 'Parameter', required: true },
{ type: 'input', label: '描述', prop: 'Description', required: true },

View File

@ -3,7 +3,7 @@
<TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
<div class="container">
<TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
:delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
:delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
<template #toolbarBtn>
<el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
</template>
@ -47,7 +47,6 @@ const page = reactive({
total: 122,
})
const tableData = ref<Session[]>([]);
const allData = ref<Session[]>([]);
//
const query = reactive({
@ -78,19 +77,8 @@ const handleSearch = async () => {
}
let result = await FindSessionService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
//
@ -113,35 +101,14 @@ const getData = async () => {
session_type: -1,
}
let result = await FindSessionService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
getData();
const changePage = (val: number) => {
page.index = val;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
//page.currentPage = val;
getData();
};
const handleGenOperate = async (row: File) => {

View File

@ -3,7 +3,7 @@
<TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
<div class="container">
<TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
:delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit">
:delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit">
<!-- <template #toolbarBtn>
<el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
</template> -->
@ -52,11 +52,11 @@ const handleSearch = async () => {
ElMessage.error('请输入用户名或ID');
return;
}
// query.name
if (isNaN(Number(query.name))) {
keyword_ = query.name;
} else {
try{
search_id = parseInt(query.name);
}catch(e){
search_id = -1;
keyword_ = query.name;
}
let req={
token: localStorage.getItem('token'),
@ -64,19 +64,8 @@ const handleSearch = async () => {
keyword: keyword_,
}
let result = await SearchUserService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
//
@ -96,7 +85,6 @@ const page = reactive({
total: 122,
})
const tableData = ref<UserInfo[]>([]);
const allData = ref<UserInfo[]>([]);
const getData = async () => {
let req={
token: localStorage.getItem('token'),
@ -104,34 +92,14 @@ const getData = async () => {
keyword: "_121",
}
let result = await SearchUserService(req);
tableData.value = result.data;
page.total = result.data.length;
page.index = 1;
allData.value = result.data;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = result.data.slice(start, end);
};
getData();
const changePage = (val: number) => {
page.index = val;
//
let start = (page.index - 1) * page.size;
let end = start + page.size;
if (end > page.total) {
end = page.total;
}
if (start > page.total) {
start = page.total;
}
tableData.value = allData.value.slice(start, end);
page.index = val;
getData();
};
//