设施类别改造

ems-ui/src/api/basecfg/area.js

@@ -72,9 +72,9 @@ export function areaTreeSelectByTag(tier, tagCode) {
   })
 }
 
-export function areaWithFacsType(facsType, facsSubType) {
+export function areaWithFacsCategory(category, subCategory) {
   return request({
-    url: '/ems/basecfg/area/listWithFacsType?facsType=' + facsType + '&facsSubType=' + facsSubType,
+    url: '/ems/basecfg/area/listWithFacsCategory?facsCategory=' + category + '&facsSubCategory=' + subCategory,
     method: 'get'
   })
 }

ems-ui/src/views/mgr/powergrid.vue

@@ -67,7 +67,7 @@
 <script>
 import { listPgSupplyH, listPvSupplyH } from '@/api/mgr/pgSupplyH'
 import BaseChart from '@/components/BaseChart'
-import { areaWithFacsType } from '@/api/basecfg/area'
+import { areaWithFacsCategory } from '@/api/basecfg/area'
 export default {
   name: 'PgSupplyH',
   dicts: ['meter_type'],
@@ -81,8 +81,8 @@ export default {
       loading: true,
       // 总条数
       total: 0,
-      facsType: '',
-      facsSubType: '',
+      facsCategory: '',
+      facsSubCategory: '',
       pgSupplyHList: [],
       pvSupplyHList: [],
       // 查询参数
@@ -253,14 +253,14 @@ export default {
     }
   },
   async created() {
-    this.facsType = 'W'
+    this.facsCategory = 'W'
     await this.getAreaList()
     this.getList()
   },
   methods: {
     // 查询区域列表
     async getAreaList() {
-      await areaWithFacsType(this.facsType, this.facsSubType).then(response => {
+      await areaWithFacsCategory(this.facsCategory, this.facsSubCategory).then(response => {
         this.areaOptions = response.data
         this.queryParams.areaCode = this.areaOptions[0].areaCode
       })
@@ -268,11 +268,13 @@ export default {
     getList() {
       this.loading = true
       if (this.activeName === 'first') {
+        areaWithFacsCategory('W', '')
         listPgSupplyH(this.queryParams).then(response => {
           this.pgSupplyHList = response.rows
           this.loading = false
         })
       } else {
+        areaWithFacsCategory('E', '')
         listPvSupplyH(this.queryParams).then(response => {
           this.pvSupplyHList = response.data
           this.loading = false

ems-ui/src/views/mgr/powerstore.vue

@@ -22,7 +22,7 @@
 
 <script>
 import { listElecStoreH } from '@/api/mgr/elecStoreH'
-import { areaWithFacsType } from '@/api/basecfg/area'
+import { areaWithFacsCategory, areaWithFacsType } from '@/api/basecfg/area'
 import BaseChart from '@/components/BaseChart'
 export default {
   name: 'ElecStoreH',
@@ -33,8 +33,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      facsType: '',
-      facsSubType: '',
+      facsCategory: '',
+      facsSubCategory: '',
       // 储能计量-小时表格数据
       elecStoreHList: [],
       // 查询参数
@@ -105,14 +105,14 @@ export default {
     }
   },
   async created() {
-    this.facsType = 'C'
+    this.facsCategory = 'C'
     await this.getAreaList()
     this.getList()
   },
   methods: {
     // 查询区域列表
     async getAreaList() {
-      await areaWithFacsType(this.facsType, this.facsSubType).then(response => {
+      await areaWithFacsCategory(this.facsCategory, this.facsSubCategory).then(response => {
         this.areaOptions = response.data
         this.queryParams.areaCode = this.areaOptions[0].areaCode
       })

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

@@ -71,8 +71,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="园区" align="center" prop="areaShortName" />
       <el-table-column label="设施" align="center" prop="facsName" />
-      <el-table-column label="设施类型" align="center" prop="facsType" />
-      <el-table-column label="设施子类" align="center" prop="facsSubtype" />
+      <el-table-column label="设施类型" align="center" prop="facsCategory" />
+      <el-table-column label="设施子类" align="center" prop="facsSubCategory" />
       <el-table-column label="日期" align="center" prop="date" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
@@ -222,8 +222,8 @@ export default {
         id: null,
         areaCode: null,
         facsCode: null,
-        facsType: null,
-        facsSubtype: null,
+        facsCategory: null,
+        facsSubCategory: null,
         date: null,
         time: null,
         timeIndex: null,