Merge branch 'feature_1.0'

quanyawei

2023-10-11 0b9e8a88c5f23886a18616c83c7649a34445a7eb

 src/views/Equipment/index.vue

@@ -2,13 +2,13 @@
  <div style="padding: 20px">
    <el-card>
      <div style="display: flex">
        <div class="timee">
        <div class="timee" style="margin-top: 0.5rem">
          {{ time }}
        </div>
        <div style="margin-left: 1.5rem; margin-top:-1.1rem">
        <div style="margin-left: 1.5rem">
          <span>设备和站点:</span>
          <el-cascader
           v-model="newMac"
            v-model="newMac"
            :options="options"
            :props="props"
            collapse-tags
@@ -18,9 +18,10 @@
            style="width: 25rem"
          ></el-cascader>
        </div>
        <div style="margin-left: 1.5rem; margin-top: -12px">
        <div style="margin-left: 1.5rem">
          <span>选择因子:</span>
          <el-cascader
            v-model="value"
            :options="newSensor"
            :props="props"
            collapse-tags
@@ -28,11 +29,26 @@
            @change="res"
          ></el-cascader>
        </div>
        <div style="margin-left: 1.5rem; margin-top: -12px">
          <el-button type="primary">查询</el-button>
        <div style="margin-left: 1.5rem">
          <el-button type="primary" @click="Equisel">查询</el-button>
        </div>
      </div>
    </el-card>
     <el-table
      :data="dateList"
      style="margin-top: 20px"
      border
      max-height="800"
    >
      <el-table-column
        v-for="item in columnList"
        :prop="item"
        :label="item"
        width="180px"
        :key="item"
      >
      </el-table-column>
    </el-table>
  </div>
</template>        

@@ -53,7 +69,11 @@
      options: [],
      newSensor:[],
      newMac:'',
      newMac1:[]
      newMac1:[],
      value:'',
      value1:'',
      columnList: [], //表头的数组
      dateList: [],
    }
  },
  // 计算属性 类似于data概念
@@ -69,6 +89,12 @@
      // 设备更新后，重新获取因子数据
      this.getSensor()
      console.log(this.newMac1)
    },
     value(n, o) {
      this.value1 = []
      for (let i = 0; i < n.length; i++) {
        this.value1.push(n[i][0])
      }
    },
  },
  //方法集合
@@ -108,7 +134,6 @@
        })
    },
    changeYz(){
      console.log(11111);
      this.getSensor();
    },
     getSensor() {
@@ -124,18 +149,37 @@
          var sensor = result.data
          for (var i in sensor) {
            this.newSensor.push({ value: i, label: sensor[i] })
            
          }
        })
        .catch((err) => {
          console.log(err)
        })
    },
    Equisel(){
      this.$request({
        url:'',
        method:'post',
        data:{
          time:this.time,
          zhan:this.newMac1,
          sensorCode:this.value1
        }
      }).then((res)=>{
        console.log(res);
        this.tableData = res.data
        console.log(this.tableData, 'this.tableData')
        for (let key in this.tableData[0]) {
          this.columnList.push(key)
        }
        for (let item of this.tableData) {
          this.dateList.push(item)
        }
      })
    }
  },
  //生命周期 - 创建完成（可以访问当前 this 实例）
  created() {
    var timer = this.dateTypeFormat('YYYY-mm-dd HH:MM:SS', new Date())
    this.time = timer
    this.time = this.dateTypeFormat('YYYY-mm-dd HH:MM:SS', new Date())
    this.getData();
  },
  //生命周期 - 挂载完成（可以访问 DOM 元素）
@@ -150,5 +194,4 @@
}
</script>
<style scoped>

</style>