6630/6590

src/components/DiagnosticList/index.less

@@ -140,12 +140,19 @@
     top: 15px;
 }
 .del-msg {
-    height: 70px;
+    height: 72px;
     width: 100%;
     text-align: center;
     font-size: 16px;
     color: #000000;
-    line-height: 16px;
+    line-height: 18px;
+    margin-bottom: 10px;
+
+    text-overflow: ellipsis;
+    display:-webkit-box; //作为弹性伸缩盒子模型显示。
+    -webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+    -webkit-line-clamp:4; //显示的行
+    overflow: hidden;
 }
 .diag-up, .diag-down, .diag-del {
     width: 20px;

src/store/reducers/newAdvice.js

@@ -86,6 +86,7 @@ export default (state = initSearchList, action) => {
     if (action.type == SELECTJITYPE) {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
+        console.log(tempArr)
         for(let i = 0;i < tempArr.length;i++){
             if(action.idx == i){
                 tempArr[i].selectShow = false

src/utils/config.js

@@ -17,7 +17,8 @@ const imageUrlPrefix = 'http://192.168.2.241:82';
 function geturl(){
     if(window.location.href.indexOf('localhost')>-1){
         return {
-            gourl:'http://localhost:8083/cdss.html',
+            // gourl:'http://localhost:8083/cdss.html',
+            gourl:'http://192.168.2.241:5654/cdss.html',
             imgurl:host.replace('6060','22')
         }
     }else if(window.location.href.indexOf('192.168.2.236')>-1){

src/utils/tools.js

@@ -971,7 +971,7 @@ function getEMRParams(){
       if(curHos.hosId != -1){
         item.uniqueName = ''
       }
-      item.name = (item.name+(item.form||''))
+      item.name = (item.uniqueName+(item.form||''))
       return item
     }
   })
@@ -980,7 +980,7 @@ function getEMRParams(){
       if(curHos.hosId != -1){
         item.uniqueName = ''
       }
-      item.name = (item.name+(item.form||''))
+      item.name = (item.uniqueName+(item.form||''))
       return item
   })
   let tempoperation = newAdvice.labelListSmall