From bcf1e1d9bb4d269e0d2a6ad0765d218adfe1fb6c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 12:45:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/views/projectPlan/projectPlan.html | 237 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 134 insertions(+), 103 deletions(-)
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 8b30231..6533d91 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 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 class="layui-col-md9">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <div 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>
+ </div>
+ <table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>
+ </div>
+ </div>
</div>
</div>
- <!-- <div class="layui-inline">-->
- <!-- <div class="layui-input-inline">-->
- <!-- <input class="layui-input" 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>
+
<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/itemTable.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>
@@ -64,7 +139,7 @@
<form id="detail" lay-filter="detail" class="layui-form admin-form">
<input name="id" type="hidden">
<div class="layui-row">
- <div class="layui-col-md12">
+ <div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">椤圭洰鍚嶇О: </label>
<div class="layui-input-block">
@@ -72,25 +147,7 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鑺傜偣鍚嶇О: </label>
- <div class="layui-input-block">
- <input class="layui-input" id="flowId$" name="flowId$" readonly="readonly">
- </div>
- </div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label layui-form-required">鑺傜偣鍚嶇О: </label>-->
-<!-- <div class="layui-input-block cool-auto-complete">-->
-<!-- <input id="flowId" class="layui-input" name="flowId" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">-->
-<!-- <input id="flowId$" 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="flowIdByflowId" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
-<!-- <select class="cool-auto-complete-window-select" data-key="flowIdByflowIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鏉冮噸鍊�: </label>
@@ -99,52 +156,44 @@
lay-verify="required">
</div>
</div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label layui-form-required">鑺傜偣ID: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="flowId" placeholder="璇疯緭鍏ヨ妭鐐笽D" lay-vertype="tips"-->
-<!-- lay-verify="required">-->
-<!-- </div>-->
-<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
+ <label class="layui-form-label">璁″垝寮�濮嬫椂闂�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�"
- lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="endTime" id="endTime$" 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="realStartTime" id="realStartTime$" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
+ <input class="layui-input" name="realStartTime" id="realStartTime" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="realEndTime" id="realEndTime$" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
- </div>
- </div>
+
<div class="layui-form-item">
<label class="layui-form-label">寤舵湡澶╂暟: </label>
<div class="layui-input-block">
- <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�">
+ <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�" type="number" oninput="if(value>100)value=0;if(value<0)value=0">
</div>
</div>
+
+
<div class="layui-form-item">
- <label class="layui-form-label">寤舵湡鍘熷洜: </label>
+ <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
<div class="layui-input-block">
- <input class="layui-input" name="delayReason" placeholder="璇疯緭鍏ュ欢鏈熷師鍥�">
+ <input class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鑺傜偣鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" id="flowId$" name="flowId$" readonly="readonly">
</div>
</div>
<div class="layui-form-item">
@@ -154,9 +203,21 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <label class="layui-form-label">璁″垝缁撴潫鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寤舵湡鍘熷洜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="delayReason" placeholder="璇疯緭鍏ュ欢鏈熷師鍥�">
</div>
</div>
<div class="layui-form-item">
@@ -165,49 +226,19 @@
<input class="layui-input" name="dutyMan" 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" id="createTime$" placeholder="璇疯緭鍏ュ垱寤烘椂闂�">-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">鍒涘缓浜篿d: </label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input class="layui-input" name="createId" placeholder="璇疯緭鍏ュ垱寤轰汉id">-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">淇敼鏃堕棿: </label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input class="layui-input" name="modifyTime" id="modifyTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">淇敼浜篿d: </label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input class="layui-input" name="modifyId" placeholder="璇疯緭鍏ヤ慨鏀逛汉id">-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">鑺傜偣鍚嶇О: </label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input class="layui-input" name="flowName" 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>
+
+
</div>
</form>
</script>
<script type="text/template" id="parentNodeGroup">
- <option value="0">鏄剧ず鍏ㄩ儴</option>
+ <option value="0" selected>鏄剧ず鍏ㄩ儴</option>
{{#each data}}
<option value="{{this.key}}">{{this.val}}</option>
{{/each}}
--
Gitblit v1.9.1