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

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

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询能源设施能流关系列表
 export function listRel(query) {
   return request({
-    url: '/ems/basecfg/flowrel/list',
+    url: '/ems/object/flowrel/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listRel(query) {
 // 查询能源设施能流关系详细
 export function getRel(id) {
   return request({
-    url: '/ems/basecfg/flowrel/' + id,
+    url: '/ems/object/flowrel/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getRel(id) {
 // 新增能源设施能流关系
 export function addRel(data) {
   return request({
-    url: '/ems/basecfg/flowrel',
+    url: '/ems/object/flowrel',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addRel(data) {
 // 修改能源设施能流关系
 export function updateRel(data) {
   return request({
-    url: '/ems/basecfg/flowrel',
+    url: '/ems/object/flowrel',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateRel(data) {
 // 删除能源设施能流关系
 export function delRel(id) {
   return request({
-    url: '/ems/basecfg/flowrel/' + id,
+    url: '/ems/object/flowrel/' + id,
     method: 'delete'
   })
 }

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

@@ -1,22 +1,6 @@
 <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="exportFacsCode" label-width="100ox">
-        <el-select v-model="queryParams.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="queryParams.exportFacsCode" >
-          <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="queryParams.inputFacsCode" >
-          <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">
         <treeselect v-model="queryParams.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择流动介质"  :style="{ width: '200px' }"/>
       </el-form-item>
@@ -64,34 +48,17 @@
 
     <el-table v-loading="loading" :data="relList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编码" align="center" prop="code" />
-      <el-table-column label="输出设施" align="center" prop="exportFacsName" />
-      <el-table-column label="流入设施" align="center" prop="inputFacsName" />
-      <el-table-column label="流动介质" align="center" prop="emsClsName" />
-      <el-table-column label="供能状态" align="center" prop="state">
+      <el-table-column label="输出对象" align="center" prop="exportObjName">
         <template slot-scope="scope">
-           <span
-             :style="{
-                    display: 'inline-block',
-                    textAlign: 'center',
-                    cursor: 'pointer',
-                    color:parseInt(scope.row.state) ===0 ? 'rgb(255,159,159)' : 'rgb(117,186,255)',
-                    backgroundColor: parseInt(scope.row.state) ===0 ? 'rgb(255,235,235)' : 'rgb(232,244,255)',
-                    fontSize: '13px',
-                    fontFamily: 'Arial, sans-serif',
-                    fontWeight: 'normal',
-                    width: '65px',
-                    height: '40px',
-                    lineHeight: '40px',
-                    padding: '0 10px',
-                    borderRadius: '4px',
-                    boxSizing: 'border-box',
-        }">
-        {{ parseInt(scope.row.state)===0?  '停止': '进行中'  }}
-      </span>
+          <span>{{ '(' + getObjType(scope.row.exportObjType) + ') ' +scope.row.exportObjName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="能流动作" align="center" prop="actionType" :formatter="getActionType"/>
+      <el-table-column label="流入对象" align="center" prop="inputObjName">
+        <template slot-scope="scope">
+          <span>{{ '(' + getObjType(scope.row.inputObjType) + ') ' +scope.row.inputObjName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流动介质" align="center" prop="emsClsName" />
       <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="['basecfg:flowrel:edit']">
@@ -111,38 +78,29 @@
     />
 
     <!-- 添加或修改能源设施能流关系对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="mergeForm" :model="mergeForm" :rules="rules" label-width="80px">
-        <el-form-item label="所在园区" prop="areaCode">
-          <el-select v-model="mergeForm.areaCode" @change="getAllFacs" style="width:100%">
-            <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
+        <el-form-item label="输出类别" prop="exportObjType">
+          <el-select v-model="mergeForm.exportObjType" @change="setCodePrefix" style="width:100%">
+            <el-option v-for="item in objOptions" :label="item.name" :value="item.code" :key="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="输出设施" prop="exportFacsCode">
-          <el-select v-model="mergeForm.exportFacsCode" @change="setCodePrefix" style="width:100%">
-            <el-option v-for="item in facsOptions" :label="item.facsName" :value="item.facsCode" :key="item.facsCode" />
-          </el-select>
+        <el-form-item label="输出对象" prop="exportObj">
+          <el-input v-model="mergeForm.exportObj"  placeholder="输出对象" />
         </el-form-item>
-        <el-form-item label="流入设施" prop="inputFacsCode">
-          <el-select v-model="mergeForm.inputFacsCode" @change="setCodeCompose" style="width:100%">
-            <el-option v-for="item in facsOptions" :label="item.facsName" :value="item.facsCode" :key="item.facsCode" />
+        <el-form-item label="流入类别" prop="inputObjType">
+          <el-select v-model="mergeForm.inputObjType" @change="setCodeCompose" style="width:100%">
+            <el-option v-for="item in objOptions" :label="item.name" :value="item.code" :key="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="编码" prop="code" >
-          <el-input v-model="mergeForm.code"  placeholder="请输入编码" />
+        <el-form-item label="流入对象" prop="inputObj">
+          <el-input v-model="mergeForm.inputObj"  placeholder="流入对象" />
         </el-form-item>
         <el-form-item label="流动介质" prop="emsCls">
           <treeselect v-model="mergeForm.emsCls" :options="emsClsOptions" :show-count="true" placeholder="请选择" />
         </el-form-item>
-        <el-form-item label="供能状态" prop="state">
-          <el-select v-model="mergeForm.state" style="width:100%">
-            <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="actionType">
-          <el-select v-model="mergeForm.actionType" style="width:100%">
-            <el-option v-for="item in actionTypeData" :label="item.name" :value="item.code" :key="item.code" />
-          </el-select>
+        <el-form-item label="能流描述" prop="flowDesc">
+          <el-input v-model="mergeForm.flowDesc"  placeholder="能流描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -193,52 +151,37 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        code: null,
-        exportFacsCode: null,
-        inputFacsCode: null,
+        exportObjType: null,
+        exportObj: null,
+        inputObjType: null,
+        inputObj: null,
         emsCls: null,
-        state: null,
-        actionType: null,
+        flowDesc: null,
       },
-      enableOptions: [
-        { code: 0, name: "停止"},
-        { code: 1, name: "进行中"}
+      objOptions: [
+        { code: 0, name: "设施"},
+        { code: 2, name: "设备"},
+        { code: 3, name: "部件"}
       ],
       // 表单参数
       mergeForm: {},
       // 表单校验
       rules: {
-        code: [
-          { required: true, message: "编码不能为空", trigger: "blur" }
-        ],
-        exportFacsCode: [
-          { required: true, message: "能源输出设施不能为空", trigger: "blur" }
+        exportObj: [
+          { required: true, message: "能源输出对象不能为空", trigger: "blur" }
         ],
-        inputFacsCode: [
-          { required: true, message: "能源流入设施不能为空", trigger: "blur" }
+        inputObj: [
+          { required: true, message: "能源流入对象不能为空", trigger: "blur" }
         ],
         emsCls: [
           { required: true, message: "能源流动介质不能为空", trigger: "blur" }
-        ],
-        state: [
-          { required: true, message: "供能状态 不能为空", trigger: "blur" }
-        ],
-        actionType: [
-          { required: true, message: "能流动作 不能为空", trigger: "change" }
-        ],
+        ]
       },
-      actionTypeData: [
-        { code:'4501',name:'购电' },
-        { code:'4502' ,name:'上网'},
-        { code:'4503' ,name:'充电'},
-        { code:'4504' ,name:'放电'},
-        { code:'4505' ,name:'自产自销'},
-      ]
+
     };
   },
   created() {
     this.getList();
-    this.getAreaTree("Area");
     this.getAllFacs("");
     this.getEmsCls();
   },
@@ -336,26 +279,13 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('ems/basecfg/flowrel/export', {
-        ...this.queryParams
-      }, `rel_${new Date().getTime()}.xlsx`)
-    },
-    getActionType(row, column, cellValue, index) {
-      const actionTypeMap = {
-        4501: '购电',
-        4502: '上网',
-        4503: '充电',
-        4504: '放电',
-        4505: '自产自销'
+    getObjType(row, column, cellValue, index) {
+      const objTypeMap = {
+        1: '设施',
+        2: '设备',
+        3: '部件'
       };
-      return actionTypeMap[cellValue] || '未知';
-    },
-    getAreaTree(tier) {
-      areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data;
-      });
+      return objTypeMap[cellValue] || '未知';
     },
     getAllFacs(areaCode) {
       listAllFacs(areaCode).then(response =>{