#

Junjie

2025-11-12 885633a6a4da38c530c033796fcd3dead72349c0

#

 src/main/java/com/zy/asrs/controller/BasDevpController.java

New file
@@ -0,0 +1,160 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
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.domain.param.InitDevpStationParam;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
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 BasDevpController extends BaseController {

    @Autowired
    private BasDevpService basDevpService;

    @RequestMapping(value = "/basDevp/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basDevpService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/basDevp/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<BasDevp> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasDevp.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basDevpService.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 = "/basDevp/add/auth")
    @ManagerAuth
    public R add(BasDevp basDevp) {
        basDevpService.insert(basDevp);
        return R.ok();
    }

    @RequestMapping(value = "/basDevp/update/auth")
    @ManagerAuth
    public R update(BasDevp basDevp){
        if (Cools.isEmpty(basDevp) || null==basDevp.getId()){
            return R.error();
        }
        basDevpService.updateById(basDevp);
        return R.ok();
    }

    @RequestMapping(value = "/basDevp/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Integer[] ids){
         for (Integer id : ids){
            basDevpService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/basDevp/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
        convert(map, wrapper);
        List<BasDevp> list = basDevpService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basDevpQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasDevp basDevp : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basDevp.getId());
            map.put("value", basDevp.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/basDevp/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basDevpService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

    @PostMapping(value = "/basDevp/initStation/auth")
    @ManagerAuth
    public R initStation(@RequestBody InitDevpStationParam param) {
        if(Cools.isEmpty(param)){
            return R.error("参数不能为空");
        }

        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("devp_no", param.getDevpNo()));
        if(Cools.isEmpty(basDevp)){
            return R.error("设备不存在");
        }

        if(Cools.isEmpty(param.getStationNo())){
            return R.error("请选择要初始化的站点编号");
        }

        if(Cools.isEmpty(param.getInitLength())){
            return R.error("请输入初始化长度");
        }

        List<HashMap<String, Object>> list = new ArrayList<>();
        for (int i = param.getStationNo(); i < param.getStationNo() + param.getInitLength(); i++) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("devpNo", param.getDevpNo());
            map.put("stationId", i);
            list.add(map);
        }

        basDevp.setStationList(JSON.toJSONString(list));
        basDevpService.updateById(basDevp);
        return R.ok();
    }

}

 src/main/java/com/zy/asrs/domain/param/InitDevpStationParam.java

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.domain.param;

import lombok.Data;

@Data
public class InitDevpStationParam {

    private Integer devpNo;

    private Integer stationNo;

    private Integer initLength;

}

 src/main/java/com/zy/asrs/entity/BasDevp.java

New file
@@ -0,0 +1,145 @@
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 java.text.SimpleDateFormat;
import java.util.Date;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("asr_bas_devp")
public class BasDevp implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 编号
     */
    @ApiModelProperty(value= "编号")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 设备编号
     */
    @ApiModelProperty(value= "设备编号")
    @TableField("devp_no")
    private Integer devpNo;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 创建人员
     */
    @ApiModelProperty(value= "创建人员")
    @TableField("create_by")
    private Long createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty(value= "创建时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @TableField("update_by")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 站点数据
     */
    @ApiModelProperty(value= "站点数据")
    @TableField("station_list")
    private String stationList;

    /**
     * 条码站点数据
     */
    @ApiModelProperty(value= "条码站点数据")
    @TableField("barcode_station_list")
    private String barcodeStationList;

    public BasDevp() {}

    public BasDevp(Integer devpNo,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String stationList) {
        this.devpNo = devpNo;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.stationList = stationList;
    }

//    BasDevp basDevp = new BasDevp(
//            null,    // 设备编号
//            null,    // 状态
//            null,    // 创建人员
//            null,    // 创建时间
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 备注
//            null    // 站点数据
//            null    // 条码站点数据
//    );

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "禁用";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }


}

 src/main/java/com/zy/asrs/mapper/BasDevpMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.BasDevp;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface BasDevpMapper extends BaseMapper<BasDevp> {

}

 src/main/java/com/zy/asrs/service/BasDevpService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.BasDevp;
import com.baomidou.mybatisplus.service.IService;

public interface BasDevpService extends IService<BasDevp> {

}

 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("basDevpService")
public class BasDevpServiceImpl extends ServiceImpl<BasDevpMapper, BasDevp> implements BasDevpService {

}

 src/main/java/com/zy/common/CodeBuilder.java

@@ -15,7 +15,7 @@
        generator.url="localhost:3306/wcs";
        generator.username="root";
        generator.password="root";
        generator.table="asr_bas_crnp_opt";
        generator.table="asr_bas_devp";
        // sqlserver
//        generator.sqlOsType = SqlOsType.SQL_SERVER;
//        generator.url="127.0.0.1:1433;databasename=tzskasrs";

 src/main/java/com/zy/core/model/command/StationCommand.java

New file
@@ -0,0 +1,17 @@
package com.zy.core.model.command;

import lombok.Data;

@Data
public class StationCommand {

    private Integer stationId;

    private Integer taskNo;

    private Integer targetStaNo;

    // 托盘大小，如无特殊情况，默认0
    private Integer palletSize;

}

 src/main/java/com/zy/core/network/ZyStationConnectDriver.java

New file
@@ -0,0 +1,73 @@
package com.zy.core.network;

import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.core.ThreadHandler;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.List;
import com.zy.core.network.fake.ZyStationFakeConnect;
import com.zy.core.network.real.ZyStationRealConnect;
import lombok.extern.slf4j.Slf4j;

/**
 * 输送站连接驱动
 */
@Slf4j
public class ZyStationConnectDriver implements ThreadHandler {

    private boolean connected = false;
    private SiemensS7Net siemensNet;
    private DeviceConfig deviceConfig;
    private ZyStationConnectApi zyStationConnectApi;

    public ZyStationConnectDriver(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
        this.siemensNet = siemensS7Net;
        this.deviceConfig = deviceConfig;
    }

    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        while (true) {
            try {
                if (!connected) {
                    connect();
                }
                Thread.sleep(1000);
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }

    @Override
    public boolean connect() {
        if (deviceConfig.getFake() == 0) {
            zyStationConnectApi = new ZyStationRealConnect(siemensNet, deviceConfig);
        } else {
            zyStationConnectApi = new ZyStationFakeConnect(deviceConfig);
        }

        boolean connect = zyStationConnectApi.connect();
        connected = connect;
        return connect;
    }

    @Override
    public void close() {
        zyStationConnectApi.disconnect();
        zyStationConnectApi = null;
        connected = false;
    }

    public List<ZyStationStatusEntity> getStatus() {
        return zyStationConnectApi.getStatus();
    }

    public CommandResponse sendCommand(StationCommand command) {
        return zyStationConnectApi.sendCommand(command);
    }
}

 src/main/java/com/zy/core/network/api/ZyStationConnectApi.java

New file
@@ -0,0 +1,19 @@
package com.zy.core.network.api;

import java.util.List;

import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.entity.ZyStationStatusEntity;

public interface ZyStationConnectApi {

    boolean connect();

    boolean disconnect();

    List<ZyStationStatusEntity> getStatus();//设备状态

    CommandResponse sendCommand(StationCommand command);//下发命令

}

 src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java

New file
@@ -0,0 +1,60 @@
package com.zy.core.network.entity;

import lombok.Data;

@Data
public class ZyStationStatusEntity {

    // 站点编号
    private Integer stationId;

    // ----------------------------------------------------------------
    // 工作号
    private Integer taskNo = 0;

    // ----------------------------------------------------------------
    // 目标站
    private Integer targetStaNo;

    // ----------------------------------------------------------------
    // 自动
    private boolean autoing;

    // 有物
    private boolean loading;

    // 可入
    private boolean inEnable;

    // 可出
    private boolean outEnable;

    // 空板信号
    private boolean emptyMk;

    // 满托盘
    private boolean fullPlt;

    // 锁定标记
    private boolean pakMk = true;

    // 托盘高度
    private Integer palletHeight;

    //报警
    private Integer error;

    //条码
    private String barcode;

    @Override
    public ZyStationStatusEntity clone() {
        try {
            return (ZyStationStatusEntity) super.clone();
        } catch (CloneNotSupportedException e) {
            e.printStackTrace();
        }
        return null;
    }

}

