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-06 11:23:04 +08:00
parent 72c94c2d34
commit 3b2799d082
13 changed files with 110 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
acs/nladmin-ui/src/i18n/langs/task/en.js
View File

@@ -51,6 +51,25 @@ export default {
'please_enter_origin_level': 'Please enter origin-level!',
'please_select_destination_column': 'Please select destination-column!',
'please_select_destination_level': 'Please select the destination floor!'
},
screen: {
'title': 'Lanzhou Hailiang equipment management task kanban',
'task_screen': 'Task Kanban',
'device': 'Current device',
'Wednesday': 'Wednesday',
'year': 'year',
'month': 'month',
'day': 'day',
'task_code': 'task_code',
'inst_code': 'inst_code',
'start': 'start',
'end': 'end',
'material': 'material',
'material_num': 'material_num',
'vehicle_code': 'vehicle_code',
'bar': 'bar',
'create_time': 'create_time',
'IP': 'IP'
}
}
}

19
acs/nladmin-ui/src/i18n/langs/task/in.js
View File

@@ -51,6 +51,25 @@ export default {
'please_enter_origin_level': 'Silakan masukkan asal-level!',
'please_select_destination_column': 'Silakan pilih tujuan-kolom!',
'please_select_destination_level': 'Silakan pilih lantai tujuan!”'
},
screen: {
'title': 'Lanzhou Hailiang tugas manajemen peralatan kanban',
'task_screen': 'Tugas Kanban',
'device': 'Perangkat saat ini',
'Wednesday': 'Rabu',
'year': 'tahun',
'month': 'bulan',
'day': 'hari',
'task_code': 'Nomor tugas',
'inst_code': 'Nomor instruksi',
'start': 'Titik awal',
'end': 'Terminal',
'material': 'Jenis barang',
'material_num': 'Jumlah barang',
'vehicle_code': 'Nomor kendaraan',
'bar': 'Kode batang',
'create_time': 'Waktu masuk',
'IP': 'IP'
}
}
}

19
acs/nladmin-ui/src/i18n/langs/task/zh.js
View File

@@ -51,6 +51,25 @@ export default {
'please_enter_origin_level': '请输入起点-层!',
'please_select_destination_column': '请选择终点-列！',
'please_select_destination_level': '请选择终点-层!'
},
screen: {
'title': '兰州海亮设备管理任务看板',
'task_screen': '任务看板',
'device': '当前设备',
'Wednesday': '星期三',
'year': '年',
'month': '月',
'day': '日',
'task_code': '任务号',
'inst_code': '指令号',
'start': '起点',
'end': '终点',
'material': '物料类型',
'material_num': '物料数量',
'vehicle_code': '载具号',
'bar': '条码',
'create_time': '入库时间',
'IP': 'IP'
}
}
}

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

@@ -155,7 +155,7 @@
:data="scope.row"
:permission="permission"
/>
<el-button slot="right" size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
<el-button slot="right" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" icon="el-icon-edit-outline">
<router-link :to="'/devices/device/config/' + scope.row.device_code ">
{{ $t('common.driver_configuration') }}
</router-link>

6
acs/nladmin-ui/src/views/acs/device/opc/index.vue
View File

@@ -111,9 +111,9 @@
<el-table-column prop="create_time" :label="$t('common.create_time')" :min-width="flexWidth('create_time',crud.data,$t('opc.table_title.create_time'))" />
<el-table-column :label="$t('common.Operate')" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row,'1')">{{ $t('common.Update') }}</el-button>
<el-button type="text" size="small" @click="handleClick(scope.row,'2')">{{ $t('common.Delete') }}</el-button>
<el-button v-if="scope.row.opc_flag === '1'" type="text" size="small" @click="handleClick(scope.row,'0')">
<el-button type="text" icon="el-icon-edit" size="small" @click="handleClick(scope.row,'1')">{{ $t('common.Update') }}</el-button>
<el-button type="text" icon="el-icon-circle-close" size="small" @click="handleClick(scope.row,'2')">{{ $t('common.Delete') }}</el-button>
<el-button v-if="scope.row.opc_flag === '1'" type="text" icon="el-icon-folder-add" size="small" @click="handleClick(scope.row,'0')">
{{ $t('opc.table_title.plc_add') }}
</el-button>
</template>

4
acs/nladmin-ui/src/views/acs/device/protocol/index.vue
View File

