diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 9ebee522..9de55bf4 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -39,10 +39,14 @@ "repelStrength": 10, "linkStrength": 1, "linkDistance": 250, +<<<<<<< HEAD <<<<<<< HEAD "scale": 0.5434149047358431, ======= "scale": 0.9549881698906871, +>>>>>>> origin/main +======= + "scale": 0.4154066362099694, >>>>>>> origin/main "close": true } \ No newline at end of file diff --git a/.trash/conflict-files-obsidian-git 3.md b/.trash/conflict-files-obsidian-git 3.md new file mode 100644 index 00000000..058a9a76 --- /dev/null +++ b/.trash/conflict-files-obsidian-git 3.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/graph.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +``` \ No newline at end of file diff --git a/.trash/conflict-files-obsidian-git 4.md b/.trash/conflict-files-obsidian-git 4.md new file mode 100644 index 00000000..058a9a76 --- /dev/null +++ b/.trash/conflict-files-obsidian-git 4.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/graph.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +``` \ No newline at end of file diff --git a/.trash/conflict-files-obsidian-git 5.md b/.trash/conflict-files-obsidian-git 5.md new file mode 100644 index 00000000..058a9a76 --- /dev/null +++ b/.trash/conflict-files-obsidian-git 5.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/graph.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +``` \ No newline at end of file diff --git a/SanPinPLM/相关操作/1.0-EDM/15.文件的收发管理.md b/SanPinPLM/相关操作/1.0-EDM/15.文件的收发管理.md index e3b512c1..cde31555 100644 --- a/SanPinPLM/相关操作/1.0-EDM/15.文件的收发管理.md +++ b/SanPinPLM/相关操作/1.0-EDM/15.文件的收发管理.md @@ -16,7 +16,7 @@ ![发布窗体](../../../外发客户教程/assets/image-20240902201810278.png) -在 **添加用户窗体** 中，可以选择整个部门将其添加进来，也可以只选择某个人将其添加进来（8.266及以后版本，存在发布给部门时，部门内成员可跳过签收直接具备权限的bug） +在 **添加用户窗体** 中，可以选择整个部门将其添加进来，也可以只选择某个人将其添加进来（`8.266`及以后版本，存在发布给部门时，部门内成员可跳过签收直接具备权限的bug） ![image-20240902202154617](../../../外发客户教程/assets/image-20240902202154617.png) diff --git a/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md b/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md index 7f3e7407..3781b1d3 100644 --- a/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md +++ b/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md @@ -8,7 +8,7 @@ 打开`WPS`软件，在 **任务管理器** 中查看它的进程位数 -如果进程后带有 `(32位)` 的信息，代表所安装的`WPS Office`软件是32位的，否则说明是64位的 +如果进程后带有 `(32位)` 的信息，代表所安装的 `WPS Office` 软件是32位的，否则说明是64位的 ![](assets/Pasted%20image%2020250429142402.png) diff --git a/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md b/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md index 13639d2b..ed5c34fd 100644 --- a/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md +++ b/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md @@ -24,7 +24,7 @@ ## 电脑手写体签名制作 -Creo三维签名需要使用电脑手写体签名，将 `FontCreator` 软件打开 +`Creo` 三维签名需要使用电脑手写体签名，将 `FontCreator` 软件打开 第一次打开需要自己手动创建字体工程，名称只能是：`SPPLMFONT`（为了三品PLM系统能够识别） diff --git a/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md b/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md index 9e8d59c8..f88b4e3e 100644 --- a/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md +++ b/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md @@ -16,7 +16,7 @@ ## 产品工作区 - 此功能位于 **产品管理** 模块之下，工程师可在 **产品工作区** 之中，创建半成品、零件等物料，将其搭建成BOM + 此功能位于 **产品管理** 模块之下，工程师可在 **产品工作区** 之中，创建半成品、零件等物料，将其搭建成`BOM` > 需要注意的是三品PLM与ERP不同，在三品PLM产品工作区中 **物料** 与 **BOM** 是同步创建出来的，也就是说在搭建BOM时，物料也就随之生成了 diff --git a/外发客户教程/0.基础操作教程/45.文档发布.md b/外发客户教程/0.基础操作教程/45.文档发布.md index 87f2d39c..b62aaf97 100644 --- a/外发客户教程/0.基础操作教程/45.文档发布.md +++ b/外发客户教程/0.基础操作教程/45.文档发布.md @@ -12,7 +12,7 @@ debugInConsole: false # Print debug info in Obsidian console # 文档发布 -文档发布需要在 **企业知识库** → **文档归档区** 中选择文件进行发布，对文件右键，在 **生命周期** 中选择 **发布** +文档发布需要在 **企业知识库** → **文档归档区** 中选择文件进行发布，对文件右键，在 **生命周期** 中选择 **发布** 即可 ![image-20240902201643897](../assets/image-20240902201643897.png) diff --git a/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md b/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md index 0f6af237..548cf1fd 100644 --- a/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md +++ b/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md @@ -1,4 +1,3 @@ - ![](assets/Pasted%20image%2020250626142701.png) 问题的原因: