From 8864275e133d2c473e42920c21107f5ebf6ca698 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 14 十月 2022 10:25:31 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/loginPage/loginPage.vue | 10 ++++++++--
src/router/route.ts | 8 ++++++++
src/views/newHome/index.vue | 8 ++++----
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/router/route.ts b/src/router/route.ts
index a0eed32..46504d1 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -95,5 +95,13 @@
meta: {
title: 'spi报告详情'
}
+ },
+ {
+ path: '/screenPage',
+ name: 'screenPage',
+ component: () => import('/@/views/riskWarningSys/warningBigScreen/indexs/index.vue'),
+ meta: {
+ title: '预警预报'
+ }
}
];
diff --git a/src/views/loginPage/loginPage.vue b/src/views/loginPage/loginPage.vue
index 46d3311..14d69e8 100644
--- a/src/views/loginPage/loginPage.vue
+++ b/src/views/loginPage/loginPage.vue
@@ -26,7 +26,7 @@
</div>
</el-col>
</el-row>
- <div class="rights">技术支持:苏州国科鸿宇智能科技有限公司</div>
+ <div class="rights">技术支持:苏州国科鸿宇智能科技有限公司<br/><span>GTXH Intelligent Security Management System V1.0.1</span></div>
</div>
</template>
@@ -130,10 +130,16 @@
left: 0;
}
.rights {
- font-size: 16px;
+ font-size: 1.2rem;
color: #fff;
position: absolute;
bottom: 30px;
+ text-align: center;
+
+ span{
+ font-size: 1rem;
+ color: #eee;
+ }
}
.loginContent {
width: 100%;
diff --git a/src/views/newHome/index.vue b/src/views/newHome/index.vue
index 339854e..32c2772 100644
--- a/src/views/newHome/index.vue
+++ b/src/views/newHome/index.vue
@@ -327,10 +327,10 @@
};
// 去风险大屏
const toRiskPlatform = () => {
- router.push({
- name: "warningScreen"
- });
- // window.open('http://39.104.85.193:8585/');
+ // router.push({
+ // name: "warningScreen"
+ // });
+ window.open('http://39.104.85.193:8585/');
};
const throttle = (renderMenu: any, delay: number) => {
let flag = true;
--
Gitblit v1.9.2