rev:更新

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java

@@ -32,21 +32,12 @@ public class AcsPointAngle implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "起始点位编码")
-    private String start_point_code;
-
     @ApiModelProperty(value = "起始设备编码")
     private String start_device_code;
 
-    @ApiModelProperty(value = "目标点位编码")
-    private String next_point_code;
-
     @ApiModelProperty(value = "目标设备编码")
     private String next_device_code;
 
-    @ApiModelProperty(value = "起始点位角度")
-    private BigDecimal start_point_angle;
-
     @ApiModelProperty(value = "目标点位角度")
     private BigDecimal next_point_angle;
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,22 +45,13 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(AcsPointAngle dto) {
-        AcsPointAngle acsPointAngle = new AcsPointAngle();
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();
-        acsPointAngle.setId(dto.getId());
+        dto.setCreate_by("auto");
-        acsPointAngle.setStart_point_code(dto.getStart_point_code());
+        dto.setCreate_time(now);
-        acsPointAngle.setStart_device_code(dto.getStart_device_code());
+        dto.setUpdate_by(currentUsername);
-        acsPointAngle.setNext_point_code(dto.getNext_point_code());
+        dto.setUpdate_time(now);
-        acsPointAngle.setNext_device_code(dto.getNext_device_code());
+        acsPointAngleMapper.insert(dto);
-        acsPointAngle.setStart_point_angle(dto.getStart_point_angle());
-        acsPointAngle.setNext_point_angle(dto.getNext_point_angle());
-        acsPointAngle.setIs_active(dto.getIs_active());
-        acsPointAngle.setCreate_by("auto");
-        acsPointAngle.setCreate_time(now);
-        acsPointAngle.setUpdate_by(currentUsername);
-        acsPointAngle.setUpdate_time(now);
-        acsPointAngleMapper.insert(acsPointAngle);
     }
 
     @Override
@@ -67,16 +59,15 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
         if (dto == null) {
             throw new BadRequestException(LangProcess.msg("error_nullPoint"));
         }
-        AcsPointAngle acsPointAngle = new AcsPointAngle();
+        AcsPointAngle entity = this.getById(dto.getId());
-        acsPointAngle.setId(dto.getId());
+        if (entity == null) {
-        //起点角度，终点角度变化
+            throw new BadRequestException(LangProcess.msg("error_nullPoint"));
-        acsPointAngle.setStart_point_angle(dto.getStart_point_angle());
+        }
-        acsPointAngle.setNext_point_angle(dto.getNext_point_angle());
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();
-        acsPointAngle.setUpdate_by(currentUsername);
+        dto.setUpdate_by(currentUsername);
-        acsPointAngle.setUpdate_time(now);
+        dto.setUpdate_time(now);
-        acsPointAngleMapper.updateById(acsPointAngle);
+        acsPointAngleMapper.updateById(dto);
     }
 
     @Override

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -458,15 +458,13 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                 if (ObjectUtil.isEmpty(inst)) {
                     return false;
                 }
-                List list = new ArrayList();
+                Map<String, Object> map = new LinkedHashMap<>();
-                Map map = new HashMap();
                 map.put("to_target", next_addr);
                 map.put("to_task", inst.getInstruction_code());
                 map.put("to_command", CommonFinalParam.ONE);
                 map.put("to_container_type", CommonFinalParam.ONE);
                 map.put("to_container_no", CommonFinalParam.ONE);
-                list.add(map);
+                this.writing(map);
-                this.writing(list);
                 led_message = getLedMessage(inst);
                 requireSucess = true;
                 return true;
@@ -555,16 +553,14 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                     taskdto.setTask_status(CommonFinalParam.ONE);
                     taskserver.update(taskdto);
                     requireSucess = true;
-                    List list = new ArrayList<>();
+                    Map<String, Object> map = new LinkedHashMap<>();
-                    Map map = new HashMap();
                     String next_addr = nextdevice.getExtraValue().get("address").toString();
                     map.put("to_target", next_addr);
                     map.put("to_task", instdto.getInstruction_code());
                     map.put("to_command", CommonFinalParam.ONE);
                     map.put("to_container_type", CommonFinalParam.ONE);
                     map.put("to_container_no", CommonFinalParam.ONE);
-                    list.add(map);
+                    this.writing(map);
-                    this.writing(list);
                     led_message = getLedMessage(instdto);
                     requireSucess = true;
                     return true;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -501,8 +501,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
 
             }
         } else {
-            List list = new ArrayList();
+            Map<String, Object> map = new LinkedHashMap<>();
-            HashMap map = new HashMap();
             switch (command) {
                 case 0:
                     boolean b = applyTask();
@@ -599,8 +598,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     break;
             }
             if (ObjectUtil.isNotNull(map)) {
-                list.add(map);
+                this.writing(map);
-                this.writing(list);
             }
 
         }
@@ -849,6 +847,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
 
     }
 
+
     public void writing(List list) {
 
         Map<String, Object> itemMap = new HashMap<String, Object>();
@@ -890,6 +889,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
         return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + ".";
     }
 
+    /**
+     * 多个信号一起下发电气
+     *
+     * @param map
+     */
     public void writing(Map<String, Object> map) {
         DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
         Map<String, Object> itemMap = new LinkedHashMap<>();

acs/nladmin-system/nlsso-server/src/main/resources/mapper/AcsTaskMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.acs.angle.mapper.AcsTaskMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        task_id, ext_task_id, task_code, vehicle_code, vehicle_type, task_type, task_status, compound_task, compound_task_data, request_again, request_again_success, link_num, is_send, material, quantity, priority, create_type, finish_type, execute_code, execute_message, start_point_code, start_device_code, put_point_code, put_device_code, start_point_code2, start_device_code2, next_point_code, next_device_code, next_point_code2, next_device_code2, from_x, from_y, from_z, put_x, put_y, put_z, to_x, to_y, to_z, from_x2, from_y2, from_z2, to_x2, to_y2, to_z2, route_plan_name, route_plan_code, is_needfeedback, emptypallet_num, remark, is_active, is_delete, create_by, create_time, update_by, update_time, weight, agv_system_type, storage_task_type, temperature, oven_time, car_no, start_height, next_height
+    </sql>
+
+</mapper>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

acs/nladmin-ui/src/views/screen/bigScreen.vue

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