@@ -50,7 +50,7 @@
<el-button
slot="left"
class="filter-item"
type="warning"
type="primary"
icon="el-icon-download"
size="mini"
:loading="downLoadcsvLoading"
@@ -61,7 +61,7 @@
<el-button
slot="left"
class="filter-item"
type="warning"
type="success"
icon="el-icon-download"
size="mini"
:loading="downLoadcsvLoadingSmart"

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

@@ -108,25 +108,25 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="instruction_id" label="指令标识" />
<el-table-column prop="instruction_code" :label="$t('TaskRecord.table.Instruction_code')" />
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" />
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
<el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')">
<el-table-column prop="instruction_code" :label="$t('TaskRecord.table.Instruction_code')" :min-width="flexWidth('instruction_code',crud.data,$t('TaskRecord.table.Instruction_code'))"/>
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))"/>
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))"/>
<el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('TaskRecord.table.Instruction_status'))">
<template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('task.select.Ready') }}</span>
<span v-if="scope.row.instruction_status=='1' ">{{ $t('task.select.In_progress') }}</span>
<span v-if="scope.row.instruction_status=='2' ">{{ $t('task.select.Completed') }}</span>
</template>
</el-table-column>
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" />
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" width="135" />
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))"/>
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))"/>
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))"/>
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))"/>
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))"/>
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))"/>
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" :min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))"/>
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" :min-width="flexWidth('update_time',crud.data,$t('task.select.Update_time'))" />
</el-table>
<!--分页组件-->
<pagination />

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

@@ -99,25 +99,25 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" />
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
<el-table-column prop="task_status" :label="$t('TaskRecord.table.Status')">
<el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" :min-width="flexWidth('task_code',crud.data,$t('TaskRecord.table.Task_number'))"/>
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
<el-table-column prop="task_status" :label="$t('TaskRecord.table.Status')" :min-width="flexWidth('task_status',crud.data,$t('TaskRecord.table.Status'))">
<template slot-scope="scope">
<span v-if="scope.row.task_status=='0' ">{{ $t('task.select.Ready') }}</span>
<span v-if="scope.row.task_status=='1' ">{{ $t('task.select.In_progress') }}</span>
<span v-if="scope.row.task_status=='2' ">{{ $t('task.select.Completed') }}</span>
</template>
</el-table-column>
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" />
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" />
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" :min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))"/>
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))"/>
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))"/>
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))"/>
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))"/>
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))"/>
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))"/>
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))"/>
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))"/>
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))"/>
</el-table>
<!--分页组件-->
<pagination />

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

@@ -168,14 +168,14 @@
</el-button>
<el-button
type="text"
icon="el-icon-folder-add"
icon="el-icon-error"
@click="handleCommand(scope.$index, scope.row,'c')"
>
{{ $t('common.Forced_cancellation') }}
</el-button>
<el-button
type="text"
icon="el-icon-folder-add"
icon="el-icon-refresh"
@click="handleCommand(scope.$index, scope.row,'d')"
>
{{ $t('common.Initialize') }}

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

@@ -333,8 +333,8 @@
</el-table-column>
<!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" :min-width="flexWidth('task_status',crud.data,$t('task.txt_box.Task_status'))">
<template slot-scope="scope" width="78px">
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
<template slot-scope="scope" width="120px">
<span v-if="scope.row.task_status==='0' ">{{ $t('task.select.Ready') }}</span>
<span v-if="scope.row.task_status==='1' ">{{ $t('task.select.In_progress') }}</span>
<span v-if="scope.row.task_status==='2' ">{{ $t('task.select.Completed') }}</span>

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

@@ -122,7 +122,7 @@
<!-- </el-dropdown>-->
<el-button
type="text"
icon="el-icon-finished"
icon="el-icon-refresh"
@click="handleCommand(scope.$index, scope.row,'a')"
>
{{ $t('task.select.Reset') }}

14
acs/nladmin-ui/src/views/system/auto/index.vue
View File

