From eb1c5d8d7636ed072d42874b409c55297d8d6b1e Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 26 Apr 2024 10:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=88=86=E6=9E=90?=
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/getMaterialsDialog.vue    |  1 -
 .../components/home/materialAnalysisDialog.vue    | 15 +++++++--------
 .../src/components/home/returnMaterialsDialog.vue |  1 -
 sgzb-screen/src/components/home/rightOne.vue      | 10 ++++------
 .../src/components/home/scrapAnalysisDialog.vue   |  1 -
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js
index 05de6c69..edabfa03 100644
--- a/sgzb-screen/src/api/dialog.js
+++ b/sgzb-screen/src/api/dialog.js
@@ -8,6 +8,7 @@ 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'
+const URL_PICKING_ANALYSIS = '/screen/base/largeScreen/home/getPickingAnalysisByMonth/details'
 
 // 设备类型
 export const getTypeList = params => GET(URL_TYPE_LIST, params)
@@ -32,3 +33,6 @@ 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
diff --git a/sgzb-screen/src/components/home/getMaterialsDialog.vue b/sgzb-screen/src/components/home/getMaterialsDialog.vue
index 44e21ce7..c2607d2e 100644
--- a/sgzb-screen/src/components/home/getMaterialsDialog.vue
+++ b/sgzb-screen/src/components/home/getMaterialsDialog.vue
@@ -90,7 +90,6 @@ export default {
   data() {
     return {
       open: false,
-      material: false, // 领料
       formData: {
         materialReqNo: '',
         materialReqUnitValue: '',
diff --git a/sgzb-screen/src/components/home/materialAnalysisDialog.vue b/sgzb-screen/src/components/home/materialAnalysisDialog.vue
index 37c5cdd2..4d7b66ba 100644
--- a/sgzb-screen/src/components/home/materialAnalysisDialog.vue
+++ b/sgzb-screen/src/components/home/materialAnalysisDialog.vue
@@ -71,7 +71,7 @@
 
 <script>
 import Pagination from '../Pagination/index.vue'
-import { getDetails, getUnitList, getProjectList } from '../../api/dialog'
+import { getPickingAnalysis, getUnitList, getProjectList } from '../../api/dialog'
 
 export default {
   name: 'getMaterialsDialog',
@@ -81,7 +81,6 @@ export default {
   data() {
     return {
       open: false,
-      material: false, // 领料
       formData: {
         materialReqNo: '',
         materialReqUnitValue: '',
@@ -100,17 +99,17 @@ export default {
         },
         {
           label: '领料单号',
-          prop: 'materialTime',
+          prop: 'materialCode',
           align: 'center'
         },
         {
           label: '领料申请单位',
-          prop: 'typeName',
+          prop: 'unitName',
           align: 'center'
         },
         {
           label: '领料申请工程',
-          prop: 'typeModelName',
+          prop: 'projectName',
           align: 'center'
         },
         {
@@ -120,12 +119,12 @@ export default {
         },
         {
           label: '申请时间',
-          prop: 'userName',
+          prop: 'materialTime',
           align: 'center'
         },
         {
           label: '申请状态',
-          prop: 'materialCode',
+          prop: 'statusName',
           align: 'center'
         }
       ],
@@ -161,7 +160,7 @@ export default {
         unitId: this.formData.materialReqUnitValue,
         projectId: this.formData.materialReqProjectValue,
       }
-      getDetails(params).then(({data}) => {
+      getPickingAnalysis(params).then(({data}) => {
         this.tableData = data.rows
         this.total = data.total
       })
diff --git a/sgzb-screen/src/components/home/returnMaterialsDialog.vue b/sgzb-screen/src/components/home/returnMaterialsDialog.vue
index bdb2fb2d..ec08ba0f 100644
--- a/sgzb-screen/src/components/home/returnMaterialsDialog.vue
+++ b/sgzb-screen/src/components/home/returnMaterialsDialog.vue
@@ -90,7 +90,6 @@ export default {
   data() {
     return {
       open: false,
-      material: false, // 领料
       formData: {
         materialReqNo: '',
         materialReqUnitValue: '',
diff --git a/sgzb-screen/src/components/home/rightOne.vue b/sgzb-screen/src/components/home/rightOne.vue
index 5c000fc8..7d02b1b8 100644
--- a/sgzb-screen/src/components/home/rightOne.vue
+++ b/sgzb-screen/src/components/home/rightOne.vue
@@ -5,7 +5,7 @@
         <h5 class="access-rate-box-title">当月领料分析</h5>
       </div>
       <div class="chart-container">
-        <div class="chart" ref="chart" id="pieChartMap"></div>
+        <div class="chart" ref="chart" id="pieChartMap" @click="handleClick"></div>
         <!-- 底座背景 -->
         <div class="bg"></div>
       </div>
@@ -427,12 +427,10 @@ export default {
       if (option && typeof option === "object") {
         myChart.setOption(option);
       }
-      myChart.off('click');
-      myChart.on('click', (params) => {
-        console.log('🚀 ~ myChart.on ~ params:', params);
-        this.$refs.materialAnalysisDialog.setOpen({open: true, maType: this.maType})
-      });
     },
+    handleClick() {
+      this.$refs.materialAnalysisDialog.setOpen({ open: true, maType: this.maType })
+    }
   },
 };
 </script>
diff --git a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue
index 61d695e9..927c6807 100644
--- a/sgzb-screen/src/components/home/scrapAnalysisDialog.vue
+++ b/sgzb-screen/src/components/home/scrapAnalysisDialog.vue
@@ -101,7 +101,6 @@ export default {
   data() {
     return {
       open: false,
-      material: false, // 领料
       formData: {
         scrapCode: '',
         scrapSource: '',