From 2c288fc04cbb697ec065a578edf8ca816287cdfd Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 15 二月 2022 08:05:29 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/webapp/static/js/projectPlan/projectPlan.js | 9 +-
src/main/webapp/views/projectPlan/projectPlan.html | 117 ++++++++++++++++++++++++++++++++-------
src/main/webapp/static/js/hostTable.js | 10 +-
3 files changed, 106 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/static/js/hostTable.js b/src/main/webapp/static/js/hostTable.js
index 0236566..8c5c063 100644
--- a/src/main/webapp/static/js/hostTable.js
+++ b/src/main/webapp/static/js/hostTable.js
@@ -12,7 +12,7 @@
var insTb = table.render({
elem: '#originTable',
- url: baseUrl + '/host/list/auth',
+ url: baseUrl + '/item/list/auth',
height: 'full-100',
headers: {token: localStorage.getItem('token')},
request: {
@@ -30,11 +30,11 @@
response: {
statusCode: 200
},
- toolbar: ['<p>',
+ /*toolbar: ['<p>',
'<button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon"></i>娣诲姞</button> ',
'<button lay-event="edit" class="layui-btn layui-btn-sm layui-btn-warm icon-btn"><i class="layui-icon"></i>淇敼</button> ',
'<button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon"></i>鍒犻櫎</button>',
- '</p>'].join(''),
+ '</p>'].join(''),*/
defaultToolbar: [],
cols: [[
{field: 'id', title: '缂栧彿', width: 70, align: 'center'},
@@ -54,7 +54,7 @@
/* 琛ㄦ牸鎼滅储 */
form.on('submit(originTbReset)', function (data) {
insTb.reload();
- insTb2.reload({where: {host_id: null}, page: {curr: 1}});
+ insTb2.reload({where: {item_id: null}, page: {curr: 1}});
return false;
});
@@ -80,7 +80,7 @@
table.on('row(originTable)', function (obj) {
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
- insTb2.reload({where: {host_id: obj.data.id}, page: {curr: 1}});
+ insTb2.reload({where: {item_id: obj.data.id}, page: {curr: 1}});
});
/* 鏄剧ず琛ㄥ崟寮圭獥 */
diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index 96c38fb..3c2fd9d 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -1,5 +1,6 @@
var pageCurr;
var items;
+var insTb2;
getItems();
@@ -15,7 +16,7 @@
var admin = layui.admin;
// 鏁版嵁娓叉煋
- tableIns = table.render({
+ insTb2 = table.render({
elem: '#projectPlan',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/projectPlan/list/auth',
@@ -27,7 +28,7 @@
where: {
items: items
},
-
+ height: 'full-100',
cols: [[
{type: 'checkbox', hide:true}
// ,{field: 'id', align: 'center',title: '鍞竴ID'}
@@ -79,7 +80,7 @@
});
searchData['orderByField'] = obj.field;
searchData['orderByType'] = obj.type;
- tableIns.reload({
+ insTb2.reload({
where: searchData,
page: {curr: 1}
});
@@ -295,7 +296,7 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
- tableIns.reload({
+ insTb2.reload({
where: searchData,
page: {curr: pageCurr}
});
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 42deb4b..8fe0831 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -9,36 +9,110 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/css/common.css" media="all">
+<!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
+ <link rel="stylesheet" href="../../static/css/originTable.css" media="all">
+ <style>
+ body {
+ color: #595959;
+ background-color: #f5f7f9;
+ }
+ .admin-form {
+ padding: 25px 30px 0 0 !important;
+ margin: 0 !important;
+ }
+
+ .alarm-dialog .layui-form-label {
+ width: 180px;
+ }
+ .alarm-dialog .layui-input-block {
+ margin-left: 210px;
+ }
+
+ </style>
</head>
<body>
-<!-- 鎼滅储鏍� -->
-<div id="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <label class="layui-form-label">褰撳墠椤圭洰: </label>
- <div class="layui-input-inline">
- <select id="items" name="items" lay-search="" lay-filter="items">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" id="mysearch" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+<!--<!– 鎼滅储鏍� –>-->
+<!--<div id="search-box" class="layui-form layui-card-header">-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">褰撳墠椤圭洰: </label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select id="items" name="items" lay-search="" lay-filter="items">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" id="mysearch" type="text" name="id" 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="projectPlan" lay-filter="projectPlan"></table>-->
+<!--</div>-->
+
+
+<!-- 姝ｆ枃寮�濮� -->
+<div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-row layui-col-space15">
+ <!-- 宸� -->
+ <div class="layui-col-md3" id="left-table">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <form class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline" style="max-width: 140px;">
+ <input name="name" class="layui-input" placeholder="杈撳叆椤圭洰鍚嶇О"/>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </form>
+ <table id="originTable" lay-filter="originTable"></table>
+ </div>
</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 class="layui-col-md9">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <form class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input name="uuid" class="layui-input" placeholder="缂栧彿"/>
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ </div>
+ </div>
+ </form>
+ <table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>
+ </div>
+ </div>
</div>
+ </div>
</div>
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>
-</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>-->
@@ -56,6 +130,7 @@
<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/hostTable.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/projectPlan/projectPlan.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js" charset="utf-8"></script>
</body>
--
Gitblit v1.9.1