From d46f2bd8e9da289ad594ecfada2bba6ca365860d Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao@zte-its.com>
Date: Thu, 26 Jul 2018 17:55:25 +0800
Subject: [PATCH] 日报查询 查询栏

---
 resource/img/dataicon.png        | Bin 0 -> 326 bytes
 resource/img/search-btn.png      | Bin 0 -> 2103 bytes
 topages/workquery/workquery.css  | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 topages/workquery/workquery.html | 25 ++++++++++++++++++++++++-
 topages/workquery/workquery.js   | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 142 insertions(+), 4 deletions(-)
 create mode 100644 resource/img/dataicon.png
 create mode 100644 resource/img/search-btn.png

diff --git a/resource/img/dataicon.png b/resource/img/dataicon.png
new file mode 100644
index 0000000..ce428ee
Binary files /dev/null and b/resource/img/dataicon.png differ
diff --git a/resource/img/search-btn.png b/resource/img/search-btn.png
new file mode 100644
index 0000000..a9dc7c9
Binary files /dev/null and b/resource/img/search-btn.png differ
diff --git a/topages/workquery/workquery.css b/topages/workquery/workquery.css
index 9b5b469..ef46aeb 100644
--- a/topages/workquery/workquery.css
+++ b/topages/workquery/workquery.css
@@ -1,3 +1,7 @@
+.workquery-cardlist{
+    height: 138px;
+    width: 100%;
+}
 .workquery-cardlist li{
     width:324px ;
     height: 136px;
@@ -36,10 +40,75 @@
 
 
 /*----------------------------------------时间*/
+.workquery-timeopr-wrap{
+    height: 34px;
+    margin-top: 30px;
+    margin-bottom: 30px;
+}
+.workquery-timeopr-wrap .timeopr-text{
+    height: 34px;
+    line-height: 34px;
+    color: #363d5d;
+    font-size: 14px;
+    width: 72px;
+}
+.ITD-daterange-btn {
+    float: left;
+    width: 120px;
+    height: 34px;
+    line-height: 34px;
 
-
-
-
+    padding-top: 1px !important;
+}
+.ITD-daterange-bg {
+    width: 90px;
+    text-align: left;
+    background: url(../../resource/img/dataicon.png) no-repeat 94% 9px !important;
+    background-color: #fff !important;
+    padding-right: 25px;
+    z-index: 9999;
+    border-radius: 4px !important;
+}
+.ITD-input-bordercolor {
+    color: rgba(0,0,0,0.45);
+    border: 1px solid #d8e2e5 !important;
+    border-radius: 4px !important;
+}
+.ITD-parkinput78 {
+    width: 180px;
+    height: 34px;
+    line-height: 34px;
+}
+.paddingleft-10 {
+    padding-left: 10px;
+}
+.workquery-timeopr-div{
+    width: 200px;
+    height: 34px;
+    line-height: 34px;
+}
+/*input 样式*/
+.bootstrap-select.btn-group .dropdown-toggle .filter-option {
+    text-align: left !important;
+}
+.bootstrap-select.btn-group .dropdown-toggle .caret{
+    position: absolute;
+    top: 50%;
+    left:170px !important;;
+    margin-top: -2px;
+    vertical-align: middle;
+}
+.margin-right-40{
+    margin-right: 40px;
+}
+/*查询按钮*/
+.workquery-searchbtn{
+    background: url("../../resource/img/search-btn.png") no-repeat;
+    width: 66px;
+    height: 66px;
+    top: -12px;
+    right: 0px;
+}
 
 /*----------------------------------------列表*/
 .workquery-list-wrap>li{
diff --git a/topages/workquery/workquery.html b/topages/workquery/workquery.html
index aa3bb87..ca36494 100644
--- a/topages/workquery/workquery.html
+++ b/topages/workquery/workquery.html
@@ -13,7 +13,29 @@
         <div class="workquery-card-counter workquery-card-nocommitedcounter">3</div>
     </li>
 </ul>
-<div class="workquery-timeopr-wrap">时间操作区域</div>
+<!--查询 sta-->
+<div class="workquery-timeopr-wrap pos-rel clearfix">
+    <div class="timeopr-text float-left">选择时间</div>
+        <div class="input-group ITD-daterange-btn" >
+            <input type="text" class="form-control ITD-daterange-bg ITD-common-color070" id="workquery-daterange-btnsta" readonly="">
+        </div>
+        <span class="float-left" style="height: 34px;line-height: 34px;margin: 0 5px;">-</span>
+        <div class="input-group ITD-daterange-btn margin-right-40">
+            <input type="text" class="form-control daterange-str ITD-daterange-bg ITD-common-color070" id="workquery-daterange-btnend" readonly="">
+        </div>
+    <div class="timeopr-text float-left">选择项目</div>
+    <div class="float-left workquery-timeopr-div margin-right-40">
+        <select id="workquery-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
+            <option value="1">企业云</option>
+            <option value="2">任你停</option>
+            <option value="3">政府云</option>
+        </select>
+    </div>
+    <div class="timeopr-text float-left">人员名称</div>
+    <input type="text" class="ITD-parkinput78 paddingleft-10 ITD-input-bordercolor" maxlength="16" id="perName">
+    <div class="workquery-searchbtn pos-abs cursor-pointer" id="queryBtn"></div>
+</div>
+<!--查询 end-->
 
 
 
@@ -51,3 +73,4 @@
         </ul>
     </li>
 </ul>
+<script src="../topages/workquery/workquery.js"></script>
diff --git a/topages/workquery/workquery.js b/topages/workquery/workquery.js
index b5ac7f1..d40d21f 100644
--- a/topages/workquery/workquery.js
+++ b/topages/workquery/workquery.js
@@ -1,3 +1,49 @@
 /**
  * Created by mac on 18/7/24.
  */
+var fun={
+    init:function () {
+        $('#workquery-projectName').selectpicker('render');
+        fun.dateInit();
+    },
+    dateInit:function () {
+        //时间初始化
+        $('#workquery-daterange-btnsta').val(moment().subtract('days', 6).format('YYYY-MM-DD'));
+        $('#workquery-daterange-btnend').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
+        //开始日期
+        $("#workquery-daterange-btnsta").datetimepicker({
+            endDate: moment().subtract('days', 0).format('YYYY-MM-DD'),
+            format: 'yyyy-mm-dd',
+            autoclose: true,
+            startView: 2,
+            //maxDate:moment().subtract('months', 3),
+            minView: 2,
+            forceParse: false,
+            clearBtn: true , //添加清除按钮，可选值：true/false
+            locale: "zh-CN",
+            language: 'zh-CN',
+            pickerPosition: "bottom-right"
+        }).on("change", function () {
+            $("#workquery-daterange-btnend").val('');
+        });
+        //结束日期
+        $("#workquery-daterange-btnend").datetimepicker({
+            endDate: moment().subtract('days', 0).format('YYYY-MM-DD'),
+            //startDate:startVal,
+            format: 'yyyy-mm-dd',
+            weekStart: 1,
+            autoclose: true,
+            clearBtn: true , //添加清除按钮，可选值：true/false
+            startView: 2,
+            minView: 2,
+            forceParse: false,
+            locale: "zh-CN",
+            language: 'zh-CN',
+            pickerPosition: "bottom-right"
+        }).on("click", function () {
+            $("#workquery-daterange-btnend").datetimepicker("setStartDate", $("#workquery-daterange-btnsta").val())
+        });
+    },
+
+}
+fun.init();
\ No newline at end of file
--
libgit2 0.21.4