From ea04d55fc1e35232c370143512ce2ed1bbdfb0af Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Tue, 9 Apr 2024 13:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 6 +- src/views/databoard/kiln/MaterialCost.vue | 71 +- src/views/system/menu/index.vue | 939 +++++++++++++--------- 3 files changed, 601 insertions(+), 415 deletions(-) diff --git a/.env.dev b/.env.dev index 75b4a12d..e9e1ad70 100644 --- a/.env.dev +++ b/.env.dev @@ -25,8 +25,10 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082' # VUE_APP_BASE_API = 'http://192.168.1.47:48082' # socket地址 -VUE_APP_Socket_API = 'ws://10.70.2.2:8080' -VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' +# VUE_APP_Socket_API = 'ws://10.70.2.2:8080' +# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' +VUE_APP_Socket_API = 'ws://192.168.0.33:48082' +VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://10.70.2.22:8080' diff --git a/src/views/databoard/kiln/MaterialCost.vue b/src/views/databoard/kiln/MaterialCost.vue index 3ce4ddde..0b7cbfc7 100644 --- a/src/views/databoard/kiln/MaterialCost.vue +++ b/src/views/databoard/kiln/MaterialCost.vue @@ -1,50 +1,23 @@ - - @@ -81,12 +61,9 @@ export default { return {}; }, computed: { - materialMsg1() { - return this.$store.state.websocket.material.slice(0,9) + materialMsg() { + return this.$store.state.websocket.material; }, - materialMsg2() { - return this.$store.state.websocket.material.slice(9) - } }, methods: {}, }; diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 082db5a8..ae8c3610 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,82 +1,194 @@ -- 2.24.3