diff --git a/resource/img/nocommited-icon-1.png b/resource/img/nocommited-icon-1.png new file mode 100644 index 0000000..d514906 --- /dev/null +++ b/resource/img/nocommited-icon-1.png diff --git a/resource/img/nocommited-icon-2.png b/resource/img/nocommited-icon-2.png new file mode 100644 index 0000000..cf73424 --- /dev/null +++ b/resource/img/nocommited-icon-2.png diff --git a/resource/img/nocommited-icon-3.png b/resource/img/nocommited-icon-3.png new file mode 100644 index 0000000..5cf9fa4 --- /dev/null +++ b/resource/img/nocommited-icon-3.png diff --git a/resource/img/nocommited-icon-4.png b/resource/img/nocommited-icon-4.png new file mode 100644 index 0000000..88e4a4e --- /dev/null +++ b/resource/img/nocommited-icon-4.png diff --git a/resource/img/nocommited-icon-5.png b/resource/img/nocommited-icon-5.png new file mode 100644 index 0000000..0e55216 --- /dev/null +++ b/resource/img/nocommited-icon-5.png diff --git a/resource/img/nocommited-icon-6.png b/resource/img/nocommited-icon-6.png new file mode 100644 index 0000000..6e72f71 --- /dev/null +++ b/resource/img/nocommited-icon-6.png diff --git a/resource/img/nocommited-icon-7.png b/resource/img/nocommited-icon-7.png new file mode 100644 index 0000000..a362dc8 --- /dev/null +++ b/resource/img/nocommited-icon-7.png diff --git a/topages/hourscount/hourscount.js b/topages/hourscount/hourscount.js index 261f6b5..6cf80c1 100644 --- a/topages/hourscount/hourscount.js +++ b/topages/hourscount/hourscount.js @@ -11,7 +11,7 @@ var fun= { }, dateInit: function () { //时间初始化 - $('#hourscount-daterange-btnsta').val(moment().subtract('days', 6).format('YYYY-MM-DD')); + $('#hourscount-daterange-btnsta').val(moment().subtract('days', 0).format('YYYY-MM-DD')); $('#hourscount-daterange-btnend').val(moment().subtract('days', 0).format('YYYY-MM-DD')); //开始日期 $("#hourscount-daterange-btnsta").datetimepicker({ diff --git a/topages/workfill/workfill.css b/topages/workfill/workfill.css index 343533c..de965b2 100644 --- a/topages/workfill/workfill.css +++ b/topages/workfill/workfill.css @@ -66,31 +66,31 @@ .workfill-list-btn:focus{ outline: none; } -.workfill-list-wrap li:nth-of-type(1) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(1) .workfill-list-btn{ background-color: #fedee5; color: #f94c6e; } -.workfill-list-wrap li:nth-of-type(2) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(2) .workfill-list-btn{ background-color: #fef0db; color: #fead39; } -.workfill-list-wrap li:nth-of-type(3) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(3) .workfill-list-btn{ background-color: #dbe7fe; color: #4886ff; } -.workfill-list-wrap li:nth-of-type(4) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(4) .workfill-list-btn{ background-color: #98c74b; color: #f1fae2; } -.workfill-list-wrap li:nth-of-type(5) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(5) .workfill-list-btn{ background-color: #f5f2fe; color: #714cf9; } -.workfill-list-wrap li:nth-of-type(6) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(6) .workfill-list-btn{ background-color: #fbf8e0; color: #f7e124; } -.workfill-list-wrap li:nth-of-type(7) .workfill-list-btn{ +.workquery-list-wrap>li:nth-of-type(7) .workfill-list-btn{ background-color: #bde7fe; color: #6297fe; } @@ -102,15 +102,14 @@ padding: 20px 20px; } .workfill-list-projectnamewrap{ - border: 1px solid #f0f1f9; - height: 64px; - padding: 24px 20px 0; - margin: 20px 0 19px; + /* height: 64px; */ + min-width: 120px; + /* padding: 24px 20px 0; */ + /* margin: 20px 0 19px; */ font-size: 16px; color: #363d5d; - position: relative; } -.workfill-list-projectnamewrap:before{ +/*.workfill-list-projectnamewrap:before{ content: ''; position: absolute; width: 30px; @@ -142,10 +141,10 @@ .workfill-list-projectname{ -} +}*/ .workfill-projectCon{ - top: 22px; - left: 19px; + /*top: 22px;*/ + /*left: 19px;*/ width: 205px; height: 34px; } @@ -159,4 +158,164 @@ left:180px !important;; margin-top: -2px; vertical-align: middle; -} \ No newline at end of file +} + +/*----------------------------------------列表*/ +.workquery-list-wrap>li{ + margin-bottom: 15px; +} +.workquery-list-wrap>li:nth-of-type(7n+1) .workquery-list-title{ + border-left: 2px solid #f94c6e; +} +.workquery-list-wrap>li:nth-of-type(7n+2) .workquery-list-title{ + border-left: 2px solid #fead39; +} +.workquery-list-wrap>li:nth-of-type(7n+3) .workquery-list-title{ + border-left: 2px solid #4886ff; +} +.workquery-list-wrap>li:nth-of-type(7n+4) .workquery-list-title{ + border-left: 2px solid #98c74b; +} +.workquery-list-wrap>li:nth-of-type(7n+5) .workquery-list-title{ + border-left: 2px solid #714cf9; +} +.workquery-list-wrap>li:nth-of-type(7n+6) .workquery-list-title{ + border-left: 2px solid #f7e124; +} +.workquery-list-wrap>li:nth-of-type(7n+7) .workquery-list-title{ + border-left: 2px solid #6297fe; +} + +.workquery-list-wrap>li:nth-of-type(7n+1) .commited-icon{ + background: url("../../resource/img/commited-icon-1.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+2) .commited-icon{ + background: url("../../resource/img/commited-icon-2.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+3) .commited-icon{ + background: url("../../resource/img/commited-icon-3.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+4) .commited-icon{ + background: url("../../resource/img/commited-icon-4.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+5) .commited-icon{ + background: url("../../resource/img/commited-icon-5.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+6) .commited-icon{ + background: url("../../resource/img/commited-icon-6.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+7) .commited-icon{ + background: url("../../resource/img/commited-icon-7.png") no-repeat 0 center; +} + + + +.workquery-list-wrap>li:nth-of-type(7n+1) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-1.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+2) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-2.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+3) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-3.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+4) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-4.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+5) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-5.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+6) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-6.png") no-repeat 0 center; +} +.workquery-list-wrap>li:nth-of-type(7n+7) .nocommited-icon{ + background: url("../../resource/img/nocommited-icon-7.png") no-repeat 0 center; +} + +.workquery-list-title{ + cursor: pointer; + height: 64px; + line-height: 64px; + background-color: #fff; + border-radius: 4px; + overflow: hidden; +} +.workquery-list-title>li{ + float: left; +} +.workquery-list-title li:nth-of-type(1){ + width: 300px; + font-size: 18px; + color: #363d5d; + padding-left: 80px; + background: url("../../resource/img/circle-icon.png") no-repeat 60px center; +} +.workquery-list-title li:nth-of-type(2){ + width: 700px; + padding-left: 40px; + font-size: 18px; + color: #363d5d; +} +.workquery-list-title li:nth-of-type(3){ + width: 150px; + text-align: right; + font-size: 14px; + color: rgba(0,0,0,.5); +} +.slide-icon{ + width: 25px; + text-align: right; + background: url("../../resource/img/arrow-up.png") no-repeat center center; +} +.slide-icon-active{ + background: url("../../resource/img/arrow-down.png") no-repeat center center; +} +.workquery-list-container{ + margin-top: 5px; +} +.workquery-list-container>li{ + height: 200px; + border-bottom: 1px solid #f0f1f9; + background-color: #fff; +} +.workquery-list-main{ + height: 200px; + padding: 20px 50px 20px 80px; +} +.workquery-list-main>li{ + float: left; +} +.workquery-list-main>li:nth-of-type(1){ + width: 100%; + height: 50px; + font-size: 14px; + color: #363d5d; +} +.workquery-list-main>li:nth-of-type(2){ + width: 100%; + height: 100px; + font-size: 14px; + color: rgba(0,0,0,.45); + border: 1px solid #f0f1f9; + padding: 15px 15px; + overflow-y: auto; + line-height: 26px; +} +.workquery-list-main>li:nth-of-type(3){ + width: 150px; + height: 142px; + line-height: 142px; + font-size: 14px; + color: #363d5d; +} +.workquery-list-main>li:nth-of-type(4){ + width: 730px; + height: 90px; + line-height: 24px; + padding: 10px 15px; + margin-top: 26px; + font-size: 12px; + color: rgba(0,0,0,.5); + border: 1px solid #f0f1f9; + overflow-y: auto; +} diff --git a/topages/workfill/workfill.html b/topages/workfill/workfill.html index c0c786c..276fdeb 100644 --- a/topages/workfill/workfill.html +++ b/topages/workfill/workfill.html @@ -9,129 +9,354 @@
- + - + + + + -
  • -
    - 周五 - -
    -
    -
    - + +
    + +
    + +
    • +
  • 取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价
    • - - - - -
    + + -
    + + + + -
  • -
    - 周六 - -
    -
    -
    - + +
    + +
    + +
    • +
  • 取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价
    • - - - - -
    + + -
    + + + + -
  • -
    - 周日 - -
    -
    -
    - + +
    + +
    + +
    • +
  • 取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价
    • - - - - -
    + + -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +