From d6ddbe5f6cd24909d83a072251cd433b9156d5ee Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期一, 17 十一月 2025 23:28:06 +0800
Subject: [PATCH] 2025.11.17
---
/dev/null | 0
src/utils/doc.js | 6 +++---
public/工地巡查单据模板-简版.docx | 0
public/~$巡查单据模板-简版.docx | 0
src/components.d.ts | 14 --------------
src/views/fysp/scene/SceneInspectFile.vue | 32 ++++++++++++++++++--------------
6 files changed, 21 insertions(+), 31 deletions(-)
diff --git "a/public/~$\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.docx" "b/public/~$\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.docx"
new file mode 100644
index 0000000..fa96a92
--- /dev/null
+++ "b/public/~$\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.docx"
Binary files differ
diff --git "a/public/\345\267\245\345\234\260\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.doc" "b/public/\345\267\245\345\234\260\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.doc"
deleted file mode 100644
index 9dd972d..0000000
--- "a/public/\345\267\245\345\234\260\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.doc"
+++ /dev/null
Binary files differ
diff --git "a/public/\345\267\245\345\234\260\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.docx" "b/public/\345\267\245\345\234\260\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.docx"
new file mode 100644
index 0000000..b02fcab
--- /dev/null
+++ "b/public/\345\267\245\345\234\260\345\267\241\346\237\245\345\215\225\346\215\256\346\250\241\346\235\277-\347\256\200\347\211\210.docx"
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 62c34bc..086570b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,14 +14,12 @@
CompQuickSet: typeof import('./components/search-option/CompQuickSet.vue')['default']
Content: typeof import('./components/core/Content.vue')['default']
ElAffix: typeof import('element-plus/es')['ElAffix']
- ElAlert: typeof import('element-plus/es')['ElAlert']
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton']
- ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
ElCalendar: typeof import('element-plus/es')['ElCalendar']
ElCard: typeof import('element-plus/es')['ElCard']
ElCascader: typeof import('element-plus/es')['ElCascader']
@@ -38,9 +36,6 @@
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElDrawer: typeof import('element-plus/es')['ElDrawer']
- ElDropdown: typeof import('element-plus/es')['ElDropdown']
- ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
- ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
@@ -56,16 +51,9 @@
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup']
ElOption: typeof import('element-plus/es')['ElOption']
- ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
- ElPagination: typeof import('element-plus/es')['ElPagination']
- ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElPopover: typeof import('element-plus/es')['ElPopover']
- ElRadio: typeof import('element-plus/es')['ElRadio']
- ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
- ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
- ElSegmented: typeof import('element-plus/es')['ElSegmented']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSpace: typeof import('element-plus/es')['ElSpace']
ElStep: typeof import('element-plus/es')['ElStep']
@@ -79,7 +67,6 @@
ElTag: typeof import('element-plus/es')['ElTag']
ElText: typeof import('element-plus/es')['ElText']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
- ElTransfer: typeof import('element-plus/es')['ElTransfer']
ElTree: typeof import('element-plus/es')['ElTree']
ElUpload: typeof import('element-plus/es')['ElUpload']
Footer: typeof import('./components/core/Footer.vue')['default']
@@ -111,7 +98,6 @@
ItemSubTask: typeof import('./components/list-item/ItemSubTask.vue')['default']
ItemUser: typeof import('./components/list-item/ItemUser.vue')['default']
MenuItems: typeof import('./components/core/MenuItems.vue')['default']
- PDFViewer: typeof import('./components/PDFViewer.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SceneMap: typeof import('./components/map/SceneMap.vue')['default']
diff --git a/src/utils/doc.js b/src/utils/doc.js
index 7d014aa..631fc3c 100644
--- a/src/utils/doc.js
+++ b/src/utils/doc.js
@@ -325,8 +325,8 @@
printable: ref,
header: title || null,
type: type || 'html',
- headerStyle:
- 'font-size:6px;font-weight:600;text-align:center;padding:15px 0 10px 0;', //鏍囬璁剧疆
+ // headerStyle:
+ // 'font-size:6px;font-weight:600;text-align:center;padding:15px 0 10px 0;', //鏍囬璁剧疆
properties: jsonData || [], //json鏁版嵁鍏�
gridHeaderStyle:
borderHeadStyle ||
@@ -336,7 +336,7 @@
'font-size:1px;font-weight:200;border: 1px solid #ccc;padding:3px 5px 3px 5px;text-align:center;', //json鍚勫紡琛ㄥ摜澶
scanStyles: false, //涓嶉�傜敤榛樿鏍峰紡
repeatTableHeader: false, //鎵撳嵃json琛ㄥご鍙樉绀哄湪绗竴椤�
- style: style || '@page{size:auto;margin: 0cm 1cm 0cm 1cm;}', //鍘婚櫎椤电湁椤佃剼
+ style: style || `@page{size:auto;margin: 0cm 1cm 0cm 1cm;}`, //鍘婚櫎椤电湁椤佃剼
css: css || null //css url
});
}
diff --git a/src/views/fysp/scene/SceneInspectFile.vue b/src/views/fysp/scene/SceneInspectFile.vue
index 05c464b..e59d32a 100644
--- a/src/views/fysp/scene/SceneInspectFile.vue
+++ b/src/views/fysp/scene/SceneInspectFile.vue
@@ -65,22 +65,24 @@
</template>
</el-dialog>
<el-dialog v-model="previewVisible" :show-close="true" fullscreen>
- <!-- <template #header="{ close, titleId, titleClass }">
+ <template #header="{ close, titleId, titleClass }">
<el-row justify="end">
<el-button type="danger" @click="close" icon="CircleCloseFilled">
鍏抽棴
</el-button>
<el-button
type="primary"
- @click="handelPrint(pdfPreview)"
+ @click="handelPrint(refWord)"
icon="PrintFilled"
>
鎵撳嵃
</el-button>
</el-row>
- </template> -->
- <div ref="refWord"></div>
- <iframe ref="pdfPreview" width="100%" height="100vh" style="height: calc(100vh - 60px);"></iframe>
+ </template>
+ <div ref="refWord">
+
+ </div>
+ <!-- <iframe ref="pdfPreview" width="100%" height="100vh" style="height: calc(100vh - 60px);"></iframe> -->
</el-dialog>
</template>
<script setup>
@@ -194,21 +196,21 @@
params: {
district: v.scense.districtname,
name: setParam(v.scense.name, 57),
- employerUnit: setParam(v.scense.csEmployerUnit, 30),
+ employerUnit: setParam(v.scense.csEmployerUnit, 60),
constructionUnit: setParam(
v.subScene ? v.subScene.csConstructionUnit : '',
- 36
+ 60
),
timeRange: setParam(
v.subScene && v.subScene.csStartTime
? `${v.subScene.csStartTime}鑷�${v.subScene.csEndTime}`
: '',
- 26
+ 40
),
- stage: setParam(v.subScene ? v.subScene.siExtension1 : '', 36),
- contacts: setParam(v.scense.contacts, 27),
+ stage: setParam(v.subScene ? v.subScene.siExtension1 : '', 40),
+ contacts: setParam(v.scense.contacts, 40),
contactsTel: setParam(v.scense.contactst, 40),
- location: setParam(v.scense.location, 27)
+ location: setParam(v.scense.location, 90)
}
};
// 椁愰ギ
@@ -239,7 +241,7 @@
switch (p.type) {
// 宸ュ湴
case 1:
- template = '/宸ュ湴宸℃煡鍗曟嵁妯℃澘.docx';
+ template = '/宸ュ湴宸℃煡鍗曟嵁妯℃澘-绠�鐗�.docx';
_param = p.params;
break;
// 椁愰ギ
@@ -262,7 +264,7 @@
switch (p.type) {
// 宸ュ湴
case 1:
- template = '/宸ュ湴宸℃煡鍗曟嵁妯℃澘.docx';
+ template = '/宸ュ湴宸℃煡鍗曟嵁妯℃澘-绠�鐗�.docx';
_param = p.params;
break;
// 椁愰ギ
@@ -309,7 +311,9 @@
if (param) {
generatePdf(param, (blob, name) => {
previewVisible.value = true;
- previewDocx(blob, refWord.value);
+ setTimeout(() => {
+ previewDocx(blob, refWord.value);
+ }, 200);
// blob.print()
// blob.getBlob((buffer) => {
// previewDocx(buffer, refWord.value);
--
Gitblit v1.9.3