Merge branch 'dev'

@@ -10,190 +10,190 @@
 </template>
 
 <script>
-export default {
-  name: '',
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    customClass: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: '新增'
-    },
-    appendToBody: {
-      // Dialog 自身是否插入至 body 元素上。嵌套的 Dialog 必须指定该属性并赋值为 true
-      type: Boolean,
-      default: true
-    },
-    modalAppendToBody: {
-      // 遮罩层是否插入至 body 元素上，若为 false，则遮罩层会插入至 Dialog 的父元素上
-      type: Boolean,
-      default: true
-    },
-    modal: {
-      // 是否需要遮罩层
-      type: Boolean,
-      default: true
+  export default {
+    name: '',
+    props: {
+      show: {
+        type: Boolean,
+        default: false
+      },
+      customClass: {
+        type: String,
+        default: ''
+      },
+      title: {
+        type: String,
+        default: '新增'
+      },
+      appendToBody: {
+        // Dialog 自身是否插入至 body 元素上。嵌套的 Dialog 必须指定该属性并赋值为 true
+        type: Boolean,
+        default: true
+      },
+      modalAppendToBody: {
+        // 遮罩层是否插入至 body 元素上，若为 false，则遮罩层会插入至 Dialog 的父元素上
+        type: Boolean,
+        default: true
+      },
+      modal: {
+        // 是否需要遮罩层
+        type: Boolean,
+        default: true
+      },
+      fullscreen: {
+        // 是否全屏
+        type: Boolean,
+        default: false
+      },
+      destroyOnClose: {
+        // 关闭时销毁 Dialog 中的元素
+        type: Boolean,
+        default: false
+      },
+      width: {
+        type: String,
+        default: '30%'
+      }
     },
-    fullscreen: {
-      // 是否全屏
-      type: Boolean,
-      default: false
+    data () {
+      return {}
     },
-    destroyOnClose: {
-      // 关闭时销毁 Dialog 中的元素
-      type: Boolean,
-      default: false
+    computed: {
+      visible: {
+        get () {
+          return this.show
+        },
+        set (val) {
+          this.$emit('update:show', val) // visible 改变的时候通知父组件
+        }
+      }
     },
-    width: {
-      type: String,
-      default: '30%'
-    }
-  },
-  data () {
-    return {}
-  },
-  computed: {
-    visible: {
-      get () {
-        return this.show
-      },
-      set (val) {
-        this.$emit('update:show', val) // visible 改变的时候通知父组件
+    methods: {
+      close () {
+        this.$emit('close')
       }
     }
-  },
-  methods: {
-    close () {
-      this.$emit('close')
-    }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  /deep/.el-dialog {
-    overflow: hidden;
-    background: url("~@/image/dialogBg.png") no-repeat !important;
-    background-size: 100% 100% !important;
-  }
-
-  .el-dialog__header {
-    padding: 0;
-    height: 56px;
-    line-height: 56px;
-    border-bottom: none;
-
-    .el-dialog__title {
-      font-weight: 400;
+  .dialog {
+    /deep/.el-dialog {
+      overflow: hidden;
+      // background: url("~@/image/dialogBg.png") no-repeat !important;
+      background-size: 100% 100% !important;
     }
 
-    .el-dialog__title:before {
-      display: inline-block;
-      content: '';
-      width: 4px;
-      height: 16px;
-      background: #3aa3f8;
-      margin-left: 12px;
-      margin-right: 8px;
-      position: relative;
-      top: 2px;
-    }
+    .el-dialog__header {
+      padding: 0;
+      height: 56px;
+      line-height: 56px;
+      border-bottom: none;
 
-    .el-dialog__headerbtn {
-      position: absolute;
-      // top: 2%;
-      right: 12px;
-    }
-  }
+      .el-dialog__title {
+        font-weight: 400;
+      }
 
-  .el-dialog__body {
-    margin: 0px 12px;
-    padding: 48px 24px;
-    background: #fff;
-    border: 1px solid #dfe7f3;
+      .el-dialog__title:before {
+        display: inline-block;
+        content: "";
+        width: 4px;
+        height: 16px;
+        background: #3aa3f8;
+        margin-left: 12px;
+        margin-right: 8px;
+        position: relative;
+        top: 2px;
+      }
 
-    .el-button {
-      padding: 8px 16px;
-      border: none;
+      .el-dialog__headerbtn {
+        position: absolute;
+        // top: 2%;
+        right: 12px;
+      }
     }
 
-    .el-form {
-      .el-checkbox {
-        line-height: 32px;
-        height: 32px;
-      }
+    .el-dialog__body {
+      margin: 0px 12px;
+      padding: 48px 24px;
+      background: #fff;
+      border: 1px solid #dfe7f3;
 
-      .form-item-mb0 {
-        margin-bottom: 0 !important;
+      .el-button {
+        padding: 8px 16px;
+        border: none;
       }
 
-      .el-form-item {
-        margin-bottom: 24px;
-
-        .el-form-item__label {
-          height: 32px;
+      .el-form {
+        .el-checkbox {
           line-height: 32px;
-          vertical-align: middle;
+          height: 32px;
         }
 
-        .el-form-item__content {
-          line-height: 32px;
+        .form-item-mb0 {
+          margin-bottom: 0 !important;
+        }
 
-          // date 组件有图标
-          .has-icon.el-date-editor {
-            .el-input__inner {
-              padding-left: 32px;
-            }
-          }
+        .el-form-item {
+          margin-bottom: 24px;
 
-          .el-input__inner {
-            padding: 0 8px;
+          .el-form-item__label {
             height: 32px;
             line-height: 32px;
-            text-align: left;
+            vertical-align: middle;
           }
 
-          .el-textarea__inner {
-            padding: 8px 8px;
-          }
+          .el-form-item__content {
+            line-height: 32px;
 
-          .el-input .el-input__icon {
-            font-size: 14px;
-            color: #747e8c;
+            // date 组件有图标
+            .has-icon.el-date-editor {
+              .el-input__inner {
+                padding-left: 32px;
+              }
+            }
+
+            .el-input__inner {
+              padding: 0 8px;
+              height: 32px;
+              line-height: 32px;
+              text-align: left;
+            }
+
+            .el-textarea__inner {
+              padding: 8px 8px;
+            }
+
+            .el-input .el-input__icon {
+              font-size: 14px;
+              color: #747e8c;
+            }
           }
         }
       }
-    }
 
-    .el-select,
-    .el-cascader,
-    .el-date-editor {
-      width: 100%;
-      line-height: 32px;
+      .el-select,
+      .el-cascader,
+      .el-date-editor {
+        width: 100%;
+        line-height: 32px;
+      }
     }
-  }
 
-  .el-dialog__footer {
-    padding: 0 12px;
-    height: 56px;
-    line-height: 56px;
-    border: none;
-
-    .el-button {
-      padding: 8px 16px;
+    .el-dialog__footer {
+      padding: 0 12px;
+      height: 56px;
+      line-height: 56px;
       border: none;
-    }
 
-    .el-button+.el-button {
-      margin-left: 12px;
+      .el-button {
+        padding: 8px 16px;
+        border: none;
+      }
+
+      .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,75 +16,75 @@
 </template>
 
 <script>
-import maps from "@/components/Echart/Map";
-import brokenline from "@/components/Echart/Brokenline";
-export default {
-  data () {
-    return {};
-  },
-  components: { maps, brokenline },
-  mounted () { },
-  beforeDestroy () { },
-  methods: {},
-};
+  import maps from "@/components/Echart/Map";
+  import brokenline from "@/components/Echart/Brokenline";
+  export default {
+    data () {
+      return {};
+    },
+    components: { maps, brokenline },
+    mounted () { },
+    beforeDestroy () { },
+    methods: {},
+  };
 </script>
 
 <style lang="scss" scoped>
-.centercard {
-  width: 40%;
-  height: calc(100vh - 114px);
-  box-sizing: border-box;
-  padding: 0 0.0521rem;
-  display: flex;
-  flex-direction: column;
+  .centercard {
+    width: 40%;
+    height: calc(100vh - 114px);
+    box-sizing: border-box;
+    padding: 0 0.0521rem;
+    display: flex;
+    flex-direction: column;
 
-  .card1 {
-    width: 100%;
-    background: url("~@/image/mapcenter.png") no-repeat;
-    background-size: 100% 100%;
-    position: relative;
-    height: 64%;
+    .card1 {
+      width: 100%;
+      // background: url("~@/image/mapcenter.png") no-repeat;
+      background-size: 100% 100%;
+      position: relative;
+      height: 64%;
 
-    .title {
-      position: absolute;
-      font-weight: bold;
-      color: #02d9fd;
-      line-height: 0.1354rem;
-      font-size: 0.1146rem;
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0.0365rem;
-      text-align: right;
-      padding-right: 15%;
+      .title {
+        position: absolute;
+        font-weight: bold;
+        color: #02d9fd;
+        line-height: 0.1354rem;
+        font-size: 0.1146rem;
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0.0365rem;
+        text-align: right;
+        padding-right: 15%;
+      }
     }
-  }
 
-  .card2 {
-    width: 100%;
-    background: url("~@/image/sjqs.png") no-repeat;
-    background-size: 100% 100%;
-    position: relative;
-    flex: 1;
+    .card2 {
+      width: 100%;
+      // background: url("~@/image/sjqs.png") no-repeat;
+      background-size: 100% 100%;
+      position: relative;
+      flex: 1;
 
-    .title {
-      position: absolute;
-      font-weight: bold;
-      color: #02d9fd;
-      line-height: 0.1354rem;
-      font-size: 0.1146rem;
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0.0365rem;
-      text-align: center;
-      margin-bottom: 0.0521rem;
-    }
+      .title {
+        position: absolute;
+        font-weight: bold;
+        color: #02d9fd;
+        line-height: 0.1354rem;
+        font-size: 0.1146rem;
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0.0365rem;
+        text-align: center;
+        margin-bottom: 0.0521rem;
+      }
 
-    .brokenline {
-      margin: auto;
-      width: 100%;
+      .brokenline {
+        margin: auto;
+        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;