diff --git a/src/api/generatedApi/index.js b/src/api/generatedApi/index.js index 5ec4490..b2fe193 100644 --- a/src/api/generatedApi/index.js +++ b/src/api/generatedApi/index.js @@ -59,7 +59,7 @@ export function datasetsExTaskPages(data) { //minerU 获取bbox export function minerUBbox(params) { return request({ - url: getUrl('/document/mineru/bbox_json'), + url: getUrl('/document/mineru/bbox_json', 'zixi'), method: 'get', params: params }) @@ -67,7 +67,7 @@ export function minerUBbox(params) { //minerU 重试 export function minerURetry(params) { return request({ - url: getUrl('/document/mineru/retry'), + url: getUrl('/document/mineru/retry', 'zixi'), method: 'get', params: params, noLoading: true @@ -76,7 +76,7 @@ export function minerURetry(params) { //minerU 获取文档处理状态 export function minerUQuery(params) { return request({ - url: getUrl('/dataset/document/query'), + url: getUrl('/dataset/document/query', 'zixi'), method: 'get', params: params, noLoading: true @@ -84,17 +84,17 @@ export function minerUQuery(params) { } //minerU 获取markdown export function minerUMarkDown(params) { - return getUrl(`/document/mineru/md?documentId=${params.documentId}`) + return getUrl(`/document/mineru/md?documentId=${params.documentId}`, 'zixi') } // minerU 获取pdf export function getPdfUrl(params) { - return getUrl(`/datasetDocumentEx/preview?id=${params.documentId}`) + return getUrl(`/datasetDocumentEx/preview?id=${params.documentId}`, 'zixi') } export function minerUMarkDownUpdate(data) { return request({ - url: getUrl(`/document/mineru/md/update`), + url: getUrl(`/document/mineru/md/update`, 'zixi'), method: 'post', data }) @@ -196,9 +196,20 @@ export function saveContentToDocument(data) { }) } //知识库文件上传-自定义 +// export function uploadFileByCustom(data) { +// return request({ +// url: getUrl(`/datasetDocumentEx/uploadFileByCustom`), +// method: 'post', +// data, +// headers: { +// 'Content-Type': 'multipart/form-data' +// } +// }) +// } + export function uploadFileByCustom(data) { return request({ - url: getUrl(`/datasetDocumentEx/uploadFileByCustom`), + url: getUrl(`/datasetDocumentEx/upload/custom`, 'zixi'), method: 'post', data, headers: { @@ -206,6 +217,7 @@ export function uploadFileByCustom(data) { } }) } + //知识库文件上传-通用 export function uploadFileByTemplate(data) { return request({ diff --git a/src/assets/sass/renderSass/button.scss b/src/assets/sass/renderSass/button.scss index 9ee62b7..db53469 100644 --- a/src/assets/sass/renderSass/button.scss +++ b/src/assets/sass/renderSass/button.scss @@ -78,22 +78,22 @@ } } &.line-button { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + background: $--color-primary-button-gradient; border: unset; cursor: pointer; color: #fff; &:hover { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + background: $--color-primary-button-gradient; border: none; color: #fff; } &:active { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + background: $--color-primary-button-gradient; border: none; color: #fff; } &:focus { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + background: $--color-primary-button-gradient; border: none; color: #fff; } diff --git a/src/assets/sass/renderSass/theme.scss b/src/assets/sass/renderSass/theme.scss index 6a3030c..efb926f 100644 --- a/src/assets/sass/renderSass/theme.scss +++ b/src/assets/sass/renderSass/theme.scss @@ -1,45 +1,95 @@ -//主题色 -$--color-primary: #4f47f5ff; //主题色 -$--color-primary-light: lighten($--color-primary, 5%); //高亮颜色 -$--color-primary-disabled: #155aef24; -$--color-primary-danger: #ff0000; -$--color-primary-danger-light: lighten($--color-primary-danger, 5%); //高亮颜色 -$--color-primary-danger-disabled: #ff000024; -$--color-primary-desc-text: #51525d; -$--color-primary-desc-text-drank: #999; -$--color-primary-table-hover: #eff0f8; -$--color-primary-table-button-hover: #e3e5f1; -$--color-primary-label: #70778d; -$--color-primary-button-color: #4f47f5; -$--color-primary-button-background: #4f47f51a; -$--color-primary-success: #02a838; -$--border-radius: 8px; -$--message-success-light: linear-gradient(180deg, #d6f1de 0%, #ffffff 100%); -$--message-error-light: linear-gradient(180deg, #fee4e7 0%, #ffffff 100%); -$--message-warning-light: linear-gradient(180deg, #ffeee1 0%, #ffffff 100%); -$--message-info-light: linear-gradient(180deg, #edf2fc 0%, #ffffff 100%); -$--message-success-border: #1cb16f; -$--message-error-border: #e44655; -$--message-warning-border: #dd7125; -$--message-info-border: #cecece; +// 主题色 +$--color-primary: #4f47f5ff; // 主题色 +$--color-primary-light: lighten($--color-primary, 5%); // 主题色的高亮版本 +$--color-primary-button-gradient: linear-gradient( + 311deg, + #8d5cff 0%, + #026eff 100% +); // 主题色的渐变色按钮 +// 按钮禁用效果 +$--color-primary-disabled: #155aef24; // 主题色的禁用版本 + +// 危险色主题 +$--color-primary-danger: #ff0000; // 危险色 +$--color-primary-danger-light: lighten( + $--color-primary-danger, + 5% +); // 危险色的高亮版本 + +// 危险色禁用效果 +$--color-primary-danger-disabled: #ff000024; // 危险色的禁用版本 + +// 描述文本颜色 +$--color-primary-desc-text: #51525d; // 主题色的描述文本颜色 +$--color-primary-desc-text-drank: #999; // 主题色的深色描述文本颜色 + +// 表格悬停效果 +$--color-primary-table-hover: #eff0f8; // 表格行悬停背景色 +$--color-primary-table-button-hover: #e3e5f1; // 表格按钮悬停背景色 + +// 标签颜色 +$--color-primary-label: #70778d; // 主题色的标签颜色 + +// 按钮颜色 +$--color-primary-button-color: $--color-primary; // 主题色的按钮文字颜色 +$--color-primary-button-background: #4f47f51a; // 主题色的按钮背景色 + +// 成功色 +$--color-primary-success: #02a838; // 成功色 + +// 边框圆角 +$--border-radius: 8px; // 全局边框圆角 + +// 消息框渐变色 +$--message-success-light: linear-gradient( + 180deg, + #d6f1de 0%, + #ffffff 100% +); // 成功消息框的渐变色 +$--message-error-light: linear-gradient( + 180deg, + #fee4e7 0%, + #ffffff 100% +); // 错误消息框的渐变色 +$--message-warning-light: linear-gradient( + 180deg, + #ffeee1 0%, + #ffffff 100% +); // 警告消息框的渐变色 +$--message-info-light: linear-gradient( + 180deg, + #edf2fc 0%, + #ffffff 100% +); // 信息消息框的渐变色 + +// 消息框边框色 +$--message-success-border: #1cb16f; // 成功消息框的边框色 +$--message-error-border: #e44655; // 错误消息框的边框色 +$--message-warning-border: #dd7125; // 警告消息框的边框色 +$--message-info-border: #cecece; // 信息消息框的边框色 + +// 根变量 :root { - --swiper-theme-color: #4f47f5ff; - --color-primary: #4f47f5ff; - --color-primary-disabled: #155aef24; - --color-primary-danger: #ff0000; - --color-primary-label: #70778d; - --color-primary-desc-text-drank: #999; - --ep-color-bg: #fff !important; + --swiper-theme-color: #4f47f5ff; // Swiper 组件的主题色 + --color-primary: #4f47f5ff; // 主题色 + --color-primary-disabled: #155aef24; // 主题色的禁用版本 + --color-primary-danger: #ff0000; // 危险色 + --color-primary-label: #70778d; // 主题色的标签颜色 + --color-primary-desc-text-drank: #999; // 主题色的深色描述文本颜色 + --ep-color-bg: #fff !important; // 全局背景色 } +// 描述文本样式 .theme-primary-desc-text { - color: $--color-primary-desc-text; -} -.theme-primary-desc-text-drank { - color: $--color-primary-desc-text-drank; + color: $--color-primary-desc-text; // 主题色的描述文本颜色 } -.emoji-picker { - --ep-color-bg: #fff !important; +.theme-primary-desc-text-drank { + color: $--color-primary-desc-text-drank; // 主题色的深色描述文本颜色 +} + +// 表情选择器背景色 +.emoji-picker { + --ep-color-bg: #fff !important; // 表情选择器的背景色 } diff --git a/src/config/index.js b/src/config/index.js index 3637872..77a0d35 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,8 +1,13 @@ let envInfo = process.env // let [admin, jifen] = [envInfo.VUE_APP_ADMIN, 'http://192.168.2.62:7196/'] -let [admin, jifen] = ['/api', 'http://192.168.2.62:7196/'] +let [admin, jifen, zixi] = [ + '/api', + 'http://192.168.2.62:7196/', + 'http://192.168.8.165:7196/' +] export default { admin, - jifen + jifen, + zixi } diff --git a/src/views/knowledge/detail/components/preprocessing.vue b/src/views/knowledge/detail/components/preprocessing.vue index cd65834..a210ab7 100644 --- a/src/views/knowledge/detail/components/preprocessing.vue +++ b/src/views/knowledge/detail/components/preprocessing.vue @@ -156,13 +156,15 @@ export default { }) return } + + // 0否 1是 let formData = new FormData() formData.append('file', this.filed) formData.append('datasetId', this.form.datasetId) let api = this.form.radio === '1' ? uploadFileByCustom : uploadFileByTemplate if (this.form.radio === '1') { - formData.append('beMinerU', this.form.beMinerU) - formData.append('beOcr', this.form.beOcr) + formData.append('useMinerU', this.form.beMinerU ? '1': '0') + formData.append('useOcr', this.form.beOcr? '1': '0') } api(formData).then(response => { this.documentId = response.content.content