From dfa9ac7043919e0b703ae265706d2ad4a7875b2e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 02 一月 2024 17:02:03 +0800 Subject: [PATCH] #修改命令记录日志 --- src/main/java/com/zy/asrs/service/SaasLogService.java | 8 src/main/webapp/static/wms/js/saasLog/saasLog.js | 252 +++++++++++++++++++++ src/main/resources/mapper/SaasLogMapper.xml | 18 + src/main/java/com/zy/common/CodeBuilder.java | 2 src/main/java/com/zy/asrs/mapper/SaasLogMapper.java | 12 + src/main/webapp/static/wms/js/user/user.js | 4 src/main/webapp/views/saasLog/saasLog.html | 121 ++++++++++ src/main/java/com/zy/asrs/service/impl/SaasLogServiceImpl.java | 12 + src/main/webapp/views/user/user.html | 6 src/main/java/com/zy/asrs/entity/SaasLog.java | 97 ++++++++ src/main/java/com/zy/asrs/controller/SaasLogController.java | 123 ++++++++++ src/main/java/com/zy/asrs/controller/TaskWrkController.java | 21 + src/main/java/com/zy/asrs/utils/SaasUtils.java | 22 + 13 files changed, 691 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/SaasLogController.java b/src/main/java/com/zy/asrs/controller/SaasLogController.java new file mode 100644 index 0000000..7dbe97c --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/SaasLogController.java @@ -0,0 +1,123 @@ +package com.zy.asrs.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.core.common.DateUtils; +import com.zy.asrs.entity.SaasLog; +import com.zy.asrs.service.SaasLogService; +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 SaasLogController extends BaseController { + + @Autowired + private SaasLogService saasLogService; + + @RequestMapping(value = "/saasLog/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(saasLogService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/saasLog/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 Map<String, Object> param){ + EntityWrapper<SaasLog> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(saasLogService.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 = "/saasLog/add/auth") + @ManagerAuth + public R add(SaasLog saasLog) { + saasLogService.insert(saasLog); + return R.ok(); + } + + @RequestMapping(value = "/saasLog/update/auth") + @ManagerAuth + public R update(SaasLog saasLog){ + if (Cools.isEmpty(saasLog) || null==saasLog.getId()){ + return R.error(); + } + saasLogService.updateById(saasLog); + return R.ok(); + } + + @RequestMapping(value = "/saasLog/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + saasLogService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/saasLog/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<SaasLog> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("saasLog")); + convert(map, wrapper); + List<SaasLog> list = saasLogService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/saasLogQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<SaasLog> wrapper = new EntityWrapper<>(); + wrapper.like("id", condition); + Page<SaasLog> page = saasLogService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (SaasLog saasLog : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", saasLog.getId()); + map.put("value", saasLog.getId()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/saasLog/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<SaasLog> wrapper = new EntityWrapper<SaasLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != saasLogService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(SaasLog.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index 00a2fbf..1fad82c 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -16,6 +16,8 @@ import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; +import com.zy.asrs.utils.SaasUtils; +import com.zy.asrs.utils.Utils; import com.zy.common.utils.HttpHandler; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; @@ -23,6 +25,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.*; @RestController @@ -90,7 +94,7 @@ @RequestMapping(value = "/taskWrk/updatePoint/auth") @ManagerAuth - public R updatePoint(TaskWrk taskWrk){ + public R updatePoint(TaskWrk taskWrk) throws UnknownHostException { if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) { return R.error(); } @@ -98,10 +102,25 @@ if (taskWrk1 == null) { return R.error(); } + InetAddress localHost = InetAddress.getLocalHost(); + String ipAddress = localHost.getHostAddress(); + + SaasUtils.insertLog(1,taskWrk1.getStartPoint()+"-"+taskWrk1.getTargetPoint(),taskWrk.getStartPoint()+"-"+taskWrk.getTargetPoint(), ipAddress,getUser().getUsername()); + + taskWrk1.setStartPoint(taskWrk.getStartPoint()); taskWrk1.setTargetPoint(taskWrk.getTargetPoint()); + if (taskWrk1.getIoType() == 1){ + taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint())); + } else if (taskWrk1.getIoType() == 2) { + taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint())); + } else if (taskWrk1.getIoType() == 3) { + taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint())); + taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint())); + } taskWrk1.setModiTime(new Date()); taskWrk1.setModiUser(getUserId()); + taskWrkService.updateById(taskWrk1); return R.ok(); } diff --git a/src/main/java/com/zy/asrs/entity/SaasLog.java b/src/main/java/com/zy/asrs/entity/SaasLog.java new file mode 100644 index 0000000..ef3ea8e --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/SaasLog.java @@ -0,0 +1,97 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +@Data +@TableName("sys_saas_log") +public class SaasLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value= "id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * {0:鍏ュ簱,1:鍑哄簱,2:绉昏浆,3:鎵嬪姩璋冩暣} + */ + @ApiModelProperty(value= "{0:鍏ュ簱,1:鍑哄簱,2:绉昏浆,3:鎵嬪姩璋冩暣}") + private Integer type; + + @ApiModelProperty(value= "") + @TableField("origin_data") + private String originData; + + @ApiModelProperty(value= "") + private String data; + + @ApiModelProperty(value= "") + @TableField("io_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date ioTime; + + @ApiModelProperty(value= "") + @TableField("create_by") + private Long createBy; + + @ApiModelProperty(value= "") + private String ip; + + @ApiModelProperty(value= "") + @TableField("create_by_name") + private String createByName; + + public SaasLog() {} + + public SaasLog(Integer type,String originData,String data,Date ioTime,Long createBy,String ip,String createByName) { + this.type = type; + this.originData = originData; + this.data = data; + this.ioTime = ioTime; + this.createBy = createBy; + this.ip = ip; + this.createByName = createByName; + } + +// SaasLog saasLog = new SaasLog( +// null, // {0:鍏ュ簱,1:鍑哄簱,2:绉昏浆,3:鎵嬪姩璋冩暣} +// null, // +// null, // +// null, // +// null, // +// null, // +// null // +// ); + + public String getType$(){ + + switch (type){ + case 1: return "淇敼搴撲綅"; + case 2: return ""; + default: + return "鏈煡"; + } + + } + public String getIoTime$(){ + if (Cools.isEmpty(this.ioTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); + } + + +} diff --git a/src/main/java/com/zy/asrs/mapper/SaasLogMapper.java b/src/main/java/com/zy/asrs/mapper/SaasLogMapper.java new file mode 100644 index 0000000..d5b02fc --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/SaasLogMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.SaasLog; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface SaasLogMapper extends BaseMapper<SaasLog> { + +} diff --git a/src/main/java/com/zy/asrs/service/SaasLogService.java b/src/main/java/com/zy/asrs/service/SaasLogService.java new file mode 100644 index 0000000..7a16352 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/SaasLogService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.SaasLog; +import com.baomidou.mybatisplus.service.IService; + +public interface SaasLogService extends IService<SaasLog> { + +} diff --git a/src/main/java/com/zy/asrs/service/impl/SaasLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/SaasLogServiceImpl.java new file mode 100644 index 0000000..306b192 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/SaasLogServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service.impl; + +import com.zy.asrs.mapper.SaasLogMapper; +import com.zy.asrs.entity.SaasLog; +import com.zy.asrs.service.SaasLogService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("saasLogService") +public class SaasLogServiceImpl extends ServiceImpl<SaasLogMapper, SaasLog> implements SaasLogService { + +} diff --git a/src/main/java/com/zy/asrs/utils/SaasUtils.java b/src/main/java/com/zy/asrs/utils/SaasUtils.java new file mode 100644 index 0000000..5344138 --- /dev/null +++ b/src/main/java/com/zy/asrs/utils/SaasUtils.java @@ -0,0 +1,22 @@ +package com.zy.asrs.utils; + +import com.core.common.SpringUtils; +import com.zy.asrs.entity.SaasLog; +import com.zy.asrs.service.SaasLogService; + +import java.util.Date; + +public class SaasUtils { + public static void insertLog(Integer type, String locNo, String matnr,String ip,String user){ + SaasLogService bean = SpringUtils.getBean(SaasLogService.class); + SaasLog saasLog = new SaasLog(); + saasLog.setType(type); + saasLog.setOriginData(locNo); + saasLog.setData(matnr); + saasLog.setIoTime(new Date()); + saasLog.setIp(ip); + saasLog.setCreateBy(1L); + saasLog.setCreateByName(user); + bean.insert(saasLog); + } +} diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java index 79cbcbc..79e22e1 100644 --- a/src/main/java/com/zy/common/CodeBuilder.java +++ b/src/main/java/com/zy/common/CodeBuilder.java @@ -20,7 +20,7 @@ generator.url="127.0.0.1:1433;databasename=ghtzasrs"; generator.username="sa"; generator.password="sa@123"; - generator.table="man_api_log"; + generator.table="sys_saas_log"; generator.packagePath="com.zy.asrs"; generator.js = false; generator.html = false; diff --git a/src/main/resources/mapper/SaasLogMapper.xml b/src/main/resources/mapper/SaasLogMapper.xml new file mode 100644 index 0000000..0205806 --- /dev/null +++ b/src/main/resources/mapper/SaasLogMapper.xml @@ -0,0 +1,18 @@ +<?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.SaasLogMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.SaasLog"> + <id column="id" property="id" /> + <result column="type" property="type" /> + <result column="origin_data" property="originData" /> + <result column="data" property="data" /> + <result column="io_time" property="ioTime" /> + <result column="create_by" property="createBy" /> + <result column="ip" property="ip" /> + <result column="create_by_name" property="createByName" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/wms/js/saasLog/saasLog.js b/src/main/webapp/static/wms/js/saasLog/saasLog.js new file mode 100644 index 0000000..2167f76 --- /dev/null +++ b/src/main/webapp/static/wms/js/saasLog/saasLog.js @@ -0,0 +1,252 @@ +var pageCurr; +layui.config({ + base: baseUrl + "/static/wms/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: '#saasLog', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/saasLog/list/auth', + page: true, + limit: 15, + limits: [15, 30, 50, 100, 200, 500], + // toolbar: '#toolbar', + cellMinWidth: 50, + height: 'full-120', + cols: [[ + {type: 'checkbox'} + ,{field: 'id', align: 'center',title: 'id', hide:true} + ,{field: 'type$', align: 'center',title: '鎿嶄綔绫诲瀷'} + ,{field: 'originData', align: 'center',title: '婧愭暟鎹�'} + ,{field: 'data', align: 'center',title: '淇敼鏁版嵁'} + ,{field: 'ip', align: 'center',title: 'ip鍦板潃'} + ,{field: 'createByName', align: 'center',title: '鎿嶄綔浜�'} + ,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'} + ,{field: 'createBy', align: 'center',title: '', hide:true} + + + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function(res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } + }); + + // 鐩戝惉鎺掑簭浜嬩欢 + table.on('sort(saasLog)', function (obj) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + searchData['orderByField'] = obj.field; + searchData['orderByType'] = obj.type; + tableIns.reload({ + where: searchData, + page: {curr: 1} + }); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(saasLog)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id).data; + switch(obj.event) { + case 'addData': + showEditModel(); + break; + case 'deleteData': + if (checkStatus.length === 0) { + layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2}); + return; + } + del(checkStatus.map(function (d) { + return d.id; + })); + break; + case 'exportData': + admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ + var titles=[]; + var fields=[]; + obj.config.cols[0].map(function (col) { + if (col.type === 'normal' && col.hide === false && col.toolbar == null) { + titles.push(col.title); + fields.push(col.field); + } + }); + var exportData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + exportData[this.name] = this.value; + }); + var param = { + 'saasLog': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/saasLog/export/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + dataType:'json', + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + layer.closeAll(); + if (res.code === 200) { + table.exportFile(titles,res.data,'xls'); + } else if (res.code === 403) { + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + }); + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(saasLog)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'edit': + showEditModel(data); + break; + case "del": + del([data.id]); + break; + } + }); + + /* 寮圭獥 - 鏂板銆佷慨鏀� */ + function showEditModel(mData) { + admin.open({ + type: 1, + area: '600px', + title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��', + content: $('#editDialog').html(), + success: function (layero, dIndex) { + layDateRender(mData); + form.val('detail', mData); + form.on('submit(editSubmit)', function (data) { + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/saasLog/"+(mData?'update':'add')+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.close(dIndex); + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + } + }); + } + + /* 鍒犻櫎 */ + function del(ids) { + layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/saasLog/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {ids: ids}, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + }); + } + + // 鎼滅储 + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 閲嶇疆 + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(false); + }); + + // 鏃堕棿閫夋嫨鍣� + function layDateRender(data) { + setTimeout(function () { + layDate.render({ + elem: '#ioTime\\$', + type: 'datetime', + value: data!==undefined?data['ioTime\\$']:null + }); + + }, 300); + } + layDateRender(); + +}); + +// 鍏抽棴鍔ㄤ綔 +$(document).on('click','#data-detail-close', function () { + parent.layer.closeAll(); +}); + +function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + tableIns.reload({ + where: searchData, + page: {curr: pageCurr} + }); +} diff --git a/src/main/webapp/static/wms/js/user/user.js b/src/main/webapp/static/wms/js/user/user.js index 6579a71..5423704 100644 --- a/src/main/webapp/static/wms/js/user/user.js +++ b/src/main/webapp/static/wms/js/user/user.js @@ -25,8 +25,8 @@ {type: 'checkbox'} // ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140} // ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'} - ,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'} - ,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'} + ,{field: 'username', align: 'center',title: '鐢ㄦ埛鍚�'} + ,{field: 'mobile', align: 'center',title: '璐﹀彿'} // ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'} ,{field: 'roleName', align: 'center',title: '瑙掕壊'} ,{field: 'email', align: 'center',title: '閭'} diff --git a/src/main/webapp/views/saasLog/saasLog.html b/src/main/webapp/views/saasLog/saasLog.html new file mode 100644 index 0000000..5be361c --- /dev/null +++ b/src/main/webapp/views/saasLog/saasLog.html @@ -0,0 +1,121 @@ +<!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/wms/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/wms/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/wms/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"> + <label class="layui-form-label">搴撲綅鍙�:</label> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="loc_no" placeholder="璇疯緭鍏ュ簱浣嶅彿" autocomplete="off"> + </div> + <label class="layui-form-label">鐗╂枡鍙�:</label> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿" autocomplete="off"> + </div> + <label class="layui-form-label">鎿嶄綔浜�:</label> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="create_by_name" placeholder="璇疯緭鍏ユ搷浣滀汉" autocomplete="off"> + </div> + </div> + <div class="layui-inline">  + <button class="layui-btn icon-btn" lay-filter="search" lay-submit> + <i class="layui-icon"></i>鎼滅储 + </button> + <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> + <i class="layui-icon"></i>閲嶇疆 + </button> + </div> + </div> + </div> + <table class="layui-hide" id="saasLog" lay-filter="saasLog"></table> + </div> + </div> +</div> + +<script type="text/html" id="toolbar"> + <div class="layui-btn-container"> + <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button> + <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> + </div> +</script> + +<script type="text/html" id="operate"> + <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> + <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> +</script> + +<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/wms/js/saasLog/saasLog.js" charset="utf-8"></script> +</body> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> + <input name="id" type="hidden"> + <div class="layui-row"> + <div class="layui-col-md12"> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">id: </label> + <div class="layui-input-block"> + <input class="layui-input" name="id" placeholder="璇疯緭鍏d" lay-vertype="tips" lay-verify="required"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">{0:鍏ュ簱,1:鍑哄簱}: </label> + <div class="layui-input-block"> + <input class="layui-input" name="type" placeholder="璇疯緭鍏0:鍏ュ簱,1:鍑哄簱}"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: </label> + <div class="layui-input-block"> + <input class="layui-input" name="locNo" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: </label> + <div class="layui-input-block"> + <input class="layui-input" name="matnr" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: </label> + <div class="layui-input-block"> + <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏�"> + </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> + </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> + diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html index ef2d052..acb747a 100644 --- a/src/main/webapp/views/user/user.html +++ b/src/main/webapp/views/user/user.html @@ -38,7 +38,7 @@ </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鎵嬫満鍙�:</label> + <label class="layui-form-label">璐﹀彿:</label> <div class="layui-input-inline"> <input name="mobile" class="layui-input" placeholder="杈撳叆鎵嬫満鍙�"/> </div> @@ -103,7 +103,7 @@ <div class="layui-col-md6"> <div class="layui-form-item"> - <label class="layui-form-label layui-form-required">鐧诲綍璐︽埛</label> + <label class="layui-form-label layui-form-required">鐢ㄦ埛鍚�</label> <div class="layui-input-block"> <input name="username" placeholder="璇疯緭鍏ョ櫥褰曡处鎴�" class="layui-input" lay-vertype="tips" lay-verify="required" required=""> </div> @@ -125,7 +125,7 @@ <div class="layui-col-md6"> <div class="layui-form-item"> - <label class="layui-form-label layui-form-required">鎵嬫満鍙�</label> + <label class="layui-form-label layui-form-required">璐﹀彿</label> <div class="layui-input-block"> <input name="mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿" class="layui-input" lay-vertype="tips" lay-verify="required" required=""> </div> -- Gitblit v1.9.1