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

rev:更新

Browse Source
This commit is contained in:
tuqiang
2023-12-20 16:29:47 +08:00
parent b7fd69ef1e
commit b633c1390d
14 changed files with 243 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acs/nladmin-ui/src/i18n/langs/angle/en.js Normal file
View File

@@ -0,0 +1,18 @@
export default {
'angle': {
'table': {
'start_point_code': 'Start Point',
'start_device_code': 'Start Device',
'next_point_code': 'Target Point',
'next_device_code': 'Target Code',
'start_point_angle': 'Start Angle',
'next_point_angle': 'Target Angle',
'is_on': 'Is on',
'create_by': 'Created By',
'create_time': 'Created Time',
'update_by': 'Modified By',
'update_time': 'Modified Time',
'operate': 'Operate'
}
}
}

18
acs/nladmin-ui/src/i18n/langs/angle/in.js Normal file
View File

@@ -0,0 +1,18 @@
export default {
'angle': {
'table': {
'start_point_code': 'Pengkodean Titik Awal',
'start_device_code': 'Memulai Kode Perangkat',
'next_point_code': 'Pengkodean Titik Target',
'next_device_code': 'Encoding Perangkat Target',
'start_point_angle': 'Sudut Titik Awal',
'next_point_angle': 'Sudut Titik Target',
'is_on': 'Apakah Itu Diaktifkan',
'create_by': 'Dibuat Oleh',
'create_time': 'Waktu Pembuatan',
'update_by': 'Diubah Oleh',
'update_time': 'Ubah Waktu',
'operate': 'Beroperasi'
}
}
}

18
acs/nladmin-ui/src/i18n/langs/angle/zh.js Normal file
View File

@@ -0,0 +1,18 @@
export default {
'angle': {
'table': {
'start_point_code': '起始点位编码',
'start_device_code': '起始设备编码',
'next_point_code': '目标点位编码',
'next_device_code': '目标设备编码',
'start_point_angle': '起始点位角度',
'next_point_angle': '目标点位角度',
'is_on': '是否启用',
'create_by': '创建者',
'create_time': '创建时间',
'update_by': '修改者',
'update_time': '修改时间',
'operate': '操作'
}
}
}

4
acs/nladmin-ui/src/i18n/langs/chinese.js
View File

