Skip to content

Z
zhxf_vue
Commit 970a1d36 authored by xiexingan's avatar xiexingan
Browse files
Options

Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

parents ecf27e41 476038b8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 387 deletions
src/App.vue
View file @ 970a1d36
......@@ -336,6 +336,7 @@ export default {
})
}).then((data) => {
if (data && data.code === 0) {
console.log('报警信息:', data.list)
this.tipList = data.list
if (this.tipList.length < 4) {
......
src/pages/alarms/untreated/alarm-detail.vue
View file @ 970a1d36
This diff is collapsed.
src/pages/alarms/untreated/index.vue
View file @ 970a1d36
......@@ -7,13 +7,13 @@
div.left_main_body
div.left_col_header 报警处理情况
el-row.row_style()
el-col(:span="8")
el-col(:span="12")
div(style="color:#F56C6C;font-size:18px;font-weight:400;font-family:Microsoft YaHei;") {{status.oneCount}}
div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 未处理
el-col(:span="8")
div(style="color:#E6A23C;font-size:18px;font-weight:400;font-family:Microsoft YaHei;") {{status.twoCount}}
div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 处理中
el-col(:span="8")
//- el-col(:span="8")
//- div(style="color:#E6A23C;font-size:18px;font-weight:400;font-family:Microsoft YaHei;") {{status.twoCount}}
//- div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 处理中
el-col(:span="12")
div(style="color:#409EFF;font-size:18px;font-weight:400;font-family:Microsoft YaHei;") {{status.threeCount}}
div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 已处理
div.left_main_body
......@@ -48,11 +48,11 @@ export default {
activeName: '0',
level: {},
status: {},
chartData: null,
chartData: null
}
},
components: {
QueryList,
QueryList
},
created() {
this.eventList = []
......@@ -69,12 +69,12 @@ export default {
let option = {
tooltip: {
trigger: 'item',
formatter: '{b}: {c} ({d}%)',
formatter: '{b}: {c} ({d}%)'
},
legend: {
orient: 'horizontal',
bottom: 10,
data: ['特别重大', '重大', '一般'],
data: ['特别重大', '重大', '一般']
},
series: [
{
......@@ -87,7 +87,7 @@ export default {
//自定义文字
//return element.name + '：' + element.value + '(' + element.percent + '%)'
return element.percent + '%'
},
}
},
itemStyle: {
normal: {
......@@ -95,15 +95,15 @@ export default {
//自定义颜色
let colorList = ['#F56C6C', '#E6A23C', '#409EFF']
return colorList[params.dataIndex]
},
},
}
}
},
labelLine: {
show: true,
show: true
},
data: this.chartData,
},
],
data: this.chartData
}
]
}
myCharts.setOption(option)
},
......@@ -114,8 +114,8 @@ export default {
url: this.$http.adornUrlAlarm(`/alarmsInfo/queryGroupUntreated`),
method: 'get',
params: this.$http.adornParams({
stationId: localStorage.getItem('stationId'),
}),
stationId: localStorage.getItem('stationId')
})
}).then((data) => {
this.leftLoading = false
if (data && data.code === 0) {
......@@ -125,7 +125,7 @@ export default {
this.chartData = [
{ value: this.level.oneCount, name: '特别重大' },
{ value: this.level.twoCount, name: '重大' },
{ value: this.level.threeCount, name: '一般' },
{ value: this.level.threeCount, name: '一般' }
]
this.groupInit()
}
......@@ -135,8 +135,8 @@ export default {
this.$nextTick(() => {
this.$refs.queryList.init(this.activeName)
})
},
},
}
}
}
</script>
<style lang="scss" scoped>
......
src/pages/alarms/untreated/query-list.vue
View file @ 970a1d36
......@@ -11,11 +11,11 @@
el-option(label="特别重大" value=1)
el-option(label="重大" value=2)
el-option(label="一般" value=3)
el-form-item(v-if="systemType === '0'" label="报警类型:")
el-form-item(label="报警类型:")
el-select(v-model="dataForm.eventType" style="width:150px" placeholder="请选择" clearable)
el-option(v-for="(item,index) in alarmOption" :label="item.eventName" :value="item.id" :key="index")
el-form-item(label="报警状态:")
el-select(v-model="dataForm.status" style="width:150px" placeholder="请选择" clearable)
el-select(v-model="dataForm.status" style="width:100px" placeholder="请选择" clearable)
el-option(label="未处理" value=1)
el-option(label="处理中" value=2)
el-option(label="已处理" value=3)
......@@ -86,17 +86,17 @@ export default {
{ label: '资源点名称', prop: 'resourceName' },
{ label: '发生时间', prop: 'occurrenceTime', slot: true },
{ label: '发生地点', prop: 'occurrenceSite' },
{ label: '处理状态', prop: 'status', slot: true, width: 120 },
{ label: '处理状态', prop: 'status', slot: true, width: 120 }
],
tableOption: {
border: false, //是否边框
maxHeight: 500, //高度
},
maxHeight: 500 //高度
}
}
},
components: {
dragTable,
AlarmDetail,
AlarmDetail
},
watch: {
totalPage() {
......@@ -107,7 +107,7 @@ export default {
this.pageIndex = pages || 1
this.getDataList() //获取表格数据的方法
}
},
}
},
created() {
this.checkList = [...this.tableHeader]
......@@ -136,8 +136,8 @@ export default {
page: this.pageIndex,
rows: this.pageSize,
sort: sort,
order: order,
},
order: order
}
}).then((data) => {
if (data && data.code === 0) {
this.dataList = data.page.rows
......@@ -168,7 +168,7 @@ export default {
this.$http({
url: this.$http.adornUrl(`/linkEvent/list`),
method: 'post',
params: {},
params: {}
}).then((data) => {
if (data && data.code === 0) {
this.alarmOption = data.list
......@@ -199,7 +199,7 @@ export default {
this.$http({
url: this.$http.adornUrlAlarm(`/alarmsInfo/update`),
method: 'post',
data: bean,
data: bean
}).then((data) => {
if (data && data.code === 0) {
this.$message({
......@@ -208,7 +208,7 @@ export default {
duration: 1500,
onClose: () => {
this.getDataList()
},
}
})
} else {
this.$message.error(data.msg)
......@@ -221,8 +221,8 @@ export default {
this.$nextTick(() => {
this.$refs.alarmDetail.init(bean)
})
},
},
}
}
}
</script>
<style lang="scss" scoped>
......
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