Browse Source

no message

xiaoxin 11 months atrás
parent
commit
0e2d0e847f
82 changed files with 4242 additions and 22 deletions
  1. BIN
      2024/assets/1-eIrDI25a.mp4
  2. BIN
      2024/assets/11-DWdUaCIq.png
  3. BIN
      2024/assets/14-C27uZ0Ba.png
  4. BIN
      2024/assets/15-DG5RGfx6.png
  5. BIN
      2024/assets/16-DFkBt18i.png
  6. BIN
      2024/assets/17-CUi_zsRL.png
  7. BIN
      2024/assets/18-XUglYt2M.png
  8. BIN
      2024/assets/23-Bo3g3oSG.png
  9. BIN
      2024/assets/25-Bxd2iCxv.png
  10. BIN
      2024/assets/29-CHZi9bGC.png
  11. BIN
      2024/assets/31-BD5Danxy.png
  12. BIN
      2024/assets/36-CDnelgsL.png
  13. BIN
      2024/assets/38-BBUaO56e.png
  14. BIN
      2024/assets/39-DPhqCzY3.png
  15. BIN
      2024/assets/45-LNlBlfv4.png
  16. BIN
      2024/assets/47-CUgFMAH_.png
  17. BIN
      2024/assets/53-Br96sNhg.png
  18. BIN
      2024/assets/54-AGS3flU4.png
  19. BIN
      2024/assets/55-BvAD9uCO.png
  20. BIN
      2024/assets/56-CQfcV0yh.png
  21. BIN
      2024/assets/58-pAzmO13O.png
  22. BIN
      2024/assets/59-t1glzP6O.png
  23. BIN
      2024/assets/68-CDrYexFS.png
  24. BIN
      2024/assets/70-C3EC-z_Q.png
  25. BIN
      2024/assets/72-CLJvGdMI.png
  26. BIN
      2024/assets/74-B__YRnx_.png
  27. BIN
      2024/assets/75-Dm4gbwqv.png
  28. BIN
      2024/assets/76-3A0orNt_.png
  29. BIN
      2024/assets/79-BzDOkcbG.png
  30. BIN
      2024/assets/80-ByetdM7x.png
  31. BIN
      2024/assets/81-BWCffLal.png
  32. BIN
      2024/assets/84-DiRWwZAZ.png
  33. BIN
      2024/assets/85-Cgbh4U75.png
  34. BIN
      2024/assets/86-DtZ2xTN8.png
  35. BIN
      2024/assets/87-CAqfI1tB.png
  36. BIN
      2024/assets/88-C-QQuSiD.png
  37. BIN
      2024/assets/9-BByoqUN2.png
  38. 2599 0
      2024/assets/EasyWasmPlayer-pn9NK9jd.js
  39. 4 0
      2024/assets/analyse-DG_eHXaO.js
  40. 1 0
      2024/assets/analyse-DKhgkeOF.css
  41. BIN
      2024/assets/analyse-btn-background-ELCgd6gv.png
  42. BIN
      2024/assets/analyse-btn-background2-B1znnIk4.png
  43. BIN
      2024/assets/analyse-center-background-CIDGeFxm.png
  44. BIN
      2024/assets/analyse-center-line-DJB3OyHw.png
  45. BIN
      2024/assets/analyse-center-title-Bd9aRfzx.png
  46. BIN
      2024/assets/analyse-line-CD-40c0I.png
  47. 1 0
      2024/assets/draggable-D-BL5IzT.js
  48. 1 0
      2024/assets/index-CJAQRip9.css
  49. 88 0
      2024/assets/index-Cj0NhRD6.js
  50. 60 0
      2024/assets/index-DrS9pjSb.js
  51. 1 0
      2024/assets/login-1_-UyFbD.js
  52. 1 0
      2024/assets/login-BtfFujsW.css
  53. BIN
      2024/assets/login-background-hOcQyf7e.png
  54. BIN
      2024/assets/main-body-bottom-line-CBAut6iS.png
  55. BIN
      2024/assets/main-body-bottom-line2-BLjT4OLc.png
  56. BIN
      2024/assets/main-header-background-JHGFKYF8.png
  57. BIN
      2024/assets/news-detail-background-BugHlkpP.png
  58. BIN
      2024/assets/news-list-background-C4MfOgAq.png
  59. 1163 0
      2024/assets/right-D726wL_q.js
  60. 1 0
      2024/assets/right-VnkOznGx.css
  61. BIN
      2024/assets/router-analyse-DJqu3RAi.png
  62. BIN
      2024/assets/router-analyse-active-c1sTrC5c.png
  63. BIN
      2024/assets/router-safe-active-DBiguAw4.png
  64. BIN
      2024/assets/router-safe-qFQ2RdgM.png
  65. BIN
      2024/assets/router-server-CMU5wTwR.png
  66. BIN
      2024/assets/router-server-active-CpWXsOp3.png
  67. BIN
      2024/assets/routerEle-image-D3VNLFr4.png
  68. 1 0
      2024/assets/safe-EHEXJ_zx.js
  69. 1 0
      2024/assets/safe-u4aLNz7E.css
  70. 2 0
      2024/assets/server-CcWyD6dt.js
  71. 1 0
      2024/assets/server-CtRgjCxV.css
  72. BIN
      2024/assets/庞门正道标题体-BQhItuPm.ttf
  73. 14 0
      2024/index.html
  74. 1 0
      2024/vite.svg
  75. 13 0
      src/api/scenic/index.ts
  76. 69 9
      src/components/map/scenicData.ts
  77. 63 0
      src/components/map/watchData.ts
  78. 4 4
      src/views/analyse/center/centerAnalyse.vue
  79. 75 2
      src/views/analyse/right/mapScenicDialog.vue
  80. 75 4
      src/views/analyse/right/scenicDetailDialog.vue
  81. 2 2
      src/views/safe/center/centerSafe.vue
  82. 1 1
      src/views/safe/safe.vue

