From c2268af8428043b9b7a4f0dfcf681529404f69c5 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Thu, 3 Mar 2022 16:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts      |  6 ++--
 src/components/ModeTree.vue         |  2 +-
 src/components/PlanTree.vue         |  2 +-
 src/components/PollingTree.vue      |  2 +-
 src/components/SignalSourceTree.vue |  4 +--
 src/entities/WSProtocol.ts          | 14 ++++-----
 src/i18n/zh-CN/index.ts             |  3 ++
 src/pages/TopToolBar.vue            | 45 ++++++++++++++++++++++-------
 src/pages/WallPage.vue              |  2 +-
 src/store/index.ts                  | 11 ++++++-
 10 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index f03e1f0..4dc7f38 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -768,13 +768,13 @@ export default class ClientConnection {
     );
   }
 
-  public async setPollingData(
+  public async setWindowPollingData(
     window_id: number,
     name: string,
     datas?: StringKeyValueEntity[]
   ) {
-    return await this.doRpc<Protocol.SetPollingDataResponseEntity>(
-      new Protocol.SetPollingDataRequestEntity(window_id, name, datas)
+    return await this.doRpc<Protocol.SetWindowPollingDataResponseEntity>(
+      new Protocol.SetWindowPollingDataRequestEntity(window_id, name, datas)
     );
   }
 
diff --git a/src/components/ModeTree.vue b/src/components/ModeTree.vue
index ef7e319..b0924d0 100644
--- a/src/components/ModeTree.vue
+++ b/src/components/ModeTree.vue
@@ -182,7 +182,7 @@ export default defineComponent({
     const tree: any | null = ref(null);
 
     onMounted(async () => {
-      while (!tree.value.nodes.length) {
+      while (!tree.value?.nodes?.length) {
         await Common.waitFor(100);
       }
       tree.value?.setExpanded("", true);
diff --git a/src/components/PlanTree.vue b/src/components/PlanTree.vue
index 1dbc665..e3b9821 100644
--- a/src/components/PlanTree.vue
+++ b/src/components/PlanTree.vue
@@ -203,7 +203,7 @@ export default defineComponent({
     const tree: any | null = ref(null);
 
     onMounted(async () => {
-      while (!tree.value.nodes.length) {
+      while (!tree.value?.nodes?.length) {
         await Common.waitFor(100);
       }
       tree.value?.setExpanded("", true);
diff --git a/src/components/PollingTree.vue b/src/components/PollingTree.vue
index 0ac2086..b8302a3 100644
--- a/src/components/PollingTree.vue
+++ b/src/components/PollingTree.vue
@@ -148,7 +148,7 @@ export default defineComponent({
     const polling_setting_dialog: Ref<any> = ref(null);
 
     onMounted(async () => {
-      while (!tree.value.nodes.length) {
+      while (!tree.value?.nodes?.length) {
         await Common.waitFor(100);
       }
       tree.value?.setExpanded("", true);
diff --git a/src/components/SignalSourceTree.vue b/src/components/SignalSourceTree.vue
index 192bb10..bb3792b 100644
--- a/src/components/SignalSourceTree.vue
+++ b/src/components/SignalSourceTree.vue
@@ -5,7 +5,7 @@
         <q-item
           class="full-width"
           clickable
-          :draggable="!prop.node.is_group && !prop.node.local_file_flag"
+          :draggable="!prop.node.is_group"
           @dragstart="(evt) => onDragStart(evt, prop.node)"
           @click="
             $store.commit(
@@ -178,7 +178,7 @@ export default defineComponent({
     const tree: any | null = ref(null);
 
     onMounted(async () => {
-      while (!tree.value.nodes.length) {
+      while (!tree.value?.nodes?.length) {
         await Common.waitFor(100);
       }
       tree.value?.setExpanded("", true);
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index f44462a..d6cabe6 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -308,8 +308,8 @@ export namespace Protocol {
     public static get kStopPolling() {
       return Commands.PROTOCOL_PREFIX + "StopPolling";
     }
-    public static get kRpcSetPollingData() {
-      return Commands.PROTOCOL_PREFIX + "RpcSetPollingData";
+    public static get kRpcSetWindowPollingData() {
+      return Commands.PROTOCOL_PREFIX + "RpcSetWindowPollingData";
     }
     public static get kPollingStateChanged() {
       return Commands.PROTOCOL_PREFIX + "PollingStateChanged";
@@ -403,7 +403,7 @@ export namespace Protocol {
       Commands.kPauseWindow,
       Commands.kPlayWindow,
       Commands.kPollingStateChanged,
-      Commands.kRpcSetPollingData,
+      Commands.kRpcSetWindowPollingData,
       Commands.kStopPolling,
       Commands.kStartPolling,
       Commands.kPollingStateChanged,
@@ -1751,7 +1751,7 @@ export namespace Protocol {
     }
   }
 
-  export class SetPollingDataRequestEntity extends Protocol.PacketEntity {
+  export class SetWindowPollingDataRequestEntity extends Protocol.PacketEntity {
     datas: StringKeyValueEntity[] = [];
     name: string;
     window_id: number = 0;
@@ -1763,7 +1763,7 @@ export namespace Protocol {
     ) {
       super();
       this.rpc_id = rcp_id ?? 0;
-      this.command = Protocol.Commands.kRpcSetPollingData;
+      this.command = Protocol.Commands.kRpcSetWindowPollingData;
       if (Array.isArray(datas)) {
         if (datas.length % 2) {
           datas.splice(datas.length - 1, 1);
@@ -1775,12 +1775,12 @@ export namespace Protocol {
     }
   }
 
-  export class SetPollingDataResponseEntity extends Protocol.PacketEntity {
+  export class SetWindowPollingDataResponseEntity extends Protocol.PacketEntity {
     success = false;
 
     constructor() {
       super();
-      this.command = Protocol.Commands.kRpcSetPollingData;
+      this.command = Protocol.Commands.kRpcSetWindowPollingData;
     }
   }
 
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 93b1363..b45355f 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -345,4 +345,7 @@ export default {
   "new polling": "新建轮询",
   "add polling": "添加轮询",
   "edit polling": "修改轮询",
+  HH: "时",
+  MM: "分",
+  SS: "秒",
 };
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index f870758..4fa4a68 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -219,9 +219,9 @@
       <q-separator vertical inset />
 
       <q-item>
-        <q-item-section avatar style="margin-right: 0px; padding-right: 0px"
-          ><q-icon class="text-white" name="img:svgs/fan.svg"
-        /></q-item-section>
+        <q-item-section avatar style="margin-right: 0px; padding-right: 0px">
+          <q-icon class="text-white rotate" name="img:svgs/fan.svg" />
+        </q-item-section>
         <q-item-section style="margin-left: -25px">
           {{ $store.state.fan_temp.toFixed(1) }} ℃
         </q-item-section>
@@ -238,6 +238,22 @@
   <about-dialog ref="about_dialog" />
 </template>
 
+<style scoped>
+@keyframes rotate {
+  0% {
+    transform: rotate(0);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.rotate {
+  animation: rotate 1.5s linear infinite;
+}
+</style>
+
 <script lang="ts">
 import { defineComponent, ref, computed } from "vue";
 import { useStore } from "src/store";
@@ -291,6 +307,13 @@ export default defineComponent({
       () => $store.state.current_running_plan.trim() != ""
     );
 
+    const get_time_text = (s: number) => {
+      const hh = (s / 3600).toFixed(0);
+      const mm = ((s % 3600) / 60).toFixed(0);
+      const ss = ((s % 3600) % 60).toFixed(0);
+      return hh + $t.t("HH") + mm + $t.t("MM") + ss + $t.t("SS");
+    };
+
     return {
       show_advanced_menu,
       plan_running,
@@ -391,19 +414,19 @@ export default defineComponent({
           ${$t.t("device resolution")} : ${$store.state.device_screen_width}X${
             $store.state.device_screen_height
           }@${$store.state.device_screen_refresh_rate}<br />
-          ${$t.t("system run time")} :  ${system_run_time} ${$t.t("s")} <br />
+          ${$t.t("system run time")} :  ${get_time_text(system_run_time)} <br />
           ${$t.t("system idle rate")} :  ${(
-            system_idle_time /
-            (system_run_time * 4)
-          ).toFixed(2)} % <br />
+            (system_idle_time / (system_run_time * 4)) *
+            100
+          ).toFixed(0)} % <br />
+          ${$t.t("server run time")} :  ${get_time_text(server_run_time)} <br />
+          ${$t.t("server all run time")} :  ${get_time_text(
+            server_all_run_time
+          )} <br />
           ${$t.t("current server system time")} : ${$date.formatDate(
             new Date(current_system_time),
             "YYYY-MM-DD HH:mm:ss"
           )}<br />
-          ${$t.t("server run time")} :  ${server_run_time} ${$t.t("s")} <br />
-          ${$t.t("server all run time")} :  ${server_all_run_time} ${$t.t(
-            "s"
-          )} <br />
           </div>`,
         });
       },
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index b6c0aa2..23c9228 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -900,7 +900,7 @@ export default defineComponent({
               try {
                 const resposne = await GlobalData.getInstance()
                   .getCurrentClient()
-                  ?.setPollingData(window_id, name, datas);
+                  ?.setWindowPollingData(window_id, name, datas);
                 if (resposne) {
                   if (resposne.success) {
                     $q.notify({
diff --git a/src/store/index.ts b/src/store/index.ts
index 011ddf1..c3abb37 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -485,6 +485,9 @@ export default store(function (/* { ssrContext } */) {
           const parent = playload.parent ?? "";
           const is_group = playload.is_group ?? false;
           let item_data = playload.item_data ?? new SignalSourceEntity();
+          if (item_data && item_data.local_file_flag) {
+            return;
+          }
           let node = _TreeHelper.findNode(
             state.signal_source_tree[0],
             "uuid",
@@ -569,7 +572,13 @@ export default store(function (/* { ssrContext } */) {
                 false,
                 item
               );
-              parent.children.push(node_item);
+              if (
+                node_item &&
+                node_item.item_data &&
+                !node_item.item_data.local_file_flag
+              ) {
+                parent.children.push(node_item);
+              }
             }
           }
         };