diff --git a/Data/DeviceIcons/工具/碘酊.png b/Data/DeviceIcons/gongju/dd.png
similarity index 100%
rename from Data/DeviceIcons/工具/碘酊.png
rename to Data/DeviceIcons/gongju/dd.png
diff --git a/Data/DeviceIcons/工具/碘伏.png b/Data/DeviceIcons/gongju/df.png
similarity index 100%
rename from Data/DeviceIcons/工具/碘伏.png
rename to Data/DeviceIcons/gongju/df.png
diff --git a/Data/DeviceIcons/工具/大号镂空筐.png b/Data/DeviceIcons/gongju/dhlkk.png
similarity index 100%
rename from Data/DeviceIcons/工具/大号镂空筐.png
rename to Data/DeviceIcons/gongju/dhlkk.png
diff --git a/Data/DeviceIcons/工具/电热断尾钳.png b/Data/DeviceIcons/gongju/drdwq.png
similarity index 100%
rename from Data/DeviceIcons/工具/电热断尾钳.png
rename to Data/DeviceIcons/gongju/drdwq.png
diff --git a/Data/DeviceIcons/工具/耳牌.png b/Data/DeviceIcons/gongju/ep.png
similarity index 100%
rename from Data/DeviceIcons/工具/耳牌.png
rename to Data/DeviceIcons/gongju/ep.png
diff --git a/Data/DeviceIcons/工具/耳牌钳.png b/Data/DeviceIcons/gongju/epq.png
similarity index 100%
rename from Data/DeviceIcons/工具/耳牌钳.png
rename to Data/DeviceIcons/gongju/epq.png
diff --git a/Data/DeviceIcons/工具/高温消毒柜.png b/Data/DeviceIcons/gongju/gwxdg.png
similarity index 100%
rename from Data/DeviceIcons/工具/高温消毒柜.png
rename to Data/DeviceIcons/gongju/gwxdg.png
diff --git a/Data/DeviceIcons/工具/接产纸.png b/Data/DeviceIcons/gongju/jcz.png
similarity index 100%
rename from Data/DeviceIcons/工具/接产纸.png
rename to Data/DeviceIcons/gongju/jcz.png
diff --git a/Data/DeviceIcons/工具/剪牙钳.png b/Data/DeviceIcons/gongju/jyq.png
similarity index 100%
rename from Data/DeviceIcons/工具/剪牙钳.png
rename to Data/DeviceIcons/gongju/jyq.png
diff --git a/Data/DeviceIcons/工具/棉球.png b/Data/DeviceIcons/gongju/mq.png
similarity index 100%
rename from Data/DeviceIcons/工具/棉球.png
rename to Data/DeviceIcons/gongju/mq.png
diff --git a/Data/DeviceIcons/工具/喷壶.png b/Data/DeviceIcons/gongju/ph.png
similarity index 100%
rename from Data/DeviceIcons/工具/喷壶.png
rename to Data/DeviceIcons/gongju/ph.png
diff --git a/Data/DeviceIcons/工具/收纳袋.png b/Data/DeviceIcons/gongju/snd.png
similarity index 100%
rename from Data/DeviceIcons/工具/收纳袋.png
rename to Data/DeviceIcons/gongju/snd.png
diff --git a/Data/DeviceIcons/工具/手术刀.png b/Data/DeviceIcons/gongju/ssd.png
similarity index 100%
rename from Data/DeviceIcons/工具/手术刀.png
rename to Data/DeviceIcons/gongju/ssd.png
diff --git a/Data/DeviceIcons/工具/手术托盘.png b/Data/DeviceIcons/gongju/sstp.png
similarity index 100%
rename from Data/DeviceIcons/工具/手术托盘.png
rename to Data/DeviceIcons/gongju/sstp.png
diff --git a/Data/DeviceIcons/工具/过硫酸氢钾消毒液.png b/Data/DeviceIcons/gongju/xdy.png
similarity index 100%
rename from Data/DeviceIcons/工具/过硫酸氢钾消毒液.png
rename to Data/DeviceIcons/gongju/xdy.png
diff --git a/Data/DeviceIcons/工具/75%乙醇消毒液.png b/Data/DeviceIcons/gongju/ycxdy.png
similarity index 100%
rename from Data/DeviceIcons/工具/75%乙醇消毒液.png
rename to Data/DeviceIcons/gongju/ycxdy.png
diff --git a/Data/DeviceIcons/工具/一次性乳胶手套.png b/Data/DeviceIcons/gongju/ycxrjst.png
similarity index 100%
rename from Data/DeviceIcons/工具/一次性乳胶手套.png
rename to Data/DeviceIcons/gongju/ycxrjst.png
diff --git a/Data/DeviceIcons/工具/右旋糖酐铁.png b/Data/DeviceIcons/gongju/yxt.png
similarity index 100%
rename from Data/DeviceIcons/工具/右旋糖酐铁.png
rename to Data/DeviceIcons/gongju/yxt.png
diff --git a/Data/DeviceIcons/工具/注射器.png b/Data/DeviceIcons/gongju/zsq.png
similarity index 100%
rename from Data/DeviceIcons/工具/注射器.png
rename to Data/DeviceIcons/gongju/zsq.png
diff --git a/Data/DeviceIcons/工具/针头若干.png b/Data/DeviceIcons/gongju/ztrg.png
similarity index 100%
rename from Data/DeviceIcons/工具/针头若干.png
rename to Data/DeviceIcons/gongju/ztrg.png
diff --git a/Data/DeviceIcons/工具/执针钳_持针钳.png b/Data/DeviceIcons/gongju/zzq_czq.png
similarity index 100%
rename from Data/DeviceIcons/工具/执针钳_持针钳.png
rename to Data/DeviceIcons/gongju/zzq_czq.png
diff --git a/Data/DeviceIcons/工具/直止血钳_手术钳.png b/Data/DeviceIcons/gongju/zzxq_ssq.png
similarity index 100%
rename from Data/DeviceIcons/工具/直止血钳_手术钳.png
rename to Data/DeviceIcons/gongju/zzxq_ssq.png
diff --git a/Data/DeviceIcons/耗材/T管.png b/Data/DeviceIcons/haocai/T管.png
similarity index 100%
rename from Data/DeviceIcons/耗材/T管.png
rename to Data/DeviceIcons/haocai/T管.png
diff --git a/Data/DeviceIcons/耗材/冲洗管.png b/Data/DeviceIcons/haocai/冲洗管.png
similarity index 100%
rename from Data/DeviceIcons/耗材/冲洗管.png
rename to Data/DeviceIcons/haocai/冲洗管.png
diff --git a/Data/DeviceIcons/耗材/钢丝.png b/Data/DeviceIcons/haocai/钢丝.png
similarity index 100%
rename from Data/DeviceIcons/耗材/钢丝.png
rename to Data/DeviceIcons/haocai/钢丝.png
diff --git a/Data/DeviceIcons/耗材/骨蜡.png b/Data/DeviceIcons/haocai/骨蜡.png
similarity index 100%
rename from Data/DeviceIcons/耗材/骨蜡.png
rename to Data/DeviceIcons/haocai/骨蜡.png
diff --git a/Data/DeviceIcons/耗材/骨钉.png b/Data/DeviceIcons/haocai/骨钉.png
similarity index 100%
rename from Data/DeviceIcons/耗材/骨钉.png
rename to Data/DeviceIcons/haocai/骨钉.png
diff --git a/Data/DeviceIcons/药品/Vetwish软骨素.png b/Data/DeviceIcons/yaopin/Vetwish软骨素.png
similarity index 100%
rename from Data/DeviceIcons/药品/Vetwish软骨素.png
rename to Data/DeviceIcons/yaopin/Vetwish软骨素.png
diff --git a/Data/DeviceIcons/药品/美洛昔康.png b/Data/DeviceIcons/yaopin/美洛昔康.png
similarity index 100%
rename from Data/DeviceIcons/药品/美洛昔康.png
rename to Data/DeviceIcons/yaopin/美洛昔康.png
diff --git a/Data/Xml/Pig1.xml b/Data/Xml/Pig1.xml
index b66ba1b9..87895bea 100644
--- a/Data/Xml/Pig1.xml
+++ b/Data/Xml/Pig1.xml
@@ -26,7 +26,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_WaiKeShouShuDao
外科手术刀
- 工具/手术刀.png
+ gongju/ssd.png
@@ -34,7 +34,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian
剪牙钳
- 工具/剪牙钳.png
+ gongju/jyq.png
@@ -42,7 +42,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JieChanZhi
接产纸
- 工具/接产纸.png
+ gongju/jcz.png
@@ -50,7 +50,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai
收纳袋
- 工具/收纳袋.png
+ gongju/snd.png
diff --git a/Data/Xml/Pig2.xml b/Data/Xml/Pig2.xml
index 35a2e18a..71da438f 100644
--- a/Data/Xml/Pig2.xml
+++ b/Data/Xml/Pig2.xml
@@ -37,7 +37,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an2/SM_XiaoTuiChe/SM_XiaoWuJian/SM_ErPaiZuHe1/SM_ErPaiZuHe/SM_ErPai
耳牌
- 工具/耳牌.png
+ gongju/ep.png
@@ -45,21 +45,21 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an2/SM_XiaoTuiChe/SM_XiaoWuJian/SM_ErPaiZuHe1/SM_ErPaiZuHe/SM_ErPaiQian
耳牌钳
- 工具/耳牌钳.png
+ gongju/epq.png
外科手术刀
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_WaiKeShouShuDao
外科手术刀
- 工具/手术刀.png
+ gongju/ssd.png
电热断尾钳
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian
电热断尾钳
- 工具/电热断尾钳.png
+ gongju/drdwq.png
diff --git a/Data/Xml/Pig3.xml b/Data/Xml/Pig3.xml
index ccea70a1..ab8bbbe5 100644
--- a/Data/Xml/Pig3.xml
+++ b/Data/Xml/Pig3.xml
@@ -43,14 +43,14 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_WaiKeShouShuDao
外科手术刀
- 工具/手术刀.png
+ gongju/ssd.png
剪牙钳
ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian1/SM_JianYaQian
剪牙钳
- 工具/剪牙钳.png
+ gongju/jyq.png
@@ -58,14 +58,14 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LouKongKuang
大号镂空筐
- 工具/大号镂空筐.png
+ gongju/dhlkk.png
电热断尾钳
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian
电热断尾钳
- 工具/电热断尾钳.png
+ gongju/drdwq.png
@@ -73,7 +73,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiCiXingRuJiaoShouTao
一次性乳胶手套
- 工具/一次性乳胶手套.png
+ gongju/ycxrjst.png
@@ -82,7 +82,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianDing
碘酊
- 工具/碘酊.png
+ gongju/dd.png
@@ -92,7 +92,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_PenHu_DianDing/SM_PenHu_DianDing1
喷壶
- 工具/喷壶.png
+ gongju/ph.png
@@ -100,7 +100,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai
收纳袋
- 工具/收纳袋.png
+ gongju/snd.png
diff --git a/Data/Xml/Pig4.xml b/Data/Xml/Pig4.xml
index 4d65d110..1e1b25c6 100644
--- a/Data/Xml/Pig4.xml
+++ b/Data/Xml/Pig4.xml
@@ -53,7 +53,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian1/SM_JianYaQian
剪牙钳
- 工具/剪牙钳.png
+ gongju/jyq.png
@@ -70,7 +70,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_WaiKeShouShuDao
外科手术刀
- 工具/手术刀.png
+ gongju/ssd.png
@@ -79,7 +79,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_DianReDuanWeiQian_FuZhi/joimt_DuanWeiQian/group6/joimt_DuanWeiQian/joimt_DuanWeiQian1
电热断尾钳
- 工具/电热断尾钳.png
+ gongju/drdwq.png
@@ -89,7 +89,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ErPaiZuHe1/SM_ErPaiZuHe/SM_ErPaiQian
耳牌钳
- 工具/耳牌钳.png
+ gongju/epq.png
@@ -98,7 +98,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_LiuSuanQingJia/SM_LiuSuanQingJia1
过硫酸氢钾消毒液
- 工具/过硫酸氢钾消毒液.png
+ gongju/xdy.png
@@ -107,7 +107,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiCiXingRuJiaoShouTao
一次性乳胶手套
- 工具/一次性乳胶手套.png
+ gongju/ycxrjst.png
@@ -145,7 +145,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoZhu/group4/SM_XiaoZhu_qiege2:joint1/SM_XiaoZhu_qiege2:joint2/SM_XiaoZhu_qiege2:joint3/SM_XiaoZhu_qiege2:joint4/SM_XiaoZhu_qiege2:joint5/SM_XiaoZhu_qiege2:joint6/SM_XiaoZhu_qiege2:joint42/SM_XiaoZhu_qiege2:joint43/SM_XiaoZhu_qiege2:joint44/KouBi
-
+
diff --git a/Data/Xml/Pig5.xml b/Data/Xml/Pig5.xml
index 0033a2f0..f62f1df6 100644
--- a/Data/Xml/Pig5.xml
+++ b/Data/Xml/Pig5.xml
@@ -70,7 +70,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian
剪牙钳
- 工具/剪牙钳.png
+ gongju/jyq.png
@@ -79,7 +79,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian
断尾钳
- 工具/电热断尾钳.png
+ gongju/drdwq.png
@@ -89,7 +89,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiYongJiuJing
医用酒精
- 工具/75%乙醇消毒液.png
+ gongju/ycxdy.png
@@ -97,7 +97,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_WaiKeShouShuDao1/SM_WaiKeShouShuDao
外科手术刀
- 工具/手术刀.png
+ gongju/ssd.png
@@ -105,7 +105,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/zhizhixueqian
手术钳
- 工具/直止血钳_手术钳.png
+ gongju/zzxq_ssq.png
@@ -113,7 +113,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_DianFu
碘伏
- 工具/碘伏.png
+ gongju/df.png
@@ -122,7 +122,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_MianHua
棉花
- 工具/棉球.png
+ gongju/mq.png
@@ -131,7 +131,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_PenHu_DianDing/SM_PenHu_DianDing1
喷壶
- 工具/喷壶.png
+ gongju/ph.png
@@ -139,7 +139,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan
手术托盘
- 工具/手术托盘.png
+ gongju/sstp.png
@@ -148,7 +148,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai
收纳袋
- 工具/收纳袋.png
+ gongju/snd.png
@@ -158,7 +158,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianDing
碘酊
- 工具/碘酊.png
+ gongju/dd.png
diff --git a/Data/Xml/Pig6.xml b/Data/Xml/Pig6.xml
index 9b731988..b4b68bb2 100644
--- a/Data/Xml/Pig6.xml
+++ b/Data/Xml/Pig6.xml
@@ -48,7 +48,7 @@
右旋糖酐铁
- 工具/右旋糖酐铁.png
+ gongju/yxt.png
@@ -56,7 +56,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ZhenTou
9*16针头若干
- 工具/针头若干.png
+ gongju/ztrg.png
@@ -65,7 +65,7 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_WaiKeShouShuDao1/SM_WaiKeShouShuDao
外科手术刀
- 工具/手术刀.png
+ gongju/ssd.png
@@ -74,28 +74,28 @@
ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoTuiChe/SM_XiaoWuJian/SM_LianXuZhuSheQi1/SM_LianXuZhuSheQi
2ml连续注射器
- 工具/注射器.png
+ gongju/zsq.png
断尾钳
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_DianReDuanWeiQian
断尾钳
- 工具/电热断尾钳.png
+ gongju/drdwq.png
执针钳
ExamPrefab/Teach_ToolsChose/SM_gongju/chizhenqian
执针钳
- 工具/执针钳_持针钳.png
+ gongju/zzq_czq.png
手术托盘
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan
手术托盘
- 工具/手术托盘.png
+ gongju/sstp.png
@@ -103,14 +103,14 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai
收纳袋
- 工具/收纳袋.png
+ gongju/snd.png
高温消毒柜
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_yiyongzhufeiji
高温消毒柜
- 工具/高温消毒柜.png
+ gongju/gwxdg.png
仔猪
@@ -145,7 +145,7 @@
ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian
剪牙钳
- 工具/剪牙钳.png
+ gongju/jyq.png