Skip to content

W
web-monitor
Commit 243aafee authored by yanzhongrong's avatar yanzhongrong
Browse files
Options

bugfix

parent d412a7ee
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 6 deletions
public/index.html
View file @ 243aafee
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title> <title>RX100R 漏缆故障定位监测系统</title>
</head> </head>
<body> <body>
<noscript> <noscript>
......
src/views/dashboard/components/type5.vue
View file @ 243aafee
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
<div> <div>
<el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="7"> <el-col :span="10">
<div class="item_name">历史记录</div> <div class="item_name">历史记录</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="7"> <el-col :span="10">
<div class="item_name">维修记录</div> <div class="item_name">维修记录</div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
......
src/views/history/leakyCableRepair/index.vue
View file @ 243aafee
...@@ -41,7 +41,16 @@ ...@@ -41,7 +41,16 @@
width="150" width="150"
align="center" align="center"
/> />
<el-table-column prop="alarmInfo" label="告警信息" align="center"/> <el-table-column prop="alarmInfo" label="告警信息" align="center">
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.alarmInfo" :key="index" :class="levelStyle[item.level]">
<span>距离：{{ item.distance }}</span>&nbsp;&nbsp;
<span>驻波比：{{ item.value }}</span><br/>
</div>
<div>漏缆百米损耗： {{ scope.row.lossValue }}</div>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="alarmMaintainTime" prop="alarmMaintainTime"
label="告警维修时间" label="告警维修时间"
...@@ -63,6 +72,7 @@ import search from './components/search.vue' ...@@ -63,6 +72,7 @@ import search from './components/search.vue'
import download from '@/utils/download' import download from '@/utils/download'
import { exportLeakyMaintainHistory } from '@/api/export' import { exportLeakyMaintainHistory } from '@/api/export'
import { successAlert, warningAlert } from '@/utils/alert' import { successAlert, warningAlert } from '@/utils/alert'
import { levelStyle } from '@/const/index'
export default { export default {
components: { components: {
search search
...@@ -80,7 +90,8 @@ export default { ...@@ -80,7 +90,8 @@ export default {
isQuery: false, isQuery: false,
istrue: 0, istrue: 0,
searchOption: {}, searchOption: {},
exids: [] exids: [],
levelStyle
} }
}, },
mounted() { mounted() {
...@@ -113,6 +124,10 @@ export default { ...@@ -113,6 +124,10 @@ export default {
} }
MonitorMaintainList(params).then((res) => { MonitorMaintainList(params).then((res) => {
let list = res.records || [] let list = res.records || []
list.forEach(item => {
item.alarmInfo = JSON.parse(item.alarmInfo)
item.lossValue = eval(item.alarmInfo.map(k => k.lossValue).join('+'))
})
this.tableData = list this.tableData = list
this.total = res.total this.total = res.total
this.exids = list.map((i) => i.id) this.exids = list.map((i) => i.id)
......
src/views/history/leakyCableStatus/components/picAnalysis.vue
View file @ 243aafee
...@@ -78,6 +78,7 @@ export default { ...@@ -78,6 +78,7 @@ export default {
finallyList.length ? this.getLine(finallyList) : '' finallyList.length ? this.getLine(finallyList) : ''
} else { } else {
this.title = '' this.title = ''
this.listData = []
} }
}) })
}, },
......
src/views/user/updateUser/components/baseInfo.vue
View file @ 243aafee
<template> <template>
<div> <div>
<div class="title">修改基本信息</div> <div class="title">修改基本信息</div>
<el-form ref="form" :model="form" label-width="100px" :rules="rules"> <el-form ref="form" :model="form" label-width="130px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName">
<el-input v-model="form.userName" /> <el-input v-model="form.userName" />
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment