Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
L
laravelzh
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
冯超鹏
laravelzh
Commits
977a91e4
Commit
977a91e4
authored
4 years ago
by
Administrator
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/fire_monitor'
parents
a000decf
b3e93631
Pipeline
#253
failed with stage
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
fire.vue
resources/js/views/monitor/fire.vue
+2
-2
No files found.
resources/js/views/monitor/fire.vue
View file @
977a91e4
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
<span>
{{
shutoffDevice
(
scope
.
row
.
shutoff_type
)
}}
</span>
<span>
{{
shutoffDevice
(
scope
.
row
.
shutoff_type
)
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
align=
"center"
label=
"检测值"
width=
"100"
>
<
!-- <
el-table-column align="center" label="检测值" width="100">
<template slot-scope="scope">
<template slot-scope="scope">
<span>{{ scope.row.nd }}</span>
<span>{{ scope.row.nd }}</span>
</template>
</template>
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
<template slot-scope="scope">
<template slot-scope="scope">
<span>{{ scope.row.danwei }}</span>
<span>{{ scope.row.danwei }}</span>
</template>
</template>
</el-table-column>
</el-table-column>
-->
<el-table-column
align=
"center"
label=
"切断装置状态"
width=
"80"
>
<el-table-column
align=
"center"
label=
"切断装置状态"
width=
"80"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
<span>
...
...
This diff is collapsed.
Click to expand it.
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