Merge remote-tracking branch 'remotes/origin/mw'

src/assets/styles/common/color.less

@@ -20,4 +20,8 @@
 @greenLinearRight: linear-gradient(to right, fade(@green, 50%), fade(@green, 0));
 @redLinearRight: linear-gradient(to right, fade(@red, 50%), fade(@red, 0));
 
+@deepblueLinearTop: linear-gradient(to top, fade(@deepblue, 50%), fade(@deepblue, 0));
+@deepblueLinearRight: linear-gradient(to right, fade(@deepblue, 50%), fade(@deepblue, 0));
+
+
 @font-color: #7a8385;

src/assets/styles/common/common.less

@@ -17,13 +17,14 @@
 
 // 亮色主题
 @import "../theme/light/light-jsc.less"; // 驾驶舱
-@import "../theme/light/jsc-jcjz.less"; // 驾驶舱-基础矩阵
-@import "../theme/light/jsc-ztjs.less"; // 驾驶舱-状态监视
 @import "../theme/light/light-jjyx.less"; // 经济运行
 @import "../theme/light/light-sp.less"; // 沙盘
 @import "../theme/light/light-qt.less"; // 其他
 
-@import "../theme/light/jjyx-dbgl.less"; // 对标管理
+@import "../theme/light/jsc.less"; // 驾驶舱
+@import "../theme/light/jjyx.less"; // 经济运行
+@import "../theme/light/zhjx.less"; // 智慧检修	
+@import "../theme/light/aqgk.less"; // 安全管控
 
 // 暗色主题
 @import "../theme/dark/dark-jsc.less"; // 驾驶舱

src/assets/styles/theme/light/aqgk.less

@@ -0,0 +1,75 @@
+//安全管控模块白色主题样式
+@import "./setting.less";
+#appBody.light {
+    .personnel .personnel-btn .i-btn:hover, .personnel .personnel-btn .i-btn.active{
+        border:1px solid rgba(75, 85, 174, 0.6);
+        background: rgba(75, 85, 174, 0.6);
+        color: @white;
+    }
+    .personnel .personnel-btn .i-btn{
+        background: rgb(220 221 223);
+        border: 1px solid @black;
+        color: @black;
+    }
+    //人员矩阵
+    .personnel .personnel-box .personnel-box-item{
+        background: @white;
+        border: 1px solid @black;
+    }
+    .personnel .personnel-box .personnel-box-item:hover{
+        border: 1px solid @deepblue;
+        background: @deepblue;
+    }
+    .personnel .personnel-box .personnel-box-item 
+        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-label{
+            color: @black;
+            font-weight: bold;
+        }
+    .personnel .personnel-box .personnel-box-item:hover 
+        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-label{
+            color: @white;
+        }
+    .personnel .personnel-box .personnel-box-item 
+        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-value{
+            color: @black;
+            font-weight: bold;
+        }
+    .personnel .personnel-box .personnel-box-item:hover 
+        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-value{
+            color: @white
+        }
+    .personnel .personnel-box .personnel-box-item .personnel-box-item-f .personnel-box-item-name{
+            color: @black;
+            font-weight: bold;
+        }
+    .personnel .personnel-box .personnel-box-item:hover .personnel-box-item-f .personnel-box-item-name{
+            color: @white
+        }
+    .personnel .personnel-box .personnel-box-item .personnel-box-item-f .personnel-box-item-icon{
+            color: @black;
+            font-weight: bold;
+        }
+        .personnel .personnel-box .personnel-box-item:hover .personnel-box-item-f .personnel-box-item-icon{
+            color: @white
+        }
+    .font-md{
+        color: @black;
+    }
+    .date-select.el-picker__popper.el-popper[role="tooltip"] .el-picker-panel .el-picker-panel__footer{
+        background: @deepblue;
+        border-color: @deepblue;
+    }
+    .el-picker-panel .el-picker-panel__footer .el-button--text{
+        color: @white;
+    }
+    .el-picker-panel .el-picker-panel__footer .el-button.is-plain{
+        background: @white;
+        border-color: @deepblue;
+        color: @black;
+    }
+    //视频监视
+    .iframe4 .el-dialog{
+        background: @white;
+
+    }
+}

src/assets/styles/theme/light/jjyx-dbgl.less

@@ -11,7 +11,7 @@
 			color: @black;
 		}
 		
-		.el-scrollbar tr td.light span {
+		.el-scrollbar tr td.light span, .el-scrollbar tr td.light div{
 			color: @blue;
 		}
 	}
@@ -187,13 +187,6 @@
 	  }
 	}
 	
-	// .action-bar .selections .item.active,.action-bar .selections .item:hover{
-	// 	border: 1px solid @deepblue;
-	// 	color:@deepblue ;
-	// 	background-image: linear-gradient(to top,rgba(57, 54, 143, 0.5),rgba(5, 187, 76, 0));
-	// 	background: linear-gradient(to top, rgba(54, 52, 142, 0.5), rgba(54, 52, 142, 0));
-	// }
-	
   .action-bar {
 	.selections {
 	  .item {

src/assets/styles/theme/light/jsc-ztjs.less

@@ -1,32 +0,0 @@
-//驾驶舱模块-状态监视白色主题样式
-@import "./setting.less";
-#appBody.light {
-    .status-panel .status-com-panel .p-body .category-box[data-v-74094c42]{
-        width: 100%;
-        background-color: @white;
-        transition : @transition;
-        display: flex;
-        margin-bottom: 0.37vh;
-    }
-    .el-scrollbar__wrap{
-        background: @white;
-        transition : @transition;
-    }
-    .booster-station .btn-group-tabs[data-v-7cf05ca5]{
-        display: flex;
-        flex-direction: row;
-        background: @white;
-        height: 60px;
-    }
-    .map-1 .btn-group-tabs[data-v-0ec6dd0b]{
-        display: flex;
-        flex-direction: row;
-        background: @white;
-        height: 50px;
-    }
-//驾驶舱模块-Agc白色主题样式
-    .com-panel2 .panel-header2 .panel-tools2{
-        color: @black;
-        opacity: 0.3;
-    }
-}

src/assets/styles/theme/light/jsc-jcjz.less

@@ -1,9 +1,7 @@
-// 驾驶舱模块-基础矩阵白色主题样式
-
 @import "./setting.less";
 
-
 #appBody.light {
+	// 基础矩阵白色主题样式
     .panel-body{
         background:@white;
         transition: @transition;
@@ -20,6 +18,29 @@
     .green[data-v-6a0a9536]{
         color: @green;
     }
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-065abbc5]{
+        font-size: 1.296vh;
+        color: @deepblue;
+        font-weight: bold;
+    }
+    .svg-icon.svg-icon-green svg use{
+        fill: @deepblue;
+    }
+    //明细矩阵
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-e0caa1f6]{
+        color: @deepblue;
+        font-weight: bold;
+    }
+    //欠发矩阵
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-6a0a9536]{
+        color: @deepblue;
+        font-weight: bold;
+    }
+    //光伏矩阵
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-55c30df5]{
+        color: @deepblue;
+        font-weight: bold;
+    }
 
     //驾驶舱模块-矩阵白色主题样式二级页面
     //基本信息-日发电量1
@@ -53,6 +74,7 @@
     .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box .page-common-body-menu-item[data-v-3b6e4be5] {
         border: 0.093vh solid @deepblue;
     }
+  
     //右侧导航栏第二个底色
      .df-table .custom-table.el-table{
         background: @white;
@@ -71,6 +93,9 @@
         background: @white;
         transition: @transition;
     }
+    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title .title-tools-left{
+        color: @black;
+    }
     table.table-form.mg-b-8{
         background: @white;
         transition: @transition;
@@ -84,8 +109,12 @@
         cursor: pointer;
         font-weight: bold;
     }
+    .matrix .panel-title .panel-title-name[data-v-2e858362]{
+        color: @deepblue;
+    }
     .com-panel.line{
         margin-left: 1px;
+        z-index: 1;
     }
     .wave{
         z-index: 1;
@@ -98,4 +127,47 @@
     .svg-icon.svg-icon-gray-l svg use{
         fill: @black;
     }
+	
+	// 状态监视白色主题样式
+	.status-panel .status-com-panel .p-body .category-box[data-v-74094c42]{
+		width: 100%;
+		background-color: @white;
+		transition : @transition;
+		display: flex;
+		margin-bottom: 0.37vh;
+	}
+	.el-scrollbar__wrap{
+		background: @white;
+		transition : @transition;
+	}
+	.map-1 .btn-group-tabs[data-v-0ec6dd0b]{
+		display: flex;
+		flex-direction: row;
+		background: @white;
+		height: 50px;
+	}
+	.status-panel .status-com-panel .p-body .item-box .data-item.light[data-v-74094c42]{
+		background-color: @deepblue;
+		position: relative;
+	}
+	.status-panel .status-com-panel .p-body .category-box .score span[data-v-74094c42]{
+		color: @deepblue;
+	}
+//驾驶舱模块-Agc白色主题样式
+	.com-panel2 .panel-header2 .panel-tools2{
+		color: @black;
+		opacity: 0.3;
+	}
+	.panel-table .data-item .data-item-count{
+		color: @deepblue;
+	}
+    .com-panel2 .panel-header2 .panel-title2{
+        color: @deepblue;
+    }
+        
+	// 风场
+	.station-tip{
+		  background-color: @gray-l;
+		  color: @black;
+	}
 }

src/assets/styles/theme/light/light-jjyx.less

@@ -60,7 +60,7 @@
 
     .power-benchmarking-page .top .top-left .top-left-header .header-right>div.active,
     .power-benchmarking-page .top .top-left .top-left-header .header-right>div:hover {
-        background  : red;
+        background  : rgba(54, 52, 142, 0.2);
         border-color: @deepblue;
         color       : @deepblue;
         transition  : @transition;

src/assets/styles/theme/light/light-qt.less

@@ -27,4 +27,44 @@
     .el-carousel__item {
         border-radius: @borderRaduis;
     }
+    .el-picker-panel .el-picker-panel__footer .el-button.is-plain{
+        color: @deepblue;
+    }
+    .el-date-editor.el-date-editor--datetimerange .el-range-input{
+        color: @black;
+    }
+    .el-date-editor.el-date-editor--datetimerange .el-range-separator{
+        color: @black;
+    }
+    .main-body .el-card .el-card__header{
+        color: @black;
+        background: @white;
+    }
+    .el-radio.is-bordered.el-radio--small .el-radio__label{
+        color: @black;
+    }
+    .el-radio.is-bordered.is-checked{
+        border-color: @deepblue;
+    }
+    .el-radio.is-checked .el-radio__inner{
+        background: @deepblue;
+        border-color: @deepblue;
+    }
+    .el-radio.is-checked .el-radio__label{
+        color: @deepblue;
+    }
+    .el-tree{
+        color: @black;
+        background: @white;
+    }
+    .el-tree-node__expand-icon{
+        color: @black;
+    }
+    .el-tree.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
+        color: @deepblue;
+    }
+    .el-tree .el-tree-node__content:hover, body .el-tree .el-upload-list__item:hover{
+        color: @deepblue;
+        font-weight: bold;
+    }
 }

src/assets/styles/theme/light/light-sp.less

@@ -110,8 +110,8 @@
             }
 
             .el-input__inner {
-                background   : rgba(0, 0, 0, 0.5);
-                border-color : rgba(0, 0, 0, 0.5);
+                // background   : rgba(0, 0, 0, 0.5);
+                border :1px solid rgba(0, 0, 0, 0.5);
                 border-radius: @borderRaduis;
                 transition   : @transition;
             }

src/assets/styles/theme/light/zhjx.less

