From 253b9c48b02d995540b84c1831e54e6baf8a1000 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 08 九月 2023 10:21:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/api/controller.js |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 6996f3a..583298d 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -2,11 +2,17 @@
 const standard = {
 	// 鎶�鏈鐞�-鏍囧噯Bom
 	selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲
+	selectVersion:"/material/selectVersion",//鍙充晶鐗堟湰
 	selectProductByMaterial: "product/selectTreeByMaterial", //鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸
 	selectTechnologyByMaterial: "technology/select",
+	selectAll:"/material/selectAll",//鍙充晶鏁版嵁
 	// 鎶�鏈鐞�-鎶�鏈枃浠�
 	selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
 	selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
+
+
+	//璁㈠崟BOM
+	delDevice:"/device/delDeviceById",//璁㈠崟Bom
 }
 // 鍘熸潗鏂欐楠�
 const raw = {
@@ -45,6 +51,10 @@
 
 // QMS瀹為獙瀹ょ鐞�
 const laboratory = {
+  delDeviceById:"/device/delDeviceById",//鍒犻櫎
+  addApi:"/device/add",//鏂板
+  listgroup:"/device/list_group",
+  selectDevice:"/device/selectDevice",//鍙宠竟灞曠ず
   addDeviceInspectDownBox: "/device/listInspect", // 鏂板浠櫒璁惧锛氭楠岄」鐩笅鎷夋
   selectDeviceInspectMessage: "/device/inspectId", // 鏂板浠櫒璁惧锛氭牴鎹楠岄」鐩甀D鏌ヨ鏁版嵁
   addDeviceKeeper: "/device/list_user",// 鏂板浠櫒璁惧锛氫繚绠′汉涓嬫媺妗�
@@ -77,14 +87,37 @@
 	delTechById:"/technologyTemplate/delTechById",//鏂板宸ヨ壓璺嚎==>鍒犻櫎
 	selecTechById:"/technologyTemplate/selecTechById",//鏂板宸ヨ壓璺嚎--銆嬬紪杈�
 	delAllTech:"/technologyTemplate/delAllTech",//鎵归噺鍒犻櫎
+
+	addTechMode:"/technicalModel/addTechMode",//鎶�鏈寚鏍�---銆嬫柊澧�
+	delTechBy:"/technicalModel/delTechById",//鎶�鏈�--.鍒犻櫎
 	selectAllleft:"/technicalModel/selectAllTechTem",//鎶�鏈寚鏍�-->宸﹁竟
 	selectAllright:"/technicalModel/selectAllTechNam",//鎶�鏈寚鏍�--銆嬪彸杈�
 	chooseProFath:"/technicalModel/chooseProFath",//鎶�鏈寚鏍�---銆嬬埗绫婚�夋嫨
 	chooseTechFath:	"/technicalModel/chooseTechFath",// 鎶�鏈�--->宸ュ簭宸ヨ壓
+	selecTech:"/technicalModel/selecTechById",//鎶�鏈�--->缂栬緫
+
 	selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
+	addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
+	material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
+
 	selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
+
 	selectAllSelf:"/selfcheckModel/selectAllSelf",//鑷缓缁存姢-----銆嬪彸杈�
-	selectjilu:"/techniqueModel/selectAllTeque",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
+	addSelfcheck:"/selfcheckModel/addSelfcheck",//鑷  ------銆嬫柊澧�
+	delSelfcheck:"/selfcheckModel/delSelfcheckById",//鑷----.鍒犻櫎
+	delAll:"selfcheckModel/delAllTech",//鎵归噺鍒犻櫎---.鑷
+
+	selectjilu:"/recordModel/selectAllRecord",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
+	selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.缂栬緫
+	delQueById:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+	delAllRecord:"/recordModel/delAllRecord",//鍒犻櫎鎵归噺--->璁板綍
+	addRecord:"/recordModel/addRecord",//鐢熶骇璁板綍-------.鏂板
+
+	choosePro:"/techniqueModel/choosePro",//鏂板鐢熶骇宸ヨ壓缁存姢---銆嬮�夋嫨鐖剁被
+	chooseDeiv:"/techniqueModel/chooseDeiv",//鏂板----->璁惧
+	addQeMode:"/techniqueModel/addQeMode",//鏂板----銆嬩紶鍙�
+	delQueById:"/techniqueModel/delQueById",//鍒犻櫎
+	delAllQue:"/techniqueModel/delAllQue",//鎵归噺鍒犻櫎
 }
 const url = {
 	enter: "user/enter", //鐧诲綍

--
Gitblit v1.9.3