Merge pull request 'fix : 修复气体echarts为空时隐藏' (#338) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/338
This commit is contained in:
@@ -425,25 +425,12 @@ const initChart = (type, values, top) => {
|
||||
//配置项
|
||||
series: [
|
||||
{
|
||||
name: "粉尘",
|
||||
name: values.dustValues.length!==0?"粉尘":"",
|
||||
// data: [
|
||||
// 56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76,
|
||||
// 69, 25, 31, 49, 81, 63,
|
||||
// ],
|
||||
data: values.dustValues,
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
lineStyle: {
|
||||
width: 5,
|
||||
},
|
||||
}, {
|
||||
name: "二氧化碳",
|
||||
// data: [
|
||||
// 56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76,
|
||||
// 69, 25, 31, 49, 81, 63,
|
||||
// ],
|
||||
data: values.carbonDioxideValues,
|
||||
data: values.dustValues.length!==0?values.dustValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
@@ -452,12 +439,26 @@ const initChart = (type, values, top) => {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "一氧化碳",
|
||||
name: values.carbonDioxideValues.length!==0?"二氧化碳":"",
|
||||
// data: [
|
||||
// 56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76,
|
||||
// 69, 25, 31, 49, 81, 63,
|
||||
// ],
|
||||
data: values.carbonDioxideValues.length!==0?values.carbonDioxideValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
lineStyle: {
|
||||
width: 5,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: values.carbonMonoxideValues.length!==0?"一氧化碳":"",
|
||||
// data: [
|
||||
// 96, 38, 75, 10, 62, 81, 41, 27, 69, 16, 33, 57, 73, 87, 22, 46, 11,
|
||||
// 79, 51, 29, 60, 48, 83, 15,
|
||||
// ],
|
||||
data: values.carbonMonoxideValues,
|
||||
data: values.carbonMonoxideValues.length!==0?values.carbonMonoxideValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
@@ -466,12 +467,12 @@ const initChart = (type, values, top) => {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "二氧化氮",
|
||||
name: values.nitrogenDioxideValues.length!==0?"二氧化氮":"",
|
||||
// data: [
|
||||
// 53, 88, 10, 67, 92, 31, 74, 46, 20, 37, 85, 16, 63, 70, 41, 99, 25,
|
||||
// 77, 82, 13, 68, 49, 55, 7, 39,
|
||||
// ],
|
||||
data: values.nitrogenDioxideValues,
|
||||
data: values.nitrogenDioxideValues.length!==0?values.nitrogenDioxideValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
@@ -480,12 +481,12 @@ const initChart = (type, values, top) => {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "一氧化氮",
|
||||
name: values.sulfurMonoxideValues.length!==0?"一氧化氮":"",
|
||||
// data: [
|
||||
// 37, 19, 85, 62, 28, 91, 43, 76, 14, 68, 33, 52, 71, 26, 97, 49, 82,
|
||||
// 17, 66, 30, 78, 55, 23, 47,
|
||||
// ],
|
||||
data: values.sulfurMonoxideValues,
|
||||
data: values.sulfurMonoxideValues.length!==0?values.sulfurMonoxideValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
@@ -494,12 +495,12 @@ const initChart = (type, values, top) => {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "二氧化硫",
|
||||
name: values.sulfurDioxideValues.length!==0?"二氧化硫":"",
|
||||
// data: [
|
||||
// 6, 30, 91, 77, 28, 51, 42, 83, 16, 65, 35, 72, 18, 96, 47, 79, 100,
|
||||
// 23, 80, 44, 62, 59, 13, 86,
|
||||
// ],
|
||||
data: values.sulfurDioxideValues,
|
||||
data: values.sulfurDioxideValues.length!==0?values.sulfurDioxideValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
@@ -508,12 +509,12 @@ const initChart = (type, values, top) => {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "硫化氢",
|
||||
name: values.hydrogenSulfideValues.length!==0?"硫化氢":"",
|
||||
// data: [
|
||||
// 13, 27, 39, 51, 62, 73, 84, 95, 10, 20, 30, 40, 50, 60, 70, 80, 90,
|
||||
// 100, 11, 21, 31, 41, 51,
|
||||
// ],
|
||||
data: values.hydrogenSulfideValues,
|
||||
data: values.hydrogenSulfideValues.length!==0?values.hydrogenSulfideValues:[],
|
||||
type: "line",
|
||||
smooth: true,
|
||||
symbolSize: 24,
|
||||
|
||||
Reference in New Issue
Block a user