From 8e72ebbb44dba3ec5cf6dd3cd2613e6e9aed31ef Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 22 Nov 2024 15:37:33 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/companyInfo/components/box/fireTrend.vue | 54 ++++++++++++++++++++----------------------------------
1 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/src/views/companyInfo/components/box/fireTrend.vue b/src/views/companyInfo/components/box/fireTrend.vue
index a761459..8a39922 100644
--- a/src/views/companyInfo/components/box/fireTrend.vue
+++ b/src/views/companyInfo/components/box/fireTrend.vue
@@ -10,7 +10,7 @@
-->
<script setup>
import publicContent from "./publicContent.vue"
-import { getList } from "@/api/emergencySupplies/emergencySupplies"
+import { getList, getCompanyList } from "@/api/emergencySupplies/emergencySupplies"
import { reactive } from "vue"
const { VITE_APP_BASE } = import.meta.env
@@ -80,6 +80,10 @@
pages.total = 0
getLists(formInline)
}
+// 应急物资图片
+let picList = ref([])
+// 应急物资
+let emergencySupplies = reactive({})
// 查询分页数据
function getLists(param = {}) {
@@ -87,17 +91,16 @@
param.size = pages.pageSize
param.firmId = data.companyInfo.id
loading.value = true
- getList(param)
+ getCompanyList(param)
.then((res) => {
const data = res.data.data
- data.records.forEach((element) => {
- if (element.ownership == 1) {
- element.ownership = "园区"
- } else {
- element.ownership = "企业"
+ tableData.value = data.dataList
+ data.dataList.forEach(item => {
+ if (item.lng && item.lat) {
+ emergencySupplies = item
}
})
- tableData.value = data.records
+ picList.value = data.picList
pages.total = data.total
loading.value = false
})
@@ -108,43 +111,25 @@
}
let addTileLayers = {}
// 行点击
-function rowClick(row) {
+function rowClick() {
+
// 销毁之前的
destroy()
if (!addTileLayers[row.name]) {
addTileLayers[row.name] = new DC.HtmlLayer(row.name)
window.$viewer.addLayer(addTileLayers[row.name])
-
- // item.method(item.params).then(res => {
- // let data = res.data.data.records
-
- // tableData.value.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
- let iconEl = ''
-
- // if ('showPanel' in item && item.showPanel == false) {
- // if (item.backgroundIcon) {
- iconEl = `
+ let iconEl = `
<div class="map-name">${row.name}</div>
<div class="map-icon">
<img src="${image.value}">
</div>
`
- // }
- // } else
- // {
- // iconEl = `<div class="marsBlueGradientPnl">
- // <div>${row.name}</div>
- // </div>`
- // }
-
let divIcon = new DC.DivIcon(
new DC.Position(row.lng, row.lat, 64),
`<div class="public-map-popup ${'qyfb-box'}">
${iconEl}
</div>`
)
-
- // divIcon.attrParams = i
let incident = () => { }
@@ -187,17 +172,18 @@
</el-form>
<!-- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search> -->
<div class="table-box">
- <el-table :data="tableData" empty-text="" style="width: 100%" :header-cell-style="headerCellStyle"
- :cell-style="tableCellStyle" element-loading-background="rgba(122, 122, 122, 0.1)">
- <el-table-column prop="name" label="名称" width="200" />
+ <el-table :data="tableData" @click="rowClick()" empty-text="" style="width: 100%"
+ :header-cell-style="headerCellStyle" :cell-style="tableCellStyle"
+ element-loading-background="rgba(122, 122, 122, 0.1)">
+ <el-table-column prop="name" label="名称" width="240" />
<el-table-column prop="numUnit" label="数量" />
<el-table-column prop="personInCha" label="负责人" />
- <el-table-column label="操作">
+ <!-- <el-table-column label="操作">
<template #default="scope">
<el-button link type="primary" size="small" :disabled="scope.row.lng == ''"
@click="rowClick(scope.row)">定位</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
</div>
--
Gitblit v1.9.3