修改配电

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

@@ -100,3 +100,11 @@ export function getNewIndex(params) {
     params
   })
 }
+//查询设备下的设备部件
+export function listByDevice(params) {
+  return request({
+    url: '/ems/device/component/listByDevice' ,
+    method: 'get',
+    params
+  })
+}

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

@@ -145,15 +145,15 @@
         <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="支路">
             </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>
@@ -164,9 +164,8 @@
   </div>
 </template>
 <script>
-import {listPowerBox, getPowerIndexs, getEqptIndexs} from '@/api/device/powerbox.js'
 import {listAlarmInfo, updateAlarmInfo} from '@/api/alarm/alarm-info.js'
-import {getByCondition, getDeviceDetail, getObjAttr, getByFlowRel, getNewIndex} from '@/api/device/device.js'
+import {getByCondition, getDeviceDetail, getObjAttr, getByFlowRel, getNewIndex, listByDevice} from '@/api/device/device.js'
 export default {
   name: 'Powerdist',
   data () {
@@ -279,8 +278,12 @@ export default {
       }).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, data.attrValues[index].attrValue + item.attrUnit)
+              this.$set(this.transformerInfo, item.attrKey, (attrValuesObj[item.attrKey] || '--') + item.attrUnit)
             })
           }
         }
@@ -301,18 +304,38 @@ export default {
     },
     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 () {
       this.getPowerInfo()
       this.getPowerAlarmList()
+      this.getEqptList()
     },
     handlerPowerAlarm (row) {
       updateAlarmInfo({