设施/设备 支持按类型查询

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

@@ -84,9 +84,10 @@ export function delSubtable(type, id) {
     method: 'delete'
   });
 }
+
 export function getFacsCategorygetByCode(code) {
   return request({
-    url: `/ems/basecfg//facsCategory/getByCode?code=${code}`,
+    url: `/ems/basecfg/facsCategory/getByCode?code=${code}`,
     method: 'get'
   });
 }

ems-ui/src/api/device/device.js

@@ -20,9 +20,9 @@ export function listDevRecursionByArea(query) {
 }
 
 // 递归查询 区域/设施 下的设备(分页)
-export function devTreeByFacs(areaCode) {
+export function devTreeByFacs(areaCode, deviceCategory) {
   return request({
-    url: '/ems/device/getTreeByFacs?areaCode=' + areaCode,
+    url: '/ems/device/getTreeByFacs?areaCode=' + areaCode + '&deviceCategory=' + deviceCategory,
     method: 'get'
   })
 }

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

@@ -16,11 +16,17 @@
         <el-tabs v-model="queryParams.deviceCategory" @tab-click="deviceCategoryChange">
           <el-tab-pane label="产能设备" name="E"></el-tab-pane>
           <el-tab-pane label="储能设备" name="C"></el-tab-pane>
-          <el-tab-pane label="供能设备" name="W"></el-tab-pane>
+          <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-item label="设备分类" prop="deviceSubCategory">
+            <el-select v-model="queryParams.deviceSubCategory" >
+              <el-option v-for="item in subCategoryOptions" placeholder="设备分类" :label="item.name" :value="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"
@@ -33,13 +39,6 @@
                 :key="item.systemCode" />
             </el-select>
           </el-form-item>
-          <el-form-item label="设备分类" prop="deviceSubCategory">
-              <el-select v-model="queryParams.deviceSubCategory">
-              <el-option v-for="item in subCategoryOptions" placeholder="设备分类" :label="item.name" :value="item.code"
-                :key="item.code" />
-            </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>
@@ -218,7 +217,7 @@ export default {
   },
   created () {
     this.getList();
-    this.getAreaTree('Zoning');
+    this.getAreaTree('Area');
     this.getFacsOptions("");
     this.getSubsystem();
     this.getSubCategorygetByCode();
@@ -362,6 +361,12 @@ export default {
     },
     deviceCategoryChange () {
       this.queryParams.deviceSubCategory = ''
+      if (this.queryParams.deviceCategory === 'E' || this.queryParams.deviceCategory === 'W'
+        || this.queryParams.deviceCategory === 'T'|| this.queryParams.deviceCategory === 'C') {
+        this.getAreaTree("Area")
+      } else if (this.queryParams.deviceCategory === 'Z') {
+        this.getAreaTree("Zoning")
+      }
       this.getSubCategorygetByCode()
       this.handleQuery()
     }

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

@@ -12,20 +12,21 @@
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
+        <el-tabs v-model="queryParams.facsCategory" @tab-click="facsCategoryChange">
+          <el-tab-pane label="产能设施" name="E"></el-tab-pane>
+          <el-tab-pane label="储能设施" name="C"></el-tab-pane>
+          <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-item label="设施名称" prop="facsName">
-            <el-input v-model="queryParams.facsName" placeholder="请输入设施名称" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <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">
-            <el-select v-model="queryParams.facsSubtype">
-              <el-option v-for="item in facsSubTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
+            <el-select v-model="queryParams.facsSubCategory">
+              <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="facsName">
+            <el-input v-model="queryParams.facsName" placeholder="请输入设施名称" clearable @keyup.enter.native="handleQuery" />
+          </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>
@@ -100,7 +101,7 @@
               <el-input v-model="form.facsName" placeholder="请输入设施名称" />
             </el-form-item>
             <el-form-item label="设施分类" prop="facsCategory">
-              <el-select v-model="form.facsCategory" @change="handleFacsCategoryChange" style="width:100%">
+              <el-select v-model="form.facsCategory"  style="width:100%">
                 <el-option v-for="item in facsCategoryOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
@@ -186,123 +187,6 @@
           </el-card>
         </div>
       </el-dialog>
-
-<!--    <el-drawer :title="curRow.facsName" size="80%" :visible.sync="showDrawer" direction="rtl">-->
-<!--      <div class="drawer-content">-->
-<!--        <el-tabs v-model="subKey">-->
-<!--          <el-tab-pane label="属性定义" name="attr">-->
-<!--            <el-button type="primary" class="mb8" icon="el-icon-plus" size="mini" @click="addSub">新增-->
-<!--            </el-button>-->
-<!--            <el-table class="sub-table" :data="attrData">-->
-<!--              <el-table-column label="序号" align="center" type="index" />-->
-<!--              <el-table-column label="属性名称" align="center" prop="attrName" />-->
-<!--              <el-table-column label="属性描述" align="center" prop="attrDesc" />-->
-<!--              <el-table-column label="属性值" align="center" prop="attrValue" />-->
-<!--              <el-table-column label="属性单位" align="center" prop="attrUnit" />-->
-<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-button size="mini" type="text" @click="editSub(scope.row)">修改</el-button>-->
-<!--                  <el-button size="mini" type="text" class="deleteBtn" @click="deleteSub(scope.row)">-->
-<!--                    删除</el-button>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="能力定义" name="ability">-->
-<!--            <el-button type="primary" class="mb8" icon="el-icon-plus" size="mini" @click="addSub">新增-->
-<!--            </el-button>-->
-<!--            <el-table class="sub-table" :data="abilityData">-->
-<!--              <el-table-column label="序号" align="center" type="index" />-->
-<!--              <el-table-column label="能力名称" align="center" prop="abilityName" />-->
-<!--              <el-table-column label="下发参数" align="center" prop="abilityParam" />-->
-<!--              <el-table-column label="描述" align="center" prop="abilityDesc" />-->
-<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-button size="mini" type="text" @click="editSub(scope.row)">-->
-<!--                    修改</el-button>-->
-<!--                  <el-button size="mini" type="text" class="deleteBtn" @click="deleteSub(scope.row)">-->
-<!--                    删除</el-button>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="事件定义" name="event">-->
-<!--            <el-button type="primary" class="mb8" icon="el-icon-plus" size="mini" @click="addSub">新增-->
-<!--            </el-button>-->
-<!--            <el-table class="sub-table" :data="eventData">-->
-<!--              <el-table-column label="序号" align="center" type="index" />-->
-<!--              <el-table-column label="事件名称" align="center" prop="eventName" />-->
-<!--              <el-table-column label="事件类型" align="center" prop="eventType">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.eventType === 1 ? '消息上报' : '异常告警' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="事件代码" align="center" prop="eventCode" />-->
-<!--              <el-table-column label="外部事件代码" align="center" prop="extEventCode" />-->
-<!--              <el-table-column label="描述" align="center" prop="eventDesc" />-->
-<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-button size="mini" type="text" @click="editSub(scope.row)">修改</el-button>-->
-<!--                  <el-button size="mini" type="text" class="deleteBtn" @click="deleteSub(scope.row)">-->
-<!--                    删除</el-button>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table>-->
-<!--          </el-tab-pane>-->
-<!--        </el-tabs>-->
-<!--      </div>-->
-<!--    </el-drawer>-->
-<!--    <el-dialog :title="subTitle" :visible.sync="subDialogShow" width="450px" append-to-body>-->
-<!--      <el-form v-if="subKey=='attr'" ref="subForm" :model="attrForm" label-width="100px">-->
-<!--        <el-form-item label="属性名称" prop="attrName" required :rules="[{ required: true, message: '属性名称不能为空'}]">-->
-<!--          <el-input v-model="attrForm.attrName" placeholder="请输入属性名称" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="属性值" prop="attrValue">-->
-<!--          <el-input v-model="attrForm.attrValue" placeholder="请输入属性值" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="属性单位" prop="attrUnit">-->
-<!--          <el-input v-model="attrForm.attrUnit" placeholder="请输入属性单位" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="描述" prop="attrDesc">-->
-<!--          <el-input v-model="attrForm.attrDesc" placeholder="请输入描述" />-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <el-form v-else-if="subKey=='ability'" ref="subForm" :model="abilityForm" label-width="100px">-->
-<!--        <el-form-item label="能力名称" prop="abilityName" required :rules="[{ required: true, message: '能力名称不能为空'}]">-->
-<!--          <el-input v-model="abilityForm.abilityName" placeholder="请输入能力名称" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="能力下发参数" prop="abilityParam">-->
-<!--          <el-input v-model="abilityForm.abilityParam" placeholder="请输入能力下发参数" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="描述" prop="abilityDesc">-->
-<!--          <el-input v-model="abilityForm.abilityDesc" placeholder="请输入描述" />-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <el-form v-else-if="subKey=='event'" ref="subForm" :model="eventForm" label-width="100px">-->
-<!--        <el-form-item label="事件名称" prop="eventName" required :rules="[{ required: true, message: '事件名称不能为空'}]">-->
-<!--          <el-input v-model="eventForm.eventName" placeholder="请输入事件名称" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="事件类型" prop="eventType" required :rules="[{ required: true, message: '事件类型不能为空'}]">-->
-<!--          <el-select v-model="eventForm.eventType" style="width:100%" placeholder="请选择事件类型">-->
-<!--            <el-option label="消息上报" :value="1" />-->
-<!--            <el-option label="异常告警" :value="2" />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="事件代码" prop="eventCode">-->
-<!--          <el-input v-model="eventForm.eventCode" placeholder="请输入事件代码" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="外部事件代码" prop="extEventCode">-->
-<!--          <el-input v-model="eventForm.extEventCode" placeholder="请输入外部事件代码" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="描述" prop="eventDesc">-->
-<!--          <el-input v-model="eventForm.eventDesc" placeholder="请输入描述" />-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        <el-button type="primary" @click="subFormSubmit">确 定</el-button>-->
-<!--        <el-button @click="subFormCancel">取 消</el-button>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
   </div>
 </template>
 
@@ -313,19 +197,13 @@ import {
   delFacs,
   addFacs,
   updateFacs,
-  getSubtable,
-  addSubtable,
-  updateSubtable,
-  delSubtable
+  getFacsCategorygetByCode,
 } from '@/api/basecfg/emsfacs'
 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'
 import {getModelByCode} from '@/api/basecfg/objModel'
-import {addAbilityBatch} from "@/api/basecfg/objAbility";
-import data from "@/views/system/dict/data.vue";
-import {code} from "quill/ui/icons";
 
 export default {
   name: 'Facs',
@@ -373,7 +251,7 @@ export default {
         pageSize: 10,
         facsCode: null,
         facsName: null,
-        facsCategory: null,
+        facsCategory: 'E',
         facsSubCategory: null,
         enable: null,
         refArea: null
@@ -439,6 +317,7 @@ export default {
     this.getList()
     this.getAreaTree('Area')
     this.getAllFacsCategory()
+    this.getSubCategorygetByCode()
   },
   methods: {
     /** 查询能源设施/系统列表 */
@@ -491,7 +370,6 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改能源设施'
-        this.handleFacsCategoryChange(response.data.facsCategory)
       })
     },
     /** 提交按钮 */
@@ -576,75 +454,15 @@ export default {
         this.facsCategoryOptions = response.data
       })
     },
-    handleFacsCategoryChange(code) {
-      const obj = {}
-      this.facsCategoryOptions.forEach(item => {
-        if (item.code && Array.isArray(item.subtypeList)) {
-          obj[item.code] = item.subtypeList
-        }
-      })
-      this.facsSubCategoryOptions = obj[code] || []
-    },
-    getSubtableList() {
-      getSubtable(this.subKey, { facsCode: this.curRow.facsCode }).then(({ code, rows }) => {
-        if (code === 200) {
-          this[`${this.subKey}Data`] = rows
-        }
-      })
-    },
-    addSub() {
-      this.subDialogShow = true
-      this.subTitle = `新增${this.subMap[this.subKey]}`
-    },
-    editSub(row) {
-      this.subDialogShow = true
-      this.subTitle = `修改${this.subMap[this.subKey]}`
-      this[`${this.subKey}Form`] = row
-    },
-    deleteSub(row) {
-      this.$modal.confirm('是否确认删除').then(() => {
-        delSubtable(this.subKey, row.id).then(({ code }) => {
-          if (code === 200) {
-            this.getSubtableList()
-            this.$modal.msgSuccess('删除成功')
-          } else {
-            this.$modal.msgError('删除失败')
-          }
-        })
+    getSubCategorygetByCode () {
+      getFacsCategorygetByCode(this.queryParams.facsCategory).then(response => {
+        this.facsSubCategoryOptions = response.data.subtypeList||[];
       })
     },
-    subFormSubmit() {
-      this.$refs['subForm'].validate(valid => {
-        if (valid) {
-          const params = Object.assign({}, this[`${this.subKey}Form`], { facsCode: this.curRow.facsCode })
-          if (this.subTitle.includes('新增')) {
-            addSubtable(this.subKey, params).then(({ code }) => {
-              if (code === 200) {
-                this.$modal.msgSuccess('新增成功')
-                this.subDialogShow = false
-                this.getSubtableList()
-              } else {
-                this.$modal.msgError('新增失败')
-              }
-            })
-          } else {
-            updateSubtable(this.subKey, params).then(({ code }) => {
-              if (code === 200) {
-                this.$modal.msgSuccess('修改成功')
-                this.subDialogShow = false
-                this.getSubtableList()
-              } else {
-                this.$modal.msgError('修改失败')
-              }
-            })
-          }
-        }
-      })
-    },
-    subFormCancel() {
-      this[`${this.subKey}Form`] = this.$options.data()[`${this.subKey}Form`]
-      this.resetForm('subForm')
-      this.subDialogShow = false
+    facsCategoryChange () {
+      this.queryParams.facsSubCategory = ''
+      this.getSubCategorygetByCode()
+      this.handleQuery()
     }
   }
 }

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

@@ -279,13 +279,13 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    getObjType(row, column, cellValue, index) {
+    getObjType(objType) {
       const objTypeMap = {
         1: '设施',
         2: '设备',
         3: '部件'
       };
-      return objTypeMap[cellValue] || '未知';
+      return objTypeMap[objType] || '未知';
     },
     getAllFacs(areaCode) {
       listAllFacs(areaCode).then(response =>{

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

@@ -477,7 +477,8 @@ export default {
           this.objCodeOptions = response.data
         })
       } else if (objType === 2) {
-        devTreeByFacs(this.form.areaCode).then(response => {
+        const devcCategory = 'E';
+        devTreeByFacs(this.form.areaCode, devcCategory).then(response => {
           this.objCodeOptions = response.data
           console.log("计量对象",this.objCodeOptions)
         })

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

@@ -28,23 +28,29 @@
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
+        <el-tabs v-model="queryParams.deviceCategory" @tab-click="deviceCategoryChange">
+          <el-tab-pane label="产能设备" name="E"></el-tab-pane>
+          <el-tab-pane label="储能设备" name="C"></el-tab-pane>
+          <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-item label="设备名称" prop="deviceName">
-            <el-input
-              v-model="queryParams.deviceName"
-              placeholder="请输入设备名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="设备分类" prop="deviceSubCategory">
+            <el-select v-model="queryParams.deviceSubCategory" >
+              <el-option v-for="item in subCategoryOptions" placeholder="设备分类" :label="item.name" :value="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" />
+            <el-select v-model="queryParams.refFacs">
+              <el-option v-for="item in facsOptions" :label="item.facsName" :value="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" />
+            <el-select v-model="queryParams.subsystemCode">
+              <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode"
+                         :key="item.systemCode" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -53,7 +59,7 @@
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+        <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="refFacsName"/>
@@ -198,36 +204,6 @@
             </el-card>
           </div>
         </el-dialog>
-
-        <!-- 添加或修改能源设备对话框 -->
-        <!--        <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="deviceName">-->
-<!--              <el-input disabled v-model="form.deviceName" placeholder="请输入设备名称"/>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="设备代码" prop="deviceCode">-->
-<!--              <el-input disabled v-model="form.deviceCode" placeholder="请输入设备代码"/>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="归属设施" prop="refFacs" >-->
-<!--              <el-input disabled v-model="form.refFacsName" placeholder="归属设施"/>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="归属区域" prop="refArea">-->
-<!--              <el-input disabled v-model="form.refAreaName" placeholder="归属区域"/>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="设备类型" prop="deviceType">-->
-<!--              <el-input disabled v-model="form.deviceTypeName" placeholder="设备类型"/>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="子系统" prop="subsystemName">-->
-<!--              <el-input disabled v-model="form.subsystemName" placeholder="子系统"/>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="设备状态" prop="deviceStatus">-->
-<!--              <el-input disabled v-model="form.deviceStatus" placeholder="设备状态"/>-->
-<!--            </el-form-item>-->
-<!--          </el-form>-->
-<!--          <div slot="footer" class="dialog-footer">-->
-<!--            <el-button @click="cancel">关闭</el-button>-->
-<!--          </div>-->
-<!--        </el-dialog>-->
       </el-col>
     </el-row>
   </div>
@@ -236,7 +212,7 @@
 <script>
 import { listDevRecursionByArea, getDevice, delDevice, addDevice, updateDevice } from '@/api/device/device'
 import { areaTreeSelect } from "@/api/basecfg/area"
-import { listAllFacs } from "@/api/basecfg/emsfacs"
+import { getFacsCategorygetByCode, listAllFacs } from '@/api/basecfg/emsfacs'
 import { getDevcType} from '@/api/commonApi'
 import { listSubsystemAll } from '@/api/adapter/subsystem'
 import Treeselect from "@riophae/vue-treeselect";
@@ -292,7 +268,8 @@ export default {
         pageSize: 10,
         deviceCode: null,
         deviceName: null,
-        deviceType: null,
+        deviceSubCategory: null,
+        deviceCategory: 'E',
         deviceStatus: null,
         areaType: null,
         refArea: null,
@@ -305,9 +282,8 @@ export default {
   },
   created() {
     this.getList();
-    this.getAreaTree('Zoning');
+    this.getAreaTree('Area');
     this.getFacsOptions("");
-    this.getDevcType();
     this.getSubsystem();
   },
   methods: {
@@ -368,7 +344,8 @@ export default {
         id: null,
         deviceCode: null,
         deviceName: null,
-        deviceType: null,
+        deviceSubCategory: null,
+        deviceCategory: null,
         deviceStatus: null,
         refArea: null,
         refFacs: null,
@@ -389,16 +366,6 @@ export default {
       this.resetForm('queryForm')
       this.handleQuery()
     },
-    // handleDetail(row) {
-    //   this.reset()
-    //   const id = row.id || this.ids
-    //   getDevice(id).then(response => {
-    //     this.form = response.data
-    //     console.log("设备详情",this.form)
-    //     this.open = true
-    //     this.title = '设备详情'
-    //   })
-    // },
     // 设备状态详情
     handleDetail(row) {
       this.reset()
@@ -413,23 +380,31 @@ export default {
         this.abilityData=response.data.abilityList
       })
     },
-    handleAreaType(data) {
-      this.form.areaType = data.tier;
-    },
     getFacsOptions(areaCode) {
       listAllFacs(areaCode).then(response =>{
         this.facsOptions = response.data;
       })
     },
-    getDevcType() {
-      getDevcType().then(response =>{
-        this.devcTypeOptions = response.data;
-      })
-    },
     getSubsystem() {
       listSubsystemAll().then(response =>{
         this.subsystemOptions = response.data;
       })
+    },
+    getSubCategorygetByCode () {
+      getFacsCategorygetByCode(this.queryParams.deviceCategory).then(response => {
+        this.subCategoryOptions = response.data.subtypeList||[];
+      })
+    },
+    deviceCategoryChange () {
+      this.queryParams.deviceSubCategory = ''
+      if (this.queryParams.deviceCategory === 'E' || this.queryParams.deviceCategory === 'W'
+        || this.queryParams.deviceCategory === 'T'|| this.queryParams.deviceCategory === 'C') {
+        this.getAreaTree("Area")
+      } else if (this.queryParams.deviceCategory === 'Z') {
+        this.getAreaTree("Zoning")
+      }
+      this.getSubCategorygetByCode()
+      this.handleQuery()
     }
   }
 }