diff --git a/package.json b/package.json index 00991ba..50a6916 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "mitt": "^3.0.1", "mockjs": "^1.1.0", "nprogress": "^0.2.0", - "pdfjs-dist": "^2.11.338", + "pdfjs-dist": "2.11.338", "pinia": "^2.1.7", "pinia-plugin-persist": "^1.0.0", "qrcode": "^1.5.3", diff --git a/src/api/reporting/RepDataProblem/RepDataProblem/index.ts b/src/api/reporting/RepDataProblem/RepDataProblem/index.ts index fe19c16..ea68962 100644 --- a/src/api/reporting/RepDataProblem/RepDataProblem/index.ts +++ b/src/api/reporting/RepDataProblem/RepDataProblem/index.ts @@ -47,9 +47,9 @@ export const exportExcelApi = (params: any) => { return request.doExport({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemExportXls', params }); }; -/** 导出Word */ -export const exportWordApi = (params: any) => { - return request.doExport({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemExportWord', params }); +/** 生成WordBytes */ +export const saveWordBytes = (tId?: string, organCode?: string, dataDate?: string) : Promise => { + return request.postJson({ url: '/RepDataProblem/sdi/reporting/RepDataProblem/RepDataProblemSaveWordBytes', data:{tId,organCode,dataDate}}); }; /** 获取某个字典 */ diff --git a/src/components/PreViewFile/src/PreViewFile-pdfjs.vue b/src/components/PreViewFile/src/PreViewFile-pdfjs.vue deleted file mode 100644 index 4c22837..0000000 --- a/src/components/PreViewFile/src/PreViewFile-pdfjs.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/PreViewFile/src/PreViewFile-word.vue b/src/components/PreViewFile/src/PreViewFile-word.vue new file mode 100644 index 0000000..08050fa --- /dev/null +++ b/src/components/PreViewFile/src/PreViewFile-word.vue @@ -0,0 +1,155 @@ + + + + + + + + diff --git a/src/components/PreViewFile/src/PreViewFile.vue b/src/components/PreViewFile/src/PreViewFile.vue index 08050fa..e66c290 100644 --- a/src/components/PreViewFile/src/PreViewFile.vue +++ b/src/components/PreViewFile/src/PreViewFile.vue @@ -1,132 +1,230 @@ - - +}; + - + + +.sidebar { + width: 250px; + padding: 20px; + border-right: 1px solid #ccc; + overflow-y: auto; +} + +.sidebar h3 { + margin-bottom: 10px; +} + +.sidebar ul { + list-style-type: none; + padding: 0; +} +.sidebar li { + text-align: center; + width: 120px; + margin:20px auto; +} + +.sidebar a { + text-decoration: none; + color: #fff; + cursor: pointer; + display: flex; + align-items: center; + flex-direction: column; +} + +.sidebar img.thumbnail { + width: 120px; + border: 1px solid #ddd; +} +.pdf-container { + flex-grow: 1; + padding: 20px; + overflow-y: auto; +} + +.pdf-pages { + display: flex; + flex-direction: column; + align-items: center; +} +.sidebar img.active{ + border:5px solid rgb(153, 196, 238)!important; +} + \ No newline at end of file diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue index 4a34822..bf47560 100644 --- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue +++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue @@ -176,7 +176,7 @@ const searchSchema = reactive([ nodeKey: 'key', props: { children: 'childrens', label: 'value' }, filterable: true, - multiple: true, + multiple: false, collapseTags: true, showCheckbox: true, // style: { minWidth: '200px' }, @@ -213,7 +213,7 @@ const searchSchema = reactive([ field: 'tCategory', label: '指标代码', componentProps: {}, - component: 'Select', + component: 'Input', formItemProps: { rules: [required()], }, diff --git a/src/views/reporting/RepDataProblem/RepDataProblem.vue b/src/views/reporting/RepDataProblem/RepDataProblem.vue index b385942..10b50a0 100644 --- a/src/views/reporting/RepDataProblem/RepDataProblem.vue +++ b/src/views/reporting/RepDataProblem/RepDataProblem.vue @@ -6,7 +6,7 @@ import { delRepDataProblemListApi, delRepDataProblemApi, queryRepDataProblemApi, - exportWordApi, + saveWordBytes, } from '@/api/reporting/RepDataProblem/RepDataProblem' import { TableData } from '@/api/reporting/RepDataProblem/RepDataProblem/types' import { useTable } from '@/hooks/web/useTable' @@ -35,9 +35,9 @@ const loginOrganCode = getLoginOrganCodeByUserInfo(); const ids = ref([]) /** 生成word */ -const exportWord = async (row: TableData) => { - const data = { tid: row.tId}; - exportWordApi(data); +const generatorWord = async (row: TableData) => { + saveWordBytes(row.tId,'666','20240303'); + getList(); }; const { tableRegister, tableState, tableMethods } = useTable({ @@ -68,14 +68,7 @@ const tableColumns = reactive([ type: 'selection', fixed: true }, - { - field: 'dataDate', - label: '数据日期' - }, - { - field: 'createTime', - label: '生成时间' - }, + , { field: 'tName', label: '报告名称' @@ -84,6 +77,14 @@ const tableColumns = reactive([ field: 'tCategory', label: '报告分类' }, + { + field: 'dataDate', + label: '数据日期' + }, + { + field: 'createTime', + label: '生成时间' + }, { field: 'action', label: t('tableDemo.action'), @@ -93,7 +94,7 @@ const tableColumns = reactive([ default: (data: any) => { return ( <> - exportWord(data.row)}> + generatorWord(data.row)}> {'生成'} ShowPreViewFile(data.row)}>