智慧园区前端大屏
1.表格无数据中文提示处理
2.控制台警告处理
3.企业详情应急空间报错处理
4.console信息删除
32 files modified
452 ■■■■ changed files
src/components/global/GlobalTable.vue 7 ●●●●● patch | view | raw | blame | history
src/components/global/MapContainer.vue 52 ●●●●● patch | view | raw | blame | history
src/hooks/initMap.js 71 ●●●●● patch | view | raw | blame | history
src/pages/layout/components/mainSearch.vue 10 ●●●● patch | view | raw | blame | history
src/pages/layout/components/mainTool.vue 2 ●●●●● patch | view | raw | blame | history
src/pages/layout/components/scomponents/layersControl.vue 30 ●●●● patch | view | raw | blame | history
src/pages/layout/components/scomponents/tool/measure.vue 2 ●●●●● patch | view | raw | blame | history
src/pages/layout/components/scomponents/toolList.vue 14 ●●●● patch | view | raw | blame | history
src/views/armyLocal/components/box/tabsTable.vue 5 ●●●● patch | view | raw | blame | history
src/views/companyInfo/components/box/dataContent.vue 1 ●●●● patch | view | raw | blame | history
src/views/companyInfo/components/box/fireSource.vue 8 ●●●●● patch | view | raw | blame | history
src/views/companyInfo/components/box/fireTrend.vue 6 ●●●● patch | view | raw | blame | history
src/views/companyInfo/components/box/unitContent.vue 7 ●●●●● patch | view | raw | blame | history
src/views/companyInfo/components/rightContainer.vue 7 ●●●●● patch | view | raw | blame | history
src/views/companyInfo/index.vue 1 ●●●● patch | view | raw | blame | history
src/views/fireWarning/components/box/tabsTable.vue 5 ●●●● patch | view | raw | blame | history
src/views/pac/components/box/dataContent.vue 28 ●●●● patch | view | raw | blame | history
src/views/pac/components/box/fireSource.vue 28 ●●●●● patch | view | raw | blame | history
src/views/pd/components/dynamicPanel.vue 2 ●●● patch | view | raw | blame | history
src/views/rs/components/box/dataContent.vue 6 ●●●● patch | view | raw | blame | history
src/views/rs/components/leftContainer.vue 1 ●●●● patch | view | raw | blame | history
src/views/rt/components/box/dataContent.vue 72 ●●●● patch | view | raw | blame | history
src/views/space/components/box/dataContent.vue 9 ●●●●● patch | view | raw | blame | history
src/views/space/components/leftContainer.vue 1 ●●●● patch | view | raw | blame | history
src/views/supplies/components/box/dataContent.vue 4 ●●●● patch | view | raw | blame | history
src/views/survey/components/box/dataContent.vue 14 ●●●● patch | view | raw | blame | history
src/views/survey/components/box/fireContent.vue 12 ●●●●● patch | view | raw | blame | history
src/views/survey/components/box/fireSource.vue 5 ●●●● patch | view | raw | blame | history
src/views/survey/components/box/fireTrend.vue 8 ●●●●● patch | view | raw | blame | history
src/views/survey/components/box/unitContent.vue 11 ●●●● patch | view | raw | blame | history
src/views/survey/components/leftContainer.vue 3 ●●●● patch | view | raw | blame | history
vite.config.js 20 ●●●● patch | view | raw | blame | history
src/components/global/GlobalTable.vue
@@ -1,9 +1,10 @@
<template>
  <div class="h100 flex f-d-c cur-table-box" v-loading="loading" element-loading-background="rgba(46, 81, 136, 0.9)">
    <div class="h0 flex-1 table-content" ref="TableContent">
      <el-table ref="tableData" :height="tableHeight" :row-key="rowKey" :border="border" :size="tableSize" :data="data"
        @selection-change="handleSelectionChange" @current-change="handleTableCurrentChange"
        @row-click="handleTableRowClick" @sort-change="handleSortChange" v-bind="otherConfig">
      <el-table empty-text="暂无数据" ref="tableData" :height="tableHeight" :row-key="rowKey" :border="border"
        :size="tableSize" :data="data" @selection-change="handleSelectionChange"
        @current-change="handleTableCurrentChange" @row-click="handleTableRowClick" @sort-change="handleSortChange"
        v-bind="otherConfig">
        <template v-for="(item, index) in columns">
          <!-- 选择框 -->
          <el-table-column v-if="item.selection" type="selection" width="36" :fixed="item.fixed"
src/components/global/MapContainer.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-25 15:07:51
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-10-28 16:42:35
 * @LastEditTime: 2024-11-27 15:23:52
 * @FilePath: \bigScreen\src\components\global\MapContainer.vue
 * @Description: 
 * 
@@ -17,10 +17,54 @@
</template>
<script setup>
import { readyViewer } from 'hooks/initMap'
import { onMounted } from 'vue'
window.$viewer = null
window.$Cesium = null
window.$turf = null
const { VITE_APP_BASE } = import.meta.env
import { useMap } from 'store/map'
import { nextTick, onMounted, onUnmounted } from 'vue'
import * as turf from '@turf/turf'
// import * as Cesium from 'cesium'
// import 'cesium/Build/Cesium/Widgets/widgets.css'
readyViewer()
const store = useMap()
function initMap () {
  if (window.$viewer) return
  nextTick(() => {
    DC.ready({
      // Cesium: Cesium,
      baseUrl: `${VITE_APP_BASE}libs/dc-sdk/resources/`,
      turf,
    }).then(() => {
      window.$Cesium = DC.getLib('Cesium')
      window.$turf = DC.getLib('turf')
      window.$viewer = new DC.Viewer('viewer-container')
      window.$viewer.locationBar.enable = true
      window.$viewer.zoomToPosition(new DC.Position(
        115.1021,
        27.2360,
        5000,
        0,
        -45,
        0
      ), () => {
        store.setLoadMap(true)
      })
    })
  })
}
onMounted(() => {
  initMap()
})
onUnmounted(() => {
  store.setLoadMap(false)
})
</script>
<script>
src/hooks/initMap.js
@@ -1,71 +0,0 @@
/*
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-25 15:09:55
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-25 16:43:43
 * @FilePath: \bigScreen\src\hooks\initMap.js
 * @Description:
 *
 * Copyright (c) 2024 by shuishen, All Rights Reserved.
 */
window.$viewer = null
window.$Cesium = null
window.$turf = null
const { VITE_APP_BASE } = import.meta.env
import { useMap } from 'store/map'
import { nextTick, onMounted, onUnmounted } from 'vue'
import * as turf from '@turf/turf'
// import * as Cesium from 'cesium'
// import 'cesium/Build/Cesium/Widgets/widgets.css'
export function readyViewer () {
  const store = useMap()
  function initMap () {
    if (window.$viewer) return
    nextTick(() => {
      DC.ready({
        // Cesium: Cesium,
        baseUrl: `${VITE_APP_BASE}libs/dc-sdk/resources/`,
        turf,
      }).then(() => {
        window.$Cesium = DC.getLib('Cesium')
        window.$turf = DC.getLib('turf')
        window.$viewer = new DC.Viewer('viewer-container')
        window.$viewer.locationBar.enable = true
        window.$viewer.zoomToPosition(new DC.Position(
          115.1021,
          27.2360,
          5000,
          0,
          -45,
          0
        ), () => {
          store.setLoadMap(true)
        })
      })
    })
  }
  onMounted(() => {
    initMap()
  })
  onUnmounted(() => {
    window.$viewer.destroy()
    window.$viewer = null
    window.$Cesium = null
    window.$turf = null
    delete window.$viewer
    delete window.$Cesium
    delete window.$turf
    store.setLoadMap(false)
  })
  return {
  }
}
src/pages/layout/components/mainSearch.vue
@@ -2,15 +2,15 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-26 16:09:35
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-10-28 11:04:58
 * @FilePath: \bigScreen\src\views\layout\components\mainSearch.vue
 * @LastEditTime: 2024-11-27 15:28:29
 * @FilePath: \bigScreen\src\pages\layout\components\mainSearch.vue
 * @Description: 
 * 
 * Copyright (c) 2024 by shuishen, All Rights Reserved. 
-->
<template>
  <div class="page-search">
    <el-input size="medium" placeholder="请输入内容" :suffix-icon="Search" @input="onSearch()" v-model="searchVal"
    <el-input placeholder="请输入内容" :suffix-icon="Search" @input="onSearch()" v-model="searchVal"
      @focus="onFocus"></el-input>
    <div class="page-search-value-box" v-show="isShowSearchSKValBox">
      <ul>
@@ -25,6 +25,8 @@
</template>
<script setup>
import { Search } from '@element-plus/icons-vue'
import { fuzzyQuery } from '../../../api/firmInfo/firmInfo'
// 搜索栏相关
@@ -73,7 +75,6 @@
}
let addTileLayers = {}
const handleCheckChange = (item) => {
  console.log(item)
  // 先清空,在添加
  clearPoint()
  if (!addTileLayers[item.name]) {
@@ -112,7 +113,6 @@
    window.$viewer.flyToPosition(new DC.Position(item.lng, item.lat, 2000, 0, -90, 0))
  } else {
    // console.log('已存在*******************************')
    window.$viewer.removeLayer(addTileLayers[item.name])
    addTileLayers = {}
  }
src/pages/layout/components/mainTool.vue
@@ -57,8 +57,6 @@
  } else {
    currentComponent.value = ''
  }
  console.log(type, currentComponent.value, 4444)
}
</script>
src/pages/layout/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-31 10:47:29
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-26 20:03:01
 * @LastEditTime: 2024-11-27 15:32:55
 * @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
 * @Description:
 *
