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

rev:三楼CTU

Browse Source
This commit is contained in:
gengby
2025-03-23 18:47:20 +08:00
parent e46efbf7a1
commit 26b24af58b
11 changed files with 181 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-ui/.env.production
View File

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

2
nladmin-ui/public/config.js
View File

@@ -3,7 +3,7 @@ window.g = {
VUE_APP_BASE_API: 'http://127.0.0.1:8011'
},
prod: {
VUE_APP_BASE_API: 'http://192.168.1.218:8011'
VUE_APP_BASE_API: 'http://192.168.18.218:8011'
}
}

2
nladmin-ui/src/i18n/langs/zh-CN.js
View File

@@ -46,7 +46,7 @@ export default {
'Confirm': '确认',
'Cancel': '取消',
'Forced_cancellation': '强制取消',
'Initialize': '初始化',
'Initialize': '重新下发',
'Operate': '操作',
'Refresh': '刷新',
'Closes': '关闭',

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

@@ -71,7 +71,7 @@
style="width: 200px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.instruction_type" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.start_or_end')">

26
nladmin-ui/src/views/acs/task/index.vue
View File

@@ -301,6 +301,9 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.select.Description')" prop="description">
<el-input v-model="form.remark" style="width: 370px;" type="textarea" @change="isDisabled=false" />
</el-form-item>
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple-light" />
@@ -405,14 +408,29 @@
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="form.vehicle_type"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <el-input v-model="form.vehicle_type" style="width: 370px;" @change="isDisabled=false" />-->
</el-form-item>
<el-form-item :label="$t('task.txt_box.extension_field')">
<div>
<el-button @click="openDialog">{{ $t('task.select.Placeholder') }}</el-button>
</div>
</el-form-item>
<el-form-item :label="$t('task.select.Description')" prop="description">
<el-input v-model="form.remark" style="width: 370px;" type="textarea" @change="isDisabled=false" />
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -585,7 +603,7 @@ import i18n from '@/i18n'
export default {
name: 'Task',
components: { pagination, crudOperation, rrOperation },
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'],
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan', 'vehicle_type'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc',