add：添加指令管理的国际化语言版本

acs/nladmin-ui/src/i18n/langs/chinese.js

@@ -1,11 +1,13 @@
 import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import zh from './zh-CN'
-import menu from './device/zh'
+import menu from './menu/zh'
 import param from './param/zh'
+import instruction from './instruction/zh'
 
 export default {
   ...zhLocale,
   ...zh,
   ...menu,
-  ...param
+  ...param,
+  ...instruction
 }

acs/nladmin-ui/src/i18n/langs/en.js

@@ -44,6 +44,8 @@ export default {
     'Reset': 'Reset',
     'Confirm': 'Confirm',
     'Cancel': 'Cancel',
+    'Forced_cancellation': 'Forced_cancellation',
+    'Initialize': 'Initialize',
     'Operate': 'Operate',
     'Refresh': 'Refresh',
     'Closes': 'Close',
@@ -81,8 +83,7 @@ export default {
     'Tip14': 'WebSocket connection error',
     'Tip15': 'Please enter an icon name',
     'loading': 'loading...',
-    'synchronous': 'synchronous',
+    'synchronous': 'synchronous'
-    'import': 'import'
   },
   'monitor': {
     'sys': 'System',

acs/nladmin-ui/src/i18n/langs/english.js

@@ -1,11 +1,13 @@
 import enLocale from 'element-ui/lib/locale/lang/en'
 import en from './en'
-import menu from './device/en'
+import menu from './menu/en'
 import param from './param/en'
+import instruction from './instruction/en'
 
 export default {
   ...enLocale,
   ...en,
   ...menu,
-  ...param
+  ...param,
+  ...instruction
 }

acs/nladmin-ui/src/i18n/langs/in.js

@@ -44,6 +44,8 @@ export default {
     'Reset': 'Reset',
     'Confirm': 'konfirmasi',
     'Cancel': 'Batalkan',
+    'Forced_cancellation': 'Pembatalan Paksa',
+    'Initialize': 'Menginisialisasi',
     'Operate': 'operasi',
     'Refresh': 'Segar',
     'Closes': 'Tutup',
@@ -81,8 +83,7 @@ export default {
     'Tip14': 'Koneksi WebSocket error',
     'Tip15': 'Silakan masukkan nama ikon',
     'loading': 'Memuatkan Data...',
-    'synchronous': 'Sinkron',
+    'synchronous': 'Sinkron'
-    'import': 'Mengimpor'
   },
   'monitor': {
     'sys': 'Sistem',

acs/nladmin-ui/src/i18n/langs/indonesian.js

@@ -1,11 +1,13 @@
 import idLocale from 'element-ui/lib/locale/lang/id'
 import id from './in'
-import menu from './device/in'
+import menu from './menu/in'
 import param from './param/in'
+import instruction from './instruction/in'
 
 export default {
   ...idLocale,
   ...id,
   ...menu,
-  ...param
+  ...param,
+  ...instruction
 }

acs/nladmin-ui/src/i18n/langs/instruction/en.js

@@ -0,0 +1,36 @@
+export default {
+  'Inst': {
+    'table': {
+      'instruction_code': 'instruction_code',
+      'instruction_type': 'instruction_type',
+      'task_code': 'task_code',
+      'vehicle_code': 'vehicle_code',
+      'instruction_status': 'instruction_status',
+      'send_status': 'send_status',
+      'start_point_code': 'start_device_code',
+      'next_point_code': 'next_device_code',
+      'put_point_code': 'put_point_code',
+      'execute_device_code': 'execute_device_code',
+      'carno': 'carno',
+      'remark': 'remark',
+      'create_by': 'create_by',
+      'create_time': 'create_time',
+      'update_by': 'update_by',
+      'update_time': 'update_time',
+      'input_taskCode_or_instCode': 'input_taskCode_or_instCode',
+      'input_vehicleCode': 'input_vehicleCode',
+      'material': 'material_type',
+      'task_status': 'task_status',
+      'input_startCode_or_nextCode': 'input_startCode_or_nextCode',
+      'ready': 'ready',
+      'Execution': 'Execution',
+      'Finish': 'Finish',
+      'undelivered': 'undelivered',
+      'succeed': 'succeed',
+      'fail': 'fail'
+    },
+    'rules': {
+      'NotNull': 'Cannot be empty'
+    }
+  }
+}

acs/nladmin-ui/src/i18n/langs/instruction/in.js

@@ -0,0 +1,36 @@
+export default {
+  'Inst': {
+    'table': {
+      'instruction_code': 'Nomor_instruksi',
+      'instruction_type': 'Jenis_instruksi',
+      'task_code': 'Nomor_tugas',
+      'vehicle_code': 'Nomor_kendaraan',
+      'instruction_status': 'Status_perintah',
+      'send_status': 'Status_pengiriman',
+      'start_point_code': 'Titik_penjemputan',
+      'next_point_code': 'Titik_pengantaran',
+      'put_point_code': 'Titik_pembuangan',
+      'execute_device_code': 'Perangkat_eksekusi_saat_ini',
+      'carno': 'Nomor_kendaraan',
+      'remark': 'deskripsi',
+      'create_by': 'Dibuat_oleh',
+      'create_time': 'Waktu_pembuatan',
+      'update_by': 'Diubah_oleh',
+      'update_time': 'Ubah_waktu',
+      'input_taskCode_or_instCode': 'Masukkan nomor tugas atau nomor instruksi',
+      'input_vehicleCode': 'Masukkan nomor kendaraan',
+      'material': 'Jenis barang',
+      'task_status': 'Status tugas',
+      'input_startCode_or_nextCode': 'Jenis barang',
+      'ready': 'siap',
+      'Execution': 'Eksekusi',
+      'Finish': 'selesai',
+      'undelivered': 'Tidak terkirim',
+      'succeed': 'berhasil',
+      'fail': 'gagal'
+    },
+    'rules': {
+      'NotNull': 'Cannot be empty'
+    }
+  }
+}

acs/nladmin-ui/src/i18n/langs/instruction/zh.js

@@ -0,0 +1,36 @@
+export default {
+  'Inst': {
+    'table': {
+      'instruction_code': '指令编号',
+      'instruction_type': '指令类型',
+      'task_code': '任务号',
+      'vehicle_code': '载具号',
+      'instruction_status': '指令状态',
+      'send_status': '下发状态',
+      'start_point_code': '取货点',
+      'next_point_code': '放货点',
+      'put_point_code': '倒料点',
+      'execute_device_code': '当前执行设备',
+      'carno': '车号',
+      'remark': '描述',
+      'create_by': '创建者',
+      'create_time': '创建时间',
+      'update_by': '修改者',
+      'update_time': '修改时间',
+      'input_taskCode_or_instCode': '输入任务号或指令号',
+      'input_vehicleCode': '输入载具号',
+      'material': '物料类型',
+      'task_status': '任务状态',
+      'input_startCode_or_nextCode': '输入起点或终点',
+      'ready': '就绪',
+      'Execution': '执行中',
+      'Finish': '完成',
+      'undelivered': '未下发',
+      'succeed': '成功',
+      'fail': '失败'
+    },
+    'rules': {
+      'NotNull': 'Cannot be empty'
+    }
+  }
+}

acs/nladmin-ui/src/i18n/langs/zh-CN.js

@@ -44,6 +44,8 @@ export default {
     'Reset': '重置',
     'Confirm': '确认',
     'Cancel': '取消',
+    'Forced_cancellation': '强制取消',
+    'Initialize': '初始化',
     'Operate': '操作',
     'Refresh': '刷新',
     'Closes': '关闭',
@@ -81,8 +83,7 @@ export default {
     'Tip14': 'WebSocket连接发生错误',
     'Tip15': '请输入图标名称',
     'loading': '数据加载中...',
-    'synchronous': '同步',
+    'synchronous': '同步'
-    'import': '导入'
   },
   'monitor': {
     'sys': '系统',

acs/nladmin-ui/src/views/acs/instruction/index.vue

@@ -8,7 +8,7 @@
           v-model="query.code"
           size="small"
           clearable
-          placeholder="输入任务号或指令号"
+          :placeholder="$t('Inst.table.input_taskCode_or_instCode')"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
@@ -17,7 +17,7 @@
           v-model="query.vehicle_code"
           size="small"
           clearable
-          placeholder="输入载具号"
+          :placeholder="$t('Inst.table.input_vehicleCode')"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
@@ -27,7 +27,7 @@
           clearable
           filterable
           size="small"
-          placeholder="物料类型"
+          :placeholder="$t('Inst.table.material')"
           class="filter-item"
           style="width: 190px"
           @change="crud.toQuery"
@@ -39,7 +39,7 @@
           clearable
           filterable
           size="small"
-          placeholder="任务状态"
+          :placeholder="$t('Inst.table.task_status')"
           class="filter-item"
           style="width: 190px"
           @change="crud.toQuery"
@@ -50,7 +50,7 @@
           v-model="query.point_code"
           size="small"
           clearable
-          placeholder="输入起点或终点"
+          :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
@@ -60,7 +60,7 @@
           clearable
           filterable
           size="small"
-          placeholder="指令类型"
+          :placeholder="$t('Inst.table.instruction_type')"
           class="filter-item"
           style="width: 190px"
           @change="crud.toQuery"
@@ -79,7 +79,7 @@
           icon="el-icon-refresh"
           @click="reload"
         >
-          同步
+          {{ $t('common.synchronous') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -91,22 +91,22 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="起点">
+          <el-form-item :label="$t('Inst.table.start_point_code')">
             <el-input v-model="form.start_point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="终点">
+          <el-form-item :label="$t('Inst.table.next_point_code')">
             <el-input v-model="form.next_point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="载具号">
+          <el-form-item :label="$t('Inst.table.vehicle_code')">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="描述信息" prop="description">
+          <el-form-item :label="$t('Inst.table.remark')" prop="description">
             <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</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">确认</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -120,36 +120,36 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
-        <el-table-column prop="instruction_code" label="指令编号" />
+        <el-table-column prop="instruction_code" :label="$t('Inst.table.instruction_code')" />
-        <el-table-column prop="instruction_type" label="指令类型">
+        <el-table-column prop="instruction_type" :label="$t('Inst.table.instruction_type')">
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.instruction_type] }}
           </template>
         </el-table-column>
         <!--        <el-table-column prop="link_num" label="关联编号" />-->
-        <el-table-column prop="task_code" label="任务号" />
+        <el-table-column prop="task_code" :label="$t('Inst.table.task_code')" />
-        <el-table-column prop="vehicle_code" label="载具号" />
+        <el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" />
-        <el-table-column prop="instruction_status" label="指令状态">
+        <el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')">
           <template slot-scope="scope">
-            <span v-if="scope.row.instruction_status=='0' ">就绪</span>
+            <span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
-            <span v-if="scope.row.instruction_status=='1' ">执行中</span>
+            <span v-if="scope.row.instruction_status=='1' ">{{ $t('Inst.table.Execution') }}</span>
-            <span v-if="scope.row.instruction_status=='2' ">完成</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="下发状态">
+        <el-table-column prop="send_status" :label="$t('Inst.table.send_status')">
           <template slot-scope="scope">
-            <span v-if="scope.row.send_status=='0' ">未下发</span>
+            <span v-if="scope.row.send_status=='0' ">{{ $t('Inst.table.undelivered') }}</span>
-            <span v-if="scope.row.send_status=='1' ">成功</span>
+            <span v-if="scope.row.send_status=='1' ">{{ $t('Inst.table.succeed') }}</span>
-            <span v-if="scope.row.send_status=='2' ">失败</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="取货点" />
+        <el-table-column prop="start_point_code" :label="$t('Inst.table.start_point_code')" />
-        <el-table-column prop="next_point_code" label="放货点" />
+        <el-table-column prop="next_point_code" :label="$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="倒料点" />
+        <el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" />
-        <el-table-column prop="execute_device_code" label="当前执行设备" width="130" />
+        <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" width="130" />
-        <el-table-column prop="carno" label="车号" />
+        <el-table-column prop="carno" :label="$t('Inst.table.carno')" />
         <!--        <el-table-column prop="compound_inst" label="复合指令">-->
         <!--          <template slot-scope="scope">-->
         <!--            <span v-if="scope.row.compound_inst==='0' ">否</span>-->
@@ -159,15 +159,15 @@
         <!--        <el-table-column prop="compound_inst_data" width="200" label="复合路线" />-->
         <!--        <el-table-column prop="matarial" label="物料" />-->
         <!--        <el-table-column prop="quantity" label="数量" />-->
-        <el-table-column prop="remark" label="描述" />
+        <el-table-column prop="remark" :label="$t('Inst.table.remark')" />
-        <el-table-column prop="create_by" label="创建者" />
+        <el-table-column prop="create_by" :label="$t('Inst.table.create_by')" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
+        <el-table-column prop="create_time" :label="$t('Inst.table.create_time')" width="135" />
-        <el-table-column prop="update_by" label="修改者" />
+        <el-table-column prop="update_by" :label="$t('Inst.table.update_by')" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column prop="update_time" :label="$t('Inst.table.update_time')" width="135" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
-          label="操作"
+          :label="$t('common.Operate')"
           width="150px"
           align="center"
         >
@@ -177,10 +177,10 @@
                 <i class="el-icon-menu" />
               </span>
               <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,'a')">{{ $t('Inst.table.Finish') }}</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,'b')">{{ $t('common.Cancel') }}</el-dropdown-item>
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">强制取消</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')">初始化</el-dropdown-item>
+                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">{{ $t('common.Initialize') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -242,7 +242,7 @@ export default {
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
-      title: '指令',
+      title: 'Instruction',
       url: 'api/instruction',
       idField: 'instruction_id',
       sort: 'instruction_id,desc',
@@ -263,25 +263,25 @@ export default {
       },
       rules: {
         instruction_id: [
-          { required: true, message: '指令标识不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ],
         instruction_code: [
-          { required: true, message: '指令编码不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ],
         can_modify: [
-          { required: true, message: '是否允许修改不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ],
         is_active: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ],
         is_delete: [
-          { required: true, message: '是否删除不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ],
         create_by: [
-          { required: true, message: '创建者不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ],
         create_time: [
-          { required: true, message: '创建时间不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('Inst.rules.NotNull'), trigger: 'blur' }
         ]
       }
     }