修改设备分类

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

@@ -3,38 +3,18 @@
     <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"
-          />
+          <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"
-          />
+          <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="20" :xs="24">
         <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-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">
@@ -54,36 +34,16 @@
 
         <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:emsfacs:add']"
-            >新增</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['basecfg:emsfacs: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:emsfacs:edit']"
-            >修改</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['basecfg:emsfacs: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:emsfacs:remove']"
-            >删除</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['basecfg:emsfacs:remove']">删除</el-button>
           </el-col>
 
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -96,7 +56,7 @@
           <el-table-column label="设施分类" align="center" prop="facsTypeName" />
           <el-table-column label="设施子类" align="center" prop="facsSubtypeName" />
           <el-table-column label="厂商" align="center" prop="manufacturer" />
-          <el-table-column label="启用状态" align="center" prop="enable" >
+          <el-table-column label="启用状态" align="center" prop="enable">
             <template slot-scope="scope">
               <!-- 根据status的值显示不同的文本 -->
               <span>{{ scope.row.enable === 0 ? '关闭' : '启用' }}</span>
@@ -104,31 +64,16 @@
           </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="['basecfg:emsfacs:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['basecfg:emsfacs:remove']"
-              >删除</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:emsfacs:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['basecfg:emsfacs:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <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="800px" append-to-body>
@@ -161,11 +106,37 @@
               <el-input v-model="form.manufacturer" placeholder="请输入厂商" />
             </el-form-item>
             <el-form-item label="设施属性" prop="subtypeList">
-              <el-table v-loading="loading" :data="form.facsAttrs">
-                <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 class="sub-table" v-loading="loading" :data="form.facsAttrs" max-height="200px">
+                <el-table-column label="属性名称" align="center" prop="attrName">
+                  <template slot-scope="scope">
+                    <el-input size="mini" v-model="scope.row.attrName" placeholder="属性名称" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="属性描述" align="center" prop="attrDesc" >
+                   <template slot-scope="scope">
+                    <el-input size="mini" v-model="scope.row.attrDesc" placeholder="属性描述" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="属性值" align="center" prop="attrValue" >
+                   <template slot-scope="scope">
+                    <el-input size="mini" v-model="scope.row.attrValue" placeholder="属性值" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="属性单位" align="center" prop="attrUnit" >
+                   <template slot-scope="scope">
+                    <el-input size="mini" v-model="scope.row.attrUnit" placeholder="属性单位" />
+                  </template>
+                </el-table-column>
+                <el-table-column align="center">
+                  <template slot="header">
+                    <div class="operateBtns" @click="addSub">
+                      <span>操作</span><i class="el-icon-circle-plus-outline"></i>
+                    </div>
+                  </template>
+                  <template slot-scope="scope">
+                    <i class="el-icon-delete" @click="deleteSub(scope.$index)"></i>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -180,14 +151,14 @@
 </template>
 
 <script>
-import { listFacs, getFacs, delFacs, addFacs, updateFacs } from "@/api/basecfg/emsfacs";
-import { listAllFacsType } from "@/api/basecfg/facstype"
+import { listFacs, getFacs, delFacs, addFacs, updateFacs } from '@/api/basecfg/emsfacs'
+import { listAllFacsType } from '@/api/basecfg/facstype'
 import { areaTreeSelect } from '@/api/basecfg/area'
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "Facs",
+  name: 'Facs',
   components: { Treeselect },
   data() {
     return {
@@ -206,7 +177,7 @@ export default {
       // 能源设施/系统表格数据
       facsList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 区域名称
@@ -214,15 +185,15 @@ export default {
       // 区域树选项
       areaOptions: undefined,
       defaultProps: {
-        children: "children",
-        label: "label"
+        children: 'children',
+        label: 'label'
       },
       // 设施分类列表
       facsTypeOptions: undefined,
       facsSubTypeOptions: undefined,
       enableOptions: [
-        { code: 0, name: "关闭"},
-        { code: 1, name: "启用"}
+        { code: 0, name: '关闭' },
+        { code: 1, name: '启用' }
       ],
       // 查询参数
       queryParams: {
@@ -238,161 +209,187 @@ export default {
         facsAttrs: null
       },
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        facsCode: null,
+        facsName: null,
+        facsType: null,
+        facsSubtype: null,
+        enable: null,
+        refArea: null,
+        manufacturer: null,
+        createTime: null,
+        updateTime: null,
+        facsAttrs: []
+      },
       // 表单校验
       rules: {
-        facsCode: [
-          { required: true, message: "设施代码不能为空", trigger: "blur" }
-        ],
-        facsName: [
-          { required: true, message: "设施名称不能为空", trigger: "blur" }
-        ],
-        facsType: [
-          { required: true, message: "设施分类不能为空", trigger: "change" }
-        ],
-        refArea: [
-          { required: true, message: "归属区域代码不能为空", trigger: "blur" }
-        ],
+        facsCode: [{ required: true, message: '设施代码不能为空', trigger: 'blur' }],
+        facsName: [{ required: true, message: '设施名称不能为空', trigger: 'blur' }],
+        facsType: [{ required: true, message: '设施分类不能为空', trigger: 'change' }],
+        refArea: [{ required: true, message: '归属区域代码不能为空', trigger: 'blur' }]
       }
-    };
+    }
   },
   created() {
-    this.getList();
-    this.getAreaTree('Area');
-    this.getAllFacsType();
+    this.getList()
+    this.getAreaTree('Area')
+    this.getAllFacsType()
   },
   methods: {
+    addSub() {
+      this.form.facsAttrs.push({
+        attrName: '',
+        attrDesc: '',
+        attrValue: '',
+        attrUnit: ''
+      })
+    },
+    deleteSub(index) {
+      this.form.facsAttrs.splice(index, 1)
+    },
     /** 查询能源设施/系统列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listFacs(this.queryParams).then(response => {
-        this.facsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.facsList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
-      this.form = {
-        id: null,
-        facsCode: null,
-        facsName: null,
-        facsType: null,
-        facsSubtype: null,
-        enable: null,
-        refArea: null,
-        manufacturer: null,
-        createTime: null,
-        updateTime: null
-      };
-      this.resetForm("form");
+      this.form = this.$options.data().form
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.refArea = null;
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.queryParams.refArea = null
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加能源设施/系统";
+      this.reset()
+      this.open = true
+      this.title = '添加能源设施/系统'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getFacs(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改能源设施/系统";
+        this.form = response.data
+        this.open = true
+        this.title = '修改能源设施/系统'
         this.handleFacsTypeChange(response.data.facsType)
-      });
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateFacs(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addFacs(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除能源设施/系统编号为"' + ids + '"的数据项？').then(function() {
-        return delFacs(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      const ids = row.id || this.ids
+      this.$modal
+        .confirm('是否确认删除能源设施/系统编号为"' + ids + '"的数据项？')
+        .then(function() {
+          return delFacs(ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('ems/basecfg/emsfacs/export', {
-        ...this.queryParams
-      }, `facs_${new Date().getTime()}.xlsx`)
+      this.download(
+        'ems/basecfg/emsfacs/export',
+        {
+          ...this.queryParams
+        },
+        `facs_${new Date().getTime()}.xlsx`
+      )
     },
     /** 查询区域树结构 */
     getAreaTree(tier) {
       areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data;
-      });
+        this.areaOptions = 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.refArea = data.id;
-      this.handleQuery();
+      this.queryParams.refArea = data.id
+      this.handleQuery()
     },
     /** 获取设施分类 **/
     getAllFacsType() {
-      listAllFacsType().then(response =>{
-        this.facsTypeOptions = response.data;
+      listAllFacsType().then(response => {
+        this.facsTypeOptions = response.data
       })
     },
     handleFacsTypeChange(code) {
-      let obj = {};
+      const obj = {}
       this.facsTypeOptions.forEach(item => {
         if (item.code && Array.isArray(item.subtypeList)) {
-          obj[item.code] = item.subtypeList;
+          obj[item.code] = item.subtypeList
         }
       })
-      this.facsSubTypeOptions = obj[code] || [];
+      this.facsSubTypeOptions = obj[code] || []
     }
   }
-};
+}
 </script>
