From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index add2ebd..8dac067 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -22,6 +22,9 @@
certification,
sealScope,
informationNotification,
+ performanceShift,
+ auxiliaryWorkingHours,
+ unPass,
}
}
@@ -178,6 +181,7 @@
selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
+ getStandardTree2: "/standardTree/getStandardTree2", //鑾峰彇浜у搧鏋舵瀯
}
const standardMethod = {
@@ -255,3 +259,19 @@
triggerModificationStatusToRead:"/informationNotification/triggerModificationStatusToRead",//鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶
}
+const performanceShift = {
+ add:"/performanceShift/add",//缁╂晥绠＄悊-鐝-鎺掔彮
+ page:"/performanceShift/page",//缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ
+ update:"/performanceShift/update",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
+}
+
+const auxiliaryWorkingHours = {
+ selectAuxiliaryWorkingHours:"/auxiliaryWorkingHours/selectAuxiliaryWorkingHours",//鏌ヨ杈呭姪宸ユ椂
+ deleteAuxiliaryWorkingHours:"/auxiliaryWorkingHours/deleteAuxiliaryWorkingHours",//鍒犻櫎杈呭姪宸ユ椂
+ upAuxiliaryWorkingHours:"/auxiliaryWorkingHours/upAuxiliaryWorkingHours",//淇敼杈呭姪宸ユ椂
+ insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//鏂板杈呭姪宸ユ椂
+}
+
+const unPass = {
+ pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
+}
--
Gitblit v1.9.3