子系统管理，标签管理

ems-ui/src/api/adapter/subsystem.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询能源子系统列表
+export function listSubsystem(query) {
+  return request({
+    url: '/ems/subsystem/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源子系统列表
+export function listSubsystemAll(query) {
+  return request({
+    url: '/ems/subsystem/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源子系统详细
+export function getSubsystem(id) {
+  return request({
+    url: '/ems/subsystem/' + id,
+    method: 'get'
+  })
+}
+
+// 新增能源子系统
+export function addSubsystem(data) {
+  return request({
+    url: '/ems/subsystem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改能源子系统
+export function updateSubsystem(data) {
+  return request({
+    url: '/ems/subsystem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源子系统
+export function delSubsystem(id) {
+  return request({
+    url: '/ems/subsystem/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询标签分类列表
+export function listTag(query) {
+  return request({
+    url: '/ems/tag/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询标签分类详细
+export function getTag(id) {
+  return request({
+    url: '/ems/tag/' + id,
+    method: 'get'
+  })
+}
+
+// 新增标签分类
+export function addTag(data) {
+  return request({
+    url: '/ems/tag',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改标签分类
+export function updateTag(data) {
+  return request({
+    url: '/ems/tag',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除标签分类
+export function delTag(id) {
+  return request({
+    url: '/ems/tag/' + id,
+    method: 'delete'
+  })
+}

ems-ui/src/views/adapter/subsystem/index.vue

@@ -0,0 +1,293 @@
+<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="systemCode">
+        <el-input
+          v-model="queryParams.systemCode"
+          placeholder="请输入系统代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="系统名称" prop="systemName">
+        <el-input
+          v-model="queryParams.systemName"
+          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>
+      </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:subsystem: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:subsystem: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:subsystem:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="subsystemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="系统代码" align="center" prop="systemCode" />
+      <el-table-column label="系统名称" align="center" prop="systemName" />
+      <el-table-column label="系统简称" align="center" prop="shortName" />
+      <el-table-column label="厂商" align="center" prop="manFacturer" />
+      <el-table-column label="联系人" align="center" prop="contactPerson" />
+      <el-table-column label="维护人" align="center" prop="maintainerPerson" />
+      <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:subsystem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:subsystem: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"
+    />
+
+    <!-- 添加或修改能源子系统对话框 -->
+    <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="systemCode">
+          <el-input v-model="form.systemCode" placeholder="请输入系统代码" />
+        </el-form-item>
+        <el-form-item label="系统名称" prop="systemName">
+          <el-input v-model="form.systemName" placeholder="请输入系统名称" />
+        </el-form-item>
+        <el-form-item label="系统简称" prop="shortName">
+          <el-input v-model="form.shortName" placeholder="请输入系统简称" />
+        </el-form-item>
+        <el-form-item label="厂商" prop="manFacturer">
+          <el-input v-model="form.manFacturer" placeholder="请输入厂商" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contactPerson">
+          <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactNumber">
+          <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="维护人" prop="maintainerPerson">
+          <el-input v-model="form.maintainerPerson" placeholder="请输入维护人" />
+        </el-form-item>
+        <el-form-item label="维护电话" prop="maintainerNumber">
+          <el-input v-model="form.maintainerNumber" placeholder="请输入维护电话" />
+        </el-form-item>
+        <el-form-item label="备注说明" prop="descr">
+          <el-input v-model="form.descr" type="textarea" 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>
+  </div>
+</template>
+
+<script>
+import { listSubsystem, getSubsystem, delSubsystem, addSubsystem, updateSubsystem } from "@/api/adapter/subsystem";
+
+export default {
+  name: "Subsystem",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能源子系统表格数据
+      subsystemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        systemCode: null,
+        systemName: null,
+        shortName: null,
+        manFacturer: null,
+        contactPerson: null,
+        contactNumber: null,
+        maintainerPerson: null,
+        maintainerNumber: null,
+        descr: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        systemCode: [
+          { required: true, message: "系统代码不能为空", trigger: "blur" }
+        ],
+        systemName: [
+          { required: true, message: "系统名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询能源子系统列表 */
+    getList() {
+      this.loading = true;
+      listSubsystem(this.queryParams).then(response => {
+        this.subsystemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        systemCode: null,
+        systemName: null,
+        shortName: null,
+        manFacturer: null,
+        contactPerson: null,
+        contactNumber: null,
+        maintainerPerson: null,
+        maintainerNumber: null,
+        descr: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加能源子系统";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSubsystem(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改能源子系统";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSubsystem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSubsystem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除能源子系统编号为"' + ids + '"的数据项？').then(function() {
+        return delSubsystem(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/subsystem/export', {
+        ...this.queryParams
+      }, `subsystem_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -2,34 +2,10 @@
   <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="areaName">
+      <el-form-item label="地块名称" prop="areaName">
         <el-input
           v-model="queryParams.areaName"
-          placeholder="请输入服务区名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="服务星级" prop="serviceStar">
-        <el-input
-          v-model="queryParams.serviceStar"
-          placeholder="请输入服务星级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所在高速" prop="highway">
-        <el-input
-          v-model="queryParams.highway"
-          placeholder="请输入所在高速"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="方向" prop="direction">
-        <el-input
-          v-model="queryParams.direction"
-          placeholder="请输入方向"
+          placeholder="请输入地块名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -88,9 +64,9 @@
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="服务区名称" align="center" prop="areaName" width="200px"/>
+      <el-table-column label="地块名称" align="center" prop="areaName" width="200px"/>
       <el-table-column label="简称" align="left" prop="shortName" />
-      <el-table-column label="服务区代码" align="center" prop="areaCode" width="200px" />
+      <el-table-column label="地块代码" align="center" prop="areaCode" width="200px" />
       <el-table-column label="服务星级" align="center" prop="serviceStar" />
       <el-table-column label="所在城市" align="left" prop="city" />
       <el-table-column label="所在高速" align="left" prop="highway" />
@@ -137,13 +113,13 @@
     <!-- 添加或修改服务区对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-form-item label="服务区代码" prop="areaCode">
-          <el-input v-model="form.areaCode" placeholder="请输入服务区代码" :readonly="isReadOnly"/>
+        <el-form-item label="地块代码" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="请输入地块代码" :readonly="isReadOnly"/>
         </el-form-item>
-        <el-form-item label="服务区名称" prop="areaName">
-          <el-input v-model="form.areaName" placeholder="请输入服务区名称" />
+        <el-form-item label="地块名称" prop="areaName">
+          <el-input v-model="form.areaName" placeholder="请输入地块名称" />
         </el-form-item>
-        <el-form-item label="服务区简称" prop="shortName">
+        <el-form-item label="地块简称" prop="shortName">
           <el-input v-model="form.shortName" placeholder="请输入简称" />
         </el-form-item>
         <el-form-item label="服务星级" prop="serviceStar">

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

@@ -90,7 +90,7 @@
 
         <el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="地块名称" align="left" prop="bldgName" />
+          <el-table-column label="建筑名称" align="left" prop="bldgName" />
           <el-table-column label="服务区" align="center" prop="areaShortName" />
           <el-table-column label="建筑编码" align="center" prop="bldgCode" />
           <el-table-column label="位置描述" align="center" prop="address" />
@@ -130,7 +130,7 @@
         <!-- 添加或修改建筑基本信息对话框 -->
         <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">
+            <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="bldgCode">

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

@@ -45,12 +45,14 @@
             />
           </el-form-item>
           <el-form-item label="归属设施" prop="refFacs">
-            <el-input
-              v-model="queryParams.refFacs"
-              placeholder="请输入归属设施"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+            <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>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -115,6 +117,7 @@
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
           <el-table-column label="设备代码" align="center" prop="deviceCode"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
+          <el-table-column label="所属子系统" align="center" prop="subsystemName"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -167,6 +170,11 @@
                 <el-option v-for="item in devcTypeOptions" :label="item.typeName" :value="item.typeCode" :key="item.typeCode" />
               </el-select>
             </el-form-item>
+            <el-form-item label="子系统" prop="subsystemCode">
+              <el-select v-model="form.subsystemCode" >
+                <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode" :key="item.systemCode" />
+              </el-select>
+            </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -182,7 +190,8 @@
 import { listDevRecursionByArea, getDevice, delDevice, addDevice, updateDevice } from '@/api/device/device'
 import { areaTreeSelect } from "@/api/basecfg/area"
 import { listAllFacs } from "@/api/basecfg/emsfacs"
-import { getDevcType} from '@/api/commonApi'
+import { getDevcType } from '@/api/commonApi'
+import { listSubsystemAll } from '@/api/adapter/subsystem'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -217,6 +226,7 @@ export default {
       facsOptions: undefined,
       // 设备分类
       devcTypeOptions: undefined,
+      subsystemOptions: undefined,
       defaultProps: {
         children: "children",
         label: "label"
@@ -257,6 +267,7 @@ export default {
     this.getAreaTree('Zoning');
     this.getFacsOptions("");
     this.getDevcType();
+    this.getSubsystem();
   },
   methods: {
     /** 查询能源设备列表 */
@@ -300,6 +311,7 @@ export default {
         deviceStatus: null,
         refArea: null,
         refFacs: null,
+        subsystemCode: null,
         createTime: null,
         updateTime: null
       }
@@ -388,6 +400,12 @@ export default {
       getDevcType().then(response =>{
         this.devcTypeOptions = response.data;
       })
+    },
+    getSubsystem() {
+      listSubsystemAll().then(response =>{
+        this.subsystemOptions = response.data;
+      })
+      console.log(this.subsystemOptions)
     }
   }
 }

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

@@ -0,0 +1,294 @@
+<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="tagModel">
+        <el-select v-model="queryParams.tagModel">
+          <el-option v-for="item in tagModelOptions" :label="item.name" :value="item.code" :key="item.code" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="标签代码" prop="tagCode">
+        <el-input
+          v-model="queryParams.tagCode"
+          placeholder="请输入标签代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标签名称" prop="tagName">
+        <el-input
+          v-model="queryParams.tagName"
+          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>
+      </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:tag: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:tag: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:tag: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:tag:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tagList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标签分类" align="center" prop="tagModel" >
+        <template slot-scope="scope">
+          <span>{{ getTagModelName(scope.row.tagModel)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="标签代码" align="center" prop="tagCode" />
+      <el-table-column label="标签名称" align="center" prop="tagName" />
+      <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:tag:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:tag: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"
+    />
+
+    <!-- 添加或修改标签分类对话框 -->
+    <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="tagModel">
+          <el-select v-model="form.tagModel" >
+            <el-option v-for="item in tagModelOptions" :label="item.name" :value="item.code" :key="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签代码" prop="tagCode">
+          <el-input v-model="form.tagCode" placeholder="请输入标签代码" />
+        </el-form-item>
+        <el-form-item label="标签名称" prop="tagName">
+          <el-input v-model="form.tagName" 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>
+  </div>
+</template>
+
+<script>
+import { listTag, getTag, delTag, addTag, updateTag } from "@/api/basecfg/tag";
+
+export default {
+  name: "Tag",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 标签分类表格数据
+      tagList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 能源分类树
+      tagModelOptions: [
+        {"code": "Area", "name": "区域标签"}
+      ],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tagModel: null,
+        tagCode: null,
+        tagName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        tagModel: [
+          { required: true, message: "标签模型不能为空", trigger: "blur" }
+        ],
+        tagCode: [
+          { required: true, message: "标签代码不能为空", trigger: "blur" }
+        ],
+        tagName: [
+          { required: true, message: "标签名称不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询标签分类列表 */
+    getList() {
+      this.loading = true;
+      listTag(this.queryParams).then(response => {
+        this.tagList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tagModel: null,
+        tagCode: null,
+        tagName: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加标签分类";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTag(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改标签分类";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTag(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTag(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除标签分类编号为"' + ids + '"的数据项？').then(function() {
+        return delTag(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/tag/export', {
+        ...this.queryParams
+      }, `tag_${new Date().getTime()}.xlsx`)
+    },
+    getTagModelName(code) {
+      const modelMap = {
+        "Area": "区域标签"
+      };
+      return modelMap[code] || '未知';
+    }
+  }
+};
+</script>

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

@@ -28,23 +28,15 @@
       </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="roomNo">
-            <el-input
-              v-model="queryParams.roomNo"
-              placeholder="请输入房间号"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="区块名称" prop="zoningName">
+          <el-form-item label="分区名称" prop="zoningName">
             <el-input
               v-model="queryParams.zoningName"
-              placeholder="请输入区块名称"
+              placeholder="请输入分区名称"
               clearable
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="区块标签" prop="tagCode">
+          <el-form-item label="分区标签" prop="tagCode">
             <el-select v-model="queryParams.tagCode" >
               <el-option v-for="item in emsTagOptions" :label="item.tagName" :value="item.tagCode" :key="item.tagCode" />
             </el-select>
@@ -103,8 +95,8 @@
 
         <el-table v-loading="loading" :data="zoningList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="区块名称" align="left" prop="zoningName" />
-          <el-table-column label="区块编码" align="center" prop="zoningCode" width="200"/>
+          <el-table-column label="分区名称" align="left" prop="zoningName" />
+          <el-table-column label="分区编码" align="center" prop="zoningCode" width="200"/>
           <el-table-column label="所在建筑" align="left" prop="areaPath" />
           <el-table-column label="区块标签" align="center" prop="tagName" />
           <el-table-column label="使用详情" align="center" prop="usageDetail" />
@@ -145,13 +137,13 @@
             <el-form-item label="楼层" prop="floor">
               <el-input v-model="form.floor" placeholder="请输入楼层" />
             </el-form-item>
-            <el-form-item label="区块编码" prop="zoningCode">
+            <el-form-item label="分区编码" prop="zoningCode">
               <el-input v-model="form.zoningCode" placeholder="请输入分区编码" />
             </el-form-item>
-            <el-form-item label="区块名称" prop="zoningName">
+            <el-form-item label="分区名称" prop="zoningName">
               <el-input v-model="form.zoningName" placeholder="请输入分区名称" />
             </el-form-item>
-            <el-form-item label="区块标签" prop="tagCode">
+            <el-form-item label="分区标签" prop="tagCode" >
               <el-select v-model="form.tagCode" >
                 <el-option v-for="item in emsTagOptions" :label="item.tagName" :value="item.tagCode" :key="item.tagCode" />
               </el-select>