@@ -0,0 +1,405 @@
+@import "./setting.less";
+#appBody.light {
+	// 故障诊断
+	.el-table{
+		th{
+			color:@black;
+		}
+		
+		.el-table__body tr.hover-row.current-row > td,
+		.el-table__body tr.hover-row.el-table__row--striped.current-row > td,
+		.el-table__body tr.hover-row.el-table__row--striped > td,
+		.el-table__body tr.hover-row > td {
+		  color: @blue;
+		}
+		
+		.ascending .sort-caret.ascending {
+		  border-bottom-color: @deepblue;
+		}
+		
+		.descending .sort-caret.descending {
+		  border-top-color: @deepblue;
+		}
+	} 
+	
+	
+	// 故障回溯
+	.el-checkbox {
+	  color: @black;
+	
+	  &.is-bordered {
+	    &.is-checked {
+	      border-color: @deepblue;
+	    }
+	  }
+	
+	  .el-checkbox__input.is-checked + .el-checkbox__label {
+	    color: @deepblue;
+	  }
+	  .el-checkbox__input.is-disabled+span.el-checkbox__label{
+		  color: @black;
+	  }
+	  .el-checkbox__input.is-checked .el-checkbox__inner,
+	  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+	    background-color: @deepblue;
+	    border-color: @deepblue;
+	  }
+	
+	  .el-checkbox__input.is-focus .el-checkbox__inner {
+	    border-color: @deepblue;
+	  }
+	}
+	
+	.time-axis-box {
+	    .time-axis-progress-box {
+	        .time-axis-progress {
+	            background: fade(@deepblue, 60);
+	        }
+	        .time-axis-progress-scale {
+	            border: 1px solid @deepblue;
+	        }
+	    }
+	}
+	
+	.fdp-sub-title {
+	    color: @deepblue;
+	}
+	
+	// 健康推荐
+  .selections {
+	.item {
+	  color: @black;
+	  background: fade(@black, 20);
+	  border: 1px solid fade(@black, 20);
+
+	  &:hover,
+	  &.active {
+		background: fade(@deepblue, 20);
+		border: 1px solid @deepblue;
+		color: @deepblue;
+	  }
+	}
+  }
+
+  .power-info {
+
+	.info-tab {
+	  .tab {
+		color: @black;
+		background: fade(@black, 20);
+		border: 1px solid fade(@black, 20);
+		i {
+		  svg use {
+			fill: @black;
+		  }
+		}
+
+		&:hover,
+		&.active {
+		  background: fade(@deepblue, 20);
+		  border: 1px solid @deepblue;
+		  color: @deepblue;
+
+		  i svg use {
+			fill: @deepblue;
+		  }
+		}
+
+		&.active::after {
+		  border-bottom: 9px solid @deepblue;
+		}
+
+		&.active::before {
+		  border-bottom: 9px solid #063319;
+		}
+	  }
+
+	}
+  }
+
+  .health-report {
+	// 健康报告 按钮样式
+	.actions {
+		.active{
+			border: 1px solid @deepblue;
+		}
+	  .item {
+		color: fade(@white, 75);
+		&.green {
+		  background: @deepblue;
+		}
+
+		&.purple {
+		  background: @purple;
+		}
+
+		&.gray {
+		  background: @black;
+		}
+	  }
+	}
+
+	.report-items {
+
+	  .item {
+		.title {
+		  background: fade(@black, 40);
+		  color: @black;
+		}
+
+		.info {
+		  background: fade(@black, 20);
+		  color: @font-color;
+		  .actions {
+			.success {
+			  border-color:@deepblue;
+			  color: @deepblue;
+			  background: fade(@deepblue,20);
+			}
+		  }
+		}
+	  }
+	}
+  }
+  
+  // 健康推荐-已分配任务
+  .track-info {
+    .form-info {
+      .work-flow {
+        background: fade(@gray, 20);
+        .work-flow-line {
+          background: @deepblue;
+        }
+  
+        .work-flow-item {
+          &.active {
+			  background: none;
+            .work-flow-icon-item {
+              .work-flow-icon-o {
+                  border: 1px solid @deepblue;
+                }
+  
+                .work-flow-icon-i {
+                  border: 2px solid @deepblue;
+                  background: linear-gradient(to bottom, @gray-l 0%,@gray-l 20%,@deepblue 100%);
+                }
+  
+                .svg-icon {
+                  svg {
+                    use {
+                      fill: @deepblue;
+                    }
+                  }
+                }
+            }
+  
+            .work-flow-text {
+              color: @deepblue;
+            }
+          }
+  
+          .work-flow-icon-item {
+            .work-flow-icon-o {
+              border: 1px solid #B3BDC0;
+            }
+  
+            .work-flow-icon-m {
+              border: 4px solid #212b2b;
+            }
+  
+            .work-flow-icon-i {
+              border: 2px solid @gray-l;
+              background: linear-gradient(to bottom, @gray 0%,@gray 20%,@gray-l 100%);
+            }
+  
+            .svg-icon {
+              svg {
+                use {
+                  fill: @gray-l;
+                }
+              }
+            }
+          }
+          .work-flow-text {
+              color: @black;
+            }
+        }
+      }
+    }
+  
+    .evaluate {
+  
+      .evaluate-item {
+        .evaluate-label,
+        .evaluate-unit {
+          color: @black;
+        }
+      }
+    }
+    .tabs {
+      border-left: 1px solid #53626833;
+  
+      .tab-box {
+  
+      .tab-item {
+        &.active {
+          color: @deepblue;
+          background-image: @deepblueLinearTop;
+  
+          &::after {
+            border: 1px solid @deepblue;
+          }
+        }
+      }
+    }
+    }
+  }
+  
+  .el-textarea {
+    .el-textarea__inner {
+      color: @black;
+	  background: fade(@gray-l, 20);
+    }
+  }
+  
+  .defect-elimination-tracking {
+	  background: fade(@white, 95);
+	  border: 1px solid fade(@deepblue, 50);
+	  
+    .defect-elimination-tracking-close {
+      &:hover {
+        i {
+          color: @blue;
+        }
+      }
+    }
+  
+    .header-tile-box {
+      .header-tile {
+  
+        .info-form-box {
+          .info-form {
+            .info-form-label {
+              color: @gray;
+            }
+            .info-form-value {
+              color: @black;
+            }
+          }
+        }
+      }
+    }
+    .det-chart-title {
+      color: @black;
+    }
+  
+    .det-chart-sub-title {
+      color: @black;
+    }
+  
+    .det-chart-sub-title-big {
+      color: @black;
+    }
+  }
+  
+  .health-2 {
+    // 电量健康情况
+    .power-info {
+      .info-tab {
+  
+        .tab {
+          color: @black;
+  
+          &:hover,
+          &.active {
+            background: fade(@deepblue, 20);
+            border: 1px solid @deepblue;
+            color: @deepblue;
+            i {
+              svg use {
+                fill: @deepblue;
+              }
+            }
+          }
+  
+          &.active::after {
+            border-bottom: 9px solid @deepblue;
+          }
+        }
+      }
+  
+    }
+    // 风场信息
+    .fc-info {
+      .fc-item {
+  
+        & > .title {
+          color: fade(@black, 75);
+        }
+  
+  
+        .tags {
+          .tag {
+            .tag-title {
+              color: @black;
+            }
+  
+            .tag-value {
+              color: @deepblue;
+              .unit {
+                color: @gray;
+              }
+            }
+          }
+        }
+        .health-info {
+          .title {
+            color: @black;
+            .actions {
+              .action {
+				  color: @gray;
+				  svg use {
+				    fill: @gray;
+				  }
+                &.active,
+                &:hover {
+					background: none;
+                  color: @deepblue;
+                  svg use {
+                    fill: @deepblue;
+                  }
+                }
+              }
+            }
+          }
+  
+          .info-body {
+            .device-list {
+              .item {
+                color: @black;
+                &.green {
+                  color: @green;
+                  background: fade(@green, 20);
+                  border-color: @green;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  .health-3{
+	  .com-panel{
+		  .green{
+		  		color:@green;
+				&.lengend{
+					background:@blue;
+				}
+		  }
+	  }
+	   
+  }
+  
+}

src/components/chart/line/multiple-y-line-chart.vue

@@ -32,156 +32,6 @@
                             ["2021/07/01 10:00:00", 69],
                             ["2021/07/01 15:00:00", 134],
                             ["2021/07/01 20:00:00", 262],
-                            ["2021/07/02 00:00:00", 181],
-                            ["2021/07/02 05:00:00", 72],
-                            ["2021/07/02 10:00:00", 221],
-                            ["2021/07/02 15:00:00", 184],
-                            ["2021/07/02 20:00:00", 319],
-                            ["2021/07/03 00:00:00", 283],
-                            ["2021/07/03 05:00:00", 156],
-                            ["2021/07/03 10:00:00", 308],
-                            ["2021/07/03 15:00:00", 153],
-                            ["2021/07/03 20:00:00", 67],
-                            ["2021/07/04 00:00:00", 289],
-                            ["2021/07/04 05:00:00", 194],
-                            ["2021/07/04 10:00:00", 358],
-                            ["2021/07/04 15:00:00", 325],
-                            ["2021/07/04 20:00:00", 345],
-                            ["2021/07/05 00:00:00", 242],
-                            ["2021/07/05 05:00:00", 100],
-                            ["2021/07/05 10:00:00", 225],
-                            ["2021/07/05 15:00:00", 230],
-                            ["2021/07/05 20:00:00", 162],
-                            ["2021/07/06 00:00:00", 235],
-                            ["2021/07/06 05:00:00", 237],
-                            ["2021/07/06 10:00:00", 248],
-                            ["2021/07/06 15:00:00", 350],
-                            ["2021/07/06 20:00:00", 298],
-                            ["2021/07/07 00:00:00", 295],
-                            ["2021/07/07 05:00:00", 192],
-                            ["2021/07/07 10:00:00", 54],
-                            ["2021/07/07 15:00:00", 321],
-                            ["2021/07/07 20:00:00", 104],
-                            ["2021/07/08 00:00:00", 163],
-                            ["2021/07/08 05:00:00", 177],
-                            ["2021/07/08 10:00:00", 185],
-                            ["2021/07/08 15:00:00", 120],
-                            ["2021/07/08 20:00:00", 61],
-                            ["2021/07/09 00:00:00", 104],
-                            ["2021/07/09 05:00:00", 178],
-                            ["2021/07/09 10:00:00", 90],
-                            ["2021/07/09 15:00:00", 331],
-                            ["2021/07/09 20:00:00", 217],
-                            ["2021/07/10 00:00:00", 338],
-                            ["2021/07/10 05:00:00", 155],
-                            ["2021/07/10 10:00:00", 99],
-                            ["2021/07/10 15:00:00", 109],
-                            ["2021/07/10 20:00:00", 221],
-                            ["2021/07/11 00:00:00", 281],
-                            ["2021/07/11 05:00:00", 306],
-                            ["2021/07/11 10:00:00", 246],
-                            ["2021/07/11 15:00:00", 176],
-                            ["2021/07/11 20:00:00", 348],
-                            ["2021/07/12 00:00:00", 94],
-                            ["2021/07/12 05:00:00", 100],
-                            ["2021/07/12 10:00:00", 53],
-                            ["2021/07/12 15:00:00", 269],
-                            ["2021/07/12 20:00:00", 93],
-                            ["2021/07/13 00:00:00", 178],
-                            ["2021/07/13 05:00:00", 100],
-                            ["2021/07/13 10:00:00", 53],
-                            ["2021/07/13 15:00:00", 260],
-                            ["2021/07/13 20:00:00", 114],
-                            ["2021/07/14 00:00:00", 251],
-                            ["2021/07/14 05:00:00", 250],
-                            ["2021/07/14 10:00:00", 97],
-                            ["2021/07/14 15:00:00", 283],
-                            ["2021/07/14 20:00:00", 231],
-                            ["2021/07/15 00:00:00", 359],
-                            ["2021/07/15 05:00:00", 105],
-                            ["2021/07/15 10:00:00", 229],
-                            ["2021/07/15 15:00:00", 81],
-                            ["2021/07/15 20:00:00", 353],
-                            ["2021/07/16 00:00:00", 244],
-                            ["2021/07/16 05:00:00", 231],
-                            ["2021/07/16 10:00:00", 275],
-                            ["2021/07/16 15:00:00", 273],
-                            ["2021/07/16 20:00:00", 199],
-                            ["2021/07/17 00:00:00", 124],
-                            ["2021/07/17 05:00:00", 176],
-                            ["2021/07/17 10:00:00", 149],
-                            ["2021/07/17 15:00:00", 77],
-                            ["2021/07/17 20:00:00", 168],
-                            ["2021/07/18 00:00:00", 256],
-                            ["2021/07/18 05:00:00", 138],
-                            ["2021/07/18 10:00:00", 95],
-                            ["2021/07/18 15:00:00", 313],
-                            ["2021/07/18 20:00:00", 244],
-                            ["2021/07/19 00:00:00", 169],
-                            ["2021/07/19 05:00:00", 199],
-                            ["2021/07/19 10:00:00", 91],
-                            ["2021/07/19 15:00:00", 241],
-                            ["2021/07/19 20:00:00", 344],
-                            ["2021/07/20 00:00:00", 85],
-                            ["2021/07/20 05:00:00", 332],
-                            ["2021/07/20 10:00:00", 189],
-                            ["2021/07/20 15:00:00", 81],
-                            ["2021/07/20 20:00:00", 290],
-                            ["2021/07/21 00:00:00", 214],
-                            ["2021/07/21 05:00:00", 61],
-                            ["2021/07/21 10:00:00", 339],
-                            ["2021/07/21 15:00:00", 286],
-                            ["2021/07/21 20:00:00", 89],
-                            ["2021/07/22 00:00:00", 279],
-                            ["2021/07/22 05:00:00", 229],
-                            ["2021/07/22 10:00:00", 238],
-                            ["2021/07/22 15:00:00", 86],
-                            ["2021/07/22 20:00:00", 163],
-                            ["2021/07/23 00:00:00", 140],
-                            ["2021/07/23 05:00:00", 312],
-                            ["2021/07/23 10:00:00", 134],
-                            ["2021/07/23 15:00:00", 53],
-                            ["2021/07/23 20:00:00", 235],
-                            ["2021/07/24 00:00:00", 97],
-                            ["2021/07/24 05:00:00", 309],
-                            ["2021/07/24 10:00:00", 147],
-                            ["2021/07/24 15:00:00", 258],
-                            ["2021/07/24 20:00:00", 192],
-                            ["2021/07/25 00:00:00", 305],
-                            ["2021/07/25 05:00:00", 282],
-                            ["2021/07/25 10:00:00", 72],
-                            ["2021/07/25 15:00:00", 258],
-                            ["2021/07/25 20:00:00", 312],
-                            ["2021/07/26 00:00:00", 259],
-                            ["2021/07/26 05:00:00", 146],
-                            ["2021/07/26 10:00:00", 93],
-                            ["2021/07/26 15:00:00", 158],
-                            ["2021/07/26 20:00:00", 156],
-                            ["2021/07/27 00:00:00", 362],
-                            ["2021/07/27 05:00:00", 193],
-                            ["2021/07/27 10:00:00", 177],
-                            ["2021/07/27 15:00:00", 313],
-                            ["2021/07/27 20:00:00", 60],
-                            ["2021/07/28 00:00:00", 119],
-                            ["2021/07/28 05:00:00", 142],
-                            ["2021/07/28 10:00:00", 283],
-                            ["2021/07/28 15:00:00", 105],
-                            ["2021/07/28 20:00:00", 121],
-                            ["2021/07/29 00:00:00", 304],
-                            ["2021/07/29 05:00:00", 82],
-                            ["2021/07/29 10:00:00", 326],
-                            ["2021/07/29 15:00:00", 216],
-                            ["2021/07/29 20:00:00", 223],
-                            ["2021/07/30 00:00:00", 218],
-                            ["2021/07/30 05:00:00", 313],
-                            ["2021/07/30 10:00:00", 339],
-                            ["2021/07/30 15:00:00", 125],
-                            ["2021/07/30 20:00:00", 244],
-                            ["2021/07/31 00:00:00", 179],
-                            ["2021/07/31 05:00:00", 360],
-                            ["2021/07/31 10:00:00", 267],
-                            ["2021/07/31 15:00:00", 85],
-                            ["2021/07/31 20:00:00", 309]
                         ],
                     },
                     {
@@ -193,156 +43,6 @@
                             ["2021/07/01 10:00:00", 290],
                             ["2021/07/01 15:00:00", 140],
                             ["2021/07/01 20:00:00", 203],
-                            ["2021/07/02 00:00:00", 280],
-                            ["2021/07/02 05:00:00", 283],
-                            ["2021/07/02 10:00:00", 252],
-                            ["2021/07/02 15:00:00", 155],
-                            ["2021/07/02 20:00:00", 133],
-                            ["2021/07/03 00:00:00", 94],
-                            ["2021/07/03 05:00:00", 191],
-                            ["2021/07/03 10:00:00", 193],
-                            ["2021/07/03 15:00:00", 205],
-                            ["2021/07/03 20:00:00", 301],
-                            ["2021/07/04 00:00:00", 101],
-                            ["2021/07/04 05:00:00", 257],
-                            ["2021/07/04 10:00:00", 82],
-                            ["2021/07/04 15:00:00", 75],
-                            ["2021/07/04 20:00:00", 254],
-                            ["2021/07/05 00:00:00", 184],
-                            ["2021/07/05 05:00:00", 146],
-                            ["2021/07/05 10:00:00", 272],
-                            ["2021/07/05 15:00:00", 100],
-                            ["2021/07/05 20:00:00", 118],
-                            ["2021/07/06 00:00:00", 125],
-                            ["2021/07/06 05:00:00", 80],
-                            ["2021/07/06 10:00:00", 144],
-                            ["2021/07/06 15:00:00", 100],
-                            ["2021/07/06 20:00:00", 232],
-                            ["2021/07/07 00:00:00", 139],
-                            ["2021/07/07 05:00:00", 311],
-                            ["2021/07/07 10:00:00", 152],
-                            ["2021/07/07 15:00:00", 182],
-                            ["2021/07/07 20:00:00", 162],
-                            ["2021/07/08 00:00:00", 175],
-                            ["2021/07/08 05:00:00", 95],
-                            ["2021/07/08 10:00:00", 300],
-                            ["2021/07/08 15:00:00", 290],
-                            ["2021/07/08 20:00:00", 218],
-                            ["2021/07/09 00:00:00", 106],
-                            ["2021/07/09 05:00:00", 301],
-                            ["2021/07/09 10:00:00", 221],
-                            ["2021/07/09 15:00:00", 126],
-                            ["2021/07/09 20:00:00", 149],
-                            ["2021/07/10 00:00:00", 308],
-                            ["2021/07/10 05:00:00", 187],
-                            ["2021/07/10 10:00:00", 164],
-                            ["2021/07/10 15:00:00", 139],
-                            ["2021/07/10 20:00:00", 199],
-                            ["2021/07/11 00:00:00", 71],
-                            ["2021/07/11 05:00:00", 198],
-                            ["2021/07/11 10:00:00", 121],
-                            ["2021/07/11 15:00:00", 242],
-                            ["2021/07/11 20:00:00", 286],
-                            ["2021/07/12 00:00:00", 198],
-                            ["2021/07/12 05:00:00", 275],
-                            ["2021/07/12 10:00:00", 63],
-                            ["2021/07/12 15:00:00", 229],
-                            ["2021/07/12 20:00:00", 272],
-                            ["2021/07/13 00:00:00", 266],
-                            ["2021/07/13 05:00:00", 305],
-                            ["2021/07/13 10:00:00", 218],
-                            ["2021/07/13 15:00:00", 273],
-                            ["2021/07/13 20:00:00", 112],
-                            ["2021/07/14 00:00:00", 243],
-                            ["2021/07/14 05:00:00", 105],
-                            ["2021/07/14 10:00:00", 147],
-                            ["2021/07/14 15:00:00", 301],
-                            ["2021/07/14 20:00:00", 145],
-                            ["2021/07/15 00:00:00", 136],
-                            ["2021/07/15 05:00:00", 153],
-                            ["2021/07/15 10:00:00", 251],
-                            ["2021/07/15 15:00:00", 76],
-                            ["2021/07/15 20:00:00", 296],
-                            ["2021/07/16 00:00:00", 128],
-                            ["2021/07/16 05:00:00", 94],
-                            ["2021/07/16 10:00:00", 236],
-                            ["2021/07/16 15:00:00", 202],
-                            ["2021/07/16 20:00:00", 94],
-                            ["2021/07/17 00:00:00", 169],
-                            ["2021/07/17 05:00:00", 93],
-                            ["2021/07/17 10:00:00", 297],
-                            ["2021/07/17 15:00:00", 110],
-                            ["2021/07/17 20:00:00", 271],
-                            ["2021/07/18 00:00:00", 98],
-                            ["2021/07/18 05:00:00", 169],
-                            ["2021/07/18 10:00:00", 114],
-                            ["2021/07/18 15:00:00", 190],
-                            ["2021/07/18 20:00:00", 62],
-                            ["2021/07/19 00:00:00", 151],
-                            ["2021/07/19 05:00:00", 239],
-                            ["2021/07/19 10:00:00", 135],
-                            ["2021/07/19 15:00:00", 281],
-                            ["2021/07/19 20:00:00", 190],
-                            ["2021/07/20 00:00:00", 65],
-                            ["2021/07/20 05:00:00", 207],
-                            ["2021/07/20 10:00:00", 140],
-                            ["2021/07/20 15:00:00", 272],
-                            ["2021/07/20 20:00:00", 195],
-                            ["2021/07/21 00:00:00", 66],
-                            ["2021/07/21 05:00:00", 163],
-                            ["2021/07/21 10:00:00", 306],
-                            ["2021/07/21 15:00:00", 213],
-                            ["2021/07/21 20:00:00", 154],
-                            ["2021/07/22 00:00:00", 305],
-                            ["2021/07/22 05:00:00", 223],
-                            ["2021/07/22 10:00:00", 201],
-                            ["2021/07/22 15:00:00", 224],
-                            ["2021/07/22 20:00:00", 63],
-                            ["2021/07/23 00:00:00", 226],
-                            ["2021/07/23 05:00:00", 75],
-                            ["2021/07/23 10:00:00", 309],
-                            ["2021/07/23 15:00:00", 191],
-                            ["2021/07/23 20:00:00", 219],
-                            ["2021/07/24 00:00:00", 142],
-                            ["2021/07/24 05:00:00", 162],
-                            ["2021/07/24 10:00:00", 260],
-                            ["2021/07/24 15:00:00", 260],
-                            ["2021/07/24 20:00:00", 249],
-                            ["2021/07/25 00:00:00", 278],
-                            ["2021/07/25 05:00:00", 187],
-                            ["2021/07/25 10:00:00", 101],
-                            ["2021/07/25 15:00:00", 200],
-                            ["2021/07/25 20:00:00", 261],
-                            ["2021/07/26 00:00:00", 161],
-                            ["2021/07/26 05:00:00", 227],
-                            ["2021/07/26 10:00:00", 289],
-                            ["2021/07/26 15:00:00", 85],
-                            ["2021/07/26 20:00:00", 88],
-                            ["2021/07/27 00:00:00", 237],
-                            ["2021/07/27 05:00:00", 198],
-                            ["2021/07/27 10:00:00", 260],
-                            ["2021/07/27 15:00:00", 146],
-                            ["2021/07/27 20:00:00", 288],
-                            ["2021/07/28 00:00:00", 213],
-                            ["2021/07/28 05:00:00", 250],
-                            ["2021/07/28 10:00:00", 77],
-                            ["2021/07/28 15:00:00", 75],
-                            ["2021/07/28 20:00:00", 153],
-                            ["2021/07/29 00:00:00", 263],
-                            ["2021/07/29 05:00:00", 173],
-                            ["2021/07/29 10:00:00", 105],
-                            ["2021/07/29 15:00:00", 239],
-                            ["2021/07/29 20:00:00", 69],
-                            ["2021/07/30 00:00:00", 126],
-                            ["2021/07/30 05:00:00", 238],
-                            ["2021/07/30 10:00:00", 62],
-                            ["2021/07/30 15:00:00", 277],
-                            ["2021/07/30 20:00:00", 61],
-                            ["2021/07/31 00:00:00", 91],
-                            ["2021/07/31 05:00:00", 201],
-                            ["2021/07/31 10:00:00", 238],
-                            ["2021/07/31 15:00:00", 307],
-                            ["2021/07/31 20:00:00", 86]
                         ],
                     },
                     {
@@ -354,156 +54,6 @@
                             ["2021/07/01 10:00:00", 231],
                             ["2021/07/01 15:00:00", 305],
                             ["2021/07/01 20:00:00", 230],
-                            ["2021/07/02 00:00:00", 248],
-                            ["2021/07/02 05:00:00", 295],
-                            ["2021/07/02 10:00:00", 147],
-                            ["2021/07/02 15:00:00", 242],
-                            ["2021/07/02 20:00:00", 317],
-                            ["2021/07/03 00:00:00", 218],
-                            ["2021/07/03 05:00:00", 217],
-                            ["2021/07/03 10:00:00", 274],
-                            ["2021/07/03 15:00:00", 329],
-                            ["2021/07/03 20:00:00", 148],
-                            ["2021/07/04 00:00:00", 316],
-                            ["2021/07/04 05:00:00", 270],
-                            ["2021/07/04 10:00:00", 173],
-                            ["2021/07/04 15:00:00", 318],
-                            ["2021/07/04 20:00:00", 297],
-                            ["2021/07/05 00:00:00", 322],
-                            ["2021/07/05 05:00:00", 182],
-                            ["2021/07/05 10:00:00", 170],
-                            ["2021/07/05 15:00:00", 199],
-                            ["2021/07/05 20:00:00", 258],
-                            ["2021/07/06 00:00:00", 128],
-                            ["2021/07/06 05:00:00", 323],
-                            ["2021/07/06 10:00:00", 142],
-                            ["2021/07/06 15:00:00", 312],
-                            ["2021/07/06 20:00:00", 174],
-                            ["2021/07/07 00:00:00", 158],
-                            ["2021/07/07 05:00:00", 317],
-                            ["2021/07/07 10:00:00", 154],
-                            ["2021/07/07 15:00:00", 262],
-                            ["2021/07/07 20:00:00", 180],
-                            ["2021/07/08 00:00:00", 204],
-                            ["2021/07/08 05:00:00", 307],
-                            ["2021/07/08 10:00:00", 232],
-                            ["2021/07/08 15:00:00", 124],
-                            ["2021/07/08 20:00:00", 126],
-                            ["2021/07/09 00:00:00", 300],
-                            ["2021/07/09 05:00:00", 289],
-                            ["2021/07/09 10:00:00", 278],
-                            ["2021/07/09 15:00:00", 211],
-                            ["2021/07/09 20:00:00", 116],
-                            ["2021/07/10 00:00:00", 271],
-                            ["2021/07/10 05:00:00", 197],
-                            ["2021/07/10 10:00:00", 296],
-                            ["2021/07/10 15:00:00", 107],
-                            ["2021/07/10 20:00:00", 153],
-                            ["2021/07/11 00:00:00", 221],
-                            ["2021/07/11 05:00:00", 196],
-                            ["2021/07/11 10:00:00", 108],
-                            ["2021/07/11 15:00:00", 190],
-                            ["2021/07/11 20:00:00", 141],
-                            ["2021/07/12 00:00:00", 98],
-                            ["2021/07/12 05:00:00", 192],
-                            ["2021/07/12 10:00:00", 190],
-                            ["2021/07/12 15:00:00", 327],
-                            ["2021/07/12 20:00:00", 260],
-                            ["2021/07/13 00:00:00", 221],
-                            ["2021/07/13 05:00:00", 240],
-                            ["2021/07/13 10:00:00", 280],
-                            ["2021/07/13 15:00:00", 234],
-                            ["2021/07/13 20:00:00", 326],
-                            ["2021/07/14 00:00:00", 143],
-                            ["2021/07/14 05:00:00", 329],
-                            ["2021/07/14 10:00:00", 156],
-                            ["2021/07/14 15:00:00", 152],
-                            ["2021/07/14 20:00:00", 316],
-                            ["2021/07/15 00:00:00", 125],
-                            ["2021/07/15 05:00:00", 322],
-                            ["2021/07/15 10:00:00", 174],
-                            ["2021/07/15 15:00:00", 286],
-                            ["2021/07/15 20:00:00", 122],
-                            ["2021/07/16 00:00:00", 145],
-                            ["2021/07/16 05:00:00", 122],
-                            ["2021/07/16 10:00:00", 313],
-                            ["2021/07/16 15:00:00", 144],
-                            ["2021/07/16 20:00:00", 150],
-                            ["2021/07/17 00:00:00", 322],
-                            ["2021/07/17 05:00:00", 130],
-                            ["2021/07/17 10:00:00", 189],
-                            ["2021/07/17 15:00:00", 99],
-                            ["2021/07/17 20:00:00", 165],
-                            ["2021/07/18 00:00:00", 235],
-                            ["2021/07/18 05:00:00", 127],
-                            ["2021/07/18 10:00:00", 104],
-                            ["2021/07/18 15:00:00", 233],
-                            ["2021/07/18 20:00:00", 178],
-                            ["2021/07/19 00:00:00", 171],
-                            ["2021/07/19 05:00:00", 123],
-                            ["2021/07/19 10:00:00", 305],
-                            ["2021/07/19 15:00:00", 113],
-                            ["2021/07/19 20:00:00", 299],
-                            ["2021/07/20 00:00:00", 157],
-                            ["2021/07/20 05:00:00", 165],
-                            ["2021/07/20 10:00:00", 147],
-                            ["2021/07/20 15:00:00", 181],
-                            ["2021/07/20 20:00:00", 261],
-                            ["2021/07/21 00:00:00", 123],
-                            ["2021/07/21 05:00:00", 317],
-                            ["2021/07/21 10:00:00", 203],
-                            ["2021/07/21 15:00:00", 284],
-                            ["2021/07/21 20:00:00", 232],
-                            ["2021/07/22 00:00:00", 124],
-                            ["2021/07/22 05:00:00", 106],
-                            ["2021/07/22 10:00:00", 233],
-                            ["2021/07/22 15:00:00", 169],
-                            ["2021/07/22 20:00:00", 214],
-                            ["2021/07/23 00:00:00", 122],
-                            ["2021/07/23 05:00:00", 145],
-                            ["2021/07/23 10:00:00", 160],
-                            ["2021/07/23 15:00:00", 260],
-                            ["2021/07/23 20:00:00", 310],
-                            ["2021/07/24 00:00:00", 234],
-                            ["2021/07/24 05:00:00", 130],
-                            ["2021/07/24 10:00:00", 248],
-                            ["2021/07/24 15:00:00", 257],
-                            ["2021/07/24 20:00:00", 178],
-                            ["2021/07/25 00:00:00", 239],
-                            ["2021/07/25 05:00:00", 111],
-                            ["2021/07/25 10:00:00", 159],
-                            ["2021/07/25 15:00:00", 101],
-                            ["2021/07/25 20:00:00", 237],
-                            ["2021/07/26 00:00:00", 299],
-                            ["2021/07/26 05:00:00", 319],
-                            ["2021/07/26 10:00:00", 135],
-                            ["2021/07/26 15:00:00", 250],
-                            ["2021/07/26 20:00:00", 308],
-                            ["2021/07/27 00:00:00", 208],
-                            ["2021/07/27 05:00:00", 208],
-                            ["2021/07/27 10:00:00", 324],
-                            ["2021/07/27 15:00:00", 122],
-                            ["2021/07/27 20:00:00", 117],
-                            ["2021/07/28 00:00:00", 129],
-                            ["2021/07/28 05:00:00", 121],
-                            ["2021/07/28 10:00:00", 166],
-                            ["2021/07/28 15:00:00", 303],
-                            ["2021/07/28 20:00:00", 262],
-                            ["2021/07/29 00:00:00", 200],
-                            ["2021/07/29 05:00:00", 229],
-                            ["2021/07/29 10:00:00", 122],
-                            ["2021/07/29 15:00:00", 122],
-                            ["2021/07/29 20:00:00", 225],
-                            ["2021/07/30 00:00:00", 227],
-                            ["2021/07/30 05:00:00", 247],
-                            ["2021/07/30 10:00:00", 102],
-                            ["2021/07/30 15:00:00", 285],
-                            ["2021/07/30 20:00:00", 167],
-                            ["2021/07/31 00:00:00", 119],
-                            ["2021/07/31 05:00:00", 212],
-                            ["2021/07/31 10:00:00", 277],
-                            ["2021/07/31 15:00:00", 159],
-                            ["2021/07/31 20:00:00", 179]
                         ],
                     },
                     {
@@ -515,156 +65,6 @@
                             ["2021/07/01 10:00:00", 296],
                             ["2021/07/01 15:00:00", 87],
                             ["2021/07/01 20:00:00", 273],
-                            ["2021/07/02 00:00:00", 129],
-                            ["2021/07/02 05:00:00", 121],
-                            ["2021/07/02 10:00:00", 65],
-                            ["2021/07/02 15:00:00", 215],
-                            ["2021/07/02 20:00:00", 245],
-                            ["2021/07/03 00:00:00", 288],
-                            ["2021/07/03 05:00:00", 256],
-                            ["2021/07/03 10:00:00", 47],
-                            ["2021/07/03 15:00:00", 207],
-                            ["2021/07/03 20:00:00", 237],
-                            ["2021/07/04 00:00:00", 68],
-                            ["2021/07/04 05:00:00", 186],
-                            ["2021/07/04 10:00:00", 126],
-                            ["2021/07/04 15:00:00", 207],
-                            ["2021/07/04 20:00:00", 59],
-                            ["2021/07/05 00:00:00", 328],
-                            ["2021/07/05 05:00:00", 72],
-                            ["2021/07/05 10:00:00", 54],
-                            ["2021/07/05 15:00:00", 114],
-                            ["2021/07/05 20:00:00", 167],
-                            ["2021/07/06 00:00:00", 164],
-                            ["2021/07/06 05:00:00", 176],
-                            ["2021/07/06 10:00:00", 59],
-                            ["2021/07/06 15:00:00", 196],
-                            ["2021/07/06 20:00:00", 208],
-                            ["2021/07/07 00:00:00", 80],
-                            ["2021/07/07 05:00:00", 119],
-                            ["2021/07/07 10:00:00", 228],
-                            ["2021/07/07 15:00:00", 80],
-                            ["2021/07/07 20:00:00", 182],
-                            ["2021/07/08 00:00:00", 152],
-                            ["2021/07/08 05:00:00", 119],
-                            ["2021/07/08 10:00:00", 236],
-                            ["2021/07/08 15:00:00", 45],
-                            ["2021/07/08 20:00:00", 36],
-                            ["2021/07/09 00:00:00", 34],
-                            ["2021/07/09 05:00:00", 280],
-                            ["2021/07/09 10:00:00", 63],
-                            ["2021/07/09 15:00:00", 53],
-                            ["2021/07/09 20:00:00", 226],
-                            ["2021/07/10 00:00:00", 56],
-                            ["2021/07/10 05:00:00", 234],
-                            ["2021/07/10 10:00:00", 301],
-                            ["2021/07/10 15:00:00", 106],
-                            ["2021/07/10 20:00:00", 80],
-                            ["2021/07/11 00:00:00", 280],
-                            ["2021/07/11 05:00:00", 277],
-                            ["2021/07/11 10:00:00", 104],
-                            ["2021/07/11 15:00:00", 76],
-                            ["2021/07/11 20:00:00", 321],
-                            ["2021/07/12 00:00:00", 93],
-                            ["2021/07/12 05:00:00", 109],
-                            ["2021/07/12 10:00:00", 100],
-                            ["2021/07/12 15:00:00", 128],
-                            ["2021/07/12 20:00:00", 87],
-                            ["2021/07/13 00:00:00", 179],
-                            ["2021/07/13 05:00:00", 189],
-                            ["2021/07/13 10:00:00", 140],
-                            ["2021/07/13 15:00:00", 109],
-                            ["2021/07/13 20:00:00", 156],
-                            ["2021/07/14 00:00:00", 173],
-                            ["2021/07/14 05:00:00", 213],
-                            ["2021/07/14 10:00:00", 331],
-                            ["2021/07/14 15:00:00", 84],
-                            ["2021/07/14 20:00:00", 339],
-                            ["2021/07/15 00:00:00", 157],
-                            ["2021/07/15 05:00:00", 225],
-                            ["2021/07/15 10:00:00", 198],
-                            ["2021/07/15 15:00:00", 46],
-                            ["2021/07/15 20:00:00", 62],
-                            ["2021/07/16 00:00:00", 189],
-                            ["2021/07/16 05:00:00", 159],
-                            ["2021/07/16 10:00:00", 295],
-                            ["2021/07/16 15:00:00", 52],
-                            ["2021/07/16 20:00:00", 238],
-                            ["2021/07/17 00:00:00", 341],
-                            ["2021/07/17 05:00:00", 269],
-                            ["2021/07/17 10:00:00", 126],
-                            ["2021/07/17 15:00:00", 275],
-                            ["2021/07/17 20:00:00", 101],
-                            ["2021/07/18 00:00:00", 348],
-                            ["2021/07/18 05:00:00", 83],
-                            ["2021/07/18 10:00:00", 225],
-                            ["2021/07/18 15:00:00", 42],
-                            ["2021/07/18 20:00:00", 234],
-                            ["2021/07/19 00:00:00", 239],
-                            ["2021/07/19 05:00:00", 265],
-                            ["2021/07/19 10:00:00", 213],
-                            ["2021/07/19 15:00:00", 219],
-                            ["2021/07/19 20:00:00", 52],
-                            ["2021/07/20 00:00:00", 79],
-                            ["2021/07/20 05:00:00", 287],
-                            ["2021/07/20 10:00:00", 340],
-                            ["2021/07/20 15:00:00", 267],
-                            ["2021/07/20 20:00:00", 321],
-                            ["2021/07/21 00:00:00", 176],
-                            ["2021/07/21 05:00:00", 222],
-                            ["2021/07/21 10:00:00", 311],
-                            ["2021/07/21 15:00:00", 82],
-                            ["2021/07/21 20:00:00", 58],
-                            ["2021/07/22 00:00:00", 186],
-                            ["2021/07/22 05:00:00", 186],
-                            ["2021/07/22 10:00:00", 312],
-                            ["2021/07/22 15:00:00", 62],
-                            ["2021/07/22 20:00:00", 40],
-                            ["2021/07/23 00:00:00", 119],
-                            ["2021/07/23 05:00:00", 314],
-                            ["2021/07/23 10:00:00", 45],
-                            ["2021/07/23 15:00:00", 308],
-                            ["2021/07/23 20:00:00", 227],
-                            ["2021/07/24 00:00:00", 54],
-                            ["2021/07/24 05:00:00", 165],
-                            ["2021/07/24 10:00:00", 337],
-                            ["2021/07/24 15:00:00", 278],
-                            ["2021/07/24 20:00:00", 35],
-                            ["2021/07/25 00:00:00", 169],
-                            ["2021/07/25 05:00:00", 344],
-                            ["2021/07/25 10:00:00", 223],
-                            ["2021/07/25 15:00:00", 309],
-                            ["2021/07/25 20:00:00", 227],
-                            ["2021/07/26 00:00:00", 303],
-                            ["2021/07/26 05:00:00", 102],
-                            ["2021/07/26 10:00:00", 238],
-                            ["2021/07/26 15:00:00", 210],
-                            ["2021/07/26 20:00:00", 198],
-                            ["2021/07/27 00:00:00", 180],
-                            ["2021/07/27 05:00:00", 168],
-                            ["2021/07/27 10:00:00", 310],
-                            ["2021/07/27 15:00:00", 210],
-                            ["2021/07/27 20:00:00", 257],
-                            ["2021/07/28 00:00:00", 316],
-                            ["2021/07/28 05:00:00", 52],
-                            ["2021/07/28 10:00:00", 202],
-                            ["2021/07/28 15:00:00", 201],
-                            ["2021/07/28 20:00:00", 150],
-                            ["2021/07/29 00:00:00", 84],
-                            ["2021/07/29 05:00:00", 267],
-                            ["2021/07/29 10:00:00", 199],
-                            ["2021/07/29 15:00:00", 249],
-                            ["2021/07/29 20:00:00", 140],
-                            ["2021/07/30 00:00:00", 56],
-                            ["2021/07/30 05:00:00", 50],
-                            ["2021/07/30 10:00:00", 147],
-                            ["2021/07/30 15:00:00", 158],
-                            ["2021/07/30 20:00:00", 318],
-                            ["2021/07/31 00:00:00", 290],
-                            ["2021/07/31 05:00:00", 338],
-                            ["2021/07/31 10:00:00", 176],
-                            ["2021/07/31 15:00:00", 90],
-                            ["2021/07/31 20:00:00", 136]
                         ],
                     },
                     {
@@ -676,156 +76,6 @@
                             ["2021/07/01 10:00:00", 313],
                             ["2021/07/01 15:00:00", 230],
                             ["2021/07/01 20:00:00", 264],
-                            ["2021/07/02 00:00:00", 272],
-                            ["2021/07/02 05:00:00", 310],
-                            ["2021/07/02 10:00:00", 176],
-                            ["2021/07/02 15:00:00", 182],
-                            ["2021/07/02 20:00:00", 248],
-                            ["2021/07/03 00:00:00", 241],
-                            ["2021/07/03 05:00:00", 225],
-                            ["2021/07/03 10:00:00", 360],
-                            ["2021/07/03 15:00:00", 222],
-                            ["2021/07/03 20:00:00", 237],
-                            ["2021/07/04 00:00:00", 252],
-                            ["2021/07/04 05:00:00", 164],
-                            ["2021/07/04 10:00:00", 320],
-                            ["2021/07/04 15:00:00", 194],
-                            ["2021/07/04 20:00:00", 319],
-                            ["2021/07/05 00:00:00", 155],
-                            ["2021/07/05 05:00:00", 328],
-                            ["2021/07/05 10:00:00", 104],
-                            ["2021/07/05 15:00:00", 157],
-                            ["2021/07/05 20:00:00", 223],
-                            ["2021/07/06 00:00:00", 156],
-                            ["2021/07/06 05:00:00", 345],
-                            ["2021/07/06 10:00:00", 352],
-                            ["2021/07/06 15:00:00", 108],
-                            ["2021/07/06 20:00:00", 167],
-                            ["2021/07/07 00:00:00", 354],
-                            ["2021/07/07 05:00:00", 338],
-                            ["2021/07/07 10:00:00", 232],
-                            ["2021/07/07 15:00:00", 359],
-                            ["2021/07/07 20:00:00", 304],
-                            ["2021/07/08 00:00:00", 271],
-                            ["2021/07/08 05:00:00", 307],
-                            ["2021/07/08 10:00:00", 315],
-                            ["2021/07/08 15:00:00", 280],
-                            ["2021/07/08 20:00:00", 302],
-                            ["2021/07/09 00:00:00", 356],
-                            ["2021/07/09 05:00:00", 196],
-                            ["2021/07/09 10:00:00", 222],
-                            ["2021/07/09 15:00:00", 317],
-                            ["2021/07/09 20:00:00", 292],
-                            ["2021/07/10 00:00:00", 314],
-                            ["2021/07/10 05:00:00", 311],
-                            ["2021/07/10 10:00:00", 292],
-                            ["2021/07/10 15:00:00", 104],
-                            ["2021/07/10 20:00:00", 297],
-                            ["2021/07/11 00:00:00", 235],
-                            ["2021/07/11 05:00:00", 293],
-                            ["2021/07/11 10:00:00", 224],
-                            ["2021/07/11 15:00:00", 137],
-                            ["2021/07/11 20:00:00", 136],
-                            ["2021/07/12 00:00:00", 144],
-                            ["2021/07/12 05:00:00", 150],
-                            ["2021/07/12 10:00:00", 267],
-                            ["2021/07/12 15:00:00", 156],
-                            ["2021/07/12 20:00:00", 201],
-                            ["2021/07/13 00:00:00", 214],
-                            ["2021/07/13 05:00:00", 324],
-                            ["2021/07/13 10:00:00", 352],
-                            ["2021/07/13 15:00:00", 117],
-                            ["2021/07/13 20:00:00", 157],
-                            ["2021/07/14 00:00:00", 166],
-                            ["2021/07/14 05:00:00", 228],
-                            ["2021/07/14 10:00:00", 344],
-                            ["2021/07/14 15:00:00", 281],
-                            ["2021/07/14 20:00:00", 224],
-                            ["2021/07/15 00:00:00", 358],
-                            ["2021/07/15 05:00:00", 200],
-                            ["2021/07/15 10:00:00", 148],
-                            ["2021/07/15 15:00:00", 352],
-                            ["2021/07/15 20:00:00", 246],
-                            ["2021/07/16 00:00:00", 340],
-                            ["2021/07/16 05:00:00", 126],
-                            ["2021/07/16 10:00:00", 205],
-                            ["2021/07/16 15:00:00", 221],
-                            ["2021/07/16 20:00:00", 280],
-                            ["2021/07/17 00:00:00", 127],
-                            ["2021/07/17 05:00:00", 149],
-                            ["2021/07/17 10:00:00", 162],
-                            ["2021/07/17 15:00:00", 297],
-                            ["2021/07/17 20:00:00", 168],
-                            ["2021/07/18 00:00:00", 292],
-                            ["2021/07/18 05:00:00", 100],
-                            ["2021/07/18 10:00:00", 110],
-                            ["2021/07/18 15:00:00", 265],
-                            ["2021/07/18 20:00:00", 185],
-                            ["2021/07/19 00:00:00", 265],
-                            ["2021/07/19 05:00:00", 354],
-                            ["2021/07/19 10:00:00", 106],
-                            ["2021/07/19 15:00:00", 206],
-                            ["2021/07/19 20:00:00", 113],
-                            ["2021/07/20 00:00:00", 193],
-                            ["2021/07/20 05:00:00", 144],
-                            ["2021/07/20 10:00:00", 359],
-                            ["2021/07/20 15:00:00", 335],
-                            ["2021/07/20 20:00:00", 239],
-                            ["2021/07/21 00:00:00", 230],
-                            ["2021/07/21 05:00:00", 357],
-                            ["2021/07/21 10:00:00", 317],
-                            ["2021/07/21 15:00:00", 264],
-                            ["2021/07/21 20:00:00", 355],
-                            ["2021/07/22 00:00:00", 284],
-                            ["2021/07/22 05:00:00", 326],
-                            ["2021/07/22 10:00:00", 184],
-                            ["2021/07/22 15:00:00", 315],
-                            ["2021/07/22 20:00:00", 102],
-                            ["2021/07/23 00:00:00", 206],
-                            ["2021/07/23 05:00:00", 292],
-                            ["2021/07/23 10:00:00", 273],
-                            ["2021/07/23 15:00:00", 156],
-                            ["2021/07/23 20:00:00", 282],
-                            ["2021/07/24 00:00:00", 146],
-                            ["2021/07/24 05:00:00", 129],
-                            ["2021/07/24 10:00:00", 270],
-                            ["2021/07/24 15:00:00", 330],
-                            ["2021/07/24 20:00:00", 302],
-                            ["2021/07/25 00:00:00", 205],
-                            ["2021/07/25 05:00:00", 132],
-                            ["2021/07/25 10:00:00", 124],
-                            ["2021/07/25 15:00:00", 182],
-                            ["2021/07/25 20:00:00", 147],
-                            ["2021/07/26 00:00:00", 319],
-                            ["2021/07/26 05:00:00", 221],
-                            ["2021/07/26 10:00:00", 126],
-                            ["2021/07/26 15:00:00", 299],
-                            ["2021/07/26 20:00:00", 164],
-                            ["2021/07/27 00:00:00", 293],
-                            ["2021/07/27 05:00:00", 337],
-                            ["2021/07/27 10:00:00", 159],
-                            ["2021/07/27 15:00:00", 256],
-                            ["2021/07/27 20:00:00", 118],
-                            ["2021/07/28 00:00:00", 193],
-                            ["2021/07/28 05:00:00", 138],
-                            ["2021/07/28 10:00:00", 273],
-                            ["2021/07/28 15:00:00", 217],
-                            ["2021/07/28 20:00:00", 274],
-                            ["2021/07/29 00:00:00", 138],
-                            ["2021/07/29 05:00:00", 223],
-                            ["2021/07/29 10:00:00", 338],
-                            ["2021/07/29 15:00:00", 340],
-                            ["2021/07/29 20:00:00", 205],
-                            ["2021/07/30 00:00:00", 293],
-                            ["2021/07/30 05:00:00", 170],
-                            ["2021/07/30 10:00:00", 103],
-                            ["2021/07/30 15:00:00", 147],
-                            ["2021/07/30 20:00:00", 231],
-                            ["2021/07/31 00:00:00", 305],
-                            ["2021/07/31 05:00:00", 359],
-                            ["2021/07/31 10:00:00", 115],
-                            ["2021/07/31 15:00:00", 215],
-                            ["2021/07/31 20:00:00", 224]
                         ],
                     }
                 ],
