李扬

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddataController.java

@@ -52,7 +52,7 @@ public class TDashboarddataController extends BaseController
     public AjaxResult selectLast(TDashboarddata tDashboarddata)
     {
         TDashboarddata dashboarddata = tDashboarddataService.selectLast(tDashboarddata);
-        logger.info("dashboarddata:" + dashboarddata);
+//        logger.info("dashboarddata:" + dashboarddata);
         return AjaxResult.success(dashboarddata);
     }
 

ui/src/views/front/ethyleneTank.vue

@@ -13,15 +13,15 @@
         </div>
       </div>
       <div style="text-align: center;">
-        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
+        <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
+        <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
+        <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
+        <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
+        <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
       </div>
     </div>

ui/src/views/front/napTank.vue

@@ -36,7 +36,6 @@ export default {
     height: 220px;
     border-radius: 0.0625rem;
     .bg-color-black {
-      height: 2.5rem;
       border-radius: 0.125rem;
     }
     .text {

ui/src/views/sems/specanalysis/ApproveChart.vue

@@ -27,7 +27,7 @@ import {devApproveData} from "@/api/sems/home";
       },
       height: {
         type: String,
-        default: '150px'
+        default: '1.7rem'
       }
     },
     data() {
@@ -157,6 +157,7 @@ import {devApproveData} from "@/api/sems/home";
     margin: 0 0 0 10px;
     cursor: pointer;  /*鼠标悬停变小手*/
     color: #ffffff;
+    font-size: 12px;
   }
   p:hover {
     background-color: #296b9bb5;

ui/src/views/sems/specanalysis/BoilerChart.vue

@@ -172,7 +172,7 @@ export default {
           {
             name: this.$t('internalInspection'),
             type: 'bar',
-            barWidth: 20,
+            barWidth: 28,
             itemStyle: {
               normal: {
                 barBorderRadius: [5, 5, 0, 0],//柱状图圆弧角度
@@ -184,7 +184,7 @@ export default {
           {
             name: this.$t('externalInspection'),
             type: 'bar',
-            barWidth: 20,
+            barWidth: 28,
             itemStyle: {
               normal: {
                 barBorderRadius: [5, 5, 0, 0],

ui/src/views/sems/specanalysis/LiftChart.vue

@@ -254,10 +254,10 @@ export default {
           {
             name: this.$t('叉车'),
             type: 'bar',
-            barWidth: 20,
+            barWidth: 28,
             itemStyle: {
               normal: {
-                barBorderRadius: [0, 0, 0, 0],
+                barBorderRadius: [5, 5, 0, 0],
               }
             },
             stack: this.$t('devTotalChart'),

ui/src/views/sems/specanalysis/PpChart.vue

@@ -170,10 +170,10 @@ export default {
           {
             name: this.$t('ppTotalChart'),
             type: 'bar',
-            barWidth: 40,
+            barWidth: 28,
             itemStyle: {
               normal: {
-                barBorderRadius: [9, 9, 0, 0],
+                barBorderRadius: [5, 5, 0, 0],
               }
             },
             stack: this.$t('ppTotalChart'),

ui/src/views/sems/specanalysis/PvChart.vue

@@ -170,10 +170,10 @@ export default {
           {
             name: this.$t('devTotalChart'),
             type: 'bar',
-            barWidth: 40,
+            barWidth: 28,
             itemStyle: {
               normal: {
-                barBorderRadius: [9, 9, 0, 0],
+                barBorderRadius: [5, 5, 0, 0],
               }
             },
             stack: this.$t('devTotalChart'),

ui/src/views/sems/specanalysis/centerChart.vue

@@ -27,7 +27,7 @@ import {listUnNotice} from "@/api/system/notice";
       },
       height: {
         type: String,
-        default: '150px'
+        default: '1.7rem'
       }
     },
     data() {
@@ -160,6 +160,7 @@ import {listUnNotice} from "@/api/system/notice";
     margin: 0 0 0 10px;
     cursor: pointer;  /*鼠标悬停变小手*/
     color: #ffffff;
+    font-size: 12px;
   }
   p:hover {
     background-color: #296b9bb5;

ui/src/views/sems/specanalysis/index.vue

@@ -30,13 +30,13 @@
         </div>
         <div>
           <div class="topElevator">
-            <div class="bg-color-spec">
-              <div style="float: left">
+            <div class="bg-color-spec other-text">
+              <div>
                 <svg-icon icon-class="boiler"
                           style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
-                <div style="font-size: 14px; color: #5470c6; font-weight:bold">{{ $t('锅炉') }}</div>
+              <div style="margin-left: 0.2rem; margin-top: 0.2rem">
+                <div class="en-spec-text" style="color: #5470c6;">{{ $t('锅炉') }}</div>
                 <div class="specFont">{{ devDatas.glData.glAll_num }}<span
                   style="font-size: 12px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
               </div>
@@ -45,13 +45,13 @@
         </div>
         <div>
           <div class="topElevator">
-            <div class="bg-color-spec">
-              <div style="float: left">
+            <div class="bg-color-spec other-text">
+              <div>
                 <svg-icon icon-class="vessel"
                           style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: right; margin-left: 0.2rem; margin-top: 0.3rem">
-                <div style="font-size: 12px; color: #92D050; font-weight:bold">{{ $t('压力容器') }}</div>
+              <div style=" margin-left: 0.2rem; margin-top: 0.2rem">
+                <div class="en-spec-text" style="color: #92D050;">{{ $t('压力容器') }}</div>
                 <div class="specFont">{{ devDatas.ylrqData.ylrqAll_num }}<span
                   style="font-size: 12px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
               </div>
@@ -60,13 +60,13 @@
         </div>
         <div>
           <div class="topElevator">
-            <div class="bg-color-spec">
-              <div style="float: left">
+            <div class="bg-color-spec other-text">
+              <div>
                 <svg-icon icon-class="pipe"
                           style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
-                <div style="font-size: 14px; color: #e4da3a; font-weight:bold">{{ $t('压力管道') }}</div>
+              <div style="margin-left: 0.2rem; margin-top: 0.2rem">
+                <div class="en-spec-text" style="color: #e4da3a;">{{ $t('压力管道') }}</div>
                 <div class="specFontSmall"><span style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('设备数') }}</span>{{
                     devDatas.ylgdData.ylgdAll_num
                   }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('条') }}</span></div>
@@ -78,13 +78,13 @@
         </div>
         <div>
           <div class="topElevator">
-            <div class="bg-color-spec">
-              <div style="float: left">
+            <div class="bg-color-spec other-text">
+              <div>
                 <svg-icon icon-class="forklift"
                           style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
-                <div style="font-size: 14px; color: #5470c6; font-weight:bold">{{ $t('叉车') }}</div>
+              <div style="margin-left: 0.2rem; margin-top: 0.2rem">
+                <div class="en-spec-text" style="color: #5470c6;">{{ $t('叉车') }}</div>
                 <div class="specFont">{{ devDatas.ccData.ccAll_num }}<span
                   style="font-size: 10px; color: #4a7d87; margin-left: 0.05rem">{{ $t('辆') }}</span></div>
               </div>
@@ -93,36 +93,37 @@
         </div>
         <div>
           <div class="topElevator">
-            <div class="bg-color-spec">
-              <div style="float: left">
+            <div class="bg-color-spec other-text">
+              <div>
                 <svg-icon icon-class="machinery"
                           style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: right;margin-top: 0.3rem">
-                <div style="font-size: 12px; color: #92D050; font-weight:bold">{{ $t('起重机械') }}</div>
-              </div>
-              <div style="float: right">
-                <div style="margin-top: 0.1rem" class="specFontSmall"><span
-                  style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('特种设备2') }}</span>{{
-                    devDatas.dzsbData.dzsbAll_num
-                  }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
-                <div style="margin-top: 0.1rem" class="specFontSmall"><span
-                  style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('非特种设备') }}</span>{{
-                    devDatas.dzsbData.dzsbUn_num
-                  }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
+              <div style="margin-left: 0.2rem;margin-top: 0.2rem">
+                <div class="en-spec-text" style="color: #92D050;">{{ $t('起重机械') }}</div>
+
+                  <div class="specFontSmall"><span
+                    style="font-size: 10px; color: #4a7d87;">{{ $t('特种设备2') }}</span>{{
+                      devDatas.dzsbData.dzsbAll_num
+                    }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
+                  <div class="specFontSmall"><span
+                    style="font-size: 10px; color: #4a7d87;">{{ $t('非特种设备') }}</span>{{
+                      devDatas.dzsbData.dzsbUn_num
+                    }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
+
               </div>
+
             </div>
           </div>
         </div>
         <div>
           <div class="topElevator">
-            <div class="bg-color-spec">
-              <div style="float: left">
+            <div class="bg-color-spec other-text">
+              <div>
                 <svg-icon icon-class="elevator"
                           style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
-                <div style="font-size: 14px; color: #e4da3a; font-weight:bold">{{ $t('电梯') }}</div>
+              <div style="margin-left: 0.2rem; margin-top: 0.2rem">
+                <div class="en-spec-text" style="color: #e4da3a;">{{ $t('电梯') }}</div>
                 <div class="specFont">{{ devDatas.dtData.dtAll_num }}<span
                   style="font-size: 12px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
               </div>
@@ -475,6 +476,10 @@ export default {
     height: 1.5rem;
     border-radius: 0.125rem;
     /*border: 4px solid #8ea3ea;*/
+    &.other-text{
+      display: flex;
+      flex-direction: row;
+    }
   }
 }
 
@@ -499,6 +504,10 @@ export default {
   margin-top: 0.2rem;
   color: #4a7d87;
   font: 25px/10px 'ds-digitalbold';
+  margin-left: -0.8rem;
+  word-wrap: break-word;
+  white-space: normal;
+  word-break: break-all;
 }
 
 .fs-xl {
@@ -651,6 +660,17 @@ export default {
 }
 .bg-color-spec {
   border-radius: 0.125rem;
+  .en-spec-text{
+    font-size: 12px;
+    font-weight: bold;
+    word-wrap: break-word;
+    white-space: normal;
+    word-break: break-all;
+  }
+  .ch-spec-text{
+    font-size: 14px;
+    font-weight: bold;
+  }
 }
 body {
   font-size: 12px !important;