Pārlūkot izejas kodu

计量设备管理

lv.wenbin 1 gadu atpakaļ
vecāks
revīzija
97e1b6b082

+ 14 - 5
ems-ui/src/api/basecfg/device.js → ems-ui/src/api/device/device.js

@@ -3,7 +3,16 @@ import request from '@/utils/request'
 // 查询能源设备列表
 export function listDevice(query) {
   return request({
-    url: '/ems/basecfg/device/list',
+    url: '/ems/device/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源设备列表
+export function listDeviceByAreaTree(query) {
+  return request({
+    url: '/ems/device/listByAreaTree',
     method: 'get',
     params: query
   })
@@ -12,7 +21,7 @@ export function listDevice(query) {
 // 查询能源设备详细
 export function getDevice(id) {
   return request({
-    url: '/ems/basecfg/device/' + id,
+    url: '/ems/device/' + id,
     method: 'get'
   })
 }
@@ -20,7 +29,7 @@ export function getDevice(id) {
 // 新增能源设备
 export function addDevice(data) {
   return request({
-    url: '/ems/basecfg/device',
+    url: '/ems/device',
     method: 'post',
     data: data
   })
@@ -29,7 +38,7 @@ export function addDevice(data) {
 // 修改能源设备
 export function updateDevice(data) {
   return request({
-    url: '/ems/basecfg/device',
+    url: '/ems/device',
     method: 'put',
     data: data
   })
@@ -38,7 +47,7 @@ export function updateDevice(data) {
 // 删除能源设备
 export function delDevice(id) {
   return request({
-    url: '/ems/basecfg/device/' + id,
+    url: '/ems/device/' + id,
     method: 'delete'
   })
 }

+ 44 - 0
ems-ui/src/api/device/meterDevice.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询计量设备列表
+export function listDevice(query) {
+  return request({
+    url: '/ems/meterDevice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询计量设备详细
+export function getDevice(id) {
+  return request({
+    url: '/ems/meterDevice/' + id,
+    method: 'get'
+  })
+}
+
+// 新增计量设备
+export function addDevice(data) {
+  return request({
+    url: '/ems/meterDevice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改计量设备
+export function updateDevice(data) {
+  return request({
+    url: '/ems/meterDevice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除计量设备
+export function delDevice(id) {
+  return request({
+    url: '/ems/meterDevice/' + id,
+    method: 'delete'
+  })
+}

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

@@ -66,7 +66,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['basecfg:device:add']"
+              v-hasPermi="['ems:device:add']"
             >新增
             </el-button>
           </el-col>
@@ -78,7 +78,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['basecfg:device:edit']"
+              v-hasPermi="['ems:device:edit']"
             >修改
             </el-button>
           </el-col>
@@ -90,7 +90,7 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['basecfg:device:remove']"
+              v-hasPermi="['ems:device:remove']"
             >删除
             </el-button>
           </el-col>
@@ -101,7 +101,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['basecfg:device:export']"
+              v-hasPermi="['ems:device:export']"
             >导出
             </el-button>
           </el-col>
@@ -110,11 +110,11 @@
 
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="归属设施" align="center" prop="refFacsName"/>
+          <el-table-column label="归属区域" align="center" prop="refAreaName"/>
           <el-table-column label="设备代码" align="center" prop="deviceCode"/>
           <el-table-column label="设备名称" align="center" prop="deviceName"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
-          <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
@@ -122,7 +122,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['basecfg:device:edit']"
+                v-hasPermi="['ems:device:edit']"
               >修改
               </el-button>
               <el-button
@@ -130,7 +130,7 @@
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['basecfg:device:remove']"
+                v-hasPermi="['ems:device:remove']"
               >删除
               </el-button>
             </template>
@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { listDevice, getDevice, delDevice, addDevice, updateDevice } from '@/api/basecfg/device'
+import { listDeviceByAreaTree, 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'
@@ -262,7 +262,7 @@ export default {
     /** 查询能源设备列表 */
     getList() {
       this.loading = true
-      listDevice(this.queryParams).then(response => {
+      listDeviceByAreaTree(this.queryParams).then(response => {
         this.deviceList = response.rows
         this.total = response.total
         this.loading = false

+ 324 - 0
ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -0,0 +1,324 @@
+<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="deviceCode">
+        <el-input
+          v-model="queryParams.deviceCode"
+          placeholder="请输入设备代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计量介质" prop="meterCls">
+        <el-input
+          v-model="queryParams.meterCls"
+          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:device: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:device: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:device: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:device:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceList" @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="deviceCode" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="计量介质" align="center" prop="meterCls" />
+      <el-table-column label="计量对象类型" align="center" prop="meterObjType" />
+      <el-table-column label="计量对象编码" align="center" prop="objCode" />
+      <el-table-column label="采集周期" align="center" prop="colCycle" />
+      <el-table-column label="采集方式" align="center" prop="colMode" />
+      <el-table-column label="规格描述" align="center" prop="specDesc" />
+      <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:device:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:device: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="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入设备代码" />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="计量介质" prop="meterCls">
+          <el-input v-model="form.meterCls" placeholder="请输入计量介质" />
+        </el-form-item>
+        <el-form-item label="对象类型" prop="objType">
+          <el-input v-model="form.objType" placeholder="请输入计量对象" />
+        </el-form-item>
+        <el-form-item label="对象编码" prop="objCode">
+          <el-input v-model="form.objCode" placeholder="请输入计量对象编码" />
+        </el-form-item>
+        <el-form-item label="采集周期" prop="colCycle">
+          <el-input v-model="form.colCycle" placeholder="请输入采集周期" />
+        </el-form-item>
+        <el-form-item label="采集方式" prop="colMode">
+          <el-input v-model="form.colMode" placeholder="请输入采集方式" />
+        </el-form-item>
+        <el-form-item label="规格描述" prop="specDesc">
+          <el-input v-model="form.specDesc" 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 { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/device/meterDevice";
+
+export default {
+  name: "Device",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 计量设备表格数据
+      deviceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceCode: null,
+        deviceName: null,
+        meterCls: null,
+        objType: null,
+        objCode: null,
+        colCycle: null,
+        colMode: null,
+        specDesc: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deviceCode: [
+          { required: true, message: "设备代码不能为空", trigger: "blur" }
+        ],
+        deviceName: [
+          { required: true, message: "设备名称不能为空", trigger: "blur" }
+        ],
+        meterCls: [
+          { required: true, message: "计量介质不能为空", trigger: "blur" }
+        ],
+        meterObjType: [
+          { required: true, message: "计量对象类型 1-区块 2-设备不能为空", trigger: "change" }
+        ],
+        objCode: [
+          { required: true, message: "计量对象编码不能为空", trigger: "blur" }
+        ],
+        colCycle: [
+          { required: true, message: "采集周期不能为空", trigger: "blur" }
+        ],
+        colMode: [
+          { required: true, message: "采集方式不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询计量设备列表 */
+    getList() {
+      this.loading = true;
+      listDevice(this.queryParams).then(response => {
+        this.deviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deviceCode: null,
+        deviceName: null,
+        meterCls: null,
+        meterObjType: null,
+        objCode: null,
+        colCycle: null,
+        colMode: null,
+        specDesc: 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
+      getDevice(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) {
+            updateDevice(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDevice(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 delDevice(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/meterDevice/export', {
+        ...this.queryParams
+      }, `device_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>