BIN
2024/assets/1-eIrDI25a.mp4


BIN
2024/assets/11-DWdUaCIq.png


BIN
2024/assets/14-C27uZ0Ba.png


BIN
2024/assets/15-DG5RGfx6.png


BIN
2024/assets/16-DFkBt18i.png


BIN
2024/assets/17-CUi_zsRL.png


BIN
2024/assets/18-XUglYt2M.png


BIN
2024/assets/23-Bo3g3oSG.png


BIN
2024/assets/25-Bxd2iCxv.png


BIN
2024/assets/29-CHZi9bGC.png


BIN
2024/assets/31-BD5Danxy.png


BIN
2024/assets/36-CDnelgsL.png


BIN
2024/assets/38-BBUaO56e.png


BIN
2024/assets/39-DPhqCzY3.png


BIN
2024/assets/45-LNlBlfv4.png


BIN
2024/assets/47-CUgFMAH_.png


BIN
2024/assets/53-Br96sNhg.png


BIN
2024/assets/54-AGS3flU4.png


BIN
2024/assets/55-BvAD9uCO.png


BIN
2024/assets/56-CQfcV0yh.png


BIN
2024/assets/58-pAzmO13O.png


BIN
2024/assets/59-t1glzP6O.png


BIN
2024/assets/68-CDrYexFS.png


BIN
2024/assets/70-C3EC-z_Q.png


BIN
2024/assets/72-CLJvGdMI.png


BIN
2024/assets/74-B__YRnx_.png


BIN
2024/assets/75-Dm4gbwqv.png


BIN
2024/assets/76-3A0orNt_.png


BIN
2024/assets/79-BzDOkcbG.png


BIN
2024/assets/80-ByetdM7x.png


BIN
2024/assets/81-BWCffLal.png