@@ -15,7 +15,7 @@
    </template>
    <template #close>
      <div class="close cursor-p" @click="$emit('close', 'layers')"><i class="fa fa-close"></i></div>
      <div class="close cursor-p" @click="emit('close', 'layers')"><i class="fa fa-close"></i></div>
    </template>
    <template #content>
@@ -57,6 +57,8 @@
    default: false
  }
})
const emit = defineEmits(['close'])
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
import { getPage as getfirmPage } from '@/api/firmInfo/firmInfo'
@@ -100,26 +102,7 @@
    type: 'layer',
    subType: '3Dtile',
    urlData: [
      {
        url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
        label: 'tile_01'
      },
      {
        url: VITE_APP_BASE + 'newMx/mx/tile_02/tileset.json',
        label: 'tile_02'
      },
      {
        url: VITE_APP_BASE + 'newMx/mx/tile_03/tileset.json',
        label: 'tile_03'
      },
      {
        url: VITE_APP_BASE + 'newMx/mx/tile_04/tileset.json',
        label: 'tile_04'
      },
      {
        url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
        label: 'tile_05'
      },
    ],
    layerName: 'hgyq'
  },
@@ -716,7 +699,6 @@
          //   url: '/zhyq/mx/tile_01/tileset.json',
          // }))
          // console.log(tile, new window.$Cesium.Cesium3DTileset({
          //   url: '/zhyq/mx/tile_01/tileset.json',
          // }), 121323)
          // item.urlData.forEach(i => {
