设备管理

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

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

ems-ui/src/api/commonApi.js

@@ -23,3 +23,11 @@ export function getEmsTag(tagModel){
     method: 'get'
   })
 }
+
+// 查询标签列表
+export function getDevcType(){
+  return request({
+    url: '/ems/common/devc/type',
+    method: 'get'
+  })
+}

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

@@ -1,28 +1,8 @@
 <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-col>
+    </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -130,7 +110,7 @@
 </template>
 
 <script>
-import { listFactor, getFactor, delFactor, addFactor, updateFactor } from "@/api/basecfg/emissionfactor";
+import { listFactor, getFactor, delFactor, addFactor, updateFactor } from "@/api/basecfg/cacfg";
 
 export default {
   name: "Factor",

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

@@ -44,14 +44,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="归属区域" prop="refArea">
-            <el-input
-              v-model="queryParams.refArea"
-              placeholder="请输入归属区域"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
           <el-form-item label="归属设施" prop="refFacs">
             <el-input
               v-model="queryParams.refFacs"
@@ -120,7 +112,7 @@
           <el-table-column type="selection" width="55" align="center"/>
           <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="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">
@@ -156,6 +148,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="refFacs" >
+              <el-select v-model="form.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="refArea">
+              <treeselect v-model="form.refArea" :options="areaOptions" :show-count="true" placeholder="请选择所属建筑" @select="handleAreaType"/>
+            </el-form-item>
             <el-form-item label="设备代码" prop="deviceCode">
               <el-input v-model="form.deviceCode" placeholder="请输入设备代码"/>
             </el-form-item>
@@ -163,13 +163,9 @@
               <el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
             </el-form-item>
             <el-form-item label="设备类型" prop="deviceType">
-              <el-input v-model="form.deviceType" placeholder="请输入设备类型"/>
-            </el-form-item>
-            <el-form-item label="归属区域" prop="refArea">
-              <treeselect v-model="form.refArea" :options="areaOptions" :show-count="true" placeholder="请选择所属建筑" @select="handleAreaType"/>
-            </el-form-item>
-            <el-form-item label="归属设施" prop="refFacs">
-              <el-input v-model="form.refFacs" placeholder="请输入归属设施"/>
+              <el-select v-model="form.deviceType" >
+                <el-option v-for="item in devcTypeOptions" :label="item.typeName" :value="item.typeCode" :key="item.typeCode" />
+              </el-select>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -185,6 +181,8 @@
 <script>
 import { listDevice, getDevice, delDevice, addDevice, updateDevice } from '@/api/basecfg/device'
 import { areaTreeSelect } from "@/api/basecfg/area"
+import { listAllFacs } from "@/api/basecfg/emsfacs"
+import { getDevcType} from '@/api/commonApi'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -215,6 +213,10 @@ export default {
       areaName: undefined,
       // 区域树选项
       areaOptions: undefined,
+      // 设施选项
+      facsOptions: undefined,
+      // 设备分类
+      devcTypeOptions: undefined,
       defaultProps: {
         children: "children",
         label: "label"
@@ -235,6 +237,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        refFacs: [
+          { required: true, message: '归属设施', trigger: 'blur' }
+        ],
+        refArea: [
+          { required: true, message: '归属区域', trigger: 'blur' }
+        ],
         deviceCode: [
           { required: true, message: '设备代码不能为空', trigger: 'blur' }
         ],
@@ -247,6 +255,8 @@ export default {
   created() {
     this.getList();
     this.getAreaTree('Zoning');
+    this.getFacsOptions("");
+    this.getDevcType();
   },
   methods: {
     /** 查询能源设备列表 */
@@ -366,6 +376,16 @@ export default {
     },
     handleAreaType(data) {
       this.form.areaType = data.tier;
+    },
+    getFacsOptions(areaCode) {
+      listAllFacs(areaCode).then(response =>{
+        this.facsOptions = response.data;
+      })
+    },
+    getDevcType() {
+      getDevcType().then(response =>{
+        this.devcTypeOptions = response.data;
+      })
     }
   }
 }

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

@@ -250,9 +250,6 @@ export default {
         facsType: [
           { required: true, message: "设施分类不能为空", trigger: "change" }
         ],
-        facsSubtype: [
-          { required: true, message: "设施子类不能为空", trigger: "change" }
-        ],
         refArea: [
           { required: true, message: "归属区域代码不能为空", trigger: "blur" }
         ],

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

@@ -105,30 +105,35 @@
 
     <!-- 添加或修改能源设施能流关系对话框 -->
     <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="请输入编码" :style="{ width: '200px' }"/>
-        </el-form-item>
+      <el-form ref="form" :model="mergeForm" :rules="rules" label-width="80px">
         <el-form-item label="所在园区" prop="areaCode">
-          <el-select v-model="form.areaCode" @change="getAllFacs" >
+          <el-select v-model="mergeForm.areaCode" @change="getAllFacs" >
             <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="输出设施" prop="exportFacsCode">
-          <el-select v-model="form.exportFacsCode" >
+          <el-select v-model="mergeForm.exportFacsCode" @change="setCodePrefix">
             <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="inputFacsCode">
-          <el-select v-model="form.inputFacsCode" >
+          <el-select v-model="mergeForm.inputFacsCode" @change="setCodeCompose">
             <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="code" :readonly="codeReadOnly">
+          <el-input v-model="mergeForm.code" :style="{ width: '200px' }"  @click="changeCodeReadOnly"/>
+        </el-form-item>
         <el-form-item label="流动介质" prop="emsCls">
-          <treeselect v-model="form.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择能源种类" :style="{ width: '200px' }"/>
+          <treeselect v-model="mergeForm.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择能源种类" :style="{ width: '200px' }"/>
         </el-form-item>
         <el-form-item label="供能状态" prop="state">
-          <el-input v-model="form.state" placeholder="请输入供能状态" :style="{ width: '200px' }"/>
+          <el-select v-model="mergeForm.state">
+            <el-option v-for="item in enableOptions" :label="item.name" :value="item.code" :key="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="供能状态" prop="state">
+          <el-input v-model="mergeForm.actionType" :style="{ width: '200px' }" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -175,6 +180,7 @@ export default {
       facsOptions: undefined,
       // 能源分类树
       emsClsOptions: [],
+      codeReadOnly: true,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -186,8 +192,12 @@ export default {
         state: null,
         actionType: null,
       },
+      enableOptions: [
+        { code: 0, name: "停止"},
+        { code: 1, name: "进行中"}
+      ],
       // 表单参数
-      form: {},
+      mergeForm: {},
       // 表单校验
       rules: {
         code: [
@@ -241,7 +251,7 @@ export default {
     },
     // 表单重置
     reset() {
-      this.form = {
+      this.mergeForm = {
         id: null,
         code: null,
         exportFacsCode: null,
@@ -252,7 +262,7 @@ export default {
         createTime: null,
         updateTime: null
       };
-      this.resetForm("form");
+      this.resetForm("mergeForm");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -282,7 +292,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRel(id).then(response => {
-        this.form = response.data;
+        this.mergeForm = response.data;
         this.open = true;
         this.title = "修改能源设施能流关系";
       });
@@ -290,16 +300,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["mergeForm"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
-            updateRel(this.form).then(response => {
+          if (this.mergeForm.id != null) {
+            updateRel(this.mergeForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addRel(this.form).then(response => {
+            addRel(this.mergeForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -339,8 +349,8 @@ export default {
         this.areaOptions = response.data;
       });
     },
-    getAllFacs(id) {
-      listAllFacs(id).then(response =>{
+    getAllFacs(areaCode) {
+      listAllFacs(areaCode).then(response =>{
         this.facsOptions = response.data;
       })
     },
@@ -350,6 +360,15 @@ export default {
         this.emsClsOptions = response.data;
       });
     },
+    setCodePrefix() {
+      this.mergeForm.code = this.mergeForm.exportFacsCode;
+    },
+    setCodeCompose() {
+      this.mergeForm.code = this.mergeForm.exportFacsCode + '_' +this.mergeForm.inputFacsCode;
+    },
+    changeCodeReadOnly() {
+      this.codeReadOnly = false;
+    }
   }
 };
 </script>