style/样式调整，无用逻辑去除

src/App.vue

@@ -25,7 +25,7 @@ window.customConfigUrl = {
   openColor: '#00C957', //运行中 颜色
   closeColor: '#FF0000',  //非运行中 颜色
 
-  type: 1,  //1十堰 2武汉 3苏州
+  type: 2,  //1十堰 2武汉 3苏州
   typeConfig: [
     {
       type: 1,

src/router/index.js

@@ -602,48 +602,48 @@ export const constantRoutes = [
   //   ]
 
   // },
-  // {
+  {
-  //   name: "Security",
+    name: "Security",
-  //   alwaysShow: true,
+    alwaysShow: true,
-  //   component: Layout,
+    component: Layout,
-  //   hidden: false,
+    hidden: false,
-  //   name: "Security",
+    name: "Security",
-  //   path: "/Security",
+    path: "/Security",
-  //   redirect: "noRedirect",
+    redirect: "noRedirect",
-  //   meta: {
+    meta: {
-  //     icon: "afxt",
+      icon: "afxt",
-  //     link: null,
+      link: null,
-  //     noCache: false,
+      noCache: false,
-  //     title: "安防系统",
+      title: "安防系统",
-  //   },
+    },
-  //   children: [
+    children: [
-  //     {
+      {
-  //       component: () => import('@/views/Security/videoSurveillance'),
+        component: () => import('@/views/Security/videoSurveillance'),
-  //       hidden: false,
+        hidden: false,
-  //       name: "videoSurveillance",
+        name: "videoSurveillance",
-  //       path: "videoSurveillance",
+        path: "videoSurveillance",
-  //       meta: {
+        meta: {
-  //         icon: "spjk",
+          icon: "spjk",
-  //         link: null,
+          link: null,
-  //         noCache: false,
+          noCache: false,
-  //         title: "视频监控",
+          title: "视频监控",
-  //       },
+        },
-  //     },
+      },
-  //     {
+      {
-  //       component: () => import('@/views/Security/doorControl'),
+        component: () => import('@/views/Security/doorControl'),
-  //       hidden: false,
+        hidden: false,
-  //       name: "doorControl",
+        name: "doorControl",
-  //       path: "doorControl",
+        path: "doorControl",
-  //       meta: {
+        meta: {
-  //         icon: "afmj",
+          icon: "afmj",
-  //         link: null,
+          link: null,
-  //         noCache: false,
+          noCache: false,
-  //         title: "门禁",
+          title: "门禁",
-  //       },
+        },
-  //     },
+      },
-  //   ]
+    ]
 
-  // },
+  },
   // {
   //   path: '',
   //   component: Layout,

src/views/Device/deviceControl.vue

@@ -73,6 +73,15 @@
           label="设备名称"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="IotDevice.device_name"
+          label="平面图展示"
+          align="center"
+        >
+          <template #default="scope">
+            <el-switch v-model="scope.row.show_on_map"></el-switch>
+          </template>
+        </el-table-column>
 
         <!-- <el-table-column
           prop="ip"

src/views/index.vue

@@ -26,11 +26,12 @@
       </div>
       <div class="headermiddle"></div>
       <div class="headerright">
-        <span class="timetop"> {{ time1 }} &nbsp;&nbsp; &nbsp;&nbsp; </span>
+        <span class="gosys" @click="goToSystem">
-        <span class="gosys">
-          <router-link to="/Device/deviceControl">
           <img src="../assets/beij/goSys.png" alt="" />
-          </router-link>
+        </span>
+
+        <span class="fullscreen-btn">
+          <Screenfull id="screenfull" />
         </span>
 
         <span class="logout" @click="close()">
@@ -49,10 +50,12 @@
 <script>
 import moment from "moment";
 import dashboardVue from "./dashboard/index.vue";
+import Screenfull from '@/components/Screenfull'
 import { useUserStore } from "@/store/modules/user";
 export default {
   components: {
     dashboardVue,
+    Screenfull
   },
 
   data() {
@@ -137,6 +140,10 @@ export default {
         return num + ".png";
       }
     },
+    //跳转到系统
+    goToSystem() {
+      this.$router.push("/Device/deviceControl");
+    },
     //退出
     close() {
       console.log("close");
@@ -280,9 +287,10 @@ body {
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 9988;
+    z-index: 100001 !important;
     background: url("../assets/beij/title3.png");
     background-size: 100% 100%;
+    pointer-events: auto;
 
     .headerleft {
       height: 110%;
@@ -294,6 +302,7 @@ body {
       position: relative;
       font-size: 16px;
       color: #d4eaff;
+      pointer-events: none;
 
       .tianqi {
         position: absolute;
@@ -336,6 +345,8 @@ body {
       color: #d4eaff;
 
       position: relative;
+      z-index: 100002 !important;
+      pointer-events: auto !important;
 
       .tianqi {
         position: absolute;
@@ -361,6 +372,7 @@ body {
       height: 100%;
       flex: 1;
       background-size: 100% 100%;
+      pointer-events: none;
     }
   }
 
@@ -423,23 +435,54 @@ body {
 }
 
 .logout {
+  position: relative;
+  z-index: 100003 !important;
+  pointer-events: auto !important;
+  cursor: pointer !important;
   img {
     width: 30px;
     height: 30px;
+    pointer-events: none;
   }
 }
 .gosys {
   position: absolute;
-  right: 70px;
+  right: 120px;
   top: 2px;
-  cursor: pointer;
+  width: 30px;
+  height: 30px;
+  cursor: pointer !important;
+  z-index: 100003 !important;
+  pointer-events: auto !important;
+  display: block !important;
   img {
     width: 30px;
     height: 30px;
+    pointer-events: none;
+  }
+}
+.fullscreen-btn {
+  cursor: pointer !important;
+  position: absolute;
+  right: 72px;
+  top: 6px;
+  z-index: 100003 !important;
+  pointer-events: auto !important;
+  display: block !important;
+  .svg-icon {
+    width: 23px;
+    height: 23px;
+    pointer-events: auto !important;
+    cursor: pointer !important;
   }
 }
 
 .app-main {
   height: calc(100% - 50px) !important;
 }
+
+.topbox {
+  position: relative;
+  z-index: 1;
+}
 </style>

src/views/plan/shiyan.vue

@@ -7,16 +7,6 @@
     >
       <div class="app-container">
         <div class="action-bar">
-          <!-- <div class="action-bar-item spicon" @click="showTable">
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="数据图表"
-              placement="top"
-            >
-              <img src="@/assets/table.png" alt="" />
-            </el-tooltip>
-          </div> -->
           <div
             class="action-bar-item spicon"
             @click="editFun"
@@ -142,8 +132,7 @@
     
   
   <script setup>
-import { forEach, throttle } from "lodash";
+import { throttle } from "lodash";
-import res_json from "./../../mock/data";
 import { getArea } from "@/api/area.js";
 import { getDeviceType, getDevices, updateDevice } from "@/api/device.js";
 import { ElMessage, ElNotification } from "element-plus";
@@ -680,21 +669,6 @@ const handleTabbar = (e) => {
   throttledRedraw(); // 只重绘上层动态内容
 };
 
-const getIconStatus = (id) => {
-  let _d = _typesDictionary.filter((d) => {
-    return d.value == id;
-  });
-  if (_d[0]) {
-    return _d[0].isSelected;
-  } else {
-    return false;
-  }
-};
-
-const showTable = () => {
-  tableModelValue.value = true;
-};
-
 const editFun = () => {
   isEdit.value = !isEdit.value;
   if (!isEdit.value) {
@@ -1340,20 +1314,6 @@ const resizeCanvas = () => {
   throttledRedraw();
 };
 
-const isCGQ = (type) => {
-  if (
-    type == 26 ||
-    type == 30 ||
-    type == 31 ||
-    type == 32 ||
-    type == 34 ||
-    type == 35
-  ) {
-    return true;
-  }
-  return false;
-};
-
 // 绘制tooltip（保持不变）
 const drawTooltip = () => { 
   if (!activeMarker.value || !activeMarker.value.target) return;
@@ -1492,17 +1452,9 @@ const draw = () => {
     if (SELECT_ACTION_TYPE.value && point.TypeId !== SELECT_ACTION_TYPE.value) {
       return;
     }
-    let status = getIconStatus(point.TypeId);
 
-    const size =
+    const size = pointSize.value * scale.value * 0.2;
-      point.DeviceId === selectedPointId.value || status
+    const iSize = iconSize.value * scale.value * 0.2;
-        ? pointSize.value * scale.value * 0.2
-        : pointSize.value * scale.value * 0.2;
-
-    const iSize =
-      point.DeviceId === selectedPointId.value || status
-        ? iconSize.value * scale.value * 0.2
-        : iconSize.value * scale.value * 0.2;
 
     ctx.value.beginPath();
     ctx.value.arc(
@@ -1548,7 +1500,7 @@ const draw = () => {
       }
     }
 
-    // 添加文字传感器数值（带圆角边框和半透明背景）
+    // 添加文字传感器数值（带圆角边框和半透明背景）当缩放倍率大于20时出现
     if (
       point.TypeName.includes("传感器") === true &&
       point.Data &&
@@ -1652,14 +1604,6 @@ const draw = () => {
     //   ctx.value.strokeStyle = window.customConfigUrl.faultColor;
     // } else if (point.target == "device" && point.IsFault) {
     //   ctx.value.strokeStyle = window.customConfigUrl.faultColor;
-    // } else if (
-    //   point.target == "device" &&
-    //   !isCGQ(point.TypeId) &&
-    //   point.TypeId != 66
-    // ) {
-    //   ctx.value.strokeStyle = window.customConfigUrl.closeColor;
-    //   ctx.value.lineWidth = 0.5;
-    //   ctx.value.stroke();
     // }
 
     ctx.value.shadowBlur = 0;