Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety-progress
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
gassafety-progress
Commits
290496fe
Commit
290496fe
authored
Apr 09, 2022
by
纪泽龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
探测器没有高低报之分,只有报警
parent
e0aa2f98
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
13 deletions
+24
-13
permission.js
gassafetyprogress-web/src/permission.js
+2
-0
TopCard.vue
...rationMonitor/monitorData/component/charsData/TopCard.vue
+22
-13
No files found.
gassafetyprogress-web/src/permission.js
View file @
290496fe
...
@@ -14,12 +14,14 @@ router.beforeEach((to, from, next) => {
...
@@ -14,12 +14,14 @@ router.beforeEach((to, from, next) => {
NProgress
.
start
();
NProgress
.
start
();
// 如果cookie里有token
// 如果cookie里有token
if
(
getToken
())
{
if
(
getToken
())
{
/* has token*/
/* has token*/
// 如果要去login,就直接去默认页面
// 如果要去login,就直接去默认页面
if
(
to
.
path
===
"/login"
)
{
if
(
to
.
path
===
"/login"
)
{
next
({
path
:
"/"
});
next
({
path
:
"/"
});
NProgress
.
done
();
NProgress
.
done
();
}
else
{
}
else
{
console
.
log
(
"有"
);
// 如果没有获得当前用户的所有信息
// 如果没有获得当前用户的所有信息
if
(
store
.
getters
.
roles
.
length
===
0
)
{
if
(
store
.
getters
.
roles
.
length
===
0
)
{
// 判断当前用户是否已拉取完user_info信息
// 判断当前用户是否已拉取完user_info信息
...
...
gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/TopCard.vue
View file @
290496fe
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2022-03-25 13:46:23
* @Date: 2022-03-25 13:46:23
* @LastEditTime: 2022-0
3-25 17:18:05
* @LastEditTime: 2022-0
4-09 10:38:14
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData.vue
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData.vue
...
@@ -30,15 +30,27 @@
...
@@ -30,15 +30,27 @@
<div
class=
"middle flex"
>
<div
class=
"middle flex"
>
<div
class=
"first"
>
正常
</div>
<div
class=
"first"
>
正常
</div>
<div>
高爆
</div>
<!-- 2是探测器,探测器只有报警,没有高低报 -->
<div>
低爆
</div>
<template
v-if=
"index != 2"
>
<div>
高报
</div>
<div>
低报
</div>
</
template
>
<
template
v-else
>
<div>
报警
</div>
</
template
>
<div
class=
"last"
>
离线数
</div>
<div
class=
"last"
>
离线数
</div>
</div>
</div>
<div
class=
"bottom flex"
>
<div
class=
"bottom flex"
>
<div
class=
"first"
>
1234
</div>
<div
class=
"first"
>
1234
</div>
<div>
1234
</div>
<!-- 2是探测器,探测器只有报警,没有高低报 -->
<div>
1231
</div>
<
template
v-if=
"index != 2"
>
<div>
123321
</div>
<div>
12321
</div>
</
template
>
<
template
v-else
>
<div>
12312
</div>
</
template
>
<div
class=
"last"
>
534534
</div>
<div
class=
"last"
>
534534
</div>
</div>
</div>
</div>
</div>
...
@@ -49,10 +61,10 @@
...
@@ -49,10 +61,10 @@
<
script
>
<
script
>
export
default
{
export
default
{
name
:
"charsData"
,
name
:
"charsData"
,
props
:{
props
:
{
cardList
:{
cardList
:
{
type
:
Array
,
type
:
Array
,
}
}
,
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -63,9 +75,8 @@ export default {
...
@@ -63,9 +75,8 @@ export default {
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.top-card
{
.top-card
{
margin-bottom
:
22px
;
margin-bottom
:
22px
;
&
>
div
{
&
>
div
{
flex
:
1
;
flex
:
1
;
margin-right
:
20px
;
margin-right
:
20px
;
...
@@ -141,6 +152,4 @@ export default {
...
@@ -141,6 +152,4 @@ export default {
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
}
}
</
style
>
</
style
>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment