增加区块标签

ems-ui/src/api/commonApi.js

@@ -15,3 +15,11 @@ export function getEmsClsTree(){
     method: 'get'
   })
 }
+
+// 查询标签列表
+export function getEmsTag(tagModel){
+  return request({
+    url: '/ems/common/emstag?tagModel=' + tagModel,
+    method: 'get'
+  })
+}

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

@@ -17,8 +17,8 @@
           <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="emsCls" label-width="68px">
-        <treeselect v-model="queryParams.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择能源种类" />
+      <el-form-item label="流动介质" prop="emsCls">
+        <treeselect v-model="queryParams.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择能源种类"  :style="{ width: '200px' }" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -107,7 +107,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="code">
-          <el-input v-model="form.code" placeholder="请输入编码" />
+          <el-input v-model="form.code" placeholder="请输入编码" :style="{ width: '200px' }"/>
         </el-form-item>
         <el-form-item label="所在园区" prop="areaCode">
           <el-select v-model="form.areaCode" @change="getAllFacs" >
@@ -125,10 +125,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="流动介质" prop="emsCls">
-          <treeselect v-model="form.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择能源种类" />
+          <treeselect v-model="form.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="请输入供能状态" />
+          <el-input v-model="form.state" placeholder="请输入供能状态" :style="{ width: '200px' }"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -98,11 +98,11 @@
 
         <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="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="zoningCode" />
+          <el-table-column label="区块名称" align="center" prop="zoningName" />
+          <el-table-column label="区块标签" align="center" prop="tagName" />
           <el-table-column label="建筑划分面积" align="center" prop="bldgLdArea" />
           <el-table-column label="使用详情" align="center" prop="usageDetail" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -135,21 +135,23 @@
 
         <!-- 添加或修改建筑区域划分对话框 -->
         <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="zoningCode">
-              <el-input v-model="form.zoningCode" placeholder="请输入分区编码" />
-            </el-form-item>
-            <el-form-item label="区块名称" prop="zoningName">
-              <el-input v-model="form.zoningName" placeholder="请输入分区名称" />
-            </el-form-item>
+          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
             <el-form-item label="所属建筑" prop="bldgCode">
               <treeselect v-model="form.bldgCode" :options="areaOptions" :show-count="true" placeholder="请选择所属建筑" />
             </el-form-item>
             <el-form-item label="楼层" prop="floor">
               <el-input v-model="form.floor" placeholder="请输入楼层" />
             </el-form-item>
-            <el-form-item label="房间号" prop="roomNo">
-              <el-input v-model="form.roomNo" placeholder="请输入房间号" />
+            <el-form-item label="区块编码" prop="zoningCode">
+              <el-input v-model="form.zoningCode" placeholder="请输入分区编码" />
+            </el-form-item>
+            <el-form-item label="区块名称" prop="zoningName">
+              <el-input v-model="form.zoningName" placeholder="请输入分区名称" />
+            </el-form-item>
+            <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>
             </el-form-item>
             <el-form-item label="建筑划分面积" prop="bldgLdArea">
               <el-input v-model="form.bldgLdArea" placeholder="请输入建筑划分面积" />
@@ -170,9 +172,11 @@
 
 <script>
 import { listZoning, getZoning, delZoning, addZoning, updateZoning } from "@/api/basecfg/zoning";
+import { getEmsTag } from '@/api/commonApi';
 import { areaTreeSelect } from "@/api/basecfg/area"
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listAllFacsType } from '@/api/basecfg/facstype'
 
 export default {
   name: "Zonin",
@@ -201,6 +205,8 @@ export default {
       areaName: undefined,
       // 区域树选项
       areaOptions: undefined,
+      // 标签选项
+      emsTagOptions: undefined,
       defaultProps: {
         children: "children",
         label: "label"
@@ -212,6 +218,7 @@ export default {
         bldgCode: null,
         zoningCode: null,
         zoningName: null,
+        tagCode: null,
         floor: null,
         roomNo: null,
         bldgLdArea: null,
@@ -239,6 +246,7 @@ export default {
   created() {
     this.getList();
     this.getAreaTree('Building');
+    this.getEmsTag("Area");
   },
   methods: {
     /** 查询建筑区域划分列表 */
@@ -352,7 +360,12 @@ export default {
       this.download('ems/basecfg/area/building/zoning/export', {
         ...this.queryParams
       }, `zoning_${new Date().getTime()}.xlsx`)
-    }
+    },
+    getEmsTag(tagModel) {
+      getEmsTag(tagModel).then(response =>{
+        this.emsTagOptions = response.data;
+      })
+    },
   }
 };
 </script>