From 392b6d769b399451890d7348ca0bc8f13710f885 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Wed, 24 Apr 2024 15:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E4=BF=9D=E6=9C=89=E9=87=8F-=E5=BC=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-screen/src/api/dialog.js | 6 +- .../src/components/home/centerFold.vue | 19 +- .../components/home/getMaterialsDialog.vue | 1 + .../src/components/home/inventoryDialog.vue | 187 ++++++++++++++++++ .../components/home/returnMaterialsDialog.vue | 1 + .../components/home/scrapAnalysisDialog.vue | 1 + sgzb-screen/src/views/Home/index.vue | 7 +- 7 files changed, 217 insertions(+), 5 deletions(-) create mode 100644 sgzb-screen/src/components/home/inventoryDialog.vue diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js index 78898258..814751e7 100644 --- a/sgzb-screen/src/api/dialog.js +++ b/sgzb-screen/src/api/dialog.js @@ -6,6 +6,7 @@ const URL_RETURN_DETAILS = '/screen/base/largeScreen/home/getMaterialReturnData/ const URL_UNIT_LIST = '/screen/material/agreementInfo/getUnitList' const URL_PROJECT_LIST = '/screen/material/agreementInfo/getProjectList' const URL_SCRAP_ANALYSIS = '/screen/base/largeScreen/home/getScrapAnalysisByMonth/details' +const URL_TOTAL_OWNERSHIP = '/screen/base/largeScreen/home/getTotalOwnership/details' // 设备类型 export const getTypeList = params => GET(URL_TYPE_LIST, params) @@ -23,4 +24,7 @@ export const getUnitList = params => GET(URL_UNIT_LIST, params) export const getProjectList = params => GET(URL_PROJECT_LIST, params) // 废料分析 -export const getScrapAnalysis = data => POST(URL_SCRAP_ANALYSIS, data) \ No newline at end of file +export const getScrapAnalysis = data => POST(URL_SCRAP_ANALYSIS, data) + +// 总保有量 +export const getTotalOwnership = data => POST(URL_TOTAL_OWNERSHIP, data) diff --git a/sgzb-screen/src/components/home/centerFold.vue b/sgzb-screen/src/components/home/centerFold.vue index 3e56275d..7c4da2ba 100644 --- a/sgzb-screen/src/components/home/centerFold.vue +++ b/sgzb-screen/src/components/home/centerFold.vue @@ -17,7 +17,7 @@
-
+
{{ item.value }}
@@ -28,14 +28,20 @@
+ +
+ + \ No newline at end of file diff --git a/sgzb-screen/src/components/home/returnMaterialsDialog.vue b/sgzb-screen/src/components/home/returnMaterialsDialog.vue index a5d6e54b..bdb2fb2d 100644 --- a/sgzb-screen/src/components/home/returnMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/returnMaterialsDialog.vue @@ -168,6 +168,7 @@ export default { this.open = params.open, this.maType = params.maType, this.tableData = [] + this.total = 0 setTimeout(() => { this.$refs.form.resetFields() this.getList() diff --git a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue index 418818fb..61d695e9 100644 --- a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue @@ -195,6 +195,7 @@ export default { this.open = params.open, this.maType = params.maType, this.tableData = [] + this.total = 0 setTimeout(() => { this.$refs.form.resetFields() this.getList() diff --git a/sgzb-screen/src/views/Home/index.vue b/sgzb-screen/src/views/Home/index.vue index 9ddd2789..e4f04cb6 100644 --- a/sgzb-screen/src/views/Home/index.vue +++ b/sgzb-screen/src/views/Home/index.vue @@ -13,8 +13,8 @@
-
- +
+
@@ -187,6 +187,9 @@ export default { const seconds = date.getSeconds().toString().padStart(2, '0') const dateTimeString = `${year}/${month}/${day} ${weekday} ${hours}:${minutes}:${seconds}` this.dateTimeString = dateTimeString + }, + handleClick() { + this.$refs.centerFold.handleClick({maType: this.maType}) } }