Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

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/api/basecfg/facstype.js → ems-ui/src/api/basecfg/facscategory.js

@@ -1,52 +1,52 @@
 import request from '@/utils/request'
 
 // 查询能源设施/系统分类列表
-export function listType(query) {
+export function listFacsCategory(query) {
   return request({
-    url: '/ems/basecfg/facstype/list',
+    url: '/ems/basecfg/facsCategory/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询能源设施/系统分类列表
-export function listAllFacsType() {
+export function listAllFacsCategory() {
   return request({
-    url: '/ems/basecfg/facstype/listall',
+    url: '/ems/basecfg/facsCategory/listall',
     method: 'get'
   })
 }
 
 // 查询能源设施/系统分类详细
-export function getType(id) {
+export function getFacsCategory(id) {
   return request({
-    url: '/ems/basecfg/facstype/' + id,
+    url: '/ems/basecfg/facsCategory/' + id,
     method: 'get'
   })
 }
 
 // 新增能源设施/系统分类
-export function addType(data) {
+export function addFacsCategory(data) {
   return request({
-    url: '/ems/basecfg/facstype',
+    url: '/ems/basecfg/facsCategory',
     method: 'post',
     data: data
   })
 }
 
 // 修改能源设施/系统分类
-export function updateType(data) {
+export function updateFacsCategory(data) {
   return request({
-    url: '/ems/basecfg/facstype',
+    url: '/ems/basecfg/facsCategory',
     method: 'put',
     data: data
   })
 }
 
 // 删除能源设施/系统分类
-export function delType(id) {
+export function delFacsCategory(id) {
   return request({
-    url: '/ems/basecfg/facstype/' + id,
+    url: '/ems/basecfg/facsCategory/' + id,
     method: 'delete'
   })
 }

ems-ui/src/views/basecfg/emsfacs/index.vue

@@ -16,9 +16,9 @@
           <el-form-item label="设施名称" prop="facsName">
             <el-input v-model="queryParams.facsName" placeholder="请输入设施名称" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="设施分类" prop="facsType">
-            <el-select v-model="queryParams.facsType" @change="handleFacsTypeChange">
-              <el-option v-for="item in facsTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
+          <el-form-item label="设施分类" prop="facsCategory">
+            <el-select v-model="queryParams.facsCategory" @change="handleFacsCategoryChange">
+              <el-option v-for="item in facsCategoryOptions" :label="item.name" :value="item.code" :key="item.code" />
             </el-select>
           </el-form-item>
           <el-form-item label="设施子类" prop="facsSubtype">
@@ -53,8 +53,8 @@
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="设施代码" align="center" prop="facsCode" />
           <el-table-column label="设施名称" align="center" prop="facsName" />
-          <el-table-column label="设施分类" align="center" prop="facsTypeName" />
-          <el-table-column label="设施子类" align="center" prop="facsSubtypeName" />
+          <el-table-column label="设施分类" align="center" prop="facsCategoryName" />
+          <el-table-column label="设施子类" align="center" prop="facsSubCategoryName" />
           <el-table-column label="启用状态" align="center" prop="enable">
             <template slot-scope="scope">
               <span
@@ -99,14 +99,14 @@
             <el-form-item label="设施名称" prop="facsName">
               <el-input v-model="form.facsName" placeholder="请输入设施名称" />
             </el-form-item>
-            <el-form-item label="设施分类" prop="facsType">
-              <el-select v-model="form.facsType" @change="handleFacsTypeChange" style="width:100%">
-                <el-option v-for="item in facsTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
+            <el-form-item label="设施分类" prop="facsCategory">
+              <el-select v-model="form.facsCategory" @change="handleFacsCategoryChange" style="width:100%">
+                <el-option v-for="item in facsCategoryOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
-            <el-form-item label="设施子类" prop="facsSubtype">
-              <el-select v-model="form.facsSubtype" style="width:100%">
-                <el-option v-for="item in facsSubTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
+            <el-form-item label="设施子类" prop="facsSubCategory">
+              <el-select v-model="form.facsSubCategory" style="width:100%">
+                <el-option v-for="item in facsSubCategoryOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
             <el-form-item label="启用状态" prop="enable">
@@ -256,7 +256,7 @@ import {
   updateSubtable,
   delSubtable
 } from '@/api/basecfg/emsfacs'
-import { listAllFacsType } from '@/api/basecfg/facstype'
+import { listAllFacsCategory } from '@/api/basecfg/facscategory'
 import { areaTreeSelect } from '@/api/basecfg/area'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -294,8 +294,8 @@ export default {
         label: 'label'
       },
       // 设施分类列表
-      facsTypeOptions: undefined,
-      facsSubTypeOptions: undefined,
+      facsCategoryOptions: undefined,
+      facsSubCategoryOptions: undefined,
       enableOptions: [
         { code: 0, name: '关闭' },
         { code: 1, name: '启用' }
@@ -306,8 +306,8 @@ export default {
         pageSize: 10,
         facsCode: null,
         facsName: null,
-        facsType: null,
-        facsSubtype: null,
+        facsCategory: null,
+        facsSubCategory: null,
         enable: null,
         refArea: null
       },
@@ -316,8 +316,8 @@ export default {
         id: null,
         facsCode: null,
         facsName: null,
-        facsType: null,
-        facsSubtype: null,
+        facsCategory: null,
+        facsSubCategory: null,
         enable: null,
         refArea: null,
         createTime: null,
@@ -327,7 +327,7 @@ export default {
       rules: {
         facsCode: [{ required: true, message: '设施代码不能为空', trigger: 'blur' }],
         facsName: [{ required: true, message: '设施名称不能为空', trigger: 'blur' }],
-        facsType: [{ required: true, message: '设施分类不能为空', trigger: 'change' }],
+        facsCategory: [{ required: true, message: '设施分类不能为空', trigger: 'change' }],
         refArea: [{ required: true, message: '归属区域代码不能为空', trigger: 'blur' }]
       },
       curRow: {},
@@ -371,7 +371,7 @@ export default {
   created() {
     this.getList()
     this.getAreaTree('Area')
-    this.getAllFacsType()
+    this.getAllFacsCategory()
   },
   methods: {
     /** 查询能源设施/系统列表 */
@@ -424,7 +424,7 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改能源设施'
-        this.handleFacsTypeChange(response.data.facsType)
+        this.handleFacsCategoryChange(response.data.facsCategory)
       })
     },
     /** 提交按钮 */
@@ -502,19 +502,19 @@ export default {
       this.handleQuery()
     },
     /** 获取设施分类 **/
-    getAllFacsType() {
-      listAllFacsType().then(response => {
-        this.facsTypeOptions = response.data
+    getAllFacsCategory() {
+      listAllFacsCategory().then(response => {
+        this.facsCategoryOptions = response.data
       })
     },
-    handleFacsTypeChange(code) {
+    handleFacsCategoryChange(code) {
       const obj = {}
-      this.facsTypeOptions.forEach(item => {
+      this.facsCategoryOptions.forEach(item => {
         if (item.code && Array.isArray(item.subtypeList)) {
           obj[item.code] = item.subtypeList
         }
       })
-      this.facsSubTypeOptions = obj[code] || []
+      this.facsSubCategoryOptions = obj[code] || []
     },
     getSubtableList() {
       getSubtable(this.subKey, { facsCode: this.curRow.facsCode }).then(({ code, rows }) => {

ems-ui/src/views/basecfg/facstype/index.vue → ems-ui/src/views/basecfg/facscategory/index.vue

@@ -2,37 +2,36 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" />
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">设施大类</el-col>
+      <el-col :span="1.5">设施类别</el-col>
     </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['basecfg:facstype:add']">新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['basecfg:facscategory:add']">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['basecfg:facstype:edit']">修改</el-button>
+          v-hasPermi="['basecfg:facscategory:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['basecfg:facstype:remove']">删除</el-button>
+          v-hasPermi="['basecfg:facscategory:remove']">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="系统代码" align="center" prop="code" />
-      <el-table-column label="系统名称" align="center" prop="name" />
+      <el-table-column label="类别代码" align="center" prop="code" />
+      <el-table-column label="类别名称" align="center" prop="name" />
       <el-table-column label="说明" align="center" prop="desc" />
       <el-table-column label="数据版本" align="center" prop="version" />
       <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:facstype:edit']">
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:facscategory:edit']">
             修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:facstype:remove']">
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:facscategory:remove']">
             删除</el-button>
-
         </template>
       </el-table-column>
     </el-table>
@@ -42,11 +41,11 @@
     <!-- 添加或修改能源设施/系统分类对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="系统代码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入设施系统代码" />
+        <el-form-item label="类别代码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入设施类别代码" />
         </el-form-item>
-        <el-form-item label="系统名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入设施系统名称" />
+        <el-form-item label="类别名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设施类别名称" />
         </el-form-item>
         <el-form-item label="说明" prop="desc">
           <el-input v-model="form.desc" placeholder="请输入说明" />
@@ -54,14 +53,14 @@
         <el-form-item label="数据版本" prop="version">
           <el-input v-model="form.version" placeholder="请输入数据版本" />
         </el-form-item>
-        <el-form-item label="系统子类" prop="subtypeList">
+        <el-form-item label="类别细分" prop="subtypeList">
           <el-table class="sub-table" v-loading="loading" :data="form.subtypeList" max-height="280px">
-            <el-table-column label="子系统代码" align="center" prop="code">
+            <el-table-column label="子类别代码" align="center" prop="code">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.code" placeholder="请输入代码" />
               </template>
             </el-table-column>
-            <el-table-column label="子系统名称" align="center" prop="name">
+            <el-table-column label="子类别名称" align="center" prop="name">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.name" placeholder="请输入名称" />
               </template>
@@ -88,7 +87,7 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType } from '@/api/basecfg/facstype'
+import { listFacsCategory, getFacsCategory, delFacsCategory, addFacsCategory, updateFacsCategory } from '@/api/basecfg/facscategory'
 
 export default {
   name: 'Type',
@@ -157,7 +156,7 @@ export default {
     /** 查询能源设施/系统分类列表 */
     getList() {
       this.loading = true
-      listType(this.queryParams).then(response => {
+      listFacsCategory(this.queryParams).then(response => {
         this.typeList = response.rows
         this.total = response.total
         this.loading = false
@@ -199,7 +198,7 @@ export default {
     handleUpdate(row) {
       this.reset()
       const id = row.id || this.ids
-      getType(id).then(response => {
+      getFacsCategory(id).then(response => {
         this.form = response.data
         this.open = true
         this.title = '修改能源设施/系统分类'
@@ -211,13 +210,13 @@ export default {
         if (valid) {
           this.form.subtypeList = this.form.subtypeList.filter(item => item.name !== '' && item.value !== '')
           if (this.form.id != null) {
-            updateType(this.form).then(response => {
+            updateFacsCategory(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
               this.getList()
             })
           } else {
-            addType(this.form).then(response => {
+            addFacsCategory(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
               this.open = false
               this.getList()
@@ -232,23 +231,13 @@ export default {
       this.$modal
         .confirm('是否确认删除能源设施/系统分类编号为"' + ids + '"的数据项？')
         .then(function() {
-          return delType(ids)
+          return delFacsCategory(ids)
         })
         .then(() => {
           this.getList()
           this.$modal.msgSuccess('删除成功')
         })
         .catch(() => {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'ems/basecfg/facstype/export',
-        {
-          ...this.queryParams
-        },
-        `type_${new Date().getTime()}.xlsx`
-      )
     }
   }
 }

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,