From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 3616019..068184a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -16,7 +16,14 @@
 		sampleOrder,
     insOrderPlan,
     insReport,
-    warehouse
+    warehouse,
+    department,
+    report,
+    certification,
+    sealScope,
+    informationNotification,
+    performanceShift,
+	unPass,
 	}
 }
 
@@ -84,6 +91,7 @@
 	upEnum: "/enum/upEnum", //淇敼鏋氫妇
 	delEnum: "/enum/delEnum", //鍒犻櫎鏋氫妇
 	selectEnumByCategory: "/enum/selectEnumByCategory", //閫氳繃鍒嗙被鏌ヨ鏋氫妇
+  getDic: "/enum/getDic", //鑾峰彇鏁版嵁瀛楀吀鐨勫垎绫�
 }
 
 const capacityScope = {
@@ -96,6 +104,12 @@
 	delTestObject: "/capacityScope/delTestObject", //鍒犻櫎妫�娴嬪璞�
 	upTestObject: "/capacityScope/upTestObject", //淇敼妫�娴嬪璞�
 	selectTestObjectByName: "/capacityScope/selectTestObjectByName", //鑾峰彇妫�楠屽璞℃灇涓�
+  getInsProduction: "/capacityScope/getInsProduction", //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
+  selectProductListByObjectId: "/capacityScope/selectProductListByObjectId", //缁存姢妫�楠屽璞$殑浜у搧
+  addProduct: "/capacityScope/addProduct", //鏂板浜у搧
+  delProduct: "/capacityScope/delProduct", //鍒犻櫎浜у搧
+  upProduct: "/capacityScope/upProduct", //淇敼浜у搧
+  getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
 }
 
 const laboratoryScope = {
@@ -116,6 +130,7 @@
 	selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
 	uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
 	selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
+  selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
 }
 
 const insOrder = {
@@ -130,6 +145,8 @@
   selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
   delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
 	selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
+	costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+  selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
 }
 
 const sampleOrder = {
@@ -163,6 +180,7 @@
 	selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
 	selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
 	selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
+  getStandardTree2: "/standardTree/getStandardTree2", //鑾峰彇浜у搧鏋舵瀯
 }
 
 const standardMethod = {
@@ -184,6 +202,11 @@
 const insReport = {
   pageInsReport: "/insReport/pageInsReport", //鏌ヨ妫�楠屾姤鍛婃暟鎹�
   wordToHtml: "/insReport/wordToHtml", //Word杞琀TML
+  inReport: "/insReport/inReport", //鎶ュ憡涓婁紶
+  upReportUrl: "/insReport/upReportUrl", //鎶ュ憡杩樺師
+  writeReport: "/insReport/writeReport", //鎶ュ憡鎻愪氦
+  examineReport: "/insReport/examineReport", //鎶ュ憡瀹℃牳
+  ratifyReport: "/insReport/ratifyReport", //鎶ュ憡鎵瑰噯
 }
 
 const warehouse = {
@@ -200,3 +223,47 @@
   getSampleRecord: "/warehouse/getSampleRecord", //鏌ヨ鏍峰搧璇︾粏璁板綍
   searchSampleId: "/warehouse/searchSampleId", //閫氳繃鏍峰搧缂栧彿杩涜妫�绱�
 }
+
+const department = {
+  selectDepartment: "/department/selectDepartment", //浜哄憳鏋舵瀯鏍�
+  addDepartment: "/department/addDepartment", //娣诲姞閮ㄩ棬
+  delDepartment: "/department/delDepartment", //鍒犻櫎閮ㄩ棬
+  showUserById: "/department/showUserById", //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
+}
+
+const report = {
+  businessStatisticsByDay: "/report/businessStatisticsByDay", //姣忔棩涓氬姟缁熻
+  calendarWorkByWeek: "/report/calendarWorkByWeek", //棣栭〉-->鏃ュ巻浠诲姟鍥�
+  addSchedule: "/report/addSchedule", //棣栭〉-->娣诲姞鏃ョ▼
+  ScheduleByMe: "/report/ScheduleByMe", //棣栭〉-->鎴戠殑鏃ョ▼
+  testProductByDay: "/report/testProductByDay", //棣栨娴嬮」鐩粺璁�
+}
+const certification = {
+  getCertificationDetail:"/certification/getCertificationDetail",//鏌ヨ璧勮川鏄庣粏鍒楄〃
+  addCertificationDetail:"/certification/addCertificationDetail",//娣诲姞璧勮川鏄庣粏鍒楄〃
+  delCertificationDetail:"certification/delCertificationDetail",//鍒犻櫎璧勮川鏄庣粏鍒楄〃
+}
+
+const sealScope = {
+  selectSeal:"/sealScope/selectSeal",//鏌ヨ鍗扮珷鍒楄〃
+  addSeal:"/sealScope/addSeal",//娣诲姞鍗扮珷鍙傛暟
+}
+
+const informationNotification = {
+  checkForUnreadData:"/informationNotification/checkForUnreadData",//鏌ヨ鏄惁瀛樺湪鏈鏁版嵁
+  deleteDataBasedOnId:"/informationNotification/deleteDataBasedOnId",//鏍规嵁Id鍒犻櫎鏁版嵁
+  informationReadOrDelete:"/informationNotification/informationReadOrDelete",//鏍囪鎵�鏈変俊鎭负宸茶-鍒犻櫎鎵�鏈夊凡璇绘秷鎭�
+  page:"/informationNotification/page",//婊氬姩鍒嗛〉鏌ヨ
+  updateMessageStatus:"/informationNotification/updateMessageStatus",//鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級
+  triggerModificationStatusToRead:"/informationNotification/triggerModificationStatusToRead",//鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶
+}
+
+const performanceShift = {
+  add:"/performanceShift/add",//缁╂晥绠$悊-鐝-鎺掔彮
+  page:"/performanceShift/page",//缁╂晥绠$悊-鐝-鍒嗛〉鏌ヨ
+  update:"/performanceShift/update/",//缁╂晥绠$悊-鐝-鐝鐘舵�佷慨鏀�
+}
+
+const unPass = {
+	pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
+}

--
Gitblit v1.9.3