feats

resources/static/less/ext-page.less

@@ -274,3 +274,4 @@
     }
   }
 }
+>>>>>>> 268768cf2fee2e747ce9459fa2ded365d1c962d0

resources/static/style/smartwizard/smart_wizard.css

@@ -7,213 +7,272 @@
   http://tech-laboratory.blogspot.com
 */
 .swMain {
-  position:relative;
-  display:block;
+  position: relative;
+  display: block;
   margin: 0 auto;
-  width:90%;
+  width: 90%;
 }
 .swMain .stepContainer {
-  display:block;
-  position: relative;  
-  overflow:hidden;
-  clear:both;
+  display: block;
+  position: relative;
+  overflow: hidden;
+  margin-left: 55px;
+  clear: both;
 }
 
-.swMain .stepContainer>div.content {
-  display:block;
+.swMain .stepContainer > div.content {
+  display: block;
   position: absolute;
   border: 1px solid #ddd;
-  height:400px;
-  z-index:88;
-  clear:both;
+  height: 400px;
+  z-index: 88;
+  clear: both;
   width: 100%;
   margin: 0;
 }
 
 .swMain div.actionBar {
-  display:block;
-  clear:both;
-  text-align:left;
- /**overflow:auto;  **/  
-  z-index:88; 
-  left:0;
-  padding-top:15px
+  display: block;
+  clear: both;
+  text-align: left;
+  /**overflow:auto;  **/
+  z-index: 88;
+  left: 0;
+  padding-top: 15px;
 }
 
 .swMain .stepContainer .StepTitle {
-  display:block;
+  display: block;
   position: relative;
-  margin:0;
-  padding:10px 20px;   
-  font: bold 16px Verdana, Arial, Helvetica, sans-serif; 
-  color:#333;   
-  background-color:#f6f6f6;
-  clear:both;
-  text-align:left; 
-  z-index:88;    
+  margin: 0;
+  padding: 10px 20px;
+  font: bold 16px Verdana, Arial, Helvetica, sans-serif;
+  color: #333;
+  background-color: #f6f6f6;
+  clear: both;
+  text-align: left;
+  z-index: 88;
 }
 .swMain ul.anchor {
   position: relative;
-  display:block;
-  float:left;
+  display: block;
+  float: left;
   list-style: none;
-  padding: 0px;  
-  margin: 10px 0;      
+  padding: 0px;
+  margin: 10px 0;
   clear: both;
-  border: 0px solid #CCCCCC;    
+  border: 0px solid #cccccc;
   background: transparent; /*#EEEEEE */
 }
-.swMain ul.anchor li{ 
-  position: relative; 
-  display:block;
+.swMain ul.anchor li {
+  width: 100px;
+  height: 103px;
+  position: relative;
   margin: 0;
-  padding: 0; 
-  padding-left:3px;
+  padding: 0;
+  padding-left: 3px;
   padding-right: 3px;
-  border: 0px solid #E0E0E0;      
+  border: 0px solid #e0e0e0;
   float: left;
 }
 /* Anchor Element Style */
 .swMain ul.anchor li a {
-  display:block;
-  position:relative;
-  float:left;
-  margin:0;
-  padding:3px;
-  height:60px;
-  width:230px;
+  align-self: center;
+  text-align: center;
+  display: block;
+  position: relative;
+  /* float: left; */
+  margin: 0;
+  padding-top: 6px;
+  height: 50px;
+  width: 50px;
   text-decoration: none;
-  outline-style:none;
-  -moz-border-radius  : 5px;
-  -webkit-border-radius: 5px;
-  z-index:99;
+  outline-style: none;
+  -moz-border-radius: 50%;
+  -webkit-border-radius: 50%;
+  z-index: 99;
 }
-.swMain ul.anchor li a .stepNumber{
-  position:relative;
-  float:left;
-  width:30px;
+.swMain ul.anchor li a .stepNumber {
+  /* position: absolute; */
+  /* float: left; */
+  width: 30px;
   text-align: center;
-  padding:5px;
-  padding-top:0;
-  font: bold 45px Verdana, Arial, Helvetica, sans-serif;
+  /* padding: 5px; */
+  font: bold 30px Verdana, Arial, Helvetica, sans-serif;
   color: inherit;
 }
-.swMain ul.anchor li a .stepDesc{
-  position:relative;
-  display:block;
-  float:left;
+.swMain ul.anchor li a .stepDesc {
+  position: absolute;
+  left: 10;
+  top: 5;
+  display: block;
+  /* float: left; */
   text-align: left;
-  padding: 5px 5px 5px 15px;
+  /* padding: 5px 5px 5px 5px; */
   color: inherit;
-  font: bold 20px Verdana, Arial, Helvetica, sans-serif;
+  font: bold 20px sans-serif;
 }
-.swMain ul.anchor li a .stepDesc small{
+.swMain ul.anchor li a .stepDesc small {
   font: normal 12px Verdana, Arial, Helvetica, sans-serif;
   color: inherit;
 }
-.swMain ul.anchor li a.selected{
-  color:#F8F8F8;
-  background: #4c88fe;  /* EA8511 */
-  cursor:pointer;
+.swMain ul.anchor li .tra1::before {
+  content: '';
+  position: absolute;
+  width: 4px;
+  height: 105px;
+  /* background: rgb(76, 136, 245); */
+  z-index: -1;
+  background-color: inherit;
+  top: -25px;
+  left: 24px;
+  border-radius: 2px;
+}
+.swMain ul.anchor li a.selected {
+  color: #f8f8f8;
+  background: #4c88fe; /* EA8511 */
+  cursor: pointer;
 }
 .swMain ul.anchor li a.selected:hover {
-  color:#F8F8F8;  
-  background: #4f8cdd;  
+  color: #f8f8f8;
+  background: #4f8cdd;
 }
 
-.swMain ul.anchor li a.done { 
-  position:relative;
-  color:#FFF;  
-  background: #8CC63F;  
-  border: 1px solid #8CC63F;   
-  z-index:99;
+.swMain ul.anchor li a.done {
+  position: relative;
+  color: #fff;
+  background: #8cc63f;
+  /* border: 1px solid #8cc63f; */
+  z-index: 99;
 }
 .swMain ul.anchor li a.done:hover {
-  color:#fff;  
-  background: #8CC63F; 
-  border: 1px solid #8CC63F;    
+  color: #fff;
+  background: #8cc63f;
+  /* border: 1px solid #8cc63f; */
+}
+.swMain ul.anchor li .tra2::before {
+  content: '';
+  position: absolute;
+  width: 4px;
+  height: 105px;
+  z-index: -1;
+  background-color: inherit;
+  /* background: rgba(176, 176, 177); */
+  left: 24px;
+  top: -25px;
+  border-radius: 2px;
+}
+.swMain ul.anchor li .tra3::before {
+  content: '';
+  position: absolute;
+  width: 4px;
+  height: 105px;
+  background-color: inherit;
+  z-index: -1;
+  left: 24px;
+  top: -25px;
+  border-radius: 2px;
 }
 .swMain ul.anchor li a.disabled {
-  color:#CCCCCC;  
-  background: #F8F8F8;
-  border: 1px solid #CCC;  
-  cursor:text;   
+  color: #cccccc;
+  background: rgb(230, 230, 230);
+  /* border: 1px solid #ccc; */
+  cursor: text;
 }
 .swMain ul.anchor li a.disabled:hover {
-  color:#CCCCCC;  
-  background: #F8F8F8;     
+  color: #cccccc;
+  background: #f8f8f8;
 }
 
 .swMain ul.anchor li a.error {
-  color:#fff;  
-  background: #f08f75 !important;
-  border: 1px solid #fb3500 !important;      
+  color: #fff;
+  background: #fb3500 !important;
+  /* border: 1px solid #fb3500 !important; */
 }
 
-.swMain .buttonNext,.swMain .buttonPrevious ,.swMain .buttonFinish
-	{font-size:14px;color: #fff;height:30px;line-height:30px;background: #4c88fe;border-radius:3px;padding: 0 20px;display:inline-block;vertical-align:middle;cursor: pointer;margin-left: 10px;float:right;text-decoration:none;}
-.swMain .buttonNext:hover,.swMain .buttonPrevious:hover ,.swMain .buttonFinish:hover{background: #4f8cdd;text-decoration:none;}
+.swMain .buttonNext,
+.swMain .buttonPrevious,
+.swMain .buttonFinish {
+  font-size: 14px;
+  color: #fff;
+  height: 30px;
+  line-height: 30px;
+  background: #4c88fe;
+  border-radius: 3px;
+  padding: 0 20px;
+  display: inline-block;
+  vertical-align: middle;
+  cursor: pointer;
+  margin-left: 10px;
+  float: right;
+  text-decoration: none;
+}
+.swMain .buttonNext:hover,
+.swMain .buttonPrevious:hover,
+.swMain .buttonFinish:hover {
+  background: #4f8cdd;
+  text-decoration: none;
+}
 .swMain .buttonDisabled {
-  color:#F8F8F8  !important;
-  background-color: #CCCCCC !important;
-  border: 1px solid #CCCCCC  !important;
-  cursor:text;    
+  color: #f8f8f8 !important;
+  background-color: #cccccc !important;
+  border: 1px solid #cccccc !important;
+  cursor: text;
 }
 
-
 /* Form Styles */
 
 .txtBox {
-  border:1px solid #CCCCCC;
-  color:#5A5655;
-  font:13px Verdana,Arial,Helvetica,sans-serif;
-  padding:2px;
-  width:430px;
+  border: 1px solid #cccccc;
+  color: #5a5655;
+  font: 13px Verdana, Arial, Helvetica, sans-serif;
+  padding: 2px;
+  width: 430px;
 }
 .txtBox:focus {
-  border:1px solid #EA8511;
+  border: 1px solid #ea8511;
 }
 
 .swMain .loader {
-  position:relative;  
-  display:none;
-  float:left;  
+  position: relative;
+  display: none;
+  float: left;
   margin: 2px 0 0 2px;
-  padding:8px 10px 8px 40px;
-  border: 1px solid #FFD700; 
-  font: bold 13px Verdana, Arial, Helvetica, sans-serif; 
-  color:#5A5655;       
-  background: #FFF url(../../images/loader.gif) no-repeat 5px;  
-  -moz-border-radius  : 5px;
+  padding: 8px 10px 8px 40px;
+  border: 1px solid #ffd700;
+  font: bold 13px Verdana, Arial, Helvetica, sans-serif;
+  color: #5a5655;
+  background: #fff url(../../images/loader.gif) no-repeat 5px;
+  -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
-  z-index:998;
+  z-index: 998;
 }
 .swMain .msgBox {
-  position:relative;  
-  display:none;
-  float:left;
-  padding:5px;
-  border: 1px solid #FFD700; 
-  background-color: #FFFFDD;         
-  -moz-border-radius  : 5px;
+  position: relative;
+  display: none;
+  float: left;
+  padding: 5px;
+  border: 1px solid #ffd700;
+  background-color: #ffffdd;
+  -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
-  z-index:999;
-  min-width:240px;   
+  z-index: 999;
+  min-width: 240px;
 }
 .swMain .msgBox .content {
-  font: normal 12px Verdana,Arial,Helvetica,sans-serif;
+  font: normal 12px Verdana, Arial, Helvetica, sans-serif;
   padding: 0px;
-  border:0;
-  background:none;
-  float:left;
+  border: 0;
+  background: none;
+  float: left;
 }
 .swMain .msgBox .close {
-  color: #CCC;
+  color: #ccc;
   outline-style: none;
   padding: 0 2px 0 2px;
   text-decoration: none;
 }
-.swMain .msgBox .close:hover{
-  color: #EA8511;
-  border: 1px solid #EA8511;  
-}
+.swMain .msgBox .close:hover {
+  color: #ea8511;
+  border: 1px solid #ea8511;
+}

resources/templates/common/common_list.html

@@ -9,6 +9,7 @@
 				<h2 class="page-title">[[${title}]]</h2>
 			</div>
 		</div>
+<<<<<<< HEAD
 		<div class="panel" style="position: relative; z-index: 20;">
 			<div class="panel-body search-bar">
 				<!--<span id="schSpan"
@@ -31,6 +32,42 @@
 					<input type="hidden" id="searchCols" />
 					<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
 							id="ordinary">搜索</a></span>
+=======
+	</div>
+	<div class="panel" style="position: relative; z-index: 20;">
+		<div class="panel-body search-bar">
+			<!--<span id="schSpan"
+				class="input-group"> <span class="input-group-addon">
+					<span class="pull-right" id="schCol_span"> 
+								</span> </span> <input type="text" name="schVal" id="schVal" value=""
+				class="form-control  "><input type="hidden" id="searchCols" />
+				<span class="input-group-btn"> <a class="btn btn-primary"
+					onclick="queryDatas()" id="ordinary"><i class="icon icon-search"></i>搜索</a>
+			</span>
+			</span>-->
+			<span id="schSpan" class="input-group">
+				<span class="input-group-addon" id="selSapn" style="display:none"></span>
+				<select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple="" id="schSel"
+					style="display:none">
+
+				</select>
+				<span class="input-group-addon" id="schCol_span"></span>
+				<input type="text" name="schVal" id="schVal" value="" class="form-control ">
+				<input type="hidden" id="searchCols" />
+				<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
+						id="ordinary">搜索</a></span>
+			</span>
+		</div>
+	</div>
+	<div class="panel">
+		<div class="panel-body">
+			<div class="editBar" id="schBar">
+				<span class="btn-group" id="btnSpan">
+					<!-- th:if="${haveAuth != null && haveAuth == '1'}" -->
+					<a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
+					<a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
+					<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
+>>>>>>> 65812a86a026ec058d29ed8cafd8100ff63f9bbe
 				</span>
 			</div>
 		</div>