Skip to content

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

bugfix

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