From bb6e607a91de71adf1a6cbda926addef02171297 Mon Sep 17 00:00:00 2001
From: jn517618 <jn517618@163.com>
Date: Fri, 12 Jan 2024 11:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=B7=BB=E5=8A=A0deptname?=
 =?UTF-8?q?=E5=80=BC=E4=BC=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/energySources/component/dmodal.vue       | 14 ++++++--------
 src/views/energySources/component/dosage.vue       |  2 +-
 src/views/energySources/component/emodal.vue       | 13 ++++++-------
 .../energySources/component/equipmentLoad.vue      |  2 +-
 src/views/energySources/component/header.vue       |  2 +-
 src/views/energySources/index.vue                  | 10 ----------
 6 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/views/energySources/component/dmodal.vue b/src/views/energySources/component/dmodal.vue
index 7dd70f1..11efc06 100644
--- a/src/views/energySources/component/dmodal.vue
+++ b/src/views/energySources/component/dmodal.vue
@@ -43,12 +43,6 @@ import tit from "./tit.vue";
 import { mapGetters } from "vuex";
 import { getPeriodElectricity, getInstrumentRunDetail } from "@/api/energySources/energySources"
 export default {
-  props: {
-    deptName: {
-      type: String,
-      default: "",
-    },
-  },
   data() {
     return {
       tableData: [],
@@ -69,7 +63,11 @@ export default {
     },
     selectDay: {
       type: String
-    }
+    },
+    deptName: {
+      type: String,
+      default: "",
+    },
   },
   watch: {
     visible(v) {
@@ -83,7 +81,7 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
   },
   created() {
-    if(this.deptName){
+    if (this.deptName) {
       this.getTableData()
     }
     // this.getData()
diff --git a/src/views/energySources/component/dosage.vue b/src/views/energySources/component/dosage.vue
index baf266d..7ed74e5 100644
--- a/src/views/energySources/component/dosage.vue
+++ b/src/views/energySources/component/dosage.vue
@@ -82,7 +82,7 @@
       <!-- <div id="mainDosage"></div> -->
     </div>
 
-    <dmodal :visible.sync="visible" @onvisible="v => visible = v" :selectDay="selectDay" />
+    <dmodal :visible.sync="visible" @onvisible="v => visible = v" :selectDay="selectDay" :deptName="deptName" />
   </div>
 </template>
 
diff --git a/src/views/energySources/component/emodal.vue b/src/views/energySources/component/emodal.vue
index b63ee76..4435fd9 100644
--- a/src/views/energySources/component/emodal.vue
+++ b/src/views/energySources/component/emodal.vue
@@ -43,12 +43,6 @@ import tit from "./tit.vue";
 import { mapGetters } from "vuex";
 import { getInstrumentActLoad, getInstrumentRunDetail } from "@/api/energySources/energySources"
 export default {
-  props: {
-    deptName: {
-      type: String,
-      default: "",
-    },
-  },
   data() {
     return {
       tableData: [],
@@ -66,7 +60,12 @@ export default {
     visible: {
       type: Boolean,
       default: false
-    }
+    },
+    
+    deptName: {
+      type: String,
+      default: "",
+    },
   },
   watch: {
     visible(v) {
diff --git a/src/views/energySources/component/equipmentLoad.vue b/src/views/energySources/component/equipmentLoad.vue
index 42e1fc8..fe19560 100644
--- a/src/views/energySources/component/equipmentLoad.vue
+++ b/src/views/energySources/component/equipmentLoad.vue
@@ -21,7 +21,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <emodal :visible.sync="visible" @onvisible="v => visible = v" />
+    <emodal :visible.sync="visible" @onvisible="v => visible = v" :deptName="deptName" />
   </div>
 </template>
 
diff --git a/src/views/energySources/component/header.vue b/src/views/energySources/component/header.vue
index e3e9b0b..e175ad0 100644
--- a/src/views/energySources/component/header.vue
+++ b/src/views/energySources/component/header.vue
@@ -65,7 +65,7 @@ export default {
   },
   methods: {
   },
-  beforeDestroy() {
+  beforeDestroyed() {
     clearInterval(this.timeFun)
   },
 };
diff --git a/src/views/energySources/index.vue b/src/views/energySources/index.vue
index 76dc297..11bc70d 100644
--- a/src/views/energySources/index.vue
+++ b/src/views/energySources/index.vue
@@ -19,15 +19,6 @@
 </template>
 
 <script>
-// import MonitorTitle from "./components/MonitorTitle.vue";
-import {
-  defaultLocation11,
-  defaultLocation1,
-  floorList11,
-  floorList12,
-  floorList1,
-} from "@/const/monitoring/monitoring.js";
-import { detail } from "@/api/system/param.js";
 import Header from "./component/header.vue";
 import all from "./component/all.vue";
 import load from "./component/load.vue";
@@ -35,7 +26,6 @@ import dosage from "./component/dosage.vue";
 import equipmentLoad from "./component/equipmentLoad.vue";
 import equipmentStatus from "./component/equipmentStatus.vue";
 import equipmentAnalyze from "./component/equipmentAnalyze.vue";
-import { getEntrustDay, getDataAcquisition } from "@/api/monitoring/monitoring";
 import {getDeptTree} from "@/api/system/dept"
 import { mapGetters } from "vuex";