diff --git a/.env.dev b/.env.dev index f97a7e9b..8eeaadd4 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-01 16:49:38 + # @LastEditTime: 2024-02-23 16:03:51 # @LastEditors: zhp # @Description: ### @@ -23,15 +23,11 @@ VUE_APP_TITLE = MES系统 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_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/api/equipment/base/config/config.js b/src/api/equipment/base/config/config.js new file mode 100644 index 00000000..71f73aa9 --- /dev/null +++ b/src/api/equipment/base/config/config.js @@ -0,0 +1,35 @@ +/* + * @Author: Do not edit + * @Date: 2024-02-21 13:43:02 + * @LastEditTime: 2024-02-21 15:00:17 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得关联表名 +export function getplcAllList(query) { + return request({ + url: '/base/equipment-plc/listAll', + method: 'get', + params: query + }) +} + +// 获得设备 +export function getEquipmentList(query) { + return request({ + url: '/base/core-equipment/page', + method: 'get', + params: query + }) +} + +// 根据产线获得工段 +export function listByParentId(query) { + return request({ + url: '/base/core-workshop-section/listByParentId', + method: 'get', + params: query + }) +} diff --git a/src/assets/icons/svg/info.svg b/src/assets/icons/svg/info.svg new file mode 100644 index 00000000..8fd6937e --- /dev/null +++ b/src/assets/icons/svg/info.svg @@ -0,0 +1,18 @@ + + + 库位信息 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/task.svg b/src/assets/icons/svg/task.svg new file mode 100644 index 00000000..65bff269 --- /dev/null +++ b/src/assets/icons/svg/task.svg @@ -0,0 +1,24 @@ + + + 搬运任务 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/tasks.svg b/src/assets/icons/svg/tasks.svg new file mode 100644 index 00000000..65bff269 --- /dev/null +++ b/src/assets/icons/svg/tasks.svg @@ -0,0 +1,24 @@ + + + 搬运任务 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 63d7e447..4ba4aed8 100644 --- a/src/views/OperationalOverview/AGVBoard.vue +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-07-19 15:18:30 * @LastEditors: zhp - * @LastEditTime: 2024-02-01 15:35:10 + * @LastEditTime: 2024-02-23 16:11:33 * @Description: -->