@@ -926,8 +908,6 @@
const restHandleDelChange = (key) => {
  let checkIds = treeRef.value?.getCheckedKeys()
  console.log(checkIds, key)
  if (checkIds && !checkIds.some(i => i == key)) {
    return
src/pages/layout/components/scomponents/tool/measure.vue
@@ -61,7 +61,6 @@
}
// 水平面积
function calcArea(item) {
    console.log('calcArea********************************', item)
    measure.area()
}
// 贴地面积
@@ -110,7 +109,6 @@
// 清空
function deactivate() {
    console.log('deactivate********************************')
    measure.deactivate()
}
src/pages/layout/components/scomponents/toolList.vue
@@ -2,8 +2,8 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-29 14:20:49
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-07 16:23:56
 * @FilePath: \bigScreen\src\views\layout\components\scomponents\toolList.vue
 * @LastEditTime: 2024-11-27 15:34:16
 * @FilePath: \bigScreen\src\pages\layout\components\scomponents\toolList.vue
 * @Description:
 *
 * Copyright (c) 2024 by shuishen, All Rights Reserved.
@@ -80,11 +80,11 @@
  //   icon: 'fa fa-level-up',
  //   title: '路线导航',
  // },
  {
    icon: 'fa fa-columns',
    title: '卷帘对比',
    component: curtain
  },
  // {
  //   icon: 'fa fa-columns',
  //   title: '卷帘对比',
  //   component: curtain
  // },
  // {
  //   icon: 'fa fa-window-restore',
  //   title: '分屏对比',
src/views/armyLocal/components/box/tabsTable.vue
@@ -43,9 +43,6 @@
onMounted(() => {
    nextTick(() => {
        curHeight.value = tableContent.value.offsetHeight - 40
        console.log(tableContent.value.offsetHeight, `current page: ${curHeight.value}`)
    })
})
@@ -54,7 +51,7 @@
<template>
    <div ref="tableContent" class="content">
        <el-table :data="tableData" stripe style="width: 100%" :height="curHeight">
    <el-table empty-text="暂无数据" :data="tableData" stripe style="width: 100%" :height="curHeight">
            <el-table-column prop="ind" label="序号" width="60" />
            <el-table-column prop="address" label="位置" />
            <el-table-column prop="fireGrade" label="火灾等级" />
src/views/companyInfo/components/box/dataContent.vue
@@ -42,7 +42,6 @@
let addTileLayers = {}
const handleCheckChange = (row) => {
    let companyInfo = JSON.parse(localStorage.getItem('companyInfo'))
    // console.log(row)
    resData.data.forEach(item => {
        if (row.value === item.value) {
            if (!addTileLayers[item.label]) {
src/views/companyInfo/components/box/fireSource.vue
@@ -2,8 +2,8 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-13 14:54:26
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-13 15:00:55
 * @FilePath: \forest-fire\src\views\statistics\components\box\dataContent.vue
 * @LastEditTime: 2024-11-27 15:40:42
 * @FilePath: \bigScreen\src\views\companyInfo\components\box\fireSource.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
@@ -18,7 +18,7 @@
          :preview-src-list="[data.companyInfo.imageUrls]" :initial-index="4" fit="cover">
          <template #error>
            <div class="image-slot">
              <el-icon><icon-picture /></el-icon>
              <el-icon><Picture /></el-icon>
            </div>
          </template>
        </el-image>
@@ -63,6 +63,8 @@
</template>
<script setup>
import { Picture } from '@element-plus/icons-vue'
import publicContent from './publicContent.vue'
import { getAssetsFile } from 'utils/utils'
import { getfirmInfoDetail } from '@/api/indParkInfo'
src/views/companyInfo/components/box/fireTrend.vue
@@ -57,7 +57,6 @@
  pages.page = 1
  pages.pageSize = 1000
  pages.total = 0
  console.log("submit!")
  getLists(formInline)
}
@@ -111,7 +110,6 @@
  if (!row.lng || !row.lat) {
    return
  }
  // console.log('点击了', row, column, event)
  // 销毁之前的
  destroy()
  if (!addTileLayers[row.name]) {
@@ -137,7 +135,6 @@
      if (picList.value.length == 0) {
        return
      }
      console.log('点击了', picList.value.length)
      addPupoLayers['企业应急物资'] = new DC.HtmlLayer('企业应急物资')
      window.$viewer.addLayer(addPupoLayers['企业应急物资'])
      let iconEl = `<div class="marsBlueGradientPnl">
@@ -182,7 +179,6 @@
  addPupoLayers = {}
}
onUnmounted(() => {
  console.log('销毁***************************')
  destroy()
  destroyPupoLayers()
})
@@ -202,7 +198,7 @@
    </el-form>
    <!-- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search> -->
    <div class="table-box">
      <el-table :data="tableData" @row-click="rowClick" empty-text="" style="width: 100%"
      <el-table empty-text="暂无数据" border :data="tableData" @row-click="rowClick" 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" />
src/views/companyInfo/components/box/unitContent.vue
@@ -2,8 +2,8 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-10 15:27:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-12 18:10:32
 * @FilePath: \bigScreen\src\views\space\components\leftContainer.vue
 * @LastEditTime: 2024-11-27 16:14:10
 * @FilePath: \bigScreen\src\views\companyInfo\components\box\unitContent.vue
 * @Description:
 *
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
@@ -47,7 +47,7 @@
            let data = res.data.data.records
            data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
                let img = image.value.filter(l => i.name.includes(l.label))
                img = img.length > 0 ? img : image
                img = img.length > 0 ? img : image.value
                let iconEl = `<div class="map-name">${i.name}</div>
                            <div class="map-icon"> <img src="${img[0].value}"> </div>`
                let divIcon = new DC.DivIcon(
@@ -111,7 +111,6 @@
    EventBus.emit('restHandleCheckChange', `3-3-4`)
})
onUnmounted(() => {
    console.log('leftContainer unmounted***********************')
    let arr = Object.keys(addTileLayers)
    arr.forEach(i => {
        addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
src/views/companyInfo/components/rightContainer.vue
@@ -23,14 +23,7 @@
})
onMounted(() => {
  // console.log("*************************", state.buttonIndex)
})
// watch(() => state.buttonIndex, (newValue, oldValue) => {
//   console.log("**************111***********", newValue)
// })
</script>
<template>
src/views/companyInfo/index.vue
@@ -49,7 +49,6 @@
})
const handleChildEvent = (data) => {
  console.log('子组件触发的事件,传递的数据:', data)
  buttonIndex.value = data
  // localStorage.setItem('buttonIndex', data);
src/views/fireWarning/components/box/tabsTable.vue
@@ -43,9 +43,6 @@
onMounted(() => {
    nextTick(() => {
        curHeight.value = tableContent.value.offsetHeight - 40
        console.log(tableContent.value.offsetHeight, `current page: ${curHeight.value}`)
    })
})
@@ -54,7 +51,7 @@
<template>
    <div ref="tableContent" class="content">
        <el-table :data="tableData" stripe style="width: 100%" :height="curHeight">
    <el-table empty-text="暂无数据" :data="tableData" stripe style="width: 100%" :height="curHeight">
            <el-table-column prop="ind" label="序号" width="60" />
            <el-table-column prop="address" label="位置" />
            <el-table-column prop="fireGrade" label="火灾等级" />
src/views/pac/components/box/dataContent.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-10 15:27:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-18 18:24:10
 * @LastEditTime: 2024-11-27 14:49:05
 * @FilePath: \bigScreen\src\views\pac\components\box\dataContent.vue
 * @Description: 
 * 
@@ -43,7 +43,6 @@
const curSelect = ref('1')
let addTileLayers = {}
const handleCheckChange = (row) => {
  // console.log(row)
  resData.data.forEach(item => {
    if (row.value === item.value) {
      if (!addTileLayers[item.label]) {
@@ -74,6 +73,26 @@
            type: 7,
            backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
            className: 'xfs-box',
          },
          {
            type: 8,
            backgroundIcon: VITE_APP_BASE + 'img/mapicon/gouqu.png',
            className: 'xfs-box',
          },
          {
            type: 9,
            backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
            className: 'xfs-box',
          },
          {
            type: 10,
            backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
            className: 'xfs-box',
          },
          {
            type: 11,
            backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
            className: 'xfs-box',
          }
        ]
@@ -84,8 +103,11 @@
          let data = res.data.data.records
          data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
            let iconEl = ''
            let divclassName = ''
            let flag = typeList.find(l => l.type == i.type)
            if (flag) {
              divclassName = flag.className
              if (flag.backgroundIcon) {
                iconEl = `
                  <div class="map-name">${i[i.showParams] || i.name}</div>
@@ -102,7 +124,7 @@
            let divIcon = new DC.DivIcon(
              new DC.Position(i.lng, i.lat, 64),
              `<div class="public-map-popup ${flag.className || ''}">
              `<div class="public-map-popup ${divclassName}">
                    ${iconEl}
                  </div>`
            )
src/views/pac/components/box/fireSource.vue
@@ -2,13 +2,15 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-13 14:54:26
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-13 15:00:55
 * @FilePath: \forest-fire\src\views\statistics\components\box\dataContent.vue
 * @LastEditTime: 2024-11-27 14:30:53
 * @FilePath: \bigScreen\src\views\pac\components\box\fireSource.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-->
<script setup>
import { Picture } from '@element-plus/icons-vue'
import publicContent from './publicContent.vue'
import { getAssetsFile } from 'utils/utils'
const one = getAssetsFile('one.png', '/img')
@@ -16,14 +18,13 @@
const three = getAssetsFile('three.png', '/img')
import { usePointStore } from 'store/usepoint'
const pointStore = usePointStore()
const sharedData = computed(() => pointStore.sharedData);
const sharedData = computed(() => pointStore.sharedData)
let indexValue = ref(1)
watch(sharedData, (newValue) => {
    indexValue.value = newValue
    // console.log(newValue, "************************************************")
});
})
</script>
<template>
@@ -37,7 +38,9 @@
                            :initial-index="4" fit="cover">
                            <template #error>
                                <div class="image-slot">
                                    <el-icon><icon-picture /></el-icon>
                  <el-icon>
                    <Picture />
                  </el-icon>
                                </div>
                            </template>
                        </el-image>
@@ -54,7 +57,9 @@
                            :initial-index="4" fit="cover">
                            <template #error>
                                <div class="image-slot">
                                    <el-icon><icon-picture /></el-icon>
                  <el-icon>
                    <Picture />
                  </el-icon>
                                </div>
                            </template>
                        </el-image>
@@ -81,7 +86,9 @@
                            :initial-index="4" fit="cover">
                            <template #error>
                                <div class="image-slot">
                                    <el-icon><icon-picture /></el-icon>
                  <el-icon>
                    <Picture />
                  </el-icon>
                                </div>
                            </template>
                        </el-image>
@@ -108,9 +115,8 @@
.content_text_box {
    height: 530px;
    overflow: scroll;
    // 隐藏滚动条
    scrollbar-width: none;
  overflow: hidden;
  overflow-y: auto;
}
src/views/pd/components/dynamicPanel.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-11-09 15:41:35
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-27 12:16:04
 * @LastEditTime: 2024-11-27 15:19:10
 * @FilePath: \bigScreen\src\views\pd\components\dynamicPanel.vue
 * @Description: 
 * 
src/views/rs/components/box/dataContent.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-13 14:54:26
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-20 18:50:27
 * @LastEditTime: 2024-11-27 14:26:33
 * @FilePath: \bigScreen\src\views\rs\components\box\dataContent.vue
 * @Description: 
 * 
@@ -99,6 +99,7 @@
// 查询分页数据
const getLists = (param = {}) => {
  tableData.value = []
  param.current = pages.page
  param.size = pages.pageSize
  loading.value = true
@@ -185,7 +186,6 @@
}
const tabClick = (item) => {
  console.log(item, 12312)
  if (curSelect.value) EventBus.emit('restHandleDelChange', `4-${curSelect.value}`)
  curSelect.value = item.value
  EventBus.emit('restHandleCheckChange', `4`)
@@ -237,7 +237,7 @@
    </div> -->
    <div class="h0 flex-1 table-content" ref="TableContent" v-loading="loading"
      element-loading-background="rgba(46, 81, 136, 0.9)">
      <el-table @row-click="rowClick" border :data="tableData" :height="curTableHeight" style="width: 100%">
      <el-table empty-text="暂无数据"  @row-click="rowClick" border :data="tableData" :height="curTableHeight" style="width: 100%">
        <el-table-column align="center" label="ID" width="42" prop="rank">
          <template #default="{ $index, row }">
            {{ (pages.page - 1) * pages.pageSize + $index + 1 }}
src/views/rs/components/leftContainer.vue
@@ -28,7 +28,6 @@
const curSelect = ref('')
const tabClick = (item) => {
  console.log(item, 12312)
  if (curSelect.value) EventBus.emit('restHandleDelChange', `4-${curSelect.value}`)
  curSelect.value = item.value
  EventBus.emit('restHandleCheckChange', `4-${item.value}`)
src/views/rt/components/box/dataContent.vue
@@ -2,21 +2,21 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-13 14:54:26
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-13 15:00:55
 * @FilePath: \forest-fire\src\views\statistics\components\box\dataContent.vue
 * @LastEditTime: 2024-11-27 14:32:26
 * @FilePath: \bigScreen\src\views\rt\components\box\dataContent.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-->
<script setup>
import publicContent from "./publicContent.vue";
import { getList } from "@/api/rescueTeam/rescueTeam";
import publicContent from "./publicContent.vue"
import { getList } from "@/api/rescueTeam/rescueTeam"
import { getPage } from '@/api/indParkInfo'
import { reactive } from "vue";
import { reactive } from "vue"
const loading = ref(false);
const loading = ref(false)
const tableData = ref([]);
const tableData = ref([])
let currentIndex = ref(0)
// 园区 企业
@@ -24,16 +24,16 @@
  { label: "园区救援队伍", value: "0", id: "1" },
  { label: "企业救援队伍", value: "0", id: "2" }
]);
])
const pages = {
  page: 1,
  pageSize: 100,
  total: 0,
};
}
onMounted(() => {
  getLists(formInline);
});
  getLists(formInline)
})
function handleClick(item, index) {
@@ -46,43 +46,42 @@
  } else {
    formInline.type = 2
  }
  getLists(formInline);
  getLists(formInline)
}
// 表格样式
const tableCellStyle = ({ row, column }) => {
  return { background: "#152851", color: "#fff" };
};
  return { background: "#152851", color: "#fff" }
}
// 表格表头样式
const headerCellStyle = ({ }) => {
  return {
    background: "#152851",
    color: "#fff",
  };
};
  }
}
// 搜索条件
const formInline = reactive({
  perInCha: "",
  type: '1'
});
})
// 提交查询
const onSubmit = () => {
  pages.page = 1
  pages.pageSize = 13
  pages.total = 0
  console.log("submit!");
  getLists(formInline);
};
  getLists(formInline)
}
// 分页树改变
const handleSizeChange = (val) => {
  pages.pageSize = val;
  getLists(formInline);
  pages.pageSize = val
  getLists(formInline)
}
// 分页改变
const handleCurrentChange = (val) => {
  pages.page = val;
  getLists(formInline);
  pages.page = val
  getLists(formInline)
}
// 重置条件
const clearBtn = () => {
@@ -91,23 +90,24 @@
  pages.page = 1
  pages.pageSize = 13
  pages.total = 0
  getLists(formInline);
  getLists(formInline)
}
// 查询分页数据
function getLists(param = {}) {
  param.current = pages.page;
  param.size = pages.pageSize;
  loading.value = true;
  tableData.value = []
  param.current = pages.page
  param.size = pages.pageSize
  loading.value = true
  getList(param)
    .then((res) => {
      const data = res.data.data;
      tableData.value = data.records;
      const data = res.data.data
      tableData.value = data.records
    })
    .catch((err) => {
      loading.value = false;
      console.log(err);
    });
      loading.value = false
      console.log(err)
    })
}
</script>
@@ -127,7 +127,7 @@
        <div class="page_box">
          <el-table border empty-text="" v-if="formInline.type == 1" :data="tableData" style="width: 100%"
          <el-table empty-text="暂无数据" border v-if="formInline.type == 1" :data="tableData" style="width: 100%"
            :header-cell-style="headerCellStyle" :cell-style="tableCellStyle">
            <el-table-column prop="teamName" label="救援队伍组名称" />
            <el-table-column prop="teamJob" label="救援队伍组职务" />
@@ -136,8 +136,8 @@
            <el-table-column prop="perInChaPho" label="联系电话" />
          </el-table>
          <el-table border empty-text="" v-else :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
            :cell-style="tableCellStyle">
          <el-table empty-text="暂无数据" border v-else :data="tableData" style="width: 100%"
            :header-cell-style="headerCellStyle" :cell-style="tableCellStyle">
            <el-table-column prop="firmName" label="企业名称" />
            <el-table-column prop="perInCha" label="责任人姓名" />
            <el-table-column prop="perInChaPho" label="联系电话" />
src/views/space/components/box/dataContent.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-13 14:54:26
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-19 17:41:11
 * @LastEditTime: 2024-11-27 14:27:09
 * @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
 * @Description:
 *
@@ -86,6 +86,7 @@
// 查询分页数据
const getLists = (param = {}) => {
  tableData.value = []
  param.current = pages.page
  param.size = pages.pageSize
  loading.value = true
@@ -192,11 +193,13 @@
<template>
  <div class="w100 h0 flex-1 flex f-d-c">
    <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
    <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn"
      ref="SeachBarCondition"></global-search>
    <div class="h0 flex-1 table-content" ref="TableContent" v-loading="loading"
      element-loading-background="rgba(46, 81, 136, 0.9)">
      <el-table @row-click="rowClick" border :data="tableData" :height="curTableHeight" style="width: 100%">
      <el-table empty-text="暂无数据" @row-click="rowClick" border :data="tableData" :height="curTableHeight"
        style="width: 100%">
        <el-table-column align="center" label="ID" width="42" prop="rank">
          <template #default="{ $index, row }">
            {{ (pages.page - 1) * pages.pageSize + $index + 1 }}
src/views/space/components/leftContainer.vue
@@ -59,7 +59,6 @@
}
const tabClick = (item) => {
  console.log('tabClick', item)
  if (curSelect.value) {
    if (curSelect.value == '3') {
      EventBus.emit('restHandleDelChange', `3-3-1`)
src/views/supplies/components/box/dataContent.vue
@@ -21,7 +21,7 @@
        <div class="page_box">
          <div>
            <el-table border empty-text="" v-if="formInline.ownership == 1" :data="tableData">
            <el-table empty-text="暂无数据" border v-if="formInline.ownership == 1" :data="tableData">
              <el-table-column prop="name" label="物资名称" />
              <el-table-column prop="personInCha" label="负责人" width="150" />
              <el-table-column prop="personInChaPhone" label="负责人电话" width="250" />
@@ -29,7 +29,7 @@
              <el-table-column prop="numUnit" label="数量" width="150" />
            </el-table>
            <el-table border empty-text="" v-else :data="tableData">
            <el-table empty-text="暂无数据" border v-else :data="tableData">
              <el-table-column prop="name" label="物资名称" />
              <el-table-column prop="personInCha" label="负责人" width="150" />
              <el-table-column prop="personInChaPhone" label="负责人电话" width="250" />
src/views/survey/components/box/dataContent.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-11-04 16:32:04
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-20 19:01:15
 * @LastEditTime: 2024-11-27 15:44:25
 * @FilePath: \bigScreen\src\views\survey\components\box\dataContent.vue
 * @Description:
 *
@@ -17,7 +17,9 @@
let $echarts = inject("echarts")
const curEcharts = ref(null)
let myEcharts = reactive(null)
let myEcharts = reactive({
  chart: ''
})
const echartsColors = ['#1E90FF', '#36A2EB', '#FFD700', '#FFA500', '#228B22', '#8FBC8F']
@@ -30,7 +32,7 @@
      yaxis_data.push(element.num)
    })
    myEcharts.setOption({
    myEcharts.chart.setOption({
      tooltip: {
        trigger: "axis",
        axisPointer: {
@@ -71,12 +73,10 @@
            interval: 0, //设置为 1,表示『隔一个标签显示一个标签』
            margin: 15,
            rotate: 45, //调整数值改变倾斜的幅度(范围-90到90)
            textStyle: {
              color: "#fff",
              fontStyle: "normal",
              fontFamily: "微软雅黑",
              fontSize: 12,
            },
          },
        },
      ],
@@ -125,12 +125,12 @@
}
nextTick(() => {
  myEcharts = $echarts.init(curEcharts.value)
  myEcharts.chart = $echarts.init(curEcharts.value)
  getStatistic()
})
const echartsResize = () => {
  myEcharts && myEcharts.resize()
  myEcharts.chart && myEcharts.chart.resize()
}
useEchartsResize(echartsResize)
src/views/survey/components/box/fireContent.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-11-04 16:32:04
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-19 15:33:32
 * @LastEditTime: 2024-11-27 15:37:28
 * @FilePath: \bigScreen\src\views\survey\components\box\fireContent.vue
 * @Description:
 *
@@ -15,7 +15,9 @@
let $echarts = inject('echarts')
const curEcharts = ref(null)
let myEcharts = reactive(null)
let myEcharts = reactive({
  chart: ''
})
let typeLevel = [
  {
@@ -59,7 +61,7 @@
      total = total + item.num
    })
    myEcharts.setOption({
    myEcharts.chart.setOption({
      title: {
        text: "总数",
        subtext: String(total),
@@ -120,12 +122,12 @@
}
nextTick(() => {
  myEcharts = $echarts.init(curEcharts.value)
  myEcharts.chart = $echarts.init(curEcharts.value)
  getRiskSource()
})
const echartsResize = () => {
  myEcharts && myEcharts.resize()
  myEcharts.chart && myEcharts.chart.resize()
}
useEchartsResize(echartsResize)
src/views/survey/components/box/fireSource.vue
@@ -1,4 +1,5 @@
<script setup>
import { Picture } from '@element-plus/icons-vue'
import { inject, Text } from 'vue'
const { VITE_APP_BASE } = import.meta.env
@@ -96,7 +97,9 @@
            :min-scale="0.2" :preview-src-list="[state.parkInfo.imageUrls]" :initial-index="4" fit="cover">
            <template #error>
              <div class="image-slot">
                <el-icon><icon-picture /></el-icon>
                <el-icon>
                  <Picture />
                </el-icon>
              </div>
            </template>
          </el-image>
src/views/survey/components/box/fireTrend.vue
@@ -30,16 +30,14 @@
    size: 100,
  }).then(res => {
    parkQy.value = res.data.data.records
    // console.log(res)
  }).catch(err => {
    // console.log(err)
    console.log(err)
  })
}
function search() {
  getPage({ name: searchQuery.value }).then(res => {
    parkQy.value = res.data.data.records
    console.log(res)
  }).catch(err => {
    console.log(err)
  })
@@ -59,9 +57,9 @@
  <div class="box-content w100 h100 flex f-d-c">
    <div>
      <div class="search-container">
        <el-input v-model="searchQuery" placeholder="请输入企业名称" size="mini">
        <el-input v-model="searchQuery" placeholder="请输入企业名称" size="large">
        </el-input>
        <el-button :color="'#0088ff'" @click="search" size="mini">搜索</el-button>
        <el-button :color="'#0088ff'" @click="search" size="large">搜索</el-button>
      </div>
    </div>
src/views/survey/components/box/unitContent.vue
@@ -16,11 +16,12 @@
let $echarts = inject("echarts")
const curEcharts = ref(null)
let myEcharts = reactive(null)
let myEcharts = reactive({
  chart: ''
})
function getEmergencySpace () {
  getEmergencySpaceStatistic().then((res) => {
    // console.log(res)
    let data = res.data.data
    let dataRsult = []
    var total = 0
@@ -32,7 +33,7 @@
      total = total + item.num
    })
    myEcharts.setOption({
    myEcharts.chart.setOption({
      title: {
        text: "总数",
        subtext: String(total),
@@ -111,12 +112,12 @@
}
nextTick(() => {
  myEcharts = $echarts.init(curEcharts.value)
  myEcharts.chart = $echarts.init(curEcharts.value)
  getEmergencySpace()
})
const echartsResize = () => {
  myEcharts && myEcharts.resize()
  myEcharts.chart && myEcharts.chart.resize()
}
useEchartsResize(echartsResize)
src/views/survey/components/leftContainer.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-10 15:27:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-05 16:33:44
 * @LastEditTime: 2024-11-27 16:15:34
 * @FilePath: \bigScreen\src\views\survey\components\leftContainer.vue
 * @Description:
 *
@@ -17,7 +17,6 @@
onMounted(() => {
  console.log('leftContainer*************************************')
  store.setLoadSub(false)
})
vite.config.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-25 10:56:27
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-24 03:04:27
 * @LastEditTime: 2024-11-27 14:15:57
 * @FilePath: \bigScreen\vite.config.js
 * @Description: 
 * 
@@ -56,11 +56,11 @@
        imports: ["vue", "vue-router"], // 自动导入vue和vue-router相关函数
      }),
      viteCompression({
          filter: /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i, // 需要压缩的文件
          threshold: 512, // 文件容量大于这个值进行压缩
        filter: /\.(js|css|json|txt|ico|svg)(\?.*)?$/i, // 需要压缩的文件
        threshold: 1024, // 文件容量大于这个值进行压缩
          algorithm: 'gzip', // 压缩方式
          ext: 'gz', // 后缀名
          deleteOriginFile: true, // 压缩后是否删除压缩源文件
        deleteOriginFile: false, // 压缩后是否删除压缩源文件
        })
    ],
@@ -114,12 +114,12 @@
          rewrite: path => path.replace(/^\/zhyq\/newMx/, ''),
        },
        '/zhyq/mx': {
          // target: 'http://localhost',
          target: 'https://wrj.shuixiongit.com/zhyq/mx',
          changeOrigin: true,
          rewrite: path => path.replace(/^\/zhyq\/mx/, ''),
        },
        // '/zhyq/mx': {
        //   // target: 'http://localhost',
        //   target: 'https://wrj.shuixiongit.com/zhyq/mx',
        //   changeOrigin: true,
        //   rewrite: path => path.replace(/^\/zhyq\/mx/, ''),
        // },
        '/zhyqapi': {
          // target: 'http://localhost:8082',