BIN
2024/assets/84-DiRWwZAZ.png


BIN
2024/assets/85-Cgbh4U75.png


BIN
2024/assets/86-DtZ2xTN8.png


BIN
2024/assets/87-CAqfI1tB.png


BIN
2024/assets/88-C-QQuSiD.png


BIN
2024/assets/9-BByoqUN2.png


File diff suppressed because it is too large
+ 2599 - 0
2024/assets/EasyWasmPlayer-pn9NK9jd.js


File diff suppressed because it is too large
+ 4 - 0
2024/assets/analyse-DG_eHXaO.js


File diff suppressed because it is too large
+ 1 - 0
2024/assets/analyse-DKhgkeOF.css


BIN
2024/assets/analyse-btn-background-ELCgd6gv.png


BIN
2024/assets/analyse-btn-background2-B1znnIk4.png


BIN
2024/assets/analyse-center-background-CIDGeFxm.png


BIN
2024/assets/analyse-center-line-DJB3OyHw.png


BIN
2024/assets/analyse-center-title-Bd9aRfzx.png


BIN
2024/assets/analyse-line-CD-40c0I.png


+ 1 - 0
2024/assets/draggable-D-BL5IzT.js

@@ -0,0 +1 @@
+const v=o=>{const a=document.getElementById(o);let l=!1,e,n,r,i,d=0,s=0;a.addEventListener("mousedown",u),document.addEventListener("mouseup",g),document.addEventListener("mousemove",c);function u(t){r=t.clientX-d,i=t.clientY-s,t.target===a&&(l=!0)}function c(t){l&&(t.preventDefault(),e=t.clientX-r,n=t.clientY-i,d=e,s=n,f(e,n,a))}function f(t,m,p){p.style.transform=`translate3d(${t}px, ${m}px, 0)`}function g(){r=e,i=n,l=!1}};export{v as d};

File diff suppressed because it is too large
+ 1 - 0
2024/assets/index-CJAQRip9.css


File diff suppressed because it is too large
+ 88 - 0
2024/assets/index-Cj0NhRD6.js


File diff suppressed because it is too large
+ 60 - 0
2024/assets/index-DrS9pjSb.js


File diff suppressed because it is too large
+ 1 - 0
2024/assets/login-1_-UyFbD.js


File diff suppressed because it is too large
+ 1 - 0
2024/assets/login-BtfFujsW.css


BIN
2024/assets/login-background-hOcQyf7e.png


BIN
2024/assets/main-body-bottom-line-CBAut6iS.png


BIN
2024/assets/main-body-bottom-line2-BLjT4OLc.png


BIN
2024/assets/main-header-background-JHGFKYF8.png


BIN
2024/assets/news-detail-background-BugHlkpP.png


BIN
2024/assets/news-list-background-C4MfOgAq.png


File diff suppressed because it is too large
+ 1163 - 0
2024/assets/right-D726wL_q.js


File diff suppressed because it is too large
+ 1 - 0
2024/assets/right-VnkOznGx.css


BIN
2024/assets/router-analyse-DJqu3RAi.png


BIN
2024/assets/router-analyse-active-c1sTrC5c.png


BIN
2024/assets/router-safe-active-DBiguAw4.png


BIN
2024/assets/router-safe-qFQ2RdgM.png


BIN
2024/assets/router-server-CMU5wTwR.png


BIN
2024/assets/router-server-active-CpWXsOp3.png


BIN
2024/assets/routerEle-image-D3VNLFr4.png


File diff suppressed because it is too large
+ 1 - 0
2024/assets/safe-EHEXJ_zx.js


File diff suppressed because it is too large
+ 1 - 0
2024/assets/safe-u4aLNz7E.css


File diff suppressed because it is too large
+ 2 - 0
2024/assets/server-CcWyD6dt.js


File diff suppressed because it is too large
+ 1 - 0
2024/assets/server-CtRgjCxV.css


