liudongfang 3.14

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

@@ -1,128 +0,0 @@
-package com.ruoyi.project.aspen.controller;
-
-import java.util.List;
-
-import com.ruoyi.project.aspen.domain.TDashboardelecdata;
-import com.ruoyi.project.aspen.service.ITDashboardelecdataService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.aspen.domain.TDashboardelecdata;
-import com.ruoyi.project.aspen.service.ITDashboardelecdataService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
-
-/**
- * 电厂大屏DASHBOARDELEC抓取数据Controller
- *
- * @author ruoyi
- * @date 2022-03-11
- */
-@RestController
-@RequestMapping("/aspen/dashboardelecdata")
-public class TDashboardelecdataController extends BaseController
-{
-    @Autowired
-    private ITDashboardelecdataService tDashboardelecdataService;
-
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TDashboardelecdata tDashboardelecdata)
-    {
-        startPage();
-        List<TDashboardelecdata> list = tDashboardelecdataService.selectTDashboardelecdataList(tDashboardelecdata);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出电厂大屏DASHBOARDELEC抓取数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:export')")
-    @Log(title = "电厂大屏DASHBOARDELEC抓取数据", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TDashboardelecdata tDashboardelecdata)
-    {
-        List<TDashboardelecdata> list = tDashboardelecdataService.selectTDashboardelecdataList(tDashboardelecdata);
-        ExcelUtil<TDashboardelecdata> util = new ExcelUtil<TDashboardelecdata>(TDashboardelecdata.class);
-        return util.exportExcel(list, "dashboardelecdata");
-    }
-
-    /**
-     * 获取电厂大屏DASHBOARDELEC抓取数据详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tDashboardelecdataService.selectTDashboardelecdataById(id));
-    }
-
-    /**
-     * 新增电厂大屏DASHBOARDELEC抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:add')")
-    @Log(title = "电厂大屏DASHBOARDELEC抓取数据", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TDashboardelecdata tDashboardelecdata)
-    {
-        return toAjax(tDashboardelecdataService.insertTDashboardelecdata(tDashboardelecdata));
-    }
-
-    /**
-     * 修改电厂大屏DASHBOARDELEC抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:edit')")
-    @Log(title = "电厂大屏DASHBOARDELEC抓取数据", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TDashboardelecdata tDashboardelecdata)
-    {
-        return toAjax(tDashboardelecdataService.updateTDashboardelecdata(tDashboardelecdata));
-    }
-
-    /**
-     * 删除电厂大屏DASHBOARDELEC抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:remove')")
-    @Log(title = "电厂大屏DASHBOARDELEC抓取数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(tDashboardelecdataService.deleteTDashboardelecdataByIds(ids));
-    }
-
-    /**
-     * 查询最后一条dashboard抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:query')")
-    @GetMapping("/selectLast")
-    public AjaxResult selectLast(TDashboardelecdata tDashboardelecdata)
-    {
-        TDashboardelecdata tDashboardelecdata1 = tDashboardelecdataService.selectLast(tDashboardelecdata);
-        return AjaxResult.success(tDashboardelecdata1);
-    }
-
-    /**
-     * 查询最近31条DASHBOARD每日抓取数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
-    @GetMapping("/month")
-    public AjaxResult selectMonth(TDashboardelecdata tDashboardelecdata)
-    {
-        TDashboardelecdata tDashboardelecdata1 = tDashboardelecdataService.selectLast(tDashboardelecdata);
-        return AjaxResult.success(tDashboardelecdata1);
-    }
-}

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

@@ -1,104 +0,0 @@
-package com.ruoyi.project.aspen.controller;
-
-import java.util.List;
-
-import com.ruoyi.project.aspen.domain.TDashboardelecday;
-import com.ruoyi.project.aspen.service.ITDashboardelecdayService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
-
-/**
- * ELECDASHBOARDDAY每日抓取数据Controller
- *
- * @author ruoyi
- * @date 2022-03-11
- */
-@RestController
-@RequestMapping("/his/dashboardelecday")
-public class TDashboardelecdayController extends BaseController
-{
-    @Autowired
-    private ITDashboardelecdayService tDashboardelecdayService;
-
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TDashboardelecday tDashboardelecday)
-    {
-        startPage();
-        List<TDashboardelecday> list = tDashboardelecdayService.selectTDashboardelecdayList(tDashboardelecday);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出ELECDASHBOARDDAY每日抓取数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:export')")
-    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TDashboardelecday tDashboardelecday)
-    {
-        List<TDashboardelecday> list = tDashboardelecdayService.selectTDashboardelecdayList(tDashboardelecday);
-        ExcelUtil<TDashboardelecday> util = new ExcelUtil<TDashboardelecday>(TDashboardelecday.class);
-        return util.exportExcel(list, "dashboardelecday");
-    }
-
-    /**
-     * 获取ELECDASHBOARDDAY每日抓取数据详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tDashboardelecdayService.selectTDashboardelecdayById(id));
-    }
-
-    /**
-     * 新增ELECDASHBOARDDAY每日抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:add')")
-    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TDashboardelecday tDashboardelecday)
-    {
-        return toAjax(tDashboardelecdayService.insertTDashboardelecday(tDashboardelecday));
-    }
-
-    /**
-     * 修改ELECDASHBOARDDAY每日抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:edit')")
-    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TDashboardelecday tDashboardelecday)
-    {
-        return toAjax(tDashboardelecdayService.updateTDashboardelecday(tDashboardelecday));
-    }
-
-    /**
-     * 删除ELECDASHBOARDDAY每日抓取数据
-     */
-    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:remove')")
-    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(tDashboardelecdayService.deleteTDashboardelecdayByIds(ids));
-    }
-}

master/src/main/java/com/ruoyi/project/aspen/domain/TDashboardelecday.java

@@ -1,195 +0,0 @@
-package com.ruoyi.project.aspen.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * ELECDASHBOARDDAY每日抓取数据对象 t_dashboardelecday
- *
- * @author ruoyi
- * @date 2022-03-11
- */
-public class TDashboardelecday extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 唯一标识ID */
-    private Long id;
-
-    /** 删除状态 */
-    private Long delFlag;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createrCode;
-
-    /** 抓取时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "抓取时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdate;
-
-    /** 修改人 */
-    @Excel(name = "修改人")
-    private String updaterCode;
-
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedate;
-
-    /** 天然气表每日消耗量 every day consume */
-    @Excel(name = "天然气表每日消耗量 every day consume")
-    private String evconsume;
-
-    /** 天然气表电厂 */
-    @Excel(name = "天然气表电厂")
-    private String elecp;
-
-    /** 天然气表合成器 */
-    @Excel(name = "天然气表合成器")
-    private String hechengqi;
-
-    /** 天然气表U2 */
-    @Excel(name = "天然气表U2")
-    private String u2;
-
-    /** 数据日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "数据日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dataDate;
-
-    /** 抓取数据日 */
-    @Excel(name = "抓取数据日")
-    private String dateDay;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setDelFlag(Long delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag()
-    {
-        return delFlag;
-    }
-    public void setCreaterCode(String createrCode)
-    {
-        this.createrCode = createrCode;
-    }
-
-    public String getCreaterCode()
-    {
-        return createrCode;
-    }
-    public void setCreatedate(Date createdate)
-    {
-        this.createdate = createdate;
-    }
-
-    public Date getCreatedate()
-    {
-        return createdate;
-    }
-    public void setUpdaterCode(String updaterCode)
-    {
-        this.updaterCode = updaterCode;
-    }
-
-    public String getUpdaterCode()
-    {
-        return updaterCode;
-    }
-    public void setUpdatedate(Date updatedate)
-    {
-        this.updatedate = updatedate;
-    }
-
-    public Date getUpdatedate()
-    {
-        return updatedate;
-    }
-    public void setEvconsume(String evconsume)
-    {
-        this.evconsume = evconsume;
-    }
-
-    public String getEvconsume()
-    {
-        return evconsume;
-    }
-    public void setElecp(String elecp)
-    {
-        this.elecp = elecp;
-    }
-
-    public String getElecp()
-    {
-        return elecp;
-    }
-    public void setHechengqi(String hechengqi)
-    {
-        this.hechengqi = hechengqi;
-    }
-
-    public String getHechengqi()
-    {
-        return hechengqi;
-    }
-    public void setU2(String u2)
-    {
-        this.u2 = u2;
-    }
-
-    public String getU2()
-    {
-        return u2;
-    }
-    public void setDataDate(Date dataDate)
-    {
-        this.dataDate = dataDate;
-    }
-
-    public Date getDataDate()
-    {
-        return dataDate;
-    }
-    public void setDateDay(String dateDay)
-    {
-        this.dateDay = dateDay;
-    }
-
-    public String getDateDay()
-    {
-        return dateDay;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("delFlag", getDelFlag())
-            .append("createrCode", getCreaterCode())
-            .append("createdate", getCreatedate())
-            .append("updaterCode", getUpdaterCode())
-            .append("updatedate", getUpdatedate())
-            .append("evconsume", getEvconsume())
-            .append("elecp", getElecp())
-            .append("hechengqi", getHechengqi())
-            .append("u2", getU2())
-            .append("dataDate", getDataDate())
-            .append("dateDay", getDateDay())
-            .toString();
-    }
-}

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboardelecdataMapper.java

