From 1d5116a05e90848da8d6d98542edb64751d45730 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Wed, 24 Apr 2024 17:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=88=86=E6=9E=90-=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-screen/src/api/dialog.js | 4 + .../src/components/home/centerBottom.vue | 19 +- .../src/components/home/centerFold.vue | 12 +- .../home/inputStoreAnalysisDialog.vue | 173 ++++++++++++++++++ .../src/components/home/inventoryDialog.vue | 2 +- sgzb-screen/src/views/Home/index.vue | 8 +- 6 files changed, 205 insertions(+), 13 deletions(-) create mode 100644 sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js index 814751e7..05de6c69 100644 --- a/sgzb-screen/src/api/dialog.js +++ b/sgzb-screen/src/api/dialog.js @@ -7,6 +7,7 @@ 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' +const URL_ACCEPTANCE_STORAGE = '/screen/base/largeScreen/home/getAcceptanceStorage/details' // 设备类型 export const getTypeList = params => GET(URL_TYPE_LIST, params) @@ -28,3 +29,6 @@ export const getScrapAnalysis = data => POST(URL_SCRAP_ANALYSIS, data) // 总保有量 export const getTotalOwnership = data => POST(URL_TOTAL_OWNERSHIP, data) + +// 入库分析 +export const getAcceptanceStorage = data => POST(URL_ACCEPTANCE_STORAGE, data) diff --git a/sgzb-screen/src/components/home/centerBottom.vue b/sgzb-screen/src/components/home/centerBottom.vue index 0f678a22..014d3586 100644 --- a/sgzb-screen/src/components/home/centerBottom.vue +++ b/sgzb-screen/src/components/home/centerBottom.vue @@ -6,15 +6,21 @@
+ + diff --git a/sgzb-screen/src/components/home/centerFold.vue b/sgzb-screen/src/components/home/centerFold.vue index 7c4da2ba..f4f444c0 100644 --- a/sgzb-screen/src/components/home/centerFold.vue +++ b/sgzb-screen/src/components/home/centerFold.vue @@ -73,7 +73,12 @@ export default { setInterval(() => { this.getTotalOwnershipApiPage() }, 60 * 1000); - + this.$eventBus.$on('maType', (maType) => { + this.maType = maType + }); + }, + destroyed() { + this.$eventBus.$off('maType'); }, methods: { getTotalOwnershipApiPage() { @@ -111,13 +116,10 @@ export default { this.$refs['box1'].style.height = height } }, - handleClick(params) { - this.maType = params.maType - }, handleClickItem() { setTimeout(() => { this.$refs.inventoryDialog.setOpen({ open: true, maType: this.maType }) - }, 100) + }, 10) } } } diff --git a/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue b/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue new file mode 100644 index 00000000..19e5b80d --- /dev/null +++ b/sgzb-screen/src/components/home/inputStoreAnalysisDialog.vue @@ -0,0 +1,173 @@ + + + + + \ No newline at end of file diff --git a/sgzb-screen/src/components/home/inventoryDialog.vue b/sgzb-screen/src/components/home/inventoryDialog.vue index 60377892..2aa675ab 100644 --- a/sgzb-screen/src/components/home/inventoryDialog.vue +++ b/sgzb-screen/src/components/home/inventoryDialog.vue @@ -146,7 +146,7 @@ export default { setTimeout(() => { this.$refs.form.resetFields() this.getList() - }, 0) + }, 10) }, getList() { const params = { diff --git a/sgzb-screen/src/views/Home/index.vue b/sgzb-screen/src/views/Home/index.vue index e4f04cb6..9e4e8eac 100644 --- a/sgzb-screen/src/views/Home/index.vue +++ b/sgzb-screen/src/views/Home/index.vue @@ -13,8 +13,8 @@
-
- +
+
@@ -188,10 +188,6 @@ export default { const dateTimeString = `${year}/${month}/${day} ${weekday} ${hours}:${minutes}:${seconds}` this.dateTimeString = dateTimeString }, - handleClick() { - this.$refs.centerFold.handleClick({maType: this.maType}) - } - } }