diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cc6e3c0..5d450d9 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.ruoyi: info
     org.springframework: warn
 
 # 用户配置
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index 0ac7ee9..5329438 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -1546,89 +1546,6 @@ export default {
     // 设备类型
     unknown: '未知' // 未知
   },
-  dict:{
-    sys_user_sex:{
-      a1:'男',
-      a2:'女',
-      a3:'未知'
-    },
-    sys_show_hide:{
-      a1:'显示',
-      a2:'隐藏'
-    },
-    sys_normal_disable:{
-      a1:'正常',
-      a2:'停用'
-    },
-    sys_job_status:{
-      a1:"正常",
-      a2:"暂停"
-    },
-    sys_job_group:{
-      a1:'默认',
-      a2:'系统'
-    },
-    sys_yes_no:{
-      a1:'是',
-      a2:'否'
-    },
-    sys_notice_type:{
-      a1:'通知',
-      a2:'公告'
-    },
-    sys_notice_status:{
-      a1:'正常',
-      a2:'关闭'
-    },
-    sys_oper_type:{
-      a1:'新增',
-      a2:'修改',
-      a3:'删除',
-      a4:'授权',
-      a5:'导出',
-      a6:'导入',
-      a7:'强退',
-      a8:'生成代码',
-      a9:'清空数据',
-      a10:'其他'
-    },
-    sys_common_status:{
-      a1:'成功',
-      a2:'失败'
-    },
-    interface_status:{
-      a1:'成功',
-      a2:'失败'
-    },
-    port_type:{
-      a1:'CTU放货点',
-      a2:'高架库放货点',
-      a3:'平库放货点',
-      a4:'集货区放货点'
-    },
-    cache_port_status:{
-      a1:'未发送标签',
-      a2:'已发送标签'
-    },
-    wms_task_type:{
-      a1:'入库CTU任务',
-      a2:'出库CTU任务',
-      a3:'AGV搬运任务'
-    },
-    task_status:{
-      a1:'任务新建',
-      a2:'任务请求',
-      a3:'任务开始',
-      a4:'走出储位',
-      a5:'任务结束'
-    },
-    ssj_type:{
-      a1:'出库输送机',
-      a2:'拣选输送机',
-      a3:'入库输送机',
-      a4:'其它输送机'
-    }
-  },
   top:{
     read:'PLC读取',
     startRead:'读取PLC',
diff --git a/ruoyi-ui/src/views/agv/queue/index.vue b/ruoyi-ui/src/views/agv/queue/index.vue
index 919457e..fffa067 100644
--- a/ruoyi-ui/src/views/agv/queue/index.vue
+++ b/ruoyi-ui/src/views/agv/queue/index.vue
@@ -1,33 +1,33 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('agv.queue.taskCode')" prop="taskCode">
+      <el-form-item label="任务单号" prop="taskCode">
         <el-input
           v-model="queryParams.taskCode"
-          :placeholder="$t('agv.queue.placeholder.taskCode')"
+          placeholder="请输入任务单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item :label="$t('agv.queue.containerCode')" prop="wmsTraycode">
+      <el-form-item label="容器码" prop="wmsTraycode">
         <el-input
           v-model="queryParams.wmsTraycode"
-          :placeholder="$t('agv.queue.placeholder.containerCode')"
+          placeholder="请输入wms托盘码/容器码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('agv.queue.wmsTaskNo')" prop="wmsTaskNo">
+      <el-form-item label="wms任务号" prop="wmsTaskNo">
         <el-input
           v-model="queryParams.wmsTaskNo"
-          :placeholder="$t('agv.queue.placeholder.wmsTaskNo')"
+          placeholder="请输入wms任务号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('agv.queue.wmsTaskType')" prop="wmsTaskType">
-        <el-select v-model="queryParams.wmsTaskType" :placeholder="$t('agv.queue.placeholder.wmsTaskType')" clearable>
+      <el-form-item label="wms任务类型" prop="wmsTaskType">
+        <el-select v-model="queryParams.wmsTaskType" placeholder="请选择wms任务类型" clearable>
           <el-option
             v-for="dict in dict.type.wms_task_type"
             :key="dict.value"
@@ -37,8 +37,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('agv.queue.taskStatus')" prop="status">
-        <el-select v-model="queryParams.status" :placeholder="$t('agv.queue.placeholder.taskStatus')" clearable>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.task_status"
             :key="dict.value"
@@ -48,58 +48,40 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('agv.queue.search') }}</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('agv.queue.reset') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
 
     <el-table v-loading="loading" :data="queueList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('agv.queue.reqCode')" align="center" prop="reqCode" />
