前台页面修改

ruoyi-ui/src/assets/styles/picture-common.scss

@@ -800,9 +800,38 @@ body {
 
 .p-dialog {
   .el-dialog {
+    display: flex;
+    flex-direction: column;
+    margin: 0 !important;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    border-radius: $p-radius-mini;
+    max-height: 90vh;
     background: $p-dark-bg;
   }
 
+  .el-dialog:before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 0;
+    height: 100%;
+    width: 3rem;
+    background: linear-gradient(to bottom, rgba($p-secondary-color, .0) 0, rgba($p-secondary-color, 1) 50%, rgba($p-secondary-color, 0) 100%);
+  }
+
+  .el-dialog:after {
+    content: "";
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    width: 3rem;
+    background: linear-gradient(to bottom, rgba($p-secondary-color, .0) 0, rgba($p-secondary-color, 1) 50%, rgba($p-secondary-color, 0) 100%);
+  }
+
   .el-dialog__header {
     position: relative;
     padding-left: 50rem;
@@ -820,6 +849,16 @@ body {
   }
 
   .el-dialog__header:before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 3rem;
+    background: linear-gradient(to right, rgba($p-secondary-color, .0) 0, rgba($p-secondary-color, 1) 50%, rgba($p-secondary-color, 0) 100%);
+  }
+
+  .el-dialog__title:after {
     content: "";
     position: absolute;
     left: 20rem;
@@ -832,6 +871,16 @@ body {
     background-repeat: no-repeat;
   }
 
+  .el-dialog__body:before {
+    content: "";
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 3rem;
+    background: linear-gradient(to right, rgba($p-secondary-color, .0) 0, rgba($p-secondary-color, 1) 50%, rgba($p-secondary-color, 0) 100%);
+  }
+
   .el-dialog__body {
     padding: $p-spacer-medium;
   }
@@ -854,6 +903,7 @@ body {
   .el-dialog__headerbtn:hover {
     opacity: 1;
   }
+
 }
 
 /* 分页 */

ruoyi-ui/src/views/dashboard/MapChart.vue

@@ -23,6 +23,7 @@
     methods: {
       initCharts () {
         const charts = echarts.init(this.$refs["charts"]);
+
         const option = {
           grid:{
             top:0,

ruoyi-ui/src/views/dashboard/rankChart.vue

@@ -28,7 +28,8 @@ export default {
     },
     propsData: {
       type: Object,
-      default: () => {}
+      default: () => {
+      }
     },
   },
   data() {
@@ -37,9 +38,10 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
+    const that = this
+    setTimeout(function () {
+      that.initChart()
+    }, 1000);
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -102,7 +104,7 @@ export default {
             label: {
               position: 'right',
               show: true,
-              color:"#fff",
+              color: "#fff",
               formatter: function (params) {
                 return params.data.value + '%';
               },

ruoyi-ui/src/views/picture/hotel-analysis/index.vue

@@ -122,8 +122,8 @@ export default {
       //房间类型分析 数据
       RoomTypeData: {eChartOpts: {}, eChartData: {}},
       //客源地分布 数据
-      VisitorSourceData: {},
-      VisitorSourceRank: [],
+      VisitorSourceData: [],
+      VisitorSourceRank: {},
       //过夜游客分析 数据
       VisitorPassnightData: {eChartOpts: {}, eChartData: {}},
       //性别占比 数据
@@ -173,16 +173,12 @@ export default {
     //获取 客源地分布 数据
     getVisitorSource() {
       getSourceCustomers(1).then(response => {
-
+        this.VisitorSourceData= response.data.seriesData
         let VisitorSourceRank = response.data.seriesData.map(item => {
           return {name: item.name, value: item.percentage}
         })
         this.VisitorSourceRank = {name: '排行', seriesData: VisitorSourceRank}
-        this.VisitorSourceData = sourceData.seriesData.map(item => {
-          return {name: item.name, value: item.value}
-        })
       });
-
     },
     //获取 过夜游客分析 数据
     getVisitorPassnight() {