From 5be703454588c433e9a33ac5c9cfd68c38caa89b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 19 五月 2023 15:29:40 +0800
Subject: [PATCH] 任务类型
---
/dev/null | 146 ------------------------------------
src/main/webapp/views/home/console.html | 31 +------
src/main/webapp/views/index.html | 4
src/main/webapp/views/basWrkIotype/basWrkIotype.html | 2
src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html | 4
src/main/webapp/static/wms/js/basWrkIotype/basWrkIotype.js | 4
src/main/resources/application.yml | 4
7 files changed, 13 insertions(+), 182 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2263b83..42d6275 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,9 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=wcs_dev
+ url: jdbc:sqlserver://localhost:1433;databasename=wcs_dev
username: sa
- password: sa@123
+ password: sa
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/webapp/static/wms/js/basWrkIotype/basWrkIotype.js b/src/main/webapp/static/wms/js/basWrkIotype/basWrkIotype.js
index 723120b..66878c3 100644
--- a/src/main/webapp/static/wms/js/basWrkIotype/basWrkIotype.js
+++ b/src/main/webapp/static/wms/js/basWrkIotype/basWrkIotype.js
@@ -21,9 +21,9 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'ioType', align: 'center',sort:true,title: '鍏ュ嚭绫诲瀷浠ｅ彿'}
+ ,{field: 'ioType', align: 'center',sort:true,title: '浠诲姟绫诲瀷浠ｅ彿'}
// ,{field: 'ioPri', align: 'center',title: '涓昏'}
- ,{field: 'ioDesc', align: 'center',title: '鍏ュ嚭绫诲瀷鎻忚堪'}
+ ,{field: 'ioDesc', align: 'center',title: '浠诲姟绫诲瀷鎻忚堪'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
diff --git a/src/main/webapp/views/basWrkIotype/basWrkIotype.html b/src/main/webapp/views/basWrkIotype/basWrkIotype.html
index bad3003..eb905d6 100644
--- a/src/main/webapp/views/basWrkIotype/basWrkIotype.html
+++ b/src/main/webapp/views/basWrkIotype/basWrkIotype.html
@@ -16,7 +16,7 @@
<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="io_type" placeholder="鍏ュ嚭绫诲瀷浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="io_type" placeholder="浠诲姟绫诲瀷浠ｅ彿" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html b/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html
index 5a3452d..3ec0d8e 100644
--- a/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html
+++ b/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html
@@ -16,7 +16,7 @@
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form" style="text-align: center">
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>鍏ュ嚭绫诲瀷浠ｅ彿锛�</label>
+ <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>浠诲姟绫诲瀷浠ｅ彿锛�</label>
<div class="layui-input-inline">
<input id="ioType" class="layui-input" type="text" onkeyup="check(this.id, 'basWrkIotype')" lay-verify="required|number">
</div>
@@ -28,7 +28,7 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label" style="font-size: x-small">鍏ュ嚭绫诲瀷鎻忚堪锛�</label>
+ <label class="layui-form-label" style="font-size: x-small">浠诲姟绫诲瀷鎻忚堪锛�</label>
<div class="layui-input-inline">
<input id="ioDesc" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index bdb7bfe..e87c6f9 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -108,30 +108,7 @@
<!--琛ㄦ牸鏁版嵁-->
<div class="home-elem loc-retention">
<div class="layui-form">
- <div id="form-header">搴撳瓨婊炵暀鏃堕棿缁熻琛�</div>
- <div class="layui-card" style="padding: 0 20px 1px 20px;">
- <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
- <legend>鎼滅储鏍�</legend>
- <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="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
- </div>
- </div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
- <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>
- </fieldset>
-
- </div>
+ <div id="form-header">搴撻緞缁熻琛�</div>
<table class="layui-hide" id="stayTime" lay-filter="stayTime"></table>
</div>
</div>
@@ -267,9 +244,9 @@
//{field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 165}
{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟',width: 90}
,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺',width: 90}
- ,{field: 'store_min', title: '搴撳瓨涓嬮檺', align: 'center'}
- ,{field: 'sum_qty', title: '搴撳瓨鎬绘暟', align: 'center'}
- ,{field: 'store_max', title: '搴撳瓨涓婇檺', align: 'center'}
+ // ,{field: 'store_min', title: '搴撳瓨涓嬮檺', align: 'center'}
+ // ,{field: 'sum_qty', title: '搴撳瓨鎬绘暟', align: 'center'}
+ // ,{field: 'store_max', title: '搴撳瓨涓婇檺', align: 'center'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�',width: 90}
];
diff --git a/src/main/webapp/views/home/navigation.html b/src/main/webapp/views/home/navigation.html
deleted file mode 100644
index bff0211..0000000
--- a/src/main/webapp/views/home/navigation.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!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/road.css">
-
- <style media="screen">
- *{
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0;
- padding: 0;
- font-family: 寰蒋闆呴粦;
- letter-spacing: 1px;
- }
- body{
- background: url(../../static/wms/image/nav/bg_1.png);
- background-size: cover;
- }
- .fn_1{
- width: 250px; height: 220px;
- background: url(../../static/wms/image/nav/fn_1.png);
- background-size: cover;
- }
- .fn_1:hover{
- background: url(../../static/wms/image/nav/fn_1_h.png);
- background-size: cover;
- }
-
- .fn_2{
- width: 250px; height: 220px;
- background: url(../../static/wms/image/nav/fn_2.png);
- background-size: cover;
- }
- .fn_2:hover{
- background: url(../../static/wms/image/nav/fn_2_h.png);
- background-size: cover;
- }
- .fn_3{
- width: 250px; height: 220px;
- background: url(../../static/wms/image/nav/fn_3.png);
- background-size: cover;
- }
- .fn_3:hover{
- background: url(../../static/wms/image/nav/fn_3_h.png);
- background-size: cover;
- }
-
- .sci-wheel{
- position: absolute;
- top: 0;
- right: 0;
- width: 100px;
- }
-
- .header{
- width: 100%; height: 100px; line-height: 100px;
- padding: 0 40px;
- background:rgba(0,0,0,0.3);
- }
- .header img{
- float: left;
- margin: 10px 10px;
- width: 100px;
- }
- .header p{
- float: left;
- font-size: 30px; color: white;
- letter-spacing: 3px;
- }
- .header .home-btn {
- float: left;
- margin-top: 20px;
- width: 74px;
- height: 74px;
- border: 1px solid #102262;
- border-radius: 5px;
- background: url(../../static/wms/image/nav/icon.png) no-repeat center center;
- background-size: 45% 45%;
- cursor: pointer;
- }
- .center{
- position: absolute;
- top: 0; bottom: 0; left: 0; right: 0;
- margin: auto;
- width: 930px; height: 250px;
- /* bottom: 300px; */
- }
- .center .list{
- display: block;
- float: left;
- margin: 0 30px;
- cursor: pointer;
- }
- .center .list p{
- text-align: center;
- color: #00BAF1;
- font-size: 18px;
- margin-top: 240px;
- }
- /* .center .list img{
- width: 250px;
- margin: 0 30px;
- } */
- </style>
-
-</head>
-<body>
-
-<div class="header">
- <p style="margin-left:20px">璇烽�夋嫨鎮ㄨ浣跨敤鐨勬ā鍧�</p>
-</div>
-
-<div class="center">
- <a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">
- <p>鍗曟嵁绠＄悊</p>
- </a>
- <a class="list fn_2 moveUpDownFla2" ew-href="wrkMast/wrkMast.html?resourceId=214">
- <p>杩愯浠诲姟</p>
- </a>
- <a class="list fn_3 moveUpDownFla1" ew-href="stoMan/stoQue.html?resourceId=10276">
- <p>搴撳瓨鏄庣粏</p>
- </a>
-</div>
-
-</body>
-<script type="text/javascript" src="../../static/wms/js/common.js"></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"></script>
-<script>
- layui.config({
- base: baseUrl + "/static/wms/layui/lay/modules/"
- }).use(['layer', 'element', 'admin'], function () {
- var element = layui.element;
- var $ = layui.jquery;
- var layer = layui.layer;
- var admin = layui.admin;
- })
-</script>
-</html>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 995e3b0..060b54a 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -21,7 +21,7 @@
</style>
</head>
<body class="layui-layout-body">
-<div class="layui-layout layui-layout-admin">
+<div class="layui-layout layui-layout-admin admin-nav-mini">
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
@@ -141,7 +141,7 @@
// 榛樿鍔犺浇涓婚〉
index.loadHome({
- menuPath: baseUrl+'/views/home/navigation.html',
+ menuPath: baseUrl+'/views/realtimeWatch/console.html',
menuName: '<i class="layui-icon layui-icon-home"></i>'
});
--
Gitblit v1.9.1