update

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

@@ -1,8 +1,8 @@
 <template>
-  <div class="app-container" >
+  <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="4" :xs="24" >
-        <div class="head-container" >
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
           <el-input
             v-model="areaName"
             placeholder="请输入区域名称"
@@ -34,23 +34,28 @@
           <el-tab-pane label="输能设备" name="W"></el-tab-pane>
           <el-tab-pane label="用能设备" name="Z"></el-tab-pane>
         </el-tabs>
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px"
+        >
           <el-form-item label="设备分类" prop="deviceSubCategory">
-            <el-select v-model="queryParams.deviceSubCategory" >
+            <el-select v-model="queryParams.deviceSubCategory">
               <el-option v-for="item in subCategoryOptions" placeholder="设备分类" :label="item.name" :value="item.code"
-                         :key="item.code" />
+                         :key="item.code"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="归属设施" prop="refFacs">
             <el-select v-model="queryParams.refFacs">
               <el-option v-for="item in facsOptions" :label="item.facsName" :value="item.facsCode"
-                         :key="item.facsCode" />
+                         :key="item.facsCode"
+              />
             </el-select>
           </el-form-item>
           <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" />
+                         :key="item.systemCode"
+              />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -59,17 +64,17 @@
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="deviceList" >
+        <el-table v-loading="loading" :data="deviceList">
           <el-table-column label="设备名称" align="left" prop="deviceName"/>
           <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="deviceStatus">-->
-<!--            <template slot-scope="scope">-->
-<!--              <dict-tag :options="dict.type.sys_device_stat" :value="scope.row.deviceStatus"/>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="设备状态" align="center" prop="deviceStatus">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <dict-tag :options="dict.type.sys_device_stat" :value="scope.row.deviceStatus"/>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column label="设备状态" align="center" prop="deviceStatus">
             <template slot-scope="scope">
                 <span
@@ -92,7 +97,7 @@
           </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"  @click="handleDetail(scope.row)">详情</el-button>
+              <el-button size="mini" type="text" @click="handleDetail(scope.row)">详情</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -209,12 +214,12 @@
 
 <script>
 import { listDevRecursionByArea } from '@/api/device/device'
-import { areaTreeSelect } from "@/api/basecfg/area"
+import { areaTreeSelect } from '@/api/basecfg/area'
 import { getFacsCategorygetByCode, listAllFacs } from '@/api/basecfg/emsfacs'
 import { listSubsystemAll } from '@/api/adapter/subsystem'
-import { getModelByCode } from "@/api/basecfg/objModel";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getModelByCode } from '@/api/basecfg/objModel'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
   name: 'Device',
