From 5d16c3796565981175c5b24c16cbc1a4dc2c188a Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 28 Mar 2024 08:09:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?keep-alive=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../environmental/voc/vocManagement/index.vue | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue index 4045c752..ff45dd42 100644 --- a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue +++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue @@ -9,10 +9,11 @@
-

{{item.checkValue ? (item.checkValue).toFixed(2) : '-'}}

+

{{ item.checkValue ? (item.checkValue).toFixed(2) : '-' }}

- {{item.name}}

+ {{ item.name }} +

@@ -24,8 +25,8 @@ 检测指标趋势图 - - + +
@@ -37,11 +38,11 @@ import LineChart from './../../components/lineChart' import SearchArea from './../../components/searchArea' import moment from 'moment' export default { - name: 'Voc', - data(){ + name: 'VocManagement', + data() { return { - realtimeList:[], - queryParams:{ + realtimeList: [], + queryParams: { checkType: 3, timeDim: null, timeRange: [] @@ -53,18 +54,18 @@ export default { mounted() { this.getMsg() this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时 - this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000] + this.queryParams.timeRange = [moment().startOf('day') + 0, moment().endOf('day') - 59 * 61 * 1000] this.getTrend() }, methods: { getMsg() { - environmentalCheckRealtime({checkType: 3}).then(res => { + environmentalCheckRealtime({ checkType: 3 }).then(res => { console.log(res) this.realtimeList = res.data || [] }) }, getTrend() { - environmentalCheckRealtimeTrend({...this.queryParams}).then(res => { + environmentalCheckRealtimeTrend({ ...this.queryParams }).then(res => { if (res.code === 0) { this.chartData = res.data } else { @@ -85,34 +86,41 @@ export default { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c23172b9..1b57e6f2 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,48 +1,14 @@ @@ -55,7 +21,6 @@ import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' import NotifyMessage from '@/layout/components/Message' -// import {getPath} from "@/utils/ruoyi"; import NavbarRight from './NavbarRight.vue' export default { @@ -102,7 +67,7 @@ export default { this.$store.dispatch('LogOut').then(() => { location.href = getPath('/'); }) - }).catch(() => {}); + }).catch(() => { }); } } } @@ -114,15 +79,15 @@ export default { overflow: hidden; position: relative; background: #fff; - box-shadow: 0 1px 4px rgba(0,21,41,.08); + box-shadow: 0 1px 4px rgba(0, 21, 41, .08); .hamburger-container { - line-height: 52px; + line-height: 44px; height: 100%; float: left; cursor: pointer; transition: background .3s; - -webkit-tap-highlight-color:transparent; + -webkit-tap-highlight-color: transparent; &:hover { background: rgba(0, 0, 0, .025) @@ -185,7 +150,8 @@ export default { height: 35px; border-radius: 50%; } - .user-nickname{ + + .user-nickname { margin-left: 5px; font-size: 14px; } diff --git a/src/layout/index.vue b/src/layout/index.vue index 218266c1..5c7135fc 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,24 +1,22 @@