From 4b110796e23c5acb0e7c52b56da102f292b4af5a Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 03 六月 2023 13:27:11 +0800 Subject: [PATCH] 提升机管理 --- src/main/resources/mapper/BasLiftMapper.xml | 38 ++ src/main/java/com/zy/asrs/controller/BasLiftController.java | 125 ++++++ src/main/java/com/zy/asrs/mapper/BasLiftMapper.java | 12 src/main/webapp/static/js/basLift/basLift.js | 277 +++++++++++++++ src/main/webapp/views/basLift/basLift.html | 260 ++++++++++++++ src/main/java/com/zy/asrs/service/impl/BasLiftServiceImpl.java | 12 src/main/java/com/zy/asrs/service/BasLiftService.java | 8 src/main/java/com/zy/asrs/entity/BasLift.java | 339 ++++++++++++++++++ 8 files changed, 1,071 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasLiftController.java b/src/main/java/com/zy/asrs/controller/BasLiftController.java new file mode 100644 index 0000000..6153fa2 --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/BasLiftController.java @@ -0,0 +1,125 @@ +package com.zy.asrs.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.core.common.DateUtils; +import com.zy.asrs.entity.BasLift; +import com.zy.asrs.service.BasLiftService; +import com.core.annotations.ManagerAuth; +import com.core.common.BaseRes; +import com.core.common.Cools; +import com.core.common.R; +import com.zy.common.web.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +@RestController +public class BasLiftController extends BaseController { + + @Autowired + private BasLiftService basLiftService; + + @RequestMapping(value = "/basLift/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(basLiftService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/basLift/list/auth") + @ManagerAuth + public R list(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam(required = false)String condition, + @RequestParam Map<String, Object> param){ + EntityWrapper<BasLift> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + allLike(BasLift.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(basLiftService.selectPage(new Page<>(curr, limit), wrapper)); + } + + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ + for (Map.Entry<String, Object> entry : map.entrySet()){ + String val = String.valueOf(entry.getValue()); + if (val.contains(RANGE_TIME_LINK)){ + String[] dates = val.split(RANGE_TIME_LINK); + wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); + wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); + } else { + wrapper.like(entry.getKey(), val); + } + } + } + + @RequestMapping(value = "/basLift/add/auth") + @ManagerAuth + public R add(BasLift basLift) { + basLiftService.insert(basLift); + return R.ok(); + } + + @RequestMapping(value = "/basLift/update/auth") + @ManagerAuth + public R update(BasLift basLift){ + if (Cools.isEmpty(basLift) || null==basLift.getLiftNo()){ + return R.error(); + } + basLiftService.updateById(basLift); + return R.ok(); + } + + @RequestMapping(value = "/basLift/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + basLiftService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/basLift/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<BasLift> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("basLift")); + convert(map, wrapper); + List<BasLift> list = basLiftService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/basLiftQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<BasLift> wrapper = new EntityWrapper<>(); + wrapper.like("lift_no", condition); + Page<BasLift> page = basLiftService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (BasLift basLift : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", basLift.getLiftNo()); + map.put("value", basLift.getLiftNo()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/basLift/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<BasLift> wrapper = new EntityWrapper<BasLift>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != basLiftService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(BasLift.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java new file mode 100644 index 0000000..5bfe9ba --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/BasLift.java @@ -0,0 +1,339 @@ +package com.zy.asrs.entity; + +import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotations.TableField; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; +import com.core.common.SpringUtils; +import com.zy.system.service.UserService; +import com.zy.system.entity.User; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +@Data +@TableName("asr_bas_lift") +public class BasLift implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 鎻愬崌鏈哄彿 + */ + @ApiModelProperty(value= "鎻愬崌鏈哄彿") + @TableId(value = "lift_no", type = IdType.INPUT) + @TableField("lift_no") + private Integer liftNo; + + /** + * 褰撳墠浠诲姟鐘舵�� + */ + @ApiModelProperty(value= "褰撳墠浠诲姟鐘舵��") + private Integer status; + + /** + * 浠诲姟鍙� + */ + @ApiModelProperty(value= "浠诲姟鍙�") + @TableField("wrk_no") + private Integer wrkNo; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("update_by") + private Long updateBy; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + /** + * 浣滀笟鏍囪 + */ + @ApiModelProperty(value= "浣滀笟鏍囪") + @TableField("pak_mk") + private Integer pakMk; + + /** + * 鎻愬崌鏈洪攣瀹� + */ + @ApiModelProperty(value= "鎻愬崌鏈洪攣瀹�") + @TableField("lift_lock") + private Integer liftLock; + + /** + * 浣嶇疆鍒拌揪鍙嶉 + */ + @ApiModelProperty(value= "浣嶇疆鍒拌揪鍙嶉") + @TableField("position_arrival_feedback") + private Integer positionArrivalFeedback; + + /** + * 鍑嗗灏辩华 + */ + @ApiModelProperty(value= "鍑嗗灏辩华") + private Integer ready; + + /** + * 杩愯涓� + */ + @ApiModelProperty(value= "杩愯涓�") + private Integer running; + + /** + * 鑱旀満/鍗曟満 + */ + @ApiModelProperty(value= "鑱旀満/鍗曟満") + private Integer mode; + + /** + * 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣 + */ + @ApiModelProperty(value= "杈撻�佺嚎鍓嶇鍏夌數鏈夎揣") + @TableField("line_front_has_stock") + private Integer lineFrontHasStock; + + /** + * 杈撻�佺嚎姝h浆鍙嶉 + */ + @ApiModelProperty(value= "杈撻�佺嚎姝h浆鍙嶉") + @TableField("forward_rotation_feedback") + private Integer forwardRotationFeedback; + + /** + * 杈撻�佺嚎鍙嶈浆鍙嶉 + */ + @ApiModelProperty(value= "杈撻�佺嚎鍙嶈浆鍙嶉") + @TableField("reverse_feedback") + private Integer reverseFeedback; + + /** + * 杈撻�佺嚎鐢垫満杩囪浇 + */ + @ApiModelProperty(value= "杈撻�佺嚎鐢垫満杩囪浇") + @TableField("motor_overload") + private Integer motorOverload; + + /** + * 杈撻�佺嚎鏈鍏夌數鏈夎揣 + */ + @ApiModelProperty(value= "杈撻�佺嚎鏈鍏夌數鏈夎揣") + @TableField("line_end_has_stock") + private Integer lineEndHasStock; + + /** + * 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀� + */ + @ApiModelProperty(value= "杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�") + @TableField("in_convey_line_card_tray_alarm") + private Integer inConveyLineCardTrayAlarm; + + /** + * 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀� + */ + @ApiModelProperty(value= "鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�") + @TableField("out_convey_line_card_tray_alarm") + private Integer outConveyLineCardTrayAlarm; + + /** + * 骞冲彴浣嶇疆鍋忓樊鎶ヨ + */ + @ApiModelProperty(value= "骞冲彴浣嶇疆鍋忓樊鎶ヨ") + @TableField("plat_position_deviation_alarm") + private Integer platPositionDeviationAlarm; + + /** + * 骞冲彴鎵煩鍋忓樊鎶ヨ + */ + @ApiModelProperty(value= "骞冲彴鎵煩鍋忓樊鎶ヨ") + @TableField("plat_torque_deviation_alarm") + private Integer platTorqueDeviationAlarm; + + /** + * 骞冲彴鍥涘悜杞︽娴� + */ + @ApiModelProperty(value= "骞冲彴鍥涘悜杞︽娴�") + @TableField("plat_shuttle_check") + private Integer platShuttleCheck; + + /** + * 鏈氨缁姸鎬� + */ + @ApiModelProperty(value= "鏈氨缁姸鎬�") + @TableField("not_ready") + private Integer notReady; + + /** + * 浼烘湇1閿欒 + */ + @ApiModelProperty(value= "浼烘湇1閿欒") + @TableField("servo_error1") + private Integer servoError1; + + /** + * 浼烘湇2閿欒 + */ + @ApiModelProperty(value= "浼烘湇2閿欒") + @TableField("servo_error2") + private Integer servoError2; + + /** + * 浼烘湇3閿欒 + */ + @ApiModelProperty(value= "浼烘湇3閿欒") + @TableField("servo_error3") + private Integer servoError3; + + /** + * 浼烘湇4閿欒 + */ + @ApiModelProperty(value= "浼烘湇4閿欒") + @TableField("servo_error4") + private Integer servoError4; + + /** + * 鎻愬崌鏈哄疄闄呴�熷害鍙嶉 + */ + @ApiModelProperty(value= "鎻愬崌鏈哄疄闄呴�熷害鍙嶉") + @TableField("lift_actual_speed") + private Integer liftActualSpeed; + + public BasLift() {} + + public BasLift(Integer liftNo,Integer status,Integer wrkNo,Date updateTime,Long updateBy,String memo,Integer pakMk,Integer liftLock,Integer positionArrivalFeedback,Integer ready,Integer running,Integer mode,Integer lineFrontHasStock,Integer forwardRotationFeedback,Integer reverseFeedback,Integer motorOverload,Integer lineEndHasStock,Integer inConveyLineCardTrayAlarm,Integer outConveyLineCardTrayAlarm,Integer platPositionDeviationAlarm,Integer platTorqueDeviationAlarm,Integer platShuttleCheck,Integer notReady,Integer servoError1,Integer servoError2,Integer servoError3,Integer servoError4,Integer liftActualSpeed) { + this.liftNo = liftNo; + this.status = status; + this.wrkNo = wrkNo; + this.updateTime = updateTime; + this.updateBy = updateBy; + this.memo = memo; + this.pakMk = pakMk; + this.liftLock = liftLock; + this.positionArrivalFeedback = positionArrivalFeedback; + this.ready = ready; + this.running = running; + this.mode = mode; + this.lineFrontHasStock = lineFrontHasStock; + this.forwardRotationFeedback = forwardRotationFeedback; + this.reverseFeedback = reverseFeedback; + this.motorOverload = motorOverload; + this.lineEndHasStock = lineEndHasStock; + this.inConveyLineCardTrayAlarm = inConveyLineCardTrayAlarm; + this.outConveyLineCardTrayAlarm = outConveyLineCardTrayAlarm; + this.platPositionDeviationAlarm = platPositionDeviationAlarm; + this.platTorqueDeviationAlarm = platTorqueDeviationAlarm; + this.platShuttleCheck = platShuttleCheck; + this.notReady = notReady; + this.servoError1 = servoError1; + this.servoError2 = servoError2; + this.servoError3 = servoError3; + this.servoError4 = servoError4; + this.liftActualSpeed = liftActualSpeed; + } + +// BasLift basLift = new BasLift( +// null, // 鎻愬崌鏈哄彿[闈炵┖] +// null, // 褰撳墠浠诲姟鐘舵�� +// null, // 浠诲姟鍙� +// null, // 淇敼鏃堕棿 +// null, // 淇敼浜哄憳 +// null, // 澶囨敞 +// null, // 浣滀笟鏍囪 +// null, // 鎻愬崌鏈洪攣瀹� +// null, // 浣嶇疆鍒拌揪鍙嶉 +// null, // 鍑嗗灏辩华 +// null, // 杩愯涓� +// null, // 鑱旀満/鍗曟満 +// null, // 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣 +// null, // 杈撻�佺嚎姝h浆鍙嶉 +// null, // 杈撻�佺嚎鍙嶈浆鍙嶉 +// null, // 杈撻�佺嚎鐢垫満杩囪浇 +// null, // 杈撻�佺嚎鏈鍏夌數鏈夎揣 +// null, // 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀� +// null, // 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀� +// null, // 骞冲彴浣嶇疆鍋忓樊鎶ヨ +// null, // 骞冲彴鎵煩鍋忓樊鎶ヨ +// null, // 骞冲彴鍥涘悜杞︽娴� +// null, // 鏈氨缁姸鎬� +// null, // 浼烘湇1閿欒 +// null, // 浼烘湇2閿欒 +// null, // 浼烘湇3閿欒 +// null, // 浼烘湇4閿欒 +// null // 鎻愬崌鏈哄疄闄呴�熷害鍙嶉 +// ); + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + public String getUpdateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.updateBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public String getPakMk$() { + if (Cools.isEmpty(this.pakMk)){ + return ""; + } + return this.pakMk == 1 ? "Y" : "N"; + } + + public String getLiftLock$() { + if (Cools.isEmpty(this.liftLock)){ + return ""; + } + return this.liftLock == 1 ? "Y" : "N"; + } + + public String getReady$() { + if (Cools.isEmpty(this.ready)){ + return ""; + } + return this.ready == 1 ? "Y" : "N"; + } + + public String getRunning$() { + if (Cools.isEmpty(this.running)){ + return ""; + } + return this.running == 1 ? "Y" : "N"; + } + + public String getMode$() { + if (Cools.isEmpty(this.mode)){ + return ""; + } + return this.mode == 1 ? "鑱旀満" : "鍗曟満"; + } + + public String getNotReady$() { + if (Cools.isEmpty(this.notReady)){ + return ""; + } + return this.notReady == 1 ? "Y" : "N"; + } + +} diff --git a/src/main/java/com/zy/asrs/mapper/BasLiftMapper.java b/src/main/java/com/zy/asrs/mapper/BasLiftMapper.java new file mode 100644 index 0000000..158122e --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/BasLiftMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.BasLift; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface BasLiftMapper extends BaseMapper<BasLift> { + +} diff --git a/src/main/java/com/zy/asrs/service/BasLiftService.java b/src/main/java/com/zy/asrs/service/BasLiftService.java new file mode 100644 index 0000000..5f39b02 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/BasLiftService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.BasLift; +import com.baomidou.mybatisplus.service.IService; + +public interface BasLiftService extends IService<BasLift> { + +} diff --git a/src/main/java/com/zy/asrs/service/impl/BasLiftServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasLiftServiceImpl.java new file mode 100644 index 0000000..868706d --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/BasLiftServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service.impl; + +import com.zy.asrs.mapper.BasLiftMapper; +import com.zy.asrs.entity.BasLift; +import com.zy.asrs.service.BasLiftService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("basLiftService") +public class BasLiftServiceImpl extends ServiceImpl<BasLiftMapper, BasLift> implements BasLiftService { + +} diff --git a/src/main/resources/mapper/BasLiftMapper.xml b/src/main/resources/mapper/BasLiftMapper.xml new file mode 100644 index 0000000..caae4e5 --- /dev/null +++ b/src/main/resources/mapper/BasLiftMapper.xml @@ -0,0 +1,38 @@ +<?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="com.zy.asrs.mapper.BasLiftMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLift"> + <result column="lift_no" property="liftNo" /> + <result column="status" property="status" /> + <result column="wrk_no" property="wrkNo" /> + <result column="update_time" property="updateTime" /> + <result column="update_by" property="updateBy" /> + <result column="memo" property="memo" /> + <result column="pak_mk" property="pakMk" /> + <result column="lift_lock" property="liftLock" /> + <result column="position_arrival_feedback" property="positionArrivalFeedback" /> + <result column="ready" property="ready" /> + <result column="running" property="running" /> + <result column="mode" property="mode" /> + <result column="line_front_has_stock" property="lineFrontHasStock" /> + <result column="forward_rotation_feedback" property="forwardRotationFeedback" /> + <result column="reverse_feedback" property="reverseFeedback" /> + <result column="motor_overload" property="motorOverload" /> + <result column="line_end_has_stock" property="lineEndHasStock" /> + <result column="in_convey_line_card_tray_alarm" property="inConveyLineCardTrayAlarm" /> + <result column="out_convey_line_card_tray_alarm" property="outConveyLineCardTrayAlarm" /> + <result column="plat_position_deviation_alarm" property="platPositionDeviationAlarm" /> + <result column="plat_torque_deviation_alarm" property="platTorqueDeviationAlarm" /> + <result column="plat_shuttle_check" property="platShuttleCheck" /> + <result column="not_ready" property="notReady" /> + <result column="servo_error1" property="servoError1" /> + <result column="servo_error2" property="servoError2" /> + <result column="servo_error3" property="servoError3" /> + <result column="servo_error4" property="servoError4" /> + <result column="lift_actual_speed" property="liftActualSpeed" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/js/basLift/basLift.js b/src/main/webapp/static/js/basLift/basLift.js new file mode 100644 index 0000000..cdef2d8 --- /dev/null +++ b/src/main/webapp/static/js/basLift/basLift.js @@ -0,0 +1,277 @@ +var pageCurr; +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).use(['table','laydate', 'form', 'admin'], function(){ + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + var admin = layui.admin; + + // 鏁版嵁娓叉煋 + tableIns = table.render({ + elem: '#basLift', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/basLift/list/auth', + page: true, + limit: 15, + limits: [15, 30, 50, 100, 200, 500], + toolbar: '#toolbar', + cellMinWidth: 50, + height: 'full-120', + cols: [[ + {type: 'checkbox'} + ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'} + ,{field: 'status', align: 'center',title: '褰撳墠浠诲姟鐘舵��'} + ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'} + // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} + ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'pakMk$', align: 'center',title: '浣滀笟鏍囪'} + ,{field: 'liftLock$', align: 'center',title: '鎻愬崌鏈洪攣瀹�'} + ,{field: 'positionArrivalFeedback', align: 'center',title: '浣嶇疆鍒拌揪鍙嶉'} + ,{field: 'ready$', align: 'center',title: '鍑嗗灏辩华'} + ,{field: 'running', align: 'center',title: '杩愯涓�'} + ,{field: 'mode$', align: 'center',title: '鑱旀満/鍗曟満'} + // ,{field: 'lineFrontHasStock', align: 'center',title: '杈撻�佺嚎鍓嶇鍏夌數鏈夎揣'} + // ,{field: 'forwardRotationFeedback', align: 'center',title: '杈撻�佺嚎姝h浆鍙嶉'} + // ,{field: 'reverseFeedback', align: 'center',title: '杈撻�佺嚎鍙嶈浆鍙嶉'} + // ,{field: 'motorOverload', align: 'center',title: '杈撻�佺嚎鐢垫満杩囪浇'} + // ,{field: 'lineEndHasStock', align: 'center',title: '杈撻�佺嚎鏈鍏夌數鏈夎揣'} + // ,{field: 'inConveyLineCardTrayAlarm', align: 'center',title: '杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�'} + // ,{field: 'outConveyLineCardTrayAlarm', align: 'center',title: '鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�'} + // ,{field: 'platPositionDeviationAlarm', align: 'center',title: '骞冲彴浣嶇疆鍋忓樊鎶ヨ'} + // ,{field: 'platTorqueDeviationAlarm', align: 'center',title: '骞冲彴鎵煩鍋忓樊鎶ヨ'} + // ,{field: 'platShuttleCheck', align: 'center',title: '骞冲彴鍥涘悜杞︽娴�'} + ,{field: 'notReady$', align: 'center',title: '鏈氨缁姸鎬�'} + // ,{field: 'servoError1', align: 'center',title: '浼烘湇1閿欒'} + // ,{field: 'servoError2', align: 'center',title: '浼烘湇2閿欒'} + // ,{field: 'servoError3', align: 'center',title: '浼烘湇3閿欒'} + // ,{field: 'servoError4', align: 'center',title: '浼烘湇4閿欒'} + // ,{field: 'liftActualSpeed', align: 'center',title: '鎻愬崌鏈哄疄闄呴�熷害鍙嶉'} + + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function(res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } + }); + + // 鐩戝惉鎺掑簭浜嬩欢 + table.on('sort(basLift)', function (obj) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + searchData['orderByField'] = obj.field; + searchData['orderByType'] = obj.type; + tableIns.reload({ + where: searchData, + page: {curr: 1} + }); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(basLift)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id).data; + switch(obj.event) { + case 'addData': + showEditModel(); + break; + case 'deleteData': + if (checkStatus.length === 0) { + layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2}); + return; + } + del(checkStatus.map(function (d) { + return d.liftNo; + })); + break; + case 'exportData': + admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ + var titles=[]; + var fields=[]; + obj.config.cols[0].map(function (col) { + if (col.type === 'normal' && col.hide === false && col.toolbar == null) { + titles.push(col.title); + fields.push(col.field); + } + }); + var exportData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + exportData[this.name] = this.value; + }); + var param = { + 'basLift': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/basLift/export/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + dataType:'json', + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + layer.closeAll(); + if (res.code === 200) { + table.exportFile(titles,res.data,'xls'); + } else if (res.code === 403) { + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + }); + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(basLift)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'edit': + showEditModel(data); + break; + case "del": + del([data.liftNo]); + break; + } + }); + + /* 寮圭獥 - 鏂板銆佷慨鏀� */ + function showEditModel(mData) { + admin.open({ + type: 1, + area: '600px', + title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��', + content: $('#editDialog').html(), + success: function (layero, dIndex) { + layDateRender(mData); + form.val('detail', mData); + form.on('submit(editSubmit)', function (data) { + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/basLift/"+(mData?'update':'add')+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.close(dIndex); + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + } + }); + } + + /* 鍒犻櫎 */ + function del(ids) { + layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/basLift/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {ids: ids}, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + }); + } + + // 鎼滅储 + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 閲嶇疆 + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(false); + }); + + // 鏃堕棿閫夋嫨鍣� + function layDateRender(data) { + setTimeout(function () { + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); + layDate.render({ + elem: '#updateTime\\$', + type: 'datetime', + value: data!==undefined?data['updateTime\\$']:null + }); + + }, 300); + } + layDateRender(); + +}); + +// 鍏抽棴鍔ㄤ綔 +$(document).on('click','#data-detail-close', function () { + parent.layer.closeAll(); +}); + +function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + tableIns.reload({ + where: searchData, + page: {curr: pageCurr} + }); +} diff --git a/src/main/webapp/views/basLift/basLift.html b/src/main/webapp/views/basLift/basLift.html new file mode 100644 index 0000000..1ce3f86 --- /dev/null +++ b/src/main/webapp/views/basLift/basLift.html @@ -0,0 +1,260 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> +</head> +<body> + +<div class="layui-fluid"> + <div class="layui-card"> + <div class="layui-card-body"> + <div class="layui-form toolbar" id="search-box"> + <div class="layui-form-item"> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width: 300px"> + <div class="layui-input-inline"> + <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"> + </div> + </div> + <div class="layui-inline">  + <button class="layui-btn icon-btn" lay-filter="search" lay-submit> + <i class="layui-icon"></i>鎼滅储 + </button> + <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> + <i class="layui-icon"></i>閲嶇疆 + </button> + </div> + </div> + </div> + <table class="layui-hide" id="basLift" lay-filter="basLift"></table> + </div> + </div> +</div> + +<script type="text/html" id="toolbar"> + <div class="layui-btn-container"> + <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button> + <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> + </div> +</script> + +<script type="text/html" id="operate"> + <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> + <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> +</script> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/basLift/basLift.js" charset="utf-8"></script> +</body> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> + <input name="id" type="hidden"> + <div class="layui-row"> + <div class="layui-col-md12"> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">鎻愬崌鏈哄彿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="liftNo" placeholder="璇疯緭鍏ユ彁鍗囨満鍙�" lay-vertype="tips" lay-verify="required"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">褰撳墠浠诲姟鐘舵��: </label> + <div class="layui-input-block"> + <input class="layui-input" name="status" placeholder="璇疯緭鍏ュ綋鍓嶄换鍔$姸鎬�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">浠诲姟鍙�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ヤ换鍔″彿"> + </div> + </div> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">淇敼鏃堕棿: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">淇敼浜哄憳: </label>--> +<!-- <div class="layui-input-block cool-auto-complete">--> +<!-- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">--> +<!-- <input id="updateBy$" name="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>--> +<!-- <div class="cool-auto-complete-window">--> +<!-- <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">--> +<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">--> +<!-- </select>--> +<!-- </div>--> +<!-- </div>--> +<!-- </div>--> + <div class="layui-form-item"> + <label class="layui-form-label">澶囨敞: </label> + <div class="layui-input-block"> + <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">浣滀笟鏍囪: </label> + <div class="layui-input-block"> + <input class="layui-input" name="pakMk" placeholder="璇疯緭鍏ヤ綔涓氭爣璁�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鎻愬崌鏈洪攣瀹�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="liftLock" placeholder="璇疯緭鍏ユ彁鍗囨満閿佸畾"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">浣嶇疆鍒拌揪鍙嶉: </label> + <div class="layui-input-block"> + <input class="layui-input" name="positionArrivalFeedback" placeholder="璇疯緭鍏ヤ綅缃埌杈惧弽棣�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍑嗗灏辩华: </label> + <div class="layui-input-block"> + <input class="layui-input" name="ready" placeholder="璇疯緭鍏ュ噯澶囧氨缁�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">杩愯涓�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="running" placeholder="璇疯緭鍏ヨ繍琛屼腑"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鑱旀満/鍗曟満: </label> + <div class="layui-input-block"> + <input class="layui-input" name="mode" placeholder="璇疯緭鍏ヨ仈鏈�/鍗曟満"> + </div> + </div> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">杈撻�佺嚎鍓嶇鍏夌數鏈夎揣: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="lineFrontHasStock" placeholder="璇疯緭鍏ヨ緭閫佺嚎鍓嶇鍏夌數鏈夎揣">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">杈撻�佺嚎姝h浆鍙嶉: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="forwardRotationFeedback" placeholder="璇疯緭鍏ヨ緭閫佺嚎姝h浆鍙嶉">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">杈撻�佺嚎鍙嶈浆鍙嶉: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="reverseFeedback" placeholder="璇疯緭鍏ヨ緭閫佺嚎鍙嶈浆鍙嶉">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">杈撻�佺嚎鐢垫満杩囪浇: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="motorOverload" placeholder="璇疯緭鍏ヨ緭閫佺嚎鐢垫満杩囪浇">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">杈撻�佺嚎鏈鍏夌數鏈夎揣: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="lineEndHasStock" placeholder="璇疯緭鍏ヨ緭閫佺嚎鏈鍏夌數鏈夎揣">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="inConveyLineCardTrayAlarm" placeholder="璇疯緭鍏ヨ繘杈撻�佺嚎鍗℃墭鐩樻姤璀�">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="outConveyLineCardTrayAlarm" placeholder="璇疯緭鍏ュ嚭杈撻�佺嚎鍗℃墭鐩樻姤璀�">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">骞冲彴浣嶇疆鍋忓樊鎶ヨ: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="platPositionDeviationAlarm" placeholder="璇疯緭鍏ュ钩鍙颁綅缃亸宸姤璀�">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">骞冲彴鎵煩鍋忓樊鎶ヨ: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="platTorqueDeviationAlarm" placeholder="璇疯緭鍏ュ钩鍙版壄鐭╁亸宸姤璀�">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">骞冲彴鍥涘悜杞︽娴�: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="platShuttleCheck" placeholder="璇疯緭鍏ュ钩鍙板洓鍚戣溅妫�娴�">--> +<!-- </div>--> +<!-- </div>--> + <div class="layui-form-item"> + <label class="layui-form-label">鏈氨缁姸鎬�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="notReady" placeholder="璇疯緭鍏ユ湭灏辩华鐘舵��"> + </div> + </div> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">浼烘湇1閿欒: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="servoError1" placeholder="璇疯緭鍏ヤ己鏈�1閿欒">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">浼烘湇2閿欒: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="servoError2" placeholder="璇疯緭鍏ヤ己鏈�2閿欒">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">浼烘湇3閿欒: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="servoError3" placeholder="璇疯緭鍏ヤ己鏈�3閿欒">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">浼烘湇4閿欒: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="servoError4" placeholder="璇疯緭鍏ヤ己鏈�4閿欒">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">鎻愬崌鏈哄疄闄呴�熷害鍙嶉: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="liftActualSpeed" placeholder="璇疯緭鍏ユ彁鍗囨満瀹為檯閫熷害鍙嶉">--> +<!-- </div>--> +<!-- </div>--> + + </div> + </div> + <hr class="layui-bg-gray"> + <div class="layui-form-item text-right"> + <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + </div> + </form> +</script> +</html> + -- Gitblit v1.9.1