Compare commits

...

8 Commits

Author SHA1 Message Date
MYR
febddcfa4a Merge remote-tracking branch 'origin/main' into MYR 2025-11-23 21:47:19 +08:00
MYR
b57385e925 666 2025-11-23 21:46:18 +08:00
YDD
027f93a599 Merge pull request '12' (#1) from YDD into main
Reviewed-on: #1
2025-11-23 21:44:11 +08:00
YDD
4d4afca1a8 12 2025-11-23 21:41:42 +08:00
MYR
57902928de Merge branch 'main' of http://ydds.cloud:3000/Qomola/ZKFC_ACC 2025-11-23 21:29:39 +08:00
MYR
9dc68ebe5d 111 2025-11-23 21:27:52 +08:00
YDD
c5e03aebb5 Merge branch 'main' of http://ydds.cloud:3000/Qomola/ZKFC_ACC 2025-11-23 21:24:17 +08:00
YDD
ca579bb074 123 2025-11-23 21:23:21 +08:00
3 changed files with 12 additions and 2 deletions

View File

@@ -45,6 +45,16 @@
"%matplotlib widget"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "794c9acf",
"metadata": {},
"outputs": [],
"source": [
"## 合并请求"
]
},
{
"cell_type": "code",
"execution_count": 2,

View File

@@ -20,7 +20,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "d2112ca7-0c05-4332-87b5-f473f8c3fcd0",
"metadata": {
"tags": []

View File

@@ -12,7 +12,7 @@ plt.rcParams['font.family'] = ['SimHei'] # 用来正常显示中文标签
plt.rcParams['axes.unicode_minus'] = False # 用来正常显示负号
pd.set_option('display.max_columns', None) #显示所有列,把行显示设置成最大
pd.set_option('display.max_rows', None) #显示所有行,把列显示设置成最大
#YDD
def die1234(data_calc,DieType):
"""
输入中科飞测量测结果及Die类型,输出4个Mark的量测结果,并与之前EVG量测数据保持一致