diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index 2961e237..089d8e2f 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -503,7 +503,7 @@ export default { }, splitLine: { - show: false, + show: true, lineStyle: { type: "dashed", //y轴分割线类型 color: "rgba(102,102,102,0.9)", @@ -513,45 +513,6 @@ export default { }, series: [], }, - option2 :{ - color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"], - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'cross', - label: { - backgroundColor: '#6a7985' - } - } - }, - legend: { - data: [] - }, - toolbox: { - feature: { - saveAsImage: {} - } - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true - }, - xAxis: [ - { - type: 'category', - boundaryGap: false, - data: [] - } - ], - yAxis: [ - { - type: 'value' - } - ], - series: [], - }, radarSeriesData: [0, 0, 0, 0, 0], radarOption: { radar: { @@ -829,7 +790,6 @@ export default { { name: "熟料", type: "line", - stack: "Total", smooth: true, lineStyle: { width: 0, @@ -847,7 +807,6 @@ export default { { name: "水泥", type: "line", - stack: "Total", smooth: true, lineStyle: { width: 0, @@ -865,7 +824,6 @@ export default { { name: "出厂水泥", type: "line", - stack: "Total", smooth: true, lineStyle: { width: 0, @@ -951,11 +909,11 @@ export default { let myChart = echarts.init(chartDom); // 初始化各个series数据数组 - let seriesData = new Array(31).fill(0); // 原料车间压缩空气 + // let seriesData = new Array(31).fill(0); // 原料车间压缩空气 let seriesData1 = new Array(31).fill(0); // 原料车间用水 - let seriesData2 = new Array(31).fill(0); // 烧成车间压缩空气 + // let seriesData2 = new Array(31).fill(0); // 烧成车间压缩空气 let seriesData3 = new Array(31).fill(0); // 烧成车间用水 - let seriesData4 = new Array(31).fill(0); // 水泥车间压缩空气 + // let seriesData4 = new Array(31).fill(0); // 水泥车间压缩空气 let seriesData5 = new Array(31).fill(0); // 水泥车间用水 // 定义查询参数的生成函数 @@ -974,10 +932,7 @@ export default { this.$API.enm.enstat.req(query1).then((response) => { response.forEach((item) => { - if (item.mgroup_name === "原料压缩空气") { - let ind = item.day_s - 1; - seriesData[ind] = item.cair_consume || 0; - } else if (item.mgroup_name === "原料车间用水") { + if (item.mgroup_name === "原料车间用水") { let ind = item.day_s - 1; seriesData1[ind] = item.water_consume || 0; } @@ -988,10 +943,7 @@ export default { return this.$API.enm.enstat.req(query2); }).then((response) => { response.forEach((item) => { - if (item.mgroup_name === "烧成压缩空气") { - let ind = item.day_s - 1; - seriesData2[ind] = item.cair_consume || 0; - } else if (item.mgroup_name === "烧成车间用水") { + if (item.mgroup_name === "烧成车间用水") { let ind = item.day_s - 1; seriesData3[ind] = item.water_consume || 0; } @@ -1002,50 +954,58 @@ export default { return this.$API.enm.enstat.req(query3); }).then((response) => { response.forEach((item) => { - if (item.mgroup_name === "水泥压缩空气") { - let ind = item.day_s - 1; - seriesData4[ind] = item.cair_consume || 0; - } else if (item.mgroup_name === "水泥车间用水") { + if (item.mgroup_name === "水泥车间用水") { let ind = item.day_s - 1; seriesData5[ind] = item.water_consume || 0; } }); // 更新图表数据 - option3.series = [ - { - name: '原料压缩空气', - type: 'line', - stack: 'Total', - data: seriesData + option3.legend.data = [ + { + name: "原料车间用水", + textStyle: { + color: "#fff", + }, + borderRadius: 2, + itemStyle: { + color: that.linearGradientColors[0], + }, }, + { + name: "烧成车间用水", + textStyle: { + color: "#fff", + }, + borderRadius: 2, + itemStyle: { + color: that.linearGradientColors[1], + }, + }, + { + name: "水泥车间用水", + textStyle: { + color: "#fff", + }, + borderRadius: 2, + itemStyle: { + color: that.linearGradientColors[2], + }, + }, + ]; + option3.series = [ { name: '原料车间用水', type: 'line', - stack: 'Total', data: seriesData1 }, { - name: '烧成压缩空气', - type: 'line', - stack: 'Total', - data: seriesData2 - }, - { name: '烧成车间用水', type: 'line', - stack: 'Total', data: seriesData3 }, { - name: '水泥压缩空气', - type: 'line', - stack: 'Total', - data: seriesData4 - }, - { name: '水泥车间用水', type: 'line', - stack: 'Total', data: seriesData5 } ] @@ -1310,31 +1270,26 @@ export default { { name: 'f-CaO', type: 'line', - stack: 'Total', data: seriesData }, { name: '立升重', type: 'line', - stack: 'Total', data: seriesData1 }, { name: 'SO3', type: 'line', - stack: 'Total', data: seriesData2 }, { name: '比表面积', type: 'line', - stack: 'Total', data: seriesData3 }, { name: '掺量', type: 'line', - stack: 'Total', data: seriesData4 }, ] diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue index 3e47949f..848c1fd5 100644 --- a/src/views/enm_mill/handoverLog.vue +++ b/src/views/enm_mill/handoverLog.vue @@ -219,7 +219,7 @@ class="numCell" v-if="reportItem.出磨水泥_SO3_rate_pass" > - {{ reportItem.出磨水泥_SO3_rate_pass * 100 }} + {{ (reportItem.出磨水泥_SO3_rate_pass * 100).toFixed(2) }} 0 比表面积合格率(%) @@ -227,7 +227,7 @@ class="numCell" v-if="reportItem.出磨水泥_比表面积_rate_pass" > - {{ reportItem.出磨水泥_比表面积_rate_pass * 100 }} + {{ (reportItem.出磨水泥_比表面积_rate_pass * 100).toFixed(2) }} 0 掺量合格率(%) @@ -235,7 +235,7 @@ class="numCell" v-if="reportItem.出磨水泥_掺量_rate_pass" > - {{ reportItem.出磨水泥_掺量_rate_pass * 100 }} + {{ (reportItem.出磨水泥_掺量_rate_pass * 100).toFixed(2) }} 0