Browse Source

Merge branch 'master' of http://152.136.206.27:3000/dongjh/guan_client

dongjh 1 year ago
parent
commit
01ed68f0ba

+ 4 - 4
src/views/modules_guAn/visualization/modules/FullCurve.vue

@@ -247,7 +247,7 @@ export default {
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                   {
                   {
                     offset: 0,
                     offset: 0,
-                    color: 'rgb(227, 1, 6, 0)'
+                    color: 'rgba(227, 1, 6, .5)'
                   },
                   },
                   {
                   {
                     offset: 0.5,
                     offset: 0.5,
@@ -255,7 +255,7 @@ export default {
                   },
                   },
                   {
                   {
                     offset: 1,
                     offset: 1,
-                    color: 'rgb(227, 1, 6, 0)'
+                    color: 'rgba(227, 1, 6, 0.5)'
                   }
                   }
                 ])
                 ])
               }
               }
@@ -273,7 +273,7 @@ export default {
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                   {
                   {
                     offset: 0,
                     offset: 0,
-                    color: 'rgb(227, 145, 6, 0)'
+                    color: 'rgba(227, 145, 6, .5)'
                   },
                   },
                   {
                   {
                     offset: 0.5,
                     offset: 0.5,
@@ -281,7 +281,7 @@ export default {
                   },
                   },
                   {
                   {
                     offset: 1,
                     offset: 1,
-                    color: 'rgb(227, 145, 6, 0)'
+                    color: 'rgba(227, 145, 6, .5)'
                   }
                   }
                 ])
                 ])
               }
               }

+ 2 - 2
src/views/modules_guAn/visualization/modules/ModeInfo.vue

@@ -145,7 +145,7 @@ export default {
           this.template = this.dataList[i].Value
           this.template = this.dataList[i].Value
         }
         }
         if (this.dataList[i].Name == '温度输出率') {
         if (this.dataList[i].Name == '温度输出率') {
-          this.outputT = this.dataList[i].Value * 100
+          this.outputT = (this.dataList[i].Value * 100).toFixed(0)
           // if (this.outputT >0 && this.outputT <100) {
           // if (this.outputT >0 && this.outputT <100) {
           //   this.statusT = 0
           //   this.statusT = 0
           // }
           // }
@@ -177,7 +177,7 @@ export default {
           this.humidity = this.dataList[i].Value
           this.humidity = this.dataList[i].Value
         }
         }
         if (this.dataList[i].Name == '湿度输出率') {
         if (this.dataList[i].Name == '湿度输出率') {
-          this.outputH = this.dataList[i].Value * 100
+          this.outputH = (this.dataList[i].Value * 100).toFixed(0)
           // if (this.outputH >0 && this.outputH <100) {
           // if (this.outputH >0 && this.outputH <100) {
           //   this.statusH = 0
           //   this.statusH = 0
           // }
           // }

+ 4 - 4
src/views/modules_guAn/visualization/modules/RealTimeCurve.vue

@@ -180,7 +180,7 @@ export default {
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                   {
                   {
                     offset: 0,
                     offset: 0,
-                    color: 'rgb(255, 0, 255, 0)'
+                    color: 'rgba(255, 0, 255, .5)'
                   },
                   },
                   {
                   {
                     offset: 0.5,
                     offset: 0.5,
@@ -188,7 +188,7 @@ export default {
                   },
                   },
                   {
                   {
                     offset: 1,
                     offset: 1,
-                    color: 'rgb(255, 0, 255, 0)'
+                    color: 'rgba(255, 0, 255, 0.5)'
                   }
                   }
                 ])
                 ])
               }
               }
@@ -206,7 +206,7 @@ export default {
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                   {
                   {
                     offset: 0,
                     offset: 0,
-                    color: 'rgb(255, 105, 0, 0)'
+                    color: 'rgba(255, 105, 0, 0.5)'
                   },
                   },
                   {
                   {
                     offset: 0.5,
                     offset: 0.5,
@@ -214,7 +214,7 @@ export default {
                   },
                   },
                   {
                   {
                     offset: 1,
                     offset: 1,
-                    color: 'rgb(255, 0, 0, 0)'
+                    color: 'rgba(255, 0, 0, 0.5)'
                   }
                   }
                 ])
                 ])
               }
               }

+ 4 - 4
src/views/modules_guAn/visualization/modules/YuzhiCurve.vue

@@ -242,7 +242,7 @@ export default {
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                   {
                   {
                     offset: 0,
                     offset: 0,
-                    color: 'rgba(207, 168, 9, .1)'
+                    color: 'rgba(207, 168, 9, .5)'
                   },
                   },
                   {
                   {
                     offset: 0.5,
                     offset: 0.5,
@@ -250,7 +250,7 @@ export default {
                   },
                   },
                   {
                   {
                     offset: 1,
                     offset: 1,
-                    color: 'rgba(207, 168, 9, .1)'
+                    color: 'rgba(207, 168, 9, .5)'
                   }
                   }
                 ])
                 ])
               }
               }
@@ -284,7 +284,7 @@ export default {
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ // 颜色渐变
                   {
                   {
                     offset: 0,
                     offset: 0,
-                    color: 'rgba(73, 228, 233, .1)'
+                    color: 'rgba(73, 228, 233, .5)'
                   },
                   },
                   {
                   {
                     offset: 0.5,
                     offset: 0.5,
@@ -292,7 +292,7 @@ export default {
                   },
                   },
                   {
                   {
                     offset: 1,
                     offset: 1,
-                    color: 'rgba(73, 228, 233, .1)'
+                    color: 'rgba(73, 228, 233, .5)'
                   }
                   }
                 ])
                 ])
               }
               }