From a1ff69f228b7a0d08959e6b25eff2dac6085df8d Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 21 九月 2023 17:59:23 +0800
Subject: [PATCH] 1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

---
 src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
index 0c5a80c..1f9b37a 100644
--- a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
@@ -209,7 +209,7 @@
           series: [
             {
               name: '鍒╃敤鐜�',
-              type: 'bar',
+              type: 'line',
               barWidth: 50,
               itemStyle: {
                 normal: {
@@ -237,7 +237,7 @@
       },
       handleChange(value) {
         this.queryParam.timeType = value
-        console.log(this.queryParam.timeType)
+        // console.log(this.queryParam.timeType)
       },
       tabChange(val) {
         this.activeKey = val
@@ -255,10 +255,14 @@
             for(var i = 0;i<res.result.dayRateDto.length;i++){
               this.useingRates.push(res.result.dayRateDto[i].utilizationRate)
             }
-            console.log(this,spaceTime)
+            // console.log(this,spaceTime)
             this.drawTu()
           } else {
-            this.$message.warning(res.message)
+            // this.$message.warning(res.message)
+            this.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
           }
         }).finally(() => {
           this.loading = false
@@ -296,7 +300,11 @@
             }
             this.drawTu()
           }else{
-            this.$message.warning(res.message)
+            // this.$message.warning(res.message)
+            this.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
           }
         }).finally(() => {
           this.loading = false
@@ -331,7 +339,11 @@
               }
               this.drawTu()
             }else{
-              this.$message.warning(res.message)
+              // this.$message.warning(res.message)
+              this.$notification.warning({
+                message:'娑堟伅',
+                description:res.message
+              });
             }
           }).finally(() => {
             this.loading = false
@@ -363,7 +375,11 @@
               }
               this.drawTu()
             }else{
-              this.$message.warning(res.message)
+              // this.$message.warning(res.message)
+              this.$notification.warning({
+                message:'娑堟伅',
+                description:res.message
+              });
             }
           }).finally(() => {
             this.loading = false
@@ -385,10 +401,19 @@
               this.queryParams = {}
               // this.queryList()
               this.equipment = {}
-              _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+              // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+              _this.$notification.warning({
+                message:'娑堟伅',
+                description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+              });
             }
           }else{
-            this.$message.warning(res.message)
+            // this.$message.warning(res.message)
+            _this.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
+
           }
         })
       },
@@ -406,10 +431,18 @@
               this.queryParams = {}
               // this.queryList()
               this.equipment = {}
-              _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+              // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+              _this.$notification.warning({
+                message:'娑堟伅',
+                description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+              });
             }
           }else{
-            this.$message.warning(res.message)
+            // this.$message.warning(res.message)
+            _this.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
           }
         })
       }

--
Gitblit v1.9.3