@@ -21,6 +21,7 @@ import deviceErrorInfo from './deviceErrorInfo/zh'
import role from './role/zh'
import department from './department/zh'
import dict from './dict/zh'
import angle from './angle/zh'
export default {
...zhLocale,
@@ -45,6 +46,7 @@ export default {
...user,
...role,
...department,
...dict
...dict,
...angle
}

4
acs/nladmin-ui/src/i18n/langs/english.js
View File

@@ -21,6 +21,7 @@ import user from './user/en'
import role from './role/en'
import department from './department/en'
import dict from './dict/en'
import angle from './angle/en'
export default {
...enLocale,
@@ -45,6 +46,7 @@ export default {
...user,
...role,
...department,
...dict
...dict,
...angle
}

4
acs/nladmin-ui/src/i18n/langs/indonesian.js
View File

@@ -21,6 +21,7 @@ import user from './user/in'
import role from './role/in'
import department from './department/in'
import dict from './dict/in'
import angle from './angle/in'
export default {
...idLocale,
@@ -46,5 +47,6 @@ export default {
...user,
...role,
...department,
...dict
...dict,
...angle
}

82
acs/nladmin-ui/src/views/acs/angle/index.vue
View File

@@ -10,14 +10,14 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="650px"
>
<el-form
ref="form"
:model="form"
:rules="rules"
size="small"
label-width="80px"
label-width="160px"
>
<el-form-item
v-if="false"
@@ -26,45 +26,24 @@
<el-input v-model="form.id" style="width: 370px;" />
</el-form-item>
<el-form-item
label="起始点位编码"
:label="$t('angle.table.start_device_code')"
>
<el-input v-model="form.start_point_code" style="width: 370px;" />
<el-input v-model="form.start_device_code" :disabled="crud.status.edit > 0" style="width: 370px;" />
</el-form-item>
<el-form-item
label="起始设备编码"
:label="$t('angle.table.next_device_code')"
>
<el-input v-model="form.start_device_code" style="width: 370px;" />
<el-input v-model="form.next_device_code" :disabled="crud.status.edit > 0" style="width: 370px;" />
</el-form-item>
<el-form-item
label="目标点位编码"
>
<el-input v-model="form.next_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item
label="目标设备编码"
>
<el-input v-model="form.next_device_code" style="width: 370px;" />
</el-form-item>
<el-form-item
label="起始点位角度"
>
<el-input v-model="form.start_point_angle" style="width: 370px;" />
</el-form-item>
<el-form-item
label="目标点位角度"
:label="$t('angle.table.next_point_angle')"
>
<el-input v-model="form.next_point_angle" style="width: 370px;" />
</el-form-item>
<el-form-item
label="是否启用"
prop="is_active"
>
<el-input v-model="form.is_active" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -82,64 +61,60 @@
prop="id"
label="id标识"
/>
<el-table-column
prop="start_point_code"
label="起始点位编码"
/>
<el-table-column
prop="start_device_code"
label="起始设备编码"
/>
<el-table-column
prop="next_point_code"
label="目标点位编码"
:label="$t('angle.table.start_device_code')"
:min-width="flexWidth('start_device_code',crud.data,$t('angle.table.start_device_code'))"
/>
<el-table-column
prop="next_device_code"
label="目标设备编码"
/>
<el-table-column
prop="start_point_angle"
label="起始点位角度"
:label="$t('angle.table.next_device_code')"
:min-width="flexWidth('next_device_code',crud.data,$t('angle.table.next_device_code'))"
/>
<el-table-column
prop="next_point_angle"
label="目标点位角度"
:label="$t('angle.table.next_point_angle')"
:min-width="flexWidth('next_point_angle',crud.data,$t('angle.table.next_point_angle'))"
/>
<el-table-column
prop="is_active"
label="是否启用"
:label="$t('angle.table.is_on')"
:min-width="flexWidth('is_active',crud.data,$t('angle.table.is_on'))"
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.is_active"
active-color="#13ce66"
inactive-color="#ff4949"
:active-value="1"
:inactive-value="0"
active-value="1"
inactive-value="0"
@change="updateIsOn(scope.row.id,scope.row.is_active)"
/>
</template>
</el-table-column>
<el-table-column
prop="create_by"
label="创建者"
:label="$t('angle.table.create_by')"
:min-width="flexWidth('create_by',crud.data,$t('angle.table.create_by'))"
/>
<el-table-column
prop="create_time"
label="创建时间"
:label="$t('angle.table.create_time')"
:min-width="flexWidth('create_time',crud.data,$t('angle.table.create_time'))"
/>
<el-table-column
prop="update_by"
label="修改者"
:label="$t('angle.table.update_by')"
:min-width="flexWidth('update_by',crud.data,$t('angle.table.update_by'))"
/>
<el-table-column
prop="update_time"
label="修改时间"
:label="$t('angle.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('angle.table.update_time'))"
/>
<el-table-column
v-permission="['admin','acsPointAngle:edit','acsPointAngle:del']"
label="操作"
:label="$t('angle.table.operate')"
width="150px"
align="center"
>
@@ -164,7 +139,6 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudAcsPointAngle from '@/api/acs/angle/acsPointAngle'
const defaultForm = {
id: null,
start_point_code: null,

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

@@ -147,6 +147,30 @@
</el-table-column>
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))"/>
<el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))"/>
<el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
<template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
<span v-if="scope.row.instruction_status=='1' ">{{ $t('Inst.table.Execution') }}</span>
<span v-if="scope.row.instruction_status=='2' ">{{ $t('Inst.table.Finish') }}</span>
</template>
</el-table-column>
<el-table-column prop="send_status" :label="$t('Inst.table.send_status')" :min-width="flexWidth('send_status',crud.data,$t('Inst.table.send_status'))">
<template slot-scope="scope">
<span v-if="scope.row.send_status=='0' ">{{ $t('Inst.table.undelivered') }}</span>
<span v-if="scope.row.send_status=='1' ">{{ $t('Inst.table.succeed') }}</span>
<span v-if="scope.row.send_status=='2' ">{{ $t('Inst.table.fail') }}</span>
</template>
</el-table-column>
<el-table-column prop="start_point_code" :label="$t('Inst.table.start_point_code')" :min-width="flexWidth('start_point_code',crud.data,$t('Inst.table.start_point_code'))" />
<el-table-column prop="next_point_code" :label="$t('Inst.table.next_point_code')" :min-width="flexWidth('next_point_code',crud.data,$t('Inst.table.next_point_code'))" />
<!-- <el-table-column prop="start_point_code2" label="取货点2" />-->
<!-- <el-table-column prop="next_point_code2" label="放货点2" />-->
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<el-table-column prop="carno" :label="$t('Inst.table.carno')" :min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))" />
<el-table-column prop="remark" :label="$t('Inst.table.remark')" :min-width="flexWidth('remark',crud.data,$t('Inst.table.remark'))" />
<el-table-column prop="create_by" :label="$t('Inst.table.create_by')" :min-width="flexWidth('create_by',crud.data,$t('Inst.table.create_by'))" />

