首页排版

src/css/console.less

@@ -1,12 +1,10 @@
 .echarts {
-  width: 50%;
+  width: 100%;
   height: 500px;
-  float: left;
 }
 .barChartPay {
-  width: 50%;
+  width: 100%;
   height: 500px;
-  float: left;
 }
 .emptyCircle {
   width: 50%;
@@ -53,12 +51,24 @@
       }
     }
   }
+  
+  .title {
+    font-size: 16px;
+    font-weight: bold;
+    border-bottom: 1px solid #E2E5EF;
+    height: 44px;
+    line-height: 44px;
+    padding-left: 15px;
+  }
 }
 .swiperWrap {
   width: 300px;
   border: 1px solid #ccc;
 }
-
+.grayLine {
+  height: 10px;
+  background-color: #f5f5f5;
+}
 .partTitle {
   height: 44px;
   line-height: 44px;
@@ -67,10 +77,65 @@
   font-size: 14px;
   font-weight: bold;
   letter-spacing: 1px;
+  box-sizing: border-box;
 }
+.pubEchart {
+  width: 50%;
+  display: inline-block;
+  border-bottom: 10px solid #f5f5f5;
 
+}
 .paymoney {
-  .title {
-    font-size: 16px;
+  border-right: 5px solid #f5f5f5;
+  box-sizing: border-box;
+}
+.dept {
+  border-left: 5px solid #f5f5f5;
+  box-sizing: border-box;
+}
+.defect {
+  border-bottom: 10px solid #f5f5f5;
+  border-right: 5px solid #f5f5f5;
+  box-sizing: border-box;
+  width: 40%;
+  display: inline-block;
+  height: 455px;
+  overflow: hidden;
+  .list {
+    padding: 20px 30px;
+    width: 100%;
+    box-sizing: border-box;
+    overflow: auto;
+  }
+  .qtable {
+    width: 100%;
+  }
+  td {
+    padding: 8px 15px;
+  }
+  .td01 {
+    width: 40px;
   }
+  .td02 {
+    
+  }
+  .td03 {
+    width: 40px;
+  }
+  .td04 {
+    width: 40px;
+  }
+}
+.circle {
+  height: 455px;
+  width: 60%;
+  display: inline-block;
+  border-bottom: 10px solid #f5f5f5;
+  border-left: 5px solid #f5f5f5;
+  box-sizing: border-box;
+  margin-bottom: 60px;
+}
+.btmWrap {
+  width: 100%;
+  overflow: hidden;
 }

src/css/index.less

@@ -126,7 +126,7 @@
   }
 }
 .main{
-  margin-left:201px;
+  margin-left:@menuWt;
   height: 100%;
   iframe{
     width: 100%;

src/html/console.html

@@ -22,13 +22,84 @@
           <div class="swiper-slide"> Slide6</div>
       </div>
     </div> -->
-    <br><br>
-    <div class="paymoney">
+    <div class="grayLine"></div>
+    <div class="pubEchart paymoney">
+      <p class="title">死亡疑难危重症占比</p>
+      <div id="barChartPay" class="barChartPay"></div>
+    </div>
+    <div class="pubEchart dept">
       <p class="title">死亡疑难危重症占比</p>
       <div id="barChart" class="echarts"></div>
     </div>
-    <div id="barChartPay" class="barChartPay"></div>
-    <div id="emptyCircle" class="emptyCircle"></div>
+    
+    <div class="btmWrap">
+      <div class="defect fl">
+        <p class="title">缺陷排行列表</p>
+        <div class="list">
+          <table class="qtable">
+            <tr class="thead">
+              <td class="td01">排名</td>
+              <td class="td02">缺陷名称</td>
+              <td class="td03">数量</td>
+              <td class="td04">占比</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+            <tr>
+              <td>1</td>
+              <td>主诉超过20个字</td>
+              <td>56</td>
+              <td>40%</td>
+            </tr>
+          </table>
+        </div>
+      </div>
+      <div class="circle">
+        <p class="title">各科室缺陷占比</p>
+        <div id="emptyCircle" class="emptyCircle"></div>
+      </div>
+    </div>
+    <br><br><br>
   </div>
   <script src="./resource/swiper.min.js"></script>
 </body>

src/js/console.js

@@ -27,7 +27,13 @@ function initConsole(){
         '本月甲级病历-机器':require("../images/icon8.png"),
         '本月乙级病历-机器':require("../images/icon9.png")
     }
-    post('/console/mrStatistics').then((res)=>{
+    post('/console/mrStatistics',{
+        // "endDate": "string",
+        // "hospitalId": "string",
+        // "limitCount": 0,
+        // "startDate": "string",
+        "type": 1//1月2年
+    }).then((res)=>{
         let data = res.data;
         if(data.code == 0){
           let result = data.data

src/js/login.js

@@ -18,7 +18,6 @@ $(function(){
       const data = res.data;
       if(data.code == 0){
         setCookie('accessToken',data.data.accessToken)
-        setCookie('username',username)
         $(".divModal").remove()
         $.alerModal({"message":"登录成功",type:"tip",time:'1000'});
         setTimeout(() => {