Browse Source

Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

luolei 5 years ago
parent
commit
7781a94e54

+ 1 - 1
src/css/console.less

@@ -302,7 +302,7 @@ body.console {
       width: 100%;
       overflow: auto;
       .thead{
-        background: #142753;
+        background: #192D5B;
         padding: 1px 0;
       }
     }

+ 8 - 1
src/css/index.less

@@ -218,12 +218,13 @@
     .copy-right{
       position: fixed;
       bottom: 0px;
-      width: @menuWt;
+      width: @menuWt+(-1px);
       text-align: center;
       height: 50px;
       line-height: 50px;
       background: @themeColor;
       border-top: 1px @themeBorderClr solid;
+      border-right: 1px rgba(74, 93, 142, 0.5) solid;
       p{
         font-size:12px;
         opacity: .3;
@@ -409,6 +410,9 @@
         line-height: 40px;
         border-radius: 2px;
         padding: 0 10px;
+        &:focus{
+          border-color: @activeColor;
+        }
       }
     }
     .itemMsgLab{
@@ -493,6 +497,9 @@
         line-height: 40px;
         border-radius: 2px;
         padding: 0 10px;
+        &:focus{
+          border-color: @activeColor;
+        }
       }
     }
     .itemMsgLab{

+ 12 - 3
src/css/login.less

@@ -29,12 +29,12 @@ body {
   }
 }
 p.title {
-  font-size: 28px;
+  font-size: 30px;
   color: #fff;
   font-weight: bold;
   position: absolute;
   top: 90px;
-  left: 50px;
+  left: 5%;
 }
   .message {
     width: 38%;
@@ -51,11 +51,20 @@ p.title {
       margin-left: -150px;
     }
     .welcome {
-      font-size: 20px;
+      font-size: 30px;
       font-weight: bold;
       color: #fff;
       margin-bottom: 50px;
     }
+    .copy-right{
+      position: absolute;
+      bottom: 50px;
+      width: 100%;
+      font-size:12px;
+      text-align: center;
+      color: #fff;
+      opacity: .6;
+    }
   }
   .perPub {
     width: 300px;

+ 1 - 1
src/html/deptScoreDetail.html

@@ -29,7 +29,7 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入医生名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室:</span>
+                    <span style="overflow:hidden">科室名称:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 1 - 0
src/html/login.html

@@ -38,6 +38,7 @@
           <p class="waring"></p>
           <div class="sureLogin">登录</div>
         </div>
+        <div class="copy-right">由杭州朗通信息技术有限公司提供技术支持</div>
       </div>
     <!--</div>-->
   </div>

BIN
src/images/btn_open.png


+ 13 - 6
src/js/console.js

@@ -398,7 +398,7 @@ function part02pan(data,dom){
     });
     let bgColor = '#fff';
     let title = '总量';
-    let color = ['#37CBCB','#dedede'];
+    let color = ['#3fffd1','#4c5c82'];
     let echartData = data;
     option = {
         //backgroundColor: bgColor,
@@ -410,9 +410,9 @@ function part02pan(data,dom){
             textStyle: {
                 rich: {
                     val: {
-                        fontSize: 14,
+                        fontSize: 12,
                         color: '#fff',
-                        fontWeight: 'bold',
+                        /*fontWeight: 'bold',*/
                         padding: [10, 0]
                     },
                     name: {
@@ -426,9 +426,16 @@ function part02pan(data,dom){
         series: [{
             name: '',
             type: 'pie',
-            radius: ['70%', '90%'],
+            radius: ['65%', '95%'],
             data: echartData,
-            hoverAnimation:false,
+            hoverAnimation:true,
+            hoverOffset:3,
+            itemStyle: {
+              normal: {
+                borderColor: '#203463',
+                borderWidth: 3
+              }
+            },
             label: {
                 normal: {
                     show:false,
@@ -826,7 +833,7 @@ function barChart(data,type){
         data3.push(data[i].lastYearAverageValue)//去年本月
     }
     option = {
-        color: ['#00A1FF', '#FAD336', '#37CBCB'],
+        color: ['#37CBCB','#5A8EEE', '#FAD336' ],
         tooltip: {
             trigger: 'axis',
             axisPointer: {