root
/
WuXiDiKe
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix：frontend i18n

master
李永德 9 months ago
parent
1eb98e3ca7
commit
f7f336b65e
23 changed files with 407 additions and 416 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      nladmin-ui/src/i18n/langs/en.js
  2. 17
      nladmin-ui/src/i18n/langs/in.js
  3. 1
      nladmin-ui/src/i18n/langs/menu/en.js
  4. 1
      nladmin-ui/src/i18n/langs/menu/in.js
  5. 1
      nladmin-ui/src/i18n/langs/menu/zh.js
  6. 13
      nladmin-ui/src/i18n/langs/monitor/en.js
  7. 13
      nladmin-ui/src/i18n/langs/monitor/in.js
  8. 13
      nladmin-ui/src/i18n/langs/monitor/zh.js
  9. 17
      nladmin-ui/src/i18n/langs/zh-CN.js
  10. 2
      nladmin-ui/src/views/acs/device/address/index.vue
  11. 18
      nladmin-ui/src/views/acs/device/customPolicy/index.vue
  12. 12
      nladmin-ui/src/views/acs/device/index.vue
  13. 20
      nladmin-ui/src/views/acs/device/opc/index.vue
  14. 6
      nladmin-ui/src/views/acs/device/protocol/index.vue
  15. 10
      nladmin-ui/src/views/acs/device/storageCell/index.vue
  16. 4
      nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
  17. 2
      nladmin-ui/src/views/acs/history/instRecord/index.vue
  18. 2
      nladmin-ui/src/views/acs/history/taskRecord/index.vue
  19. 2
      nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
  20. 24
      nladmin-ui/src/views/acs/instruction/index.vue
  21. 16
      nladmin-ui/src/views/acs/route/routeLine/index.vue
  22. 14
      nladmin-ui/src/views/acs/route/routePlan/index.vue
  23. 4
      nladmin-ui/src/views/acs/task/index.vue

17
nladmin-ui/src/i18n/langs/en.js
View File

