From 51f6b1ae7c10506910a09c7926429e19949e8421 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 08 十二月 2025 15:50:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/core/WrkMastConfig.java | 17
src/main/webapp/views/agvWrkMast/errorWrkMast.html | 161 ++++++++
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 33 +
src/main/java/com/zy/asrs/task/LogClearScheduler.java | 2
src/main/webapp/static/js/agvWrkMast/errorWrkMast.js | 765 ++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/AgvWrkMastWarnScheduler.java | 124 ++++++
6 files changed, 1,101 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index 637505b..628bd4d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.enums.SqlLike;
@@ -14,7 +15,10 @@
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.service.AgvWaitPakinService;
import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.task.core.WrkMastConfig;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,8 +30,13 @@
@Autowired
AgvWrkMastService agvWrkMastService;
+
@Autowired
AgvWaitPakinService agvWaitPakinService;
+
+ @Autowired
+ private ConfigService configService;
+
@RequestMapping(value = "/wrkMast/{id}/auth")
@ManagerAuth
@@ -59,6 +68,30 @@
return R.ok(agvWrkMastPage);
}
+ @RequestMapping(value = "/wrkMast/list/error")
+ @ManagerAuth
+ public R listerror(@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<AgvWrkMast> wrapper = new EntityWrapper<>();
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "WRKMAST_WARN_CONFIG"));
+ if (config != null && config.getValue() != null) {
+ List<WrkMastConfig> wrkMastConfigs = JSONArray.parseArray(config.getValue(), WrkMastConfig.class);
+ for (WrkMastConfig wrkMastConfig : wrkMastConfigs) {
+ wrapper.eq("wrk_sts", wrkMastConfig.getSts()).le("modi_time", DateUtil.offsetHour(new Date(), -wrkMastConfig.getHours()));
+ if (!wrkMastConfigs.get(wrkMastConfigs.size() - 1).equals(wrkMastConfig)) {
+ wrapper.orNew();
+ }
+ }
+ Page<AgvWrkMast> agvWrkMastPage = agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(agvWrkMastPage);
+ }
+ return R.ok();
+ }
+
@RequestMapping(value = "/wrkMast/list/auth/dbList")
@ManagerAuth
public R dbList(@RequestParam(defaultValue = "1") Integer curr,
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastWarnScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastWarnScheduler.java
new file mode 100644
index 0000000..f2e2f1a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastWarnScheduler.java
@@ -0,0 +1,124 @@
+package com.zy.asrs.task;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.mapper.AgvBasMapper;
+import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.task.core.WrkMastConfig;
+import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Component
+public class AgvWrkMastWarnScheduler {
+
+ private static final Logger log = LoggerFactory.getLogger(AgvWrkMastWarnScheduler.class);
+
+
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+
+
+ @Autowired
+ private ConfigService configService;
+
+ @Autowired
+ private AgvBasMapper agvBasMapper;
+
+
+ @Scheduled(fixedDelay = 600000)
+ public void report() {
+ Date date = new Date();
+ Map<Long, Integer> timeConfig = new HashMap<>();
+ Config url = configService.selectOne(new EntityWrapper<Config>().eq("code", "WRKMAST_WARN_REPORT_URL"));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "WRKMAST_WARN_CONFIG"));
+ if (url != null && url.getValue() != null && config != null && config.getValue() != null) {
+ List<WrkMastConfig> wrkMastConfigs = JSONArray.parseArray(config.getValue(), WrkMastConfig.class);
+ EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
+ for (WrkMastConfig wrkMastConfig : wrkMastConfigs) {
+ wrapper.eq("wrk_sts", wrkMastConfig.getSts()).le("modi_time", DateUtil.offsetHour(date, -wrkMastConfig.getHours()));
+ if (!wrkMastConfigs.get(wrkMastConfigs.size() - 1).equals(wrkMastConfig)) {
+ wrapper.orNew();
+ }
+ timeConfig.put(wrkMastConfig.getSts(), wrkMastConfig.getReport());
+ }
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(wrapper);
+ StringBuffer buffer;
+ for (AgvWrkMast agvWrkMast : agvWrkMasts) {
+ Date errorTime = agvWrkMast.getErrorTime();
+ if (errorTime == null) {
+ errorTime = agvWrkMast.getModiTime();
+ }
+ if (DateUtil.offsetMinute(date, -timeConfig.get(agvWrkMast.getWrkSts())).after(errorTime)) {
+ buffer = new StringBuffer();
+ buffer.append("[" + agvWrkMast.getWrkNo() + "]宸ヤ綔鍙�,鐘舵�侊細" + agvWrkMast.getWrkSts$() + "\n");
+ buffer.append("鏈�鍚庝竴娆℃洿鏂版椂闂�:" + DateUtil.formatDateTime(agvWrkMast.getModiTime()) + "\n");
+ HashMap<String, Object> param = new HashMap<>();
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("content", buffer.toString());
+ param.put("msgtype", "text");
+ param.put("text", data);
+
+ log.info("鍙戦�佹姤璀︿俊鎭細{}", JSON.toJSONString(param));
+ String response = null;
+ try {
+ response = new HttpHandler.Builder().setUri(url.getValue()).setJson(JSON.toJSONString(param)).setHttps(true).build().doPost();
+ } catch (IOException e) {
+ //continue;
+ }
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject != null && jsonObject.get("errmsg").equals("ok")) {
+ agvWrkMast.setErrorTime(date);
+ agvWrkMastService.updateById(agvWrkMast);
+ } else {
+ agvWrkMast.setErrorTime(date);
+ agvWrkMastService.updateById(agvWrkMast);
+ log.error("鍙戦�佸け璐ワ紝閿欒淇℃伅锛歿}", jsonObject == null ? "绌�" : jsonObject.get("errmsg"));
+ }
+ }
+ }
+ }
+ }
+
+
+ public static void main(String[] args) {
+ List<WrkMastConfig> list = new ArrayList<>();
+ WrkMastConfig wrkMastConfig = new WrkMastConfig();
+ wrkMastConfig.setSts(205L);
+ wrkMastConfig.setHours(480);
+ wrkMastConfig.setReport(120);
+ list.add(wrkMastConfig);
+ wrkMastConfig = new WrkMastConfig();
+ wrkMastConfig.setSts(204L);
+ wrkMastConfig.setHours(24);
+ wrkMastConfig.setReport(60);
+ list.add(wrkMastConfig);
+ wrkMastConfig = new WrkMastConfig();
+ wrkMastConfig.setSts(203L);
+ wrkMastConfig.setHours(24);
+ wrkMastConfig.setReport(60);
+ list.add(wrkMastConfig);
+ wrkMastConfig = new WrkMastConfig();
+ wrkMastConfig.setSts(202L);
+ wrkMastConfig.setHours(24);
+ wrkMastConfig.setReport(60);
+ list.add(wrkMastConfig);
+ System.out.println(JSON.toJSONString(list));
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/LogClearScheduler.java b/src/main/java/com/zy/asrs/task/LogClearScheduler.java
index 9b46e4a..034b6f0 100644
--- a/src/main/java/com/zy/asrs/task/LogClearScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LogClearScheduler.java
@@ -30,7 +30,7 @@
// @Scheduled(cron = "0/1 * * * * ? ")
@Scheduled(cron = "* * 0 * * ? ")
private void apiLogExecute(){
- LocalDateTime oneMonthAgo = LocalDateTime.now().minus(1, ChronoUnit.MONTHS);
+ LocalDateTime oneMonthAgo = LocalDateTime.now().minus(1, ChronoUnit.YEARS);
List<ApiLog> apiLogs = apiLogService.selectList(new EntityWrapper<ApiLog>().lt("create_time", oneMonthAgo));
for(ApiLog apiLog : apiLogs){
ReturnT<String> returnT = logClearHandler.startClearApiLog(apiLog);
diff --git a/src/main/java/com/zy/asrs/task/core/WrkMastConfig.java b/src/main/java/com/zy/asrs/task/core/WrkMastConfig.java
new file mode 100644
index 0000000..17d6928
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/core/WrkMastConfig.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.task.core;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WrkMastConfig implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Long sts;
+
+ private Integer hours;
+
+ private Integer report;
+
+}
diff --git a/src/main/webapp/static/js/agvWrkMast/errorWrkMast.js b/src/main/webapp/static/js/agvWrkMast/errorWrkMast.js
new file mode 100644
index 0000000..3a372e9
--- /dev/null
+++ b/src/main/webapp/static/js/agvWrkMast/errorWrkMast.js
@@ -0,0 +1,765 @@
+var pageCurr;
+var wrkNo;
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#agvWrkMast',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/agv/wrkMast/list/error',
+ page: true,
+ limit: 500,
+ limits: [500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
+ ,{field: 'modiTime$', align: 'center',title: '鏈�鏂版洿鏂版椂闂�',sort: true, width: 160}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�',width: 80}
+ //,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
+ //,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
+ ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
+ //,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
+ ,{field: 'barcode', align: 'center',title: '璐ф灦鐮�',width: 80}
+ ,{field: 'whsType', align: 'center',title: '璐ф灦绫诲瀷',width: 90}
+ ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
+ ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
+ ,{field: 'crnNo', align: 'center',title: '鐩爣妤煎眰', hide: false}
+ // ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
+ // var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.picking === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ // ,{field: 'exitMk', align: 'center',title: '閫�鍑�', templet:function(row){
+ // var html = "<input value='exitMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.exitMk === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ // ,{field: 'emptyMk', align: 'center',title: '绌烘澘', templet:function(row){
+ // var html = "<input value='emptyMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.emptyMk === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ //
+ // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
+ // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ // ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
+ ,{field: 'appeUser$', align: 'center',title: '鐢ㄦ埛'}
+ ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide:false, width: 160}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ //
+ // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.fullPlt === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
+ ]],
+ 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();
+ 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('sort(wrkMast)', 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
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(wrkMast)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ // 澧炲姞浼樺厛绾�
+ case 'priAdd':
+ var list=[];
+ checkStatus.data.map(function (track) {
+ list.push({
+
+ wrkNo: track.wrkNo,
+ ioTime: track.ioTime,
+ ioPri: track.ioPri
+ });
+ });
+ $.ajax({
+ url: baseUrl+"/agv/wrkMast/add/pri/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(list),
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ layer.closeAll();
+ 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)
+ }
+ }
+ })
+ break;
+ // 闄嶄綆浼樺厛绾�
+ case 'priRed':
+ var list=[];
+ checkStatus.data.map(function (track) {
+ list.push({
+ wrkNo: track.wrkNo,
+ ioTime: track.ioTime,
+ ioPri: track.ioPri
+ });
+ });
+ $.ajax({
+ url: baseUrl+"/agv/wrkMast/red/pri/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(list),
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ layer.closeAll();
+ 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)
+ }
+ }
+ })
+ break;
+ case 'startWrk':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍚姩'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/agv/wrkMast/startWrk/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)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'wrkMast_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.getChildFrame('##dealDownLine', index).hide();layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ 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+"/agv/wrkMast/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)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.load(2, {time: 600*1000});
+ 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 = {
+ 'wrkMast': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/agv/wrkMast/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)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(wrkMast)', function(obj){
+ let data = obj.data;
+ switch (obj.event) {
+ // 鏄庣粏灞曠ず
+ case 'detlShow':
+ wrkNo = data.wrkNo;
+ // 琛ㄦ牸涓嬫柟鏄剧ず
+ // locDetl(data.wrkNo);
+ // 寮瑰眰鏄剧ず
+ layer.open({
+ type: 2,
+ title: '宸ヤ綔妗ｆ槑缁�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'wrkDetl.html',
+ success: function(layero, index){
+ }
+ });
+ break;
+ // 瀹屾垚
+ case 'complete':
+ layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+
+ });
+ break;
+ // 鍙栨秷
+ case 'cancel':
+ if (data.pdcType === "Y") {
+ layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ } else {
+ layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ }
+ break;
+ // 鍙栨秷
+ case 'cancel1':
+ if (data.pdcType === "Y") {
+ layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:5}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ } else {
+ layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:5}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ }
+ break;
+ // 鎷ｆ枡鍏ュ簱
+ case 'pick':
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ break;
+ // 鍏堝叆鍝�
+ case 'preHave':
+ layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg, {icon: 1});
+ })
+ layer.closeAll();
+ });
+ break;
+ // 绌烘搷浣�
+ case 'takeNone':
+ layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ });
+ break;
+ // 寮冭溅
+ case 'removeSte':
+ layer.confirm('娓呴櫎灏忚溅銆�' + data.steNo + '銆�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/deal/steNo/empty", {wrkNo: data.wrkNo}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg, {icon: 1});
+ })
+ layer.closeAll();
+ });
+ break;
+ case 'priWrkMast':
+ layer.open({
+ type: 2,
+ title: '缁存姢宸ヤ綔妗�',
+ maxmin: true,
+ area: ['500px', top.detailHeight],
+ shadeClose: false,
+ content: 'wrkMast_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('#locNo', 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;
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ 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 = {
+ wrkNo: $('#wrkNo').val(),
+ invWh: $('#invWh').val(),
+ ymd: top.strToDate($('#ymd\\$').val()),
+ mk: $('#mk').val(),
+ whsType: $('#whsType').val(),
+ wrkSts: $('#wrkSts').val(),
+ ioType: $('#ioType').val(),
+ crnNo: $('#crnNo').val(),
+ sheetNo: $('#sheetNo').val(),
+ ioPri: $('#ioPri').val(),
+ wrkDate: top.strToDate($('#wrkDate\\$').val()),
+ locNo: $('#locNo').val(),
+ staNo: $('#staNo').val(),
+ sourceStaNo: $('#sourceStaNo').val(),
+ sourceLocNo: $('#sourceLocNo').val(),
+ locSts: $('#locSts').val(),
+ picking: $('#picking').val(),
+ linkMis: $('#linkMis').val(),
+ onlineYn: $('#onlineYn').val(),
+ updMk: $('#updMk').val(),
+ exitMk: $('#exitMk').val(),
+ pltType: $('#pltType').val(),
+ emptyMk: $('#emptyMk').val(),
+ ioTime: top.strToDate($('#ioTime\\$').val()),
+ ctnType: $('#ctnType').val(),
+ packed: $('#packed').val(),
+ oveMk: $('#oveMk').val(),
+ mtnType: $('#mtnType').val(),
+ userNo: $('#userNo').val(),
+ crnStrTime: top.strToDate($('#crnStrTime\\$').val()),
+ crnEndTime: top.strToDate($('#crnEndTime\\$').val()),
+ plcStrTime: top.strToDate($('#plcStrTime\\$').val()),
+ crnPosTime: top.strToDate($('#crnPosTime\\$').val()),
+ loadTime: $('#loadTime').val(),
+ expTime: $('#expTime').val(),
+ refWrkno: $('#refWrkno').val(),
+ refIotime: top.strToDate($('#refIotime\\$').val()),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+ pauseMk: $('#pauseMk').val(),
+ errorTime: top.strToDate($('#errorTime\\$').val()),
+ errorMemo: $('#errorMemo').val(),
+ ctnKind: $('#ctnKind').val(),
+ manuType: $('#manuType').val(),
+ memo: $('#memo').val(),
+ scWeight: $('#scWeight').val(),
+ logMk: $('#logMk').val(),
+ logErrTime: top.strToDate($('#logErrTime\\$').val()),
+ logErrMemo: $('#logErrMemo').val(),
+ barcode: $('#barcode').val(),
+ PdcType: $('#PdcType').val(),
+ ctnNo: $('#ctnNo').val(),
+ fullPlt: $('#fullPlt').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/agv/wrkMast/"+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("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ }
+
+ // 澶嶉�夋浜嬩欢
+ form.on('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ $('#detlTable').css("display", 'none');
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ $('#detlTable').css("display", 'none');
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#ymd\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#wrkDate\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnStrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnEndTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#plcStrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#crnPosTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#refIotime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#errorTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#logErrTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+ var pageCur;
+ function locDetl(param){
+ $('#detlTable').css("display", 'block');
+ // 鏁版嵁娓叉煋
+ $('#wrkNo').val(param);
+ // 鏁版嵁娓叉煋
+ tableIns1 = table.render({
+ elem: '#wrkDetlByMap',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/agv/wrkDetl/list/auth',
+ where: {wrk_no: param},
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+ ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
+ ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'zpallet', align: 'center',title: '璐ф灦鏉＄爜'}
+ ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:50}
+ ]],
+ 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+"/";
+ }
+ pageCur=curr;
+ 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';
+ }
+ });
+ }
+ });
+ }
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+ });
+ (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);
+ }
+ });
+}
+
+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();
+ }
+});
diff --git a/src/main/webapp/views/agvWrkMast/errorWrkMast.html b/src/main/webapp/views/agvWrkMast/errorWrkMast.html
new file mode 100644
index 0000000..6f9a3f2
--- /dev/null
+++ b/src/main/webapp/views/agvWrkMast/errorWrkMast.html
@@ -0,0 +1,161 @@
+<!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">
+ <style>
+ .layui-btn .layui-icon {
+ margin: 0;
+ }
+ #btn-pri-add {
+ display: none;
+ }
+ #btn-pri-red {
+ display: none;
+ }
+ .btn-complete {
+ display: none;
+ }
+ .btn-cancel {
+ display: none;
+ }
+ .btn-pick {
+ display: none;
+ }
+
+ /*鏄庣粏琛�*/
+ #detlTable {
+ margin-top: 20px;
+ }
+
+ #search-box {
+ padding: 30px 30px 10px 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+ #data-search-btn {
+ margin-top: 10px;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+ </style>
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="barcode" placeholder="璐ф灦鐮�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鐘舵��" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="ioType" class="layui-input" name="io_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍏ュ嚭搴撶被鍨�" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!--<!– <div class="layui-inline">–>-->
+<!--<!– <div class="layui-input-inline">–>-->
+<!--<!– <input class="layui-input" type="text" name="crn_no" 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="io_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="%source_loc_no%" placeholder="婧愬簱浣�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="%loc_no%" placeholder="鐩爣搴撲綅" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="barcode%" placeholder="璐ф灦鍓嶄袱浣�" autocomplete="off">-->
+<!-- </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 id="data-search-btn" class="layui-btn-container layui-form-item">-->
+<!-- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
+<!-- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
+<!-- </div>-->
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="agvWrkMast" lay-filter="wrkMast"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+<!-- <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>-->
+<!-- <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</button>-->
+<!-- <button class="layui-btn layui-btn-primary" id="btn-startWrk" lay-event="startWrk">寮�濮嬩换鍔�</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<!--鏄庣粏琛�-->
+<div id="detlTable" style="display: none">
+ <div class="layui-inline" style="width:90%;margin-top: 10px;margin-left: 20px">
+ <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅伐浣滄祦鐨勭墿鏂欐槑缁�</span>
+ </div>
+
+ <table class="layui-hide" id="wrkDetlByMap" lay-filter="wrkDetlByMap"></table>
+</div>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js?v=100"></script>
+<script type="text/javascript" src="../../static/layui/layui.js?v=100" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=100" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js?v=100" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMast/errorWrkMast.js?v=1" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
--
Gitblit v1.9.1