Merge branch 'test' into dev_zxc

src/css/console.less

@@ -98,7 +98,7 @@
     border-radius: 4px;
     overflow: hidden;
     cursor: pointer;
-    margin-top: 6px;
+    margin-top: 7px;
     span {
       width: 48px;
       height: 28px;

src/css/index.less

@@ -135,7 +135,7 @@
   margin-left:@menuWt;
   height: 100%;
   border: 10px solid #f5f5f5;
-  iframe{
+  iframe {
     width: 100%;
     height: 100%;
   }

src/css/qcList.less

@@ -44,4 +44,56 @@ table{
 }
 .pageNum, .more{
     margin: 0 20px 0 0;
+}
+
+
+
+.ui-datepicker-calendar {
+    border: 0 none;
+}
+.ui-datepicker thead {
+    background-color: #fff;
+    color: #c3cbd6;
+}
+.ui-datepicker td {
+    padding: 0;
+    height: auto;
+    color: #657180;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    border: 0;
+    background-color: #fff;
+    &:hover {
+        background-color: #c4d8fe;
+    }
+}
+.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    color: #333;
+    font-weight: normal;
+    height: 30px;
+    line-height: 30px;
+    margin: 0 5px;
+    width: 40%;
+    border-radius: 3px;
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
+    top: 5px;
+}
+.ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #5a8eee !important;
+    color: #fff;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #fff5bf !important;
+    color: #657180;
+}
+.ui-widget-header {
+    background-color: #fff;
+    border: 0 none;
 }

src/js/console.js

@@ -284,6 +284,9 @@ function barChart(dataX,dataY){
 function emptyCircle(data){
     if(!data||data.length == 0)return
     var myChart = echarts.init(document.getElementById('emptyCircle'));
+    $(window).resize(function(){
+        myChart.resize()
+    });
     let bgColor = '#fff';
     let title = '总量';
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];

src/js/login.js

@@ -3,32 +3,46 @@ require("../css/reset.less")
 require("../css/login.less")
 require("./modal.js")
 const {post,setCookie,delCookie} = require('../js/utils.js');
-const url = '/sys/user/getJwt';
 const md5 = require('js-md5');
 $(function(){
   delCookie('accessToken')
+  $(document).keyup(function(event){  
+    if(event.keyCode ==13){  
+      sureLogin()
+    }  
+  }); 
   $(".sureLogin").click(()=>{
-    let username = $("#username").val();
-    let password = md5($("#password").val());
-    $.alerModal({type:"loading"});
-    post(url,{
-      username:username,
-      password:password
-    }).then((res)=>{
-      const data = res.data;
-      if(data.code == 0){
-        setCookie('accessToken',data.data.accessToken)
-        $(".divModal").remove()
-        $.alerModal({"message":"登录成功",type:"tip",time:'1000'});
-        setTimeout(() => {
-          window.location.href = '/index.html'
-        }, 1000);
-      }else{
-        $(".divModal").remove()
-        $(".login .waring").css('display','block').html(data.msg)
-      }
-    }).catch(()=>{
-      $(".divModal").remove()
-    })
+    sureLogin()
   })
 });
+function sureLogin(){
+  let username = $("#username").val().trim();
+  let password = $("#password").val().trim();
+  if(!username){
+    $(".login .waring").css('display','block').html('请输入用户名')
+    return
+  }else if(!password){
+    $(".login .waring").css('display','block').html('请输入密码')
+    return
+  }
+  $.alerModal({type:"loading"});
+  post('/sys/user/getJwt',{
+    username:username,
+    password:md5(password)
+  }).then((res)=>{
+    const data = res.data;
+    if(data.code == 0){
+      setCookie('accessToken',data.data.accessToken)
+      $(".divModal").remove()
+      $.alerModal({"message":"登录成功",type:"tip",time:'1000'});
+      setTimeout(() => {
+        window.location.href = '/index.html'
+      }, 600);
+    }else{
+      $(".divModal").remove()
+      $(".login .waring").css('display','block').html(data.msg)
+    }
+  }).catch(()=>{
+    $(".divModal").remove()
+  })
+}

src/js/qcList.js

@@ -4,6 +4,9 @@ require("../css/qcList.less");
 // require("./../resource/My97DatePicker/skin/WdatePicker.css")
 const {api} = require('./api.js')
 const {post} = require('./utils.js')
+require('./../resource/jquery-ui/jquery-ui.min.js');
+require('./../resource/jquery-ui/jquery-ui.min.css');
+require('./../resource/layui/css/layui.css');
 
 let tabList
 
@@ -105,3 +108,47 @@ function recordScore(behospitalCode){
     })
 }
 
+
+$(function() {
+    $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    });
+});
+
+$((function($){
+})($));