diff --git a/ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java index 4d878e4..f9c4598 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java @@ -131,21 +131,6 @@ public class WcsSrgvQueueServiceImpl implements IWcsSrgvQueueService return wcsSrgvQueueMapper.selectByCaogoPlaceSite(siteId); } - @Override - public String selectMinCountJob( List outModelSSJ) { - return wcsSrgvQueueMapper.selectMinCountJob(outModelSSJ) ; - } - - @Override - public Integer selectTsj() { - - return wcsSrgvQueueMapper.selectTsj(); - } - - @Override - public Integer selectByCaogoPlaceSite(String siteId) { - return wcsSrgvQueueMapper.selectByCaogoPlaceSite(siteId); - } @Override public Integer selectByEndSite() { diff --git a/ruoyi-ui/src/views/device/ssj/index.vue b/ruoyi-ui/src/views/device/ssj/index.vue index cdc5286..d1e84e6 100644 --- a/ruoyi-ui/src/views/device/ssj/index.vue +++ b/ruoyi-ui/src/views/device/ssj/index.vue @@ -157,7 +157,6 @@ export default { { key: 'kx', label: '空闲', value: d.kx, dict: 'ssj_kx' }, { key: 'dw', label: '到位', value: d.dw, dict: 'ssj_dw' }, { key: 'exception', label: '异常', value: d.exception, dict: 'ssj_ex'}, - ] } if (dev.kind === 'srgv') { diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index a1733b8..92c1250 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin') const name = process.env.VUE_APP_TITLE || 'FORTUCKY WCS SYSTEM' // 网页标题 -const baseUrl = 'http://localhost:8081' // 后端接口地址(你的后端端口是8081) +const baseUrl = 'http://192.168.188.236:8081' // 后端接口地址(你的后端端口是8081) const port = process.env.port || process.env.npm_config_port || 80 // 前端端口