diff --git a/src/api/energy/record/statistics.js b/src/api/energy/record/statistics.js new file mode 100644 index 0000000..dc3c395 --- /dev/null +++ b/src/api/energy/record/statistics.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +export function listEnergyStatistics(query) { + return request({ + url: '/energy/report/preview/productionLineEnergyConsumption', + method: 'get', + params: query + }) +} + +export function getEnergyConsumptionTrendAnalysis(query) { + return request({ + url: '/energy/report/preview/energyConsumptionTrendAnalysis', + method: 'get', + params: query + }) +} + +export function getLinesConsumptionComparison(query) { + return request({ + url: '/energy/report/preview/linesConsumptionComparison', + method: 'get', + params: query + }) +} + +export function getProductConsumptionComparison(query) { + return request({ + url: '/energy/report/preview/productConsumptionComparison', + method: 'get', + params: query + }) +} diff --git a/src/views/energy/energy/base/buildInfo/index.vue b/src/views/energy/energy/base/buildInfo/index.vue index f2de43e..e20d1c2 100644 --- a/src/views/energy/energy/base/buildInfo/index.vue +++ b/src/views/energy/energy/base/buildInfo/index.vue @@ -43,10 +43,10 @@ @keyup.enter.native="handleQuery" /> --> - - 搜索 + 搜索 重置 @@ -82,7 +82,8 @@ size="mini" @click="handleAdd" v-hasPermi="['base:buildInfo:add']" - >新增 + >新增 + 展开/折叠 + >展开/折叠 + - 共{{list.length}}条 + 共{{ list.length }}条 @@ -110,15 +112,20 @@ > - + - +--> + + + + + + @@ -129,21 +136,24 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['base:buildInfo:edit']" - >修改 + >修改 + 新增 + >新增 + 删除 + >删除 + @@ -152,13 +162,14 @@ - + - + @@ -166,14 +177,22 @@ v-for="dict in dict.type.monitorStatus" :key="dict.value" :label="parseInt(dict.value)" - >{{dict.label}} + >{{ dict.label }} + + + + + + {{ dict.label }} + - - + + + + + {{ item.label }} + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + diff --git a/src/views/energy/report/linesConsumptionComparison/index.vue b/src/views/energy/report/linesConsumptionComparison/index.vue new file mode 100644 index 0000000..be3ca8a --- /dev/null +++ b/src/views/energy/report/linesConsumptionComparison/index.vue @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/energy/report/productConsumptionComparison/index.vue b/src/views/energy/report/productConsumptionComparison/index.vue new file mode 100644 index 0000000..204d235 --- /dev/null +++ b/src/views/energy/report/productConsumptionComparison/index.vue @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/energy/report/productionLineEnergyConsumption/index.vue b/src/views/energy/report/productionLineEnergyConsumption/index.vue new file mode 100644 index 0000000..24b3cc5 --- /dev/null +++ b/src/views/energy/report/productionLineEnergyConsumption/index.vue @@ -0,0 +1,260 @@ + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + {{ scope.row.percentage }}% + + + + + + + + + + +