fix: 手持设备分钟

quanyawei

2024-03-20 fbbb03338e7001ee635800a49de79ce2e4933ecf

 src/views/hand/index.vue

@@ -12,6 +12,7 @@
              v-model="formInline.mac"
              size="medium"
              placeholder="选择设备"
              clearable
            >
              <el-option
                v-for="item in handList"
@@ -21,11 +22,11 @@
              />
            </el-select>
          </el-form-item>
          <el-form-item label="设备名称:">
          <el-form-item label="监测点位:">
            <el-input
              v-model="formInline.name"
              size="medium"
              placeholder="设备名称"
              placeholder="监测点位"
            />
          </el-form-item>
          <el-form-item>
@@ -63,7 +64,6 @@
        :data="tableData"
        border
        size="mini"
        max-height="680"
        style="width: 100%"
        :header-cell-style="{
          color: '#101111', fontSize: '16px'
@@ -86,12 +86,12 @@
          prop="name"
          align="center"
          width="200px"
          label="设备名称"
          label="监测点位"
        />
        <el-table-column
          prop="address"
          align="center"
          label="设备位置"
          label="详细地址"
        />
        <el-table-column
          prop="startTime"
@@ -106,7 +106,13 @@
          width="200px"
        />
        <el-table-column
          width="60px"
          prop="createName"
          align="center"
          label="创建人"
          width="200px"
        />
        <el-table-column
          width="100px"
          align="center"
          label="操作"
        >
@@ -145,9 +151,23 @@
        <template #body>
          <div>
            <div class="devaiceDetailTitle">
              <p>设备名称：{{ selectRow.name }}</p>
              <p>设备位置：{{ selectRow.address }}</p>
              <p>设备经纬度：{{ selectRow.longitude }},{{ selectRow.latitude }}</p>
              <el-descriptions :column="4">
                <el-descriptions-item label="开始时间">
                  {{ selectRow.startTime }}
                </el-descriptions-item>
                <el-descriptions-item label="结束时间">
                  {{ selectRow.endTime }}
                </el-descriptions-item>
                <el-descriptions-item label="监测点位">
                  {{ selectRow.name }}
                </el-descriptions-item>
                <el-descriptions-item label="设备经纬度">
                  {{ selectRow.longitude }},{{ selectRow.latitude }}
                </el-descriptions-item>
                <el-descriptions-item label="详细地址">
                  {{ selectRow.address }}
                </el-descriptions-item>
              </el-descriptions>
            </div>
            <div class="typeBox">
              <div class="tapChart">
@@ -156,6 +176,12 @@
                  @click="changeTap('hour')"
                >
                  小时
                </p>
                <p
                  :class="{pClick: tapName === 'minute'}"
                  @click="changeTap('minute')"
                >
                  1分钟
                </p>
                <p
                  :class="{pClick: tapName === 'minutely'}"
@@ -257,13 +283,13 @@
      handList: [],
      radio: '今天',
      tapName: 'hour',
      value: '',
      value: [],
      radioGrouplist: [
        { label: '今天', value: 'today', type: 'day', num: '0' },
        { label: '昨天', value: 'yesterday', type: 'day', num: '1', },
        { label: '近3天', value: 'week', type: 'day', num: '3', },
        { label: '近1个月', value: 'month', type: 'month', num: '1', },
        { label: '近3个月', value: 'threeMonth', type: 'month', num: '3', },
        { label: '近7天', value: 'month', type: 'day', num: '7', },
        { label: '近1个月', value: 'threeMonth', type: 'month', num: '1', },
      ],
      tableData: [],
      rowDetailDate: [],
@@ -287,6 +313,7 @@
    }).then(res => {
      if (res.code === 0) {
        this.handList = res.data
        this.onSubmit()
      } else {
        this.$message.error(res.message)
      }
@@ -328,10 +355,20 @@
      }
    },
    changeRadio (e) {
      this.formInline.startTime = e.startTime
      this.formInline.endTime = e.endTime
      console.log('e', e)
      this.radio = e.label
      this.value = ''
      if (e.value === 'yesterday' || e.value === 'today') {
        // const today = dayjs()
        // const starTime = today.subtract(1, 'day').startOf('day')
        // const endTime = today.subtract(1, 'day').endOf('day')
        this.value = [ ]
        this.formInline.endTime = ''
        this.formInline.startTime = e.startTime.format('YYYY-MM-DD')
      } else {
        this.value = [e.startTime, e.endTime]
        this.formInline.startTime = e.startTime.format('YYYY-MM-DD HH:mm:ss')
        this.formInline.endTime = e.endTime.format('YYYY-MM-DD HH:mm:ss')
      }
    },
    sendPicker (e) {
      this.radio = ''
@@ -415,7 +452,7 @@
.devaiceDetailTitle{
  p{
    display: inline-block;
    margin-right: 10px;
    margin-right: 15px;
    font-size: 18px;
  }
}