@@ -905,6 +155,7 @@
                 });
             },
             yAxis() {
+				let themeName = this.$store.state.themeName.split(' ')[1];
                 let result = [];
                 let p = {left: 0, right: 0};
                 this.yAxises.forEach((item, index) => {
@@ -923,7 +174,7 @@
                         //分格线
                         splitLine: {
                             lineStyle: {
-                                color: partten.getColor("gray"),
+                                color: themeName === "dark"? partten.getColor("gray"): "#000",
                                 type: "dashed",
                             },
                         },
@@ -984,9 +235,10 @@
         methods: {
             resize() {},
             initChart() {
+				let themeName = this.$store.state.themeName.split(' ')[1];
                 const chart = echarts.init(this.$el);
 
-                let option = this.option();
+                let option = this.option(themeName);
                 console.log(option)
                 chart.clear();
                 chart.setOption(option);
@@ -997,15 +249,15 @@
 
                 window.addEventListener("resize", this.resize);
             },
-            option: function () {
+            option: function (themeName) {
                 return {
                     color: this.color,
                     tooltip: {
                         trigger: "axis",
-                        backgroundColor: "rgba(0,0,0,0.4)",
-                        borderColor: partten.getColor("gray"),
+                        backgroundColor: themeName === "dark"? "rgba(0,0,0,0.4)": "rgba(255,255,255,0.5)",
+                        borderColor: themeName === "dark"? partten.getColor("gray"): "#000",
                         textStyle: {
-                            color: "#fff",
+                            color: themeName === "dark" ? "#fff" : "#000",
                             fontSize: 14,
                         },
                     },
@@ -1015,9 +267,9 @@
                         right: 56,
                         icon: "circle",
                         itemWidth: 6,
-                        inactiveColor: partten.getColor("gray"),
+                        inactiveColor: themeName === "dark"? partten.getColor("gray"): "#000",
                         textStyle: {
-                            color: partten.getColor("grayl"),
+                            color: themeName === "dark"? partten.getColor("grayl"): "#000",
                             fontSize: 12,
                         },
                     },
@@ -1031,13 +283,13 @@
                         handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
                         handleSize: '110%',
                         handleStyle: {
-                            color: "#05bb4c",
+                            color: themeName === "dark"?"#05bb4c":  partten.getColor("deepblue"),
                         },
                         textStyle:{
-                            color:"rgba(204,187,225,0.5)",
+                            color: themeName === "dark"? "rgba(204,187,225,0.5)": "#000",
                         },
-                        fillerColor:"rgba(5,187,76,0.4)",
-                        borderColor: "rgba(5,187,76,0.5)",
+                        fillerColor:themeName === "dark"?"rgba(5,187,76,0.4)":"rgba(54, 52, 142,0.4)",
+                        borderColor:themeName === "dark"?"rgba(5,187,76,0.5)":"rgba(54, 52, 142,0.5)",
 
                     }, {
                         type: "inside",
@@ -1061,7 +313,7 @@
                                 // formatter: "{value}",
                                 fontSize: util.vh(14),
                                 textStyle: {
-                                    color: partten.getColor("gray"),
+                                    color: themeName === "dark"? partten.getColor("gray"): "#000",
                                 },
                             },
                             // data: this.xdata,
@@ -1104,6 +356,11 @@
         unmounted() {
             window.removeEventListener("resize", this.resize);
         },
+		watch: {
+		    "$store.state.themeName"() {
+		      this.initChart();
+		    },
+		  },
     };
 </script>
 

src/components/chart/other/Dashboard2.vue

@@ -37,8 +37,10 @@ export default {
   computed: {},
   methods: {
     initChart() {
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
+		 
       let chart = echarts.init(this.$el);
-
       let value = this.value;
       let option = {
         grid: {
@@ -60,7 +62,7 @@ export default {
                 width: 8,
                 color: [
                   [0, partten.getColor("gray") + "33"],
-                  [value / 100, partten.getColor("green")],
+                  [value / 100,themeName ? partten.getColor("green") : partten.getColor("blue")],
                   [1, partten.getColor("gray") + "33"],
                 ],
               },
@@ -93,7 +95,7 @@ export default {
                 return params;
               },
               textStyle: {
-                color: partten.getColor("green"),
+                color: themeName ? partten.getColor("green") : partten.getColor("blue"),
                 fontSize: util.vh(16),
               },
             },
@@ -115,7 +117,7 @@ export default {
               lineStyle: {
                 width: 1,
                 color: [
-                  [this.value / 100, partten.getColor("green")],
+                  [this.value / 100, themeName ? partten.getColor("green") : partten.getColor("blue")],
                   [1, "#fff5"],
                 ],
               },
@@ -152,6 +154,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/components/chart/other/thermometer-v-chart.vue

@@ -45,9 +45,9 @@ export default {
       return rgbaColor;
     },
     initChart() {
-      var mercuryColor = "#05BB4C";
       var borderColor = partten.getColor("gray");
-
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
       let option = {
         grid: {
           top: 0,
@@ -98,7 +98,7 @@ export default {
             barWidth: 16,
             itemStyle: {
               normal: {
-                color: mercuryColor,
+                color: themeName ? partten.getColor("green") : partten.getColor("deepblue"),
                 barBorderRadius: 100,
                 borderWidth: 8,
                 borderType: "dashed",
@@ -180,6 +180,11 @@ export default {
   updated() {
     this.initChart();
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/views/HealthControl/defect-elimination-tracking.vue

@@ -78,7 +78,7 @@ export default {
   data() {
     return {
       showMe: false,
-      header: require("@assets/logo.png"),
+      header: require("@assets/userhead.jpg"),
       infoss:'',    //msg
       infols:'',    //chart
     };

src/views/NewPages/alarm-center-1.vue

@@ -15,7 +15,7 @@
 					<div class="query-item">
 						<div class="lable">开始日期：</div>
 						<div class="search-input">
-							<el-date-picker v-model="startdate" type="date" placeholder="选择日期"
+							<el-date-picker v-model="startdate" type="datetime" placeholder="选择日期"
 								popper-class="date-select">
 							</el-date-picker>
 						</div>
@@ -23,7 +23,7 @@
 					<div class="query-item">
 						<div class="lable">结束日期：</div>
 						<div class="search-input">
-							<el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
+							<el-date-picker v-model="enddate" type="datetime" placeholder="选择日期" popper-class="date-select">
 							</el-date-picker>
 						</div>
 					</div>

src/views/WindSite/pages/Home/Station.vue

@@ -463,7 +463,9 @@ export default {
             height: 8,
             attrs: {
               body: {
-                fill: partten.getColor("green"),
+                fill:this.$store.state.themeName === "dark"
+                    ? partten.getColor("green")
+                    : partten.getColor("blue"),
                 stroke: "transparent",
                 class: "node-hover",
                 "data-item": encodeURIComponent(JSON.stringify(data)),
@@ -574,6 +576,9 @@ export default {
       });
       this.initStation();
     },
+	"$store.state.themeName"() {
+	  this.initStation();
+	},
   },
 };
 </script>

src/views/malfunctionDiagnose/index.vue

@@ -82,7 +82,7 @@
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search()">查询</button>
-		<button class="btn green" @click="">导入</button>
+		<!-- <button class="btn green" @click="">导入</button> -->
 		<button class="btn green" @click="export">导出</button>
       </div>
     </div>

src/views/malfunctionRecall/components/fault-diagnosis.vue

@@ -114,156 +114,6 @@ export default {
                         ["2021/07/01 10:00:00", 69],
                         ["2021/07/01 15:00:00", 134],
                         ["2021/07/01 20:00:00", 262],
-                        ["2021/07/02 00:00:00", 181],
-                        ["2021/07/02 05:00:00", 72],
-                        ["2021/07/02 10:00:00", 221],
-                        ["2021/07/02 15:00:00", 184],
-                        ["2021/07/02 20:00:00", 319],
-                        ["2021/07/03 00:00:00", 283],
-                        ["2021/07/03 05:00:00", 156],
-                        ["2021/07/03 10:00:00", 308],
-                        ["2021/07/03 15:00:00", 153],
-                        ["2021/07/03 20:00:00", 67],
-                        ["2021/07/04 00:00:00", 289],
-                        ["2021/07/04 05:00:00", 194],
-                        ["2021/07/04 10:00:00", 358],
-                        ["2021/07/04 15:00:00", 325],
-                        ["2021/07/04 20:00:00", 345],
-                        ["2021/07/05 00:00:00", 242],
-                        ["2021/07/05 05:00:00", 100],
-                        ["2021/07/05 10:00:00", 225],
-                        ["2021/07/05 15:00:00", 230],
-                        ["2021/07/05 20:00:00", 162],
-                        ["2021/07/06 00:00:00", 235],
-                        ["2021/07/06 05:00:00", 237],
-                        ["2021/07/06 10:00:00", 248],
-                        ["2021/07/06 15:00:00", 350],
-                        ["2021/07/06 20:00:00", 298],
-                        ["2021/07/07 00:00:00", 295],
-                        ["2021/07/07 05:00:00", 192],
-                        ["2021/07/07 10:00:00", 54],
-                        ["2021/07/07 15:00:00", 321],
-                        ["2021/07/07 20:00:00", 104],
-                        ["2021/07/08 00:00:00", 163],
-                        ["2021/07/08 05:00:00", 177],
-                        ["2021/07/08 10:00:00", 185],
-                        ["2021/07/08 15:00:00", 120],
-                        ["2021/07/08 20:00:00", 61],
-                        ["2021/07/09 00:00:00", 104],
-                        ["2021/07/09 05:00:00", 178],
-                        ["2021/07/09 10:00:00", 90],
-                        ["2021/07/09 15:00:00", 331],
-                        ["2021/07/09 20:00:00", 217],
-                        ["2021/07/10 00:00:00", 338],
-                        ["2021/07/10 05:00:00", 155],
-                        ["2021/07/10 10:00:00", 99],
-                        ["2021/07/10 15:00:00", 109],
-                        ["2021/07/10 20:00:00", 221],
-                        ["2021/07/11 00:00:00", 281],
-                        ["2021/07/11 05:00:00", 306],
-                        ["2021/07/11 10:00:00", 246],
-                        ["2021/07/11 15:00:00", 176],
-                        ["2021/07/11 20:00:00", 348],
-                        ["2021/07/12 00:00:00", 94],
-                        ["2021/07/12 05:00:00", 100],
-                        ["2021/07/12 10:00:00", 53],
-                        ["2021/07/12 15:00:00", 269],
-                        ["2021/07/12 20:00:00", 93],
-                        ["2021/07/13 00:00:00", 178],
-                        ["2021/07/13 05:00:00", 100],
-                        ["2021/07/13 10:00:00", 53],
-                        ["2021/07/13 15:00:00", 260],
-                        ["2021/07/13 20:00:00", 114],
-                        ["2021/07/14 00:00:00", 251],
-                        ["2021/07/14 05:00:00", 250],
-                        ["2021/07/14 10:00:00", 97],
-                        ["2021/07/14 15:00:00", 283],
-                        ["2021/07/14 20:00:00", 231],
-                        ["2021/07/15 00:00:00", 359],
-                        ["2021/07/15 05:00:00", 105],
-                        ["2021/07/15 10:00:00", 229],
-                        ["2021/07/15 15:00:00", 81],
-                        ["2021/07/15 20:00:00", 353],
-                        ["2021/07/16 00:00:00", 244],
-                        ["2021/07/16 05:00:00", 231],
-                        ["2021/07/16 10:00:00", 275],
-                        ["2021/07/16 15:00:00", 273],
-                        ["2021/07/16 20:00:00", 199],
-                        ["2021/07/17 00:00:00", 124],
-                        ["2021/07/17 05:00:00", 176],
-                        ["2021/07/17 10:00:00", 149],
-                        ["2021/07/17 15:00:00", 77],
-                        ["2021/07/17 20:00:00", 168],
-                        ["2021/07/18 00:00:00", 256],
-                        ["2021/07/18 05:00:00", 138],
-                        ["2021/07/18 10:00:00", 95],
-                        ["2021/07/18 15:00:00", 313],
-                        ["2021/07/18 20:00:00", 244],
-                        ["2021/07/19 00:00:00", 169],
-                        ["2021/07/19 05:00:00", 199],
-                        ["2021/07/19 10:00:00", 91],
-                        ["2021/07/19 15:00:00", 241],
-                        ["2021/07/19 20:00:00", 344],
-                        ["2021/07/20 00:00:00", 85],
-                        ["2021/07/20 05:00:00", 332],
-                        ["2021/07/20 10:00:00", 189],
-                        ["2021/07/20 15:00:00", 81],
-                        ["2021/07/20 20:00:00", 290],
-                        ["2021/07/21 00:00:00", 214],
-                        ["2021/07/21 05:00:00", 61],
-                        ["2021/07/21 10:00:00", 339],
-                        ["2021/07/21 15:00:00", 286],
-                        ["2021/07/21 20:00:00", 89],
-                        ["2021/07/22 00:00:00", 279],
-                        ["2021/07/22 05:00:00", 229],
-                        ["2021/07/22 10:00:00", 238],
-                        ["2021/07/22 15:00:00", 86],
-                        ["2021/07/22 20:00:00", 163],
-                        ["2021/07/23 00:00:00", 140],
-                        ["2021/07/23 05:00:00", 312],
-                        ["2021/07/23 10:00:00", 134],
-                        ["2021/07/23 15:00:00", 53],
-                        ["2021/07/23 20:00:00", 235],
-                        ["2021/07/24 00:00:00", 97],
-                        ["2021/07/24 05:00:00", 309],
-                        ["2021/07/24 10:00:00", 147],
-                        ["2021/07/24 15:00:00", 258],
-                        ["2021/07/24 20:00:00", 192],
-                        ["2021/07/25 00:00:00", 305],
-                        ["2021/07/25 05:00:00", 282],
-                        ["2021/07/25 10:00:00", 72],
-                        ["2021/07/25 15:00:00", 258],
-                        ["2021/07/25 20:00:00", 312],
-                        ["2021/07/26 00:00:00", 259],
-                        ["2021/07/26 05:00:00", 146],
-                        ["2021/07/26 10:00:00", 93],
-                        ["2021/07/26 15:00:00", 158],
-                        ["2021/07/26 20:00:00", 156],
-                        ["2021/07/27 00:00:00", 362],
-                        ["2021/07/27 05:00:00", 193],
-                        ["2021/07/27 10:00:00", 177],
-                        ["2021/07/27 15:00:00", 313],
-                        ["2021/07/27 20:00:00", 60],
-                        ["2021/07/28 00:00:00", 119],
-                        ["2021/07/28 05:00:00", 142],
-                        ["2021/07/28 10:00:00", 283],
-                        ["2021/07/28 15:00:00", 105],
-                        ["2021/07/28 20:00:00", 121],
-                        ["2021/07/29 00:00:00", 304],
-                        ["2021/07/29 05:00:00", 82],
-                        ["2021/07/29 10:00:00", 326],
-                        ["2021/07/29 15:00:00", 216],
-                        ["2021/07/29 20:00:00", 223],
-                        ["2021/07/30 00:00:00", 218],
-                        ["2021/07/30 05:00:00", 313],
-                        ["2021/07/30 10:00:00", 339],
-                        ["2021/07/30 15:00:00", 125],
-                        ["2021/07/30 20:00:00", 244],
-                        ["2021/07/31 00:00:00", 179],
-                        ["2021/07/31 05:00:00", 360],
-                        ["2021/07/31 10:00:00", 267],
-                        ["2021/07/31 15:00:00", 85],
-                        ["2021/07/31 20:00:00", 309]
                     ],
                 },
                 {
@@ -275,156 +125,6 @@ export default {
                         ["2021/07/01 10:00:00", 290],
                         ["2021/07/01 15:00:00", 140],
                         ["2021/07/01 20:00:00", 203],
-                        ["2021/07/02 00:00:00", 280],
-                        ["2021/07/02 05:00:00", 283],
-                        ["2021/07/02 10:00:00", 252],
-                        ["2021/07/02 15:00:00", 155],
-                        ["2021/07/02 20:00:00", 133],
-                        ["2021/07/03 00:00:00", 94],
-                        ["2021/07/03 05:00:00", 191],
-                        ["2021/07/03 10:00:00", 193],
-                        ["2021/07/03 15:00:00", 205],
-                        ["2021/07/03 20:00:00", 301],
-                        ["2021/07/04 00:00:00", 101],
-                        ["2021/07/04 05:00:00", 257],
-                        ["2021/07/04 10:00:00", 82],
-                        ["2021/07/04 15:00:00", 75],
-                        ["2021/07/04 20:00:00", 254],
-                        ["2021/07/05 00:00:00", 184],
-                        ["2021/07/05 05:00:00", 146],
-                        ["2021/07/05 10:00:00", 272],
-                        ["2021/07/05 15:00:00", 100],
-                        ["2021/07/05 20:00:00", 118],
-                        ["2021/07/06 00:00:00", 125],
-                        ["2021/07/06 05:00:00", 80],
-                        ["2021/07/06 10:00:00", 144],
-                        ["2021/07/06 15:00:00", 100],
-                        ["2021/07/06 20:00:00", 232],
-                        ["2021/07/07 00:00:00", 139],
-                        ["2021/07/07 05:00:00", 311],
-                        ["2021/07/07 10:00:00", 152],
-                        ["2021/07/07 15:00:00", 182],
-                        ["2021/07/07 20:00:00", 162],
-                        ["2021/07/08 00:00:00", 175],
-                        ["2021/07/08 05:00:00", 95],
-                        ["2021/07/08 10:00:00", 300],
-                        ["2021/07/08 15:00:00", 290],
-                        ["2021/07/08 20:00:00", 218],
-                        ["2021/07/09 00:00:00", 106],
-                        ["2021/07/09 05:00:00", 301],
-                        ["2021/07/09 10:00:00", 221],
-                        ["2021/07/09 15:00:00", 126],
-                        ["2021/07/09 20:00:00", 149],
-                        ["2021/07/10 00:00:00", 308],
-                        ["2021/07/10 05:00:00", 187],
-                        ["2021/07/10 10:00:00", 164],
-                        ["2021/07/10 15:00:00", 139],
-                        ["2021/07/10 20:00:00", 199],
-                        ["2021/07/11 00:00:00", 71],
-                        ["2021/07/11 05:00:00", 198],
-                        ["2021/07/11 10:00:00", 121],
-                        ["2021/07/11 15:00:00", 242],
-                        ["2021/07/11 20:00:00", 286],
-                        ["2021/07/12 00:00:00", 198],
-                        ["2021/07/12 05:00:00", 275],
-                        ["2021/07/12 10:00:00", 63],
-                        ["2021/07/12 15:00:00", 229],
-                        ["2021/07/12 20:00:00", 272],
-                        ["2021/07/13 00:00:00", 266],
-                        ["2021/07/13 05:00:00", 305],
-                        ["2021/07/13 10:00:00", 218],
-                        ["2021/07/13 15:00:00", 273],
-                        ["2021/07/13 20:00:00", 112],
-                        ["2021/07/14 00:00:00", 243],
-                        ["2021/07/14 05:00:00", 105],
-                        ["2021/07/14 10:00:00", 147],
-                        ["2021/07/14 15:00:00", 301],
-                        ["2021/07/14 20:00:00", 145],
-                        ["2021/07/15 00:00:00", 136],
-                        ["2021/07/15 05:00:00", 153],
-                        ["2021/07/15 10:00:00", 251],
-                        ["2021/07/15 15:00:00", 76],
-                        ["2021/07/15 20:00:00", 296],
-                        ["2021/07/16 00:00:00", 128],
-                        ["2021/07/16 05:00:00", 94],
-                        ["2021/07/16 10:00:00", 236],
-                        ["2021/07/16 15:00:00", 202],
-                        ["2021/07/16 20:00:00", 94],
-                        ["2021/07/17 00:00:00", 169],
-                        ["2021/07/17 05:00:00", 93],
-                        ["2021/07/17 10:00:00", 297],
-                        ["2021/07/17 15:00:00", 110],
-                        ["2021/07/17 20:00:00", 271],
-                        ["2021/07/18 00:00:00", 98],
-                        ["2021/07/18 05:00:00", 169],
-                        ["2021/07/18 10:00:00", 114],
-                        ["2021/07/18 15:00:00", 190],
-                        ["2021/07/18 20:00:00", 62],
-                        ["2021/07/19 00:00:00", 151],
-                        ["2021/07/19 05:00:00", 239],
-                        ["2021/07/19 10:00:00", 135],
-                        ["2021/07/19 15:00:00", 281],
-                        ["2021/07/19 20:00:00", 190],
-                        ["2021/07/20 00:00:00", 65],
-                        ["2021/07/20 05:00:00", 207],
-                        ["2021/07/20 10:00:00", 140],
-                        ["2021/07/20 15:00:00", 272],
-                        ["2021/07/20 20:00:00", 195],
-                        ["2021/07/21 00:00:00", 66],
-                        ["2021/07/21 05:00:00", 163],
-                        ["2021/07/21 10:00:00", 306],
-                        ["2021/07/21 15:00:00", 213],
-                        ["2021/07/21 20:00:00", 154],
-                        ["2021/07/22 00:00:00", 305],
-                        ["2021/07/22 05:00:00", 223],
-                        ["2021/07/22 10:00:00", 201],
-                        ["2021/07/22 15:00:00", 224],
-                        ["2021/07/22 20:00:00", 63],
-                        ["2021/07/23 00:00:00", 226],
-                        ["2021/07/23 05:00:00", 75],
-                        ["2021/07/23 10:00:00", 309],
-                        ["2021/07/23 15:00:00", 191],
-                        ["2021/07/23 20:00:00", 219],
-                        ["2021/07/24 00:00:00", 142],
-                        ["2021/07/24 05:00:00", 162],
-                        ["2021/07/24 10:00:00", 260],
-                        ["2021/07/24 15:00:00", 260],
-                        ["2021/07/24 20:00:00", 249],
-                        ["2021/07/25 00:00:00", 278],
-                        ["2021/07/25 05:00:00", 187],
-                        ["2021/07/25 10:00:00", 101],
-                        ["2021/07/25 15:00:00", 200],
-                        ["2021/07/25 20:00:00", 261],
-                        ["2021/07/26 00:00:00", 161],
-                        ["2021/07/26 05:00:00", 227],
-                        ["2021/07/26 10:00:00", 289],
-                        ["2021/07/26 15:00:00", 85],
-                        ["2021/07/26 20:00:00", 88],
-                        ["2021/07/27 00:00:00", 237],
-                        ["2021/07/27 05:00:00", 198],
-                        ["2021/07/27 10:00:00", 260],
-                        ["2021/07/27 15:00:00", 146],
-                        ["2021/07/27 20:00:00", 288],
-                        ["2021/07/28 00:00:00", 213],
-                        ["2021/07/28 05:00:00", 250],
-                        ["2021/07/28 10:00:00", 77],
-                        ["2021/07/28 15:00:00", 75],
-                        ["2021/07/28 20:00:00", 153],
-                        ["2021/07/29 00:00:00", 263],
-                        ["2021/07/29 05:00:00", 173],
-                        ["2021/07/29 10:00:00", 105],
-                        ["2021/07/29 15:00:00", 239],
-                        ["2021/07/29 20:00:00", 69],
-                        ["2021/07/30 00:00:00", 126],
-                        ["2021/07/30 05:00:00", 238],
-                        ["2021/07/30 10:00:00", 62],
-                        ["2021/07/30 15:00:00", 277],
-                        ["2021/07/30 20:00:00", 61],
-                        ["2021/07/31 00:00:00", 91],
-                        ["2021/07/31 05:00:00", 201],
-                        ["2021/07/31 10:00:00", 238],
-                        ["2021/07/31 15:00:00", 307],
-                        ["2021/07/31 20:00:00", 86]
                     ],
                 },
                 {
@@ -436,156 +136,6 @@ export default {
                         ["2021/07/01 10:00:00", 231],
                         ["2021/07/01 15:00:00", 305],
                         ["2021/07/01 20:00:00", 230],
-                        ["2021/07/02 00:00:00", 248],
-                        ["2021/07/02 05:00:00", 295],
-                        ["2021/07/02 10:00:00", 147],
-                        ["2021/07/02 15:00:00", 242],
-                        ["2021/07/02 20:00:00", 317],
-                        ["2021/07/03 00:00:00", 218],
-                        ["2021/07/03 05:00:00", 217],
-                        ["2021/07/03 10:00:00", 274],
-                        ["2021/07/03 15:00:00", 329],
-                        ["2021/07/03 20:00:00", 148],
-                        ["2021/07/04 00:00:00", 316],
-                        ["2021/07/04 05:00:00", 270],
-                        ["2021/07/04 10:00:00", 173],
-                        ["2021/07/04 15:00:00", 318],
-                        ["2021/07/04 20:00:00", 297],
-                        ["2021/07/05 00:00:00", 322],
-                        ["2021/07/05 05:00:00", 182],
-                        ["2021/07/05 10:00:00", 170],
-                        ["2021/07/05 15:00:00", 199],
-                        ["2021/07/05 20:00:00", 258],
-                        ["2021/07/06 00:00:00", 128],
-                        ["2021/07/06 05:00:00", 323],
-                        ["2021/07/06 10:00:00", 142],
-                        ["2021/07/06 15:00:00", 312],
-                        ["2021/07/06 20:00:00", 174],
-                        ["2021/07/07 00:00:00", 158],
-                        ["2021/07/07 05:00:00", 317],
-                        ["2021/07/07 10:00:00", 154],
-                        ["2021/07/07 15:00:00", 262],
-                        ["2021/07/07 20:00:00", 180],
-                        ["2021/07/08 00:00:00", 204],
-                        ["2021/07/08 05:00:00", 307],
-                        ["2021/07/08 10:00:00", 232],
-                        ["2021/07/08 15:00:00", 124],
-                        ["2021/07/08 20:00:00", 126],
-                        ["2021/07/09 00:00:00", 300],
-                        ["2021/07/09 05:00:00", 289],
-                        ["2021/07/09 10:00:00", 278],
-                        ["2021/07/09 15:00:00", 211],
-                        ["2021/07/09 20:00:00", 116],
-                        ["2021/07/10 00:00:00", 271],
-                        ["2021/07/10 05:00:00", 197],
-                        ["2021/07/10 10:00:00", 296],
-                        ["2021/07/10 15:00:00", 107],
-                        ["2021/07/10 20:00:00", 153],
-                        ["2021/07/11 00:00:00", 221],
-                        ["2021/07/11 05:00:00", 196],
-                        ["2021/07/11 10:00:00", 108],
-                        ["2021/07/11 15:00:00", 190],
-                        ["2021/07/11 20:00:00", 141],
-                        ["2021/07/12 00:00:00", 98],
-                        ["2021/07/12 05:00:00", 192],
-                        ["2021/07/12 10:00:00", 190],
-                        ["2021/07/12 15:00:00", 327],
-                        ["2021/07/12 20:00:00", 260],
-                        ["2021/07/13 00:00:00", 221],
-                        ["2021/07/13 05:00:00", 240],
-                        ["2021/07/13 10:00:00", 280],
-                        ["2021/07/13 15:00:00", 234],
-                        ["2021/07/13 20:00:00", 326],
-                        ["2021/07/14 00:00:00", 143],
-                        ["2021/07/14 05:00:00", 329],
-                        ["2021/07/14 10:00:00", 156],
-                        ["2021/07/14 15:00:00", 152],
-                        ["2021/07/14 20:00:00", 316],
-                        ["2021/07/15 00:00:00", 125],
-                        ["2021/07/15 05:00:00", 322],
-                        ["2021/07/15 10:00:00", 174],
-                        ["2021/07/15 15:00:00", 286],
-                        ["2021/07/15 20:00:00", 122],
-                        ["2021/07/16 00:00:00", 145],
-                        ["2021/07/16 05:00:00", 122],
-                        ["2021/07/16 10:00:00", 313],
-                        ["2021/07/16 15:00:00", 144],
-                        ["2021/07/16 20:00:00", 150],
-                        ["2021/07/17 00:00:00", 322],
-                        ["2021/07/17 05:00:00", 130],
-                        ["2021/07/17 10:00:00", 189],
-                        ["2021/07/17 15:00:00", 99],
-                        ["2021/07/17 20:00:00", 165],
-                        ["2021/07/18 00:00:00", 235],
-                        ["2021/07/18 05:00:00", 127],
-                        ["2021/07/18 10:00:00", 104],
-                        ["2021/07/18 15:00:00", 233],
-                        ["2021/07/18 20:00:00", 178],
-                        ["2021/07/19 00:00:00", 171],
-                        ["2021/07/19 05:00:00", 123],
-                        ["2021/07/19 10:00:00", 305],
-                        ["2021/07/19 15:00:00", 113],
-                        ["2021/07/19 20:00:00", 299],
-                        ["2021/07/20 00:00:00", 157],
-                        ["2021/07/20 05:00:00", 165],
-                        ["2021/07/20 10:00:00", 147],
-                        ["2021/07/20 15:00:00", 181],
-                        ["2021/07/20 20:00:00", 261],
-                        ["2021/07/21 00:00:00", 123],
-                        ["2021/07/21 05:00:00", 317],
-                        ["2021/07/21 10:00:00", 203],
-                        ["2021/07/21 15:00:00", 284],
-                        ["2021/07/21 20:00:00", 232],
-                        ["2021/07/22 00:00:00", 124],
-                        ["2021/07/22 05:00:00", 106],
-                        ["2021/07/22 10:00:00", 233],
-                        ["2021/07/22 15:00:00", 169],
-                        ["2021/07/22 20:00:00", 214],
-                        ["2021/07/23 00:00:00", 122],
-                        ["2021/07/23 05:00:00", 145],
-                        ["2021/07/23 10:00:00", 160],
-                        ["2021/07/23 15:00:00", 260],
-                        ["2021/07/23 20:00:00", 310],
-                        ["2021/07/24 00:00:00", 234],
-                        ["2021/07/24 05:00:00", 130],
-                        ["2021/07/24 10:00:00", 248],
-                        ["2021/07/24 15:00:00", 257],
-                        ["2021/07/24 20:00:00", 178],
-                        ["2021/07/25 00:00:00", 239],
-                        ["2021/07/25 05:00:00", 111],
-                        ["2021/07/25 10:00:00", 159],
-                        ["2021/07/25 15:00:00", 101],
-                        ["2021/07/25 20:00:00", 237],
-                        ["2021/07/26 00:00:00", 299],
-                        ["2021/07/26 05:00:00", 319],
-                        ["2021/07/26 10:00:00", 135],
-                        ["2021/07/26 15:00:00", 250],
-                        ["2021/07/26 20:00:00", 308],
-                        ["2021/07/27 00:00:00", 208],
-                        ["2021/07/27 05:00:00", 208],
-                        ["2021/07/27 10:00:00", 324],
-                        ["2021/07/27 15:00:00", 122],
-                        ["2021/07/27 20:00:00", 117],
-                        ["2021/07/28 00:00:00", 129],
-                        ["2021/07/28 05:00:00", 121],
-                        ["2021/07/28 10:00:00", 166],
-                        ["2021/07/28 15:00:00", 303],
-                        ["2021/07/28 20:00:00", 262],
-                        ["2021/07/29 00:00:00", 200],
-                        ["2021/07/29 05:00:00", 229],
-                        ["2021/07/29 10:00:00", 122],
-                        ["2021/07/29 15:00:00", 122],
-                        ["2021/07/29 20:00:00", 225],
-                        ["2021/07/30 00:00:00", 227],
-                        ["2021/07/30 05:00:00", 247],
-                        ["2021/07/30 10:00:00", 102],
-                        ["2021/07/30 15:00:00", 285],
-                        ["2021/07/30 20:00:00", 167],
-                        ["2021/07/31 00:00:00", 119],
-                        ["2021/07/31 05:00:00", 212],
-                        ["2021/07/31 10:00:00", 277],
-                        ["2021/07/31 15:00:00", 159],
-                        ["2021/07/31 20:00:00", 179]
                     ],
                 },
                 {