Browse Source

Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao

tags/v1.1.0^2
zhangtao 1 year ago
parent
commit
98b6761bad
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      src/views/dashboard/components/AirInfo.vue
  2. +2
    -1
      src/views/task-manage/all-task/index.vue

+ 1
- 1
src/views/dashboard/components/AirInfo.vue View File

case 3: case 3:
item.indicatorValue = res.data.hum item.indicatorValue = res.data.hum
break break
case 5:
case 4:
item.indicatorValue = res.data.tmp item.indicatorValue = res.data.tmp
} }
}) })

+ 2
- 1
src/views/task-manage/all-task/index.vue View File

setup() { setup() {
const route = useRoute() const route = useRoute()
const rowInfo = route.query.rowInfo const rowInfo = route.query.rowInfo
const type=route.query.type
const type = route.query.type
getAirOptions() getAirOptions()
const searchRef = ref() const searchRef = ref()
const data = reactive({ const data = reactive({
onMounted(() => { onMounted(() => {
if (rowInfo) { if (rowInfo) {
data.rowData = rowInfo data.rowData = rowInfo
console.log(data.rowData, '直播数据')
data.liveDrawer = true data.liveDrawer = true
} }
}) })

Loading…
Cancel
Save