@@ -300,6 +459,7 @@ export default {
name: "Liner",
data() {
return {
+ show: true,
planNum: 1000,
practicalNum: 1000,
differenceValue: 1000,
@@ -315,12 +475,17 @@ export default {
},
scrollTableData: [],
scrollTableData1: [],
+ scrollTableData2: [],
}
},
mounted() {
- getData().then(e=>{
+ let timeInter = setInterval(() => {
+ this.show = !this.show
+ }, 30 * 1000)
+ getData().then(e => {
this.scrollTableData = e.table2
this.scrollTableData1 = e.table3
+ this.scrollTableData2 = e.table32
this.$refs.chart1.setData({
tooltip: {
trigger: "axis",
@@ -337,7 +502,7 @@ export default {
containLabel: true,
},
legend: {
- data: e.chart5.y.map(val=>val.name),
+ data: e.chart5.y.map(val => val.name),
right: 'center',
top: 0,
textStyle: {
@@ -484,7 +649,7 @@ export default {
},
series: [
{
- name: e.chart3.y.name,
+ name: e.chart3.y.name,
type: "bar",
barWidth: "40%",
label: {
@@ -509,13 +674,13 @@ export default {
borderRadius: 3,
},
},
- data: e.chart3.y.data,
+ data: e.chart3.y.data,
},
],
})
this.$refs.chart3.setData({
legend: {
- data: e.chart6.y.map(val=>val.name),
+ data: e.chart6.y.map(val => val.name),
right: 'center',
top: 0,
textStyle: {
@@ -563,6 +728,7 @@ export default {
},
xAxis: [
{
+ show: false,
type: "category",
axisLine: {
show: true,
@@ -616,9 +782,7 @@ export default {
{
name: e.chart6.y[0].name,
type: "line",
- // smooth: true, //是否平滑
showAllSymbol: true,
- // symbol: 'image://./static/images/guang-circle.png',
symbol: "circle",
symbolSize: 5,
lineStyle: {
@@ -908,4 +1072,47 @@ export default {
width: 68%;
height: 3%;
}
+
+.table1-enter-active {
+ animation: table-in .5s;
+}
+
+.table1-leave-active {
+ animation: table-in .5s reverse;
+}
+
+.table2-enter-active {
+ animation: table-in .5s;
+}
+
+.table2-leave-active {
+ animation: table-in .5s reverse;
+}
+
+@keyframes table-in {
+ 0% {
+ opacity: 0;
+ transform: scale(0);
+ }
+ 100% {
+ opacity: 1;
+ transform: scale(1);
+ }
+}
+
+.supplementInfo {
+ position: absolute;
+ top: 35.5%;
+ left: 73.6%;
+ font-size: 0.7vw;
+ color: #fff;
+}
+
+.supplementInfo1 {
+ position: absolute;
+ top: 59%;
+ left: 73.6%;
+ font-size: 0.7vw;
+ color: #fff;
+}
diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue
index 3b26d51..9722bd2 100644
--- a/src/views/board/liner/index.vue
+++ b/src/views/board/liner/index.vue
@@ -425,6 +425,17 @@ export default {
],
})
this.$refs.chart4.setData({
+ legend: {
+ data: e.liner.foamFixtureState.y.map(val => val.name),
+ right: 'center',
+ top: 0,
+ textStyle: {
+ color: "#fff",
+ },
+ itemWidth: 12,
+ itemHeight: 10,
+ // itemGap: 35
+ },
tooltip: {
trigger: "axis",
axisPointer: {
@@ -469,11 +480,11 @@ export default {
},
axisLabel: {},
},
- series: [
- {
- name: e.liner.foamFixtureState.y.name,
+ series: e.liner.foamFixtureState.y.map(val => {
+ return {
+ name: val.name,
type: "bar",
- barWidth: "30%",
+ barWidth: 100 / (e.liner.foamFixtureState.y.length + 2) + "%",
barMaxWidth: 50,
itemStyle: {
normal: {
@@ -489,9 +500,9 @@ export default {
]),
},
},
- data: e.liner.foamFixtureState.y.data,
- },
- ],
+ data: val.data,
+ }
+ })
})
})
},
@@ -535,8 +546,9 @@ export default {
.title {
position: absolute;
transform: translateY(-50%);
- color: #5db9e8;
- font-size: 0.9vw;
+ color: #dddddd;
+ font-size: 1vw;
+ letter-spacing: 2px;
}
.topNum {
diff --git a/src/views/board/week/index.vue b/src/views/board/week/index.vue
new file mode 100644
index 0000000..49c97d2
--- /dev/null
+++ b/src/views/board/week/index.vue
@@ -0,0 +1,209 @@
+
+
+
综合安全生产平台
+
+ {{ i }}
+
+
+
+
+
+
+
+
<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+