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

ems-ui/src/api/device/device.js

@@ -60,3 +60,51 @@ export function delDevice(id) {
     method: 'delete'
   })
 }
+// 查询设备
+export function getByCondition(params) {
+  return request({
+    url: '/ems/device/getByCondition' ,
+    method: 'get',
+    params
+  })
+}
+// 查询设备信息
+export function getDeviceDetail(params) {
+  return request({
+    url: '/ems/device/getDetail' ,
+    method: 'get',
+    params
+  })
+}
+//查询上游设备
+export function getByFlowRel(params) {
+  return request({
+    url: '/ems/device/getByFlowRel' ,
+    method: 'get',
+    params
+  })
+}
+// 查询设备属性信息
+export function getObjAttr(params) {
+  return request({
+    url: '/ems/object/attr/getObjAttr' ,
+    method: 'get',
+    params
+  })
+}
+// 查询设备最新1条指标
+export function getNewIndex(params) {
+  return request({
+    url: '/ems/object/loadIndex/getNewIndex' ,
+    method: 'get',
+    params
+  })
+}
+//查询设备下的设备部件
+export function listByDevice(params) {
+  return request({
+    url: '/ems/device/component/listByDevice' ,
+    method: 'get',
+    params
+  })
+}

ems-ui/src/api/mgr/loadIndex.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询电力负荷设施指标列表
 export function listLoadIndex(query) {
   return request({
-    url: '/ems/loadIndex/list',
+    url: '/ems/object/loadIndex/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listLoadIndex(query) {
 // 查询电力负荷设施指标详细
 export function getLoadIndex(id) {
   return request({
-    url: '/ems/loadIndex/' + id,
+    url: '/ems/object/loadIndex/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLoadIndex(id) {
 // 新增电力负荷设施指标
 export function addLoadIndex(data) {
   return request({
-    url: '/ems/loadIndex',
+    url: '/ems/object/loadIndex',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addLoadIndex(data) {
 // 修改电力负荷设施指标
 export function updateLoadIndex(data) {
   return request({
-    url: '/ems/loadIndex',
+    url: '/ems/object/loadIndex',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateLoadIndex(data) {
 // 删除电力负荷设施指标
 export function delLoadIndex(id) {
   return request({
-    url: '/ems/loadIndex/' + id,
+    url: '/ems/object/loadIndex/' + id,
     method: 'delete'
   })
 }

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

@@ -36,10 +36,9 @@
     <div class="powerdist-body">
       <Panel title="变压器">
         <div class="transformer">
-          <el-select v-model="transformer" size="mini">
-            <el-option label="变压器1" :value="1"></el-option>
-            <!-- <el-option label="变压器2" :value="2"></el-option>
-            <el-option label="变压器3" :value="3"></el-option> -->
+          <el-select v-model="transformer" size="mini" @change="getTransformerInfo">
+            <el-option v-for="item in transformerOptions" :key="item.deviceCode" :label="item.deviceName"
+              :value="item.deviceCode"></el-option>
           </el-select>
           <div class="transformer-info">
             <!-- <div class="info-header">
@@ -49,28 +48,18 @@
             </div> -->
             <img src="@/assets/images/mgr/line.svg" class="lineImg" alt="">
             <div class="arrowImg">
-              <span>10kV</span>
+              <span>{{ transformerInfo.ratedVoltage }}</span>
               <img src="@/assets/images/mgr/arrow.svg" alt="">
             </div>
             <img class="transformerImg" src="@/assets/images/mgr/transformer.png" alt="">
-            <!-- <div class="info-right">
-              <div>
-                <img src="@/assets/images/mgr/temperature.svg" alt="">
-                <span>温度：62.5°C</span>
-              </div>
-              <div>
-                <img src="@/assets/images/mgr/overhold.svg" alt="">
-                <span>负载率：72.5%</span>
-              </div>
-            </div> -->
           </div>
           <el-descriptions class="custom-desc" title="设备参数" :column="2" size="mini" border>
-            <el-descriptions-item label="产品型号">S11-M-400/10</el-descriptions-item>
-            <el-descriptions-item label="额定容量">400kVA</el-descriptions-item>
-            <el-descriptions-item label="额定电压">10±5%/0.4kV</el-descriptions-item>
-            <el-descriptions-item label="额定频率">50HZ</el-descriptions-item>
-            <el-descriptions-item label="相数">3</el-descriptions-item>
-            <el-descriptions-item label="生产厂家">XX电器</el-descriptions-item>
+            <el-descriptions-item label="产品型号">{{ transformerInfo.deviceSpec }}</el-descriptions-item>
+            <el-descriptions-item label="额定容量">{{ transformerInfo.ratedCapacity }}</el-descriptions-item>
+            <el-descriptions-item label="额定电压">{{ transformerInfo.ratedVoltage }}</el-descriptions-item>
+            <el-descriptions-item label="额定频率">{{ transformerInfo.ratedFrequency }}</el-descriptions-item>
+            <el-descriptions-item label="相数">{{ transformerInfo.phaseNumber }}</el-descriptions-item>
+            <el-descriptions-item label="生产厂家">{{ transformerInfo.deviceBrand }}</el-descriptions-item>
           </el-descriptions>
           <alarm :alarmData="transformerAlarmData" />
         </div>
@@ -78,19 +67,20 @@
       <Panel title="配电柜" background="linear-gradient( 180deg, #F1FEFF 0%, #FFFFFF 100%)">
         <div class="power">
           <el-select v-model="powerCode" size="mini" @change="powerChange">
-            <el-option v-for="item in powerList" :key="item.boxCode" :label="item.location" :value="item.boxCode"></el-option>
+            <el-option v-for="item in powerList" :key="item.deviceCode" :label="item.deviceName"
+              :value="item.deviceCode"></el-option>
           </el-select>
           <div class="power-info">
             <div>
-              <span>{{powerInfo.electricityA||'--'}}A</span>
+              <span>{{ powerInfo.la || '--' }}A</span>
               <span>A相</span>
             </div>
             <div>
-              <span>{{powerInfo.electricityB||'--'}}A</span>
+              <span>{{ powerInfo.lb || '--' }}A</span>
               <span>B相</span>
             </div>
             <div>
-              <span>{{powerInfo.electricityC||'--'}}A</span>
+              <span>{{ powerInfo.lc || '--' }}A</span>
               <span>C相</span>
             </div>
           </div>
@@ -99,35 +89,49 @@
             <div class="power-data-body">
               <div>
                 <div class="data-name">功率因素</div>
-                <div class="data-num">{{powerInfo.power||'--'}}</div>
+                <div class="data-num">{{ powerInfo.pf || '--' }}</div>
               </div>
               <div>
                 <div class="power-data-row">
                   <div>
                     <span class="data-name">A相电压</span>
-                    <span class="data-num">{{powerInfo.voltageA||'--'}}V</span>
+                    <span class="data-num">{{ powerInfo.ua || '--' }}V</span>
                   </div>
                   <div>
                     <span class="data-name">B相电压</span>
-                    <span class="data-num">{{powerInfo.voltageB||'--'}}V</span>
+                    <span class="data-num">{{ powerInfo.ub || '--' }}V</span>
                   </div>
                   <div>
                     <span class="data-name">C相电压</span>
-                    <span class="data-num">{{powerInfo.voltageC||'--'}}V</span>
+                    <span class="data-num">{{ powerInfo.uc || '--' }}V</span>
                   </div>
                 </div>
                 <div class="power-data-row">
                   <div>
-                    <span class="data-name">AB线电压</span>
-                    <span class="data-num">233.2V</span>
+                    <span class="data-name">A相有功功率</span>
+                    <span class="data-num">{{ powerInfo.pa || '--' }}W</span>
                   </div>
                   <div>
-                    <span class="data-name">BC相电压</span>
-                    <span class="data-num">233.2V</span>
+                    <span class="data-name">B相有功功率</span>
+                    <span class="data-num">{{ powerInfo.pb || '--' }}W</span>
                   </div>
                   <div>
-                    <span class="data-name">AC相电压</span>
-                    <span class="data-num">233.2V</span>
+                    <span class="data-name">C相有功功率</span>
+                    <span class="data-num">{{ powerInfo.pc || '--' }}W</span>
+                  </div>
+                </div>
+                <div class="power-data-row">
+                  <div>
+                    <span class="data-name">A相无功功率</span>
+                    <span class="data-num">{{ powerInfo.ua || '--' }}W</span>
+                  </div>
+                  <div>
+                    <span class="data-name">B相无功功率</span>
+                    <span class="data-num">{{ powerInfo.ub || '--' }}W</span>
+                  </div>
+                  <div>
+                    <span class="data-name">C相无功功率</span>
+                    <span class="data-num">{{ powerInfo.uc || '--' }}W</span>
                   </div>
                 </div>
               </div>
@@ -137,19 +141,22 @@
         </div>
 
       </Panel>
-      <Panel title="空开" background="linear-gradient( 180deg, #FFFBF1 0%, #FFFFFF 100%)">
+      <Panel title="器件" background="linear-gradient( 180deg, #FFFBF1 0%, #FFFFFF 100%)">
         <div class="switch">
           <img class="rightArrow" src="@/assets/images/mgr/line2.svg" alt="">
           <el-table :data="eqptList" style="width: 100%">
-            <el-table-column prop="eqptSpec"  show-overflow-tooltip label="支路">
+            <el-table-column prop="psName" show-overflow-tooltip label="支路">
+              <template slot-scope="scope">
+                <span>{{ scope.row.psName + "-" + scope.row.compoTag }}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="current" align="center" width="100" label="额定电流">
+            <el-table-column prop="ratedCurrent" align="center" width="100" label="额定电流">
             </el-table-column>
-            <el-table-column prop="ratedCurrent" align="center" width="100" label="实时电流">
+            <el-table-column prop="ratedVoltage" align="center" width="100" label="额定电压">
             </el-table-column>
             <el-table-column align="center" label="开关" width="60">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.status" size="mini">
+                <el-switch :value="scope.row.onOffState != 'off'" size="mini">
                 </el-switch>
               </template>
             </el-table-column>
@@ -160,13 +167,15 @@
   </div>
 </template>
 <script>
-import { listPowerBox, getPowerIndexs, getEqptIndexs } from '@/api/device/powerbox.js'
-import { listAlarmInfo, updateAlarmInfo } from '@/api/alarm/alarm-info.js'
+import {listAlarmInfo, updateAlarmInfo} from '@/api/alarm/alarm-info.js'
+import {getByCondition, getDeviceDetail, getObjAttr, getByFlowRel, getNewIndex, listByDevice} from '@/api/device/device.js'
 export default {
   name: 'Powerdist',
-  data() {
+  data () {
     return {
       transformer: 1,
+      transformerOptions: [],
+      transformerInfo: {},
       transformerAlarmData: [
         {
           name: '变压器油温值：90.3℃',
@@ -200,7 +209,7 @@ export default {
         }
       ],
       powerAlarmData: [],
-      powerCode: 1,
+      powerCode: '',
       powerList: [],
       powerInfo: {},
       eqptList: []
@@ -210,16 +219,16 @@ export default {
     Panel: () => import('./components/panel'),
     alarm: () => import('./components/alarm.vue')
   },
-  mounted() {
-    this.getPowerList()
+  mounted () {
+    this.getTransformerList()
   },
   methods: {
-    getPowerAlarmList() {
+    getPowerAlarmList () {
       listAlarmInfo({
         objType: 4,
         objCode: this.powerCode,
         alarmStateList: [0, 1]
-      }).then(({ rows }) => {
+      }).then(({rows}) => {
         this.powerAlarmData = rows.map(item => ({
           ...item,
           name: item.objName,
@@ -228,41 +237,114 @@ export default {
         }))
       })
     },
-    getPowerList() {
-      listPowerBox().then(({ rows }) => {
-        this.powerList = rows
-        if (rows.length) {
-          this.powerCode = rows[0].boxCode
+    getPowerList () {
+      getByFlowRel({
+        upstreamObjType: 2,
+        upstreamObjCode: this.transformer,
+        deviceSubCategory: 'W2',
+        psCode: 'AP'
+      }).then(({data}) => {
+        this.powerList = data || []
+        if (data.length) {
+          this.powerCode = data[0].deviceCode
         }
         this.powerChange()
       })
     },
-    getPowerInfo() {
-      getPowerIndexs(this.powerCode).then(({ data }) => {
-        this.powerInfo = data || {}
+    getTransformerList () {
+      getByCondition({
+        deviceSubCategory: 'W2',
+        psCode: 'T'
+      }).then(({code, data}) => {
+        if (code === 200) {
+          this.transformerOptions = data
+          if (data && data.length) {
+            this.transformer = data[0].deviceCode
+          }
+          this.getTransformerInfo()
+        }
+      })
+    },
+    getTransformerInfo () {
+      getDeviceDetail({deviceCode: this.transformer}).then(({code, data}) => {
+        if (code === 200) {
+          this.transformerInfo = data
+          this.getTransformerAttr()
+          this.getPowerList()
+        }
+      })
+    },
+    getTransformerAttr () {
+      getObjAttr({
+        objType: 2,
+        objCode: this.transformer
+      }).then(({code, data}) => {
+        if (code === 200) {
+          if (data.attrs && data.attrs.length) {
+            const attrValuesObj = {};
+            (data.attrValues || []).forEach(item => {
+              attrValuesObj[item.attrKey] = item.attrValue
+            })
+            data.attrs.forEach((item, index) => {
+              this.$set(this.transformerInfo, item.attrKey, (attrValuesObj[item.attrKey] || '--') + item.attrUnit)
+            })
+          }
+        }
       })
     },
-    getEqptList() {
+
+    getPowerInfo () {
+      const [{deviceCode, refArea}] = this.powerList.filter(item => item.deviceCode === this.powerCode)
+      getNewIndex({
+        areaCode: refArea,
+        objType: '2',
+        objCode: deviceCode
+      }).then(({code, data}) => {
+        if (code === 200) {
+          this.powerInfo = data || {}
+        }
+      })
+    },
+    getEqptList () {
       this.eqptList = []
-      getEqptIndexs(this.powerCode).then(({ rows }) => {
-        this.eqptList = (rows || []).map(item => ({
+      listByDevice({deviceCode: this.powerCode}).then(({data}) => {
+        const tmpData = (data || []).map(item => ({
           ...item,
-          current: `${item.current || '--'}A`,
-          ratedCurrent: `${item.ratedCurrent || '--'}A`,
-          status: true
+          onOffState: 'off',
+          ratedCurrent: '',
+          ratedVoltage: '',
         }))
+        tmpData.forEach(async item => {
+          const {code, data: subData} = await getObjAttr({
+            objType: 3,
+            objCode: item.compoCode
+          })
+          if (code === 200) {
+            if (subData.attrs && subData.attrs.length) {
+              let valueObj = {};
+              (subData.attrValues || []).forEach(el => {
+                valueObj[el.attrKey] = el.attrValue
+              })
+              subData.attrs.forEach(el => {
+                this.$set(item, el.attrKey, (valueObj[el.attrKey] || '--') + el.attrUnit)
+              })
+            }
+          }
+        })
+        this.eqptList = tmpData
       })
+
     },
-    powerChange() {
+    powerChange () {
       this.getPowerInfo()
-      this.getEqptList()
       this.getPowerAlarmList()
+      this.getEqptList()
     },
-    handlerPowerAlarm(row) {
+    handlerPowerAlarm (row) {
       updateAlarmInfo({
         id: row.id,
         alarmState: '2'
-      }).then(({ code }) => {
+      }).then(({code}) => {
         if (code === 200) {
           this.$modal.msgSuccess('处理成功')
           this.getPowerAlarmList()
@@ -281,34 +363,41 @@ export default {
   min-height: inherit;
   display: flex;
   flex-direction: column;
+
   .powerdist-header {
     background: linear-gradient(180deg, #f1f5ff 0%, #ffffff 100%);
     border-radius: 8px;
     border: 3px solid #ffffff;
     padding: 20px;
-    > div:first-child {
+
+    >div:first-child {
       font-weight: 500;
       font-size: 20px;
       color: #212121;
     }
+
     .powerdist-env {
       display: flex;
       color: #515a6e;
       font-size: 14px;
       justify-content: space-evenly;
-      > div {
+
+      >div {
         display: flex;
         align-items: flex-end;
+
         img {
           margin-right: 5px;
           height: 30px;
         }
-        > div {
+
+        >div {
           display: flex;
           flex-direction: column;
           font-weight: 500;
           font-size: 18px;
           color: #405383;
+
           span:first-child {
             font-weight: 400;
             font-size: 14px;
@@ -319,69 +408,84 @@ export default {
       }
     }
   }
+
   .powerdist-body {
     flex: 1;
     margin-top: 10px;
     display: flex;
-    > div {
+
+    >div {
       flex: 1;
+
       &:not(:first-child) {
         margin-left: 10px;
       }
     }
+
     .transformer {
       padding: 10px;
+
       .transformer-info {
         text-align: center;
         margin-top: 50px;
         position: relative;
       }
+
       .transformerImg {
         height: 150px;
       }
-      .lineImg{
+
+      .lineImg {
         position: absolute;
         width: 275px;
         right: -38px;
         top: -20px;
       }
+
       .arrowImg {
         position: absolute;
         left: 5%;
         top: 25%;
+
         img {
           width: 80px;
         }
+
         span {
           position: absolute;
           top: 10px;
           left: 10px;
         }
       }
+
       .info-header {
         position: absolute;
         top: -20px;
         left: 50%;
         transform: translateX(-50%);
         font-size: 14px;
+
         span {
           margin-left: 5px;
           font-weight: bold;
         }
       }
+
       .info-right {
         position: absolute;
         right: 0;
         top: 50%;
         transform: translateY(-50%);
         font-size: 14px;
-        > div {
+
+        >div {
           display: flex;
           align-items: center;
           margin-top: 5px;
         }
       }
     }
+
     .custom-desc {
       ::v-deep .el-descriptions__header {
         margin-bottom: 5px;
@@ -389,6 +493,7 @@ export default {
         font-size: 14px;
         color: #212121;
       }
+
       ::v-deep .el-descriptions-item__label {
         background: #f4f5fa;
         font-weight: 400;
@@ -399,12 +504,14 @@ export default {
 
     .power {
       padding: 10px;
+
       .power-info {
         display: flex;
         justify-content: space-between;
         margin-top: 10px;
         padding: 0 10px;
-        > div {
+
+        >div {
           flex: 1;
           background: url('~@/assets/images/mgr/backA.svg') no-repeat;
           background-position: center;
@@ -416,16 +523,19 @@ export default {
           font-weight: 400;
           font-size: 12px;
           color: #6a6a6a;
+
           &:nth-child(2) {
             background: url('~@/assets/images/mgr/backB.svg') no-repeat;
             background-position: center;
             background-size: 70%;
           }
+
           &:nth-child(3) {
             background: url('~@/assets/images/mgr/backC.svg') no-repeat;
             background-position: center;
             background-size: 70%;
           }
+
           span:last-of-type {
             margin-top: 5px;
             font-size: 13px;
@@ -433,8 +543,10 @@ export default {
           }
         }
       }
+
       .power-data {
         margin-top: 20px;
+
         .power-data-title {
           background: #f4f5fa;
           padding: 8px 10px;
@@ -442,30 +554,36 @@ export default {
           font-size: 14px;
           color: #212121;
         }
+
         .power-data-body {
           border: 1px solid #f0f1f2;
           display: flex;
           align-items: center;
           padding: 10px 20px;
           text-align: center;
-          > div:last-of-type {
+
+          >div:last-of-type {
             flex: 1;
             margin-left: 30px;
           }
+
           .power-data-row {
             display: flex;
             justify-content: space-between;
             margin-top: 20px;
-            > div {
+
+            >div {
               display: flex;
               flex-direction: column;
             }
           }
+
           .data-name {
             font-weight: 400;
             font-size: 13px;
             color: #212121;
           }
+
           .data-num {
             margin-top: 4px;
             font-weight: 400;
@@ -475,10 +593,12 @@ export default {
         }
       }
     }
+
     .switch {
       padding: 10px;
       position: relative;
-      .rightArrow{
+
+      .rightArrow {
         position: absolute;
         top: 65px;
         left: -20px;

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

@@ -1,12 +1,15 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-      <el-form-item label="服务区" prop="areaCode">
-        <el-select v-model="queryParams.areaCode" placeholder="请选择服务区" @change="handleQuery">
-          <el-option v-for="item in areaOptions" :key="item.areaCode" :label="item.areaName" :value="item.areaCode" />
-        </el-select>
-      </el-form-item>
-    </el-form>
+    <el-tabs v-model="queryParams.areaCode" @tab-click="handleQuery">
+      <el-tab-pane
+        v-for="item in areaOptions"
+        :key="item.areaCode"
+        :label="item.shortName"
+        :name="item.areaCode" >
+      </el-tab-pane>
+    </el-tabs>
+
+
     <BaseChart width="100%" height="300px" :option="elecOptions" />
     <el-table v-loading="loading" :data="elecStoreHList" max-height="400px">
       <el-table-column label="设施名称" align="center" prop="facsName" />