Merge remote-tracking branch 'origin/master'

cuilei

6 天以前 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e

 src/views/mdc/base/DeviceLog.vue

@@ -6,7 +6,7 @@
        <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
      </a-col>
      <a-col :md="24-5" :sm="24">
        <log-info :equipment="selectEquipment"></log-info>
        <log-info :equipment="selectEquipment" @initEquipment="changeSelectionNode"></log-info>
      </a-col>
    </a-row>
    </div>