|
|
@@ -1113,48 +1113,58 @@
|
|
|
|
|
|
var key = "body5echart"
|
|
|
var dataApi = this.body5data.data;
|
|
|
- var szTimeShow=[]
|
|
|
+ var szTimeShow=[] // 字显示
|
|
|
+ var szTimeShowNum=[] //占多少单元格
|
|
|
dataApi.forEach(item => {
|
|
|
+ var querySz=[]
|
|
|
var sz=[]
|
|
|
- var indexNum=0
|
|
|
+ var szNum=[]
|
|
|
var i=0
|
|
|
var str=""
|
|
|
var error=""
|
|
|
+
|
|
|
+ var indexNum=0
|
|
|
+
|
|
|
item.timeUseList.forEach(item2 => {
|
|
|
|
|
|
|
|
|
Object.keys(item2).forEach(key1 => {
|
|
|
+ querySz.push(key1);
|
|
|
+
|
|
|
if (item2[key1]) {
|
|
|
- if(indexNum==0){
|
|
|
- indexNum=i
|
|
|
-
|
|
|
- str=key1
|
|
|
- }else{
|
|
|
- str=""
|
|
|
-
|
|
|
- var k1=sz[indexNum]
|
|
|
- var k2=k1.split("-")[0]+"-"+key1.split("-")[1]
|
|
|
- sz[indexNum]=k2
|
|
|
- }
|
|
|
+ indexNum++;
|
|
|
|
|
|
+ sz.push("")
|
|
|
+ szNum.push(0)
|
|
|
|
|
|
} else {
|
|
|
- str=""
|
|
|
- indexNum=0
|
|
|
+ if(indexNum!=0){
|
|
|
+
|
|
|
+ var start=querySz[i-indexNum].split("-")[0]
|
|
|
+ var end=querySz[i-1].split("-")[1]
|
|
|
+ szNum[i-1]=indexNum;
|
|
|
+ indexNum=0
|
|
|
+ sz[i-1]=(start+"-"+end)
|
|
|
+ }
|
|
|
+ sz.push("")
|
|
|
+ szNum.push(0)
|
|
|
+
|
|
|
}
|
|
|
|
|
|
});
|
|
|
- sz.push(str)
|
|
|
+
|
|
|
error+=","
|
|
|
i++
|
|
|
})
|
|
|
|
|
|
if(error!=(sz.join()+",")){
|
|
|
szTimeShow.push(sz)
|
|
|
+ szTimeShowNum.push(szNum)
|
|
|
}
|
|
|
+
|
|
|
|
|
|
})
|
|
|
- console.log(szTimeShow)
|
|
|
+ console.log(szTimeShow,szTimeShowNum)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1185,7 +1195,7 @@
|
|
|
Object.keys(item2).forEach(key1 => {
|
|
|
|
|
|
if (item2[key1]) {
|
|
|
- console.log(key1)
|
|
|
+
|
|
|
var ob = [j, i, i,'']
|
|
|
|
|
|
itemList.push(ob)
|
|
|
@@ -1206,7 +1216,8 @@
|
|
|
trigger: 'item',
|
|
|
axisPointer: {
|
|
|
type: 'shadow'
|
|
|
- },
|
|
|
+ },
|
|
|
+
|
|
|
formatter: function(params) {
|
|
|
|
|
|
var result = params.marker + params.name + '点<br/>' + params.seriesName +
|
|
|
@@ -1221,16 +1232,21 @@
|
|
|
// tooltip: {
|
|
|
// //trigger: 'none',
|
|
|
// show: false
|
|
|
- // },
|
|
|
+ // },
|
|
|
+
|
|
|
itemStyle: {
|
|
|
color: colorMap[i % colorMap.length]
|
|
|
- },
|
|
|
+ },
|
|
|
+
|
|
|
+ // 重点：设置较高的 z 值
|
|
|
+
|
|
|
renderItem: function(params, api) {
|
|
|
|
|
|
var xIndex = api.value(0); // x轴索引
|
|
|
var yIndex = api.value(1); // y轴索引
|
|
|
var value = api.value(2); // 值
|
|
|
var showName = szTimeShow[api.value(1)][api.value(0)]; // 值
|
|
|
+ var showNameNum = szTimeShowNum[api.value(1)][api.value(0)]; // 占几个格子
|
|
|
|
|
|
// 获取颜色
|
|
|
var color = colorMap[value % colorMap.length] || '#ffffff';
|
|
|
@@ -1244,7 +1260,7 @@
|
|
|
|
|
|
|
|
|
return {
|
|
|
- type: 'group',
|
|
|
+ type: 'group',
|
|
|
children: [{
|
|
|
type: 'rect',
|
|
|
|
|
|
@@ -1262,15 +1278,14 @@
|
|
|
{
|
|
|
type: 'text',
|
|
|
style: {
|
|
|
- text: "",
|
|
|
- x: x,
|
|
|
- y: y,
|
|
|
+ text: showName,
|
|
|
+ x: x - uni.upx2px(45)*((showNameNum-1)/2),
|
|
|
+ y: y - uni.upx2px(10),
|
|
|
textAlign: 'center',
|
|
|
textBaseline: 'middle',
|
|
|
fill: '#000',
|
|
|
fontSize: 12
|
|
|
},
|
|
|
-
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
@@ -1313,7 +1328,14 @@
|
|
|
},
|
|
|
xAxis: {
|
|
|
type: 'category',
|
|
|
- data: dataTime
|
|
|
+ data: dataTime,
|
|
|
+ axisLabel: {
|
|
|
+ rotate: 40,
|
|
|
+ interval: 0,
|
|
|
+ textStyle: {
|
|
|
+ color: "#333"
|
|
|
+ }
|
|
|
+ },
|
|
|
},
|
|
|
yAxis: {
|
|
|
type: 'category',
|
zhengkaixin