+<style lang="scss" scoped>
+.sub-table {
+  .el-icon-delete {
+    cursor: pointer;
+  }
+  .operateBtns {
+    cursor: pointer;
+    i {
+      color: #1990ff;
+      margin-left: 5px;
+    }
+  }
+}
+</style>

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

@@ -54,7 +54,7 @@
           <el-input v-model="form.version" placeholder="请输入数据版本" />
         </el-form-item>
         <el-form-item label="系统子类" prop="subtypeList">
-          <el-table class="sub-table" v-loading="loading" :data="form.subtypeList">
+          <el-table class="sub-table" v-loading="loading" :data="form.subtypeList" max-height="280px">
             <el-table-column label="子系统代码" align="center" prop="code">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.code" placeholder="请输入代码" />
@@ -125,6 +125,11 @@ export default {
       },
       // 表单参数
       form: {
+        id: null,
+        code: null,
+        name: null,
+        desc: null,
+        version: null,
         subtypeList: []
       },
       // 表单校验

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

@@ -1,21 +1,16 @@
 <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="areaCode" >
-        <el-select v-model="queryParams.areaCode" >
+      <el-form-item label="服务区" prop="areaCode">
+        <el-select v-model="queryParams.areaCode">
           <el-option v-for="item in areaOptions" :label="item.areaName" :value="item.areaCode" :key="item.areaCode" />
         </el-select>
       </el-form-item>
       <el-form-item label="箱柜代码" prop="boxCode">
