lv.wenbin 9 mesi fa
parent
commit
0aa582e009

File diff suppressed because it is too large
+ 307 - 272
ems-ui/src/views/basecfg/device/index.vue


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

@@ -77,11 +77,11 @@
 <script>
 import { listElecStoreH, dayStatistics } from '@/api/mgr/elecStoreH'
 import { areaWithFacsCategoryAsTree } from '@/api/basecfg/area'
-import BaseChart from '@/components/BaseChart'
-import Block from '@/components/Block/block.vue'
 import { dateFormat } from '@/utils/index.js'
 import dayjs from 'dayjs'
 import { DateTool } from '@/utils/DateTool'
+import BaseChart from '@/components/BaseChart'
+import Block from '@/components/Block/block.vue'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -331,7 +331,7 @@ export default {
     handleNodeClick(data) {
       this.queryParams.areaCode = data.id
       this.selectedLabel = data.label
-      this.handleQuery()
+      this.getList()
     },
     /** 搜索按钮操作 */
     tabClick() {

+ 20 - 4
ems-ui/src/views/mgr/poweruse.vue

@@ -8,13 +8,16 @@
       <el-tab-pane v-for="item in facsCategoryOptions" :key="item.code" :label="item.name" :name="item.code">
         <el-col :span="4" :xs="24">
           <div class="head-container">
-            <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small"
+            <el-input v-model="areaName" placeholder="请输入区名称" clearable size="small"
                       prefix-icon="el-icon-search"
                       style="margin-bottom: 20px"
             />
           </div>
-          <div class="head-container">
-            <el-tree ref="tree" :data="areaOptions"/>
+          <div class="head-container" style="height: 100vh; overflow: hidden; position: relative;">
+            <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false"
+                     :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+                     @node-click="handleNodeClick" style="height: calc(100vh - 50px); overflow-y: auto;"
+            />
           </div>
         </el-col>
         <el-col :span="20" :xs="24">
@@ -67,14 +70,23 @@
 </template>
 
 <script>
-import { listH, getH, delH, addH, updateH } from '@/api/mgr/elecUseH'
+import { listH } from '@/api/mgr/elecUseH'
 import { getFacsCategorygetByCode } from '@/api/basecfg/emsfacs'
 import { areaWithFacsCategoryAsTree } from '@/api/basecfg/area'
 import dayjs from 'dayjs'
 import { DateTool } from '@/utils/DateTool'
+import BaseChart from '@/components/BaseChart/index.vue'
+import Block from '@/components/Block/block.vue'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: 'H',
+  components: {
+    Treeselect,
+    BaseChart,
+    Block
+  },
   data() {
     return {
       activeName: 'summery',
@@ -100,6 +112,10 @@ export default {
       facsSubCategory: '',
       // 区域名称
       areaName: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       areaOptions: [],
       facsCategoryOptions: [],
       dateRange: [dayjs().format(DateTool.DateFormat.YYYY_MM_DD_00_00_00), dayjs().format(DateTool.DateFormat.YYYY_MM_DD_23_59_59)],

Some files were not shown because too many files changed in this diff