SettingEdit

.env

@@ -1,2 +1,2 @@
-VITE_BASE_WS1_URL=ws://192.168.8.12:19001/
-VITE_BASE_WS2_URL=ws://192.168.8.12:19002/
+VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
+VITE_BASE_WS2_URL=ws://127.0.0.1:19002/

src/components/LoginForm.vue

@@ -107,7 +107,7 @@ const handleLogin = () => {
           props.hideLoginModal()
           // 判断是否在消毒中，如果在消毒中，将TAB切换到设置
         } else {
-          window.location.href = 'http://127.0.0.1/#/home'
+          router.push({path:'/home'});
         }
       }
     })

src/components/Operator.vue

@@ -630,9 +630,9 @@ const showLogPicker = () => {
 
 const timer = ref(null)
 onMounted(() => {
-  timer.value = setInterval(() => {
-    webSocketStore.sendCommandMsg(getStateJSON)
-  }, 1000)
+  // timer.value = setInterval(() => {
+  //   webSocketStore.sendCommandMsg(getStateJSON)
+  // }, 1000)
 })
 
 const hiddenLogVisible = () => {

src/components/Progress.vue

@@ -308,9 +308,9 @@ const binCharts = ref(null)
 const time1 = ref(null)
 const time2 = ref(null)
 onMounted(() => {
-  timer.value = setInterval(() => {
-    webSocketStore.sendCommandMsg(getStateJSON)
-  }, 1000)
+  // timer.value = setInterval(() => {
+  //   webSocketStore.sendCommandMsg(getStateJSON)
+  // }, 1000)
   let a = echarts.getInstanceByDom(document.getElementById('bin'))
   if (a == undefined) {
     binCharts.value = echarts.init(document.getElementById('bin'))

src/device/pipeline/SettingEdit.vue

@@ -108,6 +108,8 @@ const options = ref({});
 let settingRules = [];
 // promise
 let editPromise = null;
+// string
+let optionId = null;
 // on mounted
 onMounted(mounted);
 // expose methods
@@ -115,6 +117,25 @@ defineExpose({edit});
 
 // on mounted
 async function mounted() {
+    // nothing to do here
+}
+
+// edit
+function edit( item = null ) {
+    return new Promise((resolve) => {
+        editPromise = {resolve};
+        if ( null !== item ) {
+            optionId = item.formula_id;
+            options.value = JSON.parse(JSON.stringify(item));
+        } else {
+            optionId = null;
+            optionDefaultValuesSetup();
+        }
+    });
+}
+
+// setup default values
+async function optionDefaultValuesSetup() {
     settingRules = await ws.call('getAllSetting');
     settingRules = settingRules.dbval;
     let defaultSettingKV = {};
@@ -132,27 +153,26 @@ async function mounted() {
     options.value.formula_id = '';
 }
 
-// edit
-function edit() {
-    return new Promise((resolve) => {
-        editPromise = {resolve};
-    });
-}
-
 // action save
 async function actionSave() {
     if (options.value.formula_id == '') {
         return showFailToast('配方名称不能为空');
     }
     
+    let isNewOptions = null === optionId;
     let list = await ws.call('getAllFormula');
     list = list.formula.formulas;
-    let existedSetting = list.find(i => i.formula_id === options.value.formula_id);
-    if ( undefined !== existedSetting ) {
+    let existedCount = list.filter(i => i.formula_id === options.value.formula_id);
+    if ( (isNewOptions && 0 < existedCount) || (!isNewOptions && 1 < existedCount) ) {
         return showFailToast('配方名称已存在')
     }
     
-    await ws.call('addFormula', options.value);
+    if ( isNewOptions ) {
+        await ws.call('addFormula', options.value);
+    } else {
+        options.value.id = optionId;
+        await ws.call('updateFormula2', options.value);
+    }
     editPromise.resolve();
 }
 

src/pages/Home.vue

@@ -403,7 +403,7 @@ const sealStore = useSealStore()
 const userStore = useUserStore()
 const { socketCommandInstance } = storeToRefs(webSocketStore)
 webSocketStore.initCommandSocket()
-webSocketStore.initEventSocket()
+// webSocketStore.initEventSocket()
 
 const loginModalVisible = ref(false)
 
@@ -484,10 +484,10 @@ onMounted(() => {
   timer.value = setInterval(() => {
     getdateTime()
   }, 200)
-  setTimeout(() => {
-    webSocketStore.sendCommandMsg(getStateJSON)
-    webSocketStore.sendCommandMsg(getAllSettingJSON)
-  }, 1000)
+  // setTimeout(() => {
+  //   webSocketStore.sendCommandMsg(getStateJSON)
+  //   webSocketStore.sendCommandMsg(getAllSettingJSON)
+  // }, 1000)
   document.addEventListener('click', e => {
     let box = document.getElementById('keyboard')
     let room = document.getElementById('room_size')
@@ -511,6 +511,7 @@ const handleLogout = () => {
   handleLogoutReal()
 }
 const handleLogoutReal = () => {
+  debugger;
   webSocketStore?.sendCommandMsg(logoutJSON)
   window.location.href = 'http://127.0.0.1/#/'
 }

src/router/index.js

@@ -15,6 +15,10 @@ const routes = [
     component: Home,
   },
   {
+    path: '/home/progress',
+    component: Home,
+  },
+  {
     path: '/key',
     component: Key,
   },

src/socket/index.js

@@ -12,15 +12,15 @@ export default class Socket {
     console.log(this.url)
     this.ws = new WebSocket(this.url, this.protocols)
     this.ws.onopen = () => {
-      console.log('WebSocket连接成功')
+      console.log(`WebSocket连接成功 : ${this.url}`)
       this.reconnectTimes = 0
     }
     this.ws.onclose = () => {
-      console.log('WebSocket断开连接')
+      console.log(`WebSocket断开连接 : ${this.url}`)
       this.reconnect()
     }
     this.ws.onerror = err => {
-      console.log('WebSocket连接出错', err)
+      console.log(`WebSocket连接出错 : ${this.url}`, err)
     }
   }
 

src/store/modules/websocket.js

@@ -50,6 +50,8 @@ export const useWebSocketStore = defineStore({
 
 
     initCommandSocket() {
+      console.log('initCommandSocket');
+      
       const url = import.meta.env.VITE_BASE_WS1_URL
       const init = new Socket(url)
       const settingStore = useSettingStore()
@@ -74,7 +76,8 @@ export const useWebSocketStore = defineStore({
           let response = JSON.parse(ev.data);
           const handler = $this.callPromiseHandlers[messageId];
           delete $this.callPromiseHandlers[messageId];
-          console.log(`[Call Response : ${messageId}] ${handler.message.command} => ${JSON.stringify(response)}`);
+          let duration = Date.now() - handler.startedAt;
+          console.log(`[Call Response : ${messageId} - (${duration}ms)] ${handler.message.command} => ${JSON.stringify(response)}`);
           if ( 0 === response.ackcode ) {
             handler.resolve(response);
           } else {
@@ -104,6 +107,7 @@ export const useWebSocketStore = defineStore({
               replenishingFluidsWorkState,
             } = state || {}
             if (!isLogin) {
+              debugger;
               window.location.href = 'http://127.0.0.1/#/'
               return
             }
@@ -385,7 +389,7 @@ export const useWebSocketStore = defineStore({
                   message.params = params;
               }
           }
-          this.callPromiseHandlers[callId] = { resolve, reject, message };
+          this.callPromiseHandlers[callId] = { resolve, reject, message, startedAt:Date.now() };
           console.log(`[Call Request : ${callId}] ${command}(${JSON.stringify(params)})`);
           this.sendCommandMsg(message);
       });