Quellcode durchsuchen

Merge remote-tracking branch 'origin/uiUptate0629' into testNew

# Conflicts:
#	src/css/cdssHorizontal.less
zhouna vor 3 Jahren
Ursprung
Commit
82be5f2111
3 geänderte Dateien mit 13 neuen und 3 gelöschten Zeilen
  1. 6 2
      src/css/cdssHorizontal.less
  2. 6 1
      src/html/smartAlert.html
  3. 1 0
      src/js/smartAlert.js

+ 6 - 2
src/css/cdssHorizontal.less

@@ -297,7 +297,7 @@
   line-height: 21px;
   color: @bgcBlue;
   right: 5px;
-  bottom: -3px;
+  bottom: -4px;
   font-size: 12px;
 }
 .longStrBox {
@@ -398,13 +398,17 @@
   cursor: pointer;
   color: @bgcBlue;
   right: 0px;
-  bottom: 4px;
+  bottom: 0;
   background: #fff;
 }
 .generalTreatInfo {
   position: relative;
   padding: 0 28px 0 0;
   color: @fontColor;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  overflow: hidden;
   ol li {
     list-style: decimal;
     list-style-position: inside;

+ 6 - 1
src/html/smartAlert.html

@@ -33,6 +33,11 @@
       height: 60px;
       line-height: 60px;
     }
+    .titleH1 img{
+      vertical-align: middle;
+      margin-right: 4px;
+      margin-bottom: 3px;
+    }
     .content{
       padding:20px 0 0 60px;
     }
@@ -78,7 +83,7 @@
 
 <body>
   <div class="container">
-    <h1 class="titleH1">智能警示</h1>
+    <h1 class="titleH1"><img src="../images/icon_warn1.png" alt="">智能警示</h1>
     <div class="content">
 
     </div>

+ 1 - 0
src/js/smartAlert.js

@@ -1,6 +1,7 @@
 const $ = require("jquery");
 const { post,config,getUrlArgObject } = require('./promise.js');
 require('./../images/dot.png').replace(/^undefined/g, '')
+require('./../images/icon_warn1.png').replace(/^undefined/g, '')
 let mrId = getUrlArgObject('mrId')
 let hospitalIdUrl = getUrlArgObject('hospitalId') || ''
 const codes = getUrlArgObject('codes') || ''