Merge remote-tracking branch 'origin/master'

# Conflicts:
#	echarts-screen/src/components/PieCon.vue
#	echarts-screen/src/views/Brand.vue

echarts-screen/src/views/Brand.vue

@@ -9,11 +9,13 @@
                 </div>
                 <h2>疫情数据分析</h2>
                 <div class="showTime">
-                    <span class="time">{{ nowTime }}</span>
+                  <span class="upDate">数据更新至 {{ date }}</span>
+                </div>
+              <div class="showTime1">
                     <span class="date">
-                        <span>{{ week }}</span>
-                        <span>{{ date }}</span>
-                    </span>
+                      <span class="time">当前时间: {{ nowTime }}</span>
+                      <span>{{ week }}</span>
+          </span>
                 </div>
             </header>
 
@@ -25,7 +27,7 @@
                         <div class="panel-footer"></div>
                     </div>
                     <div class="panel">
-                        <h2>新增病例情况</h2>
+                        <h2>新增确诊</h2>
                         <PieCon/>
                         <div class="panel-footer"></div>
                     </div>
@@ -10136,7 +10138,6 @@
                         margin-bottom: 0.1875rem;
 
                         &:before {
-                            display: flex;
                             position: absolute;
                             top: 0;
                             left: 0;