dedsudiyu 1 周之前
父节点
当前提交
6af0c78997
共有 1 个文件被更改,包括 23 次插入19 次删除
  1. 23 19
      src/views/newSafetyOverview/pageComponent/laboratoryData.vue

+ 23 - 19
src/views/newSafetyOverview/pageComponent/laboratoryData.vue

@@ -63,24 +63,24 @@
       </div>
       <div class="bottom-box">
         <div class="bottom-min-box">
-          <!--<p class="left-p">{{bottomDataName1}}:</p>-->
-          <p class="left-p">科研类:</p>
-          <p style="width:65px;color:#0183FA;text-align: right;line-height:50px;">- -</p>
-          <!--<dv-digital-flop :config="bottomDataTotal1" class="dvDigitalFlop"/>-->
+          <!--<p class="left-p">科研类:</p>-->
+          <!--<p style="width:65px;color:#0183FA;text-align: right;line-height:50px;">- -</p>-->
+          <p class="left-p">{{bottomDataName1}}:</p>
+          <dv-digital-flop :config="bottomDataTotal1" class="dvDigitalFlop"/>
           <p class="right-p">间</p>
         </div>
         <div class="bottom-min-box">
-          <!--<p class="left-p">{{bottomDataName2}}:</p>-->
-          <p class="left-p">教学类:</p>
-          <p style="width:65px;color:#25D748;text-align: right;line-height:50px;">- -</p>
-          <!--<dv-digital-flop :config="bottomDataTotal2" class="dvDigitalFlop"/>-->
+          <!--<p class="left-p">教学类:</p>-->
+          <!--<p style="width:65px;color:#25D748;text-align: right;line-height:50px;">- -</p>-->
+          <p class="left-p">{{bottomDataName2}}:</p>
+          <dv-digital-flop :config="bottomDataTotal2" class="dvDigitalFlop"/>
           <p class="right-p">间</p>
         </div>
         <div class="bottom-min-box">
-          <!--<p class="left-p">{{bottomDataName3}}:</p>-->
-          <p class="left-p">公共平台:</p>
-          <p style="width:65px;color:#00FFFF;text-align: right;line-height:50px;">- -</p>
-          <!--<dv-digital-flop :config="bottomDataTotal3" class="dvDigitalFlop"/>-->
+          <!--<p class="left-p">公共平台:</p>-->
+          <!--<p style="width:65px;color:#00FFFF;text-align: right;line-height:50px;">- -</p>-->
+          <p class="left-p">{{bottomDataName3}}:</p>
+          <dv-digital-flop :config="bottomDataTotal3" class="dvDigitalFlop"/>
           <p class="right-p">间</p>
         </div>
       </div>
@@ -195,7 +195,6 @@
     style: {
       fill: '#0183FA',
       fontSize: 16,
-      fontWeight: 65,
       fontFamily: 'AlimamaShuHeiTi',
       gradientParams: [0, 0, 0, 20]
     }
@@ -206,7 +205,6 @@
     style: {
       fill: '#25D748',
       fontSize: 16,
-      fontWeight: 65,
       fontFamily: 'AlimamaShuHeiTi',
       gradientParams: [0, 0, 0, 20]
     }
@@ -217,7 +215,6 @@
     style: {
       fill: '#00FFFF',
       fontSize: 16,
-      fontWeight: 65,
       fontFamily: 'AlimamaShuHeiTi',
       gradientParams: [0, 0, 0, 20]
     }
@@ -777,18 +774,25 @@
           background-size: 100%;
           display: flex;
           .left-p{
+            margin-left:14px;
             font-size:14px;
             color:#fff;
-            text-align: right;
+            text-align: left;
+            line-height: 50px;
+            /*width:80px;*/
+            flex:1;
+          }
+          .dvDigitalFlop {
             line-height: 50px;
-            width:80px;
+            height: 40px;
+            width: 50px;
           }
           .right-p{
             font-size:14px;
             color:#fff;
             line-height: 50px;
-            width:27px;
-            margin-left:10px;
+            width:24px;
+            margin-left:5px;
           }
         }
       }