diff --git a/.env.dev b/.env.dev index 66d57691..5d443fe7 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-02-18 13:46:30 + # @LastEditTime: 2024-02-21 15:27:58 # @LastEditors: zhp # @Description: ### @@ -13,27 +13,25 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -# VUE_APP_BASE_API = 'http://10.70.2.2:8080' -VUE_APP_BASE_API = 'http://192.168.0.33:48082' -# VUE_APP_BASE_API = 'http://192.168.1.20:48080' -# VUE_APP_BASE_API = 'http://192.168.1.20:48080' +VUE_APP_BASE_API = 'http://10.70.2.2:8080' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48082' # VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # VUE_APP_BASE_API = 'http://192.168.1.104:48082' # VUE_APP_BASE_API = 'http://192.168.0.30:8888' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082' -# dcs地址 -VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' # socket地址 -# VUE_APP_Socket_API = 'ws://10.70.2.2:8080' -VUE_APP_Socket_API = 'ws://192.168.0.30:8888' +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_JIMU_API = 'http://10.70.2.22:8080' diff --git a/.env.prod b/.env.prod index 12538daa..0148da16 100644 --- a/.env.prod +++ b/.env.prod @@ -16,6 +16,9 @@ VUE_APP_BASE_API = '/prod-api' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://10.70.2.2:8080' +# socket地址 +VUE_APP_Socket_API = 'ws://10.70.2.2:8080' +VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' # 根据服务器或域名修改 diff --git a/.env.stage b/.env.stage index 6c48b2dc..1e29f627 100644 --- a/.env.stage +++ b/.env.stage @@ -14,6 +14,8 @@ VUE_APP_Socket_API = 'ws://10.70.2.2:8080' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://192.168.0.33:48082' +# socket地址 +VUE_APP_Socket_API = 'ws://192.168.0.33:48082' # 根据服务器或域名修改 diff --git a/public/index.html b/public/index.html index 860ebd9d..24473042 100644 --- a/public/index.html +++ b/public/index.html @@ -8,6 +8,10 @@ + + + + <%= webpackConfig.name %> diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 913a7f6f..814ac1a9 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -88,23 +88,26 @@ export default { visitedViews(newVal, oldVal){ let num = 0 newVal && newVal.map(item => { + console.log(item) if (item.path === '/databoard/kiln' || item.path === '/databoard/whole-plant' || item.path === '/databoard/deep-processing') { num++ } }) - if (num > 0) { - if(!this.wsIsOpen) { - getDcsMsg() - this.wsIsOpen = true - console.log('开启websocket==========') + this.$nextTick(() => { + if (num > 0) { + if(!this.wsIsOpen) { + getDcsMsg() + this.wsIsOpen = true + console.log('开启websocket==========') + } + }else{ + if (this.wsIsOpen) { + closeDcsMsg() + this.wsIsOpen = false + console.log('关闭============') + } } - }else{ - if (this.wsIsOpen) { - closeDcsMsg() - this.wsIsOpen = false - console.log('关闭============') - } - } + }) } }, mounted() { diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue index 53f053dd..8657ce89 100644 --- a/src/views/OperationalOverview/AGVBoard.vue +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -757,6 +757,9 @@ export default { this.init() this.getTimes() this.windowWidth(document.documentElement.clientWidth) + setTimeout(() => { + window.location.reload() + }, 86400000) }, mounted() { const _this = this; diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index edcbce29..010b9e5a 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -394,6 +394,9 @@ export default { // this.fetchList('order-process') // this.fetchList('line-chart-data') this.init() + setTimeout(() => { + window.location.reload() + }, 86400000) }, destroyed() { this.funInitWebSocket() diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue index cda23481..7d289927 100644 --- a/src/views/OperationalOverview/components/doubleYChart .vue +++ b/src/views/OperationalOverview/components/doubleYChart .vue @@ -141,7 +141,8 @@ export default { } } }, - data: passRateList + // data: passRateList + data: [] } ] // const colors = ['#5470C6', '#91CC75', '#EE6666'] diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue index 954e9b98..2f4d997a 100644 --- a/src/views/OperationalOverview/processingBoard.vue +++ b/src/views/OperationalOverview/processingBoard.vue @@ -610,6 +610,9 @@ export default { // this.fetchList('order-process') // this.fetchList('line-chart-data') this.init() + setTimeout(() => { + window.location.reload() + }, 86400000) }, destroyed () { this.websocketClose() diff --git a/src/views/bpm/processInstance/detail.vue b/src/views/bpm/processInstance/detail.vue index 7ecc5343..b8a843a1 100644 --- a/src/views/bpm/processInstance/detail.vue +++ b/src/views/bpm/processInstance/detail.vue @@ -89,7 +89,7 @@ - + diff --git a/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue b/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue index ec503b40..c0d922be 100644 --- a/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue +++ b/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue @@ -41,7 +41,7 @@ - + @@ -50,17 +50,17 @@ - + - + - + diff --git a/src/views/cost/rawMaterialConfig/add-or-updata.vue b/src/views/cost/rawMaterialConfig/add-or-updata.vue index 6de75d00..1196e9ae 100644 --- a/src/views/cost/rawMaterialConfig/add-or-updata.vue +++ b/src/views/cost/rawMaterialConfig/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-08-01 13:52:10 * @LastEditors: zwq - * @LastEditTime: 2023-12-05 15:41:39 + * @LastEditTime: 2024-02-19 09:36:50 * @Description: -->