diff --git a/src/views/bigScreen/bigScreenLayout.vue b/src/views/bigScreen/bigScreenLayout.vue
index 815960d..f2f5fe8 100644
--- a/src/views/bigScreen/bigScreenLayout.vue
+++ b/src/views/bigScreen/bigScreenLayout.vue
@@ -3,7 +3,7 @@
@@ -12,12 +12,105 @@
@@ -27,7 +120,7 @@ export default {
position: relative;
width: 1920px;
height: 1080px;
- background-color: #0D1049;
+ background-color: #0d1049;
// background-image: url("../img/bg.png");
background-size: cover;
display: flex;
diff --git a/src/views/bigScreen/drivingCabin/left1.vue b/src/views/bigScreen/drivingCabin/left1.vue
index 9ba907b..00eaeb7 100644
--- a/src/views/bigScreen/drivingCabin/left1.vue
+++ b/src/views/bigScreen/drivingCabin/left1.vue
@@ -161,7 +161,7 @@ export default {
titData.push(item.month);
COMPLETEDREVENUE.push(item.COMPLETEDREVENUE);
FORECASTREVENUE.push(item.FORECASTREVENUE);
- TARGETREVENUE.push(item.COMPLETEDREVENUE/item.TARGETREVENUE * 100);
+ TARGETREVENUE.push((item.COMPLETEDREVENUE/item.TARGETREVENUE * 100).toFixed(2));
}
this.setOptions2(titData,COMPLETEDREVENUE,FORECASTREVENUE,TARGETREVENUE)
})
@@ -181,7 +181,7 @@ export default {
},
grid: {
containLabel: true,
- left: 20,
+ left: 30,
right: 10,
top: 30,
bottom: 50,
diff --git a/src/views/bigScreen/drivingCabin/right2.vue b/src/views/bigScreen/drivingCabin/right2.vue
index d3582f0..593fb55 100644
--- a/src/views/bigScreen/drivingCabin/right2.vue
+++ b/src/views/bigScreen/drivingCabin/right2.vue
@@ -74,6 +74,9 @@ export default {
color: '#fff'
},
},
+ tooltip: {
+ trigger: 'axis',
+ },
grid: {
left: '3%',
right: '6%',
diff --git a/src/views/bigScreen/management/center.vue b/src/views/bigScreen/management/center.vue
index 09ef87a..f812362 100644
--- a/src/views/bigScreen/management/center.vue
+++ b/src/views/bigScreen/management/center.vue
@@ -158,7 +158,7 @@ export default {
method: 'get',
params: { type: type }
}).then(res => {
- if (200 == res.code) {
+ if (200 == res.code && res.data) {
this.resData = res.data;
}
})
@@ -327,7 +327,7 @@ export default {
let { list, rate } = res.data;
this.chart2 = echarts.init(this.$refs.chart2, 'macarons')
this.setOptions2(list);
- this.initChart3(rate);
+ this.initChart3(rate);
}
})
@@ -350,20 +350,7 @@ export default {
xAxis: [
{
type: 'category',
- data: [
- '2021-01',
- '2021-02',
- '2021-03',
- '2021-04',
- '2021-05',
- '2021-06',
- '2021-07',
- '2021-08',
- '2021-09',
- '2021-10',
- '2021-11',
- '2021-12',
- ],
+ data: list.map(e=>e.month),
// axisPointer: {
// type: 'shadow',
// },
@@ -411,7 +398,9 @@ export default {
type: 'line',
yAxisIndex: 0,
smooth: false,
- data: [80, 70, 80, 70, 80, 70, 80, 70, 80, 70, 80, 70],
+ //
+ data: list.map(e=>e.rate),
+ // data: [80, 70, 80, 70, 80, 70, 80, 70, 80, 70, 80, 70],
itemStyle: {
color: '#1098FF',
},
@@ -433,6 +422,9 @@ export default {
})
},
initChart3 (rate) {
+ if(!rate) {
+ return;
+ }
this.chart3 = echarts.init(this.$refs.chart3, 'macarons')
this.setOptions3(rate)
},
diff --git a/src/views/bigScreen/management/right1.vue b/src/views/bigScreen/management/right1.vue
index f5fe7ab..484026d 100644
--- a/src/views/bigScreen/management/right1.vue
+++ b/src/views/bigScreen/management/right1.vue
@@ -16,7 +16,7 @@
·总体完成率
- 80%
+ {{rate.comprehensiveRate.toFixed(2) || 0}}%
@@ -203,7 +203,9 @@ export default {
}).then(res => {
if (200 == res.code) {
let { rate, list } = res.data;
- this.rate = rate;
+ if(rate) {
+ this.rate = rate;
+ }
this.chart = echarts.init(this.$refs.chart)
this.chart.setOption({
tooltip: {
diff --git a/src/views/bigScreen/management/right2.vue b/src/views/bigScreen/management/right2.vue
index 41bb3ca..3e047f5 100644
--- a/src/views/bigScreen/management/right2.vue
+++ b/src/views/bigScreen/management/right2.vue
@@ -16,7 +16,7 @@
新签合同额
-
300/{{total.newContractAmount}}
+
{{total.newContractAmount}}
万
diff --git a/src/views/bigScreen/securityManage/center.vue b/src/views/bigScreen/securityManage/center.vue
index e33f087..d249446 100644
--- a/src/views/bigScreen/securityManage/center.vue
+++ b/src/views/bigScreen/securityManage/center.vue
@@ -96,57 +96,32 @@ export default {
},
{
"name": "三级",
- "COUNTNUMBER": 1
+ "COUNTNUMBER": 0
},
{
"name": "一级",
- "COUNTNUMBER": 1
+ "COUNTNUMBER": 0
}
],
sourceLevelCount: [
{
"name": "二级",
- "COUNTNUMBER": 2
+ "COUNTNUMBER": 0
},
{
"name": "三级",
- "COUNTNUMBER": 1
+ "COUNTNUMBER": 0
},
{
"name": "四级",
- "COUNTNUMBER": 1
+ "COUNTNUMBER": 0
},
{
"name": "一级",
- "COUNTNUMBER": 1
+ "COUNTNUMBER": 0
}
],
- points: [
- {
- "id": 1,
- "pointName": "1号大门",
- "deptName": "部门七",
- "level": "一级",
- "status": "运行中",
- "abscissa": "55%",
- "ordinate": "65%",
- "rtmpAddress": "baiddakdnkad",
- "remark": "没有备注",
- "createTime": null
- },
- {
- "id": 2,
- "pointName": "爆炸点",
- "deptName": "人事部",
- "level": "三级",
- "status": "运作中",
- "abscissa": "0.65",
- "ordinate": "0.65",
- "rtmpAddress": "dhuiagduadad",
- "remark": "这是备注",
- "createTime": "2021-12-09 14:32:55"
- }
- ]
+ points: []
}
},
mounted () {
diff --git a/src/views/bigScreen/securityManage/left1.vue b/src/views/bigScreen/securityManage/left1.vue
index 4fe111b..f8a414b 100644
--- a/src/views/bigScreen/securityManage/left1.vue
+++ b/src/views/bigScreen/securityManage/left1.vue
@@ -89,69 +89,10 @@ export default {
},
data () {
return {
- data: [
- { value: 154, name: '类别一' },
- { value: 775, name: '类别二' },
- { value: 679, name: '类别三' },
- { value: 679, name: '类别四' },
- { value: 679, name: '类别五' },
- { value: 679, name: '类别六' },
- { value: 679, name: '类别七' },
- { value: 679, name: '类别八' },
- ],
colorList,
listData: [1, 2, 3, 4,5,6,7,8],
rate: 0,
- points: [
- {
- "id": 1,
- "pointName": "1号大门",
- "deptName": "部门七",
- "level": "一级",
- "status": "运行中",
- "abscissa": "55%",
- "ordinate": "65%",
- "rtmpAddress": "baiddakdnkad",
- "remark": "没有备注",
- "createTime": null
- },
- {
- "id": 2,
- "pointName": "1号大门",
- "deptName": "部门七",
- "level": "一级",
- "status": "运行中",
- "abscissa": "55%",
- "ordinate": "65%",
- "rtmpAddress": "baiddakdnkad",
- "remark": "没有备注",
- "createTime": null
- },
- {
- "id": 3,
- "pointName": "1号大门",
- "deptName": "部门七",
- "level": "一级",
- "status": "运行中",
- "abscissa": "55%",
- "ordinate": "65%",
- "rtmpAddress": "baiddakdnkad",
- "remark": "没有备注",
- "createTime": null
- },
- {
- "id": 4,
- "pointName": "1号大门",
- "deptName": "部门七",
- "level": "一级",
- "status": "运行中",
- "abscissa": "55%",
- "ordinate": "65%",
- "rtmpAddress": "baiddakdnkad",
- "remark": "没有备注",
- "createTime": null
- },
- ],
+ points: [],
flvPlayer: null,
}
},
diff --git a/src/views/bigScreen/securityManage/left2.vue b/src/views/bigScreen/securityManage/left2.vue
index 6596ed8..a93b426 100644
--- a/src/views/bigScreen/securityManage/left2.vue
+++ b/src/views/bigScreen/securityManage/left2.vue
@@ -85,19 +85,7 @@ export default {
colorList,
listData: [1, 2, 3, 4, 5, 6, 7, 8],
- scrollList: [
- {
- "id": 1,
- "month": "2021-01",
- "workshopName": "车间一",
- "dangerContent": "没有灭火器",
- "category": "一类",
- "measures": "已整改",
- "personLiable": "小明",
- "remark": "小明xxx",
- "createTime": null
- },
- ],
+ scrollList: [],
dateRange: [],
chart1: null,