diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/progress.png b/src/assets/bigScreen/progress.png new file mode 100644 index 0000000..ef4136b --- /dev/null +++ b/src/assets/bigScreen/progress.png Binary files differ diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/progress.png b/src/assets/bigScreen/progress.png new file mode 100644 index 0000000..ef4136b --- /dev/null +++ b/src/assets/bigScreen/progress.png Binary files differ diff --git a/src/assets/bigScreen/resource.png b/src/assets/bigScreen/resource.png new file mode 100644 index 0000000..06e1e7e --- /dev/null +++ b/src/assets/bigScreen/resource.png Binary files differ diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/progress.png b/src/assets/bigScreen/progress.png new file mode 100644 index 0000000..ef4136b --- /dev/null +++ b/src/assets/bigScreen/progress.png Binary files differ diff --git a/src/assets/bigScreen/resource.png b/src/assets/bigScreen/resource.png new file mode 100644 index 0000000..06e1e7e --- /dev/null +++ b/src/assets/bigScreen/resource.png Binary files differ diff --git a/src/assets/bigScreen/work.png b/src/assets/bigScreen/work.png new file mode 100644 index 0000000..0a47204 --- /dev/null +++ b/src/assets/bigScreen/work.png Binary files differ diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/progress.png b/src/assets/bigScreen/progress.png new file mode 100644 index 0000000..ef4136b --- /dev/null +++ b/src/assets/bigScreen/progress.png Binary files differ diff --git a/src/assets/bigScreen/resource.png b/src/assets/bigScreen/resource.png new file mode 100644 index 0000000..06e1e7e --- /dev/null +++ b/src/assets/bigScreen/resource.png Binary files differ diff --git a/src/assets/bigScreen/work.png b/src/assets/bigScreen/work.png new file mode 100644 index 0000000..0a47204 --- /dev/null +++ b/src/assets/bigScreen/work.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e40f4c1..4213084 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -24,6 +24,13 @@ default: false, }, /** + * 图形上文本标签颜色 + */ + labelColor: { + type: String, + default: '#09c2f9', + }, + /** * 网格配置 */ grid: { @@ -329,6 +336,12 @@ lineStyle: { width: 2, }, + label: { + show: item.seriesType === 'bar' ? true : false, + position: 'top', + color: props.labelColor, + fontSize: 15, + }, data: item.data, } // 线段颜色 diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/progress.png b/src/assets/bigScreen/progress.png new file mode 100644 index 0000000..ef4136b --- /dev/null +++ b/src/assets/bigScreen/progress.png Binary files differ diff --git a/src/assets/bigScreen/resource.png b/src/assets/bigScreen/resource.png new file mode 100644 index 0000000..06e1e7e --- /dev/null +++ b/src/assets/bigScreen/resource.png Binary files differ diff --git a/src/assets/bigScreen/work.png b/src/assets/bigScreen/work.png new file mode 100644 index 0000000..0a47204 --- /dev/null +++ b/src/assets/bigScreen/work.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e40f4c1..4213084 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -24,6 +24,13 @@ default: false, }, /** + * 图形上文本标签颜色 + */ + labelColor: { + type: String, + default: '#09c2f9', + }, + /** * 网格配置 */ grid: { @@ -329,6 +336,12 @@ lineStyle: { width: 2, }, + label: { + show: item.seriesType === 'bar' ? true : false, + position: 'top', + color: props.labelColor, + fontSize: 15, + }, data: item.data, } // 线段颜色 diff --git a/src/views/bigScreen/components/areaDanger.vue b/src/views/bigScreen/components/areaDanger.vue index 0975a3c..02c1154 100644 --- a/src/views/bigScreen/components/areaDanger.vue +++ b/src/views/bigScreen/components/areaDanger.vue @@ -10,13 +10,6 @@ // 单元安全隐患分类 function fetchAreaDanger() { loading.value = true - // const value = [88, 58, 55, 77, 23, 40, 55] - // const value1 = [10, 20, 34, 5, 44, 55, 1] - // const value2 = [67, 67, 67, 88, 23, 50, 66] - // const value3 = [67, 58, 88, 78, 23, 40, 122] - // safeCatogeryByDeptData.value = [{ name: '有害气体', data: value }, { name: '易燃易爆', data: value1 }, { name: '机械', data: value2 }, { name: '其他', data: value3 }] - // // safeCatogeryByDeptYDataMax.value = Math.max(value) > 10 ? Math.max(value) : 10 - // safeCatogeryByDeptXData.value = ['二部', '201', '203', '283', '23', '25', '706'] getAreaDanger().then((res) => { safeCatogeryByDeptData.value = res.data.yData safeCatogeryByDeptXData.value = res.data.xData @@ -32,14 +25,14 @@ diff --git a/src/assets/bigScreen/chemistry.png b/src/assets/bigScreen/chemistry.png new file mode 100644 index 0000000..91ebaf0 --- /dev/null +++ b/src/assets/bigScreen/chemistry.png Binary files differ diff --git a/src/assets/bigScreen/point.png b/src/assets/bigScreen/point.png new file mode 100644 index 0000000..c4862d0 --- /dev/null +++ b/src/assets/bigScreen/point.png Binary files differ diff --git a/src/assets/bigScreen/progress.png b/src/assets/bigScreen/progress.png new file mode 100644 index 0000000..ef4136b --- /dev/null +++ b/src/assets/bigScreen/progress.png Binary files differ diff --git a/src/assets/bigScreen/resource.png b/src/assets/bigScreen/resource.png new file mode 100644 index 0000000..06e1e7e --- /dev/null +++ b/src/assets/bigScreen/resource.png Binary files differ diff --git a/src/assets/bigScreen/work.png b/src/assets/bigScreen/work.png new file mode 100644 index 0000000..0a47204 --- /dev/null +++ b/src/assets/bigScreen/work.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e40f4c1..4213084 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -24,6 +24,13 @@ default: false, }, /** + * 图形上文本标签颜色 + */ + labelColor: { + type: String, + default: '#09c2f9', + }, + /** * 网格配置 */ grid: { @@ -329,6 +336,12 @@ lineStyle: { width: 2, }, + label: { + show: item.seriesType === 'bar' ? true : false, + position: 'top', + color: props.labelColor, + fontSize: 15, + }, data: item.data, } // 线段颜色 diff --git a/src/views/bigScreen/components/areaDanger.vue b/src/views/bigScreen/components/areaDanger.vue index 0975a3c..02c1154 100644 --- a/src/views/bigScreen/components/areaDanger.vue +++ b/src/views/bigScreen/components/areaDanger.vue @@ -10,13 +10,6 @@ // 单元安全隐患分类 function fetchAreaDanger() { loading.value = true - // const value = [88, 58, 55, 77, 23, 40, 55] - // const value1 = [10, 20, 34, 5, 44, 55, 1] - // const value2 = [67, 67, 67, 88, 23, 50, 66] - // const value3 = [67, 58, 88, 78, 23, 40, 122] - // safeCatogeryByDeptData.value = [{ name: '有害气体', data: value }, { name: '易燃易爆', data: value1 }, { name: '机械', data: value2 }, { name: '其他', data: value3 }] - // // safeCatogeryByDeptYDataMax.value = Math.max(value) > 10 ? Math.max(value) : 10 - // safeCatogeryByDeptXData.value = ['二部', '201', '203', '283', '23', '25', '706'] getAreaDanger().then((res) => { safeCatogeryByDeptData.value = res.data.yData safeCatogeryByDeptXData.value = res.data.xData @@ -32,14 +25,14 @@ diff --git a/src/views/bigScreen/components/dangerCategory.vue b/src/views/bigScreen/components/dangerCategory.vue index 1fbcb55..b62edf2 100644 --- a/src/views/bigScreen/components/dangerCategory.vue +++ b/src/views/bigScreen/components/dangerCategory.vue @@ -1,10 +1,19 @@ diff --git a/src/views/bigScreen/components/dangerCategory.vue b/src/views/bigScreen/components/dangerCategory.vue index 1fbcb55..b62edf2 100644 --- a/src/views/bigScreen/components/dangerCategory.vue +++ b/src/views/bigScreen/components/dangerCategory.vue @@ -1,10 +1,19 @@