王子文 生产日报

1) 前端表格样式修改
2) 页面加载时查询日期最近的生产日报

master/src/main/java/com/ruoyi/project/production/controller/TDailyProductionReportController.java

@@ -34,6 +34,16 @@ public class TDailyProductionReportController extends BaseController
     @Autowired
     private ITDailyProductionReportService tDailyProductionReportService;
 
+    /**
+     * 查询日期最新的每日生产报告列表
+     */
+    @PreAuthorize("@ss.hasPermi('production:report:query')")
+    @GetMapping("/selectTDailyProductionReportByMaxDate")
+    public AjaxResult selectTDailyProductionReportByMaxDate()
+    {
+        return AjaxResult.success(tDailyProductionReportService.selectTDailyProductionReportByMaxDate());
+    }
+
     /**
      * 查询每日生产报告列表
      */

master/src/main/java/com/ruoyi/project/production/mapper/TDailyProductionReportMapper.java

@@ -13,6 +13,13 @@ import com.ruoyi.project.production.domain.TDailyProductionReport;
  */
 public interface TDailyProductionReportMapper
 {
+    /**
+     * 查询日期最新的每日生产报告
+     *
+     * @return 每日生产报告
+     */
+    public TDailyProductionReport selectTDailyProductionReportByMaxDate();
+
     /**
      * 查询每日生产报告
      * 

master/src/main/java/com/ruoyi/project/production/service/ITDailyProductionReportService.java

@@ -12,6 +12,13 @@ import com.ruoyi.project.production.domain.TDailyProductionReport;
  */
 public interface ITDailyProductionReportService 
 {
+    /**
+     * 查询日期最新的每日生产报告
+     *
+     * @return 每日生产报告
+     */
+    public TDailyProductionReport selectTDailyProductionReportByMaxDate();
+
     /**
      * 查询每日生产报告
      * 

master/src/main/java/com/ruoyi/project/production/service/impl/TDailyProductionReportServiceImpl.java

@@ -20,6 +20,16 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
     @Autowired
     private TDailyProductionReportMapper tDailyProductionReportMapper;
 
+    /**
+     * 查询日期最新的每日生产报告
+     *
+     * @return 每日生产报告
+     */
+    @Override
+    public TDailyProductionReport selectTDailyProductionReportByMaxDate() {
+        return tDailyProductionReportMapper.selectTDailyProductionReportByMaxDate();
+    }
+
     /**
      * 查询每日生产报告
      *

master/src/main/resources/mybatis/production/TDailyProductionReportMapper.xml

@@ -628,6 +628,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from t_daily_production_report d
     </sql>
 
+    <select id="selectTDailyProductionReportByMaxDate" resultMap="TDailyProductionReportResult">
+        <include refid="selectTDailyProductionReportVo"/>
+        where d.REPORT_DATE = (select max(t2.REPORT_DATE) from t_daily_production_report t2)
+    </select>
+
     <select id="selectTDailyProductionReportList" parameterType="TDailyProductionReport" resultMap="TDailyProductionReportResult">
         <include refid="selectTDailyProductionReportVo"/>
         <where>  

ui/src/api/production/report.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 查询日期最新的每日生产报告详细
+export function getReportByMaxDate() {
+  return request({
+    url: '/production/report/selectTDailyProductionReportByMaxDate',
+    method: 'get'
+  })
+}
+
 // 查询每日生产报告列表
 export function listReport(query) {
   return request({

ui/src/views/production/daily/index.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="app-container" style="overflow-x: auto;">
+    <!--<div class="triangle-top"></div>-->
+    <!--<div class="triangle-bottom"></div>-->
+    <!--<div class="triangle-left"></div>-->
     <!-- 操作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="报告日期" prop="reportDate">
@@ -91,9 +94,9 @@
           </tr>
           <tr>
             <td class="bg-blue-light">Nap</td>
-            <td class="no-border" rowspan="35"></td>
+            <td class="no-border"></td>
             <td class="bg-green" rowspan="35">Cracker</td>
-            <td class="no-border" rowspan="35" colspan="2"></td>
+            <td class="no-border" rowspan="2" colspan="2"></td>
             <td class="bg-blue-light"></td>
             <td class="bg-blue-light">yield %</td>
             <td class="bg-blue-light">Produced</td>
@@ -107,6 +110,9 @@
               <span v-if="!updating">{{reportData.nap}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.nap"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2">
+              <!--<div class="triangle-right"></div>-->
+            </td>
             <td class="bg-blue-light" rowspan="2">H2</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.h2YieldPercentage}}</span>
@@ -139,6 +145,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">C5</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.h2ToPgu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.h2ToPgu"/>
@@ -161,6 +168,7 @@
               <span v-if="!updating">{{reportData.c5}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.c5"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">ETHYLEN</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.ethylenYieldPercentage}}</span>
@@ -200,6 +208,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">C6-C8-NA</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.ethylenToTm}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.ethylenToTm"/>
@@ -250,6 +259,7 @@
               <span v-if="!updating">{{reportData.c6C8Na}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.c6C8Na"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">Propylene</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.propyleneYieldPercentage}}</span>
@@ -288,6 +298,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">wison Ethane </td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.propyleneToAaAe}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.propyleneToAaAe"/>
@@ -334,6 +345,7 @@
               <span v-if="!updating">{{reportData.wisonEthane}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.wisonEthane"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light">C3 LPG</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.c3LpgYieldPercentage}}</span>
@@ -367,6 +379,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">LPG to furnace</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-blue-light">C4 LPG</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.c4LpgYieldPercentage}}</span>
@@ -402,6 +415,7 @@
               <span v-if="!updating">{{reportData.lpgToFurnace}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.lpgToFurnace"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">MixedC4'S</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.mixedC4sYieldPercentage}}</span>
@@ -439,6 +453,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">Raff1 fr BD</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.mixedC4sToBd}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.mixedC4sToBd"/>
@@ -481,6 +496,7 @@
               <span v-if="!updating">{{reportData.raff1FrBd}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.raff1FrBd"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">EBO</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.eboYieldPercentage}}</span>
@@ -513,6 +529,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">Raff2 fr IB</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.eboToShip}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.eboToShip"/>
@@ -535,6 +552,7 @@
               <span v-if="!updating">{{reportData.raff2FrIb}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.raff2FrIb"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">Naphthalene</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.naphthaleneYieldPercentage}}</span>
@@ -561,16 +579,17 @@
               <el-input v-if="updating" size="mini" v-model="reportData.naphthaleneExport"/>
             </td>
             <td class="bg-blue-light">To Truck</td>
-            <td class="no-border" colspan="7"></td>
+            <td class="no-border" colspan="9"></td>
             <td class="bg-blue-light" colspan="2">Export & Import</td>
           </tr>
           <tr>
             <td class="bg-blue-light">Raff3 fr BD</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.naphthaleneToTruck}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.naphthaleneToTruck"/>
             </td>
-            <td class="no-border" colspan="7"></td>
+            <td class="no-border" colspan="9"></td>
             <td class="bg-blue-light">To ship</td>
             <td class="bg-blue-light">Fr ship</td>
           </tr>
@@ -579,6 +598,7 @@
               <span v-if="!updating">{{reportData.raff3FrBd}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.raff3FrBd"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">PO/Flux Oil</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.poFluxOilYieldPercentage}}</span>
@@ -605,7 +625,7 @@
               <el-input v-if="updating" size="mini" v-model="reportData.poFluxOilExport"/>
             </td>
             <td class="bg-blue-light">To BD</td>
-            <td class="no-border" colspan="7"></td>
+            <td class="no-border" colspan="9"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuBenzeneToShip}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuBenzeneToShip"/>
@@ -617,11 +637,12 @@
           </tr>
           <tr>
             <td class="bg-blue-light">Raffinate II P fr 2PH</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.poFluxOilToBd}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.poFluxOilToBd"/>
             </td>
-            <td class="no-border" colspan="7"></td>
+            <td class="no-border" colspan="9"></td>
             <td class="bg-blue-light">To YBS</td>
             <td class="bg-blue-light"></td>
           </tr>
@@ -630,6 +651,7 @@
               <span v-if="!updating">{{reportData.raffinate2pFr2ph}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.raffinate2pFr2ph"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">Offags</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.offgasYieldPercentage}}</span>
@@ -661,8 +683,9 @@
             <td class="bg-blue-light">SuB(inclose U2)</td>
             <td class="bg-blue-light">Flare+SCTU</td>
             <td class="bg-blue-light">To U2(nm3)</td>
-            <td class="bg-blue-light">Flare loss (T)</td>
-            <td class="no-border"></td>
+            <td class="bg-orange ft-red">Flare loss (T)</td>
+            <td class="no-border" colspan="2"></td>
+            <td class="no-border solid-line-top solid-line-left" rowspan="7"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuBenzeneToYbs}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuBenzeneToYbs"/>
@@ -671,6 +694,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">C2 fr LDPE</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.offgasToFurnance}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.offgasToFurnance"/>
@@ -699,7 +723,7 @@
               <span v-if="!updating">{{reportData.offgasFlareLossT}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.offgasFlareLossT"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border" colspan="3"></td>
             <td class="bg-blue-light">To RTTF</td>
             <td class="bg-blue-light">To Train</td>
           </tr>
@@ -708,6 +732,7 @@
               <span v-if="!updating">{{reportData.c2FrLdpe}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.c2FrLdpe"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">RPG</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.rpgYieldPercentage}}</span>
@@ -735,7 +760,7 @@
             </td>
             <td class="bg-blue-light">To PGU</td>
             <td class="bg-blue-light">Fr YFCC</td>
-            <td class="no-border" colspan="6"></td>
+            <td class="no-border" colspan="8"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuBenzeneToRttf}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuBenzeneToRttf"/>
@@ -747,6 +772,7 @@
           </tr>
           <tr>
             <td class="bg-blue-light">C3 fr OXO</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.rpgToPgu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.rpgToPgu"/>
@@ -761,6 +787,7 @@
               <span v-if="!updating">{{reportData.c3FrOxo}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.c3FrOxo"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">Methane</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.methaneYieldPercentage}}</span>
@@ -774,12 +801,13 @@
             <td class="no-border" colspan="8"></td>
             <td class="bg-blue-light">yield %</td>
             <td class="bg-blue-light">Inventory</td>
-            <td class="no-border"></td>
+            <td class="no-border" colspan="3"></td>
             <td class="bg-blue-light">To Ship</td>
             <td class="bg-blue-light">Fr Ship</td>
           </tr>
           <tr>
             <td class="bg-blue-light">MIXED C3/C4 </td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.methaneToEoEg}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.methaneToEoEg"/>
@@ -789,7 +817,7 @@
             <td class="no-border" colspan="2"></td>
             <td class="bg-blue-light">Produced</td>
             <td class="bg-blue-light">Change</td>
-            <td class="no-border"></td>
+            <td class="no-border" colspan="3"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuTolueneToShip}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuTolueneToShip"/>
@@ -804,6 +832,7 @@
               <span v-if="!updating">{{reportData.mixedC3C4}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.mixedC3C4"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light" rowspan="2">Residue oil</td>
             <td class="bg-yellow-light" rowspan="2">
               <span v-if="!updating">{{reportData.residueOilYieldPercentage}}</span>
@@ -813,7 +842,8 @@
               <span v-if="!updating">{{reportData.residueOilProduced}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.residueOilProduced"/>
             </td>
-            <td class="no-border" colspan="8"></td>
+            <td class="no-border" colspan="7"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">Benzene</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuBenzeneYeildPercentage}}</span>
@@ -823,12 +853,13 @@
               <span v-if="!updating">{{reportData.aeuBenzeneInventory}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuBenzeneInventory"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom" colspan="2"></td>
             <td class="bg-blue-light">To YPC</td>
             <td class="bg-blue-light">Fr YPC</td>
           </tr>
           <tr>
             <td class="bg-blue-light">Hy C9</td>
+            <td class="no-border solid-line-top" rowspan="2" colspan="2"></td>
             <td class="no-border" colspan="8"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuBenzeneProduced}}</span>
@@ -838,7 +869,7 @@
               <span v-if="!updating">{{reportData.aeuBenzeneChange}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuBenzeneChange"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom" colspan="3" rowspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuTolueneToYpc}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuTolueneToYpc"/>
@@ -853,7 +884,9 @@
               <span v-if="!updating">{{reportData.hyC9}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.hyC9"/>
             </td>
-            <td class="no-border" colspan="11"></td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
+            <td class="no-border" colspan="10"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">Toluene</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuTolueneYeildPercentage}}</span>
@@ -863,12 +896,12 @@
               <span v-if="!updating">{{reportData.aeuTolueneInventory}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuTolueneInventory"/>
             </td>
-            <td class="no-border"></td>
             <td class="bg-blue-light">To RTTF</td>
             <td class="bg-blue-light">Fr YBS</td>
           </tr>
           <tr>
             <td class="bg-blue-light">PGU Offgas</td>
+            <td class="no-border" rowspan="9" colspan="2"></td>
             <td class="no-border" colspan="11"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuTolueneProduced}}</span>
@@ -878,7 +911,8 @@
               <span v-if="!updating">{{reportData.aeuTolueneChange}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuTolueneChange"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom" colspan="2" rowspan="2"></td>
+            <td class="no-border" rowspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuTolueneToRttf}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuTolueneToRttf"/>
@@ -893,13 +927,14 @@
               <span v-if="!updating">{{reportData.pguOffgas}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguOffgas"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="no-border" colspan="7"></td>
             <td class="no-border bg-yellow">t/h</td>
             <td class="no-border bg-yellow">
               <span v-if="!updating">{{reportData.pguAeuTH}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguAeuTH"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">Xylene</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuXyleneYeildPercentage}}</span>
@@ -909,7 +944,6 @@
               <span v-if="!updating">{{reportData.aeuXyleneInventory}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuXyleneInventory"/>
             </td>
-            <td class="no-border"></td>
             <td class="bg-blue-light">To EU</td>
             <td class="bg-blue-light"></td>
           </tr>
@@ -931,6 +965,8 @@
               <el-input v-if="updating" size="mini" v-model="reportData.aeuXyleneChange"/>
             </td>
             <td class="no-border"></td>
+            <td class="no-border"></td>
+            <td class="no-border solid-line-left solid-line-bottom" rowspan="7"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuTolueneToEu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuTolueneToEu"/>
@@ -942,15 +978,16 @@
               <span v-if="!updating">{{reportData.washOil}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.washOil"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="no-border" colspan="5"></td>
             <td class="bg-blue-light">Produced</td>
             <td class="bg-blue-light">Change</td>
             <td class="bg-blue-light">To AEU</td>
-            <td class="no-border bg-yellow-light">
+            <td class="no-border bg-yellow-light solid-line-bottom">
               <span v-if="!updating">{{reportData.pguToAeu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguToAeu"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">C6-C8 NA</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuC6C8NaYeildPercentage}}</span>
@@ -960,6 +997,8 @@
               <span v-if="!updating">{{reportData.aeuC6C8NaInventory}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuC6C8NaInventory"/>
             </td>
+            <td class="no-border"></td>
+            <td class="no-border"></td>
           </tr>
           <tr>
             <td class="bg-blue-light">Toluene</td>
@@ -968,7 +1007,7 @@
               <span v-if="!updating">{{reportData.pguRpgTH}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguRpgTH"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light">BTX</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.pguBtxYeildPercentage}}</span>
@@ -991,6 +1030,7 @@
               <span v-if="!updating">{{reportData.aeuC6C8NaChange}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuC6C8NaChange"/>
             </td>
+            <td class="no-border solid-line-top solid-line-right" rowspan="8"></td>
             <td class="no-border"></td>
             <td class="bg-blue-light">To ship</td>
             <td class="bg-blue-light">Fr ship</td>
@@ -1000,8 +1040,9 @@
               <span v-if="!updating">{{reportData.toluene}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.toluene"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-blue-light">RPG</td>
-            <td class="no-border">
+            <td class="no-border solid-line-bottom">
               <span v-if="!updating">{{reportData.rpgToPgu2}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.rpgToPgu2"/>
             </td>
@@ -1019,11 +1060,12 @@
               <span v-if="!updating">{{reportData.pguBtxToAeu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguBtxToAeu"/>
             </td>
-            <td class="no-border bg-yellow-light">
+            <td class="no-border bg-yellow-light solid-line-top">
               <span v-if="!updating">{{reportData.aeuToPgu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuToPgu"/>
             </td>
-            <td class="no-border" colspan="5"></td>
+            <td class="no-border" colspan="4"></td>
+            <td class="no-border"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuXyleneToShip}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuXyleneToShip"/>
@@ -1051,11 +1093,12 @@
               <span v-if="!updating">{{reportData.hyC4FrR800}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.hyC4FrR800"/>
             </td>
+            <td class="no-border solid-line-top" rowspan="2"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.pguRpg2}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguRpg2"/>
             </td>
-            <td class="bg-yellow-light no-border">
+            <td class="bg-yellow-light no-border solid-line-top">
               <span v-if="!updating">{{reportData.pguToRpg}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguToRpg"/>
             </td>
@@ -1080,7 +1123,8 @@
             </td>
           </tr>
           <tr>
-            <td class="no-border" colspan="9"></td>
+            <td class="no-border" colspan="8"></td>
+            <td class="no-border  solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">Washoil</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.pguWashoilYeildPercentage}}</span>
@@ -1138,6 +1182,7 @@
               <el-input v-if="updating" size="mini" v-model="reportData.pguAeuTotalLoss"/>
             </td>
             <td class="no-border"></td>
+            <td class="no-border"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuXyleneToRttf}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuXyleneToRttf"/>
@@ -1155,7 +1200,8 @@
               <span v-if="!updating">{{reportData.pguH2}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguH2"/>
             </td>
-            <td class="no-border" colspan="3"></td>
+            <td class="no-border solid-line-top"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">offags</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.pguOffgasYeildPercentage}}</span>
@@ -1206,7 +1252,7 @@
               <span v-if="!updating">{{reportData.pguAeuFeedLoadPercentage}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguAeuFeedLoadPercentage"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom" colspan="2"></td>
             <td class="bg-blue-light">To EU</td>
             <td class="bg-blue-light">To YPC</td>
           </tr>
@@ -1222,7 +1268,7 @@
               <span v-if="!updating">{{reportData.pguTotalFeed}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguTotalFeed"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">C5</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.pguC5YeildPercentage}}</span>
@@ -1235,7 +1281,7 @@
             </td>
             <td class="bg-blue-light">To EU</td>
             <td class="bg-blue-light">To Yuanguan</td>
-            <td class="no-border" colspan="5"></td>
+            <td class="no-border" colspan="7"></td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.aeuC6C8NaToEu}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuC6C8NaToEu"/>
@@ -1291,7 +1337,7 @@
               <span v-if="!updating">{{reportData.pguTotalLoss}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.pguTotalLoss"/>
             </td>
-            <td class="no-border"></td>
+            <td class="no-border solid-line-bottom"></td>
             <td class="bg-blue-light" rowspan="2">C9</td>
             <td class="bg-yellow-light">
               <span v-if="!updating">{{reportData.pguC9YeildPercentage}}</span>
@@ -2716,7 +2762,7 @@
 </template>
 
 <script>
-import { listReport, getReport, delReport, addReport, updateReport, exportReport, importTemplate} from "@/api/production/report";
+import { getReportByMaxDate, listReport, getReport, delReport, addReport, updateReport, exportReport, importTemplate} from "@/api/production/report";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -3860,7 +3906,7 @@ export default {
       this.$nextTick(() => {
           this.clientHeight = document.body.clientHeight -250
       })
-      this.setDateAsToday();
+      this.setMaxDate();
       this.getReport();
       this.getTreeselect();
       this.loading = false;
@@ -3884,7 +3930,7 @@ export default {
         if (response.code == 200) {
           this.$message.success("修改成功");
         } else {
-          this.$message.error("未知错误，请联系管理员！");
+          this.$message.error("未知错误，请联系管理员");
         }
         this.getReport();
       });
@@ -3894,16 +3940,15 @@ export default {
       this.updating = false;
       this.getReport();
     },
-    /** 设置日期 */
-    setDateAsToday() {
-      let today = new Date();
-      let todayString = today.getFullYear()
-        + "-" + (today.getMonth() + 1)
-        + "-" + today.getDate();
-      // this.queryParams.reportDate = todayString;
-      // this.lastSelectedDate = todayString;
-      this.queryParams.reportDate = "2022-8-8";
-      this.lastSelectedDate = "2022-8-8";
+    /** 设置最近的日期 */
+    setMaxDate() {
+      getReportByMaxDate().then(response => {
+        if (null != response.data) {
+          this.queryParams.reportDate = response.data.reportDate;
+        } else {
+          this.$message.info("未导入生产日报数据");
+        }
+      });
     },
     /** 查询生产报告 */
     getReport() {
@@ -3916,7 +3961,7 @@ export default {
         } else {
           let str = "未查询到" + this.queryParams.reportDate + "的日报，请修改搜索日期或手动导入数据。";
           this.queryParams.reportDate = this.lastSelectedDate;
-          this.$message.error(str);
+          this.$message.warning(str);
           this.loading = false;
         }
       });
@@ -4585,6 +4630,41 @@ export default {
 </script>
 
 <style scoped>
+  .triangle-top{
+    height:8px;
+    width:8px;
+    border-color:transparent transparent black transparent;
+    border-style:solid;
+    border-width:8px;
+    display:inline-block;
+  }
+  .triangle-right{
+    height:8px;
+    width:8px;
+    border-color:transparent transparent transparent black;
+    border-style:solid;
+    border-width:8px;
+    display:inline-block;
+    position:relative;
+    top:-27px;
+    left:25px;
+  }
+  .triangle-bottom{
+    height:8px;
+    width:8px;
+    border-color:black transparent transparent transparent;
+    border-style:solid;
+    border-width:8px;
+    display:inline-block;
+  }
+  .triangle-left{
+    height:8px;
+    width:8px;
+    border-color:transparent black transparent transparent;
+    border-style:solid;
+    border-width:8px;
+    display:inline-block;
+  }
   table{
     border-width: 0px;
     border-spacing: 0px;
@@ -4596,6 +4676,18 @@ export default {
   .no-border{
     border: 0px;
   }
+  .solid-line-top{
+    border-top: 3px solid;
+  }
+  .solid-line-bottom{
+    border-bottom: 3px solid;
+  }
+  .solid-line-left{
+    border-left: 3px solid;
+  }
+  .solid-line-right{
+    border-right: 3px solid;
+  }
   .bg-yellow{
     background-color: #FFFF00;
   }