BIN
2024/assets/庞门正道标题体-BQhItuPm.ttf


+ 14 - 0
2024/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/2024/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title></title>
+    <script type="module" crossorigin src="/2024/assets/index-Cj0NhRD6.js"></script>
+    <link rel="stylesheet" crossorigin href="/2024/assets/index-CJAQRip9.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

File diff suppressed because it is too large
+ 1 - 0
2024/vite.svg


+ 13 - 0
src/api/scenic/index.ts

@@ -36,6 +36,9 @@ enum API {
   ALLPEOPLENUMBYADD_URL = "/tourqueryTourT.action",
   // 获取各个景点实时人流数据 接口地址
   TOURREALNUMBYPLACE_URL = "/tourqueryPlaceT.action",
+
+  // 获取各个景点实时人流数据 接口地址
+  scenicDetail_URL = "/tourqueryTourDetail.action",
 }
 
 //获取单个景点信息
@@ -196,3 +199,13 @@ export const reqGetNumByPlace = () =>
       type: "bigData",
     },
   });
+
+// 获取各个景点实时人流数据
+export const reqGetScenicDetail = (data: any) =>
+  request({
+    method: "post",
+    url: `${API.scenicDetail_URL}?sm_place=${data.sm_place}&page=${data.page}&rows=${data.rows}`,
+    headers: {
+      type: "bigData",
+    },
+  });

+ 69 - 9
src/components/map/scenicData.ts

@@ -797,13 +797,73 @@ export const scenicData = [
     timer: null,
     player: null,
   },
-  // {
-  //   title: "璪都红绿灯路口",
-  // },
-  // {
-  //   title: "中源乡三坪村",
-  // },
-  // {
-  //   title: "中源乡",
-  // },
+  {
+    markerContent: `
+    <div class="scenic"">
+      <div class="scenic_text">
+      璪都幼儿园路口
+         <div class="icon"></div>
+      </div>
+      <div class="scenic_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 115.180368,
+    lat: 29.010868,
+    ele: ".marker",
+    title: "璪都幼儿园路口",
+    left: 16,
+    right: -33,
+    rtspaddr: "rtsp://admin:hik12345@6.205.68.154:554/Streaming/Channels/102",
+    isShow: false,
+    timer: null,
+    player: null,
+  },
+  {
+    markerContent: `
+    <div class="scenic"">
+      <div class="scenic_text">
+      中源集镇
+         <div class="icon"></div>
+      </div>
+      <div class="scenic_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 114.994086,
+    lat: 28.863778,
+    ele: ".marker",
+    title: "中源集镇",
+    left: 16,
+    right: -33,
+    rtspaddr: "rtsp://admin:hik12345@6.205.68.179:554/Streaming/Channels/102",
+    isShow: false,
+    timer: null,
+    player: null,
+  },
+  {
+    markerContent: `
+    <div class="scenic"">
+      <div class="scenic_text">
+      中源乡白沙坪与修水隔界
+         <div class="icon"></div>
+      </div>
+      <div class="scenic_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 114.914062,
+    lat: 28.83365,
+    ele: ".marker",
+    title: "中源乡白沙坪与修水隔界",
+    left: 16,
+    right: -33,
+    rtspaddr: "rtsp://admin:hik12345@6.205.67.219:554/Streaming/Channels/102",
+    isShow: false,
+    timer: null,
+    player: null,
+  },
 ];

+ 63 - 0
src/components/map/watchData.ts

@@ -696,4 +696,67 @@ export const watchData = [
     iframeUrl: `${baseUrl}/hik/cn/ch245_two.html`,
     rtspaddr: "rtsp://admin:hik12345@6.205.67.244:554/Streaming/Channels/102",
   },
+  {
+    markerContent: `
+    <div class="watch"">
+      <div class="watch_text">
+      璪都幼儿园路口
+         <div class="icon"></div>
+      </div>
+      <div class="watch_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 115.180368,
+    lat: 29.010868,
+    ele: ".marker",
+    title: "璪都幼儿园路口",
+    left: 24,
+    right: -39,
+    // iframeUrl: `${baseUrl}/hik/cn/ch245_two.html`,
+    rtspaddr: "rtsp://admin:hik12345@6.205.68.154:554/Streaming/Channels/102",
+  },
+  {
+    markerContent: `
+    <div class="watch"">
+      <div class="watch_text">
+      中源集镇
+         <div class="icon"></div>
+      </div>
+      <div class="watch_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 114.994086,
+    lat: 28.863778,
+    ele: ".marker",
+    title: "中源集镇",
+    left: 24,
+    right: -39,
+    // iframeUrl: `${baseUrl}/hik/cn/ch245_two.html`,
+    rtspaddr: "rtsp://admin:hik12345@6.205.68.179:554/Streaming/Channels/102",
+  },
+  {
+    markerContent: `
+    <div class="watch"">
+      <div class="watch_text">
+      中源乡白沙坪与修水隔界
+         <div class="icon"></div>
+      </div>
+      <div class="watch_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 114.914062,
+    lat: 28.83365,
+    ele: ".marker",
+    title: "中源乡白沙坪与修水隔界",
+    left: 24,
+    right: -39,
+    // iframeUrl: `${baseUrl}/hik/cn/ch245_two.html`,
+    rtspaddr: "rtsp://admin:hik12345@6.205.67.219:554/Streaming/Channels/102",
+  },
 ];