-        <el-input
-          v-model="queryParams.boxCode"
-          placeholder="请输入箱柜代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.boxCode" placeholder="请输入箱柜代码" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="箱体类型" prop="boxType">
-        <el-select v-model="queryParams.boxType" >
+        <el-select v-model="queryParams.boxType">
           <el-option v-for="item in boxTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
         </el-select>
       </el-form-item>
@@ -27,46 +22,19 @@
 
     <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:box:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ems:box: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="['ems:box:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['ems:box: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="['ems:box:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['ems:box:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['ems:box:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['ems:box:export']">导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -74,7 +42,7 @@
     <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="箱柜代码" align="center" prop="boxCode" />
-      <el-table-column label="箱体类型" align="center" prop="boxType" >
+      <el-table-column label="箱体类型" align="center" prop="boxType">
         <template slot-scope="scope">
           <span>{{ getPowerBoxTypeName(scope.row.boxType) }}</span>
         </template>
@@ -83,31 +51,15 @@
       <el-table-column label="安装位置" align="center" prop="location" />
       <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:box:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:box:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems:box:edit']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ems:box:remove']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <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="800px" append-to-body>
@@ -116,12 +68,12 @@
           <el-input v-model="form.boxCode" placeholder="请输入箱柜代码" />
         </el-form-item>
         <el-form-item label="箱柜类型" prop="boxType">
-          <el-select v-model="form.boxType" >
+          <el-select v-model="form.boxType">
             <el-option v-for="item in boxTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
           </el-select>
         </el-form-item>
         <el-form-item label="所在服务区" prop="areaCode">
-          <el-select v-model="form.areaCode" >
+          <el-select v-model="form.areaCode">
             <el-option v-for="item in areaOptions" :label="item.areaName" :value="item.areaCode" :key="item.areaCode" />
           </el-select>
         </el-form-item>
@@ -137,16 +89,58 @@
         <el-form-item label="网关端口" prop="gatewayPort">
           <el-input v-model="form.gatewayPort" placeholder="请输入网关端口" />
         </el-form-item>
-        <el-form-item label="电气元件" prop="elecEqptList">
-          <el-table v-loading="loading" :data="form.elecEqptList">
-            <el-table-column label="元件编码" align="center" prop="eqptCode" />
-            <el-table-column label="外系统编码" align="center" prop="extEqptCode" />
-            <el-table-column label="元件类型" align="center" prop="eqptName" />
-            <el-table-column label="元件型号" align="center" prop="eqptSpec" />
-            <el-table-column label="额定电压" align="center" prop="ratedVoltage" />
-            <el-table-column label="额定电流" align="center" prop="ratedCurrent" />
-            <el-table-column label="上游元件" align="center" prop="parentEqpt" />
-            <el-table-column label="计量设备" align="center" prop="meterDevice" />
+        <el-form-item label="电气元件" prop="elecEqptList" >
+          <el-table v-loading="loading" :data="form.elecEqptList" max-height="200px">
+            <el-table-column label="元件编码" align="center" width="100" prop="eqptCode">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.eqptCode" placeholder="元件编码" />
+              </template>
+            </el-table-column>
+            <el-table-column label="外系统编码" align="center" width="120" prop="extEqptCode">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.extEqptCode" placeholder="外系统编码" />
+              </template>
+            </el-table-column>
+            <el-table-column label="元件类型" align="center" width="100" prop="eqptName">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.eqptName" placeholder="元件类型" />
+              </template>
+            </el-table-column>
+            <el-table-column label="元件型号" align="center" width="100" prop="eqptSpec">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.eqptSpec" placeholder="元件型号" />
+              </template>
+            </el-table-column>
+            <el-table-column label="额定电压" align="center" width="100" prop="ratedVoltage">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.ratedVoltage" placeholder="额定电压" />
+              </template>
+            </el-table-column>
+            <el-table-column label="额定电流" align="center" width="100" prop="ratedCurrent">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.ratedCurrent" placeholder="额定电流" />
+              </template>
+            </el-table-column>
+            <el-table-column label="上游元件" align="center" width="100" prop="parentEqpt">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.parentEqpt" placeholder="上游元件" />
+              </template>
+            </el-table-column>
+            <el-table-column label="计量设备" align="center" width="100" prop="meterDevice">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.meterDevice" placeholder="计量设备" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" fixed="right">
+              <template slot="header">
+                <div class="operateBtns" @click="addSub">
+                  <span>操作</span><i class="el-icon-circle-plus-outline"></i>
+                </div>
+              </template>
+              <template slot-scope="scope">
+                <i class="el-icon-delete" @click="deleteSub(scope.$index)"></i>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form-item>
       </el-form>
@@ -159,11 +153,11 @@
 </template>
 
 <script>
-import { listPowerBox, getPowerBox, delPowerBox, addPowerBox, updatePowerBox } from "@/api/device/powerbox";
+import { listPowerBox, getPowerBox, delPowerBox, addPowerBox, updatePowerBox } from '@/api/device/powerbox'
 import { listTotalArea } from '@/api/basecfg/area'
 
 export default {
-  name: "Box",
+  name: 'Box',
   data() {
     return {
       // 遮罩层
@@ -181,14 +175,14 @@ export default {
       // 动力箱柜表格数据
       boxList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       areaOptions: [],
       boxTypeOptions: [
-        {"code":1, "name":"配电柜"},
-        {"code":2, "name":"控制柜"},
-        {"code":3, "name":"逆变器"},
+        { code: 1, name: '配电柜' },
+        { code: 2, name: '控制柜' },
+        { code: 3, name: '逆变器' }
       ],
       // 查询参数
       queryParams: {
@@ -203,123 +197,136 @@ export default {
         gatewayPort: null
       },
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        boxCode: null,
+        boxType: null,
+        areaCode: null,
+        location: null,
+        boxSize: null,
+        gatewayAddr: null,
+        gatewayPort: null,
+        elecEqptList: []
+      },
       // 表单校验
       rules: {
-        boxCode: [
-          { required: true, message: "箱柜代码不能为空", trigger: "blur" }
-        ],
-        boxType: [
-          { required: true, message: "箱体类型不能为空", trigger: "change" }
-        ],
+        boxCode: [{ required: true, message: '箱柜代码不能为空', trigger: 'blur' }],
+        boxType: [{ required: true, message: '箱体类型不能为空', trigger: 'change' }]
       }
-    };
+    }
   },
   created() {
-    this.getAreaOptions();
-    this.getList();
+    this.getAreaOptions()
+    this.getList()
   },
   methods: {
+    addSub() {
+      this.form.elecEqptList.push({
+        name: '',
+        code: ''
+      })
+    },
+    deleteSub(index) {
+      this.form.elecEqptList.splice(index, 1)
+    },
     /** 查询动力箱柜列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listPowerBox(this.queryParams).then(response => {
-        this.boxList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.boxList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
-      this.form = {
-        id: null,
-        boxCode: null,
-        boxType: null,
-        areaCode: null,
-        location: null,
-        boxSize: null,
-        gatewayAddr: null,
-        gatewayPort: null,
-        elecEqptList: null
-      };
-      this.resetForm("form");
+      this.form = this.$options.data().form
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加动力箱柜";
+      this.reset()
+      this.open = true
+      this.title = '添加动力箱柜'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getPowerBox(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改动力箱柜";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改动力箱柜'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updatePowerBox(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addPowerBox(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除动力箱柜编号为"' + ids + '"的数据项？').then(function() {
-        return delPowerBox(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      const ids = row.id || this.ids
+      this.$modal
+        .confirm('是否确认删除动力箱柜编号为"' + ids + '"的数据项？')
+        .then(function() {
+          return delPowerBox(ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('ems/powerBox/export', {
-        ...this.queryParams
-      }, `box_${new Date().getTime()}.xlsx`)
+      this.download(
+        'ems/powerBox/export',
+        {
+          ...this.queryParams
+        },
+        `box_${new Date().getTime()}.xlsx`
+      )
     },
     getAreaOptions() {
       listTotalArea().then(response => {
-        this.areaOptions = response.data;
+        this.areaOptions = response.data
       })
     },
     getPowerBoxTypeName(boxType) {
@@ -327,9 +334,9 @@ export default {
         1: '配电柜',
         2: '控制柜',
         3: '逆变器'
-      };
-      return boxTypeMap[boxType] || '';
-    },
+      }
+      return boxTypeMap[boxType] || ''
+    }
   }
-};
+}
 </script>