Selaa lähdekoodia

LY 专项培训

ly 3 vuotta sitten
vanhempi
commit
7b7d7010d4

+ 19 - 13
master/src/main/java/com/ruoyi/project/sems/controller/TMeasureThicknessController.java

@@ -414,21 +414,27 @@ public class TMeasureThicknessController extends BaseController
     }
 
     public String getRecordUrl(String id){
-        TMeasureThickness measureThicknessEntity = tMeasureThicknessService.selectTMeasureThicknessById(Long.parseLong(id));
-        List<TMeasureRecord> measureRecords = tMeasureRecordService.queryRecords(id);
-        Collections.reverse(measureRecords);
-        //种类数据集
-        DefaultCategoryDataset dataset = new DefaultCategoryDataset();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
-        for (TMeasureRecord t: measureRecords
-        ) {
-            dataset.addValue(t.getMeasureValue() , "数值Value" , sdf.format(t.getMeasureDate()));
-            if (measureThicknessEntity.getThicknessMin() != null){
-                dataset.addValue(Double.parseDouble(measureThicknessEntity.getThicknessMin()) , "最小允许壁厚" , sdf.format(t.getMeasureDate()));
+        try {
+            TMeasureThickness measureThicknessEntity = tMeasureThicknessService.selectTMeasureThicknessById(Long.parseLong(id));
+            List<TMeasureRecord> measureRecords = tMeasureRecordService.queryRecords(id);
+            Collections.reverse(measureRecords);
+            //种类数据集
+            DefaultCategoryDataset dataset = new DefaultCategoryDataset();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+            for (TMeasureRecord t: measureRecords
+            ) {
+                dataset.addValue(t.getMeasureValue() , "数值Value" , sdf.format(t.getMeasureDate()));
+                if (measureThicknessEntity.getThicknessMin() != null){
+                    dataset.addValue(Double.parseDouble(measureThicknessEntity.getThicknessMin()) , "最小允许壁厚" , sdf.format(t.getMeasureDate()));
+                }
             }
+            String url = RuoYiConfig.getProfile() + "/" + id +".jpg";
+            ChartUtil.createLinePort("" , dataset ,"" ,"" , url ) ;
+
+        }catch (Exception e) {
+            logger.error("生成图片错误");
+            logger.error(JSON.toJSONString(e));
         }
-        String url = RuoYiConfig.getProfile() + "/" + id +".jpg";
-        ChartUtil.createLinePort("" , dataset ,"" ,"" , url ) ;
         return id +".jpg";
     }
 

+ 2 - 2
ui/src/views/monitor/elec/centerRight1.vue

@@ -18,7 +18,7 @@
           <icon name="chart-line"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">BOC用电情况</span>
+          <span class="fs-xl text mx-2">BYC购电情况</span>
         </div>
       </div>
       <div class="d-flex jc-center body-box" @click="openBOCdialog">
@@ -29,7 +29,7 @@
     <el-dialog class="my-info-dialog" :visible.sync="openChartBYCChart" title="BYC用电情况" @open="openBYC" width="1600px" destroy-on-close append-to-body>
       <div id="BYCChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
-    <el-dialog class="my-info-dialog" :visible.sync="openChartBOCChart" title="BOC用电情况" @open="openBOC" width="1600px" destroy-on-close append-to-body>
+    <el-dialog class="my-info-dialog" :visible.sync="openChartBOCChart" title="BYC购电情况" @open="openBOC" width="1600px" destroy-on-close append-to-body>
       <div id="BOCChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
   </div>

+ 1 - 1
ui/src/views/monitor/elec/frontElecTwo.vue

@@ -68,7 +68,7 @@
         </div>
 
         <div class="kuangBox pos1-9">
-            <div class="kuang">J1501</div>
+            <div class="kuang">J1504</div>
             <div class="word">入: <span>123</span> 出:<span>324</span></div>
             <img src="@/assets/image/elec/4-9.png" style="width:80px;height:40px" class="img">
         </div>