luoshiwen
/
long_IslandOcean
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://172.16.1.12/luoshiwen/long_IslandOcean

This commit is contained in:
lixiaobang 2023-12-12 14:48:17 +08:00
parent 54c7bb4dbf e9ea23aa15
commit 862b36894f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/mainHeader/index.vue
View File

@ -9,7 +9,11 @@ import lighting from '@/views/lighting/index.vue' //照明
import carbonEmission from '@/views/carbonEmission/index.vue' //碳排放 import carbonEmission from '@/views/carbonEmission/index.vue' //碳排放
import screen from '@/views/screen/index.vue' //显示屏 import screen from '@/views/screen/index.vue' //显示屏
<<<<<<< HEAD
=======
import energyMonitoring from '@/views/energyMonitoring/index.vue' import energyMonitoring from '@/views/energyMonitoring/index.vue'
>>>>>>> af48436e2178f27ff7772684e807f1fea9516ede
const nowDate = ref('') const nowDate = ref('')
const nowWeek = ref('') const nowWeek = ref('')
const nowMin = ref('') const nowMin = ref('')
@ -26,7 +30,11 @@ timer.value = setInterval(()=>{
},1000) },1000)
const menuList = ref([ const menuList = ref([
{name:shallowRef(overview),default:'../../assets/images/menu/overview.png',select:'../../assets/images/menu/overview-select.png'}, {name:shallowRef(overview),default:'../../assets/images/menu/overview.png',select:'../../assets/images/menu/overview-select.png'},
<<<<<<< HEAD
{ //name:shallowRef(energyMonitoring),
=======
{name:shallowRef(energyMonitoring), {name:shallowRef(energyMonitoring),
>>>>>>> af48436e2178f27ff7772684e807f1fea9516ede
default:'../../assets/images/menu/energy.png',select:'../../assets/images/menu/energy-select.png'}, default:'../../assets/images/menu/energy.png',select:'../../assets/images/menu/energy-select.png'},
{name:shallowRef(energyEfficiency),default:'../../assets/images/menu/energy-efficiency.png',select:'../../assets/images/menu/energy-efficiency-select.png'}, {name:shallowRef(energyEfficiency),default:'../../assets/images/menu/energy-efficiency.png',select:'../../assets/images/menu/energy-efficiency-select.png'},
{name:shallowRef(drainage),default:'../../assets/images/menu/drainage.png',select:'../../assets/images/menu/drainage-select.png'}, {name:shallowRef(drainage),default:'../../assets/images/menu/drainage.png',select:'../../assets/images/menu/drainage-select.png'},