+ 4 - 4
src/views/analyse/center/centerAnalyse.vue

@@ -11,13 +11,13 @@
       </div>
       <div class="left_info">
         <div class="info_box">
-          <div class="now">实时(人)</div>
+          <div class="now">实时(人)</div>
           <div class="box">
             <div class="num" ref="realDom">{{ realValue }}</div>
           </div>
         </div>
         <div class="info_box">
-          <div class="now">累计(人)</div>
+          <div class="now">累计(人)</div>
           <div class="box">
             <div class="num" ref="addDom">{{ addValue }}</div>
           </div>
@@ -53,13 +53,13 @@
       </div>
       <div class="right_info">
         <div class="info_box">
-          <div class="now">累计(人)</div>
+          <div class="now">累计(人)</div>
           <div class="box">
             <div class="num" ref="addDom2">{{ addValue2 }}</div>
           </div>
         </div>
         <div class="info_box">
-          <div class="now">实时(人)</div>
+          <div class="now">实时(人)</div>
           <div class="box">
             <div class="num" ref="realDom2">{{ realValue2 }}</div>
           </div>

+ 75 - 2
src/views/analyse/right/mapScenicDialog.vue

@@ -79,8 +79,22 @@
     <div class="detail_line"></div>
 
     <!-- 简介区域 -->
-    <div class="detail_desc">
+    <!-- <div class="detail_desc">
       {{ scenicInfo?.scenicSpotDesc }}
+    </div> -->
+
+    <div class="detail_desc">
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+        v-loading="loading"
+        element-loading-text="加载中..."
+        element-loading-background="rgba(1,18,38, 0.8)"
+      >
+        <el-table-column prop="sm_name" label="姓名" align="center" />
+        <el-table-column prop="sm_phone" label="电话" align="center" />
+        <el-table-column prop="sm_time" label="时间" align="center" />
+      </el-table>
     </div>
 
     <!-- 关闭按钮区域 -->
@@ -92,7 +106,11 @@
 import { ref, onMounted, watch, onUnmounted } from "vue";
 import { countUpNum } from "@/utils/countUpNum.ts";
 // 引入景点相关的接口
