From 2573c1c123a8464c312d27e380ac16d7e0ac2f11 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 23:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index c8fbad9..79bbf40 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -41,13 +41,14 @@
}
// 鍘熸潗鏂欐楠�
const raw = {
- selectRawInspectsList: "/rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
- selectRawInspectsListById: "/rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
- updaterawInsProduct: '/rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽��
- updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //涓婃姤,
- rawSelectDevice: "/rawInsProduct/selectDevice", //鏌ヨ璁惧淇℃伅
- addRawInspects: "/rawInspect/addRawInspects", // 娣诲姞
- updateDevByRpId: "/rawInsProduct/updateDevByRpId", // 鏇存敼璁惧
+ selectRawInspectsList: "/rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+ selectRawInspectsListById: "/rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
+ updaterawInsProduct: '/rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽��
+ updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //涓婃姤,
+ rawSelectDevice: "/rawInsProduct/selectDevice", //鏌ヨ璁惧淇℃伅
+ addRawInspects: "/rawInspect/addRawInspects", // 娣诲姞
+ updateDevByRpId: "/rawInsProduct/updateDevByRpId", // 鏇存敼璁惧
+ rawInspectChooseIFS: "/rawInspect/chooseIFS",//閫氳繃璁惧缂栫爜寰楀埌淇℃伅
}
// 鏌ヨ鎴愬搧涓嶅悎鏍煎搧绠＄悊
@@ -164,26 +165,28 @@
}
const url = {
- enter: "user/enter", //鐧诲綍
- ...standard,
- ...raw,
- ...laboratory,
- ...measure,
- ...finishedIns,
- ...dispose,
- ...Basicdata,
- ...unRawInspects,
- ...processInspection,
- // ...gettable,
- selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
- selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
- addSale: "sale/addSale", //鏂板閿�鍞崟
- saleCheck: "sale/check", //瀹℃牳閿�鍞崟
- synchronization: "sale/synchronization", //鍚屾
- updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
- delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
- delAllSale: "sale/delAllSale", //鎵归噺鍒犻櫎閿�鍞崟锛�
- chooseType: "technologyTemplate/chooseType", //鏌ヨ绫诲瀷
+ enter: "user/enter", //鐧诲綍
+ ...standard,
+ ...raw,
+ ...laboratory,
+ ...measure,
+ ...finishedIns,
+ ...dispose,
+ ...Basicdata,
+ ...unRawInspects,
+ ...processInspection,
+ // ...gettable,
+ selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
+ selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
+ addSale: "sale/addSale", //鏂板閿�鍞崟
+ saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+ exportSale: "sale/exportSale",//瀵煎嚭閿�鍞鍗�
+ saleDownload: "sale/download",//涓嬭浇闄勪欢
+ synchronization: "sale/synchronization", //鍚屾
+ updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
+ delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
+ delAllSale: "sale/delAllSale", //鎵归噺鍒犻櫎閿�鍞崟锛�
+ chooseType: "technologyTemplate/chooseType", //鏌ヨ绫诲瀷
}
@@ -192,4 +195,4 @@
Vue.prototype.$api = {
url
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3