@ -1,6 +1,5 @@
export default { export default {
'lang': 'English', 'lang': 'English',
'auto': {
'common': { 'common': {
'home': 'Dashboard', 'home': 'Dashboard',
'Layout_setting': 'Layout Setting', 'Layout_setting': 'Layout Setting',
@ -100,21 +99,5 @@ export default {
'false': 'False', 'false': 'False',
'Running': 'Running', 'Running': 'Running',
'Paused': 'Paused' 'Paused': 'Paused'
},
'monitor': {
'sys': 'System',
'day': 'Running Day',
'status': 'Status',
'core': 'Core',
'cpu': 'CPU Utilization',
'memory': 'Memory Utilization',
'tality': 'Tality',
'used': 'Used',
'leisure': 'Leisure',
'exchange': 'Exchange Utilization',
'disk': 'Disk Utilization',
'cpu_monitoring': 'Cpu Utilization Monitoring',
'memory_monitoring': 'Memory Utilization Monitoring'
}
} }
} }

17
nladmin-ui/src/i18n/langs/in.js
View File

@ -1,6 +1,5 @@
export default { export default {
'lang': 'In', 'lang': 'In',
'auto': {
'common': { 'common': {
'home': 'Rumah', // 首页 'home': 'Rumah', // 首页
'Layout_setting': 'Pengaturan Bentangan', 'Layout_setting': 'Pengaturan Bentangan',
@ -100,21 +99,5 @@ export default {
'false': 'Tidak', 'false': 'Tidak',
'Running': 'Menjalankan', 'Running': 'Menjalankan',
'Paused': 'Berhenti' 'Paused': 'Berhenti'
},
'monitor': {
'sys': 'Sistem',
'day': 'Proyek ini telah berjalan terus menerus',
'status': 'Keadaan',
'core': 'Inti',
'cpu': 'Kadar penggunaan CPU',
'memory': 'Kadar penggunaan ingatan',
'tality': 'Total',
'used': 'Digunakan',
'leisure': 'Bebas',
'exchange': 'Kadar penggunaan area pertukaran',
'disk': 'Kadar penggunaan disk',
'cpu_monitoring': 'Monitor penggunaan CPU',
'memory_monitoring': 'Monitor penggunaan memori'
}
} }
} }

1
nladmin-ui/src/i18n/langs/menu/en.js
View File

@ -1,5 +1,6 @@
export default { export default {
'menu': { 'menu': {
'home': 'Dashboard',
'title': 'Menu', 'title': 'Menu',
'placeholder': { 'placeholder': {
'fuzzy_search': 'Fuzzy Search', 'fuzzy_search': 'Fuzzy Search',

1
nladmin-ui/src/i18n/langs/menu/in.js
View File

@ -1,5 +1,6 @@
export default { export default {
'menu': { 'menu': {
'home': 'halaman rumah',
'title': 'Menu', 'title': 'Menu',
'placeholder': { 'placeholder': {
'fuzzy_search': 'Pencarian Kabur', 'fuzzy_search': 'Pencarian Kabur',

1
nladmin-ui/src/i18n/langs/menu/zh.js
View File

@ -1,5 +1,6 @@
export default { export default {
'menu': { 'menu': {
'home': '首页',
'title': '菜单', 'title': '菜单',
'placeholder': { 'placeholder': {
'fuzzy_search': '模糊搜索', 'fuzzy_search': '模糊搜索',

13
nladmin-ui/src/i18n/langs/monitor/en.js
View File

@ -1,5 +1,18 @@
export default { export default {
'monitor': { 'monitor': {
'sys': 'System',
'day': 'Running Day',
'status': 'Status',
'core': 'Core',
'cpu': 'CPU Utilization',
'memory': 'Memory Utilization',
'tality': 'Tality',
'used': 'Used',
'leisure': 'Leisure',
'exchange': 'Exchange Utilization',
'disk': 'Disk Utilization',
'cpu_monitoring': 'Cpu Utilization Monitoring',
'memory_monitoring': 'Memory Utilization Monitoring',
'table': { 'table': {
'clear': 'Clear', 'clear': 'Clear',
'username': 'Username', 'username': 'Username',

13
nladmin-ui/src/i18n/langs/monitor/in.js
View File

@ -1,5 +1,18 @@
export default { export default {
'monitor': { 'monitor': {
'sys': 'Sistem',
'day': 'Proyek ini telah berjalan terus menerus',
'status': 'Keadaan',
'core': 'Inti',
'cpu': 'Kadar penggunaan CPU',
'memory': 'Kadar penggunaan ingatan',
'tality': 'Total',
'used': 'Digunakan',
'leisure': 'Bebas',
'exchange': 'Kadar penggunaan area pertukaran',
'disk': 'Kadar penggunaan disk',
'cpu_monitoring': 'Monitor penggunaan CPU',
'memory_monitoring': 'Monitor penggunaan memori',
'table': { 'table': {
'clear': 'Mengosongkan', 'clear': 'Mengosongkan',
'username': 'Nama Pengguna', 'username': 'Nama Pengguna',

13
nladmin-ui/src/i18n/langs/monitor/zh.js
View File

@ -1,5 +1,18 @@
export default { export default {
'monitor': { 'monitor': {
'sys': '系统',
'day': '项目已不间断运行',
'status': '状态',
'cpu': 'CPU使用率',
'core': '核心',
'memory': '内存使用率',
'tality': '总量',
'used': '已使用',
'leisure': '空闲',
'exchange': '交换区使用率',
'disk': '磁盘使用率',
'cpu_monitoring': 'CPU使用率监控',
'memory_monitoring': '内存使用率监控',
'table': { 'table': {
'clear': '清空', 'clear': '清空',
'username': '用户名', 'username': '用户名',

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

@ -1,6 +1,5 @@
export default { export default {
'lang': 'zh', 'lang': 'zh',
'auto': {
'common': { 'common': {
'home': '首页', 'home': '首页',
'Layout_setting': '布局设置', 'Layout_setting': '布局设置',
@ -100,21 +99,5 @@ export default {
'false': '否', 'false': '否',
'Running': '运行中', 'Running': '运行中',
'Paused': '已暂停' 'Paused': '已暂停'
},
'monitor': {
'sys': '系统',
'day': '项目已不间断运行',
'status': '状态',
'cpu': 'CPU使用率',
'core': '核心',
'memory': '内存使用率',
'tality': '总量',
'used': '已使用',
'leisure': '空闲',
'exchange': '交换区使用率',
'disk': '磁盘使用率',
'cpu_monitoring': 'CPU使用率监控',
'memory_monitoring': '内存使用率监控'
}
} }
} }

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

@ -54,7 +54,7 @@
<el-table-column prop="methods_name" :label="$t('address.methods_name')" /> <el-table-column prop="methods_name" :label="$t('address.methods_name')" />
<el-table-column prop="methods_url" :label="$t('address.methods_url')" /> <el-table-column prop="methods_url" :label="$t('address.methods_url')" />
<el-table-column prop="remark" :label="$t('address.remark')" /> <el-table-column prop="remark" :label="$t('address.remark')" />
<el-table-column v-permission="['admin','Address:edit','Address:del']" :label="$t('auto.common.Cancel')" width="150px" align="center"> <el-table-column v-permission="['admin','Address:edit','Address:del']" :label="$t('common.Cancel')" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

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

@ -13,7 +13,7 @@
style="width: 370px;" style="width: 370px;"
filterable filterable
clearable clearable
:placeholder="$t('auto.common.please')" :placeholder="$t('common.please')"
> >
<el-option <el-option
v-for="item in deviceList" v-for="item in deviceList"
@ -28,20 +28,20 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="key_code" :label="$t('device.device_table_title.device_name')" /> <el-table-column prop="key_code" :label="$t('device.device_table_title.device_name')" />
<el-table-column prop="create_user" :label="$t('auto.common.create_by')" /> <el-table-column prop="create_user" :label="$t('common.create_by')" />
<el-table-column prop="update_user" :label="$t('auto.common.update_by')" /> <el-table-column prop="update_user" :label="$t('common.update_by')" />
<el-table-column prop="name" :label="$t('customPolicy.unit_name')" /> <el-table-column prop="name" :label="$t('customPolicy.unit_name')" />
<el-table-column prop="create_time" :label="$t('auto.common.create_time')" /> <el-table-column prop="create_time" :label="$t('common.create_time')" />
<el-table-column prop="update_time" :label="$t('auto.common.update_time')" /> <el-table-column prop="update_time" :label="$t('common.update_time')" />
<el-table-column prop="is_on" :label="$t('auto.common.is_on')"> <el-table-column prop="is_on" :label="$t('common.is_on')">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.is_on" v-model="scope.row.is_on"
@ -53,7 +53,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-permission="['admin','customPolicy:del']" :label="$t('auto.common.Operate')" width="150px" align="center"> <el-table-column v-permission="['admin','customPolicy:del']" :label="$t('common.Operate')" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

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

@ -48,7 +48,7 @@
size="mini" size="mini"
@click="uploadShow = true" @click="uploadShow = true"
> >
{{ $t('auto.common.import') }} {{ $t('common.import') }}
</el-button> </el-button>
<el-button <el-button
slot="right" slot="right"
@ -58,7 +58,7 @@
icon="el-icon-refresh" icon="el-icon-refresh"
@click="reload" @click="reload"
> >
{{ $t('auto.common.synchronous') }} {{ $t('common.synchronous') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
@ -130,8 +130,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
@ -167,7 +167,7 @@
<!-- <el-table-column prop="manufacturer" label="生产厂家" />--> <!-- <el-table-column prop="manufacturer" label="生产厂家" />-->
<!-- <el-table-column prop="manufacturer_phone" label="厂家电话" />--> <!-- <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
<el-table-column prop="remark" :label="$t('device.device_table_title.descriptive_information')" :min-width="flexWidth('remark',crud.data,$t('device.device_table_title.descriptive_information'))" /> <el-table-column prop="remark" :label="$t('device.device_table_title.descriptive_information')" :min-width="flexWidth('remark',crud.data,$t('device.device_table_title.descriptive_information'))" />
<el-table-column v-permission="['admin','device:edit','device:del']" :label="$t('auto.common.Operate')" width="200px" align="center"> <el-table-column v-permission="['admin','device:edit','device:del']" :label="$t('common.Operate')" width="200px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
style="display: inline" style="display: inline"
@ -176,7 +176,7 @@
/> />
<el-button slot="right" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" icon="el-icon-edit-outline"> <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 "> <router-link :to="'/devices/device/config/' + scope.row.device_code ">
{{ $t('auto.common.driver_configuration') }} {{ $t('common.driver_configuration') }}
</router-link> </router-link>
</el-button> </el-button>
</template> </template>

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

@ -47,10 +47,10 @@
<el-form-item :label="$t('opc.table_title.opc_address')"> <el-form-item :label="$t('opc.table_title.opc_address')">
<el-input v-model="form.opc_host" style="width: 370px;" /> <el-input v-model="form.opc_host" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('auto.common.username')"> <el-form-item :label="$t('common.username')">
<el-input v-model="form.user" style="width: 370px;" /> <el-input v-model="form.user" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('auto.common.password')" prop="password"> <el-form-item :label="$t('common.password')" prop="password">
<el-input v-model="form.password" style="width: 370px;" type="password" /> <el-input v-model="form.password" style="width: 370px;" type="password" />
<el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">{{ $t('opc.dialog.detail') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">{{ $t('opc.dialog.detail') }}</el-button>
</el-form-item> </el-form-item>
@ -73,8 +73,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -119,17 +119,17 @@
<el-table-column prop="opc_name" :label="$t('opc.table_title.opc_name')" :min-width="flexWidth('opc_name',crud.data,$t('opc.table_title.opc_name'))" /> <el-table-column prop="opc_name" :label="$t('opc.table_title.opc_name')" :min-width="flexWidth('opc_name',crud.data,$t('opc.table_title.opc_name'))" />
<el-table-column prop="opc_host" :label="$t('opc.table_title.opc_address')" :min-width="flexWidth('opc_host',crud.data,$t('opc.table_title.opc_address'))" /> <el-table-column prop="opc_host" :label="$t('opc.table_title.opc_address')" :min-width="flexWidth('opc_host',crud.data,$t('opc.table_title.opc_address'))" />
<el-table-column prop="type" :label="$t('opc.table_title.type')" :min-width="flexWidth('type',crud.data,$t('opc.table_title.type'))" /> <el-table-column prop="type" :label="$t('opc.table_title.type')" :min-width="flexWidth('type',crud.data,$t('opc.table_title.type'))" />
<el-table-column prop="user" :label="$t('auto.common.username')" :min-width="flexWidth('user',crud.data,$t('opc.table_title.username'))" /> <el-table-column prop="user" :label="$t('common.username')" :min-width="flexWidth('user',crud.data,$t('opc.table_title.username'))" />
<el-table-column prop="password" :label="$t('auto.common.password')" :min-width="flexWidth('password',crud.data,$t('opc.table_title.password'))" /> <el-table-column prop="password" :label="$t('common.password')" :min-width="flexWidth('password',crud.data,$t('opc.table_title.password'))" />
<el-table-column prop="prog_id" :label="$t('opc.table_title.program_id')" :min-width="flexWidth('prog_id',crud.data,$t('opc.table_title.program_id'))" /> <el-table-column prop="prog_id" :label="$t('opc.table_title.program_id')" :min-width="flexWidth('prog_id',crud.data,$t('opc.table_title.program_id'))" />
<el-table-column prop="cls_id" :label="$t('opc.table_title.registry_id')" :min-width="flexWidth('cls_id',crud.data,$t('opc.table_title.registry_id'))" /> <el-table-column prop="cls_id" :label="$t('opc.table_title.registry_id')" :min-width="flexWidth('cls_id',crud.data,$t('opc.table_title.registry_id'))" />
<el-table-column prop="domain" :label="$t('opc.table_title.domain')" :min-width="flexWidth('domain',crud.data,$t('opc.table_title.domain'))" /> <el-table-column prop="domain" :label="$t('opc.table_title.domain')" :min-width="flexWidth('domain',crud.data,$t('opc.table_title.domain'))" />
<el-table-column prop="remark" :label="$t('opc.table_title.remark')" :min-width="flexWidth('remark',crud.data,$t('opc.table_title.remark'))" /> <el-table-column prop="remark" :label="$t('opc.table_title.remark')" :min-width="flexWidth('remark',crud.data,$t('opc.table_title.remark'))" />
<el-table-column prop="create_time" :label="$t('auto.common.create_time')" :min-width="flexWidth('create_time',crud.data,$t('opc.table_title.create_time'))" /> <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('auto.common.Operate')" width="200px" align="center" fixed="right"> <el-table-column :label="$t('common.Operate')" width="200px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" icon="el-icon-edit" size="small" @click="handleClick(scope.row,'1')">{{ $t('auto.common.Update') }}</el-button> <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('auto.common.Delete') }}</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')"> <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') }} {{ $t('opc.table_title.plc_add') }}
</el-button> </el-button>

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

@ -69,7 +69,7 @@
:loading="downLoadcsvLoading" :loading="downLoadcsvLoading"
@click="doExportCSV()" @click="doExportCSV()"
> >
{{ $t('auto.common.Export') }} CSV {{ $t('common.Export') }} CSV
</el-button> </el-button>
<el-button <el-button
slot="left" slot="left"
@ -80,7 +80,7 @@
:loading="downLoadcsvLoadingSmart" :loading="downLoadcsvLoadingSmart"
@click="doExportSmartCSV()" @click="doExportSmartCSV()"
> >
{{ $t('auto.common.Export') }} SMARTCSV {{ $t('common.Export') }} SMARTCSV
</el-button> </el-button>
<el-button <el-button
slot="left" slot="left"
@ -91,7 +91,7 @@
:loading="downLoadcsvLoadingFX5U" :loading="downLoadcsvLoadingFX5U"
@click="doExportFX5UCSV()" @click="doExportFX5UCSV()"
> >
{{ $t('auto.common.Export') }} FX5UCSV {{ $t('common.Export') }} FX5UCSV
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->

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

@ -74,8 +74,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
@ -86,10 +86,10 @@
<el-table-column prop="y" :label="$t('storageCell.table_title.y')" /> <el-table-column prop="y" :label="$t('storageCell.table_title.y')" />
<el-table-column prop="z" :label="$t('storageCell.table_title.z')" /> <el-table-column prop="z" :label="$t('storageCell.table_title.z')" />
<el-table-column prop="address" :label="$t('storageCell.table_title.address')" /> <el-table-column prop="address" :label="$t('storageCell.table_title.address')" />
<el-table-column prop="create_by" :label="$t('auto.common.create_by')" /> <el-table-column prop="create_by" :label="$t('common.create_by')" />
<el-table-column prop="create_time" :label="$t('auto.common.create_time')" /> <el-table-column prop="create_time" :label="$t('common.create_time')" />
<el-table-column prop="parent_storage_code" :label="$t('storageCell.table_title.parent_storage_code')" /> <el-table-column prop="parent_storage_code" :label="$t('storageCell.table_title.parent_storage_code')" />
<el-table-column v-permission="['admin','storageCell:edit','storageCell:del']" :label="$t('auto.common.Operate')" width="150px" align="center"> <el-table-column v-permission="['admin','storageCell:edit','storageCell:del']" :label="$t('common.Operate')" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

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

@ -52,7 +52,7 @@
:loading="downLoadDeviceErrorLogging" :loading="downLoadDeviceErrorLogging"
@click="doExportDeviceErrorLogging()" @click="doExportDeviceErrorLogging()"
> >
{{ $t('auto.common.Export') }} {{ $t('common.Export') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
@ -85,7 +85,7 @@
<el-table-column prop="error_time" :label="$t('errorLog.table.error_time')" /> <el-table-column prop="error_time" :label="$t('errorLog.table.error_time')" />
<el-table-column <el-table-column
v-permission="['admin','acsDeviceErrorLog:edit','acsDeviceErrorLog:del']" v-permission="['admin','acsDeviceErrorLog:edit','acsDeviceErrorLog:del']"
:label="$t('Auto.table.operate')" :label="$t('table.operate')"
width="150px" width="150px"
align="center" align="center"
> >

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

@ -87,7 +87,7 @@
:loading="downLoadInstLogging" :loading="downLoadInstLogging"
@click="doExportInstLogging()" @click="doExportInstLogging()"
> >
{{ $t('auto.common.Export') }} {{ $t('common.Export') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->

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

@ -98,7 +98,7 @@
:loading="downLoadTaskLogging" :loading="downLoadTaskLogging"
@click="doExportTaskLogging()" @click="doExportTaskLogging()"
> >
{{ $t('auto.common.Export') }} {{ $t('common.Export') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->

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

@ -87,7 +87,7 @@
:loading="downLoadTaskTreeLogging" :loading="downLoadTaskTreeLogging"
@click="doExportTaskTreeLogging()" @click="doExportTaskTreeLogging()"
> >
{{ $t('auto.common.Export') }} {{ $t('common.Export') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->

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

@ -98,7 +98,7 @@
icon="el-icon-refresh" icon="el-icon-refresh"
@click="reload" @click="reload"
> >
{{ $t('auto.common.synchronous') }} {{ $t('common.synchronous') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
@ -124,8 +124,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
@ -148,8 +148,8 @@
<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="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="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="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="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="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'))"> <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"> <template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span> <span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
@ -179,7 +179,7 @@
<el-table-column prop="update_time" :label="$t('Inst.table.update_time')" :min-width="flexWidth('update_time',crud.data,$t('Inst.table.update_time'))" /> <el-table-column prop="update_time" :label="$t('Inst.table.update_time')" :min-width="flexWidth('update_time',crud.data,$t('Inst.table.update_time'))" />
<el-table-column <el-table-column
v-permission="['admin','instruction:edit','instruction:del']" v-permission="['admin','instruction:edit','instruction:del']"
:label="$t('auto.common.Operate')" :label="$t('common.Operate')"
width="250px" width="250px"
align="center" align="center"
> >
@ -190,9 +190,9 @@
<!-- </span>--> <!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('Inst.table.Finish') }}</el-dropdown-item>--> <!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('Inst.table.Finish') }}</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('auto.common.Cancel') }}</el-dropdown-item>--> <!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('common.Cancel') }}</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('auto.common.Forced_cancellation') }}</el-dropdown-item>--> <!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('common.Forced_cancellation') }}</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">{{ $t('auto.common.Initialize') }}</el-dropdown-item>--> <!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">{{ $t('common.Initialize') }}</el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<el-button <el-button
@ -207,21 +207,21 @@
icon="el-icon-circle-close" icon="el-icon-circle-close"
@click="handleCommand(scope.$index, scope.row,'b')" @click="handleCommand(scope.$index, scope.row,'b')"
> >
{{ $t('auto.common.Cancel') }} {{ $t('common.Cancel') }}
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
icon="el-icon-error" icon="el-icon-error"
@click="handleCommand(scope.$index, scope.row,'c')" @click="handleCommand(scope.$index, scope.row,'c')"
> >
{{ $t('auto.common.Forced_cancellation') }} {{ $t('common.Forced_cancellation') }}
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="handleCommand(scope.$index, scope.row,'d')" @click="handleCommand(scope.$index, scope.row,'d')"
> >
{{ $t('auto.common.Initialize') }} {{ $t('common.Initialize') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

16
nladmin-ui/src/views/acs/route/routeLine/index.vue
View File

@ -59,7 +59,7 @@
icon="el-icon-refresh" icon="el-icon-refresh"
@click="reload" @click="reload"
> >
{{ $t('auto.common.synchronous') }} {{ $t('common.synchronous') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
@ -98,7 +98,7 @@
clearable clearable
multiple multiple
reserve-keyword reserve-keyword
:placeholder="$t('auto.common.please')" :placeholder="$t('common.please')"
style="width: 370px;" style="width: 370px;"
> >
<el-option <el-option
@ -117,7 +117,7 @@
clearable clearable
reserve-keyword reserve-keyword
multiple multiple
:placeholder="$t('auto.common.please')" :placeholder="$t('common.please')"
style="width: 370px;" style="width: 370px;"
> >
<el-option <el-option
@ -189,10 +189,10 @@
<el-table-column prop="weights" :label="$t('route.table_title.weights')" /> <el-table-column prop="weights" :label="$t('route.table_title.weights')" />
<el-table-column <el-table-column
:label="$t('auto.common.is_on')" :label="$t('common.is_on')"
align="center" align="center"
prop="is_active" prop="is_active"
:min-width="flexWidth('is_active',crud.data,$t('auto.common.is_on'))" :min-width="flexWidth('is_active',crud.data,$t('common.is_on'))"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
@ -206,11 +206,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="update_by" :label="$t('auto.common.update_by')" /> <el-table-column prop="update_by" :label="$t('common.update_by')" />
<el-table-column prop="update_time" min-width="160" :label="$t('auto.common.update_time')" /> <el-table-column prop="update_time" min-width="160" :label="$t('common.update_time')" />
<el-table-column <el-table-column
v-permission="['admin','routeLine:edit','routeLine:del']" v-permission="['admin','routeLine:edit','routeLine:del']"
:label="$t('auto.common.Operate')" :label="$t('common.Operate')"
width="150px" width="150px"
align="center" align="center"
> >

14
nladmin-ui/src/views/acs/route/routePlan/index.vue
View File

@ -27,8 +27,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
@ -45,13 +45,13 @@
<el-table-column prop="plan_code" :label="$t('route.table_title.code')" /> <el-table-column prop="plan_code" :label="$t('route.table_title.code')" />
<el-table-column prop="plan_name" :label="$t('route.table_title.name')" /> <el-table-column prop="plan_name" :label="$t('route.table_title.name')" />
<el-table-column prop="remark" :label="$t('route.table_title.remark')" /> <el-table-column prop="remark" :label="$t('route.table_title.remark')" />
<el-table-column prop="create_by" :label="$t('auto.common.create_by')" /> <el-table-column prop="create_by" :label="$t('common.create_by')" />
<el-table-column prop="create_time" :label="$t('auto.common.create_time')" /> <el-table-column prop="create_time" :label="$t('common.create_time')" />
<el-table-column prop="update_by" :label="$t('auto.common.update_by')" /> <el-table-column prop="update_by" :label="$t('common.update_by')" />
<el-table-column prop="update_time" :label="$t('auto.common.update_time')" /> <el-table-column prop="update_time" :label="$t('common.update_time')" />
<el-table-column <el-table-column
v-permission="['admin','routePlan:edit','routePlan:del']" v-permission="['admin','routePlan:edit','routePlan:del']"
:label="$t('auto.common.Update')" :label="$t('common.Update')"
width="150px" width="150px"
align="center" align="center"
> >

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

@ -97,7 +97,7 @@
icon="el-icon-plus" icon="el-icon-plus"
@click="formDia=true" @click="formDia=true"
> >
{{ $t('auto.common.Create') }} {{ $t('common.Create') }}
</el-button> </el-button>
<el-button <el-button
slot="right" slot="right"
@ -107,7 +107,7 @@
icon="el-icon-refresh" icon="el-icon-refresh"
@click="reload" @click="reload"
> >
{{ $t('auto.common.synchronous') }} {{ $t('common.synchronous') }}
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->

Write Preview
Loading…
Cancel
Save