Merge branch 'dev'

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-export default {
+  export default {
     name: '',
     props: {
       show: {
@@ -73,14 +73,14 @@ export default {
         this.$emit('close')
       }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.dialog {
+  .dialog {
     /deep/.el-dialog {
       overflow: hidden;
-    background: url("~@/image/dialogBg.png") no-repeat !important;
+      // background: url("~@/image/dialogBg.png") no-repeat !important;
       background-size: 100% 100% !important;
     }
 
@@ -96,7 +96,7 @@ export default {
 
       .el-dialog__title:before {
         display: inline-block;
-      content: '';
+        content: "";
         width: 4px;
         height: 16px;
         background: #3aa3f8;
@@ -191,9 +191,9 @@ export default {
         border: none;
       }
 
-    .el-button+.el-button {
+      .el-button + .el-button {
         margin-left: 12px;
       }
     }
-}
+  }
 </style>

-/*
- * @Description: 
- * @Autor: renchao
- * @LastEditTime: 2023-03-23 14:47:38
- */
-let mixin = {
-
-  methods: {
-
-  }
-}
-export default mixin
\ No newline at end of file

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-06-08 10:48:43
+ * @LastEditTime: 2023-06-09 09:43:07
  */
 import Vue from 'vue'
 import axios from 'axios'
@@ -79,7 +79,7 @@ router.beforeEach(async (to, from, next) => {
         let path = JSON.parse(getMenuData[0].metadata)?.path + JSON.parse(getMenuData[0].children[0].metadata)?.path
         router.addRoutes([
           ...accessRoutes,
-          { path: "*", redirect: "/404", hidden: true },
+          { path: "*", redirect: "/404", hidden: true }
         ]);
         const routeTo = Cookies.get("routerTo");
         if (routeTo && routeTo !== "/") {

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-06-09 10:06:26
+-->
 <template>
   <div class="centercard">
     <div class="card1">
@@ -11,9 +16,9 @@
 </template>
 
 <script>
-import maps from "@/components/Echart/Map";
-import brokenline from "@/components/Echart/Brokenline";
-export default {
+  import maps from "@/components/Echart/Map";
+  import brokenline from "@/components/Echart/Brokenline";
+  export default {
     data () {
       return {};
     },
@@ -21,11 +26,11 @@ export default {
     mounted () { },
     beforeDestroy () { },
     methods: {},
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.centercard {
+  .centercard {
     width: 40%;
     height: calc(100vh - 114px);
     box-sizing: border-box;
@@ -35,7 +40,7 @@ export default {
 
     .card1 {
       width: 100%;
-    background: url("~@/image/mapcenter.png") no-repeat;
+      // background: url("~@/image/mapcenter.png") no-repeat;
       background-size: 100% 100%;
       position: relative;
       height: 64%;
@@ -57,7 +62,7 @@ export default {
 
     .card2 {
       width: 100%;
-    background: url("~@/image/sjqs.png") no-repeat;
+      // background: url("~@/image/sjqs.png") no-repeat;
       background-size: 100% 100%;
       position: relative;
       flex: 1;
@@ -81,5 +86,5 @@ export default {
         width: 100%;
       }
     }
-}
+  }
 </style>

 <!--
  * @Description  :工作台左侧
  * @Autor        : miaofang
- * @LastEditTime : 2023-05-17 15:23:32
+ * @LastEditTime: 2023-06-09 10:08:02
 -->
 <template>
   <div class="leftcard">
@@ -130,7 +130,7 @@
 
     .card {
       height: 22%;
-      background: url("~@/image/qxjr.png") no-repeat;
+      // background: url("~@/image/qxjr.png") no-repeat;
       background-size: 100% 100%;
       position: relative;
       text-align: center;
@@ -147,7 +147,7 @@
     }
 
     .card1 {
-      background: url("~@/image/sbtj.png") no-repeat;
+      // background: url("~@/image/sbtj.png") no-repeat;
       background-size: 100% 100%;
       position: relative;
       box-sizing: border-box;

 <!--
  * @Description  :工作台右侧
  * @Autor        : miaofang
- * @LastEditTime : 2023-05-17 15:22:56
+ * @LastEditTime: 2023-06-09 10:06:56
 -->
 <template>
   <div class="rightcard">
@@ -124,7 +124,7 @@
 
     .card1 {
       height: 33%;
-      background: url("~@/image/xjgyfwxx.png") no-repeat;
+      // background: url("~@/image/xjgyfwxx.png") no-repeat;
       background-size: 100% 100%;
 
       /deep/.dv-scroll-board {
@@ -155,7 +155,7 @@
 
     .card2 {
       height: 33%;
-      background: url("~@/image/djywl.png") no-repeat;
+      // background: url("~@/image/djywl.png") no-repeat;
       background-size: 100% 100%;
       padding: 0.3825rem 0 0 0;
       overflow: hidden;
@@ -164,7 +164,7 @@
     .card3 {
       height: 33%;
       flex: 1;
-      background: url("~@/image/djlxzl.png") no-repeat;
+      // background: url("~@/image/djlxzl.png") no-repeat;
       background-size: 100% 100%;
       padding-bottom: 0;