feat:还原User Activity

src/views/dashboard/overview/css/index.css

@@ -206,7 +206,7 @@
 /* 流量统计 */
 .upfFlowTotal {
   /* min-height: 7.5rem; */
-  height: 20.4%;
+  height: 14.4%;
 }
 .upfFlowTotal .inner h3 {
   display: flex;

src/views/dashboard/overview/index.vue

@@ -702,44 +702,44 @@ onBeforeUnmount(() => {
       </div>
 
       <!-- 用户行为 -->
-<!--      <div class="userActivity panel">-->
-<!--        <div class="inner">-->
-<!--          <h3>-->
-<!--            <WhatsAppOutlined style="color: #68d8fe" />&nbsp;&nbsp;-->
-<!--            {{ t('views.dashboard.overview.userActivity.title') }}-->
-<!--          </h3>-->
-<!--          <div class="chart">-->
-<!--            <UserActivity />-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
       <div class="userActivity panel">
         <div class="inner">
-          <h3 style="display: flex; align-items: center">
+          <h3>
-            <DashboardOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+            <WhatsAppOutlined style="color: #68d8fe" />&nbsp;&nbsp;
-            {{ t('views.dashboard.overview.resources.title') }}：
+            {{ t('views.dashboard.overview.userActivity.title') }}
-            <a-dropdown
-              :trigger="['click']"
-              :get-Popup-Container="getPopupContainer"
-            >
-              <div class="toDeep-text">
-                {{ graphNodeClickID }}
-                <DownOutlined style="margin-left: 12px; font-size: 12px" />
-              </div>
-              <template #overlay>
-                <a-menu @click="fnSelectNeRe">
-                  <a-menu-item v-for="v in onlineOtions" :key="v.value">
-                    {{ v.label }}
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
           </h3>
           <div class="chart">
-            <NeResources />
+            <UserActivity />
           </div>
         </div>
       </div>
+<!--      <div class="userActivity panel">-->
+<!--        <div class="inner">-->
+<!--          <h3 style="display: flex; align-items: center">-->
+<!--            <DashboardOutlined style="color: #68d8fe" />&nbsp;&nbsp;-->
+<!--            {{ t('views.dashboard.overview.resources.title') }}：-->
+<!--            <a-dropdown-->
+<!--              :trigger="['click']"-->
+<!--              :get-Popup-Container="getPopupContainer"-->
+<!--            >-->
+<!--              <div class="toDeep-text">-->
+<!--                {{ graphNodeClickID }}-->
+<!--                <DownOutlined style="margin-left: 12px; font-size: 12px" />-->
+<!--              </div>-->
+<!--              <template #overlay>-->
+<!--                <a-menu @click="fnSelectNeRe">-->
+<!--                  <a-menu-item v-for="v in onlineOtions" :key="v.value">-->
+<!--                    {{ v.label }}-->
+<!--                  </a-menu-item>-->
+<!--                </a-menu>-->
+<!--              </template>-->
+<!--            </a-dropdown>-->
+<!--          </h3>-->
+<!--          <div class="chart">-->
+<!--            <NeResources />-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
     </div>
     <div class="column" style="flex: 4; margin: 1.333rem 0.833rem 0">
       <!-- 实时流量 -->
@@ -862,34 +862,34 @@ onBeforeUnmount(() => {
           </div>
         </div>
       </div>
-<!--      &lt;!&ndash; 资源情况 &ndash;&gt;-->
+      <!-- 资源情况 -->
-<!--      <div class="resources panel">-->
+      <div class="resources panel">
-<!--        <div class="inner">-->
+        <div class="inner">
-<!--          <h3 style="display: flex; align-items: center">-->
+          <h3 style="display: flex; align-items: center">
-<!--            <DashboardOutlined style="color: #68d8fe" />&nbsp;&nbsp;-->
+            <DashboardOutlined style="color: #68d8fe" />&nbsp;&nbsp;
-<!--            {{ t('views.dashboard.overview.resources.title') }}：-->
+            {{ t('views.dashboard.overview.resources.title') }}：
-<!--            <a-dropdown-->
+            <a-dropdown
-<!--              :trigger="['click']"-->
+              :trigger="['click']"
-<!--              :get-Popup-Container="getPopupContainer"-->
+              :get-Popup-Container="getPopupContainer"
-<!--            >-->
+            >
-<!--              <div class="toDeep-text">-->
+              <div class="toDeep-text">
-<!--                {{ graphNodeClickID }}-->
+                {{ graphNodeClickID }}
-<!--                <DownOutlined style="margin-left: 12px; font-size: 12px" />-->
+                <DownOutlined style="margin-left: 12px; font-size: 12px" />
-<!--              </div>-->
+              </div>
-<!--              <template #overlay>-->
+              <template #overlay>
-<!--                <a-menu @click="fnSelectNeRe">-->
+                <a-menu @click="fnSelectNeRe">
-<!--                  <a-menu-item v-for="v in onlineOtions" :key="v.value">-->
+                  <a-menu-item v-for="v in onlineOtions" :key="v.value">
-<!--                    {{ v.label }}-->
+                    {{ v.label }}
-<!--                  </a-menu-item>-->
+                  </a-menu-item>
-<!--                </a-menu>-->
+                </a-menu>
-<!--              </template>-->
+              </template>
-<!--            </a-dropdown>-->
+            </a-dropdown>
-<!--          </h3>-->
+          </h3>
-<!--          <div class="chart">-->
+          <div class="chart">
-<!--            <NeResources />-->
+            <NeResources />
-<!--          </div>-->
+          </div>
-<!--        </div>-->
+        </div>
-<!--      </div>-->
+      </div>
       </div>
     </div>
 <!--  </div>-->