Commit f56b2646 authored by mhw's avatar mhw

问题修改

parent 70227d70
...@@ -412,7 +412,7 @@ const ModeOfSpeaking = new DictionaryBase('对话模式', [ ...@@ -412,7 +412,7 @@ const ModeOfSpeaking = new DictionaryBase('对话模式', [
}, },
{ {
id: 3, id: 3,
name: '文件对话', name: '基于文件问答',
symbol: 'fileSession' symbol: 'fileSession'
}, },
{ {
......
...@@ -31,6 +31,7 @@ import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/ ...@@ -31,6 +31,7 @@ import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/
import { MyModel } from '@/api/gptController.js'; import { MyModel } from '@/api/gptController.js';
import card from './card/index'; import card from './card/index';
/* eslint-disable-next-line */
import particulars from './particulars/index'; import particulars from './particulars/index';
export default { export default {
data () { data () {
...@@ -100,11 +101,12 @@ export default { ...@@ -100,11 +101,12 @@ export default {
}, },
particulars (item) { particulars (item) {
this.$dialog.show('详情', particulars, { console.log('详情');
area: ['100%', '100%'] // this.$dialog.show('详情', particulars, {
}, { tableItem: item }).then(res => { // area: ['100%', '100%']
this.refresh(); // }, { tableItem: item }).then(res => {
}).catch(e => { }); // this.refresh();
// }).catch(e => { });
}, },
refresh (reloadData = false) { refresh (reloadData = false) {
if (reloadData) { if (reloadData) {
......
...@@ -62,8 +62,7 @@ export default { ...@@ -62,8 +62,7 @@ export default {
let isFile = ['pdf', 'jpg', 'gif', 'jpeg', 'png', 'docx', 'doc', 'xlsx', 'xls', 'mp4', 'webm', 'ogg', 'ogv', 'txt'].indexOf(tagUrl.split('.').pop().toLowerCase()) !== -1 let isFile = ['pdf', 'jpg', 'gif', 'jpeg', 'png', 'docx', 'doc', 'xlsx', 'xls', 'mp4', 'webm', 'ogg', 'ogv', 'txt'].indexOf(tagUrl.split('.').pop().toLowerCase()) !== -1
let isFile2 = ['html', 'md', 'json', 'jsonl', 'csv', 'pdf', 'png', 'jpg', 'jpeg', 'bmp', 'eml', 'msg', 'epub', 'xlsx', 'xlsd', 'ipynb', 'odt', 'py', 'rst', 'rtf', 'srt', 'toml', 'tsv', 'docx', 'doc', 'xml', 'ppt', 'pptx', 'txt', 'htm'].indexOf(tagUrl.split('.').pop().toLowerCase()) !== -1 let isFile2 = ['html', 'md', 'json', 'jsonl', 'csv', 'pdf', 'png', 'jpg', 'jpeg', 'bmp', 'eml', 'msg', 'epub', 'xlsx', 'xlsd', 'ipynb', 'odt', 'py', 'rst', 'rtf', 'srt', 'toml', 'tsv', 'docx', 'doc', 'xml', 'ppt', 'pptx', 'txt', 'htm'].indexOf(tagUrl.split('.').pop().toLowerCase()) !== -1
console.log(tagUrl, isFile); if (isFile2 || aTag.className === 'show_detail') { // 判断知识库以及基于文件问答 的文件类型,并添加dom以及样式 || 添加特殊a标签展示详情内容
if (isFile2 || aTag.className === 'show_detail') { // 判断知识库以及文件对话 的文件类型,并添加dom以及样式 || 添加特殊a标签展示详情内容
this.setDescribeStyle(aTag) this.setDescribeStyle(aTag)
} }
aTag.addEventListener('click', function (event) { aTag.addEventListener('click', function (event) {
...@@ -161,7 +160,6 @@ export default { ...@@ -161,7 +160,6 @@ export default {
container.appendChild(fullDom) container.appendChild(fullDom)
fullDom.addEventListener('click', () => { fullDom.addEventListener('click', () => {
console.log(container.getAttribute('isfull'));
if (container.getAttribute('isfull') !== '0') { if (container.getAttribute('isfull') !== '0') {
container.style.height = '400px'; container.style.height = '400px';
container.style.position = 'relative'; container.style.position = 'relative';
......
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
} else if (this.chatForm.pattern === '搜索引擎问答') { } else if (this.chatForm.pattern === '搜索引擎问答') {
apiUrl = '/2api/chat/search_engine_chat' apiUrl = '/2api/chat/search_engine_chat'
this.param = { ...this.param, ...this.chatForm.searchConfige } this.param = { ...this.param, ...this.chatForm.searchConfige }
} else if (this.chatForm.pattern === '文件对话') { } else if (this.chatForm.pattern === '基于文件问答') {
apiUrl = '/2api/chat/file_chat' apiUrl = '/2api/chat/file_chat'
this.param = { ...this.param, ...this.chatForm.fileConfige } this.param = { ...this.param, ...this.chatForm.fileConfige }
if (!this.chatForm.fileConfige.knowledge_id) { if (!this.chatForm.fileConfige.knowledge_id) {
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
}) })
} else if (this.chatForm.pattern === '搜索引擎问答') { } else if (this.chatForm.pattern === '搜索引擎问答') {
} else if (this.chatForm.pattern === '文件对话') { } else if (this.chatForm.pattern === '基于文件问答') {
let temporary = JSON.parse(`[${data}]`.replace(/}{/g, '},{')) let temporary = JSON.parse(`[${data}]`.replace(/}{/g, '},{'))
temporary.forEach((item) => { temporary.forEach((item) => {
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<el-form-item label="模板名称" prop="formFilter.templateName"> <el-form-item label="模板名称" prop="formFilter.templateName">
<el-input class="filter-item" v-model="myDataSetPage.formFilter.templateName" :clearable="true" placeholder="模板名称" /> <el-input class="filter-item" v-model="myDataSetPage.formFilter.templateName" :clearable="true" placeholder="模板名称" />
</el-form-item> </el-form-item>
<el-form-item label-width="0px"> <!-- <el-form-item label-width="0px">
<el-button class="add" type="primary" icon="el-icon-plus" :size="defaultFormItemSize" @click="add">创建模板</el-button> <el-button class="add" type="primary" icon="el-icon-plus" :size="defaultFormItemSize" @click="add">创建模板</el-button>
</el-form-item> </el-form-item> -->
</filter-box> </filter-box>
</el-form> </el-form>
<div class="listBox"> <div class="listBox">
......
<!--预置模板--> <!--预置模板-->
<template> <template>
<div class="presetTemplate"> <div class="presetTemplate">
<el-form ref="myDataSetPage" :model="myDataSetPage" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent> <el-form
ref="myDataSetPage"
:model="myDataSetPage"
label-width="75px"
:size="defaultFormItemSize"
label-position="right"
@submit.native.prevent
>
<filter-box :item-width="350" @search="refresh()" @reset="onReset"> <filter-box :item-width="350" @search="refresh()" @reset="onReset">
<el-form-item label="模板名称" prop="formFilter.templateName"> <el-form-item label="模板名称" prop="formFilter.templateName">
<el-input class="filter-item" v-model="myDataSetPage.formFilter.templateName" :clearable="true" placeholder="模板名称" /> <el-input
class="filter-item"
v-model="myDataSetPage.formFilter.templateName"
:clearable="true"
placeholder="模板名称"
/>
</el-form-item> </el-form-item>
<el-form-item label-width="0px"> <!-- <el-form-item label-width="0px">
<el-button class="add" type="primary" icon="el-icon-plus" :size="defaultFormItemSize" @click="add">创建模板</el-button> <el-button class="add" type="primary" icon="el-icon-plus" :size="defaultFormItemSize" @click="add">创建模板</el-button>
</el-form-item> </el-form-item> -->
</filter-box> </filter-box>
</el-form> </el-form>
<div class="listBox"> <div class="listBox">
<card :dataList='myDataSetPage.operationLog.impl.dataList' :isPreset="true" :refresh="refresh"></card> <card
:dataList="myDataSetPage.operationLog.impl.dataList"
:isPreset="true"
:refresh="refresh"
></card>
<el-row slot="pagination" type="flex" justify="end" style="margin-top: 16px;width: 100%;"> <el-row
<el-pagination :total="myDataSetPage.operationLog.impl.totalCount" :current-page="myDataSetPage.operationLog.impl.currentPage" :page-size="myDataSetPage.operationLog.impl.pageSize" :page-sizes="[10, 20, 50, 100]" layout="total, prev, pager, next, sizes" @current-change="myDataSetPage.operationLog.impl.onCurrentPageChange" @size-change="myDataSetPage.operationLog.impl.onPageSizeChange"> slot="pagination"
type="flex"
justify="end"
style="margin-top: 16px; width: 100%"
>
<el-pagination
:total="myDataSetPage.operationLog.impl.totalCount"
:current-page="myDataSetPage.operationLog.impl.currentPage"
:page-size="myDataSetPage.operationLog.impl.pageSize"
:page-sizes="[10, 20, 50, 100]"
layout="total, prev, pager, next, sizes"
@current-change="myDataSetPage.operationLog.impl.onCurrentPageChange"
@size-change="myDataSetPage.operationLog.impl.onPageSizeChange"
>
</el-pagination> </el-pagination>
</el-row> </el-row>
</div> </div>
...@@ -25,7 +54,12 @@ ...@@ -25,7 +54,12 @@
<script> <script>
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
/* eslint-disable-next-line */ /* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js'; import {
// DropdownWidget,
TableWidget
// UploadWidget,
// ChartWidget
} from '@/utils/widget.js';
import { TemplateController } from '@/api/gptController.js'; import { TemplateController } from '@/api/gptController.js';
import createTemplate from '../components/dialog/createTemplate'; import createTemplate from '../components/dialog/createTemplate';
import card from '../components/card/index'; import card from '../components/card/index';
...@@ -49,20 +83,26 @@ export default { ...@@ -49,20 +83,26 @@ export default {
}, },
operationLog: { operationLog: {
impl: new TableWidget(this.getwidgetData, true, true, false, undefined, false) impl: new TableWidget(
this.getwidgetData,
true,
true,
false,
undefined,
false
)
} }
} }
}; };
}, },
components: {card}, components: { card },
computed: { computed: {
...mapGetters(['getMainContextHeight']), ...mapGetters(['getMainContextHeight']),
tableHeight () { tableHeight () {
return this.getMainContextHeight - 149 - 94 - 40 + 'px'; return this.getMainContextHeight - 149 - 94 - 40 + 'px';
} }
}, },
methods: { methods: {
...@@ -95,31 +135,49 @@ export default { ...@@ -95,31 +135,49 @@ export default {
templateSource: this.myDataSetPage.formFilter.templateSource, templateSource: this.myDataSetPage.formFilter.templateSource,
variable: this.myDataSetPage.formFilter.variable variable: this.myDataSetPage.formFilter.variable
} }
} };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
TemplateController.listForPreset(this, params).then(res => { TemplateController.listForPreset(this, params)
resolve({ .then((res) => {
dataList: res.data.dataList, resolve({
totalCount: res.data.totalCount dataList: res.data.dataList,
totalCount: res.data.totalCount
});
})
.catch((e) => {
reject(e);
}); });
}).catch(e => {
reject(e);
});
}); });
}, },
add () { add () {
this.$dialog.show('创建模版', createTemplate, { this.$dialog
area: ['100%', '100%'] .show(
}, { isEdit: false }).then(res => { '创建模版',
this.refresh(); createTemplate,
}).catch(e => { }); {
area: ['100%', '100%']
},
{ isEdit: false }
)
.then((res) => {
this.refresh();
})
.catch((e) => { });
}, },
edit () { edit () {
this.$dialog.show('修改模版', createTemplate, { this.$dialog
area: ['100%', '100%'] .show(
}, { isEdit: true }).then(res => { '修改模版',
this.refresh(); createTemplate,
}).catch(e => { }); {
area: ['100%', '100%']
},
{ isEdit: true }
)
.then((res) => {
this.refresh();
})
.catch((e) => { });
}, },
refresh (reloadData = false) { refresh (reloadData = false) {
if (reloadData) { if (reloadData) {
...@@ -137,11 +195,10 @@ export default { ...@@ -137,11 +195,10 @@ export default {
}, },
handleChange () { } handleChange () { }
}, },
mounted () { mounted () {
this.formInit() this.formInit();
} }
}; };
</script> </script>
...@@ -224,5 +281,4 @@ export default { ...@@ -224,5 +281,4 @@ export default {
align-content: flex-start; align-content: flex-start;
justify-content: space-between; justify-content: space-between;
} }
</style> </style>
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<slot name="title"> </slot> <slot name="title"> </slot>
<slot name="content"> </slot> <slot name="content"> </slot>
</div> </div>
</template> </template>
<script> <script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment