Skip to content

W
web-monitor
Commit 11816e26 authored by yanzhongrong's avatar yanzhongrong
Browse files
Options

bugfix

parent 498855f3
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 121 deletions
src/views/alarm/cableTime/index.vue
View file @ 11816e26
...@@ -95,60 +95,36 @@ ...@@ -95,60 +95,36 @@
width="30%" width="30%"
center center
> >
<table style="margin: auto" class="device-detail-tb"> <el-row class="flex row_obj">
<tr style="line-height: 50px"> <div class="text_header">基站名称：</div>
<td style="width: 150px"> <div>{{ dialogInfo.siteName }}</div>
<label class="particulars">基站名称：</label> </el-row>
</td> <el-row class="flex row_obj">
<td style="width: 180px; text-align: left"> <div class="text_header">告警对象：</div>
<label v-text="dialogInfo.siteName" /> <div>{{ dialogInfo.alarmTarget }}</div>
</td> </el-row>
</tr> <el-row class="flex row_obj">
<tr style="line-height: 50px"> <div class="text_header">告警级别：</div>
<td style="width: 150px"> <div>{{ dialogInfo.alarmLevelName }}</div>
<label class="particulars">告警对象：</label> </el-row>
</td> <el-row class="flex row_obj">
<td style="width: 180px; text-align: left"> <div class="text_header">告警信息：</div>
<label v-text="dialogInfo.alarmTarget" /> <div>
</td> <div v-for="(item, index) in dialogInfo.alarmInfo" style="font-weight:700;display: block;" :key="index">
</tr>
<tr style="line-height: 50px">
<td style="width: 150px">
<label class="particulars">告警级别：</label>
</td>
<td style="width: 180px; text-align: left">
<label v-text="dialogInfo.alarmLevelName" />
</td>
</tr>
<tr style="line-height: 50px">
<td style="width: 150px">
<label class="particulars">告警信息：</label>
</td>
<td style="width: 180px; text-align: left">
<div v-for="(item, index) in dialogInfo.alarmInfo" style="font-weight:700" :key="index">
<span>距离：{{ item.distance }}</span>&nbsp;&nbsp; <span>距离：{{ item.distance }}</span>&nbsp;&nbsp;
<span>驻波比：{{ item.value }}</span>&nbsp; <span>驻波比：{{ item.value }}</span>&nbsp;
</div> </div>
<div style="font-weight:700">漏缆百米损耗： {{ dialogInfo.lossValue }}</div> <div>漏缆百米损耗： {{ dialogInfo.lossValue }}</div>
</td> </div>
</tr> </el-row>
<tr style="line-height: 50px"> <el-row class="flex row_obj">
<td style="width: 150px"> <div class="text_header">最新上传时间：</div>
<label class="particulars">最新上传时间：</label> <div>{{ dialogInfo.lateUploadTime }}</div>
</td> </el-row>
<td style="width: 180px; text-align: left"> <el-row class="flex row_obj">
<label v-text="dialogInfo.lateUploadTime" /> <div class="text_header">状态变化时间：</div>
</td> <div>{{ dialogInfo.statusTimeChange }}</div>
</tr> </el-row>
<tr style="line-height: 50px">
<td style="width: 150px">
<label class="particulars">状态变化时间：</label>
</td>
<td style="width: 180px; text-align: left">
<label v-text="dialogInfo.statusTimeChange" />
</td>
</tr>
</table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button <el-button
v-if=" v-if="
...@@ -215,7 +191,6 @@ export default { ...@@ -215,7 +191,6 @@ export default {
this.getTableData() this.getTableData()
}, },
created() { created() {
console.log(this.$route.query)
this.searchOption = this.$route.query this.searchOption = this.$route.query
}, },
methods: { methods: {
...@@ -322,6 +297,20 @@ export default { ...@@ -322,6 +297,20 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.row_obj {
text-align: center;
margin-top: 20px;
div {
font-size: 16px;
font-weight: 700;
color: #333333;
}
.text_header {
width: 200px;
font-weight: 700;
color:#666666
}
}
.leakage-cable { .leakage-cable {
.leakage-top { .leakage-top {
margin-bottom: 20px; margin-bottom: 20px;
......
src/views/alarm/device/index.vue
View file @ 11816e26
...@@ -71,40 +71,22 @@ ...@@ -71,40 +71,22 @@
width="30%" width="30%"
center center
> >
<table style="margin: auto" class="device-detail-tb"> <el-row class="flex row_obj">
<tr style="line-height: 50px"> <div class="text_header">网元设备：</div>
<td style="width: 150px"> <div>{{ dialogInfo.startPointDeviceName }}</div>
<label class="particulars">网元设备：</label> </el-row>
</td> <el-row class="flex row_obj">
<td style="width: 180px; text-align: left"> <div class="text_header">连接状态：</div>
<label v-text="dialogInfo.startPointDeviceName"></label> <div>{{ dialogInfo.connectStatusName }}</div>
</td> </el-row>
</tr> <el-row class="flex row_obj">
<tr style="line-height: 50px"> <div class="text_header">网元设备：</div>
<td style="width: 150px"> <div>{{ dialogInfo.endPointDeviceName }}</div>
<label class="particulars">连接状态：</label> </el-row>
</td> <el-row class="flex row_obj">
<td style="width: 180px; text-align: left"> <div class="text_header">上传时间：</div>
<label v-text="dialogInfo.connectStatusName"></label> <div>{{ dialogInfo.uploadTime }}</div>
</td> </el-row>
</tr>
<tr style="line-height: 50px">
<td style="width: 150px">
<label class="particulars">网元设备：</label>
</td>
<td style="width: 180px; text-align: left">
<label v-text="dialogInfo.endPointDeviceName"></label>
</td>
</tr>
<tr style="line-height: 50px">
<td style="width: 150px">
<label class="particulars">上传时间：</label>
</td>
<td style="width: 180px; text-align: left">
<label v-text="dialogInfo.uploadTime"></label>
</td>
</tr>
</table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button <el-button
type="primary" type="primary"
...@@ -278,6 +260,20 @@ export default { ...@@ -278,6 +260,20 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.row_obj {
text-align: center;
margin-top: 20px;
div {
font-size: 16px;
font-weight: 700;
color: #333333;
}
.text_header {
width: 200px;
font-weight: 700;
color:#666666
}
}
.leakage-cable { .leakage-cable {
.leakage-top { .leakage-top {
margin-bottom: 20px; margin-bottom: 20px;
......
src/views/dashboard/api.js
View file @ 11816e26
...@@ -7,6 +7,7 @@ const path = { ...@@ -7,6 +7,7 @@ const path = {
fsuOpen: '/fsu/updateFsu', fsuOpen: '/fsu/updateFsu',
monitorEquipOpen: '/monitorEquip/updateMonitorEquip', monitorEquipOpen: '/monitorEquip/updateMonitorEquip',
leakyCableOpen: '/leakyCable/updateLeakyCable', leakyCableOpen: '/leakyCable/updateLeakyCable',
updateFeeder: '/antennaFeeder/updateFeeder',
getYear: '/sysStandingWaveRatio/getYear', getYear: '/sysStandingWaveRatio/getYear',
getMonth: '/sysStandingWaveRatio/getMonth', getMonth: '/sysStandingWaveRatio/getMonth',
...@@ -30,6 +31,9 @@ export function monitorEquipOpen() { ...@@ -30,6 +31,9 @@ export function monitorEquipOpen() {
export function leakyCableOpen() { export function leakyCableOpen() {
return request.post(path.leakyCableOpen, ...arguments) return request.post(path.leakyCableOpen, ...arguments)
} }
export function updateFeeder() {
return request.post(path.updateFeeder, ...arguments)
}
export function getYear() { export function getYear() {
return request.post(path.getYear, ...arguments) return request.post(path.getYear, ...arguments)
......
src/views/dashboard/components/type5.vue
View file @ 11816e26
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<span>记录信息</span> <span>记录信息</span>
</div> </div>
<div> <div>
<el-row class="text" :gutter="24"> <!-- <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">历史记录</div> <div class="item_name">历史记录</div>
</el-col> </el-col>
...@@ -26,15 +26,21 @@ ...@@ -26,15 +26,21 @@
@click="trendAnalysis" @click="trendAnalysis"
>趋势分析图形</el-button> >趋势分析图形</el-button>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <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="8">
<div class="item_data">{{ form.log.monitor }}条</div> <div class="item_data">{{ form.log.monitor }}条</div>
</el-col> </el-col>
<el-col :span="7" /> <el-col :span="6" />
<el-button
class="picbtn"
type="success"
size="mini"
@click="trendAnalysis"
>趋势分析图形</el-button>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
...@@ -232,12 +238,11 @@ ...@@ -232,12 +238,11 @@
v-if="statusl.length != 0" v-if="statusl.length != 0"
class="item_data levelData" class="item_data levelData"
:style="acolor" :style="acolor"
/> >{{statusl[0].value }}</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-button <el-button
v-if=" v-if="form.status[0].value == '紧急告警' || form.status[0].value == '重要告警' || form.status[0].value == '一般告警'
timeStatus.level == '紧急告警' || timeStatus.level == '重要告警' || timeStatus.level == '一般告警'
" "
class="alarmbtn" class="alarmbtn"
type="primary" type="primary"
...@@ -374,17 +379,17 @@ export default { ...@@ -374,17 +379,17 @@ export default {
}) })
}, },
leakylevelcolor() { leakylevelcolor() {
if (this.timeStatus.level === '正常') { if (this.statusl[0].value === '正常') {
this.acolor.color = 'green' this.acolor.color = 'green'
} else if (this.timeStatus.level === '紧急') { } else if (this.statusl[0].value === '紧急') {
this.acolor.color = '#f00' this.acolor.color = '#f00'
this.timeStatus.level = '紧急告警' this.statusl[0].value = '紧急告警'
} else if (this.timeStatus.level === '重要') { } else if (this.statusl[0].value === '重要') {
this.acolor.color = '#f89850' this.acolor.color = '#f89850'
this.timeStatus.level = '重要告警' this.statusl[0].value = '重要告警'
} else if (this.timeStatus.level === '一般') { } else if (this.statusl[0].value === '一般') {
this.acolor.color = '#ead906' this.acolor.color = '#ead906'
this.timeStatus.level = '一般告警' this.statusl[0].value = '一般告警'
} }
}, },
toalarm() { toalarm() {
...@@ -442,7 +447,7 @@ export default { ...@@ -442,7 +447,7 @@ export default {
} }
.specialCard { .specialCard {
position: absolute; position: absolute;
top: 205px; top: 170px;
} }
.posa { .posa {
position: relative; position: relative;
......
src/views/dashboard/components/type6.vue
View file @ 11816e26
...@@ -222,12 +222,12 @@ ...@@ -222,12 +222,12 @@
v-if="statusl.length != 0" v-if="statusl.length != 0"
class="item_data levelData" class="item_data levelData"
:style="acolor" :style="acolor"
/> >{{statusl[0].value}}</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-button <el-button
v-if=" v-if="
timeStatus.level == '紧急告警' || timeStatus.level == '重要告警' || timeStatus.level == '一般告警' form.status[0].value == '紧急告警' || form.status[0].value == '重要告警' || form.status[0].value == '一般告警'
" "
class="alarmbtn" class="alarmbtn"
type="primary" type="primary"
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="item_data"> <div class="item_data">
{{ form.baseInfo.hundredMetersLoss }} {{ form.baseInfo.feederLossMeters }}
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
<script> <script>
import { DetailMixins } from './mixins' import { DetailMixins } from './mixins'
import { leakyCableOpen } from '../api' import { updateFeeder } from '../api'
import picAnalysis from '@/views/history/leakyCableStatus/components/picAnalysis.vue' import picAnalysis from '@/views/history/leakyCableStatus/components/picAnalysis.vue'
import trendAnalysis from './trendAnalysis.vue' import trendAnalysis from './trendAnalysis.vue'
...@@ -358,22 +358,22 @@ export default { ...@@ -358,22 +358,22 @@ export default {
isOpen: this.form.baseInfo.isOpen, isOpen: this.form.baseInfo.isOpen,
hundredMetersLoss: this.form.baseInfo.hundredMetersLoss hundredMetersLoss: this.form.baseInfo.hundredMetersLoss
} }
leakyCableOpen(params).then((res) => { updateFeeder(params).then((res) => {
this.$message.success('修改成功') this.$message.success('修改成功')
}) })
}, },
leakylevelcolor() { leakylevelcolor() {
if (this.timeStatus.level === '正常') { if (this.form.status[0].value === '正常') {
this.acolor.color = 'green' this.acolor.color = 'green'
} else if (this.timeStatus.level === '紧急') { } else if (this.form.status[0].value === '紧急') {
this.acolor.color = '#f00' this.acolor.color = '#f00'
this.timeStatus.level = '紧急告警' this.form.status[0].value = '紧急告警'
} else if (this.timeStatus.level === '重要') { } else if (this.form.status[0].value === '重要') {
this.acolor.color = '#f89850' this.acolor.color = '#f89850'
this.timeStatus.level = '重要告警' this.form.status[0].value = '重要告警'
} else if (this.timeStatus.level === '一般') { } else if (this.form.status[0].value === '一般') {
this.acolor.color = '#ead906' this.acolor.color = '#ead906'
this.timeStatus.level = '一般告警' this.form.status[0].value = '一般告警'
} }
}, },
toalarm() { toalarm() {
...@@ -381,7 +381,6 @@ export default { ...@@ -381,7 +381,6 @@ export default {
path: '/alarm/cableTime', path: '/alarm/cableTime',
query: { query: {
alarmTargetName: this.form.baseInfo.leakyCableDescribe alarmTargetName: this.form.baseInfo.leakyCableDescribe
} }
}) })
}, },
......
src/views/setting/add/comp/monitorEquip.vue
View file @ 11816e26
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="IP：" prop="ip"> <el-form-item label="IP：" prop="ip">
<el-input v-model="monitorForm.ip" placeholder="请输入设备厂商" /> <el-input v-model="monitorForm.ip" placeholder="请输入IP" />
</el-form-item> </el-form-item>
<el-form-item label="设备类别：" prop="equipType"> <el-form-item label="设备类别：" prop="equipType">
<el-select v-model="monitorForm.equipType" placeholder="请输入设备类别"> <el-select v-model="monitorForm.equipType" placeholder="请输入设备类别">
......
src/views/setting/add/comp/railWay.vue
View file @ 11816e26
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
], ],
totalLong: [ totalLong: [
{ required: true, pattern:/^(([^0][0-9]+|0)\.([0-9]{1,2})$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]{1,5})$)|^(([1-9]+)$)/, message: "请输入整数或小数(小数点后最多5位)", trigger: "blur" }, { required: true, pattern:/^0\.([1-9]|\d[1-9])$|^[1-9]\d{0,7}\.\d{0,2}$|^[1-9]\d{0,7}$/, message: "最大输入8位整数（小数点后最多2位）", trigger: "blur" },
], ],
}, },
}; };
......
src/views/user/userLog/index.vue
View file @ 11816e26
...@@ -77,6 +77,7 @@ export default { ...@@ -77,6 +77,7 @@ export default {
: this.getTableData(); : this.getTableData();
}, },
search(option){ search(option){
this.params.current = 1
this.istrue=1 this.istrue=1
this.searchOption = option this.searchOption = option
this.getTableData() this.getTableData()
......
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