 src/main/java/com/zy/core/network/fake/ZyCrnFakeConnect.java

@@ -84,6 +84,7 @@
        int taskNo = command.getTaskNo().intValue();

        this.crnStatus.setTaskNo(taskNo);
        this.crnStatus.setMode(taskMode);
        this.crnStatus.setStatus(CrnStatusType.FETCH_MOVING.id);
        moveY(this.crnStatus.getBay(), sourcePosY);
        moveZ(this.crnStatus.getLevel(), sourcePosZ);

 src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java

New file
@@ -0,0 +1,86 @@
package com.zy.core.network.fake;

import com.alibaba.fastjson.JSON;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.Collections;
import java.util.List;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

/**
 * 输送站假连接（模拟）
 */
public class ZyStationFakeConnect implements ZyStationConnectApi {

    private ZyStationStatusEntity status;
    private final DeviceConfig deviceConfig;
    private final ExecutorService executor = Executors.newSingleThreadExecutor();

    public ZyStationFakeConnect(DeviceConfig deviceConfig) {
        this.deviceConfig = deviceConfig;
        this.status = JSON.parseObject(deviceConfig.getFakeInitStatus(), ZyStationStatusEntity.class);
        if (this.status == null) {
            this.status = new ZyStationStatusEntity();
            this.status.setStationId(deviceConfig.getDeviceNo());
        }
    }

    @Override
    public boolean connect() {
        return true;
    }

    @Override
    public boolean disconnect() {
        return true;
    }

    @Override
    public List<ZyStationStatusEntity> getStatus() {
        return Collections.singletonList(status);
    }

    @Override
    public CommandResponse sendCommand(StationCommand command) {
        CommandResponse response = new CommandResponse(false);
        executor.submit(() -> handleCommand(command));
        response.setResult(true);
        return response;
    }

    private void handleCommand(StationCommand command) {
        // 简单的模拟：设置工作号和目标站，并模拟有物/可入/可出状态切换
        this.status.setTaskNo(command.getTaskNo());
        this.status.setTargetStaNo(command.getTargetStaNo());

        // 模拟到站过程
        this.status.setAutoing(true);
        this.status.setLoading(true);
        sleep(1000);

        // 模拟放下托盘
        this.status.setInEnable(true);
        this.status.setOutEnable(false);
        sleep(1000);

        // 完成任务，复位状态
        this.status.setLoading(false);
        this.status.setAutoing(false);
        this.status.setTaskNo(0);
        this.status.setInEnable(false);
        this.status.setOutEnable(true);
    }

    private void sleep(long ms) {
        try {
            Thread.sleep(ms);
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
    }
}

 src/main/java/com/zy/core/network/real/ZyStationRealConnect.java

New file
@@ -0,0 +1,205 @@
package com.zy.core.network.real;

import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import lombok.extern.slf4j.Slf4j;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import java.text.MessageFormat;
import java.util.Date;

/**
 * 输送站真实连接（PLC）
 */
@Slf4j
public class ZyStationRealConnect implements ZyStationConnectApi {

    private List<ZyStationStatusEntity> statusList;
    private List<ZyStationStatusEntity> barcodeStatusList;
    private final SiemensS7Net siemensNet;
    private final DeviceConfig deviceConfig;

    public ZyStationRealConnect(SiemensS7Net siemensNet, DeviceConfig deviceConfig) {
        this.siemensNet = siemensNet;
        this.deviceConfig = deviceConfig;
    }

    @Override
    public boolean connect() {
        boolean connected = false;
        OperateResult connect = siemensNet.ConnectServer();
        if (connect.IsSuccess) {
            connected = true;
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】输送站plc连接成功 ===>> [id:{1}] [ip:{2}] [port:{3}]",
                    DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(),
                    deviceConfig.getPort()));
            News.info("SiemensDevp" + " - 1" + " - 输送站plc连接成功 ===>> [id:{}] [ip:{}] [port:{}]",
                    deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】输送站plc连接失败！！！ ===>> [id:{1}] [ip:{2}] [port:{3}]",
                    DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(),
                    deviceConfig.getPort()));
            News.error("SiemensDevp" + " - 2" + " - 输送站plc连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]",
                    deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
        }
        return connected;
    }

    @Override
    public boolean disconnect() {
        siemensNet.ConnectClose();
        return true;
    }

    @Override
    public List<ZyStationStatusEntity> getStatus() {
        if (statusList == null) {
            BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
            if (basDevpService == null) {
                return Collections.emptyList();
            }

            BasDevp basDevp = basDevpService
                    .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
            if (basDevp == null) {
                return Collections.emptyList();
            }

            statusList = JSONObject.parseArray(basDevp.getStationList(), ZyStationStatusEntity.class);
            barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
        }

        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 2));
        if (result.IsSuccess) {
            for (int i = 0; i < statusList.size(); i++) {
                ZyStationStatusEntity statusEntity = statusList.get(i); // 站点编号
                boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 2, 2);
                statusEntity.setAutoing(status[0]); // 自动
                statusEntity.setLoading(status[1]); // 有物
                statusEntity.setInEnable(status[2]); // 可入
                statusEntity.setOutEnable(status[3]);// 可出
                statusEntity.setEmptyMk(status[4]); // 空板信号
                statusEntity.setFullPlt(status[5]); // 满托盘
            }
        }

        OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) (statusList.size() * 4));
        if (result1.IsSuccess) {
            for (int i = 0; i < statusList.size(); i++) {
                ZyStationStatusEntity statusEntity = statusList.get(i);
                statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4)); // 工作号
                statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4 + 2)); // 目标站
            }
        }

        // 条码扫描器
        OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.100", (short) (statusList.size() * 10));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeStatusList.size(); i++) {
                ZyStationStatusEntity barcodeEntity = barcodeStatusList.get(i);
                ZyStationStatusEntity statusEntity = findStatusEntity(barcodeEntity.getStationId());
                if (statusEntity == null) {
                    continue;
                }
                String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 10 + 2, 8, "UTF-8");
                barcode = barcode.trim();
                barcodeEntity.setBarcode(barcode);
            }
        }

        return statusList;
    }

    @Override
    public CommandResponse sendCommand(StationCommand command) {
        CommandResponse commandResponse = new CommandResponse(false);
        if (null == command) {
            commandResponse.setMessage("命令为空");
            return commandResponse;
        }

        int index = findIndex(command.getStationId());
        if (index < 0) {
            commandResponse.setMessage("站点不存在");
            return commandResponse;
        }

        OperateResult write = null;
        // 任务下发次数
        int writeCount = 0;
        do {
            short[] data = new short[2];
            data[0] = command.getTaskNo().shortValue();
            data[1] = command.getTargetStaNo().shortValue();

            write = siemensNet.Write("DB100." + index * 4, data);
            if (write.IsSuccess) {
                log.error("写入输送线命令成功。站点编号={}，站点数据={},写入次数={}", command.getStationId(), JSON.toJSON(command),
                        writeCount);
                commandResponse.setResult(true);
                break;
            } else {
                writeCount++;
                log.error("写入输送线命令失败。站点编号={}，站点数据={},写入次数={}", command.getStationId(), JSON.toJSON(command),
                        writeCount);
                commandResponse.setResult(false);
            }
        } while (writeCount < 5);

        if (write == null) {
            commandResponse.setMessage("写入命令失败");
            return commandResponse;
        }

        if (!write.IsSuccess) {
            ZyStationStatusEntity staProtocol = findStatusEntity(command.getStationId());
            OutputQueue.DEVP.offer(MessageFormat.format("写入输送线站点数据失败。站点编号={1}，站点数据={2}", command.getStationId(),
                    JSON.toJSON(staProtocol)));
            News.error("写入输送线站点数据失败。站点编号={}，站点数据={}", command.getStationId(), JSON.toJSON(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}",
                    DateUtils.convert(new Date()), command.getStationId(), JSON.toJSON(command)));
            News.info("输送线命令下发 [id:{}] >>>>> 命令下发： {}", command.getStationId(),
                    JSON.toJSON(command));
        }
        return commandResponse;
    }

    private ZyStationStatusEntity findStatusEntity(Integer stationId) {
        for (ZyStationStatusEntity statusEntity : statusList) {
            if (statusEntity.getStationId().equals(stationId)) {
                return statusEntity;
            }
        }
        return null;
    }

    private int findIndex(Integer stationId) {
        for (int i = 0; i < statusList.size(); i++) {
            ZyStationStatusEntity statusEntity = statusList.get(i);
            if (statusEntity.getStationId().equals(stationId)) {
                return i;
            }
        }
        return -1;
    }
}

 src/main/java/com/zy/core/task/DeviceLogScheduler.java