@@ -251,8 +256,8 @@ export default {
       subsystemOptions: undefined,
       subCategoryOptions: undefined,
       defaultProps: {
-        children: "children",
-        label: "label"
+        children: 'children',
+        label: 'label'
       },
       curRow: {},
       attrData: [],
@@ -262,26 +267,21 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        deviceCode: null,
-        deviceName: null,
         deviceSubCategory: '',
         deviceCategory: 'E',
-        deviceStatus: null,
         locationType: null,
         locationRef: null,
         refFacs: null,
         subsystemCode: null
-      },
-      // 表单参数
-      form: {}
+      }
     }
   },
   created() {
-    this.getList();
-    this.getAreaTree('Building');
-    this.getFacsOptions();
-    this.getSubsystem();
-    this.getSubCategorygetByCode();
+    this.getList()
+    this.getAreaTree('Building')
+    this.getFacsOptions()
+    this.getSubsystem()
+    this.getSubCategorygetByCode()
   },
   methods: {
     getDeviceStatusText(status) {
@@ -289,20 +289,20 @@ export default {
         0: '运行',
         1: '故障',
         2: '未运行'
-      };
-      return statusMap[status] || '';
+      }
+      return statusMap[status] || ''
     },
     getDeviceStatusTextColor(status) {
-      if (status === 0) return 'rgb(232,244,255)';
-      if (status === 1) return '#FFFFFF';
-      if (status === 2) return 'rgb(255,235,235)';
-      return '#000000'; // 默认黑色文字
+      if (status === 0) return 'rgb(232,244,255)'
+      if (status === 1) return '#FFFFFF'
+      if (status === 2) return 'rgb(255,235,235)'
+      return '#000000' // 默认黑色文字
     },
     getDeviceStatusBgColor(status) {
-      if (status === 0) return 'rgb(117,186,255)';
-      if (status === 1) return 'rgb(242,197,92)';
-      if (status === 2) return 'rgb(255,159,159)';
-      return 'transparent'; // 默认无背景色
+      if (status === 0) return 'rgb(117,186,255)'
+      if (status === 1) return 'rgb(242,197,92)'
+      if (status === 2) return 'rgb(255,159,159)'
+      return 'transparent' // 默认无背景色
     },
     /** 查询能源设备列表 */
     getList() {
@@ -316,45 +316,29 @@ export default {
     /** 查询区域树结构 */
     getAreaTree(tier) {
       areaTreeSelect(tier).then(response => {
-        this.treeAreaOptions =  [{
+        this.treeAreaOptions = [{
           id: '-1',
           label: '全部',
           children: response.data
         }]
-      });
+      })
     },
     // 筛选节点
     filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.locationType = data.tier;
-      this.queryParams.locationRef = data.id;
-      this.handleQuery();
+      this.queryParams.locationType = data.tier
+      this.queryParams.locationRef = data.id
+      this.handleQuery()
     },
     // 取消按钮
     cancel() {
       this.open = false
       this.reset()
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        deviceCode: null,
-        deviceName: null,
-        deviceSubCategory: null,
-        deviceCategory: null,
-        deviceStatus: null,
-        locationRef: null,
-        refFacs: null,
-        createTime: null,
-        updateTime: null
-      }
-      this.resetForm('form')
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -362,23 +346,23 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.locationType = null;
-      this.queryParams.locationRef = null;
+      this.queryParams.locationType = null
+      this.queryParams.locationRef = null
       this.resetForm('queryForm')
       this.handleQuery()
     },
     // 设备状态详情
     handleDetail(row) {
       this.reset()
-      this.curRow= row
-      console.log("设备data",this.curRow)
+      this.curRow = row
+      console.log('设备data', this.curRow)
       getModelByCode(this.curRow.deviceModel).then(response => {
         this.open = true
-        const code=response.data
-        console.log("code",code)
-        this.attrData=response.data.attrList
-        this.eventData=response.data.eventList
-        this.abilityData=response.data.abilityList
+        const code = response.data
+        console.log('code', code)
+        this.attrData = response.data.attrList
+        this.eventData = response.data.eventList
+        this.abilityData = response.data.abilityList
       })
     },
     getFacsOptions() {
@@ -387,30 +371,37 @@ export default {
         subCategory: this.queryParams.deviceSubCategory
       }
       listAllFacs(getFacsParams).then(response => {
-        this.facsOptions = response.data;
+        this.facsOptions = response.data
       })
     },
     getSubsystem() {
-      listSubsystemAll().then(response =>{
-        this.subsystemOptions = response.data;
+      listSubsystemAll().then(response => {
+        this.subsystemOptions = response.data
       })
     },
-    getSubCategorygetByCode () {
+    getSubCategorygetByCode() {
       getFacsCategorygetByCode(this.queryParams.deviceCategory).then(response => {
-        this.subCategoryOptions = response.data.subtypeList||[];
+        this.subCategoryOptions = response.data.subtypeList || []
       })
     },
-    deviceCategoryChange () {
-      this.queryParams.deviceSubCategory = ''
+    deviceCategoryChange() {
+      this.reset()
       if (this.queryParams.deviceCategory === 'E' || this.queryParams.deviceCategory === 'W'
-        || this.queryParams.deviceCategory === 'T'|| this.queryParams.deviceCategory === 'C') {
-        this.getAreaTree("Building")
+        || this.queryParams.deviceCategory === 'T' || this.queryParams.deviceCategory === 'C') {
+        this.getAreaTree('Building')
       } else if (this.queryParams.deviceCategory === 'Z') {
-        this.getAreaTree("Zoning")
+        this.getAreaTree('Zoning')
       }
       this.getSubCategorygetByCode()
       this.getFacsOptions()
       this.handleQuery()
+    },
+    reset() {
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.queryParams.deviceSubCategory = ''
+      this.queryParams.refFacs = null
+      this.queryParams.subsystemCode = null
     }
   }
 }
@@ -429,5 +420,4 @@ export default {
 }
 
 
-
 </style>

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

@@ -294,9 +294,9 @@ export default {
     },
 
     getPowerInfo () {
-      const [{deviceCode, refArea}] = this.powerList.filter(item => item.deviceCode === this.powerCode)
+      const [{deviceCode, areaCode}] = this.powerList.filter(item => item.deviceCode === this.powerCode)
       getNewIndex({
-        areaCode: refArea,
+        areaCode: areaCode,
         objType: '2',
         objCode: deviceCode
       }).then(({code, data}) => {

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

@@ -1,165 +1,155 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="策略名称" prop="strategyName">
-        <el-input
-            v-model="queryParams.strategyName"
-            placeholder="请输入策略名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="策略类型" prop="strategyType">
-        <el-select v-model="queryParams.strategyType" placeholder="请选择策略类型" clearable>
-          <el-option
-              v-for="dict in dict.type.strategy_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="执行模式" prop="execMode">
-        <el-select v-model="queryParams.execMode" placeholder="请选择执行模式" clearable>
-          <el-option
-              v-for="dict in dict.type.exec_mode"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <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="['ems:energyStrategy:add']"
-        >新增
-        </el-button>
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <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 :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" />
+        </div>
       </el-col>
-      <el-col :span="1.5">
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+      <el-col :span="20" :xs="24">
+        <el-tabs v-model="strategyType" @tab-click="strategyTypeChange">
+          <el-tab-pane label="源网协调" name="1"></el-tab-pane>
+          <el-tab-pane label="源荷互动" name="2"></el-tab-pane>
+          <el-tab-pane label="网储互动" name="3"></el-tab-pane>
+          <el-tab-pane label="其他" name="4"></el-tab-pane>
+        </el-tabs>
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="策略名称" prop="strategyName">
+            <el-input
+              v-model="queryParams.strategyName"
+              placeholder="请输入策略名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="执行模式" prop="execMode">
+            <el-select v-model="queryParams.execMode" placeholder="请选择执行模式" clearable>
+              <el-option
+                v-for="dict in dict.type.exec_mode"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
 
-    <el-table v-loading="loading" :data="energyStrategyList" @selection-change="handleSelectionChange">
-      <el-table-column label="策略代码" align="center" prop="strategyCode" />
-      <el-table-column label="策略名称" align="center" prop="strategyName" />
-      <el-table-column label="策略描述" align="center" prop="strategyDesc" />
-      <el-table-column label="策略类型" align="center" prop="strategyType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.strategy_type" :value="scope.row.strategyType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="执行模式" align="center" prop="execMode">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.exec_mode" :value="scope.row.execMode" />
-        </template>
-      </el-table-column>
-      <el-table-column label="执行规则" align="center" prop="execRule" />
-      <el-table-column label="允许修改" align="center" prop="allowModify">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.allow_modify" :value="scope.row.allowModify" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
               size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['ems:energyStrategy:edit']"
-          >修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:energyStrategy:remove']">
-            删除</el-button>
+              @click="handleAdd"
+              v-hasPermi="['ems:energyStrategy:add']"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="energyStrategyList" @selection-change="handleSelectionChange">
+          <el-table-column label="策略代码" align="center" prop="strategyCode" />
+          <el-table-column label="策略名称" align="center" prop="strategyName" />
+          <el-table-column label="策略类型" align="center" prop="strategyType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.strategy_type" :value="scope.row.strategyType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="执行模式" align="center" prop="execMode">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.exec_mode" :value="scope.row.execMode" />
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="strategyState" >
+            <template slot-scope="scope">
+              <scope>{{ getStateName(scope.row.strategyState)}}</scope>
+            </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="['ems:energyStrategy:edit']"
+              >修改
+              </el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:energyStrategy:remove']">
+                删除</el-button>
 
-    <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-    />
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <!-- 添加或修改能源策略对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="策略代码" prop="strategyCode">
-          <el-input v-model="form.strategyCode" placeholder="请输入策略代码" />
-        </el-form-item>
-        <el-form-item label="策略名称" prop="strategyName">
-          <el-input v-model="form.strategyName" placeholder="请输入策略名称" />
-        </el-form-item>
-        <el-form-item label="策略描述" prop="strategyDesc">
-          <el-input v-model="form.strategyDesc" placeholder="请输入策略描述" />
-        </el-form-item>
-        <el-form-item label="策略类型" prop="strategyType">
-          <el-select v-model="form.strategyType" placeholder="请选择策略类型">
-            <el-option
-                v-for="dict in dict.type.strategy_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="执行模式" prop="execMode">
-          <el-select v-model="form.execMode" placeholder="请选择执行模式">
-            <el-option
-                v-for="dict in dict.type.exec_mode"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="执行规则" prop="execRule">
-          <el-input v-model="form.execRule" placeholder="请输入执行规则" />
-        </el-form-item>
-        <el-form-item label="允许修改" prop="allowModify">
-          <el-select v-model="form.allowModify" placeholder="请选择允许修改">
-            <el-option
-                v-for="dict in dict.type.allow_modify"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+        <!-- 添加或修改能源策略对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="地块" prop="areaCode">
+              <treeselect v-model="form.areaCode" :options="areaOptions" :show-count="true" placeholder="请选择策略区域" />
+            </el-form-item>
+            <el-form-item label="策略代码" prop="strategyCode">
+              <el-input v-model="form.strategyCode" placeholder="请输入策略代码" />
+            </el-form-item>
+            <el-form-item label="策略名称" prop="strategyName">
+              <el-input v-model="form.strategyName" placeholder="请输入策略名称" />
+            </el-form-item>
+            <el-form-item label="执行模式" prop="execMode">
+              <el-select v-model="form.execMode" placeholder="请选择执行模式" @change="handleExecModeChange">
+                <el-option
+                  v-for="dict in dict.type.exec_mode"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="showExecRule" label="执行规则" prop="execRule">
+              <el-input v-model="form.execRule" placeholder="请输入执行规则" />
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import {
-  addEnergyStrategy, delEnergyStrategy, getEnergyStrategy, listEnergyStrategy, updateEnergyStrategy,
-} from '@/api/mgr/energyStrategy';
+import { addEnergyStrategy, delEnergyStrategy, getEnergyStrategy, listEnergyStrategy, updateEnergyStrategy} from '@/api/mgr/energyStrategy';
+import { areaTreeSelect } from '@/api/basecfg/area'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
   name: 'EnergyStrategy',
   dicts: ['strategy_type', 'allow_modify', 'exec_mode'],
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -180,22 +170,35 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      areaCode: undefined,
+      // 区域名称
+      areaName: undefined,
+      areaOptions: [],
+      strategyType: 1,
+      showExecRule: false,
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        strategyCode: null,
-        strategyName: null,
-        strategyDesc: null,
+        areaCode: null,
         strategyType: null,
-        execMode: null,
-        execRule: null,
-        allowModify: null,
+        execMode: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        areaCode: [
+          {
+            required: true,
+            message: '地块不能为空',
+            trigger: 'blur',
+          },
+        ],
         strategyCode: [
           {
             required: true,
@@ -235,6 +238,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.strategyType = 1;
+    this.getAreaTree('Area')
     this.getList();
   },
   methods: {
@@ -256,15 +261,14 @@ export default {
     reset() {
       this.form = {
         id: null,
+        areaCode: null,
         strategyCode: null,
         strategyName: null,
         strategyDesc: null,
         strategyType: null,
+        strategyState: null,
         execMode: null,
-        execRule: null,
-        allowModify: null,
-        createTime: null,
-        updateTime: null,
+        execRule: null
       };
       this.resetForm('form');
     },
@@ -289,6 +293,8 @@ export default {
       this.reset();
       this.open = true;
       this.title = '添加能源策略';
+      this.form.execMode = 99;
+      this.form.strategyType = this.strategyType;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -330,12 +336,40 @@ export default {
         this.$modal.msgSuccess('删除成功');
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('ems/energyStrategy/export', {
-        ...this.queryParams,
-      }, `energyStrategy_${new Date().getTime()}.xlsx`);
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.areaCode = data.id
+      this.handleQuery()
+    },
+    /** 查询区域树结构 */
+    getAreaTree(tier) {
+      areaTreeSelect(tier).then(response => {
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+      })
+    },
+    strategyTypeChange() {
+      this.queryParams.strategyType = this.strategyType
+      this.getList()
+    },
+    handleExecModeChange(value) {
+      this.showExecRule = value === 1;
     },
+    getStateName(key) {
+      if (key === null || key === 0) {
+        return "停用"
+      } else {
+        return "启用"
+      }
+    }
   },
 };
 </script>