From a3187607ce0f23a9acdf41b58d2cd88a3aa5b06a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 24 Dec 2024 21:21:28 +0800
Subject: [PATCH] 菜单显示、三级防控加载
---
src/views/pac/components/box/dataContent.vue | 75 ++++++++----------------
src/pages/single/components/mainMenu.vue | 16 ++--
src/pages/main/components/mainMenu.vue | 16 ++--
src/router/index.js | 28 ++++----
4 files changed, 55 insertions(+), 80 deletions(-)
diff --git a/src/pages/main/components/mainMenu.vue b/src/pages/main/components/mainMenu.vue
index d394610..d0099f0 100644
--- a/src/pages/main/components/mainMenu.vue
+++ b/src/pages/main/components/mainMenu.vue
@@ -43,14 +43,14 @@
menuName: '救援队伍',
path: '/layout/single/rt'
},
- {
- menuName: '突发事件模拟',
- path: '/layout/map/main/pd'
- },
- {
- menuName: '作战图',
- path: '/layout/single/ochart'
- },
+ /* {
+ menuName: '突发事件模拟',
+ path: '/layout/map/main/pd'
+ },
+ {
+ menuName: '作战图',
+ path: '/layout/single/ochart'
+ }, */
]
)
diff --git a/src/pages/single/components/mainMenu.vue b/src/pages/single/components/mainMenu.vue
index d394610..cb7f6ee 100644
--- a/src/pages/single/components/mainMenu.vue
+++ b/src/pages/single/components/mainMenu.vue
@@ -43,14 +43,14 @@
menuName: '救援队伍',
path: '/layout/single/rt'
},
- {
- menuName: '突发事件模拟',
- path: '/layout/map/main/pd'
- },
- {
- menuName: '作战图',
- path: '/layout/single/ochart'
- },
+ /* {
+ menuName: '突发事件模拟',
+ path: '/layout/map/main/pd'
+ },
+ {
+ menuName: '作战图',
+ path: '/layout/single/ochart'
+ }, */
]
)
diff --git a/src/router/index.js b/src/router/index.js
index 071e3a1..b10d9ed 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -89,13 +89,13 @@
},
component: () => import('@/views/pac/index.vue')
},
- {
- path: 'pd',
- meta: {
- title: '突发事件模拟'
- },
- component: () => import('@/views/pd/index.vue')
- },
+ // {
+ // path: 'pd',
+ // meta: {
+ // title: '突发事件模拟'
+ // },
+ // component: () => import('@/views/pd/index.vue')
+ // },
]
},
@@ -135,13 +135,13 @@
},
component: () => import('@/views/rt/index.vue')
},
- {
- path: 'ochart',
- meta: {
- title: '作战图'
- },
- component: () => import('@/views/ochart/index.vue')
- },
+ // {
+ // path: 'ochart',
+ // meta: {
+ // title: '作战图'
+ // },
+ // component: () => import('@/views/ochart/index.vue')
+ // },
]
},
]
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index 010d075..f6323a1 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-10 15:27:59
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-27 14:49:05
+ * @LastEditTime: 2024-12-24 19:36:50
* @FilePath: \bigScreen\src\views\pac\components\box\dataContent.vue
* @Description:
*
@@ -57,8 +57,18 @@
},
{
type: 2,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
+ className: 'ysf-box',
+ },
+ {
+ type: 3,
backgroundIcon: VITE_APP_BASE + 'img/mapicon/ysf.png',
className: 'ysf-box',
+ },
+ {
+ type: 4,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/zb.png',
+ className: 'sk-box',
},
{
type: 5,
@@ -67,32 +77,17 @@
},
{
type: 6,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjb.png',
- className: 'yjb-box',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/kt.png',
+ className: 'sk-box',
},
{
type: 7,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wd.png',
className: 'xfs-box',
},
{
type: 8,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/gouqu.png',
- className: 'xfs-box',
- },
- {
- type: 9,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
- className: 'xfs-box',
- },
- {
- type: 10,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
- className: 'xfs-box',
- },
- {
- type: 11,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/ql.png',
className: 'xfs-box',
}
]
@@ -116,19 +111,19 @@
</div>
`
}
- let divIcon = new DC.DivIcon(
- new DC.Position(i.lng, i.lat, i.ele || 64),
- `<div class="public-map-popup ${divclassName}">
+ let divIcon = new DC.DivIcon(
+ new DC.Position(i.lng, i.lat, i.ele || 64),
+ `<div class="public-map-popup ${divclassName}">
${iconEl}
</div>`
- )
- divIcon.attrParams = i
- let incident = () => { }
+ )
+ divIcon.attrParams = i
+ let incident = () => { }
- if (item.incident) incident = item.incident
- divIcon.on(DC.MouseEventType.CLICK, incident)
- addTileLayers[item.label].addOverlay(divIcon)
- }
+ if (item.incident) incident = item.incident
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addTileLayers[item.label].addOverlay(divIcon)
+ }
})
})
} else {
@@ -140,26 +135,6 @@
}
}
})
-
- if (row.type == 2) {
- EventBus.emit('restHandleCheckChange', `3-3-2`)
- EventBus.emit('restHandleCheckChange', `3-3-4`)
- EventBus.emit('restHandleCheckChange', `3-9`)
- } else {
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
- EventBus.emit('restHandleDelChange', `3-9`)
- }
-
- if (row.type == 3) {
- EventBus.emit('restHandleCheckChange', `3-3-2`)
- EventBus.emit('restHandleCheckChange', `3-3-4`)
- EventBus.emit('restHandleCheckChange', `3-8`)
- } else {
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
- EventBus.emit('restHandleDelChange', `3-8`)
- }
}
const tabClick = (item) => {
--
Gitblit v1.9.3