diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js index edabfa03..8dde3f83 100644 --- a/sgzb-screen/src/api/dialog.js +++ b/sgzb-screen/src/api/dialog.js @@ -9,6 +9,7 @@ const URL_SCRAP_ANALYSIS = '/screen/base/largeScreen/home/getScrapAnalysisByMont const URL_TOTAL_OWNERSHIP = '/screen/base/largeScreen/home/getTotalOwnership/details' const URL_ACCEPTANCE_STORAGE = '/screen/base/largeScreen/home/getAcceptanceStorage/details' const URL_PICKING_ANALYSIS = '/screen/base/largeScreen/home/getPickingAnalysisByMonth/details' +const URL_MATERIAL_RETURN_BY_MONTH = '/screen/base/largeScreen/home/getMaterialReturnByMonth/details' // 设备类型 export const getTypeList = params => GET(URL_TYPE_LIST, params) @@ -35,4 +36,7 @@ export const getTotalOwnership = data => POST(URL_TOTAL_OWNERSHIP, data) export const getAcceptanceStorage = data => POST(URL_ACCEPTANCE_STORAGE, data) // 领料分析 -export const getPickingAnalysis = data => POST(URL_PICKING_ANALYSIS, data) \ No newline at end of file +export const getPickingAnalysis = data => POST(URL_PICKING_ANALYSIS, data) + +// 退料分析 +export const getMaterialReturnByMonth = data => POST(URL_MATERIAL_RETURN_BY_MONTH, data) \ No newline at end of file diff --git a/sgzb-screen/src/components/home/materialAnalysisDialog.vue b/sgzb-screen/src/components/home/materialAnalysisDialog.vue index 4d7b66ba..31701621 100644 --- a/sgzb-screen/src/components/home/materialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/materialAnalysisDialog.vue @@ -87,7 +87,6 @@ export default { materialReqProjectValue: '', materialReqUnitList: [], materialReqProjectList: [], - materialReqTypeList: [], }, tableData: [], tableColumn: [ diff --git a/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue b/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue new file mode 100644 index 00000000..24930ae2 --- /dev/null +++ b/sgzb-screen/src/components/home/returnMaterialAnalysisDialog.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/sgzb-screen/src/components/home/rightTwo.vue b/sgzb-screen/src/components/home/rightTwo.vue index 42e9d83f..31a2336e 100644 --- a/sgzb-screen/src/components/home/rightTwo.vue +++ b/sgzb-screen/src/components/home/rightTwo.vue @@ -16,6 +16,8 @@ + +