Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

# Conflicts:
#	ems-ui-cloud/src/views/basecfg/boundaryRel/index.vue

ems-ui-cloud/src/api/basecfg/disStaCoal.js

@@ -1,44 +1,44 @@
-import request from '@/utils/request'
-
-// 查询能源折标准煤维列表
-export function listDisStaCoal(query) {
-  return request({
-    url: '/ems/disStaCoal/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询能源折标准煤维详细
-export function getDisStaCoal(id) {
-  return request({
-    url: '/ems/disStaCoal/' + id,
-    method: 'get'
-  })
-}
-
-// 新增能源折标准煤维
-export function addDisStaCoal(data) {
-  return request({
-    url: '/ems/disStaCoal',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改能源折标准煤维
-export function updateDisStaCoal(data) {
-  return request({
-    url: '/ems/disStaCoal',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除能源折标准煤维
-export function delDisStaCoal(id) {
-  return request({
-    url: '/ems/disStaCoal/' + id,
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询能源折标准煤维列表
+export function listDisStaCoal(query) {
+  return request({
+    url: '/ems/disStaCoal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源折标准煤维详细
+export function getDisStaCoal(id) {
+  return request({
+    url: '/ems/disStaCoal/' + id,
+    method: 'get'
+  })
+}
+
+// 新增能源折标准煤维
+export function addDisStaCoal(data) {
+  return request({
+    url: '/ems/disStaCoal',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改能源折标准煤维
+export function updateDisStaCoal(data) {
+  return request({
+    url: '/ems/disStaCoal',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源折标准煤维
+export function delDisStaCoal(id) {
+  return request({
+    url: '/ems/disStaCoal/' + id,
+    method: 'delete'
+  })
+}

ems-ui-cloud/src/api/basecfg/meterBoundary.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+// 查询计量设备绑定边界对象关系列表
+export function listByObj(objType,meterCls, boundaryObj) {
+  return request({
+    url: '/ems/meterBoundary/listByObj',
+    method: 'get',
+    params: {
+      objType: objType,
+      meterCls:meterCls,
+      boundaryObj: boundaryObj
+    }
+  })
+}
+
+// 新增计量设备绑定边界对象关系
+export function addByObj(data) {
+  return request({
+    url: '/ems/meterBoundary/addBatch',
+    method: 'post',
+    data: data
+  })
+}
+
+export function addAllByObj(objType, meterCls, boundaryObj,data) {
+  return request({
+    url: `/ems/meterBoundary/merge?objType=${objType}&boundaryObj=${boundaryObj}&meterCls=${meterCls}`,
+    method: 'put',
+    data: data // 将数据数组作为请求体发送
+  });
+}
+
+// 删除计量设备绑定边界对象关系
+export function delByObj(objType, boundaryObj) {
+  return request({
+    url: '/ems/meterBoundary/delByObj',
+    method: 'delete',
+    params: {
+      objType: objType,
+      boundaryObj: boundaryObj
+    }
+  })
+}

ems-ui-cloud/src/views/basecfg/boundaryRel/index.vue

@@ -379,8 +379,8 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { areaTreeSelect, listDetailArea } from '@/api/basecfg/area'
 import SubTitle from '@/components/SubTitle/index.vue'
 import { getDevProcess, getEmsTag } from '@/api/commonApi'
-import {  listDevice } from '@/api/device/meterDevice'
-import { addAllByObj, listByObj } from '@/api/basecfg/boundaryRel'
+import { delDevice, listDevice } from '@/api/device/meterDevice'
+import { addAllByObj, listByObj } from '@/api/basecfg/meterBoundary'
 import { listDept } from '@/api/system/dept'
 import { getFacsCategorygetByCode, listAllFacs, listFacs } from '@/api/basecfg/emsfacs'
 import { listDevRecursionByArea } from '@/api/device/device'

ems-ui-cloud/src/views/basecfg/dsccfg/index.vue

@@ -1,233 +1,233 @@
-<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="energyCode">
-        <el-input
-          v-model="queryParams.energyCode"
-          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:disStaCoal:add']"
-        >新增</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="disStaCoalList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="能源代码" align="center" prop="energyCode" />
-      <el-table-column label="能源名称" align="center" prop="energyName" />
-      <el-table-column label="系数值" align="left" prop="coefficientValue" >
-        <template slot-scope="scope">
-          <span>{{ scope.row.coefficientValue + ' ' + scope.row.coefficientUnit }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['ems:disStaCoal:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:disStaCoal: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="energyCode">
-          <el-input v-model="form.energyCode" placeholder="请输入能源代码" />
-        </el-form-item>
-        <el-form-item label="能源名称" prop="energyName">
-          <el-input v-model="form.energyName" placeholder="请输入能源名称" />
-        </el-form-item>
-        <el-form-item label="系数值" prop="coefficientValue">
-          <el-input v-model="form.coefficientValue" placeholder="请输入系数值" />
-        </el-form-item>
-        <el-form-item label="系数单位" prop="coefficientUnit">
-          <el-input v-model="form.coefficientUnit" 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 { listDisStaCoal, getDisStaCoal, delDisStaCoal, addDisStaCoal, updateDisStaCoal } from "@/api/basecfg/disStaCoal";
-
-export default {
-  name: "DisStaCoal",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 能源折标准煤维表格数据
-      disStaCoalList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        energyCode: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        energyCode: [
-          { required: true, message: "能源代码不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询能源折标准煤维列表 */
-    getList() {
-      this.loading = true;
-      listDisStaCoal(this.queryParams).then(response => {
-        this.disStaCoalList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        energyCode: null,
-        energyName: null,
-        coefficientValue: null,
-        coefficientUnit: 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
-      getDisStaCoal(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) {
-            updateDisStaCoal(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDisStaCoal(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 delDisStaCoal(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('ems/disStaCoal/export', {
-        ...this.queryParams
-      }, `disStaCoal_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
+<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="energyCode">
+        <el-input
+          v-model="queryParams.energyCode"
+          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:disStaCoal:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="disStaCoalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="能源代码" align="center" prop="energyCode" />
+      <el-table-column label="能源名称" align="center" prop="energyName" />
+      <el-table-column label="系数值" align="left" prop="coefficientValue" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.coefficientValue + ' ' + scope.row.coefficientUnit }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems:disStaCoal:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:disStaCoal: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="energyCode">
+          <el-input v-model="form.energyCode" placeholder="请输入能源代码" />
+        </el-form-item>
+        <el-form-item label="能源名称" prop="energyName">
+          <el-input v-model="form.energyName" placeholder="请输入能源名称" />
+        </el-form-item>
+        <el-form-item label="系数值" prop="coefficientValue">
+          <el-input v-model="form.coefficientValue" placeholder="请输入系数值" />
+        </el-form-item>
+        <el-form-item label="系数单位" prop="coefficientUnit">
+          <el-input v-model="form.coefficientUnit" 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 { listDisStaCoal, getDisStaCoal, delDisStaCoal, addDisStaCoal, updateDisStaCoal } from "@/api/basecfg/disStaCoal";
+
+export default {
+  name: "DisStaCoal",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能源折标准煤维表格数据
+      disStaCoalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        energyCode: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        energyCode: [
+          { required: true, message: "能源代码不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询能源折标准煤维列表 */
+    getList() {
+      this.loading = true;
+      listDisStaCoal(this.queryParams).then(response => {
+        this.disStaCoalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        energyCode: null,
+        energyName: null,
+        coefficientValue: null,
+        coefficientUnit: 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
+      getDisStaCoal(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) {
+            updateDisStaCoal(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDisStaCoal(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 delDisStaCoal(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/disStaCoal/export', {
+        ...this.queryParams
+      }, `disStaCoal_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>