191
acs/nladmin-ui/src/views/screen/bigScreen.vue
View File

@@ -1,114 +1,103 @@
<template>
<div class="login" :style="'background-image:url('+ Background +');'">
<div style="font-size: 42px; color: #f4f4f5; text-align: center; background-color: transparent;padding-top: 20px;">{{ $t('task.screen.title') }}</div>
<el-row>
<el-col :span="12">
<di><h2 style="font-size: 50px; color: #f4f4f5;margin-left: 30px;padding-top: 10px;">{{ $t('task.screen.task_screen') }}</h2></di>
<el-form
:inline="true"
label-position="right"
label-suffix=":"
>
<el-form-item class="dqsFont" label="当前设备">
<el-select id="sltFont" v-model="device" placeholder="请选择"
@change="changeDevice">
<el-option style="font-size: 22px;"
v-for="item in ledList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-form>
</el-col>
<div style="font-size: 42px; color: #f4f4f5; text-align: center; background-color: transparent;padding-top: 20px;">
{{ $t('task.screen.title') }}
</div>
<div>
<el-row>
<el-col :span="12">
<div class="grid-content bg-purple-light">
<h2 style="font-size: 50px; color: #f4f4f5;margin-left: 100px;padding-top: 10px;">
{{ $t('task.screen.task_screen') }}</h2></div>
<div class="grid-content bg-purple-light">
<el-form
:inline="true"
label-position="right"
label-suffix=":"
>
<el-form-item class="custom-label" :label="$t('task.screen.device')" style="margin-left: 100px;">
<el-select
v-model="device"
clearable
filterable
size="small"
:placeholder="$t('common.please')"
id="item-size"
@change="changeDevice">
<el-option
v-for="item in ledList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-form>
</div>
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple-light">
<h2 style="font-size: 50px; color: #f4f4f5;text-align:right;margin-right: 140px;">{{ getTime }}</h2>
</div>
<div class="grid-content bg-purple-light">
<p style="font-size: 50px; color: #f4f4f5;text-align:right;margin-right: 110px;"><b>{{ getDate }}</b></p>
</div>
</el-col>
</el-row>
<el-form v-if="device!=''" ref="form" style="border: 2px solid #f4f4f5;margin-top: 10px;padding-top: 50px;"
:inline="true"
:model="form" :rules="rules" size="medium" label-width="85px" label-suffix=":">
<el-row type="flex" justify="center" style="height: 100px;">
<el-col :span="12">
<el-form-item class="item" label="任务号" label-width="400px">
<el-input class="cpp" v-model="form.task_code"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
<div class="grid-content bg-purple-light">
<h2 style="font-size: 50px; color: #f4f4f5;text-align:right;margin-right: 140px;">{{ getTime }}</h2>
</div>
<div class="grid-content bg-purple-light">
<p style="font-size: 50px; color: #f4f4f5;text-align:right;margin-right: 110px;"><b>{{ getDate }}</b></p>
</div>
</el-col>
<el-col :span="12">
<el-form-item class="item" label="指令号" label-width="400px">
</el-row>
</div>
<el-form
v-if="device!=''"
style="margin-top: 50px;padding-top: 10px" ref="form" :model="form" :rules="rules"
size="small" label-width="200px">
<el-row>
<el-col :span="12" style="padding-left: 100px">
<el-form-item class="custom-label" style="padding-bottom: 50px" prop="task_code" :label="$t('task.screen.task_code')">
<el-input v-model="form.task_code" class="cpp"/>
</el-form-item>
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.inst_code')" prop="inst_code">
<el-input class="cpp" v-model="form.inst_code"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="center" style="height: 100px;">
<el-col :span="12">
<el-form-item class="item" label="起点" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.start')" prop="start_device_code">
<el-input class="cpp" v-model="form.start_device_code"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="item" label="终点" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.end')" prop="next_device_code">
<el-input class="cpp" v-model="form.next_device_code"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="center" style="height: 100px;">
<el-col :span="12" >
<el-form-item class="item" label="物料类型" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.material')" prop="material_type">
<el-input class="cpp" v-model="form.material_type"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="item" label="物料数量" label-width="400px">
<el-col :span="12" style="padding-left: 100px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.material_num')" prop="quantity">
<el-input class="cpp" v-model="form.quantity"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="center" style="height: 100px;">
<el-col :span="12">
<el-form-item class="item" label="载具号" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.vehicle_code')" prop="vehicle_code">
<el-input class="cpp" v-model="form.vehicle_code"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="item" label="条码" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.bar')" prop="instruction_status">
<el-input class="cpp" v-model="form.instruction_status"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="center" style="height: 100px;">
<el-col :span="12">
<el-form-item class="item" label="入库日期" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.create_time')" prop="entry_time">
<el-input class="cpp" v-model="form.entry_time"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="item" label="IP" label-width="400px">
<el-form-item class="custom-label" style="padding-bottom: 50px" :label="$t('task.screen.IP')" prop="ip">
<el-input class="cpp" v-model="form.ip"/>
<span style="color: #f4f4f5;margin-left: 10px;"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if="device!=''" style="font-size: 30px; color: #f4f4f5; text-align: center; background-color: transparent;padding-top: 50px;">
<div v-if="device!=''"
style="font-size: 30px; color: #f4f4f5; text-align: center; background-color: transparent;padding-top: 50px;">
<i class="el-icon-lock"></i>
http://127.0.0.1:8014/bigScreen/screen</div>
http://127.0.0.1:8014/bigScreen/screen
</div>
</div>
</template>
@@ -207,31 +196,37 @@ export default {
}
</style>
<style>
.item .el-form-item__label{
color: white;
font-size: 34px;
}
/*.item .el-form-item__label {*/
/* color: white;*/
/* font-size: 34px;*/
/*}*/
.cpp {
height: 300%;
width: 350px;
font-size: 30px;;
width: 500px;
font-size: 40px;;
text-align: center;
}
.ppd{
height: 301%;
width: 350px;
margin-left: 10px;
font-size: 30px;;
text-align: center;
}
#sltFont {
font-size: 30px;
height: 50px;
width: 150px;
}
.dqsFont .el-form-item__label{
font-size: 34px;
/*.ppd {*/
/* height: 301%;*/
/* width: 350px;*/
/* margin-left: 10px;*/
/* font-size: 30px;;*/
/* text-align: center;*/
/*}*/
.custom-label .el-form-item__label {
font-size: 40px;
color: white;
}
.custom-label .el-input__inner {
height: 40px;
line-height: 40px;
}
#item-size {
font-size: 37px;
width: 200px;
}
</style>