From a90cf43e7a1f41dcde401ed1fd118b0f90d7c3f5 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期四, 26 五月 2022 11:41:49 +0800
Subject: [PATCH] 举一反三隐患-存在
---
src/views/chartAnalysis/index.vue | 579 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 356 insertions(+), 223 deletions(-)
diff --git a/src/views/chartAnalysis/index.vue b/src/views/chartAnalysis/index.vue
index cd22bff..e6bea92 100644
--- a/src/views/chartAnalysis/index.vue
+++ b/src/views/chartAnalysis/index.vue
@@ -38,24 +38,30 @@
</el-form-item>
<el-form-item style="margin-left: 30px;">
<el-radio-group v-model="formData.model">
- <el-radio label="1">按隐患单位</el-radio>
- <el-radio label="2">按类别</el-radio>
- <el-radio label="3">按级别</el-radio>
- <el-radio label="4">按检查单位</el-radio>
- <el-radio label="5">按录入单位</el-radio>
- <el-radio label="6">按检查类别</el-radio>
- <el-radio label="7">按当前警情</el-radio>
+ <el-radio label="0">按隐患单位</el-radio>
+ <el-radio label="1">按类别</el-radio>
+ <el-radio label="2">按级别</el-radio>
+ <el-radio label="3">按检查单位</el-radio>
+ <el-radio label="4">按录入单位</el-radio>
+ <el-radio label="5">按检查类别</el-radio>
+ <el-radio label="6">按当前警情</el-radio>
</el-radio-group>
- <el-radio-group v-model="chartType" style="margin-left: 50px;">
+ <el-radio-group v-model="chartType" v-if="!THDB" style="margin-left: 50px;">
<el-radio label="line">曲线图</el-radio>
<el-radio label="pie">饼状图</el-radio>
<el-radio label="column">柱形图</el-radio>
+ </el-radio-group>
+
+ <el-radio-group v-model="timeDes" v-if="THDB" @change="initTHDBTime" style="margin-left: 50px;">
+ <el-radio label="month">月度</el-radio>
+ <el-radio label="quarter">季度</el-radio>
+ <el-radio label="year">年度</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div class="center">
<el-form-item label="已选单位：">
- <el-input autosize v-model="form.name"></el-input>
+ <el-input autosize v-model="form.name"></el-input>
</el-form-item>
<el-form-item autosize label="已选类别：">
<el-input v-model="formData.ht_typesub.join(',')"></el-input>
@@ -72,8 +78,9 @@
<el-form-item label="已选当前警情：">
<el-input v-model="formData.curWarningLevel.join(',')"></el-input>
</el-form-item>
- <el-form-item label="检查时间：" class="time">
+ <el-form-item label="检查时间：" v-if="!THDB" class="time" style="width: 300px">
<el-date-picker
+ style="width: 218px"
v-model="time"
type="daterange"
range-separator="至"
@@ -81,27 +88,64 @@
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
+
+ <el-form-item label="对比时间：" v-if="THDB" class="time" style="width: 340px">
+ <div v-if="timeDes!='quarter'">
+ <el-date-picker
+ v-model="THDBBegin"
+ :type="timeDes"
+ style="width: 40%;float: left"
+ :value-format="timeDes=='month'?'yyyy年MM月':'yyyy年'"
+ :placeholder="timeDes=='month'?'请选择月':'请选择年'">
+ </el-date-picker>
+ <span style="width: 20px">-</span>
+ <el-date-picker
+ v-model="THDBEnd"
+ :type="timeDes"
+ :value-format="timeDes=='month'?'yyyy年MM月':'yyyy年'"
+ style="width: 40%"
+ :placeholder="timeDes=='month'?'请选择月':'请选择年'">
+ </el-date-picker>
+ </div>
+ <div v-if="timeDes=='quarter'">
+
+ <el-quarter-picker v-model="THDBBegin" style="width: 45%" placeholder="选择季度"/>
+ <span style="width: 20px">-</span>
+ <el-quarter-picker v-model="THDBEnd" style="width: 45%" placeholder="选择季度"/>
+ </div>
+
+ </el-form-item>
+
<el-form-item>
<el-button class="btn" size="small" type="primary" @click="getData()"
>汇总
</el-button>
- <el-button class="btn" size="small" type="primary" @click="close()"
+ <el-button v-if="!THDB" class="btn" size="small" type="primary" @click="THDB=true"
>同比环比
</el-button>
</el-form-item>
</div>
</el-form>
</div>
- <div class="whole_bottom">
- <div v-if="chartType == 'pie'" id="pie" style="width: 100%;height: 550px;"></div>
- <div v-if="chartType == 'line'" id="line" style="width: 100%;height: 550px;"></div>
- <div v-if="chartType == 'column'" id="column" style="width: 100%;height: 650px;"></div>
+ <div class="whole_bottom" style="position: relative;z-index: 1">
+ <div id="heigcharts" style="width: 100%;height: 550px;"></div>
+ <!--<div v-if="chartType == 'line'" id="line" style="width: 100%;height: 550px;"></div>-->
+ <!--<div v-if="chartType == 'column'" id="column" style="width: 100%;height: 550px;"></div>-->
+ <div v-if="chartType == 'column'" class="legend">
+ <div class="legend-body">
+
+ <div v-for="(item,index) in this.columnChartData.xList" class="legend-item">
+ <div :class="'legendItemBack'+index"></div>
+ {{ item }}
+ </div>
+ </div>
+ </div>
</div>
</div>
</template>
<script>
import {echarts} from "../../global";
-import {chart_analysis} from "@/api/sgyhpczl/chartAnalysis";
+import {chart_analysis,chart_compare} from "@/api/sgyhpczl/chartAnalysis";
import {
initJCBM,
initYHLX,
@@ -118,6 +162,7 @@
import loadExporting from "highcharts/modules/exporting";
import exportExcel from "highcharts/modules/export-data.src";
import highcharts3d from 'highcharts/highcharts-3d'
+import ElQuarterPicker from "../common/jdSelect";
loadExporting(Highcharts);
exportExcel(Highcharts);
@@ -126,8 +171,11 @@
export default {
name: "index",
+ components: {ElQuarterPicker},
+
data() {
return {
+ value: '',
form: {
name: '众泰煤焦化',
time: '',
@@ -140,7 +188,7 @@
},
formData: {
"echart_type": "line", //line:折线图；column：柱状图；pie :饼状图
- "model": "1", //0：
+ "model": "0", //0：
"beginTime": "", //开始时间
"endTime": "", //结束时间
"ht_typesub": [], //隐患类别
@@ -166,7 +214,12 @@
JCLBList: [],
YHBMList: [],
YHJBList: [],
+ THDB: false,
+ THDBBegin: "",
+ THDBEnd: "",
+ timeDes: "month",
YHZTList: [],
+ columnXData: []
}
},
mounted() {
@@ -178,17 +231,38 @@
this.initLlr()
this.initYHBM()
this.initYHZT()
- this.changeJCDW(0)
+ this.changeJCDW(1)
this.getData()
+ this.initTHDBTime()
},
watch: {
"chartType": function (newVal, oldVal) {
this.formData.echart_type = newVal;
- console.log(this.formData.echart_type)
this.getData();
- }
+ },
+ "formData.model": function (newVal, oldVal) {
+ this.formData.model = newVal;
+ this.getData();
+
+ },
+ // "timeDes": function (newVal, oldVal) {
+ // this.initTHDBTime();
+ // }
},
methods: {
+ initTHDBTime() {
+ var dayStr = this.getCurrentMonthFirst();
+ if (this.timeDes == "month") {
+ this.THDBBegin = dayStr.split("-")[0] + "年" + (parseInt(dayStr.split("-")[1]) - 1) + "月";
+ this.THDBEnd = dayStr.split("-")[0] + "年" + (dayStr.split("-")[1]) + "月";
+ } else if (this.timeDes == "year") {
+ this.THDBBegin = (parseInt(dayStr.split("-")[0]) - 1) + "年";
+ this.THDBEnd = dayStr.split("-")[0] + "年";
+ } else {
+ this.THDBBegin = dayStr.split("-")[0] + "年第1季度";
+ this.THDBEnd = dayStr.split("-")[0] + "年第2季度";
+ }
+ },
initYHLX() {
initYHLX().then(res => {
if (res.data.ok == 1) {
@@ -211,7 +285,6 @@
initReformStatus().then(res => {
if (res.data.ok == 1) {
this.YHZTList = res.data.data
- console.log(this.YHZTList)
} else {
this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
@@ -273,12 +346,6 @@
beta: 0
}
},
- title: {
- text: '众泰煤焦化合隐患单位隐患比例分析',
- style: {
- fontWeight: "bold"
- }
- },
tooltip: {
pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
},
@@ -305,23 +372,72 @@
data: this.pieChartData
}]
}
- Highcharts.chart("pie", option);
+ Highcharts.chart("heigcharts", option);
},
getData() {
this.formData.beginTime = this.time[0]
this.formData.endTime = this.time[1]
+ if(this.THDB) {
+ this.formData.beginTime = this.THDBBegin
+ this.formData.endTime = this.THDBEnd
+ this.formData.compare_type = this.timeDes;
+ }
let requestData = JSON.parse(JSON.stringify(this.formData));
- console.log(requestData)
requestData.ht_typesub = requestData.ht_typesub.join(",")
requestData.level = requestData.level.join(",")
requestData.superior = requestData.superior.join(",")
requestData.checktype = requestData.checktype.join(",")
requestData.curWarningLevel = requestData.curWarningLevel.join(",")
+ if(this.THDB){
+ chart_compare(requestData).then(res=>{
+ let data = res.data;
+ if (data.ok) {
+ this.lineChartData = {}
+ let dataList = [];
+ let timeList = [];
+ if (data.data != null && data.data.length > 0) {
+ data.data[0].forEach(n => {
+ if (timeList.indexOf(n.graph) == -1) {
+ timeList.push(n.graph)
+ }
+ let obj = dataList.find(v => v.name == n.xAxes);
+ if (obj == null) {
+ // obj.data.push(n.counts);
+ obj = {
+ name: n.xAxes,
+ data: [],
+ // type: 'line',
+ // areaStyle: {}
+ }
+ dataList.push(obj)
+ }
+ })
+ timeList.forEach(time => {
+ let singileData = data.data[0].filter(n => n.graph == time)
+ dataList.forEach(n => {
+ let searchData = singileData.find(v => v.xAxes == n.name);
+ if (searchData != null) {
+ n.data.push(parseInt(searchData.yAxes))
+ } else {
+ n.data.push(0)
+ }
+ })
+ })
+ }
+ this.lineChartData.timeList = timeList;
+ this.lineChartData.dataList = dataList;
+ this.initLineChart()
+ }
+ })
+ return;
+ }
+
+
+
chart_analysis(requestData).then(res => {
let data = res.data;
if (data.ok) {
- console.log(this.formData.echart_type)
if (this.formData.echart_type == "column") {
this.columnChartData = {};
let xList = [];
@@ -331,18 +447,24 @@
xList.push(n.graph);
let singleData = {
"name": n.graph,
- "type": 'bar',
- "label": "labelOption",
- "emphasis": {
- focus: 'series'
- },
- "data": [n.yAxes]
+ // "type": 'bar',
+ // "label": "labelOption",
+ // "emphasis": {
+ // focus: 'series'
+ // },
+ "data": [parseInt(n.yAxes)]
}
- dataList.push(singleData);
+ dataList.push(parseInt(n.yAxes));
})
}
this.columnChartData.xList = xList;
- this.columnChartData.dataList = dataList;
+ this.columnChartData.dataList = []
+ this.columnChartData.dataList.push(
+ {
+ data: dataList,
+ colorByPoint: true
+ }
+ );
this.initCloumnChart()
} else if (this.formData.echart_type == "line") {
this.lineChartData = {}
@@ -359,8 +481,8 @@
obj = {
name: n.catalogy,
data: [],
- type: 'line',
- areaStyle: {}
+ // type: 'line',
+ // areaStyle: {}
}
dataList.push(obj)
}
@@ -370,7 +492,7 @@
dataList.forEach(n => {
let searchData = singileData.find(v => v.catalogy == n.name);
if (searchData != null) {
- n.data.push(searchData.counts)
+ n.data.push(parseInt(searchData.counts))
} else {
n.data.push(0)
}
@@ -379,7 +501,6 @@
}
this.lineChartData.timeList = timeList;
this.lineChartData.dataList = dataList;
- console.log(this.lineChartData)
this.initLineChart()
} else {
this.pieChartData = []
@@ -438,204 +559,122 @@
// 折线图
var chartDom = document.getElementById('line');
// var chartDom = document.getElementById('myChart');
- var myChart = echarts.init(chartDom);
+ // var myChart = echarts.init(chartDom);
+ // var option = {
+ // title: {
+ // text: '众泰煤焦化各隐患单位隐患走势分析',
+ // left: 'center'
+ // },
+ // legend: {
+ // bottom: 0,
+ // // textStyle: {
+ // // color: '#ffffff'
+ // // },
+ // },
+ // grid: {
+ // left: '3%',
+ // right: '4%',
+ // bottom: '5%',
+ // containLabel: true
+ // },
+ // xAxis: {
+ // type: 'category',
+ // boundaryGap: false,
+ // data: this.lineChartData.timeList
+ // // data: ['2022-05-01', '', '2022-05-03', '', '2022-05-05', '', '2022-05-07', '', '2022-05-09', '', '2022-05-11']
+ // },
+ // yAxis: {
+ // type: 'value'
+ // },
+ // color: ['#9a0202', '#02cccc', '#0202ff', '#ff9a02', '#02ff02', '#CC02CCFF', '#35FF02FF', '#CCFF67FF', '#35CC67FF', '#9A0202FF'],
+ // series: this.lineChartData.dataList
+ // // series: [
+ // // {
+ // // name: '电仪车间',
+ // // data: [50, 35, 63, 64, 79, 95, 104, 50, 35, 63, 64],
+ // // type: 'line',
+ // // areaStyle: {}
+ // // }
+ // // ]
+ // }
+ // // 使用刚指定的配置项和数据显示图表。
+ // myChart.setOption(option)
+
var option = {
+ chart: {
+ type: 'area'
+ },
title: {
- text: '众泰煤焦化各隐患单位隐患走势分析',
- left: 'center'
- },
- legend: {
- bottom: 0,
- // textStyle: {
- // color: '#ffffff'
- // },
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '5%',
- containLabel: true
- },
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: this.lineChartData.timeList
- // data: ['2022-05-01', '', '2022-05-03', '', '2022-05-05', '', '2022-05-07', '', '2022-05-09', '', '2022-05-11']
+ text: '众泰煤焦化各隐患单位隐患走势分析'
},
yAxis: {
- type: 'value'
+ title: {
+ enabled: false
+ }
},
- color: ['#9a0202', '#02cccc', '#0202ff', '#ff9a02', '#02ff02', '#CC02CCFF', '#35FF02FF', '#CCFF67FF', '#35CC67FF', '#9A0202FF'],
- series: this.lineChartData.dataList
- // series: [
- // {
- // name: '电仪车间',
- // data: [50, 35, 63, 64, 79, 95, 104, 50, 35, 63, 64],
- // type: 'line',
- // areaStyle: {}
- // }
- // ]
+ colors: ['#9a0202', '#02cccc', '#0202ff', '#ff9a02', '#02ff02', '#CC02CCFF', '#35FF02FF', '#CCFF67FF', '#35CC67FF', '#9A0202FF'],
+ legend: {
+ align: "center", //程度标的目标地位
+ verticalAlign: "bottom",//垂直标的目标地位
+ x: 0, //间隔x轴的间隔
+ y: 0 //间隔Y轴的间隔
+ },
+ xAxis: {
+ // type: 'category',
+ // boundaryGap: false,
+ categories: this.lineChartData.timeList,
+ // data: ['2022-05-01', '', '2022-05-03', '', '2022-05-05', '', '2022-05-07', '', '2022-05-09', '', '2022-05-11']
+ },
+ series: this.lineChartData.dataList,
+ exporting: {
+ enabled: false //去掉右上角
+ },
+ credits: {
+ enabled: false //不显示LOGO
+ },
}
- // 使用刚指定的配置项和数据显示图表。
- myChart.setOption(option)
+ Highcharts.chart("heigcharts", option);
},
initCloumnChart() {
- // 柱形图
- var chartDom = document.getElementById('column');
- var myChart = echarts.init(chartDom);
- var option;
- const posList = [
- 'left',
- 'right',
- 'top',
- 'bottom',
- 'inside',
- 'insideTop',
- 'insideLeft',
- 'insideRight',
- 'insideBottom',
- 'insideTopLeft',
- 'insideTopRight',
- 'insideBottomLeft',
- 'insideBottomRight'
- ];
- app.configParameters = {
- rotate: {
- min: -90,
- max: 90
+
+ var option = {
+ chart: {
+ type: 'column',
+ marginBottom: 70
},
- align: {
- options: {
- left: 'left',
- center: 'center',
- right: 'right'
+ title: {
+ text: null
+ },
+ yAxis: {
+ title: {
+ enabled: false
}
},
- verticalAlign: {
- options: {
- top: 'top',
- middle: 'middle',
- bottom: 'bottom'
- }
- },
- position: {
- options: posList.reduce(function (map, pos) {
- map[pos] = pos;
- return map;
- }, {})
- },
- distance: {
- min: 0,
- max: 100
- }
- };
- app.config = {
- rotate: 90,
- align: 'left',
- verticalAlign: 'middle',
- position: 'insideBottom',
- distance: 15,
- onChange: function () {
- const labelOption = {
- rotate: app.config.rotate,
- align: app.config.align,
- verticalAlign: app.config.verticalAlign,
- position: app.config.position,
- distance: app.config.distance
- };
- myChart.setOption({
- series: [
- {
- label: labelOption
- },
- {
- label: labelOption
- },
- {
- label: labelOption
- },
- {
- label: labelOption
- }
- ]
- });
- }
- };
- const labelOption = {
- show: false,
- position: app.config.position,
- distance: app.config.distance,
- align: app.config.align,
- verticalAlign: app.config.verticalAlign,
- rotate: app.config.rotate,
- formatter: '{c} {name|{a}}',
- fontSize: 16,
- rich: {
- name: {}
- }
- };
- console.log(this.columnChartData)
- this.columnChartData.dataList.forEach(n => {
- n.label = labelOption;
- })
- option = {
tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow'
+ formatter: function () {
+ return this.x + " : " + this.y
}
},
+ colors: ['#ff6600', '#fcd202', '#b0de09', '#0289cc', '#2001cd', '#cd0d74', '#cc0000', '#00cc00', '#0000cc', '#dddddd', '#999999', '#333333', '#990000', '#92e3d4', '#f09aea'],
legend: {
- bottom: 0,
- data: this.columnChartData.xList
- // data: ['安全环保部', '电仪车间', '干熄焦', '工程部','化产二车间', '化产一车间', '机电部', '炼焦二车间','炼焦一车间', '生产技术部', '消防保卫部', '选煤厂', '原料二车间', '原料一车间', '众和机电']
+ enabled: false,
},
- grid: {
- left: '3%',
- right: '4%',
- containLabel: true
+ xAxis: {
+ // type: 'category',
+ // boundaryGap: false,
+ categories: this.columnChartData.xList,
+ max: this.columnChartData.xList.length - 1
+ // data: ['2022-05-01', '', '2022-05-03', '', '2022-05-05', '', '2022-05-07', '', '2022-05-09', '', '2022-05-11']
},
- // toolbox: {
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true }
- // }
- // },
- xAxis: [
- {
- type: 'category',
- axisTick: {show: false},
- data: this.columnChartData.xList
- // data: ['2012', '2013', '2014', '2015', '2016']
- }
- ],
- yAxis: [
- {
- type: 'value'
- }
- ],
- series: this.columnChartData.dataList
- // series: [
- // {
- // name: '安全环保部',
- // type: 'bar',
- // label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: [320]
- // }
- // ]
- };
- // 使用刚指定的配置项和数据显示图表。
- myChart.setOption(option)
+ series: this.columnChartData.dataList,
+ exporting: {
+ enabled: false //去掉右上角
+ },
+ credits: {
+ enabled: false //不显示LOGO
+ },
+ }
+ Highcharts.chart("heigcharts", option);
},
getCurrentMonthFirst() {
var date = new Date();
@@ -675,6 +714,96 @@
</script>
<style scoped>
+.legend {
+ position: absolute;
+ bottom: 10px;
+ z-index: 2;
+ width: 100%;
+}
+
+.legend-body {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ flex-wrap: wrap;
+ font-size: 12px;
+ height: 100%;
+}
+
+.legend-item {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-left: 20px;
+ line-height: 1.5;
+}
+
+.legend-item div {
+ width: 20px;
+ height: 15px;
+ margin-right: 10px;
+}
+
+.legendItemBack0 {
+ background-color: #ff6600;
+}
+
+.legendItemBack1 {
+ background-color: #fcd202;
+}
+
+.legendItemBack2 {
+ background-color: #b0de09;
+}
+
+.legendItemBack3 {
+ background-color: #0289cc;
+}
+
+.legendItemBack4 {
+ background-color: #2001cd;
+}
+
+.legendItemBack5 {
+ background-color: #cd0d74;
+}
+
+.legendItemBack6 {
+ background-color: #cc0000;
+}
+
+.legendItemBack7 {
+ background-color: #00cc00;
+}
+
+.legendItemBack8 {
+ background-color: #0000cc;
+}
+
+.legendItemBack9 {
+ background-color: #dddddd;
+}
+
+.legendItemBack10 {
+ background-color: #999999;
+}
+
+.legendItemBack11 {
+ background-color: #333333;
+}
+
+.legendItemBack12 {
+ background-color: #990000;
+}
+
+.legendItemBack13 {
+ background-color: #92e3d4;
+}
+
+.legendItemBack14 {
+ background-color: #f09aea;
+}
+
.top {
padding: 10px 5px;
background: #e4edf4;
@@ -780,4 +909,8 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
+
+>>> .center .time[data-v-21f55eb3] .el-input__inner {
+ width: 100px;
+}
</style>
--
Gitblit v1.9.2