diff --git a/src/components/aboutTable/DarkTable.vue b/src/components/aboutTable/DarkTable.vue index 6a5a874..9fb3e08 100644 --- a/src/components/aboutTable/DarkTable.vue +++ b/src/components/aboutTable/DarkTable.vue @@ -130,7 +130,7 @@ const props = defineProps({ default: 180 }, tableHeight: { - type: Number + type: Number || String, }, isScroll: { type: Number, diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 7ed1a4c..89c0043 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -61,11 +61,9 @@ - -
diff --git a/src/views/home/layout/head.vue b/src/views/home/layout/head.vue index 28f6c66..c73c6e4 100644 --- a/src/views/home/layout/head.vue +++ b/src/views/home/layout/head.vue @@ -148,8 +148,8 @@ const store = useStore(); const router = useRouter(); const route = useRoute(); const btns = reactive({ - rightBtn: ["四色预警", "重点人群"], - leftBtn: ["智能布控", '研判首页'], + rightBtn: ["实站支撑", "安全监控"], + leftBtn: ["数据整合", '分析研判'], moreBtn: [ { name: '后台', img: require('@/assets/images/Group427322486.png') }, { name: '退出登录', img: require('@/assets/images/Group427322485.png') }] @@ -185,22 +185,20 @@ const handleBtns = (val) => { btnsActive.value = val; switch (val) { - case "智能布控": - router.push("/DeploymentArea"); + case "数据整合": + router.push("/resourceMonitoring"); break; - case "四色预警": - router.push("/IdentityManage"); + case "实站支撑": + router.push("/InfoCollection"); break; - case "研判首页": + case "分析研判": router.push("/ResearchHome"); break; case "后台": router.push("/editPassword"); break; - case "重点人群": - router.push("/mpvPeo"); - // const NPShref = router.resolve({ path: '/KeyPopulations', query: {}}); - // window.open(NPShref.href, "_blank"); + case "安全监控": + router.push("/BaseLibrary"); break; case "退出登录": store.dispatch("user/logout"); diff --git a/src/views/home/model/warningLevels.vue b/src/views/home/model/warningLevels.vue index 59e54e4..0613814 100644 --- a/src/views/home/model/warningLevels.vue +++ b/src/views/home/model/warningLevels.vue @@ -1,6 +1,6 @@