diff --git a/BackEnd/api/exportExcel.ashx.cs b/BackEnd/api/exportExcel.ashx.cs
index 537ece4..87fa53d 100644
--- a/BackEnd/api/exportExcel.ashx.cs
+++ b/BackEnd/api/exportExcel.ashx.cs
@@ -122,42 +122,42 @@ namespace abbott_2024_event.BackEnd.api
{
case 3:
{
- inpercent = "0%~3%";
+ inpercent = "低於3%";
break;
}
case 15:
{
- inpercent = "3%~15%";
+ inpercent = "3~14%";
break;
}
case 25:
{
- inpercent = "15%~25%";
+ inpercent = "15~49%";
break;
}
case 50:
{
- inpercent = "25%~50%";
+ inpercent = "15~49%";
break;
}
case 75:
{
- inpercent = "50%~75%";
+ inpercent = "50%以上 ";
break;
}
case 85:
{
- inpercent = "75%~85%";
+ inpercent = "50%以上 ";
break;
}
case 97:
{
- inpercent = "85%~97%";
+ inpercent = "50%以上 ";
break;
}
case 100:
{
- inpercent = "97%~100%";
+ inpercent = "50%以上 ";
break;
}
diff --git a/BackEnd/assets/javascript/custom/userList.js b/BackEnd/assets/javascript/custom/userList.js
index f794e54..b9da06c 100644
--- a/BackEnd/assets/javascript/custom/userList.js
+++ b/BackEnd/assets/javascript/custom/userList.js
@@ -324,12 +324,12 @@ function loadDataTable() {
}
htmlString += "
";
- htmlString += " | " + item.baby_name + "(" + gender + ") | ";
- htmlString += " 生日:" + item.baby_birthday + " | ";
- htmlString += " 測驗日期:" + item.baby_testdate + " | ";
- htmlString += " 年齡:" + item.baby_age + " | ";
- htmlString += " 身高:" + item.baby_height + " cm | ";
- htmlString += " 成長百分比:" + inpercent + " | ";
+ htmlString += " " + item.baby_name + "(" + gender + ") | ";
+ htmlString += " 生日:" + item.baby_birthday + " | ";
+ htmlString += " 測驗日期:" + item.baby_testdate + " | ";
+ htmlString += " 年齡:" + item.baby_age + " | ";
+ htmlString += " 身高:" + item.baby_height + " cm | ";
+ htmlString += " 成長百分比:" + inpercent + " | ";
htmlString += "
";
});
diff --git a/BackEnd/userList.aspx b/BackEnd/userList.aspx
index 93fbe1f..59d1fe4 100644
--- a/BackEnd/userList.aspx
+++ b/BackEnd/userList.aspx
@@ -104,7 +104,7 @@
Line UID |
電話 |
測驗日期 |
- 寶寶資料 |
+ 寶寶資料 |
|
@@ -200,5 +200,5 @@
-
+
diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll
index bbbad90..b321017 100644
Binary files a/bin/abbott_2024_event.dll and b/bin/abbott_2024_event.dll differ
diff --git a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
index f794e54..b9da06c 100644
--- a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
+++ b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
@@ -324,12 +324,12 @@ function loadDataTable() {
}
htmlString += "";
- htmlString += " | " + item.baby_name + "(" + gender + ") | ";
- htmlString += " 生日:" + item.baby_birthday + " | ";
- htmlString += " 測驗日期:" + item.baby_testdate + " | ";
- htmlString += " 年齡:" + item.baby_age + " | ";
- htmlString += " 身高:" + item.baby_height + " cm | ";
- htmlString += " 成長百分比:" + inpercent + " | ";
+ htmlString += " " + item.baby_name + "(" + gender + ") | ";
+ htmlString += " 生日:" + item.baby_birthday + " | ";
+ htmlString += " 測驗日期:" + item.baby_testdate + " | ";
+ htmlString += " 年齡:" + item.baby_age + " | ";
+ htmlString += " 身高:" + item.baby_height + " cm | ";
+ htmlString += " 成長百分比:" + inpercent + " | ";
htmlString += "
";
});
diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll
index a455e08..9501c1d 100644
Binary files a/bin/app.publish/bin/abbott_2024_event.dll and b/bin/app.publish/bin/abbott_2024_event.dll differ