Commit 2012c653 authored by 张牧越's avatar 张牧越

bugfix

parent f76910a0
No preview for this file type
...@@ -326,7 +326,7 @@ export function getFallWarningList() { ...@@ -326,7 +326,7 @@ export function getFallWarningList() {
export function getFallWarningStatus() { export function getFallWarningStatus() {
return request({ return request({
url: '/pweb/s/linbian/statistics', url: '/pweb/s/linbian/warning/statistics',
method: 'get', method: 'get',
}) })
......
...@@ -437,16 +437,17 @@ export default { ...@@ -437,16 +437,17 @@ export default {
) { ) {
stepLength *= -1; // 转换方向 stepLength *= -1; // 转换方向
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -463,16 +463,17 @@ export default { ...@@ -463,16 +463,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -325,16 +325,17 @@ export default { ...@@ -325,16 +325,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -389,16 +389,17 @@ export default { ...@@ -389,16 +389,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<img class="smallcontainer" src="@/assets/noise/temp.png" alt="" /> <img class="smallcontainer" src="@/assets/noise/temp.png" alt="" />
</div> </div>
<div class="humidity"> <div class="humidity">
<div class="text">湿度/</div> <div class="text">湿度/%</div>
<div class="value" style="color: #22c3ed"> <div class="value" style="color: #22c3ed">
{{ currentMonitorStatis.humidity }} {{ currentMonitorStatis.humidity }}
</div> </div>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
/> />
</div> </div>
<div class="windangle"> <div class="windangle">
<div class="text">风向</div> <div class="text">风向</div>
<div class="value" style="color: #cc43b7"> <div class="value" style="color: #cc43b7">
{{ currentMonitorStatis.wind_direction }} {{ currentMonitorStatis.wind_direction }}
</div> </div>
...@@ -578,16 +578,17 @@ export default { ...@@ -578,16 +578,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
<div class="chart-angle"> <div class="chart-angle">
<div class="chart-title">项目自查</div> <div class="chart-title">项目自查</div>
<div <div
class="chart-background"
style=" style="
display: flex; display: flex;
height: calc(100% - 30px); height: calc(100% - 30px);
...@@ -133,12 +134,6 @@ ...@@ -133,12 +134,6 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
background: linear-gradient(
90deg,
rgba(39, 172, 251, 0.05) 0%,
rgba(39, 172, 251, 0) 50%,
rgba(39, 172, 251, 0.05) 100%
);
" "
> >
<div style="display: flex"> <div style="display: flex">
...@@ -175,6 +170,7 @@ ...@@ -175,6 +170,7 @@
<div class="chart-angle"> <div class="chart-angle">
<div class="chart-title">企业检查</div> <div class="chart-title">企业检查</div>
<div <div
class="chart-background"
style=" style="
display: flex; display: flex;
height: calc(100% - 30px); height: calc(100% - 30px);
...@@ -182,12 +178,6 @@ ...@@ -182,12 +178,6 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
background: linear-gradient(
90deg,
rgba(39, 172, 251, 0.05) 0%,
rgba(39, 172, 251, 0) 50%,
rgba(39, 172, 251, 0.05) 100%
);
" "
> >
<div style="display: flex"> <div style="display: flex">
...@@ -224,6 +214,7 @@ ...@@ -224,6 +214,7 @@
<div class="chart-angle"> <div class="chart-angle">
<div class="chart-title">监督检测</div> <div class="chart-title">监督检测</div>
<div <div
class="chart-background"
style=" style="
display: flex; display: flex;
height: calc(100% - 30px); height: calc(100% - 30px);
...@@ -231,12 +222,6 @@ ...@@ -231,12 +222,6 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
background: linear-gradient(
90deg,
rgba(39, 172, 251, 0.05) 0%,
rgba(39, 172, 251, 0) 50%,
rgba(39, 172, 251, 0.05) 100%
);
" "
> >
<div style="display: flex"> <div style="display: flex">
...@@ -274,6 +259,7 @@ ...@@ -274,6 +259,7 @@
<div class="chart-title">移动巡查</div> <div class="chart-title">移动巡查</div>
<div <div
class="chart-background"
style=" style="
display: flex; display: flex;
height: calc(100% - 30px); height: calc(100% - 30px);
...@@ -281,12 +267,6 @@ ...@@ -281,12 +267,6 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
background: linear-gradient(
90deg,
rgba(39, 172, 251, 0.05) 0%,
rgba(39, 172, 251, 0) 50%,
rgba(39, 172, 251, 0.05) 100%
);
" "
> >
<div style="display: flex"> <div style="display: flex">
...@@ -727,16 +707,17 @@ export default { ...@@ -727,16 +707,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -1013,4 +994,12 @@ export default { ...@@ -1013,4 +994,12 @@ export default {
} }
} }
} }
.chart-background {
background: linear-gradient(
90deg,
rgba(39, 172, 251, 0.05) 0%,
rgba(39, 172, 251, 0) 50%,
rgba(39, 172, 251, 0.05) 100%
);
}
</style> </style>
\ No newline at end of file
...@@ -720,15 +720,16 @@ export default { ...@@ -720,15 +720,16 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
autoScroll2(stepLength, speed, delay, element) { autoScroll2(stepLength, speed, delay, element) {
clearTimeout();
var that = this; var that = this;
function start() { function start() {
that.interval2 = setInterval(scrolling, speed); that.interval2 = setInterval(scrolling, speed);
...@@ -744,16 +745,17 @@ export default { ...@@ -744,16 +745,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval2); clearInterval(that.interval2);
setTimeout(start, delay); that.timeout2 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout2 = setTimeout(start, delay);
} }
}, },
clearScroll1() { clearScroll1() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll1() { reScroll1() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -763,6 +765,7 @@ export default { ...@@ -763,6 +765,7 @@ export default {
}, },
clearScroll2() { clearScroll2() {
clearInterval(this.interval2); clearInterval(this.interval2);
clearTimeout(this.timeout2);
}, },
reScroll2() { reScroll2() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -679,16 +679,17 @@ export default { ...@@ -679,16 +679,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -465,16 +465,17 @@ export default { ...@@ -465,16 +465,17 @@ export default {
) { ) {
element.scrollTop = 0; element.scrollTop = 0;
clearInterval(that.interval1); clearInterval(that.interval1);
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
} }
if (element.offsetHeight !== element.scrollHeight) { if (element.offsetHeight !== element.scrollHeight) {
// 元素内容没有溢出时,不触发 // 元素内容没有溢出时,不触发
setTimeout(start, delay); that.timeout1 = setTimeout(start, delay);
} }
}, },
clearScroll() { clearScroll() {
clearInterval(this.interval1); clearInterval(this.interval1);
clearTimeout(this.timeout1);
}, },
reScroll() { reScroll() {
this.$nextTick(() => { this.$nextTick(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment