联调修复

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

@@ -53,23 +53,6 @@
           <el-table-column label="分区编码" align="center" prop="zoningCode" width="200" />
           <el-table-column label="所在建筑" align="left" prop="areaPath" />
           <el-table-column label="区块标签" align="center" prop="tagNames" />
-          <el-table-column label="使用状态" align="center" prop="usageDetail">
-            <template slot-scope="scope">
-              <span
-                :style="{
-                    padding: '6px 12px',
-                    borderRadius: '4px',
-                    display: 'inline-block',
-                    textAlign: 'center',
-                    cursor: 'pointer',
-                    color:parseInt(scope.row.usageDetail) ===0 ? 'rgb(255,159,159)' : 'rgb(117,186,255)',
-                    backgroundColor: parseInt(scope.row.usageDetail) ===0 ? 'rgb(255,235,235)' : 'rgb(232,244,255)',
-        }">
-
-        {{ parseInt(scope.row.usageDetail) === 0 ?  '停用': '启动' }}
-      </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="['basecfg:zoning:edit']">
@@ -107,10 +90,8 @@
             <el-form-item label="建筑划分面积" prop="bldgLdArea">
               <el-input v-model="form.bldgLdArea" placeholder="请输入建筑划分面积" />
             </el-form-item>
-            <el-form-item label="使用状态" prop="usageDetail">
-              <el-select v-model="form.usageDetail" placeholder="请选择" style="width:100%">
-                <el-option v-for="item in usageDetailOptions" :key="item.code" :label="item.name" :value="item.code"></el-option>
-              </el-select>
+            <el-form-item label="使用情况" prop="usageDetail">
+              <el-input v-model="form.usageDetail" placeholder="请输入使用情况" />
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -177,13 +158,8 @@ export default {
       // 表单校验
       rules: {
         zoningCode: [{ required: true, message: '分区编码不能为空', trigger: 'blur' }],
-        zoningName: [{ required: true, message: '分区名称不能为空', trigger: 'blur' }],
-        usageDetail: [{ required: true, message: '使用状态不能为空', trigger: 'change' }]
-      },
-      usageDetailOptions: [
-        { code: '1', name: '启用' },
-        { code: '0', name: '停用' }
-      ]
+        zoningName: [{ required: true, message: '分区名称不能为空', trigger: 'blur' }]
+      }
     }
   },
   watch: {

ems-ui/src/views/devmgr/el/index.vue

@@ -1,14 +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="recordCode">
-        <el-input
-          v-model="queryParams.recordCode"
-          placeholder="请输入记录编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="对象类型" prop="objType">
         <el-select v-model="queryParams.objType" placeholder="请选择对象类型" clearable>
           <el-option
@@ -105,7 +97,7 @@
 
     <el-table v-loading="loading" :data="rbookList" @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="recordCode" />
       <el-table-column label="对象类型" align="center" prop="objType">
         <template slot-scope="scope">

ems-ui/src/views/devmgr/state/index.vue

@@ -29,14 +29,6 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <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"
@@ -46,12 +38,9 @@
             />
           </el-form-item>
           <el-form-item label="归属设施" prop="refFacs">
-            <el-input
-              v-model="queryParams.refFacs"
-              placeholder="请输入归属设施"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+            <el-select v-model="queryParams.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="subsystemCode">
             <el-select v-model="queryParams.subsystemCode" >
@@ -65,11 +54,9 @@
         </el-form>
 
         <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="deviceName"/>
-          <el-table-column label="归属区域" align="left" prop="areaPath"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName"/>
+          <el-table-column label="归属区域" align="left" prop="areaPath" width="200px"/>
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
-          <el-table-column label="设备代码" align="center" prop="deviceCode"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
           <el-table-column label="设备状态" align="center" prop="deviceStatus">
             <template slot-scope="scope">
@@ -77,6 +64,11 @@
             </template>
           </el-table-column>
           <el-table-column label="子系统" align="center" prop="subsystemName"/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text"  @click="handleDetail(scope.row)">详情</el-button>
+            </template>
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -90,29 +82,30 @@
         <!-- 添加或修改能源设备对话框 -->
         <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="deviceName">
+              <el-input disabled v-model="form.deviceName" placeholder="请输入设备名称"/>
+            </el-form-item>
+            <el-form-item label="设备代码" prop="deviceCode">
+              <el-input disabled v-model="form.deviceCode" placeholder="请输入设备代码"/>
+            </el-form-item>
             <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-input disabled v-model="form.refFacsName" placeholder="归属设施"/>
             </el-form-item>
             <el-form-item label="归属区域" prop="refArea">
-              <treeselect v-model="form.refArea" :options="areaOptions" :show-count="true" placeholder="请选择所属建筑" @select="handleAreaType"/>
+              <el-input disabled v-model="form.refAreaName" placeholder="归属区域"/>
             </el-form-item>
-            <el-form-item label="设备代码" prop="deviceCode">
-              <el-input v-model="form.deviceCode" placeholder="请输入设备代码"/>
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-input disabled v-model="form.deviceTypeName" placeholder="设备类型"/>
             </el-form-item>
-            <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
+            <el-form-item label="子系统" prop="subsystemName">
+              <el-input disabled v-model="form.subsystemName" placeholder="子系统"/>
             </el-form-item>
-            <el-form-item label="设备类型" prop="deviceType">
-              <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 label="设备状态" prop="deviceStatus">
+              <el-input disabled v-model="form.deviceStatus" 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>
+            <el-button @click="cancel">关闭</el-button>
           </div>
         </el-dialog>
       </el-col>
@@ -128,6 +121,7 @@ import { getDevcType} from '@/api/commonApi'
 import { listSubsystemAll } from '@/api/adapter/subsystem'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getBuilding } from '@/api/basecfg/building'
 
 
 export default {
@@ -181,22 +175,7 @@ export default {
         subsystemCode: null
       },
       // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        refFacs: [
-          { required: true, message: '归属设施', trigger: 'blur' }
-        ],
-        refArea: [
-          { required: true, message: '归属区域', trigger: 'blur' }
-        ],
-        deviceCode: [
-          { required: true, message: '设备代码不能为空', trigger: 'blur' }
-        ],
-        deviceName: [
-          { required: true, message: '设备名称不能为空', trigger: 'blur' }
-        ]
-      }
+      form: {}
     }
   },
   created() {
@@ -265,65 +244,15 @@ export default {
       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) {
+    handleDetail(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()
-            })
-          }
-        }
+        this.title = '设备详情'
       })
     },
-    /** 删除按钮操作 */
-    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/basecfg/device/export', {
-        ...this.queryParams
-      }, `device_${new Date().getTime()}.xlsx`)
-    },
     handleAreaType(data) {
       this.form.areaType = data.tier;
     },

ems-ui/src/views/mgr/powergrid.vue

@@ -11,7 +11,7 @@
         </el-form>
         <BaseChart width="100%" height="300px" :option="elecOptions" />
         <el-table v-loading="loading" :data="pgSupplyHList">
-          <el-table-column label="服务区" align="center" prop="areaShortName" />
+          <el-table-column label="设施" align="center" prop="facsName" />
           <el-table-column label="日期" align="center" prop="date" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
@@ -42,7 +42,7 @@
         </el-form>
         <BaseChart width="100%" height="300px" :option="pvOptions" />
         <el-table v-loading="loading" :data="pvSupplyHList">
-          <el-table-column label="服务区" align="center" prop="areaShortName" />
+          <el-table-column label="设施" align="center" prop="facsName" />
           <el-table-column label="日期" align="center" prop="date" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
@@ -53,8 +53,7 @@
               <span>{{ scope.row.time }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="单位电价" align="center" prop="upUnitPrice" />
-          <el-table-column label="发电量" align="center" prop="genElecQuantity" />
+          <el-table-column label="总发电量" align="center" prop="genElecQuantity" />
           <el-table-column label="自用电量" align="center" prop="useElecQuantity" />
           <el-table-column label="上网电量" align="center" prop="upElecQuantity" />
           <el-table-column label="上网收益" align="center" prop="upElecEarn" />

ems-ui/src/views/mgr/powerstore.vue

@@ -9,7 +9,6 @@
     </el-form>
     <BaseChart width="100%" height="300px" :option="elecOptions" />
     <el-table v-loading="loading" :data="elecStoreHList" max-height="400px">
-      <el-table-column label="园区名称" align="center" prop="areaShortName" />
       <el-table-column label="设施名称" align="center" prop="facsName" />
       <el-table-column label="日期" align="center" prop="date" width="180">
       </el-table-column>