-      <el-table-column :label="$t('agv.queue.reqTime')" align="center" prop="reqTime" />
-      <el-table-column :label="$t('agv.queue.startPoint')" align="center" prop="positionCode1" />
-      <el-table-column :label="$t('agv.queue.endPoint')" align="center" prop="positionCode2" />
-      <el-table-column :label="$t('agv.queue.taskType')" align="center" prop="taskType" />
-      <el-table-column :label="$t('agv.queue.containerType')" align="center" prop="ctnrType" />
-      <el-table-column :label="$t('agv.queue.containerNumber')" align="center" prop="ctnrCode" />
-      <el-table-column :label="$t('agv.queue.containerCount')" align="center" prop="ctnrNum" />
-      <el-table-column :label="$t('agv.queue.taskMode')" align="center" prop="taskMode" />
-      <el-table-column :label="$t('agv.queue.priority')" align="center" prop="priority" />
-      <el-table-column :label="$t('agv.queue.deviceType')" align="center" prop="agvType" />
-      <el-table-column :label="$t('agv.queue.continueRequest')" align="center" prop="request" />
-      <el-table-column :label="$t('agv.queue.finishTime')" align="center" prop="finishTime" />
-      <el-table-column :label="$t('agv.queue.wmsTrayCode')" align="center" prop="wmsTraycode" />
-      <el-table-column :label="$t('agv.queue.wmsTaskNo')" align="center" prop="wmsTaskNo" />
-      <el-table-column :label="$t('agv.queue.taskCode')" align="center" prop="taskCode" />
-      <el-table-column :label="$t('agv.queue.status')" align="center" prop="status" >
+      <el-table-column label="请求编号" align="center" prop="reqCode" />
+      <el-table-column label="请求时间" align="center" prop="reqTime" />
+      <el-table-column label="起点" align="center" prop="positionCode1" />
+      <el-table-column label="终点" align="center" prop="positionCode2" />
+      <el-table-column label="任务类型" align="center" prop="taskType" />
+      <el-table-column label="容器类型" align="center" prop="ctnrType" />
+      <el-table-column label="容器编号" align="center" prop="ctnrCode" />
+      <el-table-column label="容器数量" align="center" prop="ctnrNum" />
+      <el-table-column label="任务模式" align="center" prop="taskMode" />
+      <el-table-column label="优先级" align="center" prop="priority" />
+      <el-table-column label="设备类型" align="center" prop="agvType" />
+      <el-table-column label="继续请求" align="center" prop="request" />
+      <el-table-column label="结束时间" align="center" prop="finishTime" />
+      <el-table-column label="wms托盘码" align="center" prop="wmsTraycode" />
+      <el-table-column label="wms任务号" align="center" prop="wmsTaskNo" />
+      <el-table-column label="任务单号" align="center" prop="taskCode" />
+      <el-table-column label="任务状态" align="center" prop="status" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.task_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('agv.queue.wmsTaskType')" align="center" prop="wmsTaskType">
+      <el-table-column label="wms任务类型" align="center" prop="wmsTaskType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.wms_task_type" :value="scope.row.wmsTaskType"/>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['agv:queue:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['agv:queue:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -117,7 +99,6 @@
 <script>
 import { listQueue, getQueue, delQueue, addQueue, updateQueue } from "@/api/agv/queue"
 import { listQueueFinish } from "@/api/agv/queueFinish"
-import i18n from '@/lang'
 
 export default {
   name: "Queue",
@@ -242,7 +223,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "agv.queue.dialog.add"
+      this.title = "新增AGV任务队列"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -251,7 +232,7 @@ export default {
       getQueue(reqCode).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "agv.queue.dialog.edit"
+        this.title = "修改AGV任务队列"
       })
     },
     /** 提交按钮 */
