merge master

zhangzengfei

2021-07-07 0b737708e696c45720499759b5c31aced87fdbb6

 src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue

@@ -34,7 +34,10 @@
        :key="indicator.id"
      >
        <div class="title">
          <span class="dot" :class="{'kx':indicator.id=='kx','dx':indicator.id=='dx','ccgz':indicator.id=='ccgz'}"></span>
          <span
            class="dot"
            :class="{'kx':indicator.id=='kx','dx':indicator.id=='dx','ccgz':indicator.id=='ccgz'}"
          ></span>
          <span class="word">{{indicator.title}}</span>
        </div>
        <div class="indicator-val">{{indicator.slots.length}}</div>
@@ -52,12 +55,15 @@
          <label>设备状态:</label>
          <div>
            <el-select v-model="deviceState" size="small">
              <el-option></el-option>
              <el-option value="" label="全部"></el-option>
              <el-option value="1" label="读写中"></el-option>
              <el-option value="0" label="空闲中"></el-option>
              <el-option value="2" label="插槽故障"></el-option>
            </el-select>
          </div>
        </div>
        <div class="btns">
          <el-button type="primary" size="small">查询</el-button>
          <el-button @click="findDeviceIfo" type="primary" size="small">查询</el-button>
        </div>
      </div>
      <el-table class="thbg" :data="tableData" fit>
@@ -109,7 +115,7 @@
  </div>
</template>
<script>
import { addDevice, getDeviceList, getDeviceInfoById } from '@/api/shuohuang';
import { addDevice, getDeviceList, getDeviceInfo } from '@/api/shuohuang';
export default {
  data () {
    return {
@@ -138,7 +144,10 @@
    },
    findDeviceIfo () {
      let _this = this;
      getDeviceInfoById({ DeviceID: this.actTab }).then(res => {
      getDeviceInfo({ 
        DeviceID: this.actTab,
        Status:this.deviceState
        }).then(res => {
        // debugger
        _this.tableData = res.data;
        //统计当前插槽状态
@@ -247,7 +256,7 @@
      flex: 1;
      position: relative;
      &:not(.lastOne):after {
        content: '';
        content: "";
        width: 1px;
        height: 57px;
        background: #e9e9e9;