From 19e748acfbb114c85426c393925a15265565148b Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sun, 10 Sep 2023 11:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E6=96=B9=E6=B7=BB=E5=8A=A0=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                           | 8 ++++----
 src/components/Audit.vue       | 9 +++++----
 src/components/Formula.vue     | 2 +-
 src/store/modules/websocket.js | 3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index c4ae906..fe3f0dd 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
-# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
+VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
+VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
 
-VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
-VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
+# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
+# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
diff --git a/src/components/Audit.vue b/src/components/Audit.vue
index cab330c..31c6099 100644
--- a/src/components/Audit.vue
+++ b/src/components/Audit.vue
@@ -18,9 +18,9 @@
         :key="item?.id"
       >
         <div class="username">{{ item?.uid }}</div>
-        <div class="oper">{{ item?.behaviorZH }}</div>
+        <div class="oper">{{ `${item?.behaviorZH}${item?.behaviorinfo}` }}</div>
         <div class="time">
-          {{ moment(item?.date).format('YYYY-MM-DD HH:mm:ss') }}
+          {{ item?.date }}
         </div>
       </div>
       <svg
@@ -79,6 +79,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .audit_container {
   margin-bottom: 19px;
+  overflow: hidden;
   height: 580px;
   box-sizing: border-box;
   background: #ffffff;
@@ -123,14 +124,14 @@ onMounted(() => {
         text-align: center;
       }
       .oper {
-        width: 550px;
+        width: 600px;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
         text-align: center;
       }
       .time {
-        width: 200px;
+        width: 230px;
         overflow: hidden;
         text-align: center;
         white-space: nowrap;
diff --git a/src/components/Formula.vue b/src/components/Formula.vue
index 5bbc465..a58c06a 100644
--- a/src/components/Formula.vue
+++ b/src/components/Formula.vue
@@ -163,7 +163,7 @@ const addNewPre = () => {
 }
 
 onMounted(() => {
-  // webSocketStore.sendCommandMsg(getAllFormulaJSON)
+  webSocketStore.sendCommandMsg(getAllFormulaJSON)
 })
 </script>
 
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index c1606cc..1457659 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -183,7 +183,8 @@ export const useWebSocketStore = defineStore({
             break
           case 'getAllFormula':
             const { formula } = JSON.parse(ev.data) || {}
-            formulaStore.updateFormulaList(formula || [])
+            const { formulas } = formula || {}
+            formulaStore.updateFormulaList(formulas || [])
             break
           case 'getUserBehaviorRecordDescJson':
             const { records } = JSON.parse(ev.data) || {}