配电柜-器件

Signed-off-by: hsshuxian <3049816743@qq.com>

ems-ui-cloud/src/views/devmgr/attr/index.vue

@@ -223,6 +223,55 @@
               </el-card>
             </div>
 
+            <!-- 事件日志 -->
+            <div v-if="activeTab === 'eventLog'">
+              <el-form inline>
+                <el-form-item label="记录时间">
+                  <el-date-picker
+                    v-model="logDaterangeTime"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd HH:mm"
+                    type="datetimerange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="事件名称">
+                  <el-select v-model="eventLogQueryParams.eventName" clearable>
+                    <el-option
+                      v-for="item in eventData"
+                      :key="item.eventKey"
+                      :label="item.eventName"
+                      :value="item.eventKey"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" @click="handleEventLogQuery">查询</el-button>
+                  <el-button @click="resetEventLogQuery">重置</el-button>
+                </el-form-item>
+              </el-form>
+              <el-table :data="eventLogData" style="width: 100%" :show-header="true" :empty-text="'暂无数据'">
+                <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+                <el-table-column label="对象编号" prop="objCode"></el-table-column>
+                <el-table-column label="对象名称" prop="objName"></el-table-column>
+                <el-table-column label="事件名称" prop="eventName"></el-table-column>
+                <el-table-column label="事件时间" prop="eventTime"></el-table-column>
+                <el-table-column label="操作" align="center" width="100">
+                  <template slot-scope="scope">
+                    <el-button type="text" size="mini" icon="el-icon-info" @click="handleEventLogDetail(scope.row)">详情</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="eventLogQueryTotal > 0"
+                :total="eventLogQueryTotal"
+                :page.sync="eventLogQueryParams.pageNum"
+                :limit.sync="eventLogQueryParams.pageSize"
+                @pagination="handleEventLogQuery"
+              />
+            </div>
             <!-- 调用日志 -->
             <div v-if="activeTab === 'callLog'">
               <el-form inline>
@@ -328,55 +377,7 @@
               />
             </div>
 
-            <!-- 事件日志 -->
-            <div v-if="activeTab === 'eventLog'">
-              <el-form inline>
-                <el-form-item label="记录时间">
-                  <el-date-picker
-                    v-model="logDaterangeTime"
-                    style="width: 240px"
-                    value-format="yyyy-MM-dd HH:mm"
-                    type="datetimerange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  ></el-date-picker>
-                </el-form-item>
-                <el-form-item label="事件名称">
-                  <el-select v-model="eventLogQueryParams.eventName" clearable>
-                    <el-option
-                      v-for="item in eventData"
-                      :key="item.eventKey"
-                      :label="item.eventName"
-                      :value="item.eventKey"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="handleEventLogQuery">查询</el-button>
-                  <el-button @click="resetEventLogQuery">重置</el-button>
-                </el-form-item>
-              </el-form>
-              <el-table :data="eventLogData" style="width: 100%" :show-header="true" :empty-text="'暂无数据'">
-                <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-                <el-table-column label="对象编号" prop="objCode"></el-table-column>
-                <el-table-column label="对象名称" prop="objName"></el-table-column>
-                <el-table-column label="事件名称" prop="eventName"></el-table-column>
-                <el-table-column label="事件时间" prop="eventTime"></el-table-column>
-                <el-table-column label="操作" align="center" width="100">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" icon="el-icon-info" @click="handleEventLogDetail(scope.row)">详情</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <pagination
-                v-show="eventLogQueryTotal > 0"
-                :total="eventLogQueryTotal"
-                :page.sync="eventLogQueryParams.pageNum"
-                :limit.sync="eventLogQueryParams.pageSize"
-                @pagination="handleEventLogQuery"
-              />
-            </div>
+
           </div>
         </el-dialog>
       </el-col>
@@ -551,22 +552,6 @@ export default {
       return statusMap[status] || '未知状态'
     },
 
-    /**日志*/
-    // showCallLog(row) {
-    //   this.curRow = row
-    //   this.getCallLog(row.deviceCode, this.callLogQueryParams.startTime, this.callLogQueryParams.endTime)
-    //   this.callLog = true
-    // },
-    // showReportLog(row) {
-    //   this.curRow = row
-    //   this.getReportLog(row.deviceCode, this.logQueryParams.startTime, this.logQueryParams.endTime) // 加载设备日志数据
-    //   this.reportLog = true
-    // },
-    // showEventLog(row) {
-    //   this.curRow = row;
-    //   this.getEventLog(row.deviceCode, this.logDaterangeTime[0], this.logDaterangeTime[1]);
-    //   this.eventLogDialog = true;
-    // },
    /** 查询事件日志*/
     handleEventLogQuery() {
       if (this.curRow) {
@@ -742,10 +727,7 @@ export default {
     getDeviceStatusClass(status) {
       return status === 1 ? 'status-online' : 'status-offline'
     },
-
-    formatEventType(row, column, cellValue) {
-      return cellValue === 1 ? '消息上报' : '异常告警'
-    },
+    
     getDeviceStatusText(status) {
       const statusMap = {
         0: '离线',

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

@@ -145,21 +145,12 @@
         <div class="switch">
           <img class="rightArrow" src="@/assets/images/mgr/line2.svg" alt="">
           <el-table :data="eqptList" style="width: 100%">
-            <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="ratedCurrent" align="center" width="100" label="额定电流">
-            </el-table-column>
-            <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 :value="scope.row.onOffState != 'off'" size="mini">
-                </el-switch>
-              </template>
-            </el-table-column>
+            <el-table-column prop="deviceCode" align="center" width="100" label="设备代码"></el-table-column>
+            <el-table-column prop="deviceName" align="center" width="100" label="设备名称"></el-table-column>
+            <el-table-column prop="deviceBrand" align="center" width="100" label="设备品牌"></el-table-column>
+            <el-table-column prop="location" align="center" width="100" label="安装位置"></el-table-column>
+
+
           </el-table>
         </div>
       </Panel>
@@ -292,7 +283,6 @@ export default {
         }
       })
     },
-
     getPowerInfo () {
       const [{deviceCode, areaCode}] = this.powerList.filter(item => item.deviceCode === this.powerCode)
       getNewIndex({
@@ -306,34 +296,15 @@ export default {
       })
     },
     getEqptList () {
-      this.eqptList = []
-      listByDevice({deviceCode: this.powerCode}).then(({data}) => {
-        const tmpData = (data || []).map(item => ({
-          ...item,
-          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
+      getByFlowRel({
+        upstreamObjType: 2,
+        upstreamObjCode:  this.powerCode,
+        deviceSubCategory: 'W2',
+      }).then(({ code, data }) => {
+        if (code === 200) {
+          this.eqptList = data || []
+        }
       })
-
     },
     powerChange () {
       this.getPowerInfo()