Browse Source

化验公表项名称过长时处理(2502)

zhangxc 5 years ago
parent
commit
1ff5ddc0fd

+ 4 - 1
src/components/diagBase/DiagBase.vue

@@ -47,7 +47,7 @@
                     :resizable = "false"
                     label="校验数据">
                     <template slot-scope="scope" >
-                        <span :class="scope.row.hasQuestion == '0' ? '': 'hsaQuestion'">
+                        <span :class="scope.row.hasQuestion == '0' ? '': scope.row.hasQuestion == '1'? 'hsaQuestion' :scope.row.hasQuestion == '2'?'hasTemp':''">
                             {{scope.row.hasQuestion == "0" ? "无问题词" : scope.row.hasQuestion == "1"? "有问题词":scope.row.hasQuestion == "2"?"暂存数据":""}}
                         </span>
                     </template>
@@ -320,4 +320,7 @@ export default {
     .hsaQuestion {
         color: red;
     }
+    .hasTemp{
+      color: blue;
+    }
 </style>

+ 2 - 2
src/components/icss/AddChemicalAndCommonMapping.vue

@@ -359,7 +359,7 @@
     .leftBox , .midBox, .rightBox{
         width: 40%;
         float: left;
-        height: 200px;
+        min-height: 200px;
         font-size: 14px;
     }
     .midBox {
@@ -380,7 +380,7 @@
     }
     .itemLabel {
         width: 100%;
-        height: 50px;
+        min-height: 50px;
         line-height: 50px;
         position: relative;
     }

+ 1 - 1
src/components/medicalStatistics/MedicalStatistics.vue

@@ -5,7 +5,7 @@
         <div class="contents">
             <div class="contentBox">
                 <div class="headerBox">
-                    <span>当前数据更新时间:{{updateTime}}</span>
+                    <span v-show="updateTime">当前数据更新时间:{{updateTime}}</span>
                     <el-button
                         class="btn"
                         size="mini"