From 897faa2d11f5a64d0c5e0f3d802e363430f8bdc0 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 28 六月 2024 13:36:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 2f5338c..e321968 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -31,6 +31,7 @@
     auxiliaryCorrectionHours,
     insBushing,
     auxiliaryOriginalHours,
+    evaluate,
   }
 }
 
@@ -164,6 +165,7 @@
   selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
   updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
   updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+  labelPrinting: "/insOrder/labelPrinting", //鏍囩鎵撳嵃
 }
 
 const sampleOrder = {
@@ -193,6 +195,7 @@
 
 const standardTree = {
   selectStandardTreeList: "/standardTree/selectStandardTreeList", //鑾峰彇鏍囧噯鏍�
+  selectStandardTreeList2: "/standardTree/selectStandardTreeList2", //鑾峰彇鏍囧噯鏍�
   addStandardTree: "/standardTree/addStandardTree", //娣诲姞鏍囧噯鏍�
   addStandardMethodList: "/standardTree/addStandardMethodList", //缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�
   selectsStandardMethodByFLSSM: "/standardTree/selectsStandardMethodByFLSSM", //鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�
@@ -209,6 +212,9 @@
   upStandardProducts: "/standardTree/upStandardProducts", //鑾峰彇浜у搧鏋舵瀯
   selectStandardProductEnumByMethodId: "/standardTree/selectStandardProductEnumByMethodId", //鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�
   getStandTreeBySampleType: "/standardTree/getStandTreeBySampleType", //浠呰幏鍙栧厜绾ょ殑鍨嬪彿
+  inExcelOfTree: "/standardTree/inExcelOfTree", //瀵煎叆鏍囧噯搴�
+  resetTreeOfPrice: "/standardTree/resetTreeOfPrice", //閲嶇疆鏍囧噯搴撳崟浠�
+  resetTreeOfHour: "/standardTree/resetTreeOfHour", //閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�
 }
 
 const standardMethod = {
@@ -348,3 +354,16 @@
   selectAuxiliaryOriginalHours: "/auxiliaryOriginalHours/selectAuxiliaryOriginalHours", //鏌ヨ鍘熷宸ユ椂
   exportOriginalHours: "/auxiliaryOriginalHours/exportOriginalHours", //瀵煎嚭鍘熷宸ユ椂
 }
+
+const evaluate = {
+  page: "/evaluate/page", //鏌ヨ鑰冭瘎
+  exportEvaluate: "/evaluate/exportEvaluate", //瀵煎嚭鑰冭瘎
+  getEvaluateCompetent: "/evaluateCompetent/getEvaluateCompetent", //鏌ヨ涓荤鎵撳垎
+  writeEvaluateCompetent: "/evaluateCompetent/writeEvaluateCompetent", //濉啓涓荤鎵撳垎
+  getEvaluateLeader: "/evaluateLeader/getEvaluateLeader", //鏌ヨ缁勯暱璇勫垎
+  writeEvaluateLeader: "/evaluateLeader/writeEvaluateLeader", //缁勯暱璇勫垎
+  exportEvaluateCompetent: "/evaluateCompetent/exportEvaluateCompetent", //瀵煎嚭涓荤鎵撳垎
+  exportEvaluateLeader: "/evaluateLeader/exportEvaluateLeader", //瀵煎嚭缁勯暱鎵撳垎
+  getEvaluateGroup: "/evaluateGroup/getEvaluateGroup", //鏌ヨ鍛樺伐浜掕瘎
+  writeEvaluateGroup: "/evaluateGroup/writeEvaluateGroup", //濉啓鍛樺伐浜掕瘎
+}

--
Gitblit v1.9.3