@@ -12,13 +12,13 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="name" :label="$t('Auto.table.name')" />
<el-table-column :show-overflow-tooltip="false" prop="code" :label="$t('Auto.table.code')" width="200" />
<el-table-column show-overflow-tooltip prop="status" :label="$t('Auto.table.status')" />
<el-table-column show-overflow-tooltip prop="thread_name" :label="$t('Auto.table.thread_name')" />
<el-table-column show-overflow-tooltip prop="thread_state" :label="$t('Auto.table.thread_state')" />
<el-table-column show-overflow-tooltip prop="usedStatus" :label="$t('Auto.table.usedStatus')" />
<el-table-column show-overflow-tooltip prop="stopMessage" width="90px" :label="$t('Auto.table.stopMessage')" />
<el-table-column show-overflow-tooltip prop="name" :label="$t('Auto.table.name')" :min-width="flexWidth('name',crud.data,$t('Auto.table.name'))"/>
<el-table-column :show-overflow-tooltip="false" prop="code" :label="$t('Auto.table.code')" :min-width="flexWidth('code',crud.data,$t('Auto.table.code'))" />
<el-table-column show-overflow-tooltip prop="status" :label="$t('Auto.table.status')" :min-width="flexWidth('status',crud.data,$t('Auto.table.status'))" />
<el-table-column show-overflow-tooltip prop="thread_name" :label="$t('Auto.table.thread_name')" :min-width="flexWidth('thread_name',crud.data,$t('Auto.table.thread_name'))"/>
<el-table-column show-overflow-tooltip prop="thread_state" :label="$t('Auto.table.thread_state')" :min-width="flexWidth('thread_state',crud.data,$t('Auto.table.thread_state'))" />
<el-table-column show-overflow-tooltip prop="usedStatus" :label="$t('Auto.table.usedStatus')" :min-width="flexWidth('usedStatus',crud.data,$t('Auto.table.usedStatus'))" />
<el-table-column show-overflow-tooltip prop="stopMessage" :label="$t('Auto.table.stopMessage')" :min-width="flexWidth('stopMessage',crud.data,$t('Auto.table.stopMessage'))" />
<el-table-column v-permission="['admin','timing:edit','timing:del']" :label="$t('Auto.table.operate')" width="170px" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="start(scope.row.code)">{{ $t('common.firing') }}</el-button>

18
acs/nladmin-ui/src/views/system/timing/index.vue
View File

@@ -101,19 +101,19 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="job_id" :label="$t('Timing.DB.job_id')" />
<el-table-column show-overflow-tooltip prop="job_name" :label="$t('Timing.DB.job_name')" />
<el-table-column show-overflow-tooltip prop="bean_name" :label="$t('Timing.DB.bean_name')" />
<el-table-column show-overflow-tooltip prop="method_name" :label="$t('Timing.DB.method_name')" />
<el-table-column show-overflow-tooltip prop="params" :label="$t('Timing.DB.params')" />
<el-table-column show-overflow-tooltip prop="job_id" :label="$t('Timing.DB.job_id')" :min-width="flexWidth('job_id',crud.data,$t('Timing.DB.job_id'))"/>
<el-table-column show-overflow-tooltip prop="job_name" :label="$t('Timing.DB.job_name')" :min-width="flexWidth('job_name',crud.data,$t('Timing.DB.job_name'))"/>
<el-table-column show-overflow-tooltip prop="bean_name" :label="$t('Timing.DB.bean_name')" :min-width="flexWidth('bean_name',crud.data,$t('Timing.DB.bean_name'))"/>
<el-table-column show-overflow-tooltip prop="method_name" :label="$t('Timing.DB.method_name')" :min-width="flexWidth('method_name',crud.data,$t('Timing.DB.method_name'))"/>
<el-table-column show-overflow-tooltip prop="params" :label="$t('Timing.DB.params')" :min-width="flexWidth('params',crud.data,$t('Timing.DB.params'))"/>
<el-table-column
show-overflow-tooltip
prop="cron_expression"
:label="$t('Timing.DB.cron_expression')"
min-width="100"
:min-width="flexWidth('cron_expression',crud.data,$t('Timing.DB.cron_expression'))"
show-tooltip-when-overflow
/>
<el-table-column show-overflow-tooltip prop="is_pause" width="90px" :label="$t('Timing.DB.is_pause')">
<el-table-column show-overflow-tooltip prop="is_pause" width="120px" :label="$t('Timing.DB.is_pause')" align="center">
<template slot-scope="scope">
<el-tag :type="scope.row.is_pause ? 'warning' : 'success'">{{
scope.row.is_pause ? '已暂停' : '运行中'
@@ -121,8 +121,8 @@
</el-tag>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="description" width="150px" :label="$t('Timing.DB.description')" />
<el-table-column show-overflow-tooltip prop="create_time" width="136px" :label="$t('Timing.DB.create_time')">
<el-table-column show-overflow-tooltip prop="description" :min-width="flexWidth('description',crud.data,$t('Timing.DB.description'))" :label="$t('Timing.DB.description')" />
<el-table-column show-overflow-tooltip prop="create_time" :min-width="flexWidth('create_time',crud.data,$t('Timing.DB.create_time'))" :label="$t('Timing.DB.create_time')">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.create_time) }}</span>
</template>