模型配置修改

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询排放因子维列表
+export function listFactor(query) {
+  return request({
+    url: '/ems/basecfg/emissionFactor/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询排放因子维详细
+export function getFactor(id) {
+  return request({
+    url: '/ems/basecfg/emissionFactor/' + id,
+    method: 'get'
+  })
+}
+
+// 新增排放因子维
+export function addFactor(data) {
+  return request({
+    url: '/ems/basecfg/emissionFactor',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改排放因子维
+export function updateFactor(data) {
+  return request({
+    url: '/ems/basecfg/emissionFactor',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排放因子维
+export function delFactor(id) {
+  return request({
+    url: '/ems/basecfg/emissionFactor/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询能源设施/系统分类列表
+export function listType(query) {
+  return request({
+    url: '/ems/basecfg/facstype/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源设施/系统分类详细
+export function getType(id) {
+  return request({
+    url: '/ems/basecfg/facstype/' + id,
+    method: 'get'
+  })
+}
+
+// 新增能源设施/系统分类
+export function addType(data) {
+  return request({
+    url: '/ems/basecfg/facstype',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改能源设施/系统分类
+export function updateType(data) {
+  return request({
+    url: '/ems/basecfg/facstype',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源设施/系统分类
+export function delType(id) {
+  return request({
+    url: '/ems/basecfg/facstype/' + id,
+    method: 'delete'
+  })
+}

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

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询建筑区域划分列表
-export function listDivision(query) {
+export function listZoning(query) {
   return request({
     url: '/ems/basecfg/area/building/zoning/list',
     method: 'get',
@@ -10,7 +10,7 @@ export function listDivision(query) {
 }
 
 // 查询建筑区域划分详细
-export function getDivision(id) {
+export function getZoning(id) {
   return request({
     url: '/ems/basecfg/area/building/zoning/' + id,
     method: 'get'
@@ -18,7 +18,7 @@ export function getDivision(id) {
 }
 
 // 新增建筑区域划分
-export function addDivision(data) {
+export function addZoning(data) {
   return request({
     url: '/ems/basecfg/area/building/zoning',
     method: 'post',
@@ -27,7 +27,7 @@ export function addDivision(data) {
 }
 
 // 修改建筑区域划分
-export function updateDivision(data) {
+export function updateZoning(data) {
   return request({
     url: '/ems/basecfg/area/building/zoning',
     method: 'put',
@@ -36,7 +36,7 @@ export function updateDivision(data) {
 }
 
 // 删除建筑区域划分
-export function delDivision(id) {
+export function delZoning(id) {
   return request({
     url: '/ems/basecfg/area/building/zoning/' + id,
     method: 'delete'

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

@@ -105,8 +105,11 @@
       </el-table-column>
       <el-table-column label="占地面积" align="center" prop="landArea" />
       <el-table-column label="建筑面积" align="center" prop="floorArea" />
-      <el-table-column label="经度" align="center" prop="longitude" />
-      <el-table-column label="纬度" align="center" prop="latitude" />
+      <el-table-column label="坐标" align="center" >
+        <template slot-scope="scope">
+          {{ scope.row.longitude + ',' + scope.row.latitude }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

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

@@ -66,6 +66,7 @@
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="建筑编码" align="center" prop="bldgCode" />
       <el-table-column label="建筑名称" align="center" prop="bldgName" />
+      <el-table-column label="归属园区" align="center" prop="areaName" />
       <el-table-column label="详细地址" align="center" prop="address" />
       <el-table-column label="建筑层数(地上)" align="center" prop="upBldgFloor" />
       <el-table-column label="建筑层数(地下)" align="center" prop="downBldgFloor" />
@@ -109,6 +110,9 @@
         <el-form-item label="建筑名称" prop="bldgName">
           <el-input v-model="form.bldgName" placeholder="请输入建筑名称" />
         </el-form-item>
+        <el-form-item label="所属园区" prop="areaCode">
+          <el-input v-model="form.areaName" placeholder="请输入归属园区" />
+        </el-form-item>
         <el-form-item label="详细地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入详细地址" />
         </el-form-item>

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

@@ -91,9 +91,8 @@
       <el-table-column label="设备代码" align="center" prop="deviceCode" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="设备状态" align="center" prop="deviceStatus" />
-      <el-table-column label="归属区域" align="center" prop="refArea" />
-      <el-table-column label="归属设施" align="center" prop="refFacs" />
+      <el-table-column label="归属区域" align="center" prop="refAreaName" />
+      <el-table-column label="归属设施" align="center" prop="refFacsName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

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

@@ -0,0 +1,286 @@
+<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="regionCode">
+        <el-input
+          v-model="queryParams.regionCode"
+          placeholder="请输入地区码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="地区名称" prop="regionName">
+        <el-input
+          v-model="queryParams.regionName"
+          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:factor: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:factor: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:factor: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:factor:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="factorList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="地区码" align="center" prop="regionCode" />
+      <el-table-column label="地区名称" align="center" prop="regionName" />
+      <el-table-column label="地区类型" align="center" prop="regionType" />
+      <el-table-column label="因子值" align="center" prop="factorValue" />
+      <el-table-column label="因子类型" align="center" prop="factorType" />
+      <el-table-column label="数据版本" align="center" prop="version" />
+      <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:factor:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:factor: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="regionCode">
+          <el-input v-model="form.regionCode" placeholder="请输入地区码" />
+        </el-form-item>
+        <el-form-item label="地区名称" prop="regionName">
+          <el-input v-model="form.regionName" placeholder="请输入地区名称" />
+        </el-form-item>
+        <el-form-item label="因子值" prop="factorValue">
+          <el-input v-model="form.factorValue" placeholder="请输入因子值 单位: kgCO2/kWh" />
+        </el-form-item>
+        <el-form-item label="数据版本" prop="version">
+          <el-input v-model="form.version" 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 { listFactor, getFactor, delFactor, addFactor, updateFactor } from "@/api/basecfg/emissionfactor";
+
+export default {
+  name: "Factor",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 排放因子维表格数据
+      factorList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        regionCode: null,
+        regionName: null,
+        regionType: null,
+        factorValue: null,
+        factorType: null,
+        version: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        regionCode: [
+          { required: true, message: "地区码不能为空", trigger: "blur" }
+        ],
+        regionName: [
+          { required: true, message: "地区名称不能为空", trigger: "blur" }
+        ],
+        regionType: [
+          { required: true, message: "地区类型 0：国家，1：地区，2：省份，3：城市不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询排放因子维列表 */
+    getList() {
+      this.loading = true;
+      listFactor(this.queryParams).then(response => {
+        this.factorList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        regionCode: null,
+        regionName: null,
+        regionType: null,
+        factorValue: null,
+        factorType: null,
+        version: 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
+      getFactor(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) {
+            updateFactor(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFactor(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 delFactor(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/basecfg/emissionFactor/export', {
+        ...this.queryParams
+      }, `factor_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -88,13 +88,13 @@
     <el-table v-loading="loading" :data="facsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="归属区域" align="center" prop="refAreaName" />
       <el-table-column label="设施代码" align="center" prop="facsCode" />
       <el-table-column label="设施名称" align="center" prop="facsName" />
-      <el-table-column label="设施分类" align="center" prop="facsType" />
-      <el-table-column label="设施子类" align="center" prop="facsSubtype" />
-      <el-table-column label="启用状态" align="center" prop="enable" />
-      <el-table-column label="归属区域" align="center" prop="refArea" />
+      <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" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -135,6 +135,12 @@
         <el-form-item label="启用状态" prop="enable">
           <el-input v-model="form.enable" placeholder="请输入启用状态" />
         </el-form-item>
+        <el-form-item label="设施分类" prop="facsType">
+          <el-input v-model="form.facsType" placeholder="请输入设施分类" />
+        </el-form-item>
+        <el-form-item label="设施子类" prop="facsSubtype">
+          <el-input v-model="form.facsSubtype" placeholder="请输入设施子类" />
+        </el-form-item>
         <el-form-item label="归属区域" prop="refArea">
           <el-input v-model="form.refArea" placeholder="请输入归属区域" />
         </el-form-item>

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

@@ -0,0 +1,275 @@
+<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="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入设施系统代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="系统名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入设施系统名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数据版本" prop="version">
+        <el-input
+          v-model="queryParams.version"
+          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="['basecfg:facstype: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:facstype: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:facstype:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="设施系统代码" align="center" prop="code" />
+      <el-table-column label="设施系统名称" align="center" prop="name" />
+      <el-table-column label="说明" align="center" prop="desc" />
+      <el-table-column label="数据版本" align="center" prop="version" />
+      <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:type:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:type: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="code">
+          <el-input v-model="form.code" placeholder="请输入设施系统代码" />
+        </el-form-item>
+        <el-form-item label="设施系统名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设施系统名称" />
+        </el-form-item>
+        <el-form-item label="说明" prop="desc">
+          <el-input v-model="form.desc" placeholder="请输入说明" />
+        </el-form-item>
+        <el-form-item label="数据版本" prop="version">
+          <el-input v-model="form.version" 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 { listType, getType, delType, addType, updateType } from "@/api/basecfg/facstype";
+
+export default {
+  name: "Type",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能源设施/系统分类表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        name: null,
+        desc: null,
+        version: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        code: [
+          { required: true, message: "设施系统代码不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "设施系统名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询能源设施/系统分类列表 */
+    getList() {
+      this.loading = true;
+      listType(this.queryParams).then(response => {
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        code: null,
+        name: null,
+        desc: null,
+        version: 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
+      getType(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) {
+            updateType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addType(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 delType(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/basecfg/facstype/export', {
+        ...this.queryParams
+      }, `type_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -72,16 +72,6 @@
           v-hasPermi="['basecfg:flowrel: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="['basecfg:flowrel:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -89,8 +79,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="编码" align="center" prop="code" />
-      <el-table-column label="输出设施" align="center" prop="exportFacsCode" />
-      <el-table-column label="流入设施" align="center" prop="inputFacsCode" />
+      <el-table-column label="输出设施" align="center" prop="exportFacsName" />
+      <el-table-column label="流入设施" align="center" prop="inputFacsName" />
       <el-table-column label="流动介质" align="center" prop="emsCls" />
       <el-table-column label="供能状态" align="center" prop="state" />
       <el-table-column label="能流动作" align="center" prop="actionType" />

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

@@ -1,9 +1,9 @@
 <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="divisionName">
+      <el-form-item label="分区名称" prop="zoningName">
         <el-input
-          v-model="queryParams.divisionName"
+          v-model="queryParams.zoningName"
           placeholder="请输入分区名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -77,12 +77,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="divisionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="zoningList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="建筑编码" align="center" prop="bldgCode" />
-      <el-table-column label="分区编码" align="center" prop="divisionCode" />
-      <el-table-column label="分区名称" align="center" prop="divisionName" />
+      <el-table-column label="分区编码" align="center" prop="zoningCode" />
+      <el-table-column label="分区名称" align="center" prop="zoningName" />
+      <el-table-column label="所在建筑" align="center" prop="bldgName" />
       <el-table-column label="楼层" align="center" prop="floor" />
       <el-table-column label="房间号" align="center" prop="roomNo" />
       <el-table-column label="建筑划分面积" align="center" prop="bldgLdArea" />
@@ -118,14 +118,14 @@
     <!-- 添加或修改建筑区域划分对话框 -->
     <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="bldgCode">
-          <el-input v-model="form.bldgCode" placeholder="请输入建筑编码" />
+        <el-form-item label="分区编码" prop="zoningCode">
+          <el-input v-model="form.zoningCode" placeholder="请输入分区编码" />
         </el-form-item>
-        <el-form-item label="分区编码" prop="divisionCode">
-          <el-input v-model="form.divisionCode" placeholder="请输入分区编码" />
+        <el-form-item label="分区名称" prop="zoningName">
+          <el-input v-model="form.zoningName" placeholder="请输入分区名称" />
         </el-form-item>
-        <el-form-item label="分区名称" prop="divisionName">
-          <el-input v-model="form.divisionName" placeholder="请输入分区名称" />
+        <el-form-item label="所在建筑" prop="bldgName">
+          <el-input v-model="form.bldgCode" placeholder="请输入建筑编码" />
         </el-form-item>
         <el-form-item label="楼层" prop="floor">
           <el-input v-model="form.floor" placeholder="请输入楼层" />
@@ -149,10 +149,10 @@
 </template>
 
 <script>
-import { listDivision, getDivision, delDivision, addDivision, updateDivision } from "@/api/basecfg/zoning";
+import { listZoning, getZoning, delZoning, addZoning, updateZoning } from "@/api/basecfg/zoning";
 
 export default {
-  name: "Division",
+  name: "Zonin",
   data() {
     return {
       // 遮罩层
@@ -168,7 +168,7 @@ export default {
       // 总条数
       total: 0,
       // 建筑区域划分表格数据
-      divisionList: [],
+      zoningList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -178,8 +178,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         bldgCode: null,
-        divisionCode: null,
-        divisionName: null,
+        zoningCode: null,
+        zoningName: null,
         floor: null,
         roomNo: null,
         bldgLdArea: null,
@@ -189,13 +189,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        bldgCode: [
-          { required: true, message: "建筑编码不能为空", trigger: "blur" }
-        ],
-        divisionCode: [
+        zoningCode: [
           { required: true, message: "分区编码不能为空", trigger: "blur" }
         ],
-        divisionName: [
+        zoningName: [
           { required: true, message: "分区名称不能为空", trigger: "blur" }
         ],
       }
@@ -208,8 +205,8 @@ export default {
     /** 查询建筑区域划分列表 */
     getList() {
       this.loading = true;
-      listDivision(this.queryParams).then(response => {
-        this.divisionList = response.rows;
+      listZoning(this.queryParams).then(response => {
+        this.zoningList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -224,8 +221,8 @@ export default {
       this.form = {
         id: null,
         bldgCode: null,
-        divisionCode: null,
-        divisionName: null,
+        zoningCode: null,
+        zoningName: null,
         floor: null,
         roomNo: null,
         bldgLdArea: null,
@@ -259,7 +256,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getDivision(id).then(response => {
+      getZoning(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改建筑区域划分";
@@ -270,13 +267,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateDivision(this.form).then(response => {
+            updateZoning(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addDivision(this.form).then(response => {
+            addZoning(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -289,7 +286,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除建筑区域划分编号为"' + ids + '"的数据项？').then(function() {
-        return delDivision(ids);
+        return delZoning(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -297,9 +294,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('ems/division/export', {
+      this.download('ems/basecfg/area/building/zoning/export', {
         ...this.queryParams
-      }, `division_${new Date().getTime()}.xlsx`)
+      }, `zoning_${new Date().getTime()}.xlsx`)
     }
   }
 };