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/views/projectPlan/projectPlan.html | 117 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 21 deletions(-)
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