From f01a3e5566acd939b984472da7ea57a1ae7b271e Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 11 Jan 2024 17:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=82=E5=8C=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8E=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/login/userlogin.vue | 26 +++------- src/views/energySources/component/all.vue | 24 ++++++--- src/views/energySources/component/dmodal.vue | 16 ++++-- src/views/energySources/component/dosage.vue | 20 ++++--- src/views/energySources/component/emodal.vue | 16 ++++-- .../component/equipmentAnalyze.vue | 16 ++++-- .../energySources/component/equipmentLoad.vue | 16 ++++-- .../component/equipmentStatus.vue | 22 +++++--- src/views/energySources/component/header.vue | 10 +++- src/views/energySources/component/load.vue | 13 ++++- src/views/energySources/index.vue | 52 ++++++++++++++++--- 11 files changed, 162 insertions(+), 69 deletions(-) diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 54a2d6c..83f319e 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -62,7 +62,6 @@ import { info } from "@/api/system/tenant"; import { getCaptcha } from "@/api/user"; import { getTopUrl } from "@/util/util"; import { setStore, getStore, removeStore } from "@/util/store"; -import {getDeptTree} from "@/api/system/dept" export default { name: "userlogin", @@ -151,6 +150,7 @@ export default { }, checked: false, deptData:[], + deptName:'', }; }, created() { @@ -192,13 +192,6 @@ export default { }, props: [], methods: { - // getDept(){ - // getDeptTree().then(res => { - // console.log('res ====>',res) - // // const column = this.findObject(this.option.column, "parentId"); - // // column.dicData = res.data.data; - // }); - // }, refreshCode() { if (this.website.captchaMode) { getCaptcha().then(res => { @@ -223,17 +216,7 @@ export default { this.handleLogin(); done(); }, - // getAllIds(tree, result) { - // //遍历树 获取id数组 - // for (const i in tree) { - // result.push(tree[i].id); // 遍历项目满足条件后的操作 - // if (tree[i].children) { - // //存在子节点就递归 - // getAllIds(tree[i].children, result); - // } - // } - // return result; - // }, + handleLogin() { this.$refs.loginForm.validate(valid => { if (valid) { @@ -264,9 +247,12 @@ export default { return false; } } - // console.log('user ==========>',this.userInfo) + + console.log('user ==========>',this.userInfo) if(this.userInfo.role_name == '政府大屏'){ this.$router.push({ path: '/energySourcesProvince/index' }); + }else if(this.userInfo.role_name == '厂区大屏'){ + this.$router.push({ path: '/energySources/index',query:{deptId:this.userInfo.dept_id} }); }else{ this.$router.push({ path: this.tagWel.value }); } diff --git a/src/views/energySources/component/all.vue b/src/views/energySources/component/all.vue index 9ca16a6..56eb237 100644 --- a/src/views/energySources/component/all.vue +++ b/src/views/energySources/component/all.vue @@ -86,6 +86,12 @@ import tit from "./tit.vue"; import { mapGetters } from "vuex"; import {getTotalElectricity,getMonthElectricity} from "@/api/energySources/energySources" export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { num: 0, @@ -104,13 +110,15 @@ export default { }, created() { this.selectMonth = this.$moment().format('YYYY-MM') - this.getTotal() - this.$nextTick(() => { - this.getTrend() - }) - this.timeFun = setInterval(() => { + if(this.deptName){ this.getTotal() - }, 300000) + this.$nextTick(() => { + this.getTrend() + }) + this.timeFun = setInterval(() => { + this.getTotal() + }, 300000) + } }, beforeDestroyed() { clearInterval(this.timeFun) @@ -120,7 +128,7 @@ export default { }, methods: { getTotal(){ - getTotalElectricity({manufacturerBrand:this.userInfo.dept_name}).then(res =>{ + getTotalElectricity({manufacturerBrand:this.deptName}).then(res =>{ let data = res.data.data this.yearNum = data.currentYear.toString().split('') this.monthNum = data.currentMonth.toString().split('') @@ -131,7 +139,7 @@ export default { getTrend(){ this.currentMonthData = []; this.lastMonthData = [] - getMonthElectricity({manufacturerBrand:this.userInfo.dept_name,currentMonth:this.selectMonth}).then(res =>{ + getMonthElectricity({manufacturerBrand:this.deptName,currentMonth:this.selectMonth}).then(res =>{ let currData = res.data.data.currentMonth let lastData = res.data.data.lastMonth Object.keys(currData).forEach((key) => { diff --git a/src/views/energySources/component/dmodal.vue b/src/views/energySources/component/dmodal.vue index 70468d6..7dd70f1 100644 --- a/src/views/energySources/component/dmodal.vue +++ b/src/views/energySources/component/dmodal.vue @@ -43,6 +43,12 @@ 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: [], @@ -77,18 +83,20 @@ export default { ...mapGetters(["userInfo", "permission"]), }, created() { - this.getTableData() + if(this.deptName){ + this.getTableData() + } // this.getData() }, methods: { getTableData() { - getPeriodElectricity({ manufacturerBrand: this.userInfo.dept_name }).then(res => { + getPeriodElectricity({ manufacturerBrand: this.deptName }).then(res => { this.options = res.data.data // this.value = this.options[0].name }) }, getData() { - getInstrumentRunDetail({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDay, name: this.value }).then(res => { + getInstrumentRunDetail({ manufacturerBrand: this.deptName, today: this.selectDay, name: this.value }).then(res => { console.log(res) this.tableData = res.data.records this.total = res.data.total @@ -96,7 +104,7 @@ export default { }, getData() { getInstrumentRunDetail({ - manufacturerBrand: this.userInfo.dept_name, + manufacturerBrand: this.deptName, today: this.selectDay, name: this.value, current: this.current, diff --git a/src/views/energySources/component/dosage.vue b/src/views/energySources/component/dosage.vue index 9a14b49..301a3e5 100644 --- a/src/views/energySources/component/dosage.vue +++ b/src/views/energySources/component/dosage.vue @@ -92,6 +92,12 @@ import dmodal from "./dmodal.vue"; import { mapGetters } from "vuex"; import { getPeriodElectricity } from "@/api/energySources/energySources" export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { selectDay: '', @@ -106,14 +112,12 @@ export default { }, created() { this.selectDay = this.$moment().format('YYYY-MM-DD') - this.getPeriodData() - // this.$nextTick(() => { - - // this.echartsInit() - // }) - this.timeFun = setInterval(() => { + if(this.deptName){ this.getPeriodData() - }, 300000) + this.timeFun = setInterval(() => { + this.getPeriodData() + }, 300000) + } }, beforeDestroyed() { clearInterval(this.timeFun) @@ -148,7 +152,7 @@ export default { } }, getPeriodData() { - getPeriodElectricity({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDay }).then(res => { + getPeriodElectricity({ manufacturerBrand: this.deptName, today: this.selectDay }).then(res => { console.log('period =====>', res) this.tableData = res.data.data }) diff --git a/src/views/energySources/component/emodal.vue b/src/views/energySources/component/emodal.vue index 6f2179c..b63ee76 100644 --- a/src/views/energySources/component/emodal.vue +++ b/src/views/energySources/component/emodal.vue @@ -43,6 +43,12 @@ 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: [], @@ -73,11 +79,15 @@ export default { ...mapGetters(["userInfo", "permission"]), }, created() { - this.getTableData() + if(this.deptName){ + this.getTableData() + } + + }, methods: { getTableData() { - getInstrumentActLoad({ manufacturerBrand: this.userInfo.dept_name }).then(res => { + getInstrumentActLoad({ manufacturerBrand: this.deptName }).then(res => { this.options = res.data.data // this.value = this.options[0].name @@ -85,7 +95,7 @@ export default { }, getData() { getInstrumentRunDetail({ - manufacturerBrand: this.userInfo.dept_name, + manufacturerBrand: this.deptName, today: this.$moment().format('yyyy-MM-DD'), name: this.value, current: this.current, diff --git a/src/views/energySources/component/equipmentAnalyze.vue b/src/views/energySources/component/equipmentAnalyze.vue index 4510ce6..52491d5 100644 --- a/src/views/energySources/component/equipmentAnalyze.vue +++ b/src/views/energySources/component/equipmentAnalyze.vue @@ -56,6 +56,12 @@ import tit from "./tit.vue"; import { mapGetters } from "vuex"; import { getInstrumentDaylyLoad } from "@/api/energySources/energySources" export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { selectDay: "", @@ -71,10 +77,12 @@ export default { }, created() { this.selectDay = this.$moment().format('YYYY-MM-DD') - this.getTotalData() - this.timeFun = setInterval(() => { + if(this.deptName){ this.getTotalData() - }, 300000) + this.timeFun = setInterval(() => { + this.getTotalData() + }, 300000) + } }, beforeDestroyed() { clearInterval(this.timeFun) @@ -84,7 +92,7 @@ export default { this.getTotalData() }, getTotalData() { - getInstrumentDaylyLoad({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDay }).then(res => { + getInstrumentDaylyLoad({ manufacturerBrand: this.deptName, today: this.selectDay }).then(res => { this.tableData = res.data.data; // this.yearNum = data.currentYear.toString().split('') // this.monthNum = data.currentMonth.toString().split('') diff --git a/src/views/energySources/component/equipmentLoad.vue b/src/views/energySources/component/equipmentLoad.vue index 494ce5d..2620c56 100644 --- a/src/views/energySources/component/equipmentLoad.vue +++ b/src/views/energySources/component/equipmentLoad.vue @@ -31,6 +31,12 @@ import emodal from "./emodal.vue"; import { mapGetters } from "vuex"; import { getInstrumentActLoad } from "@/api/energySources/energySources" export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { tableData: [], @@ -45,17 +51,19 @@ export default { ...mapGetters(["userInfo", "permission"]), }, created() { - this.getTableData() - this.timeFun = setInterval(() => { + if(this.deptName){ this.getTableData() - }, 300000) + this.timeFun = setInterval(() => { + this.getTableData() + }, 300000) + } }, beforeDestroyed() { clearInterval(this.timeFun) }, methods: { getTableData() { - getInstrumentActLoad({ manufacturerBrand: this.userInfo.dept_name }).then(res => { + getInstrumentActLoad({ manufacturerBrand: this.deptName }).then(res => { this.tableData = res.data.data }) }, diff --git a/src/views/energySources/component/equipmentStatus.vue b/src/views/energySources/component/equipmentStatus.vue index 50aa83a..12e9e7a 100644 --- a/src/views/energySources/component/equipmentStatus.vue +++ b/src/views/energySources/component/equipmentStatus.vue @@ -13,6 +13,12 @@ import tit from "./tit.vue"; import { mapGetters } from "vuex"; import { getInstrumentRunStatus } from "@/api/energySources/energySources" export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { funt: null @@ -22,14 +28,16 @@ export default { tit }, created() { - this.$nextTick(() => { + if(this.deptName){ - this.getData() - this.funt = setInterval(() => { - this.getData() - }, 3600000) - }) + this.$nextTick(() => { + this.getData() + this.funt = setInterval(() => { + this.getData() + }, 3600000) + }) + } }, beforeDestroyed() { clearInterval(this.funt) @@ -42,7 +50,7 @@ export default { }, methods: { getData() { - getInstrumentRunStatus({ manufacturerBrand: this.userInfo.dept_name }).then(res => { + getInstrumentRunStatus({ manufacturerBrand: this.deptName }).then(res => { // this.tableData = res.data.data; // this.yearNum = data.currentYear.toString().split('') // this.monthNum = data.currentMonth.toString().split('') diff --git a/src/views/energySources/component/header.vue b/src/views/energySources/component/header.vue index 306dee8..e175ad0 100644 --- a/src/views/energySources/component/header.vue +++ b/src/views/energySources/component/header.vue @@ -23,11 +23,11 @@
- {{ userInfo.dept_name }}实业公司能耗监测系统 + {{ deptName }}实业公司能耗监测系统
- {{ userInfo.dept_name }}实业公司能耗监测系统 + {{deptName }}实业公司能耗监测系统
@@ -37,6 +37,12 @@ import { getWeather } from "@/api/energySourcesProvince/energySourcesProvince" import { mapGetters } from "vuex"; export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { time: '', diff --git a/src/views/energySources/component/load.vue b/src/views/energySources/component/load.vue index fdf1de6..d254f90 100644 --- a/src/views/energySources/component/load.vue +++ b/src/views/energySources/component/load.vue @@ -26,6 +26,12 @@ import tit from "./tit.vue"; import { mapGetters } from "vuex"; import { getDayElectricity, getWeekElectricity } from "@/api/energySources/energySources" export default { + props: { + deptName: { + type: String, + default: "", + }, + }, data() { return { radio: 0, @@ -39,6 +45,8 @@ export default { }, created() { this.selectDate = this.$moment().format('YYYY-MM-DD') + if(this.deptName){ + this.getWeekData('created') this.$nextTick(() => { if (this.radio) { @@ -50,6 +58,7 @@ export default { } }) + } }, computed: { ...mapGetters(["userInfo", "permission"]), @@ -81,7 +90,7 @@ export default { }, // 获取日分析 getDayData() { - getDayElectricity({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDate }).then(res => { + getDayElectricity({ manufacturerBrand: this.deptName, today: this.selectDate }).then(res => { console.log('res ======>', res) let data = res.data.data let xAxisArr = Array.from({ length: 24 }, (_, index) => index + 1); @@ -129,7 +138,7 @@ export default { }, // 获取周分析 getWeekData(t) { - getWeekElectricity({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDate }).then(res => { + getWeekElectricity({ manufacturerBrand: this.deptName, today: this.selectDate }).then(res => { console.log('res1 ====>', res) let data = res.data.data diff --git a/src/views/energySources/index.vue b/src/views/energySources/index.vue index 8afe28f..76dc297 100644 --- a/src/views/energySources/index.vue +++ b/src/views/energySources/index.vue @@ -1,16 +1,16 @@