diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue
index 3b8ca33a..50b838f2 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue
@@ -16,7 +16,9 @@
-
+
+
+
@@ -75,5 +77,8 @@ export default {
}
}
}
+ .content {
+ height: calc(100% - 84px);
+ }
}
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue
index 2d66f149..62d30fd1 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue
@@ -1,7 +1,7 @@
- hello
+
@@ -9,8 +9,9 @@
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
index 1c88d2fa..ed48d0b3 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
@@ -12,6 +12,10 @@ export default {
text: ''
})
},
+ tooltip: {
+ type: Object,
+ default: () => ({ show: false })
+ },
grid: {
type: Array,
default: () => ['15%', '2%', '2%', '2%']
@@ -43,7 +47,7 @@ export default {
},
methods: {
createChart() {
- const { title, grid, color, xData, yData, series } = this
+ const { title, tooltip, grid, color, xData, yData, series } = this
const configSeries = (series => {
if (series.length) {
return series.map(item => ({ data: item.data, type: 'bar', barWidth: 15 }))
@@ -62,6 +66,7 @@ export default {
fontWeight: 'normal'
}
},
+ tooltip,
grid: {
top: grid[0],
right: grid[1],