From 0ec212473ec515f0a942bfd6b5d87a565e784bcd Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Wed, 27 Sep 2023 17:17:21 +0800
Subject: [PATCH] fix: 限制字符，超出隐藏，无文件时不查看文件

---
 pages/component/AuxiliaryModule.vue   |  5 +++++
 pages/component/InformationModule.vue |  8 +++++++-
 pages/component/InspectionModule.vue  |  6 ++++++
 pages/component/UploadFile.vue        | 11 ++++++++---
 pages/product/index.vue               | 46 +++++++++++++++++++++++++++-------------------
 utils/utils.js                        |  2 +-
 6 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/pages/component/AuxiliaryModule.vue b/pages/component/AuxiliaryModule.vue
index fb195e3..bbf9316 100644
--- a/pages/component/AuxiliaryModule.vue
+++ b/pages/component/AuxiliaryModule.vue
@@ -93,6 +93,11 @@
 		.title {
 			font-size: 30px;
 			margin: 38px 0 0 28px;
+			white-space: nowrap;
+			/* 防止换行 */
+			overflow: hidden;
+			/* 超出部分隐藏 */
+			text-overflow: ellipsis;
 		}
 
 		.flex-between {
diff --git a/pages/component/InformationModule.vue b/pages/component/InformationModule.vue
index c466881..aecf9e2 100644
--- a/pages/component/InformationModule.vue
+++ b/pages/component/InformationModule.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="containers">
-		<u-swiper class="swiperCss" :list="informationData.lampPath"
+		<u-swiper class="swiperCss"  :list="informationData.lampPath"
 			@click="previewLargeImage(informationData.lampPath,current)" :current="current" indicator
 			indicatorMode="dot" imgMode="aspectFit" circular :height="$isMobile?'400rpx':'600px'"
 			indicatorActiveColor="#00aeaa" indicatorInactiveColor="rgba(0, 174, 170, 0.3)" @change="changeSwiper"
@@ -197,5 +197,11 @@
 		color: #2b3950;
 		text-align: left;
 		line-height: normal;
+		max-width: 400px;
+		white-space: nowrap;
+		/* 防止换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/component/InspectionModule.vue b/pages/component/InspectionModule.vue
index 4266e34..52bab29 100644
--- a/pages/component/InspectionModule.vue
+++ b/pages/component/InspectionModule.vue
@@ -220,5 +220,11 @@
 		color: #2b3950;
 		text-align: left;
 		line-height: normal;
+		max-width: 400px;
+		white-space: nowrap;
+		/* 防止换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/component/UploadFile.vue b/pages/component/UploadFile.vue
index 24c282a..2cffb66 100644
--- a/pages/component/UploadFile.vue
+++ b/pages/component/UploadFile.vue
@@ -6,9 +6,9 @@
 				<u-icon name="/static/images/icon/excelIcon.png" size="33px" v-if="fileType == 2"></u-icon>
 				<u-icon name="/static/images/icon/csvIcon.png" size="33px" v-if="fileType == 3"></u-icon>
 				<text class="iconTitle"
-					@click="seeFile">{{downloadFileName ? downloadFileName.substring(downloadFileName.lastIndexOf('/') + 1) : $t('hdk.noFile')}}</text>
+					@click="seeFile('preview')">{{downloadFileName ? downloadFileName.substring(downloadFileName.lastIndexOf('/') + 1) : $t('hdk.noFile')}}</text>
 			</view>
-			<view class="rightText" @click="seeFile('preview')" v-if="downloadFileNamePath != ''">
+			<view class="rightText" @click="seeFile('preview')" v-if="downloadFileName && downloadFileNamePath">
 				{{$t('hdk.Check')}}
 			</view>
 		</view>
@@ -67,12 +67,17 @@
 				// if (this.isCsv) {
 				//   return
 				// }
+				console.log(this.downloadFileName);
+				console.log(this.downloadFileNamePath);
+				if(!this.downloadFileName || !this.downloadFileNamePath){
+					return false
+				}
 				console.log('查看文件');
+				// return
 				uni.showLoading({
 					title: this.$t('hdk.loading')
 				})
 				let that = this;
-
 				if (!this.isCsv) {
 					const count = (this.downloadFileNamePath.match(/;/g) || []).length;
 					console.log(this.downloadFileNamePath, "解析文件有", count, "个")
diff --git a/pages/product/index.vue b/pages/product/index.vue
index d4a6869..fa1cbba 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -7,7 +7,8 @@
 			:activeStyle="activeStyle" :inactiveStyle="inactiveStyle"></u-tabs>
 		<view class="ComponentsBody">
 			<view class="productInformation" v-if="current == 0">
-				<InformationModule v-if="informationData != null" :informationData="informationData">
+				<InformationModule v-if="informationData != null && Array.isArray(informationData.lampPath)"
+					:informationData="informationData">
 				</InformationModule>
 			</view>
 			<view class="inspectionInformation" v-else-if="current == 1">
@@ -17,8 +18,8 @@
 				<AuxiliaryModule v-if="auxiliaryData != null" :auxiliaryData="auxiliaryData"></AuxiliaryModule>
 			</view>
 			<view class="repairReportBtnCss" @click="jumpService">
-				<image src="/static/images/icon/repair.png" class="repairReportImageCss" mode="witFix" ></u-image>
-				<text class="repairReportTextCss">{{$t("hdk.Repair")}}</text>
+				<image src="/static/images/icon/repair.png" class="repairReportImageCss" mode="witFix"></u-image>
+					<text class="repairReportTextCss">{{$t("hdk.Repair")}}</text>
 			</view>
 		</view>
 
@@ -134,9 +135,9 @@
 					productionTime: this.productObject.productionTime,
 					productionUserName: this.productObject.productionUserName,
 					productDatasheet: this.productObject.productRespVO?.productDatasheet || null,
-					productDatasheetPath: this.productObject.productRespVO?.productDatasheetPath || [],
+					productDatasheetPath: this.productObject.productRespVO?.productDatasheetPath || null,
 					productManual: this.productObject.productRespVO?.productManual || null,
-					productManualPath: this.productObject.productRespVO?.productManualPath || []
+					productManualPath: this.productObject.productRespVO?.productManualPath || null
 				};
 				console.log("产品信息", this.informationData);
 
@@ -195,8 +196,9 @@
 						this.generateDownloadUrls(this.productObject.lightIntensityPath)
 							.then(modifiedManuals => {
 								// console.log("光强==>", modifiedManuals);
-								this.inspectionData.lightIntensityPhoto = modifiedManuals.filter(url => this.isPicture(
-									url));
+								this.inspectionData.lightIntensityPhoto = modifiedManuals.filter(url => this
+									.isPicture(
+										url));
 								this.inspectionData.lightIntensityFile = modifiedManuals.filter(filename => !this
 									.isPicture(filename) && filename.includes('.'));
 								// 在这里可以访问已更新的inspectionData.lightIntensityPhoto和inspectionData.lightIntensityFile的值
@@ -234,7 +236,7 @@
 				// console.log("filenames", filenames)
 				if (!filenames || filenames.length === 0) {
 					// 如果 filenames 为空或者null，则执行相应的操作
-					return Promise.resolve(require('@/static/images/noPhoto.png'))
+					return Promise.resolve([require('@/static/images/noPhoto.png')])
 				}
 				const modifiedFilenames = filenames.replace(/;+$/, '');
 				const modifiedUrls = modifiedFilenames.split(";").map(filename => {
@@ -243,7 +245,11 @@
 						// const encodedFilename = Buffer.from(trimmedFilename, 'utf-8').toString('base64');
 						const url = config.fileUrl + `/${trimmedFilename}`;
 						// console.log(url);
-						return this.checkUrlValidity(url).catch(error => {
+						return this.checkUrlValidity(url)
+						// .then(res => {
+						// 	return res == null ? Promise.resolve(require('@/static/images/noPhoto.png')):res
+						// })
+						.catch(error => {
 							// console.error(error);
 							// console.log("请求失败", trimmedFilename)
 							return Promise.resolve(require('@/static/images/noPhoto.png'));
@@ -256,7 +262,9 @@
 				});
 
 				return Promise.all(modifiedUrls).then(results => {
+					console.log(results);
 					const validUrls = results.filter(url => url !== null);
+					// console.log(validUrls);
 					if (validUrls.length > 0) {
 						// console.log("有效地址",validUrls);
 						return validUrls;
@@ -335,7 +343,7 @@
 	// .attachmentInformation{
 	// 	width: 100%;
 	// }
-	
+
 	//移动端样式
 	@media screen and (max-width: 767px) {
 		.repairReportBtnCss {
@@ -351,15 +359,15 @@
 			bottom: 100px;
 			// background-color: #00aeaa;
 		}
-		
-		
-		
+
+
+
 		// .u-image__image{
 		// 	width: 100px !important;
 		// 	height: 100px !important;
 		// }
-		
-		.repairReportImageCss{
+
+		.repairReportImageCss {
 			width: 100px !important;
 			height: 100px !important;
 		}
@@ -388,13 +396,13 @@
 			bottom: 100px;
 			// background-color: #00aeaa;
 		}
-		
+
 		// .u-image__image{
 		// 	width: 200px !important;
 		// }
-		
-		
-		.repairReportImageCss{
+
+
+		.repairReportImageCss {
 			width: 200px !important;
 			height: 200px !important;
 		}
diff --git a/utils/utils.js b/utils/utils.js
index 08492ec..3773078 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -7,7 +7,7 @@ export const deviceMixin = {
 
       for (const keyword of mobileKeywords) {
         if (userAgent.includes(keyword)) {
-			console.log(keyword);
+			// console.log(keyword);
           return true; // 如果包含移动设备关键词，则判断为移动端
         }
       }
--
libgit2 0.21.2