-import { reqGetScenicInfo, reqGetScenicInfoByNum } from "@/api/scenic/index";
+import {
+  reqGetScenicInfo,
+  reqGetScenicInfoByNum,
+  reqGetScenicDetail,
+} from "@/api/scenic/index";
 // 引入景点数据
 import { scenicData } from "@/components/map/scenicData";
 // 引入监控相关的数据接口
@@ -134,17 +152,28 @@ const isShow = ref(false);
 // 延时器实例
 const videoTimer = ref();
 
+// loading加载效果控制
+const loading = ref(true);
+
+// 表格数据
+const tableData = ref([]);
+
 onMounted(() => {
+  // console.log(props.detailObj);
+
   // 获取监控视频地址
   getVideosData();
   // 获取景点信息
   getScenicInfo();
   // 获取单个景点人数相关信息
   getScenicInfoByNum(true);
+  // 获取表格数据
+  getTableData();
 
   // 每5秒刷新数据
   timer.value = setInterval(() => {
     getScenicInfoByNum(false);
+    getTableData();
   }, 5000);
 });
 
@@ -220,6 +249,18 @@ const getScenicInfoByNum = async (flag: boolean) => {
   }
 };
 
+// 获取表格数据
+const getTableData = async () => {
+  const res: any = await reqGetScenicDetail({
+    sm_place: props.detailObj.name,
+    page: 1,
+    rows: 20,
+  });
+  // console.log(res);
+  tableData.value = res.rows || [];
+  loading.value = false;
+};
+
 // 让数字跳动
 const getCountUpNum = () => {
   countUpNum(dayDom.value, dayValue.value);
@@ -406,4 +447,36 @@ const handleCloseDetail = () => {
     cursor: pointer;
   }
 }