@@ -1,77 +0,0 @@
-package com.ruoyi.project.aspen.mapper;
-
-import java.util.List;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.aspen.domain.TDashboardelecdata;
-
-
-/**
- * 电厂大屏DASHBOARDELEC抓取数据Mapper接口
- * 
- * @author ruoyi
- * @date 2022-03-11
- */
-public interface TDashboardelecdataMapper 
-{
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param id 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 电厂大屏DASHBOARDELEC抓取数据
-     */
-    public TDashboardelecdata selectTDashboardelecdataById(Long id);
-
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据列表
-     * 
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 电厂大屏DASHBOARDELEC抓取数据集合
-     */
-    @DataScope(deptAlias = "d")
-    public List<TDashboardelecdata> selectTDashboardelecdataList(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 新增电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 结果
-     */
-    public int insertTDashboardelecdata(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 修改电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 结果
-     */
-    public int updateTDashboardelecdata(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 删除电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param id 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdataById(Long id);
-
-    /**
-     * 批量删除电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdataByIds(Long[] ids);
-
-    /**
-     * 查询最后一条dashboardelec抓取数据
-     *
-     * @return dashboardelec抓取数据
-     */
-    public TDashboardelecdata selectLast(TDashboardelecdata tDashboardelecdata);
-    /**
-     * 查询最近一个月dashboardelec抓取数据
-     *
-     * @return dashboardelec抓取数据
-     */
-    public List<TDashboardelecdata> selectMonth(TDashboardelecdata tDashboardelecdata);
-}

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboardelecdayMapper.java

@@ -1,64 +0,0 @@
-package com.ruoyi.project.aspen.mapper;
-
-import java.util.List;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.aspen.domain.TDashboardelecday;
-
-
-/**
- * ELECDASHBOARDDAY每日抓取数据Mapper接口
- * 
- * @author ruoyi
- * @date 2022-03-11
- */
-public interface TDashboardelecdayMapper 
-{
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param id ELECDASHBOARDDAY每日抓取数据ID
-     * @return ELECDASHBOARDDAY每日抓取数据
-     */
-    public TDashboardelecday selectTDashboardelecdayById(Long id);
-
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据列表
-     * 
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return ELECDASHBOARDDAY每日抓取数据集合
-     */
-    @DataScope(deptAlias = "d")
-    public List<TDashboardelecday> selectTDashboardelecdayList(TDashboardelecday tDashboardelecday);
-
-    /**
-     * 新增ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return 结果
-     */
-    public int insertTDashboardelecday(TDashboardelecday tDashboardelecday);
-
-    /**
-     * 修改ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return 结果
-     */
-    public int updateTDashboardelecday(TDashboardelecday tDashboardelecday);
-
-    /**
-     * 删除ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param id ELECDASHBOARDDAY每日抓取数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdayById(Long id);
-
-    /**
-     * 批量删除ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdayByIds(Long[] ids);
-}

master/src/main/java/com/ruoyi/project/aspen/service/ITDashboardelecdataService.java

@@ -1,77 +0,0 @@
-package com.ruoyi.project.aspen.service;
-
-import com.ruoyi.project.aspen.domain.TDashboardelecdata;
-
-import java.util.List;
-
-
-/**
- * 电厂大屏DASHBOARDELEC抓取数据Service接口
- * 
- * @author ruoyi
- * @date 2022-03-11
- */
-public interface ITDashboardelecdataService 
-{
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param id 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 电厂大屏DASHBOARDELEC抓取数据
-     */
-    public TDashboardelecdata selectTDashboardelecdataById(Long id);
-
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据列表
-     * 
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 电厂大屏DASHBOARDELEC抓取数据集合
-     */
-    public List<TDashboardelecdata> selectTDashboardelecdataList(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 新增电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 结果
-     */
-    public int insertTDashboardelecdata(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 修改电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 结果
-     */
-    public int updateTDashboardelecdata(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 批量删除电厂大屏DASHBOARDELEC抓取数据
-     * 
-     * @param ids 需要删除的电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdataByIds(Long[] ids);
-
-    /**
-     * 删除电厂大屏DASHBOARDELEC抓取数据信息
-     * 
-     * @param id 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdataById(Long id);
-
-    /**
-     * 查询最后一条dashboardelec抓取数据
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return dashboardelec抓取数据
-     */
-    public TDashboardelecdata selectLast(TDashboardelecdata tDashboardelecdata);
-
-    /**
-     * 查询最近一个月dashboardelec抓取数据
-     *
-     * @return dashboardelec抓取数据
-     */
-    public List<TDashboardelecdata> selectMonth(TDashboardelecdata tDashboardelecdata);
-}

master/src/main/java/com/ruoyi/project/aspen/service/ITDashboardelecdayService.java

@@ -1,63 +0,0 @@
-package com.ruoyi.project.aspen.service;
-
-import com.ruoyi.project.aspen.domain.TDashboardelecday;
-
-import java.util.List;
-
-
-/**
- * ELECDASHBOARDDAY每日抓取数据Service接口
- * 
- * @author ruoyi
- * @date 2022-03-11
- */
-public interface ITDashboardelecdayService 
-{
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param id ELECDASHBOARDDAY每日抓取数据ID
-     * @return ELECDASHBOARDDAY每日抓取数据
-     */
-    public TDashboardelecday selectTDashboardelecdayById(Long id);
-
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据列表
-     * 
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return ELECDASHBOARDDAY每日抓取数据集合
-     */
-    public List<TDashboardelecday> selectTDashboardelecdayList(TDashboardelecday tDashboardelecday);
-
-    /**
-     * 新增ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return 结果
-     */
-    public int insertTDashboardelecday(TDashboardelecday tDashboardelecday);
-
-    /**
-     * 修改ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return 结果
-     */
-    public int updateTDashboardelecday(TDashboardelecday tDashboardelecday);
-
-    /**
-     * 批量删除ELECDASHBOARDDAY每日抓取数据
-     * 
-     * @param ids 需要删除的ELECDASHBOARDDAY每日抓取数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdayByIds(Long[] ids);
-
-    /**
-     * 删除ELECDASHBOARDDAY每日抓取数据信息
-     * 
-     * @param id ELECDASHBOARDDAY每日抓取数据ID
-     * @return 结果
-     */
-    public int deleteTDashboardelecdayById(Long id);
-}

master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboardelecdataServiceImpl.java

@@ -1,105 +0,0 @@
-package com.ruoyi.project.aspen.service.impl;
-
-import java.util.List;
-import com.ruoyi.project.aspen.domain.TDashboardelecdata;
-import com.ruoyi.project.aspen.mapper.TDashboardelecdataMapper;
-import com.ruoyi.project.aspen.service.ITDashboardelecdataService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-
-/**
- * 电厂大屏DASHBOARDELEC抓取数据Service业务层处理
- *
- * @author ruoyi
- * @date 2022-03-11
- */
-@Service
-public class TDashboardelecdataServiceImpl implements ITDashboardelecdataService
-{
-    @Resource
-    private TDashboardelecdataMapper tDashboardelecdataMapper;
-
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据
-     *
-     * @param id 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 电厂大屏DASHBOARDELEC抓取数据
-     */
-    @Override
-    public TDashboardelecdata selectTDashboardelecdataById(Long id)
-    {
-        return tDashboardelecdataMapper.selectTDashboardelecdataById(id);
-    }
-
-    /**
-     * 查询电厂大屏DASHBOARDELEC抓取数据列表
-     *
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 电厂大屏DASHBOARDELEC抓取数据
-     */
-    @Override
-    public List<TDashboardelecdata> selectTDashboardelecdataList(TDashboardelecdata tDashboardelecdata)
-    {
-        return tDashboardelecdataMapper.selectTDashboardelecdataList(tDashboardelecdata);
-    }
-
-    /**
-     * 新增电厂大屏DASHBOARDELEC抓取数据
-     *
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 结果
-     */
-    @Override
-    public int insertTDashboardelecdata(TDashboardelecdata tDashboardelecdata)
-    {
-        return tDashboardelecdataMapper.insertTDashboardelecdata(tDashboardelecdata);
-    }
-
-    /**
-     * 修改电厂大屏DASHBOARDELEC抓取数据
-     *
-     * @param tDashboardelecdata 电厂大屏DASHBOARDELEC抓取数据
-     * @return 结果
-     */
-    @Override
-    public int updateTDashboardelecdata(TDashboardelecdata tDashboardelecdata)
-    {
-        return tDashboardelecdataMapper.updateTDashboardelecdata(tDashboardelecdata);
-    }
-
-    /**
-     * 批量删除电厂大屏DASHBOARDELEC抓取数据
-     *
-     * @param ids 需要删除的电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTDashboardelecdataByIds(Long[] ids)
-    {
-        return tDashboardelecdataMapper.deleteTDashboardelecdataByIds(ids);
-    }
-
-    /**
-     * 删除电厂大屏DASHBOARDELEC抓取数据信息
-     *
-     * @param id 电厂大屏DASHBOARDELEC抓取数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTDashboardelecdataById(Long id)
-    {
-        return tDashboardelecdataMapper.deleteTDashboardelecdataById(id);
-    }
-
-    @Override
-    public TDashboardelecdata selectLast(TDashboardelecdata tDashboardelecdata) {
-        return tDashboardelecdataMapper.selectLast(tDashboardelecdata);
-    }
-
-    @Override
-    public List<TDashboardelecdata> selectMonth(TDashboardelecdata tDashboardelecdata) {
-        return tDashboardelecdataMapper.selectMonth(tDashboardelecdata);
-    }
-}

master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboardelecdayServiceImpl.java

@@ -1,96 +0,0 @@
-package com.ruoyi.project.aspen.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.project.aspen.domain.TDashboardelecday;
-import com.ruoyi.project.aspen.mapper.TDashboardelecdayMapper;
-import com.ruoyi.project.aspen.service.ITDashboardelecdayService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-
-/**
- * ELECDASHBOARDDAY每日抓取数据Service业务层处理
- *
- * @author ruoyi
- * @date 2022-03-11
- */
-@Service
-public class TDashboardelecdayServiceImpl implements ITDashboardelecdayService
-{
-    @Resource
-    private TDashboardelecdayMapper tDashboardelecdayMapper;
-
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据
-     *
-     * @param id ELECDASHBOARDDAY每日抓取数据ID
-     * @return ELECDASHBOARDDAY每日抓取数据
-     */
-    @Override
-    public TDashboardelecday selectTDashboardelecdayById(Long id)
-    {
-        return tDashboardelecdayMapper.selectTDashboardelecdayById(id);
-    }
-
-    /**
-     * 查询ELECDASHBOARDDAY每日抓取数据列表
-     *
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return ELECDASHBOARDDAY每日抓取数据
-     */
-    @Override
-    public List<TDashboardelecday> selectTDashboardelecdayList(TDashboardelecday tDashboardelecday)
-    {
-        return tDashboardelecdayMapper.selectTDashboardelecdayList(tDashboardelecday);
-    }
-
-    /**
-     * 新增ELECDASHBOARDDAY每日抓取数据
-     *
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return 结果
-     */
-    @Override
-    public int insertTDashboardelecday(TDashboardelecday tDashboardelecday)
-    {
-        return tDashboardelecdayMapper.insertTDashboardelecday(tDashboardelecday);
-    }
-
-    /**
-     * 修改ELECDASHBOARDDAY每日抓取数据
-     *
-     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
-     * @return 结果
-     */
-    @Override
-    public int updateTDashboardelecday(TDashboardelecday tDashboardelecday)
-    {
-        return tDashboardelecdayMapper.updateTDashboardelecday(tDashboardelecday);
-    }
-
-    /**
-     * 批量删除ELECDASHBOARDDAY每日抓取数据
-     *
-     * @param ids 需要删除的ELECDASHBOARDDAY每日抓取数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTDashboardelecdayByIds(Long[] ids)
-    {
-        return tDashboardelecdayMapper.deleteTDashboardelecdayByIds(ids);
-    }
-
-    /**
-     * 删除ELECDASHBOARDDAY每日抓取数据信息
-     *
-     * @param id ELECDASHBOARDDAY每日抓取数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTDashboardelecdayById(Long id)
-    {
-        return tDashboardelecdayMapper.deleteTDashboardelecdayById(id);
-    }
-}

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

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.sems.his.mapper.TDashboardelecdayMapper">
-    
-    <resultMap type="TDashboardelecday" id="TDashboardelecdayResult">
-        <result property="id"    column="id"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createrCode"    column="creater_code"    />
-        <result property="createdate"    column="createdate"    />
-        <result property="updaterCode"    column="updater_code"    />
-        <result property="updatedate"    column="updatedate"    />
-        <result property="evconsume"    column="evconsume"    />
-        <result property="elecp"    column="elecp"    />
-        <result property="hechengqi"    column="hechengqi"    />
-        <result property="u2"    column="u2"    />
-        <result property="dataDate"    column="data_date"    />
-        <result property="dateDay"    column="date_day"    />
-        <result property="deptName" column="dept_name" />
-    </resultMap>
-
-    <sql id="selectTDashboardelecdayVo">
-        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.evconsume, d.elecp, d.hechengqi, d.u2, d.data_date, d.date_day ,s.dept_name from t_dashboardelecday d
-      left join sys_dept s on s.dept_id = d.dept_id
-    </sql>
-
-    <select id="selectTDashboardelecdayList" parameterType="TDashboardelecday" resultMap="TDashboardelecdayResult">
-        <include refid="selectTDashboardelecdayVo"/>
-        <where>  
-            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
-            <if test="createdate != null "> and createdate = #{createdate}</if>
-            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
-            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
-            <if test="evconsume != null  and evconsume != ''"> and evconsume = #{evconsume}</if>
-            <if test="elecp != null  and elecp != ''"> and elecp = #{elecp}</if>
-            <if test="hechengqi != null  and hechengqi != ''"> and hechengqi = #{hechengqi}</if>
-            <if test="u2 != null  and u2 != ''"> and u2 = #{u2}</if>
-            <if test="dataDate != null "> and data_date = #{dataDate}</if>
-            <if test="dateDay != null  and dateDay != ''"> and date_day = #{dateDay}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectTDashboardelecdayById" parameterType="Long" resultMap="TDashboardelecdayResult">
-        <include refid="selectTDashboardelecdayVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTDashboardelecday" parameterType="TDashboardelecday">
-        <selectKey keyProperty="id" resultType="long" order="BEFORE">
-            SELECT seq_t_dashboardelecday.NEXTVAL as id FROM DUAL
-        </selectKey>
-        insert into t_dashboardelecday
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createrCode != null">creater_code,</if>
-            <if test="createdate != null">createdate,</if>
-            <if test="updaterCode != null">updater_code,</if>
-            <if test="updatedate != null">updatedate,</if>
-            <if test="evconsume != null">evconsume,</if>
-            <if test="elecp != null">elecp,</if>
-            <if test="hechengqi != null">hechengqi,</if>
-            <if test="u2 != null">u2,</if>
-            <if test="dataDate != null">data_date,</if>
-            <if test="dateDay != null">date_day,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createrCode != null">#{createrCode},</if>
-            <if test="createdate != null">#{createdate},</if>
-            <if test="updaterCode != null">#{updaterCode},</if>
-            <if test="updatedate != null">#{updatedate},</if>
-            <if test="evconsume != null">#{evconsume},</if>
-            <if test="elecp != null">#{elecp},</if>
-            <if test="hechengqi != null">#{hechengqi},</if>
-            <if test="u2 != null">#{u2},</if>
-            <if test="dataDate != null">#{dataDate},</if>
-            <if test="dateDay != null">#{dateDay},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTDashboardelecday" parameterType="TDashboardelecday">
-        update t_dashboardelecday
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createrCode != null">creater_code = #{createrCode},</if>
-            <if test="createdate != null">createdate = #{createdate},</if>
-            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
-            <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="evconsume != null">evconsume = #{evconsume},</if>
-            <if test="elecp != null">elecp = #{elecp},</if>
-            <if test="hechengqi != null">hechengqi = #{hechengqi},</if>
-            <if test="u2 != null">u2 = #{u2},</if>
-            <if test="dataDate != null">data_date = #{dataDate},</if>
-            <if test="dateDay != null">date_day = #{dateDay},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteTDashboardelecdayById" parameterType="Long">
-        update t_dashboardelecday set del_flag = 2 where id = #{id}
-    </update>
-
-    <update id="deleteTDashboardelecdayByIds" parameterType="String">
-        update t_dashboardelecday set del_flag = 2 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-    
-</mapper>

ui/src/api/aspen/dashboardelecdata.js

@@ -1,70 +0,0 @@
-import request from '@/utils/request'
-
-// 查询电厂大屏DASHBOARDELEC抓取数据列表
-export function listDashboardelecdata(query) {
-  return request({
-    url: '/his/dashboardelecdata/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询电厂大屏DASHBOARDELEC抓取数据详细
-export function getDashboardelecdata(id) {
-  return request({
-    url: '/his/dashboardelecdata/' + id,
-    method: 'get'
-  })
-}
-
-// 新增电厂大屏DASHBOARDELEC抓取数据
-export function addDashboardelecdata(data) {
-  return request({
-    url: '/his/dashboardelecdata',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改电厂大屏DASHBOARDELEC抓取数据
-export function updateDashboardelecdata(data) {
-  return request({
-    url: '/his/dashboardelecdata',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除电厂大屏DASHBOARDELEC抓取数据
-export function delDashboardelecdata(id) {
-  return request({
-    url: '/his/dashboardelecdata/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出电厂大屏DASHBOARDELEC抓取数据
-export function exportDashboardelecdata(query) {
-  return request({
-    url: '/his/dashboardelecdata/export',
-    method: 'get',
-    params: query
-  })
-}
-// 查询最后一条dashboardelec抓取数据
-export function selectLast(query) {
-  return request({
-    url: '/aspen/dashboardelecdata/selectLast',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询月度dashboardelec抓取数据
-export function selectMonth(query) {
-  return request({
-    url: '/aspen/dashboardelecdata/month',
-    method: 'get',
-    params: query
-  })
-}

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

@@ -33,6 +33,17 @@
 <script>
 import centreLeft1Chart from "./echart/centerLeft2/centreLeft1Chart";
 export default {
+  props: {
+    monthData: {},
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '2.2rem'
+    }
+  },
   data() {
     return {
       config: {
@@ -108,6 +119,7 @@ export default {
     this.initTwoChart();
     this.initThreeChart();
     this.initFourChart();
+    console.log('aaaa',this.monthData)
   },
   methods: {
     changeTiming() {
@@ -124,7 +136,12 @@ export default {
     initOneChart() {
       // 基于准备好的dom，初始化echarts实例
       this.chart = this.echarts.init(document.getElementById('oneGTGyChart'))
-
+      const dateDay = [];
+      const dateNum = [];
+      for (let i = 0; i < this.monthData.length; i++) {
+        dateDay[i] = this.monthData[i].dateDay
+        dateNum[i] = this.monthData[i].gtg1Lv
+      }
       this.chart.setOption({
         /* 周围边距 */
         grid: {
@@ -136,14 +153,16 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          // data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          data:dateDay
         },
         yAxis: {
           type: 'value'
         },
         series: [
           {
-            data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            // data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            data:dateNum,
             type: 'line',
             itemStyle: {
               color: 'rgb(78,109,60)'
@@ -168,6 +187,12 @@ export default {
     initTwoChart() {
       // 基于准备好的dom，初始化echarts实例
       this.chart = this.echarts.init(document.getElementById('twoGTGyChart'))
+      const dateDay = [];
+      const dateNum = [];
+      for (let i = 0; i < this.monthData.length; i++) {
+        dateDay[i] = this.monthData[i].dateDay
+        dateNum[i] = this.monthData[i].gtg2Lv
+      }
 
       this.chart.setOption({
         /* 周围边距 */
@@ -180,14 +205,16 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          // data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          data:dateDay
         },
         yAxis: {
           type: 'value'
         },
         series: [
           {
-            data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            // data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            data:dateNum,
             type: 'line',
             itemStyle: {
               color: 'rgb(24,56,255)'
@@ -212,6 +239,12 @@ export default {
     initThreeChart() {
       // 基于准备好的dom，初始化echarts实例
       this.chart = this.echarts.init(document.getElementById('threeGTGyChart'))
+      const dateDay = [];
+      const dateNum = [];
+      for (let i = 0; i < this.monthData.length; i++) {
+        dateDay[i] = this.monthData[i].dateDay
+        dateNum[i] = this.monthData[i].gtg3Lv
+      }
 
       this.chart.setOption({
         /* 周围边距 */
@@ -224,14 +257,16 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          // data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          data:dateDay
         },
         yAxis: {
           type: 'value'
         },
         series: [
           {
-            data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            // data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            data:dateNum,
             type: 'line',
             itemStyle: {
               color: 'rgb(142,161,131)'
@@ -256,6 +291,12 @@ export default {
     initFourChart() {
       // 基于准备好的dom，初始化echarts实例
       this.chart = this.echarts.init(document.getElementById('fourGTGyChart'))
+      const dateDay = [];
+      const dateNum = [];
+      for (let i = 0; i < this.monthData.length; i++) {
+        dateDay[i] = this.monthData[i].dateDay
+        dateNum[i] = this.monthData[i].stg1Lv
+      }
 
       this.chart.setOption({
         /* 周围边距 */
@@ -268,14 +309,16 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          // data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          data:dateDay
         },
         yAxis: {
           type: 'value'
         },
         series: [
           {
-            data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            // data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            data:dateNum,
             type: 'line',
             itemStyle: {
               color: 'rgb(60,95,109)'

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

@@ -27,6 +27,7 @@
 
 <script>
   import centreRight2Chart1 from "@/components/echart/centreRight2/centreRight2Chart1";
+  props:[]
 
   export default {
     data() {

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

@@ -65,7 +65,7 @@
         <div class="content-box">
           <div>
             <dv-border-box-12>
-              <centerLeft1 :dashboardelecdata="dashboardelecdata"/>
+              <centerLeft1 :monthData="monthData"/>
             </dv-border-box-12>
           </div>
           <!-- 中间 -->
@@ -74,7 +74,7 @@
           </div>
           <!-- 中间 -->
           <div>
-            <centerRight2 :dashboardelecdata="dashboardelecdata"/>
+            <centerRight2 :dashboardelecdata="dashboardelecdata,monthData"/>
           </div>
           <div>
             <dv-border-box-13>
@@ -291,12 +291,21 @@ export default {
   created() {
     this.getList1();
     this.getMonthList1();
+    // 每隔30秒请求一次数据
     window.setInterval(() => {
       setTimeout(() => {
         ///调取接口获取数据
         this.getList1();
       }, 0)
     }, 20000)
+
+    // 一天请求一次数据
+    window.setInterval(() => {
+      setTimeout(() => {
+        ///调取接口获取数据
+        this.getMonthList1();
+      }, 0)
+    }, 1000 * 10 * 6 * 60 * 6)
   },
   methods: {
     /** 查询dashboarddayelec抓取数据列表 */
@@ -306,6 +315,7 @@ export default {
         this.dashboardelecdata = response.data;
       });
     },
+    /** 查询dashboarddayelec近三十天抓取数据列表 */
     getMonthList1()
     {
       selectMonth(this.queryParams).then(response => {