@@ -8,7 +8,6 @@
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;

 src/main/java/com/zy/core/thread/StationThread.java

New file
@@ -0,0 +1,17 @@
package com.zy.core.thread;

import com.zy.core.ThreadHandler;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.List;

public interface StationThread extends ThreadHandler{

    List<ZyStationStatusEntity> getStatus();

    StationCommand getMoveCommand();

    CommandResponse sendCommand(StationCommand command);

}

 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java

@@ -34,7 +34,6 @@

/**
 * 堆垛机线程
 * Created by vincent on 2020/8/4
 */
@Data
@Slf4j

 src/main/java/com/zy/core/thread/impl/ZyStationThread.java

New file
@@ -0,0 +1,62 @@
package com.zy.core.thread.impl;

import com.zy.core.thread.StationThread;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.common.utils.RedisUtil;
import com.zy.core.network.ZyStationConnectDriver;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.Collections;
import java.util.List;

import lombok.Data;
import lombok.extern.slf4j.Slf4j;

/**
 * 输送站线程
 */
@Data
@Slf4j
public class ZyStationThread implements Runnable, StationThread {

    private DeviceConfig deviceConfig;
    private RedisUtil redisUtil;
    private ZyStationConnectDriver zyStationConnectDriver;

    public ZyStationThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
        this.deviceConfig = deviceConfig;
        this.redisUtil = redisUtil;
    }

    @Override
    public boolean connect() {
        return true;
    }

    @Override
    public void close() {
    }

    @Override
    public List<ZyStationStatusEntity> getStatus() {
        if (zyStationConnectDriver == null) {
            return Collections.emptyList();
        }
        return zyStationConnectDriver.getStatus();
    }

    @Override
    public StationCommand getMoveCommand() {
        return null;
    }

    @Override
    public CommandResponse sendCommand(StationCommand command) {
        return new CommandResponse(true);
    }

    @Override
    public void run() {
    }
}

 src/main/resources/mapper/BasDevpMapper.xml

New file
@@ -0,0 +1,20 @@
<?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.BasDevpMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp">
        <id column="id" property="id" />
        <result column="devp_no" property="devpNo" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />
        <result column="station_list" property="stationList" />
        <result column="barcode_station_list" property="barcodeStationList" />

    </resultMap>

</mapper>

 src/main/webapp/components/MapSettingCard.js

 src/main/webapp/components/WatchCrnCard.js

 src/main/webapp/static/js/basDevp/basDevp.js

@@ -1,82 +1,64 @@
var pageCurr;
layui.use(['table','laydate', 'form'], function(){
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: '#basDevp',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/basDevp/list/auth',
      elem: "#basDevp",
      headers: { token: localStorage.getItem("token") },
      url: baseUrl + "/basDevp/list/auth",
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
      limit: 15,
      limits: [15, 30, 50, 100, 200, 500],
      toolbar: "#toolbar",
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox', fixed: 'left'}
            ,{field: 'devNo', align: 'center',sort:true,title: '编号'}
            ,{field: 'inEnable', align: 'center',title: '可入', templet:function(row){
                    var html = "<input value='inEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.inEnable === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'outEnable', align: 'center',title: '可出', templet:function(row){
                    var html = "<input value='outEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.outEnable === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'autoing', align: 'center',title: '自动', templet:function(row){
                    var html = "<input value='autoing' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.autoing === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'loading', align: 'center',title: '有物', templet:function(row){
                    var html = "<input value='loading' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.loading === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'canining', align: 'center',title: '能入', templet:function(row){
                    var html = "<input value='canining' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.canining === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'canouting', align: 'center',title: '能出', templet:function(row){
                    var html = "<input value='canouting' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.canouting === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'wrkNo', align: 'center',title: '工作号', edit:true,  style:'color: blue;font-weight: bold'}
            ,{field: 'locType1$', align: 'center',title: '高低'}
            ,{field: 'barcode', align: 'center',title: '条形码'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
      height: "full-120",
      cols: [
        [
          { type: "checkbox" },
          { field: "id", align: "center", title: "编号" },
          { field: "devpNo", align: "center", title: "设备编号" },
          { field: "status$", align: "center", title: "状态" },
          { field: "createBy", align: "center", title: "创建人员" },
          { field: "createTime$", align: "center", title: "创建时间" },
          { field: "updateBy", align: "center", title: "修改人员" },
          { field: "updateTime$", align: "center", title: "修改时间" },
          { field: "memo", align: "center", title: "备注" },
          { field: "stationList", align: "center", title: "站点数据" },
          { field: "barcodeStationList", align: "center", title: "条码站点数据" },

          {
            fixed: "right",
            title: "操作",
            align: "center",
            toolbar: "#operate",
            width: 240,
          },
        ],
      ],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        pageName: "curr",
        pageSize: "limit",
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
          code: res.code,
          msg: res.msg,
          count: res.data.total,
          data: res.data.records,
        };
        },
        response: {
            statusCode: 200
        statusCode: 200,
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
@@ -84,157 +66,80 @@
            }
            pageCurr=curr;
            limit();
            form.on('checkbox(tableCheckbox)', function (data) {
                var _index = $(data.elem).attr('table-index')||0;
                if(data.elem.checked){
                    res.data[_index][data.value] = 'Y';
                }else{
                    res.data[_index][data.value] = 'N';
                }
            });
        }
    });

    // 页面修改
    table.on('edit(basDevp)', function (obj) {
        if (isNaN(obj.value)) {
            layer.msg("请输入数字");
            tableReload();
            return;
        }
        $.ajax({
            url: baseUrl+"/basDevp/update/auth",
            headers: {'token': localStorage.getItem('token')},
            data: top.reObject({
                devNo: obj.data.devNo,
                wrkNo: obj.value
            }),
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    $(".layui-laypage-btn")[0].click();
                    layer.msg(res.msg);
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                }
            }
        })
      },
    });

    // 监听排序事件
    table.on('sort(basDevp)', function (obj) {
    table.on("sort(basDevp)", function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
      $.each($("#search-box [name]").serializeArray(), function () {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
      searchData["orderByField"] = obj.field;
      searchData["orderByType"] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {
                curr: 1
            },
            done: function (res, curr, count) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                limit();
            }
        page: { curr: 1 },
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(basDevp)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id);
    table.on("toolbar(basDevp)", function (obj) {
      var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                layer.open({
                    type: 2,
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    content: 'basDevp_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#autoing,#loading,#canining,#canouting,#inreq1,#inreq2,#wrkNo,#barcode,#ctnType,#grossWt', index).parent().parent().hide();
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
                        clearFormVal(layer.getChildFrame('#detail', index));
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                    }
                });
        case "addData":
          showEditModel();
                break;
            case 'refreshData':
                tableIns.reload({
                    page: {
                        curr: pageCurr
        case "deleteData":
          if (checkStatus.length === 0) {
            layer.msg("请选择要删除的数据", { icon: 2 });
            return;
                    }
                });
                limit();
                break;
            case 'deleteData':
                var data = checkStatus.data;
                if (data.length === 0){
                    layer.msg('请选择数据');
                } else {
                    layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){
                        $.ajax({
                            url: baseUrl+"/basDevp/delete/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: {param: JSON.stringify(data)},
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                }
                            }
          del(
            checkStatus.map(function (d) {
              return d.id;
                        })
                    });
                }
          );
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
        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) {
              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() {
            $.each($("#search-box [name]").serializeArray(), function () {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'basDevp': exportData,
                        'fields': fields
              basDevp: exportData,
              fields: fields,
                    };
                    $.ajax({
                        url: baseUrl+"/basDevp/export/auth",
                        headers: {'token': localStorage.getItem('token')},
              headers: { token: localStorage.getItem("token") },
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
              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');
                  table.exportFile(titles, res.data, "xls");
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                  layer.msg(res.msg, { icon: 2 });
                            }
                        }
              },
                    });
                });
                break;