+
+/*最外层透明*/
+.detail_desc ::v-deep(.el-table),
+.detail_desc ::v-deep(.el-table__expanded-cell) {
+  background-color: transparent;
+  color: white;
+  border: none;
+}
+/* 表格内背景颜色 */
+.detail_desc ::v-deep(.el-table th),
+.detail_desc ::v-deep(.el-table tr),
+.detail_desc ::v-deep(.el-table td) {
+  background-color: transparent !important;
+  color: white;
+  font-size: 16px;
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+// 表格底部白线清除
+::v-deep(.el-table__inner-wrapper::before) {
+  height: 0;
+}
+
+// 修改表头背景颜色
+::v-deep(.el-table__header) {
+  background-color: rgba(58, 126, 199, 0.5);
+}
+// 清除表格默认padding
+::v-deep(.el-table .el-table__body-wrapper .el-table__cell) {
+  padding: 0;
+  height: 55px;
+}
 </style>

+ 75 - 4
src/views/analyse/right/scenicDetailDialog.vue

@@ -94,8 +94,22 @@
       <div class="detail_line"></div>
 
       <!-- 简介区域 -->
-      <div class="detail_desc">
+      <!-- <div class="detail_desc">
         {{ scenicInfo?.scenicSpotDesc || "暂无数据" }}
+      </div> -->
+
+      <div class="detail_desc">
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          v-loading="loading"
+          element-loading-text="加载中..."
+          element-loading-background="rgba(1,18,38, 0.8)"
+        >
+          <el-table-column prop="sm_name" label="姓名" align="center" />
+          <el-table-column prop="sm_phone" label="电话" align="center" />
+          <el-table-column prop="sm_time" label="时间" align="center" />
+        </el-table>
       </div>
 
       <!-- 关闭按钮区域 -->
@@ -108,7 +122,11 @@
 import { ref, onMounted, onUnmounted } from "vue";
 import { countUpNum } from "@/utils/countUpNum.ts";
 // 引入景点相关的接口
-import { reqGetScenicInfo, reqGetScenicInfoByNum } from "@/api/scenic/index";
+import {
+  reqGetScenicInfo,
+  reqGetScenicInfoByNum,
+  reqGetScenicDetail,
+} from "@/api/scenic/index";
 // 引入监控相关的数据接口
 import { getVedio } from "@/api/video/index";
 // @ts-ignore
@@ -145,8 +163,14 @@ const isShow = ref(false);
 // 延时器实例
 const videoTimer = ref();
 
+// loading加载效果控制
+const loading = ref(true);
+
+// 表格数据
+const tableData = ref([]);
+
 onMounted(() => {
-  console.log(props.detailObj);
+  // console.log(props.detailObj);
 
   // 获取监控视频地址
   getVideosData();
@@ -154,10 +178,13 @@ onMounted(() => {
   getScenicInfo();
   // 获取单个景点人数相关信息
   getScenicInfoByNum(true);
+  // 获取表格数据
+  getTableData();
 
   // 每5秒刷新数据
   timer.value = setInterval(() => {
     getScenicInfoByNum(false);
+    getTableData();
   }, 5000);
 });
 
@@ -204,7 +231,7 @@ const getScenicInfoByNum = async (flag: boolean) => {
   const res = await reqGetScenicInfoByNum({
     place_name: props.detailObj.place,
   });
-  console.log(res);
+  // console.log(res);
   dayValue.value = res.dayNum;
   addValue.value = res.LjNum * 1;
   moreValue.value = res.maxNum;
@@ -214,6 +241,18 @@ const getScenicInfoByNum = async (flag: boolean) => {
   }
 };
 
+// 获取表格数据
+const getTableData = async () => {
+  const res: any = await reqGetScenicDetail({
+    sm_place: props.detailObj.place,
+    page: 1,
+    rows: 20,
+  });
+  //console.log(res);
+  tableData.value = res.rows || [];
+  loading.value = false;
+};
+
 // 让数字跳动
 const getCountUpNum = () => {
   countUpNum(dayDom.value, dayValue.value);
@@ -418,4 +457,36 @@ const handleCloseDetail = () => {
     }
   }
 }
+
+/*最外层透明*/
+.detail_desc ::v-deep(.el-table),
+.detail_desc ::v-deep(.el-table__expanded-cell) {
+  background-color: transparent;
+  color: white;
+  border: none;
+}
+/* 表格内背景颜色 */
+.detail_desc ::v-deep(.el-table th),
+.detail_desc ::v-deep(.el-table tr),
+.detail_desc ::v-deep(.el-table td) {
+  background-color: transparent !important;
+  color: white;
+  font-size: 16px;
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+// 表格底部白线清除
+::v-deep(.el-table__inner-wrapper::before) {
+  height: 0;
+}
+
+// 修改表头背景颜色
+::v-deep(.el-table__header) {
+  background-color: rgba(58, 126, 199, 0.5);
+}
+// 清除表格默认padding
+::v-deep(.el-table .el-table__body-wrapper .el-table__cell) {
+  padding: 0;
+  height: 55px;
+}
 </style>

+ 2 - 2
src/views/safe/center/centerSafe.vue

@@ -109,7 +109,7 @@ const list = ref([
 ]);
 
 // 点位总计数据
-const pointCount = ref<number>(33);
+const pointCount = ref<number>(36);
 const pointList = ref<string[]>([]);
 const pointListDom = ref();
 
@@ -163,7 +163,7 @@ const changeIndex = (index: number, item: any) => {
   currentIndex.value = index;
   currentValue.value = item.title;
   if (item.title === "监控点位") {
-    pointCount.value = 33;
+    pointCount.value = 36;
   } else if (item.title === "防火 鹰眼点位") {
     pointCount.value = 6;
   } else if (item.title === "广播点位") {

+ 1 - 1
src/views/safe/safe.vue

@@ -18,7 +18,7 @@ const centerDom = ref();
 const handleChange = () => {
   centerDom.value.currentIndex = 0;
   centerDom.value.currentValue = "监控点位";
-  centerDom.value.pointCount = 33;
+  centerDom.value.pointCount = 36;
   centerDom.value.init();
 };
 </script>