Browse Source

气体报警编辑

master
xh 5 days ago
parent
commit
e4a5135eb9
  1. 4
      web/src/views/HandDevice/Home/components/services/marker.service.ts
  2. 10
      web/src/views/HandDevice/Home/index.vue
  3. 4
      web/src/views/gas/handalarm/index.vue

4
web/src/views/HandDevice/Home/components/services/marker.service.ts

@ -135,8 +135,8 @@ export class MarkerService {
this.map?.addLayer(this.markerLayer) this.map?.addLayer(this.markerLayer)
// 获取所有图层 // 获取所有图层
const layers = this.map?.getLayers().getArray() || []
console.log('this.currentLayerMode', this.currentLayerMode, layers)
// const layers = this.map?.getLayers().getArray() || []
// console.log('this.currentLayerMode', this.currentLayerMode, layers)
} }
/** /**

10
web/src/views/HandDevice/Home/index.vue

@ -18,7 +18,7 @@
<div class="markerList"> <div class="markerList">
<el-scrollbar height="100%"> <el-scrollbar height="100%">
<!--marker列表 --> <!--marker列表 -->
<el-collapse accordion>
<el-collapse accordion @change="collapseChange">
<el-collapse-item :name="item.name" v-for="item in filterMarkers" :key="item.id"> <el-collapse-item :name="item.name" v-for="item in filterMarkers" :key="item.id">
<template #title> <template #title>
<div class="flex flex-row w-100%"> <div class="flex flex-row w-100%">
@ -40,6 +40,10 @@
<!-- <div> <span>在线状态</span>{{ item.onlineStatus }}</div> --> <!-- <div> <span>在线状态</span>{{ item.onlineStatus }}</div> -->
<div> <span>数值</span>{{ item.value }} {{ item.unit }}</div> <div> <span>数值</span>{{ item.value }} {{ item.unit }}</div>
<div> <span>时间</span>{{ dayjs(item.time).format('YYYY-MM-DD HH:mm:ss') }}</div> <div> <span>时间</span>{{ dayjs(item.time).format('YYYY-MM-DD HH:mm:ss') }}</div>
<!-- <div>
<el-button type="primary" size="small">定位</el-button>
<el-button type="primary" size="small">轨迹</el-button>
</div> -->
<!-- {{ item }} --> <!-- {{ item }} -->
</div> </div>
@ -74,6 +78,9 @@ const fences = ref<FenceData[]>([])
const mapRef = ref<typeof OpenLayerMap>() const mapRef = ref<typeof OpenLayerMap>()
const search = ref('') const search = ref('')
function collapseChange(name: string) {
console.log('collapseChange', name)
}
watch( watch(
() => search.value, () => search.value,
(newSearch, oldSearch) => { (newSearch, oldSearch) => {
@ -169,7 +176,6 @@ onMounted(() => {
getFences() getFences()
console.log('定时器,暂时关掉,太烦了') console.log('定时器,暂时关掉,太烦了')
getDataTimer.value = setInterval(() => { getDataTimer.value = setInterval(() => {

4
web/src/views/gas/handalarm/index.vue

@ -227,7 +227,7 @@
<template #default="scope"> <template #default="scope">
<!-- <el-button link type="primary" @click="openForm('update', scope.row.id)"> <!-- <el-button link type="primary" @click="openForm('update', scope.row.id)">
查看位置 查看位置
</el-button>
</el-button>-->
<el-button <el-button
link link
@ -236,7 +236,7 @@
v-hasPermi="['gas:hand-alarm:update']" v-hasPermi="['gas:hand-alarm:update']"
> >
编辑 编辑
</el-button> -->
</el-button>
<!-- <el-button <!-- <el-button
link link
type="danger" type="danger"

Loading…
Cancel
Save