diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index b84c6ad5..1d79e5d1 100644
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -5,7 +5,7 @@
   "showAttachments": false,
   "hideUnresolved": false,
   "showOrphans": true,
-  "collapse-color-groups": false,
+  "collapse-color-groups": true,
   "colorGroups": [
     {
       "query": "path:SanPinPLM  ",
@@ -39,6 +39,10 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
+<<<<<<< HEAD
   "scale": 0.5359795996226132,
+=======
+  "scale": 0.7514342322277856,
+>>>>>>> origin/main
   "close": true
 }
\ No newline at end of file
diff --git a/SanPinPLM/相关操作/1.0-EDM/assets/image-20240603152853325.png b/.trash/image-20240603152853325.png
similarity index 100%
rename from SanPinPLM/相关操作/1.0-EDM/assets/image-20240603152853325.png
rename to .trash/image-20240603152853325.png
diff --git a/SanPinPLM/相关操作/1.0-EDM/assets/image-20240603153929430.png b/.trash/image-20240603153929430.png
similarity index 100%
rename from SanPinPLM/相关操作/1.0-EDM/assets/image-20240603153929430.png
rename to .trash/image-20240603153929430.png
diff --git a/SanPinPLM/相关操作/1.0-EDM/assets/image-20240603154619394.png b/.trash/image-20240603154619394.png
similarity index 100%
rename from SanPinPLM/相关操作/1.0-EDM/assets/image-20240603154619394.png
rename to .trash/image-20240603154619394.png
diff --git a/SanPinPLM/相关操作/1.0-EDM/assets/image-20240603154749096.png b/.trash/image-20240603154749096.png
similarity index 100%
rename from SanPinPLM/相关操作/1.0-EDM/assets/image-20240603154749096.png
rename to .trash/image-20240603154749096.png
diff --git a/SanPinPLM/相关操作/1.0-EDM/assets/image-20240603154934910.png b/.trash/image-20240603154934910.png
similarity index 100%
rename from SanPinPLM/相关操作/1.0-EDM/assets/image-20240603154934910.png
rename to .trash/image-20240603154934910.png
diff --git a/SanPinPLM/相关操作/1.0-EDM/assets/image-20240603155358364.png b/.trash/image-20240603155358364.png
similarity index 100%
rename from SanPinPLM/相关操作/1.0-EDM/assets/image-20240603155358364.png
rename to .trash/image-20240603155358364.png
diff --git a/SanPinPLM/相关操作/0.5-SETOUT/20.浏览器安装、调试.md b/SanPinPLM/相关操作/0.5-SETOUT/20.浏览器安装、调试.md
index 4ec4e265..d36bfe57 100644
--- a/SanPinPLM/相关操作/0.5-SETOUT/20.浏览器安装、调试.md
+++ b/SanPinPLM/相关操作/0.5-SETOUT/20.浏览器安装、调试.md
@@ -48,7 +48,7 @@
 
 `CAXA` 的图纸（`.exb`)需要单独安装 `CAXA` 提取组件（优点在于可以做测量，测量精度高），需要分别安装如下三个文件夹中的程序
 
-补充：==服务器上一定要装，所有使用CAXA绘图的电脑，以及有看图需求的电脑都要安装==
+补充：==服务器上一定要装，所有使用CAXA绘图的电脑，以及有看图需求的电脑都要安装==，其中服务器上的CAXA提取组件需要破解，其他的电脑则安装即可
 
 ![image-20240715135634395](../1.0-EDM/assets/image-20240715135634395.png)
 
diff --git a/SanPinPLM/相关操作/4.0-other/assets/clip_image004.jpg b/SanPinPLM/相关操作/4.0-other/assets/clip_image004.jpg
new file mode 100644
index 00000000..2062d5d9
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/clip_image004.jpg differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/clip_image006.jpg b/SanPinPLM/相关操作/4.0-other/assets/clip_image006.jpg
new file mode 100644
index 00000000..fab3703e
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/clip_image006.jpg differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/clip_image008.jpg b/SanPinPLM/相关操作/4.0-other/assets/clip_image008.jpg
new file mode 100644
index 00000000..281a7520
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/clip_image008.jpg differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603151728784.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603151728784.png
new file mode 100644
index 00000000..37025795
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603151728784.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603152019320.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603152019320.png
new file mode 100644
index 00000000..12c548f7
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603152019320.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603152853325.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603152853325.png
new file mode 100644
index 00000000..5b8133d2
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603152853325.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603153929430.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603153929430.png
new file mode 100644
index 00000000..6e63593e
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603153929430.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603154619394.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603154619394.png
new file mode 100644
index 00000000..2aa7937c
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603154619394.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603154749096.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603154749096.png
new file mode 100644
index 00000000..0061d53a
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603154749096.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603154934910.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603154934910.png
new file mode 100644
index 00000000..8c9fcf6b
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603154934910.png differ
diff --git a/SanPinPLM/相关操作/4.0-other/assets/image-20240603155358364.png b/SanPinPLM/相关操作/4.0-other/assets/image-20240603155358364.png
new file mode 100644
index 00000000..9d373197
Binary files /dev/null and b/SanPinPLM/相关操作/4.0-other/assets/image-20240603155358364.png differ