From d1eaedbdcfe79ccc716e5bc806c692bc640cd2d4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 18 十一月 2025 12:47:19 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/BasSensorController.java | 127 ++++++++++
src/main/java/com/zy/asrs/mapper/BasSensorMapper.java | 12 +
src/main/java/com/zy/asrs/task/GetEquipmentStatus.java | 2
src/main/webapp/static/js/basSensor/basSensor.js | 257 +++++++++++++++++++++
src/main/java/com/zy/asrs/service/BasSensorService.java | 8
src/main/java/com/zy/asrs/entity/BasSensor.java | 72 ++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 4
src/main/java/com/zy/asrs/service/impl/BasSensorServiceImpl.java | 12 +
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/resources/application.yml | 34 +-
src/main/resources/mapper/BasSensorMapper.xml | 15 +
src/main/webapp/views/basSensor/basSensor.html | 116 +++++++++
12 files changed, 641 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasSensorController.java b/src/main/java/com/zy/asrs/controller/BasSensorController.java
new file mode 100644
index 0000000..22834a9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasSensorController.java
@@ -0,0 +1,127 @@
+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.BasSensor;
+import com.zy.asrs.service.BasSensorService;
+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 BasSensorController extends BaseController {
+
+ @Autowired
+ private BasSensorService basSensorService;
+
+ @RequestMapping(value = "/basSensor/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basSensorService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basSensor/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<BasSensor> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasSensor.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basSensorService.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 = "/basSensor/add/auth")
+ @ManagerAuth
+ public R add(BasSensor basSensor) {
+ Date now = new Date();
+ basSensor.setCreateTime(now);
+ basSensorService.insert(basSensor);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basSensor/update/auth")
+ @ManagerAuth
+ public R update(BasSensor basSensor){
+ if (Cools.isEmpty(basSensor) || null==basSensor.getId()){
+ return R.error();
+ }
+ basSensorService.updateById(basSensor);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basSensor/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basSensorService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basSensor/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasSensor> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basSensor"));
+ convert(map, wrapper);
+ List<BasSensor> list = basSensorService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basSensorQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasSensor> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasSensor> page = basSensorService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasSensor basSensor : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basSensor.getId());
+ map.put("value", basSensor.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basSensor/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasSensor> wrapper = new EntityWrapper<BasSensor>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basSensorService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasSensor.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasSensor.java b/src/main/java/com/zy/asrs/entity/BasSensor.java
new file mode 100644
index 0000000..caa6874
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasSensor.java
@@ -0,0 +1,72 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("asr_bas_sensor")
+public class BasSensor implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浼犳劅鍣ㄧ紪鍙�
+ */
+ @ApiModelProperty(value= "浼犳劅鍣ㄧ紪鍙�")
+ private Double number;
+
+ /**
+ * 浼犳劅鍣ㄤ綅缃�
+ */
+ @ApiModelProperty(value= "浼犳劅鍣ㄤ綅缃�")
+ private String location;
+
+ /**
+ * 浼犳劅鍣ㄦ俯搴�
+ */
+ @ApiModelProperty(value= "浼犳劅鍣ㄦ俯搴�")
+ private String temperature;
+
+ /**
+ * 浼犳劅鍣ㄦ箍搴�
+ */
+ @ApiModelProperty(value= "浼犳劅鍣ㄦ箍搴�")
+ private String humidity;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value= "浼犳劅鍣ㄦ箍搴�")
+ private Date createTime;
+
+ public BasSensor() {}
+
+ public BasSensor(Double number,String location,String temperature,String humidity) {
+ this.number = number;
+ this.location = location;
+ this.temperature = temperature;
+ this.humidity = humidity;
+ }
+
+// BasSensor basSensor = new BasSensor(
+// null, // 浼犳劅鍣ㄧ紪鍙穂闈炵┖]
+// null, // 浼犳劅鍣ㄤ綅缃�
+// null, // 浼犳劅鍣ㄦ俯搴�
+// null // 浼犳劅鍣ㄦ箍搴�
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasSensorMapper.java b/src/main/java/com/zy/asrs/mapper/BasSensorMapper.java
new file mode 100644
index 0000000..d6a4076
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasSensorMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasSensor;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasSensorMapper extends BaseMapper<BasSensor> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasSensorService.java b/src/main/java/com/zy/asrs/service/BasSensorService.java
new file mode 100644
index 0000000..cc33825
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasSensorService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasSensor;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasSensorService extends IService<BasSensor> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasSensorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasSensorServiceImpl.java
new file mode 100644
index 0000000..b83e7e7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasSensorServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasSensorMapper;
+import com.zy.asrs.entity.BasSensor;
+import com.zy.asrs.service.BasSensorService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basSensorService")
+public class BasSensorServiceImpl extends ServiceImpl<BasSensorMapper, BasSensor> implements BasSensorService {
+
+}
diff --git a/src/main/java/com/zy/asrs/task/GetEquipmentStatus.java b/src/main/java/com/zy/asrs/task/GetEquipmentStatus.java
index a1164aa..1de78fd 100644
--- a/src/main/java/com/zy/asrs/task/GetEquipmentStatus.java
+++ b/src/main/java/com/zy/asrs/task/GetEquipmentStatus.java
@@ -37,7 +37,7 @@
@Autowired
private BasDevpService basDevpService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
//鑾峰彇璁惧淇℃伅
String response ="";
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 6a3ff20..9731f6d 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.15:1433;databasename=hylyasrs";
+ generator.url="127.0.0.1:1433;databasename=shhtgcasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_loc_check";
+ generator.table="asr_bas_sensor";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0bb19fd..8e3da92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,15 +10,15 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=qlasrs-sxk
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=shhtgcasrs
username: sa
- password: spcyy@2025
+ password: sa@123
mvc:
static-path-pattern: /**
- redis:
- host: localhost
- port: 6379
- database: 0
+# redis:
+# host: localhost
+# port: 6379
+# database: 0
# password: xltys1995
servlet:
multipart:
@@ -43,7 +43,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: qlasrs-sxk
+ subject: shhtgcasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -53,16 +53,16 @@
wcs-slave:
# 鐢辨祬鍏ユ繁
locGroupAscOrder: [
- {rowList: [1],minBay: 1,maxBay: 16},
- {rowList: [3,4,5,6],minBay: 1,maxBay: 16},
- {rowList: [10,9,8,7],minBay: 1,maxBay: 16},
- {rowList: [10,9,8,7,6,5,4,3],minBay: 17,maxBay: 22},
- {rowList: [12,13],minBay: 1,maxBay: 22},
- {rowList: [15,14],minBay: 1,maxBay: 22},
- {rowList: [17,18,19,20,21,22,23],minBay: 1,maxBay: 22},
- {rowList: [2],minBay: 1,maxBay: 22},
- {rowList: [11],minBay: 1,maxBay: 22},
- {rowList: [16],minBay: 1,maxBay: 22},
+ {rowList: [1],minBay: 1,maxBay: 1},
+# {rowList: [3,4,5,6],minBay: 1,maxBay: 16},
+# {rowList: [10,9,8,7],minBay: 1,maxBay: 16},
+# {rowList: [10,9,8,7,6,5,4,3],minBay: 17,maxBay: 22},
+# {rowList: [12,13],minBay: 1,maxBay: 22},
+# {rowList: [15,14],minBay: 1,maxBay: 22},
+# {rowList: [17,18,19,20,21,22,23],minBay: 1,maxBay: 22},
+ {rowList: [2],minBay: 1,maxBay: 1},
+# {rowList: [11],minBay: 1,maxBay: 22},
+# {rowList: [16],minBay: 1,maxBay: 22},
]
#wcs瀵规帴
diff --git a/src/main/resources/mapper/BasSensorMapper.xml b/src/main/resources/mapper/BasSensorMapper.xml
new file mode 100644
index 0000000..3f6bcb2
--- /dev/null
+++ b/src/main/resources/mapper/BasSensorMapper.xml
@@ -0,0 +1,15 @@
+<?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.BasSensorMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasSensor">
+ <result column="number" property="number" />
+ <result column="location" property="location" />
+ <result column="temperature" property="temperature" />
+ <result column="humidity" property="humidity" />
+ <result column="create_time" property="createTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basSensor/basSensor.js b/src/main/webapp/static/js/basSensor/basSensor.js
new file mode 100644
index 0000000..d4501d1
--- /dev/null
+++ b/src/main/webapp/static/js/basSensor/basSensor.js
@@ -0,0 +1,257 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ var timer = setInterval(function () {
+ tableIns = table.render({
+ elem: '#basSensor',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basSensor/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'number', align: 'center',title: '浼犳劅鍣ㄧ紪鍙�'}
+ ,{field: 'location', align: 'center',title: '浼犳劅鍣ㄤ綅缃�'}
+ ,{field: 'temperature', align: 'center',title: '浼犳劅鍣ㄦ俯搴�(掳c)'}
+ ,{field: 'humidity', align: 'center',title: '浼犳劅鍣ㄦ箍搴�(%)'}
+ // ,{field: 'createTime', align: 'center',title: '鍒涘缓鏃堕棿'}
+
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ },1000);
+// clearInterval(timer);
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basSensor)', 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(basSensor)', 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 = {
+ 'basSensor': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basSensor/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(basSensor)', 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+"/basSensor/"+(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+"/basSensor/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+ }, 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}
+ });
+}
+
+// let timer = setInterval(function () {
+// $(".layui-laypage-btn")[0].click();
+// },1000);
+clearInterval(timer);
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..5bd503d 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -55,8 +55,8 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:false}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:false, width: 160}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
//
// ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
diff --git a/src/main/webapp/views/basSensor/basSensor.html b/src/main/webapp/views/basSensor/basSensor.html
new file mode 100644
index 0000000..4e6a1f0
--- /dev/null
+++ b/src/main/webapp/views/basSensor/basSensor.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basSensor" lay-filter="basSensor"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basSensor/basSensor.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">浼犳劅鍣ㄧ紪鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="number" placeholder="璇疯緭鍏ヤ紶鎰熷櫒缂栧彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浼犳劅鍣ㄤ綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="location" placeholder="璇疯緭鍏ヤ紶鎰熷櫒浣嶇疆">
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">浼犳劅鍣ㄦ俯搴�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="temperature" placeholder="璇疯緭鍏ヤ紶鎰熷櫒娓╁害">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">浼犳劅鍣ㄦ箍搴�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="humidity" 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" placeholder="璇疯緭鍏ヤ紶鎰熷櫒婀垮害">-->
+<!-- </div>-->
+<!-- </div>-->
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1