Parcourir la source

华电部署报告添加3D图

liujiejie il y a 2 semaines
Parent
commit
6d85d2d5eb

+ 2 - 2
downLoadServer/src/server/utils/chartsCom/BoxLineCharts.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2025-05-12 17:40:10
- * @LastEditTime: 2025-07-10 13:45:58
+ * @LastEditTime: 2025-07-10 13:51:46
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /downLoadServer/src/server/utils/chartsCom/BoxLineCharts.js
@@ -234,5 +234,5 @@ const isInDateRange = (timestamp) => {
   const date = new Date(timestamp);
   return date >= new Date(startDate) && date <= new Date(endDate);
 };
-//5500+3000+2700=11200+
+
 // ... existing code ...

+ 2 - 2
src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
               ),
           },
           {

+ 9 - 11
src/views/admin/cockpitManage/HD.vue

@@ -4,7 +4,6 @@
     <bottom-data :maplistArr="maplistArr" :defaultdata="defaultdata" />
     <div class="zuobian">
       <selecttree
-
         placeholder="请选择所属公司"
         :list="parentOpt"
         type="1"
@@ -220,16 +219,15 @@ bottom-data {
   top: 30px;
   left: 10px;
 }
-
-
-
 @media screen and (max-width: 1650px) {
-.zuobian {
-  width: 150px;
-  position: absolute;
-  top: 10px;
-  left: 10px;
+  .zuobian {
+    width: 150px;
+    position: absolute;
+    top: 10px;
+    left: 10px;
+  }
+  .map-ditu {
+    height: calc(100vh - 60px);
+  }
 }
-}
-
 </style>

+ 1 - 1
src/views/home/Index.vue

@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       loading: false,
-      isShowHd: true, //true 则展示华电的菜单样式,false 则展示默认的左侧边栏菜单
+      isShowHd: false, //true 则展示华电的菜单样式,false 则展示默认的左侧边栏菜单
     };
   },
   methods: {

+ 13 - 15
src/views/home/components/MenuHD.vue

@@ -244,14 +244,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep.menuParentItem .el-submenu__title{
+::v-deep.menuParentItem .el-submenu__title {
   background: #eff1f300 !important;
   color: #fff !important;
 }
 :v-deep.menuParentItem .el-submenu__title:hover {
   color: #eee !important;
 }
-::v-deep .menuParentItem{
+::v-deep .menuParentItem {
   background-image: url("../../../assets/head-tab.png") !important;
   background-repeat: no-repeat !important;
   background-position: center !important;
@@ -268,12 +268,12 @@ export default {
 ::v-deep.el-menu {
   background-color: #eff1f300 !important;
 }
-::v-deep.hdMenuTitle{
+::v-deep.hdMenuTitle {
   background-color: transparent !important;
   padding: 0px !important;
 }
 
-::v-deep.titles{
+::v-deep.titles {
   width: 100% !important;
   // background-image: url("../../../assets/headerBorder.png") !important;
   background-size: 35%, 100% !important;
@@ -374,7 +374,6 @@ export default {
   color: #ffffff !important;
 }
 
-
 // 默认样式(大屏)
 ::v-deep .menuParentItem {
   width: 160px !important;
@@ -401,18 +400,17 @@ export default {
   }
 }
 
-
 // 非华电公司放开这个注释下面的
-// .el-submenu__title * {
-//   font-size: 16px;
-// }
-// .el-menu-item * {
-//   font-size: 16px;
-// }
+.el-submenu__title * {
+  font-size: 16px;
+}
+.el-menu-item * {
+  font-size: 16px;
+}
 </style>
 
- <!-- /* 华电时的菜单打开这个 */ -->
- <style lang="scss">
+<!-- /* 华电时的菜单打开这个 */ -->
+<!-- <style lang="scss">
 .el-menu--popup {
   width: 100% !important;
   min-width: 120px !important;
@@ -429,4 +427,4 @@ export default {
 .el-menu-item * {
   font-size: 20px;
 }
-</style> 
+</style>  -->