From 49a74a67140e814bb70efcde61b37d4750448e6a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 14 五月 2024 16:39:01 +0800
Subject: [PATCH] 1、设备加工工件报表页面调整表格唯一标识字段由equipmentId调整为id以试图解决项目服务器上表格数据混乱问题 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析页面调整设备类型、驱动类型、设备级别以及设备种类页面组件为多选下拉菜单
---
src/components/table2excel/table2excel.js | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/table2excel/table2excel.js b/src/components/table2excel/table2excel.js
index 4891d2b..9fdec8d 100644
--- a/src/components/table2excel/table2excel.js
+++ b/src/components/table2excel/table2excel.js
@@ -93,15 +93,21 @@
if( rc.flag.length > 0 ) {
tempRows += "<td> </td>"; // exclude it!!
} else {
- tempRows += "<td";
+ // 鍖归厤鏍煎紡涓�'yyyy-mm'鐨勬棩鏈熷瓧绗︿覆鏁版嵁锛岃嫢鏈夊叾浠栭渶姹傚悗鏈熷啀澧炲姞
+ var regexPattern = /^\d{4}-\d{2}$/;
+ if($(q).html().match(regexPattern)){
+ tempRows += "<td style=\"mso-number-format:'yyyy-mm';\"";
+ }else{
+ tempRows += "<td";
+ if(additionalStyles){
+ tempRows += " style='" + additionalStyles + "'";
+ }
+ }
if( rc.rows > 0) {
tempRows += " rowspan='" + rc.rows + "' ";
}
if( rc.cols > 0) {
tempRows += " colspan='" + rc.cols + "' ";
- }
- if(additionalStyles){
- tempRows += " style='" + additionalStyles + "'";
}
tempRows += ">" + $(q).html() + "</td>";
}
--
Gitblit v1.9.3