Skip to content

W
web-monitor
Commit b2eb3224 authored by zhongrong.yan's avatar zhongrong.yan
Browse files
Options

Merge branch 'dev_yzr' into 'dev' 

bugfix

See merge request !13
parents 7ebcef20 af690702
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 133 deletions
src/views/dashboard/components/mixins.js
View file @ b2eb3224
...@@ -5,7 +5,6 @@ export const DetailMixins = { ...@@ -5,7 +5,6 @@ export const DetailMixins = {
return { return {
form: {}, form: {},
flag: true, flag: true,
formFunc: null, formFunc: null,
isOpenSelect: [{ isOpenSelect: [{
key: 0, key: 0,
...@@ -15,6 +14,10 @@ export const DetailMixins = { ...@@ -15,6 +14,10 @@ export const DetailMixins = {
key: 1, key: 1,
label: "已开通" label: "已开通"
}], }],
defaultList: [{
name: '设备状态',
value: '正常'
}]
} }
}, },
watch: { watch: {
...@@ -43,13 +46,15 @@ export const DetailMixins = { ...@@ -43,13 +46,15 @@ export const DetailMixins = {
}, },
computed: { computed: {
statusList() { statusList() {
if (this.form.status) { if (this.form.status.length) {
for (let i = 0; i < this.form.status.length; i++) { for (let i = 0; i < this.form.status.length; i++) {
if (i % 2 != 0) { if (i % 2 != 0) {
this.form.status[i].value = this.dateFormat(this.form.status[i].value, 'yyyy-MM-dd HH:mm:ss') this.form.status[i].value = this.dateFormat(this.form.status[i].value, 'yyyy-MM-dd HH:mm:ss')
} }
} }
return this.form.status return this.form.status
} else {
return this.defaultList
} }
} }
}, },
......
src/views/dashboard/components/type1.vue
View file @ b2eb3224
...@@ -50,10 +50,22 @@ ...@@ -50,10 +50,22 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10" class="value_handle" :style="acolor3">{{form.status.connectAlarm}}</el-col> <el-col :span="10" class="value_handle" :style="acolor3">{{
form.status.connectAlarm
}}</el-col>
<el-col :span="10" <el-col :span="10"
><el-button class="alarmbtn" type="primary" size="mini" v-if="form.status.connectAlarm == '告警' || form.status.connectAlarm == '连接异常'" ><el-button
@click="toalarm(form.status.connectAlarm)">处理告警</el-button></el-col> class="alarmbtn"
type="primary"
size="mini"
v-if="
form.status.connectAlarm == '告警' ||
form.status.connectAlarm == '连接异常'
"
@click="toalarm(form.status.connectAlarm)"
>处理告警</el-button
></el-col
>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
...@@ -63,12 +75,24 @@ ...@@ -63,12 +75,24 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10" class="value_handle" :style="acolor">{{form.status.monitorAlarm}}</el-col> <el-col :span="10" class="value_handle" :style="acolor">{{
form.status.monitorAlarm
}}</el-col>
<el-col :span="10" <el-col :span="10"
><el-button class="alarmbtn" type="primary" size="mini" v-if="form.status.monitorAlarm != '正常' && form.status.monitorAlarm != '' && form.status.monitorAlarm != undefined" ><el-button
@click="toalarm(form.status.monitorAlarm)">处理告警</el-button></el-col> class="alarmbtn"
type="primary"
size="mini"
v-if="
form.status.monitorAlarm != '正常' &&
form.status.monitorAlarm != '' &&
form.status.monitorAlarm != undefined
"
@click="toalarm(form.status.monitorAlarm)"
>处理告警</el-button
></el-col
>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -134,9 +158,7 @@ ...@@ -134,9 +158,7 @@
class="savebtn" class="savebtn"
v-if="flag == true" v-if="flag == true"
@click="editbtn()" @click="editbtn()"
><svg-icon ><svg-icon icon-class="edit" /> 编辑</el-button
icon-class="edit"
/> 编辑</el-button
> >
<el-button <el-button
style="float: right; padding: 3px 0; margin-right: 20px" style="float: right; padding: 3px 0; margin-right: 20px"
...@@ -144,9 +166,7 @@ ...@@ -144,9 +166,7 @@
class="savebtn" class="savebtn"
v-else v-else
@click="savebtn()" @click="savebtn()"
><svg-icon ><svg-icon icon-class="save" /> 保存</el-button
icon-class="save"
/> 保存</el-button
> >
</div> </div>
<div> <div>
...@@ -248,26 +268,26 @@ export default { ...@@ -248,26 +268,26 @@ export default {
mixins: [DetailMixins], mixins: [DetailMixins],
data() { data() {
return { return {
colspan:14, colspan: 14,
acolor:{ acolor: {
color:"" color: ""
}, },
acolor3:{ acolor3: {
color:"" color: ""
}, },
}; };
}, },
methods: { methods: {
savebtn() { savebtn() {
this.flag = true; this.flag = true;
let params = { let params = {
id : this.form.baseInfo.id, id: this.form.baseInfo.id,
name: this.form.baseInfo.name, name: this.form.baseInfo.name,
isOpen : this.form.baseInfo.isOpen, isOpen: this.form.baseInfo.isOpen,
startPointName: this.form.baseInfo.startPointName, startPointName: this.form.baseInfo.startPointName,
endPointName: this.form.baseInfo.endPointName, endPointName: this.form.baseInfo.endPointName,
totalLong: this.form.baseInfo.totalLong totalLong: this.form.baseInfo.totalLong
} }
railWayOpen(params).then((res) => { railWayOpen(params).then((res) => {
this.$message.success("修改成功"); this.$message.success("修改成功");
...@@ -277,37 +297,36 @@ export default { ...@@ -277,37 +297,36 @@ export default {
if (this.form.status.monitorAlarm == '正常') { if (this.form.status.monitorAlarm == '正常') {
this.acolor.color = 'green' this.acolor.color = 'green'
} else if (this.form.status.monitorAlarm == '紧急') { } else if (this.form.status.monitorAlarm == '紧急') {
this.acolor.color = '#f00' this.acolor.color = '#f00'
this.form.status.monitorAlarm = '紧急告警' this.form.status.monitorAlarm = '紧急告警'
} else if (this.form.status.monitorAlarm == '重要') { } else if (this.form.status.monitorAlarm == '重要') {
this.acolor.color = '#f89850' this.acolor.color = '#f89850'
this.form.status.monitorAlarm = '重要告警' this.form.status.monitorAlarm = '重要告警'
} else if (this.form.status.monitorAlarm == '一般') { } else if (this.form.status.monitorAlarm == '一般') {
this.acolor.color = '#ead906' this.acolor.color = '#ead906'
this.form.status.monitorAlarm = '一般告警' this.form.status.monitorAlarm = '一般告警'
} }
}, },
waylevelcolor2() { waylevelcolor2() {
if (this.form.status.connectAlarm == '连接正常') { if (this.form.status.connectAlarm == '连接正常') {
this.acolor3.color = 'green' this.acolor3.color = 'green'
} else if (this.form.status.connectAlarm == '连接异常') { } else if (this.form.status.connectAlarm == '连接异常') {
this.acolor3.color = '#f00' this.acolor3.color = '#f00'
this.form.status.connectAlarm = '告警' this.form.status.connectAlarm = '告警'
}
},
toalarm(data) {
let topath = ''
if (data == '告警') {
topath = '/alarm/device'
} else {
topath = '/alarm/cableTime'
} }
},
toalarm(data){
console.log(data);
let topath = ''
if (data == '告警') {
topath = '/alarm/device'
} else{
topath = '/alarm/cableTime'
}
this.$router.push({ this.$router.push({
path: topath, path: topath,
query: { query: {
wayId :this.form.baseInfo.id wayId: this.form.baseInfo.id
}, },
}); });
}, },
...@@ -317,7 +336,7 @@ export default { ...@@ -317,7 +336,7 @@ export default {
return getUserName(); return getUserName();
}, },
}, },
watch: { watch: {
form: { form: {
immediate: true, immediate: true,
handler(newV) { handler(newV) {
......
src/views/dashboard/components/type2.vue
View file @ b2eb3224
...@@ -202,16 +202,16 @@ ...@@ -202,16 +202,16 @@
<div> <div>
<el-row v-for="(item, i) in statusAlarmfun" class="text" :gutter="24"> <el-row v-for="(item, i) in statusAlarmfun" class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">{{ item.name }}</div> <div class="item_name">{{ item.name }}</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="item_data levelData" >{{item.value}}</div> <div class="item_data levelData" >{{item.value}}</div>
</el-col> </el-col>
<el-col :span="6" <el-col :span="6"
><el-button class="alarmbtn" type="primary" size="mini" v-if="item.value == '连接异常' || item.value == '紧急' || item.value == '重要' || item.value == '一般'" ><el-button class="alarmbtn" type="primary" size="mini" v-if="item.value == '连接异常' || item.value == '紧急' || item.value == '重要' || item.value == '一般'"
@click="toalarm(item.value)" >处理告警</el-button @click="toalarm(item.value)" >处理告警</el-button
></el-col ></el-col
> >
</el-row> </el-row>
</div> </div>
...@@ -231,7 +231,12 @@ export default { ...@@ -231,7 +231,12 @@ export default {
return { return {
flag: true, flag: true,
colspan: 14, colspan: 14,
defaultList: [
{
name: '设备状态',
value: '正常'
}
]
}; };
}, },
methods: { methods: {
...@@ -285,6 +290,8 @@ export default { ...@@ -285,6 +290,8 @@ export default {
statusAlarmfun() { statusAlarmfun() {
if (this.form.status) { if (this.form.status) {
return this.form.status; return this.form.status;
} else {
return this.defaultList
} }
}, },
}, },
......
src/views/dashboard/components/type5.vue
View file @ b2eb3224
...@@ -18,9 +18,11 @@ ...@@ -18,9 +18,11 @@
<el-col :span="8"> <el-col :span="8">
<div class="item_data">{{ form.log.all }}条</div> <div class="item_data">{{ form.log.all }}条</div>
</el-col> </el-col>
<el-col :span="6" > <el-col :span="6">
<el-button class="picbtn" type="success" size="mini">趋势分析图形</el-button> <el-button class="picbtn" type="success" size="mini"
</el-col> >趋势分析图形</el-button
>
</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="7">
...@@ -29,8 +31,7 @@ ...@@ -29,8 +31,7 @@
<el-col :span="7"> <el-col :span="7">
<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="7"> </el-col>
</el-col>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
...@@ -46,9 +47,7 @@ ...@@ -46,9 +47,7 @@
class="savebtn" class="savebtn"
v-if="flag == true" v-if="flag == true"
@click="editbtn()" @click="editbtn()"
><svg-icon ><svg-icon icon-class="edit" /> 编辑</el-button
icon-class="edit"
/> 编辑</el-button
> >
<el-button <el-button
style="float: right; padding: 3px 0; margin-right: 20px" style="float: right; padding: 3px 0; margin-right: 20px"
...@@ -56,9 +55,7 @@ ...@@ -56,9 +55,7 @@
class="savebtn" class="savebtn"
v-else v-else
@click="savebtn()" @click="savebtn()"
><svg-icon ><svg-icon icon-class="save" /> 保存</el-button
icon-class="save"
/> 保存</el-button
> >
</div> </div>
<div> <div>
...@@ -225,25 +222,42 @@ ...@@ -225,25 +222,42 @@
</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>
<el-col :span="8"> <el-col :span="8">
<div class="item_data levelData" :style="acolor" v-if="statusl.length!=0">{{ this.statusl[0].value }}</div> <div
class="item_data levelData"
:style="acolor"
v-if="statusl.length != 0"
>
{{ this.statusl[0].value }}
</div>
</el-col>
<el-col :span="6">
<el-button
class="alarmbtn"
type="primary"
size="mini"
v-if="
this.timeStatus.level == '紧急告警' ||
this.timeStatus.level == '重要告警' ||
this.timeStatus.level == '一般告警'
"
@click="toalarm()"
>处理告警</el-button
>
</el-col> </el-col>
<el-col :span="6" >
<el-button class="alarmbtn" type="primary" size="mini"
v-if="this.timeStatus.level == '紧急告警' || this.timeStatus.level == '重要告警' || this.timeStatus.level == '一般告警'"
@click="toalarm()" >处理告警</el-button>
</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="colspan"> <el-col :span="colspan">
<div class="item_data" v-if="statusl.length!=0">{{ this.statusl[1].value }}</div> <div class="item_data" v-if="statusl.length != 0">
{{ this.statusl[1].value }}
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-for="(item, i) in long" class="text" :gutter="24"> <el-row v-for="(item, i) in long" class="text" :gutter="24">
...@@ -270,10 +284,11 @@ ...@@ -270,10 +284,11 @@
{{ form.baseInfo.hundredMetersLoss }} {{ form.baseInfo.hundredMetersLoss }}
</div> </div>
</el-col> </el-col>
<el-col :span="6" > <el-col :span="6">
<el-button class="picbtn" type="success" size="mini" >生成图形</el-button> <el-button class="picbtn" type="success" size="mini"
>生成图形</el-button
</el-col> >
</el-col>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
...@@ -286,85 +301,85 @@ ...@@ -286,85 +301,85 @@
import { DetailMixins } from "./mixins"; import { DetailMixins } from "./mixins";
import { leakyCableOpen } from "../api"; import { leakyCableOpen } from "../api";
export default { export default {
data() { data() {
return { return {
colspan:14, colspan: 14,
acolor:{ acolor: {
color:"" color: ""
}, },
leakyList: [], leakyList: [],
timeStatus: {}, timeStatus: {},
zhubobi:[], zhubobi: [],
long:[], long: [],
statusl:[] statusl: []
}; };
}, },
mixins: [DetailMixins], mixins: [DetailMixins],
methods: { methods: {
savebtn() { savebtn() {
this.flag = true; this.flag = true;
let params = { let params = {
id : this.form.baseInfo.id, id: this.form.baseInfo.id,
isOpen : this.form.baseInfo.isOpen, isOpen: this.form.baseInfo.isOpen,
hundredMetersLoss : this.form.baseInfo.hundredMetersLoss hundredMetersLoss: this.form.baseInfo.hundredMetersLoss
} }
leakyCableOpen(params).then((res) => { leakyCableOpen(params).then((res) => {
this.$message.success("修改成功"); this.$message.success("修改成功");
}); });
}, },
leakylevelcolor() { leakylevelcolor() {
if (this.timeStatus.level == '正常') { if (this.timeStatus.level == '正常') {
this.acolor.color = 'green' this.acolor.color = 'green'
} else if (this.timeStatus.level == '紧急') { } else if (this.timeStatus.level == '紧急') {
this.acolor.color = '#f00' this.acolor.color = '#f00'
this.timeStatus.level = '紧急告警' this.timeStatus.level = '紧急告警'
} else if (this.timeStatus.level == '重要') { } else if (this.timeStatus.level == '重要') {
this.acolor.color = '#f89850' this.acolor.color = '#f89850'
this.timeStatus.level = '重要告警' this.timeStatus.level = '重要告警'
} else if (this.timeStatus.level == '一般') { } else if (this.timeStatus.level == '一般') {
this.acolor.color = '#ead906' this.acolor.color = '#ead906'
this.timeStatus.level = '一般告警' this.timeStatus.level = '一般告警'
} }
}, },
toalarm(){ toalarm() {
this.$router.push({ this.$router.push({
path: "/alarm/cableTime", path: "/alarm/cableTime",
query: { query: {
alarmTargetName : this.form.baseInfo.leakyCableDescribe alarmTargetName: this.form.baseInfo.leakyCableDescribe
}, },
}); });
}, },
trans() { trans() {
let arr1 = [],arr2 = [],arr3 = [] let arr1 = [], arr2 = [], arr3 = []
if (this.statusAlarmfun.length != 0) { if (this.statusAlarmfun.length != 0) {
for(let i=0; i<this.statusAlarmfun.length;i++){ for (let i = 0; i < this.statusAlarmfun.length; i++) {
if (i % 2 != 0) { if (i % 2 != 0) {
if (this.statusAlarmfun[i].name=='最后更新时间') { if (this.statusAlarmfun[i].name == '最后更新时间') {
arr1.push(this.statusAlarmfun[i]) arr1.push(this.statusAlarmfun[i])
} else{ } else {
arr2.push(this.statusAlarmfun[i]) arr2.push(this.statusAlarmfun[i])
} }
} else{ } else {
if (this.statusAlarmfun[i].name=='漏缆状态') { if (this.statusAlarmfun[i].name == '漏缆状态') {
arr1.push(this.statusAlarmfun[i]) arr1.push(this.statusAlarmfun[i])
} else{ } else {
arr3.push(this.statusAlarmfun[i]) arr3.push(this.statusAlarmfun[i])
} }
} }
} }
this.statusl=arr1 this.statusl = arr1
this.zhubobi=arr2 this.zhubobi = arr2
this.long=arr3 this.long = arr3
} }
}, },
}, },
computed: { computed: {
statusAlarmfun() { statusAlarmfun() {
if (this.form.status) { if (this.form.status) {
return this.form.status; return this.form.status;
} }
...@@ -376,7 +391,7 @@ export default { ...@@ -376,7 +391,7 @@ export default {
handler(newV) { handler(newV) {
if (newV) { if (newV) {
this.trans(); this.trans();
this.$nextTick(function () { this.$nextTick(function () {
this.leakylevelcolor(); this.leakylevelcolor();
}); });
} }
......
src/views/dashboard/index.vue
View file @ b2eb3224
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div> <div>
<orgTree ref="tree" style="float:left" @selectItem="selectItem" @defaultSite="defaultSite" @dblClick="dblClick"/> <orgTree ref="tree" style="float:left" @selectItem="selectItem" @defaultSite="defaultSite" @dblClick="dblClick"/>
<div class="ml300"> <div class="ml300">
<type :type="type" :curInfo="curInfo" /> <type v-loading="loading" :type="type" :curInfo="curInfo" />
</div> </div>
</div> </div>
...@@ -21,17 +21,14 @@ export default { ...@@ -21,17 +21,14 @@ export default {
data() { data() {
return { return {
type: 1, type: 1,
curInfo: {} curInfo: {},
loading: false
} }
}, },
components: { components: {
orgTree, orgTree,
Type, Type,
}, },
computed: {
},
mounted() {
},
methods: { methods: {
defaultSite(data){ defaultSite(data){
this.getDetailNode(data) this.getDetailNode(data)
...@@ -59,6 +56,7 @@ export default { ...@@ -59,6 +56,7 @@ export default {
type: this.type, type: this.type,
id: data id: data
} }
this.loading = true
treeBaseInfo(param).then(res => { treeBaseInfo(param).then(res => {
let controlLimit = res.controlLimit || [] let controlLimit = res.controlLimit || []
if(controlLimit) { if(controlLimit) {
...@@ -67,6 +65,7 @@ export default { ...@@ -67,6 +65,7 @@ export default {
}) })
} }
this.curInfo = res this.curInfo = res
this.loading = false
}) })
}, },
} }
......
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