@@ -260,13 +241,13 @@ export default {
         if (valid) {
           if (this.form.reqCode != null) {
             updateQueue(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.editSuccess'))
+              this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
             addQueue(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.addSuccess'))
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -277,11 +258,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const reqCodes = row.reqCode || this.ids
-      this.$modal.confirm(this.$t('common.deleteConfirm', { content: reqCodes })).then(function() {
+      this.$modal.confirm('是否确认删除' + reqCodes + '的数据项？').then(function() {
         return delQueue(reqCodes)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess(this.$t('common.deleteSuccess'))
+        this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/device/DeviceCar/index.vue b/ruoyi-ui/src/views/device/DeviceCar/index.vue
index 5261c3d..25d6ba5 100644
--- a/ruoyi-ui/src/views/device/DeviceCar/index.vue
+++ b/ruoyi-ui/src/views/device/DeviceCar/index.vue
@@ -1,118 +1,91 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('device.car.deviceCode')" prop="deviceCode">
-        <el-input
-          v-model="queryParams.deviceCode"
-          :placeholder="$t('device.car.placeholder.deviceCode')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="设备编码" prop="deviceCode">
+        <el-input v-model="queryParams.deviceCode" placeholder="请输入设备编码" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('device.car.name')" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          :placeholder="$t('device.car.placeholder.name')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="设备名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('device.car.taskNo')" prop="taskNo">
-        <el-input
-          v-model="queryParams.taskNo"
-          :placeholder="$t('device.car.placeholder.taskNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="类型" prop="type">
+        <el-input v-model="queryParams.type" placeholder="请输入类型" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('device.car.zxjd')" prop="zxjd">
-        <el-input
-          v-model="queryParams.zxjd"
-          :placeholder="$t('device.car.placeholder.zxjd')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="设备IP" prop="ipAddress">
+        <el-input v-model="queryParams.ipAddress" placeholder="请输入设备IP" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="关联缓冲区" prop="bufferAreaId">
+        <el-input v-model="queryParams.bufferAreaId" placeholder="请输入关联缓冲区" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="是否可用" prop="isActive">
+        <el-input v-model="queryParams.isActive" placeholder="请输入是否可用" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-input v-model="queryParams.status" placeholder="请输入状态" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="备用字段1" prop="spare1">
+        <el-input v-model="queryParams.spare1" placeholder="请输入备用字段1" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="备用字段2" prop="spare2">
+        <el-input v-model="queryParams.spare2" placeholder="请输入备用字段2" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="备用字段3" prop="spare3">
+        <el-input v-model="queryParams.spare3" placeholder="请输入备用字段3" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="备用字段4" prop="spare4">
+        <el-input v-model="queryParams.spare4" placeholder="请输入备用字段4" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input v-model="queryParams.taskNo" placeholder="请输入任务号" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="执行阶段" prop="zxjd">
+        <el-input v-model="queryParams.zxjd" placeholder="请输入执行阶段" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['device:DeviceCar:add']"
-        >{{ $t('common.add') }}</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['device:DeviceCar:edit']"
-        >{{ $t('common.edit') }}</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['device:DeviceCar:remove']"
-        >{{ $t('common.delete') }}</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['device:DeviceCar:export']"
-        >{{ $t('common.export') }}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="DeviceCarList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('common.id')" align="center" prop="id" />
-      <el-table-column :label="$t('device.car.deviceCode')" align="center" prop="deviceCode" />
-      <el-table-column :label="$t('device.car.name')" align="center" prop="name" />
-      <el-table-column :label="$t('device.car.type')" align="center" prop="type" />
-      <el-table-column :label="$t('device.car.ipAddress')" align="center" prop="ipAddress" />
-      <el-table-column :label="$t('device.car.bufferAreaId')" align="center" prop="bufferAreaId" />
-      <el-table-column :label="$t('device.car.isActive')" align="center" prop="isActive" />
-      <el-table-column :label="$t('device.car.status')" align="center" prop="status" />
-      <el-table-column :label="$t('device.car.taskNo')" align="center" prop="taskNo" />
-      <el-table-column :label="$t('device.car.zxjd')" align="center" prop="zxjd" />
-      <el-table-column :label="$t('common.operation')" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="设备编码" align="center" prop="deviceCode" />
+      <el-table-column label="设备名称" align="center" prop="name" />
+      <el-table-column label="类型" align="center" prop="type" />
+      <el-table-column label="设备IP" align="center" prop="ipAddress" />
+      <el-table-column label="关联缓冲区" align="center" prop="bufferAreaId" />
+      <el-table-column label="是否可用" align="center" prop="isActive" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['device:DeviceCar:edit']"
-          >{{ $t('common.edit') }}</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['device:DeviceCar:remove']"
-          >{{ $t('common.delete') }}</el-button>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="备用字段1" align="center" prop="spare1" />
+      <el-table-column label="备用字段2" align="center" prop="spare2" />
+      <el-table-column label="备用字段3" align="center" prop="spare3" />
+      <el-table-column label="备用字段4" align="center" prop="spare4" />
+      <el-table-column label="任务号" align="center" prop="taskNo" />
+      <el-table-column label="执行阶段" align="center" prop="zxjd" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -128,43 +101,46 @@
     <!-- Add or Edit Device Information Dialog -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('device.car.deviceCode')" prop="deviceCode">
-          <el-input v-model="form.deviceCode" :placeholder="$t('device.car.placeholder.deviceCode')" />
+        <el-form-item label="设备编码" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.name')" prop="name">
-          <el-input v-model="form.name" :placeholder="$t('device.car.placeholder.name')" />
+        <el-form-item label="设备名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设备名称" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.ipAddress')" prop="ipAddress">
-          <el-input v-model="form.ipAddress" :placeholder="$t('device.car.placeholder.ipAddress')" />
+        <el-form-item label="类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入类型" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.bufferAreaId')" prop="bufferAreaId">
-          <el-input v-model="form.bufferAreaId" :placeholder="$t('device.car.placeholder.bufferAreaId')" />
+        <el-form-item label="设备IP" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="请输入设备IP" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.isActive')" prop="isActive">
-          <el-input v-model="form.isActive" :placeholder="$t('device.car.placeholder.isActive')" />
+        <el-form-item label="关联缓冲区" prop="bufferAreaId">
+          <el-input v-model="form.bufferAreaId" placeholder="请输入关联缓冲区" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.spare1')" prop="spare1">
-          <el-input v-model="form.spare1" :placeholder="$t('device.car.placeholder.spare1')" />
+        <el-form-item label="是否可用" prop="isActive">
+          <el-input v-model="form.isActive" placeholder="请输入是否可用" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.spare2')" prop="spare2">
-          <el-input v-model="form.spare2" :placeholder="$t('device.car.placeholder.spare2')" />
+        <el-form-item label="备用字段1" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入备用字段1" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.spare3')" prop="spare3">
-          <el-input v-model="form.spare3" :placeholder="$t('device.car.placeholder.spare3')" />
+        <el-form-item label="备用字段2" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入备用字段2" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.spare4')" prop="spare4">
-          <el-input v-model="form.spare4" :placeholder="$t('device.car.placeholder.spare4')" />
+        <el-form-item label="备用字段3" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入备用字段3" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.taskNo')" prop="taskNo">
-          <el-input v-model="form.taskNo" :placeholder="$t('device.car.placeholder.taskNo')" />
+        <el-form-item label="备用字段4" prop="spare4">
+          <el-input v-model="form.spare4" placeholder="请输入备用字段4" />
         </el-form-item>
-        <el-form-item :label="$t('device.car.zxjd')" prop="zxjd">
-          <el-input v-model="form.zxjd" :placeholder="$t('device.car.placeholder.zxjd')" />
+        <el-form-item label="任务号" prop="taskNo">
+          <el-input v-model="form.taskNo" placeholder="请输入任务号" />
+        </el-form-item>
+        <el-form-item label="执行阶段" prop="zxjd">
+          <el-input v-model="form.zxjd" placeholder="请输入执行阶段" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -172,7 +148,6 @@
 
 <script>
 import { listDeviceCar, getDeviceCar, delDeviceCar, addDeviceCar, updateDeviceCar } from "@/api/device/DeviceCar"
-import i18n from '@/lang'
 
 export default {
   name: "DeviceCar",
@@ -280,7 +255,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = this.$t('device.car.dialog.add')
+      this.title = "添加设备信息"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -289,7 +264,7 @@ export default {
       getDeviceCar(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = this.$t('device.car.dialog.edit')
+        this.title = "修改设备信息"
       })
     },
     /** 提交按钮 */
@@ -298,13 +273,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDeviceCar(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.editSuccess'))
+              this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
             addDeviceCar(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.addSuccess'))
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -315,11 +290,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm(this.$t('device.car.dialog.delete', { 0: ids })).then(function() {
+      this.$modal.confirm('是否确认删除设备信息编号为"' + ids + '"的数据项？').then(function() {
         return delDeviceCar(ids)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess(this.$t('common.deleteSuccess'))
+        this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/device/api/index.vue b/ruoyi-ui/src/views/device/api/index.vue
index b836119..5952296 100644
--- a/ruoyi-ui/src/views/device/api/index.vue
+++ b/ruoyi-ui/src/views/device/api/index.vue
@@ -1,24 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('device.api.requestParams')" prop="requestBody">
+      <el-form-item label="请求参数" prop="requestBody">
         <el-input
           v-model="queryParams.requestBody"
-          :placeholder="$t('device.api.placeholder.requestParams')"
+          placeholder="请输入请求参数"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('device.api.errorInfo')" prop="errorDetails">
+      <el-form-item label="错误信息" prop="errorDetails">
         <el-input
           v-model="queryParams.errorDetails"
-          :placeholder="$t('device.api.placeholder.errorInfo')"
+          placeholder="请输入错误信息"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('device.api.isSuccessful')" prop="isSuccessful">
-        <el-select v-model="queryParams.isSuccessful" :placeholder="$t('device.api.placeholder.isSuccessful')" clearable>
+      <el-form-item label="是否成功" prop="isSuccessful">
+        <el-select v-model="queryParams.isSuccessful" placeholder="请选择是否成功" clearable>
           <el-option
             v-for="dict in dict.type.interface_status"
             :key="dict.value"
@@ -28,8 +28,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('device.api.search') }}</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('device.api.reset') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -42,7 +42,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:api:add']"
-        >{{ $t('device.api.add') }}</el-button>
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +53,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:api:edit']"
-        >{{ $t('device.api.modify') }}</el-button>
+        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -64,7 +64,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:api:remove']"
-        >{{ $t('device.api.delete') }}</el-button>
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,28 +74,28 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:api:export']"
-        >{{ $t('device.api.export') }}</el-button>
+        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="apiList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('device.api.requestId')" align="left" prop="requestId" />
-      <el-table-column :label="$t('device.api.requestTime')" align="left" prop="requestTime" />
-      <el-table-column :label="$t('device.api.sourceSystem')" align="left" prop="sourceSystem" />
-      <el-table-column :label="$t('device.api.targetSystem')" align="left" prop="targetSystem" />
-      <el-table-column :label="$t('device.api.endpoint')" align="left" prop="endpoint" />
-      <el-table-column :label="$t('device.api.requestUrl')" align="left" prop="requestUrl" />
-      <el-table-column :label="$t('device.api.requestMethod')" align="left" prop="requestMethod" />
-      <el-table-column :label="$t('device.api.requestHeaders')" align="left" prop="requestHeaders" />
-      <el-table-column :label="$t('device.api.requestParams')" align="left" prop="requestBody" />
-      <el-table-column :label="$t('device.api.responseTime')" align="left" prop="responseTime" />
-      <el-table-column :label="$t('device.api.responseBody')" align="left" prop="responseBody" />
-      <el-table-column :label="$t('device.api.responseStatus')" align="left" prop="responseStatus" />
-      <el-table-column :label="$t('device.api.errorInfo')" align="left" prop="errorDetails" />
-      <el-table-column :label="$t('device.api.duration')" align="left" prop="duration" />
-      <el-table-column :label="$t('device.api.isSuccessful')" align="left" prop="isSuccessful">
+      <el-table-column label="请求id" align="left" prop="requestId" />
+      <el-table-column label="请求时间" align="left" prop="requestTime" />
+      <el-table-column label="来源系统" align="left" prop="sourceSystem" />
+      <el-table-column label="目标系统" align="left" prop="targetSystem" />
+      <el-table-column label="接口名称" align="left" prop="endpoint" />
+      <el-table-column label="url路径" align="left" prop="requestUrl" />
+      <el-table-column label="请求方式" align="left" prop="requestMethod" />
+      <el-table-column label="请求头信息" align="left" prop="requestHeaders" />
+      <el-table-column label="请求参数" align="left" prop="requestBody" />
+      <el-table-column label="响应时间" align="left" prop="responseTime" />
+      <el-table-column label="响应主体" align="left" prop="responseBody" />
+      <el-table-column label="响应状态" align="left" prop="responseStatus" />
+      <el-table-column label="错误信息" align="left" prop="errorDetails" />
+      <el-table-column label="耗时" align="left" prop="duration" />
+      <el-table-column label="是否成功" align="left" prop="isSuccessful">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.interface_status" :value="scope.row.isSuccessful"/>
         </template>
@@ -112,40 +112,40 @@
     />
 
     <!-- 添加或修改接口记录对话框 -->
-    <el-dialog :title="$t(title)" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('device.api.sourceSystem')" prop="sourceSystem">
-          <el-input v-model="form.sourceSystem" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="来源系统" prop="sourceSystem">
+          <el-input v-model="form.sourceSystem" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.targetSystem')" prop="targetSystem">
-          <el-input v-model="form.targetSystem" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="目标系统" prop="targetSystem">
+          <el-input v-model="form.targetSystem" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.endpoint')" prop="endpoint">
-          <el-input v-model="form.endpoint" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="接口名称" prop="endpoint">
+          <el-input v-model="form.endpoint" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.requestUrl')" prop="requestUrl">
-          <el-input v-model="form.requestUrl" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="url路径" prop="requestUrl">
+          <el-input v-model="form.requestUrl" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.requestMethod')" prop="requestMethod">
-          <el-input v-model="form.requestMethod" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="请求方式" prop="requestMethod">
+          <el-input v-model="form.requestMethod" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.requestHeaders')" prop="requestHeaders">
-          <el-input v-model="form.requestHeaders" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="请求头信息" prop="requestHeaders">
+          <el-input v-model="form.requestHeaders" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.requestParams')" prop="requestBody">
-          <el-input v-model="form.requestBody" :placeholder="$t('device.api.placeholder.requestParams')" />
+        <el-form-item label="请求参数" prop="requestBody">
+          <el-input v-model="form.requestBody" placeholder="请输入请求参数" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.responseBody')" prop="responseBody">
-          <el-input v-model="form.responseBody" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="响应主体" prop="responseBody">
+          <el-input v-model="form.responseBody" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.errorInfo')" prop="errorDetails">
-          <el-input v-model="form.errorDetails" :placeholder="$t('device.api.placeholder.errorInfo')" />
+        <el-form-item label="错误信息" prop="errorDetails">
+          <el-input v-model="form.errorDetails" placeholder="请输入错误信息" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.duration')" prop="duration">
-          <el-input v-model="form.duration" type="textarea" :placeholder="$t('device.api.placeholder.content')" />
+        <el-form-item label="耗时" prop="duration">
+          <el-input v-model="form.duration" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item :label="$t('device.api.isSuccessful')" prop="isSuccessful">
-          <el-select v-model="form.isSuccessful" :placeholder="$t('device.api.placeholder.isSuccessful')">
+        <el-form-item label="是否成功" prop="isSuccessful">
+          <el-select v-model="form.isSuccessful" placeholder="请选择是否成功">
             <el-option
               v-for="dict in dict.type.interface_status"
               :key="dict.value"
@@ -156,8 +156,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{ $t('device.api.dialog.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('device.api.dialog.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -165,7 +165,6 @@
 
 <script>
 import { listApi, getApi, delApi, addApi, updateApi } from "@/api/device/api"
-import i18n from '@/lang'
 
 export default {
   name: "Api",
@@ -275,7 +274,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "device.api.dialog.add"
+      this.title = "添加接口记录"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -284,7 +283,7 @@ export default {
       getApi(requestId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "device.api.dialog.edit"
+        this.title = "修改接口记录"
       })
     },
     /** 提交按钮 */
@@ -293,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.requestId != null) {
             updateApi(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.editSuccess'))
+              this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
             addApi(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.addSuccess'))
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -310,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const requestIds = row.requestId || this.ids
-      this.$modal.confirm(this.$t('common.deleteConfirm', { content: requestIds })).then(function() {
+      this.$modal.confirm('是否确认删除接口记录编号为"' + requestIds + '"的数据项？').then(function() {
         return delApi(requestIds)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess(this.$t('common.deleteSuccess'))
+        this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/device/ssj/index.vue b/ruoyi-ui/src/views/device/ssj/index.vue
index 5f79f7b..74846d3 100644
--- a/ruoyi-ui/src/views/device/ssj/index.vue
+++ b/ruoyi-ui/src/views/device/ssj/index.vue
@@ -1,33 +1,108 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('device.ssj.deviceCode')" prop="deviceCode ">
+      <el-form-item :label="'设备编码'" prop="deviceCode">
         <el-input
-          v-model="queryParams.deviceCode "
-          :placeholder="$t('device.ssj.placeholder.deviceCode')"
+          v-model="queryParams.deviceCode"
+          :placeholder="'请输入设备唯一编码'"
           clearable
+          size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('device.ssj.name')" prop="name ">
+      <el-form-item :label="'设备名称'" prop="name">
         <el-input
-          v-model="queryParams.name "
-          :placeholder="$t('device.ssj.placeholder.name')"
+          v-model="queryParams.name"
+          :placeholder="'请输入设备名称'"
           clearable
+          size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('device.ssj.taskNo')" prop="taskNo">
+      <el-form-item :label="'设备IP'" prop="ipAddress">
+        <el-input
+          v-model="queryParams.ipAddress"
+          :placeholder="'请输入设备IP'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'PLC读取地址'" prop="plcDbReadAddress">
+        <el-input
+          v-model="queryParams.plcDbReadAddress"
+          :placeholder="'请输入PLC读取地址'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'PLC写入地址'" prop="plcDbWriteAddress">
+        <el-input
+          v-model="queryParams.plcDbWriteAddress"
+          :placeholder="'请输入PLC写入地址'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'是否可用'" prop="isActive">
+        <el-input
+          v-model="queryParams.isActive"
+          :placeholder="'请输入0-F 1-T'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'入库请求'" prop="rkqq">
+        <el-input
+          v-model="queryParams.rkqq"
+          :placeholder="'请输入入库请求'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'空闲'" prop="kx">
+        <el-input
+          v-model="queryParams.kx"
+          :placeholder="'请输入空闲'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'到位'" prop="dw">
+        <el-input
+          v-model="queryParams.dw"
+          :placeholder="'请输入到位'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'条码'" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          :placeholder="'请输入条码'"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'任务号'" prop="taskNo">
         <el-input
           v-model="queryParams.taskNo"
-          :placeholder="$t('device.ssj.placeholder.taskNo')"
+          :placeholder="'请输入任务号'"
           clearable
+          size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -40,7 +115,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:ssj:add']"
-        >{{ $t('common.add') }}</el-button>
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -48,10 +123,9 @@
           plain
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:ssj:edit']"
-        >{{ $t('common.edit') }}</el-button>
+        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -59,10 +133,9 @@
           plain
           icon="el-icon-delete"
           size="mini"
-          :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:ssj:remove']"
-        >{{ $t('common.delete') }}</el-button>
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,31 +145,24 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:ssj:export']"
-        >{{ $t('common.export') }}</el-button>
+        >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ssjList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('common.id')" align="center" prop="id" />
-      <el-table-column :label="$t('device.ssj.deviceCode')" align="center" prop="deviceCode" />
-      <el-table-column :label="$t('device.ssj.name')" align="center" prop="name" />
-      <el-table-column :label="$t('device.ssj.type')" align="center" prop="type" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.ssj_type" :value="scope.row.type"/>
-        </template>
-      </el-table-column>
-<!--      <el-table-column :label="$t('device.ssj.ipAddress')" align="center" prop="ipAddress" />
-      <el-table-column :label="$t('device.ssj.plcDbReadAddress')" align="center" prop="plcDbReadAddress" />
-      <el-table-column :label="$t('device.ssj.isActive')" align="center" prop="isActive" />
-      <el-table-column :label="$t('device.ssj.plcDbWriteAddress')" align="center" prop="plcDbWriteAddress" />-->
-      <el-table-column :label="$t('device.ssj.rkqq')" align="center" prop="rkqq" />
-      <el-table-column :label="$t('device.ssj.kx')" align="center" prop="kx" />
-      <el-table-column :label="$t('device.ssj.dw')" align="center" prop="dw" />
-      <el-table-column :label="$t('device.ssj.trayCode')" align="center" prop="trayCode" />
-      <el-table-column :label="$t('device.ssj.taskNo')" align="center" prop="taskNo" />
-      <el-table-column :label="$t('common.operation')" align="center" class-name="small-padding fixed-width">
+    <el-table v-loading="loading" :data="ssjList">
+      <el-table-column label="设备编码" align="center" prop="deviceCode" />
+      <el-table-column label="设备名称" align="center" prop="name" />
+      <el-table-column label="类型" align="center" prop="type" />
+      <el-table-column label="设备IP" align="center" prop="ipAddress" />
+      <el-table-column label="PLC读取地址" align="center" prop="plcDbReadAddress" />
+      <el-table-column label="PLC写入地址" align="center" prop="plcDbWriteAddress" />
+      <el-table-column label="是否可用" align="center" prop="isActive" />
+      <el-table-column label="入库请求" align="center" prop="rkqq" />
+      <el-table-column label="空闲" align="center" prop="kx" />
+      <el-table-column label="到位" align="center" prop="dw" />
+      <el-table-column label="条码" align="center" prop="trayCode" />
+      <el-table-column label="任务号" align="center" prop="taskNo" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -104,14 +170,14 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:ssj:edit']"
-          >{{ $t('common.edit') }}</el-button>
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:ssj:remove']"
-          >{{ $t('common.delete') }}</el-button>
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -124,57 +190,60 @@
       @pagination="getList"
     />
 
-    <!-- Add or Edit Conveyor Dialog -->
+    <!-- 添加或修改输送机对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('device.ssj.deviceCode')" prop="deviceCode ">
-          <el-input v-model="form.deviceCode " :placeholder="$t('device.ssj.placeholder.deviceCode')" />
+        <el-form-item label="设备编码" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入设备唯一编码" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.name')" prop="name ">
-          <el-input v-model="form.name " :placeholder="$t('device.ssj.placeholder.name')" />
+        <el-form-item label="设备名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设备名称" />
         </el-form-item>
-<!--        <el-form-item :label="$t('device.ssj.ipAddress')" prop="ipAddress">
-          <el-input v-model="form.ipAddress" :placeholder="$t('device.ssj.placeholder.ipAddress')" />
+        <el-form-item label="类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入类型" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.plcDbReadAddress')" prop="plcDbReadAddress">
-          <el-input v-model="form.plcDbReadAddress" :placeholder="$t('device.ssj.placeholder.plcDbReadAddress')" />
+        <el-form-item label="设备IP" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="请输入设备IP" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.isActive')" prop="isActive">
-          <el-input v-model="form.isActive" :placeholder="$t('device.ssj.placeholder.isActive')" />
+        <el-form-item label="PLC读取地址" prop="plcDbReadAddress">
+          <el-input v-model="form.plcDbReadAddress" placeholder="请输入PLC读取地址" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.plcDbWriteAddress')" prop="plcDbWriteAddress">
-          <el-input v-model="form.plcDbWriteAddress" :placeholder="$t('device.ssj.placeholder.plcDbWriteAddress')" />
-        </el-form-item>-->
-        <el-form-item :label="$t('device.ssj.rkqq')" prop="rkqq">
-          <el-input v-model="form.rkqq" :placeholder="$t('device.ssj.placeholder.rkqq')" />
+        <el-form-item label="PLC写入地址" prop="plcDbWriteAddress">
+          <el-input v-model="form.plcDbWriteAddress" placeholder="请输入PLC写入地址" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.kx')" prop="kx">
-          <el-input v-model="form.kx" :placeholder="$t('device.ssj.placeholder.kx')" />
+        <el-form-item label="是否可用" prop="isActive">
+          <el-input v-model="form.isActive" placeholder="请输入0-F 1-T" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.dw')" prop="dw">
-          <el-input v-model="form.dw" :placeholder="$t('device.ssj.placeholder.dw')" />
+        <el-form-item label="入库请求" prop="rkqq">
+          <el-input v-model="form.rkqq" placeholder="请输入入库请求" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.trayCode')" prop="trayCode">
-          <el-input v-model="form.trayCode" :placeholder="$t('device.ssj.placeholder.trayCode')" />
+        <el-form-item label="空闲" prop="kx">
+          <el-input v-model="form.kx" placeholder="请输入空闲" />
         </el-form-item>
-        <el-form-item :label="$t('device.ssj.taskNo')" prop="taskNo">
-          <el-input v-model="form.taskNo" :placeholder="$t('device.ssj.placeholder.taskNo')" />
+        <el-form-item label="到位" prop="dw">
+          <el-input v-model="form.dw" placeholder="请输入到位" />
+        </el-form-item>
+        <el-form-item label="条码" prop="trayCode">
+          <el-input v-model="form.trayCode" placeholder="请输入条码" />
+        </el-form-item>
+        <el-form-item label="任务号" prop="taskNo">
+          <el-input v-model="form.taskNo" placeholder="请输入任务号" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listSsj, getSsj, delSsj, addSsj, updateSsj } from "@/api/device/ssj"
+import { listSsj, getSsj, delSsj, addSsj, updateSsj } from "@/api/device/ssj";
+import "@/assets/styles/index.scss";
 
 export default {
   name: "Ssj",
-  dicts: ['ssj_type'],
   data() {
     return {
       // 遮罩层
@@ -192,20 +261,20 @@ export default {
       // 输送机表格数据
       ssjList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        deviceCode : null,
-        name : null,
+        deviceCode: null,
+        name: null,
         type: null,
         ipAddress: null,
         plcDbReadAddress: null,
-        isActive: null,
         plcDbWriteAddress: null,
+        isActive: null,
         rkqq: null,
         kx: null,
         dw: null,
@@ -216,8 +285,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        deviceCode: [
+          { required: true, message: '设备编码不能为空', trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: '设备名称不能为空', trigger: 'blur' }
+        ]
       }
-    }
+    };
   },
   created() {
     this.getList()
@@ -225,69 +300,62 @@ export default {
   methods: {
     /** 查询输送机列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       listSsj(this.queryParams).then(response => {
-        this.ssjList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+        this.ssjList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
         id: null,
-        deviceCode : null,
-        name : null,
+        deviceCode: null,
+        name: null,
         type: null,
         ipAddress: null,
         plcDbReadAddress: null,
-        isActive: null,
-        createTime: null,
         plcDbWriteAddress: null,
+        isActive: null,
         rkqq: null,
         kx: null,
         dw: null,
         trayCode: null,
         taskNo: null
-      }
-      this.resetForm("form")
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = this.$t('device.ssj.dialog.add')
+      this.reset();
+      this.open = true;
+      this.title = "添加输送机";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
+      this.reset();
+      const id = row.id || this.ids;
       getSsj(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = this.$t('device.ssj.dialog.edit')
-      })
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改输送机";
+      });
     },
     /** 提交按钮 */
     submitForm() {
@@ -295,35 +363,35 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSsj(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.editSuccess'))
-              this.open = false
-              this.getList()
-            })
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
             addSsj(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.addSuccess'))
-              this.open = false
-              this.getList()
-            })
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids
-      this.$modal.confirm(this.$t('device.ssj.dialog.deleteConfirm', { id: ids })).then(function() {
-        return delSsj(ids)
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除输送机编号为"' + ids + '"的数据项？').then(function() {
+        return delSsj(ids);
       }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess(this.$t('common.deleteSuccess'))
-      }).catch(() => {})
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('device/ssj/export', {
         ...this.queryParams
-      }, `ssj_${new Date().getTime()}.xlsx`)
+      }, `输送机_${new Date().getTime()}.xlsx`);
     }
   }
 }