root/nuoLiSiQi_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
张江玮
2023-10-31 14:20:34 +08:00
parent 59063cdda3
commit 1504737964
17 changed files with 389 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-ui/.env.production
View File

@@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'http://10.93.41.198:8010'
VUE_APP_BASE_API = 'http://127.0.0.1:8010'
# 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://10.93.41.198:8010'
VUE_APP_WS_API = 'ws://127.0.0.1:8010'

11
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -164,7 +164,7 @@
v-permission="['admin','instruction:edit','instruction:del']"
fixed="left"
label="操作"
width="150px"
width="80px"
align="center"
>
<template slot-scope="scope">
@@ -172,7 +172,7 @@
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdonwn">
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">下发</el-dropdown-item>
@@ -347,11 +347,8 @@ export default {
case 'b':// 取消
this.cancel(command.index, command.row)
break
case 'c':// 强制取消
this.forceCancel(command.index, command.row)
break
case 'd':// 初始化
this.init(command.index, command.row)
case 'c':
this.sendToAGV(command.index, command.row)
break
}
}