From 6d5eb3f44aa8297544074534540b02661dcea6c7 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 13:11:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-procheck-1121' into lsf-dataproduct-1024
---
src/views/fysp/data-product/ProdSceneReport.vue | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/views/fysp/data-product/ProdSceneReport.vue b/src/views/fysp/data-product/ProdSceneReport.vue
index 1274d47..dd38e5c 100644
--- a/src/views/fysp/data-product/ProdSceneReport.vue
+++ b/src/views/fysp/data-product/ProdSceneReport.vue
@@ -71,21 +71,15 @@
</el-scrollbar>
</template>
</BaseContentLayout>
- <el-dialog
- v-model="anyPhotoDialog"
- width="66%"
- title="浠绘剰鍥剧墖"
- destroy-on-close
- >
- <ArbitraryPhoto
- :max-select="1"
- :readonly="false"
- :subtask="curSubtask.data"
- @selectByAnyPhonoEvent="handleSelectAnyPhoto"
- :defaultFile="[sceneImg]"
- >
- </ArbitraryPhoto>
- </el-dialog>
+ <ArbitraryPhoto
+ v-if="anyPhotoDialog"
+ v-model:dialog-visible="anyPhotoDialog"
+ :max-select="1"
+ :readonly="false"
+ :subtask="curSubtask.data"
+ @submit="handleSelectAnyPhoto"
+ :defaultFile="[sceneImg]"
+ ></ArbitraryPhoto>
<el-dialog
title="璁惧鍥剧墖"
width="66%"
@@ -357,11 +351,11 @@
const d2 =
i + 1 < deviceList.value.length ? deviceList.value[i + 1] : undefined;
_deviceList.push({
- _showStatusPic_1: d1._showStatusPic,
+ _showStatusPic_1: d1._showStatusPic ? d1._showStatusPic : right_triangle,
_deviceTypeName_1: d1._deviceTypeName,
// hasPic2: d2 ? true : false,
- _showStatusPic_2: d2 ? d2._showStatusPic : right_triangle,
- _deviceTypeName_2: d2 ? d2._deviceTypeName : ''
+ _showStatusPic_2: d2 ? (d2._showStatusPic ? d2._showStatusPic : right_triangle) : right_triangle,
+ _deviceTypeName_2: d2 ? d2._deviceTypeName : '',
});
}
const param = {
@@ -404,16 +398,16 @@
}
}
const date = dayjs(curSubtask.value.data.stPlanTime).format('MM鏈圖D鏃�');
- console.log(param);
docLoading.value = true;
exportDocx(
- '/鍗曚綋妯＄増.docx',
+ '/鍗曚綋妯＄増-v1.0.docx',
param,
`${param.sceneName}鍗曚綋锛�${date}锛�.docx`,
{
horizontalHeight: 368,
- verticalWidth: 266
+ verticalWidth: 266,
+ scale: 1.367
}
).finally(() => (docLoading.value = false));
}
--
Gitblit v1.9.3