@@ -242,328 +147,177 @@
    });

    // 监听行工具事件
    table.on('tool(basDevp)', function(obj){
    table.on("tool(basDevp)", function (obj) {
        var data = obj.data;
        switch (obj.event) {
            // 详情
            case 'detail':
                layer.open({
                    type: 2,
                    title: '详情',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    content: 'basDevp_detail.html',
                    success: function(layero, index){
                        setFormVal(layer.getChildFrame('#detail', index), data, true);
                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                        layer.getChildFrame('#data-detail-submit-save,#prompt', index).hide();
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
        case "edit":
          showEditModel(data);
          break;
        case "del":
          del([data.id]);
          break;
        case "initStation":
          showInitStation(data);
          break;
                    }
                });
                break;
            // 编辑
            case 'edit':
                layer.open({
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    content: 'basDevp_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
                        setFormVal(layer.getChildFrame('#detail', index), data, false);
                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
                        top.convertDisabled(layer.getChildFrame('#devNo', index), true);
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                    }
                });
                break;
            case 'modiUser':
                var param = top.reObject(data).modiUser;
                if (param === undefined) {
                    layer.msg("无数据");
                } else {
                   layer.open({
                       type: 2,
                       title: '修改详情',
                       maxmin: true,
                       area: [top.detailWidth, top.detailHeight],
                       shadeClose: false,
                       content: '../user/user_detail.html',
                       success: function(layero, index){

    function showInitStation(mData) {
      admin.open({
        type: 1,
        area: "600px",
        title: "初始化站点数据",
        content: $("#initStationDialog").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+"/user/"+ param +"/auth",
                               headers: {'token': localStorage.getItem('token')},
                               method: 'GET',
              url: baseUrl + "/basDevp/initStation/auth",
              headers: { token: localStorage.getItem("token") },
              contentType: "application/json;charset=UTF-8",
              data: JSON.stringify(data.field),
              method: "POST",
                               success: function (res) {
                layer.close(loadIndex);
                                   if (res.code === 200){
                                       setFormVal(layer.getChildFrame('#detail', index), res.data, true);
                                       top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                                       layer.getChildFrame('#password,#createTime\\$,#status', index).parent().parent().hide();
                                       layer.getChildFrame('#data-detail-submit,#prompt', index).hide();
                                       layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                                       layero.find('iframe')[0].contentWindow.layui.form.render('select');
                                       layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                   }
                               }
                           })
                       }
                   });
                }
                break;
            case 'appeUser':
                var param = top.reObject(data).appeUser;
                if (param === undefined) {
                    layer.msg("无数据");
                } else {
                   layer.open({
                       type: 2,
                       title: '创详情',
                       maxmin: true,
                       area: [top.detailWidth, top.detailHeight],
                       shadeClose: false,
                       content: '../user/user_detail.html',
                       success: function(layero, index){
                           $.ajax({
                               url: baseUrl+"/user/"+ param +"/auth",
                               headers: {'token': localStorage.getItem('token')},
                               method: 'GET',
                               success: function (res) {
                                   if (res.code === 200){
                                       setFormVal(layer.getChildFrame('#detail', index), res.data, true);
                                       top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                                       layer.getChildFrame('#data-detail-submit', index).hide();
                                       layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                                       layero.find('iframe')[0].contentWindow.layui.form.render('select');
                                       layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                   }
                               }
                           })
                       }
                   });
                }
                break;

        }
    });

    // 数据保存动作
    form.on('submit(save)', function () {
        if (banMsg != null){
            layer.msg(banMsg);
            return;
        }
        method("add");
    });

    // 数据修改动作
    form.on('submit(edit)', function () {
        method("update")
    });

    function method(name){
        var index = layer.load(1, {
            shade: [0.5,'#000'] //0.1透明度的背景
        });
        var data = {
//            id: $('#id').val(),
            devNo: $('#devNo').val(),
            decDesc: $('#decDesc').val(),
            devMk: $('#devMk').val(),
            inEnable: $('#inEnable').val(),
            outEnable: $('#outEnable').val(),
            autoing: $('#autoing').val(),
            loading: $('#loading').val(),
            canining: $('#canining').val(),
            canouting: $('#canouting').val(),
            fronting: $('#fronting').val(),
            rearing: $('#rearing').val(),
            uping: $('#uping').val(),
            downing: $('#downing').val(),
            inreq1: $('#inreq1').val(),
            inreq2: $('#inreq2').val(),
            wrkNo: $('#wrkNo').val(),
            wrkNo1: $('#wrkNo1').val(),
            ctnType: $('#ctnType').val(),
            barcode: $('#barcode').val(),
            inQty: $('#inQty').val(),
            row1: $('#row1').val(),
            ioTime: top.strToDate($('#ioTime\\$').val()),
            area: $('#area').val(),
            inOk: $('#inOk').val(),
            outOk: $('#outOk').val(),
            modiUser: $('#modiUser').val(),
            modiTime: top.strToDate($('#modiTime\\$').val()),
            appeUser: $('#appeUser').val(),
            appeTime: top.strToDate($('#appeTime\\$').val()),
            stdQty: $('#stdQty').val(),
            minWt: $('#minWt').val(),
            maxWt: $('#maxWt').val(),
            grossWt: $('#grossWt').val(),
            cartPos: $('#cartPos').val(),

        };
        $.ajax({
            url: baseUrl+"/basDevp/"+name+"/auth",
            headers: {'token': localStorage.getItem('token')},
            data: top.reObject(data),
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    parent.layer.closeAll();
                    parent.$(".layui-laypage-btn")[0].click();
                    $("#data-detail :input").each(function () {
                        $(this).val("");
                    });
                  layer.close(dIndex);
                  layer.msg(res.msg, { icon: 1 });
                  tableReload();
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                  layer.msg(res.msg, { icon: 2 });
                }
                layer.close(index);
            }
        })
    }

    // 复选框事件
    form.on('checkbox(detailCheckbox)', function (data) {
        var el = data.elem;
        if (el.checked) {
            $(el).val('Y');
        } else {
            $(el).val('N');
        }
              },
    });
            return false;
          });
          $(layero).children(".layui-layer-content").css("overflow", "visible");
          layui.form.render("select");
        },
      });
    }

    // 搜索栏搜索事件
    form.on('submit(search)', function (data) {
    /* 弹窗 - 新增、修改 */
    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 + "/basDevp/" + (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: 0.1,
        },
        function (i) {
          layer.close(i);
          var loadIndex = layer.load(2);
          $.ajax({
            url: baseUrl + "/basDevp/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) {
    // 重置
    form.on("submit(reset)", function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
      clearFormVal($("#search-box"));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender(data) {
      setTimeout(function () {
    layDate.render({
        elem: '#ioTime\\$',
        type: 'datetime'
          elem: ".layui-laydate-range",
          type: "datetime",
          range: true,
    });
    layDate.render({
        elem: '#modiTime\\$',
        type: 'datetime'
          elem: "#createTime\\$",
          type: "datetime",
          value: data !== undefined ? data["createTime\\$"] : null,
    });
    layDate.render({
        elem: '#appeTime\\$',
        type: 'datetime'
          elem: "#updateTime\\$",
          type: "datetime",
          value: data !== undefined ? data["updateTime\\$"] : null,
    });


      }, 300);
    }
    layDateRender();
});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
$(document).on("click", "#data-detail-close", function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
  $.each($("#search-box [name]").serializeArray(), function () {
        searchData[this.name] = this.value;
    });
    (child ? parent.tableIns : tableIns).reload({
        where: searchData,
        page: {
            curr: pageCurr
        },
        done: function (res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            if (res.data.length === 0 && count !== 0) {
                tableIns.reload({
                    where: searchData,
                    page: {
                        curr: pageCurr-1
                    }
                });
                pageCurr -= 1;
            }
            limit(child);
        }
    page: { curr: pageCurr },
    });
}

function setFormVal(el, data, showImg) {
    for (var val in data) {
        var find = el.find(":input[id='" + val + "']");
        if (find[0]!=null){
            if (find[0].type === 'checkbox'){
                if (data[val]==='Y'){
                    find.attr("checked","checked");
                    find.val('Y');
                } else {
                    find.remove("checked");
                    find.val('N');
                }
                continue;
            }
        }
        find.val(data[val]);
        if (showImg){
            var next = find.next();
            if (next.get(0)){
                if (next.get(0).localName === "img") {
                    find.hide();
                    next.attr("src", data[val]);
                    next.show();
                }
            }
        }
    }
}

function clearFormVal(el) {
    $(':input', el)
        .val('')
        .removeAttr('checked')
        .removeAttr('selected');
}

function detailScreen(index) {
    var detail = layer.getChildFrame('#data-detail', index);
    var height = detail.height()+60;
    if (height > ($(window).height()*0.9)) {
        height = ($(window).height()*0.8);
    }
    layer.style(index, {
//        top: (($(window).height()-height)/3)+"px",
        height: height+'px'
    });
}

$('body').keydown(function () {
    if (event.keyCode === 13) {
        $("#search").click();
    }
});

 src/main/webapp/views/admin/basDevp/basDevp.html

File was deleted

 src/main/webapp/views/admin/basDevp/basDevp_detail.html

File was deleted

 src/main/webapp/views/admin/basPlcerror/basPlcerror.html

File was deleted

 src/main/webapp/views/admin/basPlcerror/basPlcerror_detail.html

File was deleted

 src/main/webapp/views/admin/index.html

File was deleted

 src/main/webapp/views/admin/watch/crn.html

File was deleted

 src/main/webapp/views/apiLog/apiLog.html

File was renamed from src/main/webapp/views/admin/apiLog/apiLog.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -69,11 +69,11 @@
    {{# } }}
</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/apiLog/apiLog.js" charset="utf-8"></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/apiLog/apiLog.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/barcode.html

File was deleted

 src/main/webapp/views/basCrnp/basCrnp.html

File was renamed from src/main/webapp/views/admin/basCrnp/basCrnp.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -60,11 +60,11 @@
    <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/basCrnp/basCrnp.js" charset="utf-8"></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/basCrnp/basCrnp.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/basCrnp/basCrnp_detail.html

 src/main/webapp/views/basCrnpErr/basCrnpErr.html

File was renamed from src/main/webapp/views/admin/basCrnpErr/basCrnpErr.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -60,11 +60,11 @@
    <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/basCrnpErr/basCrnpErr.js" charset="utf-8"></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/basCrnpErr/basCrnpErr.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/basCrnpErr/basCrnpErr_detail.html

 src/main/webapp/views/basCrnpErrLog/basCrnpErrLog.html

File was renamed from src/main/webapp/views/admin/basCrnpErrLog/basCrnpErrLog.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -60,11 +60,11 @@
    <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/basCrnpErrLog/basCrnpErrLog.js" charset="utf-8"></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/basCrnpErrLog/basCrnpErrLog.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/basCrnpErrLog/basCrnpErrLog_detail.html

 src/main/webapp/views/basCrnpOpt/basCrnpOpt.html

File was renamed from src/main/webapp/views/admin/basCrnpOpt/basCrnpOpt.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -60,11 +60,11 @@
    <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/basCrnpOpt/basCrnpOpt.js" charset="utf-8"></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/basCrnpOpt/basCrnpOpt.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/basCrnpOpt/basCrnpOpt_detail.html

 src/main/webapp/views/basDevp/basDevp.html

New file
@@ -0,0 +1,173 @@
<!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">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="basDevp" lay-filter="basDevp"></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="initStation">初始化站点数据</a>
    <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/basDevp/basDevp.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">设备编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="devpNo" placeholder="请输入设备编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择状态</option>
                            <option value="1">正常</option>
                            <option value="0">禁用</option>
                        </select>
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">创建人员: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="createBy" placeholder="请输入创建人员">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">创建时间: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入创建时间">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">修改人员: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="updateBy" 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">
                        <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="stationList" placeholder="请输入站点数据">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">条码站点数据: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="barcodeStationList" 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>

<script type="text/html" id="initStationDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="devpNo" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">站点起始编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="stationNo" placeholder="请输入站点起始编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">初始化长度: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="initLength" 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>


 src/main/webapp/views/basDevp/basDevp_detail.html

New file
@@ -0,0 +1,112 @@
<!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/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" placeholder="编号">
            </div>
        </div>
    -->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basDevp')" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">设备编号：</label>
            <div class="layui-input-inline">
                <input id="devpNo" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">状　　态：</label>
            <div class="layui-input-inline">
                <select id="status">
                    <option value="" style="display: none"></option>
                    <option value="1">正常</option>
                    <option value="0">禁用</option>
                </select>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">创建人员：</label>
            <div class="layui-input-inline">
                <input id="createBy" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">创建时间：</label>
            <div class="layui-input-inline">
                <input id="createTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">修改人员：</label>
            <div class="layui-input-inline">
                <input id="updateBy" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">修改时间：</label>
            <div class="layui-input-inline">
                <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">备　　注：</label>
            <div class="layui-input-inline">
                <input id="memo" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">站点数据：</label>
            <div class="layui-input-inline">
                <input id="stationList" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">条码站点数据：</label>
            <div class="layui-input-inline">
                <input id="barcodeStationList" class="layui-input" type="text">
            </div>
        </div>


        <hr class="layui-bg-gray">

        <div id="data-detail-btn" class="layui-btn-container layui-form-item">
            <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</div>
            <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">修改</div>
            <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">关闭</div>
        </div>

        <div id="prompt">
            温馨提示：请仔细填写相关信息，<span class="extrude"><span class="not-null">*</span> 为必填选项。</span>
        </div>
    </form>
</div>
</body>
<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/basDevp/basDevp.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/basLocSts/basLocSts.html

File was renamed from src/main/webapp/views/admin/basLocSts/basLocSts.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -41,11 +41,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/basLocSts/basLocSts.js" charset="utf-8"></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/basLocSts/basLocSts.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/basLocSts/basLocSts_detail.html

File was renamed from src/main/webapp/views/admin/basLocSts/basLocSts_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -79,10 +79,10 @@
    </form>
</div>
</body>
<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/basLocSts/basLocSts.js" charset="utf-8"></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/basLocSts/basLocSts.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/basMap/basMap.html

File was renamed from src/main/webapp/views/admin/basMap/basMap.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -65,11 +65,11 @@
    <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/basMap/basMap.js" charset="utf-8"></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/basMap/basMap.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/basMap/basMap_detail.html

File was renamed from src/main/webapp/views/admin/basMap/basMap_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -81,10 +81,10 @@
    </form>
</div>
</body>da
<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/basMap/basMap.js" charset="utf-8"></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/basMap/basMap.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/basWrkIotype/basWrkIotype.html

File was renamed from src/main/webapp/views/admin/basWrkIotype/basWrkIotype.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -41,11 +41,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/basWrkIotype/basWrkIotype.js" charset="utf-8"></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/basWrkIotype/basWrkIotype.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html

File was renamed from src/main/webapp/views/admin/basWrkIotype/basWrkIotype_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -85,10 +85,10 @@
    </form>
</div>
</body>
<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/basWrkIotype/basWrkIotype.js" charset="utf-8"></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/basWrkIotype/basWrkIotype.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/basWrkStatus/basWrkStatus.html

File was renamed from src/main/webapp/views/admin/basWrkStatus/basWrkStatus.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -41,11 +41,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/basWrkStatus/basWrkStatus.js" charset="utf-8"></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/basWrkStatus/basWrkStatus.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/basWrkStatus/basWrkStatus_detail.html

File was renamed from src/main/webapp/views/admin/basWrkStatus/basWrkStatus_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -87,10 +87,10 @@
    </form>
</div>
</body>
<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/basWrkStatus/basWrkStatus.js" charset="utf-8"></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/basWrkStatus/basWrkStatus.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/config/config.html

File was renamed from src/main/webapp/views/admin/config/config.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -42,11 +42,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/config/config.js" charset="utf-8"></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/config/config.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/config/config_detail.html

File was renamed from src/main/webapp/views/admin/config/config_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -74,10 +74,10 @@
    </form>
</div>
</body>
<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/config/config.js" charset="utf-8"></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/config/config.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/console.html

File was deleted

 src/main/webapp/views/debugParam/debugParam.html

File was renamed from src/main/webapp/views/admin/debugParam/debugParam.html
@@ -4,11 +4,11 @@
    <head>
        <meta charset="UTF-8">
        <title>调试参数</title>
        <link rel="stylesheet" href="../../../static/vue/element/element.css">
        <script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
        <script type="text/javascript" src="../../../static/js/common.js"></script>
        <script type="text/javascript" src="../../../static/vue/js/vue.min.js"></script>
        <script type="text/javascript" src="../../../static/vue/element/element.js"></script>
        <link rel="stylesheet" href="../../static/vue/element/element.css">
        <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
        <script type="text/javascript" src="../../static/js/common.js"></script>
        <script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
        <script type="text/javascript" src="../../static/vue/element/element.js"></script>
        <style>
            .show-box {
                width: 20%;

 src/main/webapp/views/detail.html

File was renamed from src/main/webapp/views/admin/detail.html
@@ -6,8 +6,8 @@
    <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">
    <script type="text/javascript" src="../../static/js/common.js"></script>
    <link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
    <script type="text/javascript" src="../static/js/common.js"></script>
    <style>
        body {
            background-color: #fff;
@@ -96,8 +96,8 @@
    </fieldset>
</div>
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script src="../../static/layui/layui.js"></script>
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script src="../static/layui/layui.js"></script>
<script>
    layui.use(['form'], function(){
        var form = layui.form,

 src/main/webapp/views/deviceConfig/deviceConfig.html

File was renamed from src/main/webapp/views/admin/deviceConfig/deviceConfig.html
@@ -6,9 +6,9 @@
    <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">
    <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>

@@ -60,11 +60,11 @@
    <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/deviceConfig/deviceConfig.js" charset="utf-8"></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/deviceConfig/deviceConfig.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/deviceConfig/deviceConfig_detail.html

File was renamed from src/main/webapp/views/admin/deviceConfig/deviceConfig_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -81,10 +81,10 @@
    </form>
</div>
</body>
<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/deviceConfig/deviceConfig.js" charset="utf-8"></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/deviceConfig/deviceConfig.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/index.html

@@ -2,107 +2,198 @@
<html lang="en">
<head>
    <meta charset="utf-8">
    <title>自动仓库RCS系统</title>
    <link rel="stylesheet" href="../static/css/index.css">
    <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css" />
    <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script src="../static/js/tools/layx.min.js"></script>
  <title>浙江中扬 - 自动化立体仓库 - AS / RS</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
  <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/loader.css" media="all">
    <style>
        .layx-window.layx-skin-news .layx-control-bar {
            background-color: #333333;
    .layui-logo img {
      width: 25px;
    }
    .layui-logo cite {
      font-size: 18px;
      font-weight: 400;
      /*margin-left: 5px;*/
        }
    </style>
</head>
<body>
<!-- 导航栏 -->
<div class="sidebar">
    <div class="nav">
        <ul class="cl-effect-4">
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
<!--            <li><a id="forklift" onclick="nav(this.id)" class="nav-unselect" href="#">货叉提升机</a></li>-->
            <li><a id="lift" onclick="nav(this.id)" class="nav-unselect" href="#">提升机</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
            <li><a id="admin" onclick="nav(this.id)" class="nav-unselect" href="#">管理后台</a></li>
<body class="layui-layout-body">
<div class="layui-layout layui-layout-admin">
  <!-- 头部 -->
  <div class="layui-header">
    <div class="layui-logo">
      <img src="../static/images/zy-logo-dark.png" style="display: inline-block; width: 60%;height: auto">
      <!--          <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>-->
      <!--          <img src="../static/image/logo.svg"/>-->
      <!--          <cite>中扬 - Zoneyung</cite>-->
    </div>

    <ul class="layui-nav layui-layout-left">
      <li class="layui-nav-item" lay-unselect>
        <a ew-event="flexible" title="侧边伸缩"><i class="layui-icon layui-icon-shrink-right"></i></a>
      </li>
      <li class="layui-nav-item" lay-unselect>
        <a ew-event="refresh" title="刷新"><i class="layui-icon layui-icon-refresh-3"></i></a>
      </li>
    </ul>
    <ul class="layui-nav layui-layout-right">
<!--      <li class="layui-nav-item" lay-unselect>-->
<!--        <a ew-event="note" title="便签"><i class="layui-icon layui-icon-note"></i></a>-->
<!--      </li>-->
      <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
        <div style="color: red;">许可证有效期：<span id="licenseDays">29</span>天</div>
      </li>
      <li class="layui-nav-item layui-hide-xs" lay-unselect>
        <a ew-event="fullScreen" title="全屏"><i class="layui-icon layui-icon-screen-full"></i></a>
      </li>
      <li class="layui-nav-item" lay-unselect>
        <a>
          <cite id="username" style="margin-right: 5px">管理员</cite>
        </a>
        <dl class="layui-nav-child">
          <dd lay-unselect><a ew-href="detail.html?resourceId=8">基本资料</a></dd>
          <hr>
          <dd lay-unselect><a id="logout">退出</a></dd>
        </dl>
      </li>
      <li class="layui-nav-item" lay-unselect>
        <a ew-event="theme" title="主题"><i class="layui-icon layui-icon-more-vertical"></i></a>
      </li>
    </ul>
  </div>

  <!-- 侧边栏 -->
  <div class="layui-side">
    <div class="layui-side-scroll">
      <ul id="menu-main" class="layui-nav layui-nav-tree arrow2" lay-filter="admin-side-nav" lay-shrink="_all">
        </ul>
    </div>
</div>
<!-- 主体内容 -->
<iframe id="content" src="console.html"></iframe>
<!-- 尾部 -->
<footer class="footer">
    Copyright © 2015~2025 All Rights Reserved. 浙江中扬立库技术有限公司  保留所有权利
</footer>
</body>

  <!-- 主体部分 -->
  <div class="layui-body"></div>
  <!-- 底部 -->
  <div class="layui-footer layui-text">
    copyright © 2023 浙江中扬立库技术有限公司 all rights reserved.
    <span class="pull-right">Version 1.0.0</span>
  </div>

</div>

<!--初始化加载层-->
<div class="layuimini-loader">
  <div class="layuimini-loader-inner"></div>
</div>

<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/layui/layui.js"></script>
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
    window.location.href = './admin/index.html'
    // 导航栏
    function nav(id) {
        if(id == 'admin') {
            window.open('./admin/index.html')
            return
        }else if (id == "shuttle") {
            window.open('./shuttleNew.html')
            return
        }else if (id == "lift") {
            window.open('./lift.html')
            return
  console.log('%c 中扬立库平台 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
  $(function () {
    if ("" === localStorage.getItem('token')) {
      top.location.href = baseUrl + "/login";
        }
        $('.nav-select').attr("class", "nav-unselect");
        $('#'+id).attr("class", "nav-select");
        $('#content').attr("src", id+".html");
  });

  layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
  }).extend({
    notice: 'notice/notice',
  }).use(['index', 'element', 'layer', 'admin', 'notice'], function () {
    var $ = layui.jquery;
    var index = layui.index;
    var element = layui.element;
    var layer = layui.layer;
    var admin = layui.admin;
    var notice = layui.notice;

    var easywebIframeMsg = localStorage.getItem("easyweb-iframe");
    if (!isEmpty(easywebIframeMsg)) {
      var easywebIframeObj = JSON.parse(easywebIframeMsg);
      if (easywebIframeObj.defaultTheme === undefined) {
        admin.changeTheme("theme-colorful");
      }
    }

    // 系统运行状态
    var systemRunning = true;
    $.ajax({
      url: baseUrl + "/menu/auth",
      headers: {'token': localStorage.getItem('token')},
      method: 'POST',
      // async: false,
      success: function (res) {
        // 关闭加载动画
        $('.layuimini-loader').fadeOut();
        if (res.code === 200) {
          var tpl = $('#menuTpl').html();
          var template = Handlebars.compile(tpl);
          var html = template(res);
          $("#menu-main").html(html);
          element.init();
        } else if (res.code === 403) {
          top.location.href = baseUrl + "/login";
        } else {
          layer.msg(res.msg, {icon: 2});
        }
      }
    });

    // news by http://chuange.gitee.io/vue-layx/
    news();layx.min('wcs-news');
    function news() {
        layx.iframe(
              'wcs-news' // id
            , '系统分析报告'
            , "news.html"
            , {
                  shadow:false
                , storeStatus:false
                // , skin: 'news'
                , width:800
                , height:600
                , position:'rb'
                // , control:false
                , opacity:0.9
                , border:false
                , icon:'<img src="../static/images/favicon.ico" style="height:22px;display:block;"  alt=""/>'
                , stickMenu:true
                , maxMenu:false
                , closeMenu:false
                , moveLimit:{
                    leftOut: false,
                    rightOut: false,
                    topOut: false,
                    bottomOut: false,
    $.ajax({
      url: baseUrl + "/license/getLicenseDays",
      headers: {'token': localStorage.getItem('token')},
      method: 'POST',
      success: function (res) {
        if (res.code == 200) {
          let days = res.data
          if (days <= 30) {
            $("#licenseShow").show()
            $("#licenseDays").html(days)
                }
                , minWidth:300
                , minHeight:300
                , borderRadius: '8px'
                , shadeDestroy:true
                , escKey: false
                , event:{
                    onmin: {
                        after: function () {
                            $('.layx-min-statu').css("left", "inherit").css("right", "10px")
        }else {
          top.location.href = baseUrl + "/login";
                        }
                    }
                    , onrestore:{
                        after: function () {
                            let win = layx.getFrameContext('wcs-news');
                            win.autoScroll = true
                        }
                    }
                }
            }
        );
    }
    });

    // 默认加载主页
    index.loadHome({
      menuPath: baseUrl+'/views/watch/console.html',
      menuName: '<i class="layui-icon layui-icon-home"></i>'
    });

    $('#username').text(localStorage.getItem('username'));

    $(document).on('click','#logout', function () {
      window.location.href = "login.html";
      localStorage.removeItem('token');
      localStorage.removeItem('username');
      admin.closeAllTabs();
    });

    // 替换退出按钮变量
    var logout = document.getElementById('logout');
    var url = logout.getAttribute('href');
    logout.setAttribute('href', baseUrl + "/login");

  });
</script>
<script type="text/html" id="menuTpl">
  {{#each data}}
  <li class="layui-nav-item">
    <a><i class="layui-icon {{this.menuIcon}}"></i>&emsp;<cite>{{this.menu}}</cite></a>
    <dl class="layui-nav-child">
      {{#each this.subMenu}}
      <dd><a lay-href="{{this.code}}?resourceId={{this.id}}">{{this.name}}</a></dd>
      {{/each}}
    </dl>
  </li>
  {{/each}}
</script>
</body>
</html>



 src/main/webapp/views/locMap/locMap.html

File was renamed from src/main/webapp/views/admin/locMap/locMap.html
@@ -3,18 +3,18 @@
<head>
  <meta charset="UTF-8">
  <title>库位地图</title>
  <link rel="stylesheet" href="../../../static/css/animate.min.css">
  <link rel="stylesheet" href="../../../static/vue/element/element.css">
  <link rel="stylesheet" href="../../../static/css/console_vue.css">
  <link rel="stylesheet" href="../../../static/css/toggle-switch.css">
  <script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
  <script type="text/javascript" src="../../../static/layui/layui.js"></script>
  <script type="text/javascript" src="../../../static/js/handlebars/handlebars-v4.5.3.js"></script>
  <script type="text/javascript" src="../../../static/js/common.js"></script>
  <script type="text/javascript" src="../../../static/vue/js/vue.min.js"></script>
  <script type="text/javascript" src="../../../static/vue/element/element.js"></script>
  <script src="../../../static/js/gsap.min.js"></script>
  <script src="../../../static/js/pixi-legacy.min.js"></script>
  <link rel="stylesheet" href="../../static/css/animate.min.css">
  <link rel="stylesheet" href="../../static/vue/element/element.css">
  <link rel="stylesheet" href="../../static/css/console_vue.css">
  <link rel="stylesheet" href="../../static/css/toggle-switch.css">
  <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
  <script type="text/javascript" src="../../static/layui/layui.js"></script>
  <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
  <script type="text/javascript" src="../../static/js/common.js"></script>
  <script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
  <script type="text/javascript" src="../../static/vue/element/element.js"></script>
  <script src="../../static/js/gsap.min.js"></script>
  <script src="../../static/js/pixi-legacy.min.js"></script>
  <style>
    *{
      margin: 0;

 src/main/webapp/views/locMast/locMast.html

File was renamed from src/main/webapp/views/admin/locMast/locMast.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <style>
        #btn-init {
            display: none;
@@ -73,11 +73,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/locMast/locMast.js" charset="utf-8"></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/locMast/locMast.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>

<!-- 重置库位弹窗 -->

 src/main/webapp/views/locMast/locMast_detail.html

File was renamed from src/main/webapp/views/admin/locMast/locMast_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -66,10 +66,10 @@
    </form>
</div>
</body>
<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/locMast/locMast.js" charset="utf-8"></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/locMast/locMast.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/map_edit/css/app.7cc7872b.css

File was deleted

 src/main/webapp/views/map_edit/favicon.ico

Binary files differ

 src/main/webapp/views/map_edit/index.html

File was deleted

 src/main/webapp/views/map_edit/js/app.0fd42bf5.js

File was deleted

 src/main/webapp/views/map_edit/js/app.0fd42bf5.js.map

File was deleted

 src/main/webapp/views/map_edit/js/chunk-vendors.ed5506ad.js

File was deleted

 src/main/webapp/views/map_edit/js/chunk-vendors.ed5506ad.js.map

File was deleted

 src/main/webapp/views/monitor/css/Pacifico.css

File was deleted

 src/main/webapp/views/monitor/css/lunbo.css

File was deleted

 src/main/webapp/views/monitor/css/monitor.css

File was deleted

 src/main/webapp/views/monitor/data/map.json

File was deleted

 src/main/webapp/views/monitor/echarts.js.map

File was deleted

 src/main/webapp/views/monitor/img/a.png

Binary files differ

 src/main/webapp/views/monitor/img/a1.png

Binary files differ

 src/main/webapp/views/monitor/img/a2.png

Binary files differ

 src/main/webapp/views/monitor/img/b.png

Binary files differ

 src/main/webapp/views/monitor/img/b1.png

Binary files differ

 src/main/webapp/views/monitor/img/b2.png

Binary files differ

 src/main/webapp/views/monitor/img/background.png

Binary files differ

 src/main/webapp/views/monitor/img/banner/banner1.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/banner2.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/banner3.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/banner4.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/banner5.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/test1.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/test2.jpg

Binary files differ

 src/main/webapp/views/monitor/img/banner/test3.png

Binary files differ

 src/main/webapp/views/monitor/img/c.png

Binary files differ

 src/main/webapp/views/monitor/img/c1.png

Binary files differ

 src/main/webapp/views/monitor/img/c2.png

Binary files differ

 src/main/webapp/views/monitor/img/d.png

Binary files differ

 src/main/webapp/views/monitor/img/d1.png

Binary files differ

 src/main/webapp/views/monitor/img/d2.png

Binary files differ

 src/main/webapp/views/monitor/img/e.png

Binary files differ

 src/main/webapp/views/monitor/img/e1.png

Binary files differ

 src/main/webapp/views/monitor/img/e2.png

Binary files differ

 src/main/webapp/views/monitor/img/f.png

Binary files differ

 src/main/webapp/views/monitor/img/f1.png

Binary files differ

 src/main/webapp/views/monitor/img/f2.png

Binary files differ

 src/main/webapp/views/monitor/img/g.png

Binary files differ

 src/main/webapp/views/monitor/img/g1.png

Binary files differ

 src/main/webapp/views/monitor/img/g2.png

Binary files differ

 src/main/webapp/views/monitor/img/left.png

Binary files differ

 src/main/webapp/views/monitor/img/right.png

Binary files differ

 src/main/webapp/views/monitor/img/wxCode.jpg

Binary files differ

 src/main/webapp/views/monitor/js/echarts/echarts.min.js

File was deleted

 src/main/webapp/views/monitor/js/jquery-3.3.1.min.js

File was deleted

 src/main/webapp/views/monitor/js/jquery.countup.min.js

File was deleted

 src/main/webapp/views/monitor/js/jquery.waypoints.min.js

File was deleted

 src/main/webapp/views/monitor/js/md5.js

File was deleted

 src/main/webapp/views/monitor/js/monitor.js

File was deleted

 src/main/webapp/views/monitor/js/vincent.js

File was deleted

 src/main/webapp/views/monitor/monitor.html

File was deleted

 src/main/webapp/views/monitor/monitor0.html

File was deleted

 src/main/webapp/views/news.html

File was deleted

 src/main/webapp/views/operateLog/operateLog.html

File was renamed from src/main/webapp/views/admin/operateLog/operateLog.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -57,11 +57,11 @@
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</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/operateLog/operateLog.js" charset="utf-8"></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/operateLog/operateLog.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/operateLog/operateLog_detail.html

File was renamed from src/main/webapp/views/admin/operateLog/operateLog_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -78,10 +78,10 @@
    </form>
</div>
</body>
<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/operateLog/operateLog.js" charset="utf-8"></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/operateLog/operateLog.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/password.html

File was renamed from src/main/webapp/views/admin/password.html
@@ -6,7 +6,7 @@
    <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/layui/css/layui.css" media="all">
    <style>
        #password-div {
            padding: 20px 20px 20px 13px;
@@ -62,10 +62,10 @@
    </div>
</div>
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script src="../../static/layui/layui.js"></script>
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../static/js/common.js" charset="utf-8"></script>
<script src="../static/layui/layui.js"></script>
<script>
    layui.use(['form'], function() {
        var form = layui.form,

 src/main/webapp/views/permission/permission.html

File was renamed from src/main/webapp/views/admin/permission/permission.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -53,11 +53,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/permission/permission.js" charset="utf-8"></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/permission/permission.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/permission/permission_detail.html

File was renamed from src/main/webapp/views/admin/permission/permission_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -70,10 +70,10 @@
    </form>
</div>
</body>
<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/permission/permission.js" charset="utf-8"></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/permission/permission.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/pipeline.html

File was deleted

 src/main/webapp/views/resource/resource.html

File was renamed from src/main/webapp/views/admin/resource/resource.html
@@ -6,10 +6,10 @@
    <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">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <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">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <style>
        #detail {
            padding: 25px 30px 0 0;
@@ -120,10 +120,10 @@
    <span name="level" class="layui-badge layui-badge-gray">按钮</span>
    {{# } }}
</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/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>
    layui.config({

 src/main/webapp/views/role/role.html

File was renamed from src/main/webapp/views/admin/role/role.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -47,11 +47,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/role/role.js" charset="utf-8"></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/role/role.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/role/role_detail.html

File was renamed from src/main/webapp/views/admin/role/role_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -73,10 +73,10 @@
    </form>
</div>
</body>
<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/role/role.js" charset="utf-8"></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/role/role.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/role/role_power_detail.html

File was renamed from src/main/webapp/views/admin/role/role_power_detail.html
@@ -6,8 +6,8 @@
    <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/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<style>
    #power {
@@ -29,9 +29,9 @@
    </form>
</div>
</body>
<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"></script>
<script type="text/javascript" src="../../../static/js/role/rolePower.js" charset="utf-8"></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"></script>
<script type="text/javascript" src="../../static/js/role/rolePower.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/tpl/alarm-detl.html

 src/main/webapp/views/tpl/theme/img/ic_loading.gif

 src/main/webapp/views/tpl/theme/img/icon_date.png

 src/main/webapp/views/tpl/theme/img/icon_search.png

 src/main/webapp/views/tpl/theme/img/theme-admin.png

 src/main/webapp/views/tpl/theme/img/theme-blue.png

 src/main/webapp/views/tpl/theme/img/theme-colorful.png

 src/main/webapp/views/tpl/theme/img/theme-cyan.png

 src/main/webapp/views/tpl/theme/img/theme-green.png

 src/main/webapp/views/tpl/theme/img/theme-my.png

 src/main/webapp/views/tpl/theme/img/theme-pink.png

 src/main/webapp/views/tpl/theme/img/theme-purple.png

 src/main/webapp/views/tpl/theme/img/theme-red.png

 src/main/webapp/views/tpl/theme/img/theme-white.png

 src/main/webapp/views/tpl/tpl-note.html

 src/main/webapp/views/tpl/tpl-theme.html

 src/main/webapp/views/user/user.html

File was renamed from src/main/webapp/views/admin/user/user.html
@@ -6,10 +6,10 @@
    <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">
    <link rel="stylesheet" href="../../../static/css/originTable.css" media="all">
    <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">
    <link rel="stylesheet" href="../../static/css/originTable.css" media="all">
    <style>
        body {
            color: #595959;
@@ -147,13 +147,13 @@
    </form>
</script>

<script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../../static/js/handlebars/handlebars-v4.5.3.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/tools/md5.js"></script>
<script type="text/javascript" src="../../../static/js/user/user.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.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/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>

<!-- 项目编辑窗口 -->
<script type="text/html" id="hostEditDialog">

 src/main/webapp/views/user/user_detail.html

 src/main/webapp/views/userLogin/userLogin.html

File was renamed from src/main/webapp/views/admin/userLogin/userLogin.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -48,11 +48,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/userLogin/userLogin.js" charset="utf-8"></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/userLogin/userLogin.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/userLogin/userLogin_detail.html

File was renamed from src/main/webapp/views/admin/userLogin/userLogin_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -60,10 +60,10 @@
    </form>
</div>
</body>
<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/userLogin/userLogin.js" charset="utf-8"></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/userLogin/userLogin.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/watch/console.html

File was renamed from src/main/webapp/views/admin/watch/console.html
@@ -3,15 +3,15 @@
    <head>
        <meta charset="UTF-8">
        <title>WCS控制中心</title>
        <link rel="stylesheet" href="../../../static/css/animate.min.css">
        <link rel="stylesheet" href="../../../static/vue/element/element.css">
        <link rel="stylesheet" href="../../../static/css/watch/console_vue.css">
        <script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
        <script type="text/javascript" src="../../../static/layui/layui.js"></script>
        <script type="text/javascript" src="../../../static/js/handlebars/handlebars-v4.5.3.js"></script>
        <script type="text/javascript" src="../../../static/js/common.js"></script>
        <script type="text/javascript" src="../../../static/vue/js/vue.min.js"></script>
        <script type="text/javascript" src="../../../static/vue/element/element.js"></script>
        <link rel="stylesheet" href="../../static/css/animate.min.css">
        <link rel="stylesheet" href="../../static/vue/element/element.css">
        <link rel="stylesheet" href="../../static/css/watch/console_vue.css">
        <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
        <script type="text/javascript" src="../../static/layui/layui.js"></script>
        <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
        <script type="text/javascript" src="../../static/js/common.js"></script>
        <script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
        <script type="text/javascript" src="../../static/vue/element/element.js"></script>
    </head>
    <body>
        <div id="app">

 src/main/webapp/views/watch/test.json

 src/main/webapp/views/wrkLastno/wrkLastno.html

File was renamed from src/main/webapp/views/admin/wrkLastno/wrkLastno.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -45,11 +45,11 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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/wrkLastno/wrkLastno.js" charset="utf-8"></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/wrkLastno/wrkLastno.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/wrkLastno/wrkLastno_detail.html

File was renamed from src/main/webapp/views/admin/wrkLastno/wrkLastno_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -69,10 +69,10 @@
    </form>
</div>
</body>
<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/wrkLastno/wrkLastno.js" charset="utf-8"></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/wrkLastno/wrkLastno.js" charset="utf-8"></script>
</html>


 src/main/webapp/views/wrkMast/wrkMast.html

File was renamed from src/main/webapp/views/admin/wrkMast/wrkMast.html
@@ -4,12 +4,12 @@
    <head>
        <meta charset="UTF-8">
        <title>任务管理</title>
        <link rel="stylesheet" href="../../../static/vue/element/element.css">
        <script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
        <script type="text/javascript" src="../../../static/layui/layui.js"></script>
        <script type="text/javascript" src="../../../static/js/common.js"></script>
        <script type="text/javascript" src="../../../static/vue/js/vue.min.js"></script>
        <script type="text/javascript" src="../../../static/vue/element/element.js"></script>
        <link rel="stylesheet" href="../../static/vue/element/element.css">
        <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
        <script type="text/javascript" src="../../static/layui/layui.js"></script>
        <script type="text/javascript" src="../../static/js/common.js"></script>
        <script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
        <script type="text/javascript" src="../../static/vue/element/element.js"></script>
        <style>
            .el-table .success-row {
                background: #b6ff8e;

 src/main/webapp/views/wrkMastLog/wrkMastLog.html

File was renamed from src/main/webapp/views/admin/wrkMastLog/wrkMastLog.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>
<!-- 搜索栏 -->
@@ -74,11 +74,11 @@
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</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/wrkMastLog/wrkMastLog.js" charset="utf-8"></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/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html

File was renamed from src/main/webapp/views/admin/wrkMastLog/wrkMastLog_detail.html
@@ -6,9 +6,9 @@
    <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/cool.css" media="all">
    <link rel="stylesheet" href="../../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

@@ -187,10 +187,10 @@
    </form>
</div>
</body>
<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/wrkMastLog/wrkMastLog.js" charset="utf-8"></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/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
</html>