cq

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

@@ -38,11 +38,10 @@ public class TDashboarddataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TDashboarddata tDashboarddata)
+    public List<TDashboarddata> list(TDashboarddata tDashboarddata)
     {
-        startPage();
         List<TDashboarddata> list = tDashboarddataService.selectTDashboarddataList(tDashboarddata);
-        return getDataTable(list);
+        return list;
     }
 
     /**

master/src/main/resources/mybatis/aspen/TDashboarddataMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="energyLpg != null  and energyLpg != ''"> and energy_lpg = #{energyLpg}</if>
             and del_flag = 0
         </where>
+        order by id
     </select>
     
     <select id="selectTDashboarddataById" parameterType="Long" resultMap="TDashboarddataResult">

ui/src/views/front/materialBalance.vue

@@ -383,8 +383,6 @@
         },
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 20
         },
       }
     },
@@ -396,14 +394,14 @@
           ///调取接口获取数据
           this.getList();
         }, 0)
-      }, 30000)
+      }, 10000)
     },
     methods: {
       /** 查询dashboard抓取数据列表 */
       getList()
       {
         listDashboarddata(this.queryParams).then(response => {
-          this.dashboarddata = response.rows[0];
+          this.dashboarddata = response[response.length - 1];
           console.info("刷新数据")
         });
       }

ui/src/views/monitor/elec/index.vue

@@ -70,8 +70,8 @@
         </div>
         <div class="three-bototm-box">
           <dv-border-box-12>
-            <!--<nap-tank />-->
-            <bottom-left />
+            <nap-tank />
+            <!--<bottom-left />-->
           </dv-border-box-12>
           <dv-border-box-12>
             <ethylene-tank />