前后端联调

ems-ui-cloud/src/api/basecfg/emum.js

@@ -5,7 +5,7 @@ import request from '@/utils/request'
  */
 export function getAttrList(modelCode, attrKey) {
   return request({
-    url: '/ems/object/attr/emum/list?modelCode=' + modelCode + '&attrKey=' + attrKey,
+    url: '/ems/object/attr/enum/list?modelCode=' + modelCode + '&attrKey=' + attrKey,
     method: 'get'
   })
 }
@@ -14,7 +14,7 @@ export function getAttrList(modelCode, attrKey) {
  */
 export function getAttrEnumInfo(modelCode, attrKey, attrValue) {
   return request({
-    url: `/ems/object/attr/emum/`,
+    url: `/ems/object/attr/enum/`,
     method: 'get',
     params: {
       modelCode: modelCode,
@@ -28,7 +28,7 @@ export function getAttrEnumInfo(modelCode, attrKey, attrValue) {
  */
 export function addAttrEnums(data) {
   return request({
-    url: '/ems/object/attr/emum/batch',
+    url: '/ems/object/attr/enum/batch',
     method: 'post',
     data: data
   })
@@ -39,7 +39,7 @@ export function addAttrEnums(data) {
  */
 export function delAttrEnum(id) {
   return request({
-    url: '/ems/object/attr/emum/' + id,
+    url: '/ems/object/attr/enum/' + id,
     method: 'delete'
   })
 }

ems-ui-cloud/src/views/analysis/power/consume.vue

@@ -379,10 +379,10 @@ export default {
     getPowerChart () {
       this.powerMaxLoad = ''
       this.powerChartData = []
-      const [startTime, endTime] = this.dateRange
+      const [startRecTime, endRecTime] = this.dateRange
       const params = {
-        startTime,
-        endTime,
+        startRecTime,
+        endRecTime,
         areaCode: this.queryParams.areaCode,
         objType: '2',
       }
@@ -402,10 +402,10 @@ export default {
       })
     },
     getDayMaxLoad () {
-      const [startTime, endTime] = this.maxPowerDate
+      const [startRecTime, endRecTime] = this.maxPowerDate
       getPowerDayMaxLoad({
-        startTime,
-        endTime,
+        startRecTime,
+        endRecTime,
         areaCode: this.queryParams.areaCode,
         objType: '2',
       }).then(({code, rows}) => {

ems-ui-cloud/src/views/analysis/power/prod.vue

@@ -274,17 +274,17 @@ export default {
     getList () {
       this.loading = true
       const {areaCode} = this.queryParams
-      let startTime = ''
-      let endTime = ''
+      let startRecTime = ''
+      let endRecTime = ''
       if (this.dateRange && this.dateRange.length) {
         const [start, end] = this.dateRange
-        startTime = start
-        endTime = end
+        startRecTime = start
+        endRecTime = end
       }
       listPvSupplyD({
         areaCode,
-        startTime,
-        endTime
+        startRecTime,
+        endRecTime
       }).then(({code, data}) => {
         this.loading = false
         if (code === 200) {

ems-ui-cloud/src/views/analysis/power/store.vue

@@ -234,11 +234,11 @@ export default {
     getList () {
       this.loading = true
       const {areaCode} = this.queryParams
-      const [startTime, endTime] = this.dateRange
+      const [startRecTime, endRecTime] = this.dateRange
       getStoreDayList({
         areaCode,
-        startTime,
-        endTime
+        startRecTime,
+        endRecTime
       }).then(({code, data}) => {
         this.loading = false
         if (code === 200) {

ems-ui-cloud/src/views/basecfg/device/index.vue

@@ -38,7 +38,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="子系统" prop="subsystemCode">
+          <el-form-item label="归属系统" prop="subsystemCode">
             <el-select v-model="queryParams.subsystemCode">
               <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode"
                          :key="item.systemCode"
@@ -91,7 +91,7 @@
           <el-table-column label="安装位置" align="left" prop="areaPath" width="220px"/>
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
           <el-table-column label="设备分类" align="center" prop="deviceCategoryName"/>
-          <el-table-column label="子系统" align="center" prop="subsystemName"/>
+          <el-table-column label="归属系统" align="center" prop="subsystemName"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-s-tools" @click="handleDetail(scope.row)"
@@ -189,7 +189,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="子系统" prop="subsystemCode">
+              <el-form-item label="归属系统" prop="subsystemCode">
                 <el-select v-model="form.subsystemCode" clearable>
                   <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode"
                              :key="item.systemCode"
@@ -814,7 +814,7 @@ export default {
   methods: {
     // 根据区域代码获取区域名称
     buildRefAreaName(curRow) {
-      const area = this.treeAreaOptions.find(a => a.id === curRow.areaCode);
+      const area = this.areaOptions.find(a => a.id === curRow.areaCode);
       const areaName = area ? area.label : '未知区域';
 
       if (curRow.locationRef !== curRow.areaCode) {

ems-ui-cloud/src/views/basecfg/meterdevc/index.vue

@@ -63,7 +63,7 @@
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="设备编号" align="left" prop="deviceCode" />
-          <el-table-column label="设备名称" align="left" prop="deviceName" width="200px"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName" width="250px"/>
           <el-table-column label="安装位置" align="left" prop="location" width="200px"/>
           <el-table-column label="计量标签" align="center" prop="objTag">
             <template slot-scope="scope">
@@ -75,11 +75,7 @@
               <span>{{ getColModeName(scope.row.colMode) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="周期时长（秒）" align="center" prop="colCycle">
-            <template slot-scope="scope">
-              <span>{{ scope.row.colCycle}}</span>
-            </template>
-          </el-table-column>
+
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:device:edit']">

ems-ui-cloud/src/views/devmgr/attr/index.vue

@@ -38,7 +38,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="子系统" prop="subsystemCode">
+          <el-form-item label="归属系统" prop="subsystemCode">
             <el-select v-model="queryParams.subsystemCode">
               <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode"
                          :key="item.systemCode"
@@ -56,7 +56,7 @@
           <el-table-column label="归属区域" align="left" prop="areaPath" width="280px"/>
           <el-table-column label="设备分类" align="center" prop="deviceCategoryName"/>
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
-          <el-table-column label="子系统" align="center" prop="subsystemName"/>
+          <el-table-column label="归属系统" align="center" prop="subsystemName"/>
           <el-table-column label="设备状态" align="center" prop="deviceStatus">
             <template slot-scope="scope">
               <span :style="{

ems-ui-cloud/src/views/mgr/poweruse.vue

@@ -116,10 +116,9 @@
 <script>
 import * as echarts from 'echarts/core';
 import {listByFacs,listFacsMeter} from '@/api/device/elecMeterH'
-import {listHSum, sumByFacsH, sumBySubCategoryH, getPowerData, getPowerMaxLoad} from '@/api/mgr/elecUseH'
+import { getPowerData, getPowerMaxLoad} from '@/api/mgr/elecUseH'
 import {getFacsCategorygetByCode} from '@/api/basecfg/emsfacs'
 import {areaTreeByFacsCategory} from '@/api/basecfg/area'
-import {listAllFacs} from '@/api/basecfg/emsfacs'
 import dayjs from 'dayjs'
 import {DateTool} from '@/utils/DateTool'
 import {dateFormat} from '@/utils';
@@ -223,8 +222,6 @@ export default {
         date: null,
         time: null,
         timeIndex: null,
-
-
       },
       queryObjParams: {
         refArea: null,
@@ -570,10 +567,10 @@ export default {
     getPowerChart () {
       this.powerMaxLoad = ''
       this.powerChartData = []
-      const [startTime, endTime] = this.powerDate
+      const [startRecTime, endRecTime] = this.powerDate
       const params = {
-        startTime,
-        endTime,
+        startRecTime,
+        endRecTime,
         areaCode: '-1',
         objType: '2',
       }
@@ -595,10 +592,10 @@ export default {
     getEquipPowerChart () {
       this.equipPowerMaxLoad = ''
       this.equipPowerChartData = []
-      const [startTime, endTime] = this.dateRange
+      const [startRecTime, endRecTime] = this.dateRange
       const params = {
-        startTime,
-        endTime,
+        startRecTime,
+        endRecTime,
         areaCode: '-1',
         objType: '2',
         facsCategory: 'Z',