地图修改

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

@@ -889,6 +889,22 @@ body {
 
 }
 
+
+.p-message-card {
+  background: rgba($p-message-bg, .1);
+  border: 1rem solid rgba($p-border-color, .5);
+  border-radius: 6rem;
+  .p-message-card-title {
+    display: flex;
+    padding: $p-spacer-mini $p-spacer-large;
+    font-size: $p-font-small;
+    background-image: linear-gradient(to right, rgba($p-message-bg, .2), rgba($p-message-bg, 0));
+  }
+  .p-message-card-body {
+    padding: $p-spacer-mini $p-spacer-large;
+  }
+}
+
 /* 分页 */
 .p-pagination {
   input {

ruoyi-ui/src/utils/p-filter.js

@@ -90,12 +90,13 @@ const lightBlueLinear = {
 
 export const $echartsColor = [purpleLinear, orangeLinear, lightBlueLinear, yellowLinear, blueLinear]
 
-const red='#e8415d'
-const orange='#FF6600'
-const yellow='#E8cc41'
-const blue='#1890FF'
-const green='#3CA272'
-export const Colors={red:red,orange:orange,yellow:yellow,blue:blue,green:green}
+const red = '#e8415d'
+const orange = '#FF6600'
+const yellow = '#E8cc41'
+const blue = '#1890FF'
+const green = '#3CA272'
+export const Colors = {red: red, orange: orange, yellow: yellow, blue: blue, green: green}
+
 function getScreenRatio() {
   const screenWidth = document.body.clientWidth;
   const screenHeight = document.body.clientHeight;
@@ -108,10 +109,46 @@ function getScreenRatio() {
   }
 }
 
+const chinaGeoCoordMap = [
+  {name: '黑龙江省', value: [127.9688, 45.368]},
+  {name: '内蒙古自治区', value: [110.3467, 41.4899]},
+  {name: "吉林省", value: [125.8154, 44.2584]},
+  {name: '北京市', value: [116.4551, 40.2539]},
+  {name: "辽宁省", value: [123.1238, 42.1216]},
+  {name: "河北省", value: [114.4995, 38.1006]},
+  {name: "天津市", value: [117.4219, 39.4189]},
+  {name: "山西省", value: [112.3352, 37.9413]},
+  {name: "陕西省", value: [109.1162, 34.2004]},
+  {name: "甘肃省", value: [103.5901, 36.3043]},
+  {name: "宁夏回族自治区", value: [106.3586, 38.1775]},
+  {name: "青海省", value: [101.4038, 36.8207]},
+  {name: "新疆维吾尔自治区", value: [87.9236, 43.5883]},
+  {name: "西藏自治区", value: [91.11, 29.97]},
+  {name: "四川省", value: [103.9526, 30.7617]},
+  {name: "重庆市", value: [108.384366, 30.439702]},
+  {name: "山东省", value: [117.1582, 36.8701]},
+  {name: "河南省", value: [113.4668, 34.6234]},
+  {name: "江苏省", value: [118.8062, 31.9208]},
+  {name: "安徽省", value: [117.29, 32.0581]},
+  {name: "湖北省", value: [114.3896, 30.6628]},
+  {name: "浙江省", value: [119.5313, 29.8773]},
+  {name: "福建省", value: [119.4543, 25.9222]},
+  {name: "江西省", value: [116.0046, 28.6633]},
+  {name: "湖南省", value: [113.0823, 28.2568]},
+  {name: "贵州省", value: [106.6992, 26.7682]},
+  {name: "云南省", value: [102.9199, 25.4663]},
+  {name: "广东省", value: [113.12244, 23.009505]},
+  {name: "广西壮族自治区", value: [108.479, 23.1152]},
+  {name: "海南省", value: [110.3893, 19.8516]},
+  {name: '上海市', value: [121.4648, 31.2891]},
+  {name: '澳门', value: [113.54, 22.19]},
+  {name: '香港', value: [114.17, 22.32]},
+  {name: '台湾省', value: [121.01, 23.54]},
+]
 
 // 文字过滤
 function textFilter(value) {
-  if (value.length > 0 || value == null  || value == undefined) {
+  if (value.length > 0 || value == null || value == undefined) {
     return value;
   } else {
     return "--";
@@ -404,5 +441,6 @@ export default {
   sentimentStyle,
   flowStyle,
   stackStyle,
+  chinaGeoCoordMap
 };
 

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

@@ -16,14 +16,15 @@
       },
     },
     created () {
-      this.$nextTick(() => {
-        this.initCharts();
-      })
+      const that = this
+      setTimeout(function () {
+        that.initCharts();
+      }, 1000);
     },
     methods: {
       initCharts () {
         const charts = echarts.init(this.$refs["charts"]);
-
+console.log(this.propsData)
         const option = {
           grid:{
             top:0,
@@ -134,10 +135,7 @@
                 },
               },
               zlevel: 1,
-              data: [
-                { name: "西藏", value: [91.23, 29.5, 2333] },
-                { name: "黑龙江", value: [128.03, 47.01, 1007] },
-              ],
+              data: this.propsData,
             },
           ],
           visualMap: {

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

@@ -87,7 +87,13 @@
 
 <script>
 import {
-  getHotelPassengerFlow,getRoomType,getGenderRatio,getAgeRatio,getOvernightStayDuration,getOvernightTourists,getSourceCustomers
+  getHotelPassengerFlow,
+  getRoomType,
+  getGenderRatio,
+  getAgeRatio,
+  getOvernightStayDuration,
+  getOvernightTourists,
+  getSourceCustomers
 } from "@/api/picture/hotelcomprehensiveanalysis/hotelComprehensiveAnalysis";
 //引入 地图组件
 import MapChart from "@/views/dashboard/MapChart";
@@ -166,14 +172,20 @@ export default {
       }
       this.RoomTypeData.eChartOpts = pieOpts
       getRoomType().then(response => {
-        this.RoomTypeData.eChartData  = response.data
+        this.RoomTypeData.eChartData = response.data
       })
 
     },
     //获取 客源地分布 数据
     getVisitorSource() {
       getSourceCustomers(1).then(response => {
-        this.VisitorSourceData= response.data.seriesData
+        let VisitorSourceData = response.data.seriesData.map((item, index)=>{
+          let lat= this.$filter.chinaGeoCoordMap.filter((currentValue) => {
+            return currentValue.name == item.name;
+          });
+          return {name: item.name, value:[...lat[0].value,...item.value.split('')]}
+        });
+        this.VisitorSourceData =VisitorSourceData
         let VisitorSourceRank = response.data.seriesData.map(item => {
           return {name: item.name, value: item.percentage}
         })
@@ -193,7 +205,7 @@ export default {
       }
       this.VisitorPassnightData.eChartOpts = mixOpts
       getOvernightTourists().then(response => {
-        this.VisitorPassnightData.eChartData  = response.data
+        this.VisitorPassnightData.eChartData = response.data
 
       });
 
@@ -223,12 +235,13 @@ export default {
       }
       this.PassnightStopData.eChartOpts = barOpts
       getOvernightStayDuration().then(response => {
-        this.PassnightStopData.eChartData  = response.data
+        this.PassnightStopData.eChartData = response.data
       });
 
     },
   }
 }
+
 const HotelFlowData = {
   today: [{name: "入住数", value: "643"}, {name: "入住率", value: "874"}],
   otherTitle: ["入住数 (人次)", "入住房间数 (间)"],

ruoyi-ui/src/views/picture/public-sentiment/public-analysis.vue

@@ -3,12 +3,11 @@
   <div class="p-public-analysis p-message-list" v-if="propsData.length>0">
     <el-row :gutter="20">
       <el-col :span="6" v-for="(item,index) in propsData" :key="index" class="p-message-item">
-        <div class="p-message-box">
-          <div class="p-message-title align-center">{{ item.name }}</div>
-          <div class="p-message-body align-center">
-
+        <div class="p-message-card m-b-small">
+          <div class="p-message-card-title align-center">{{ item.name }}</div>
+          <div class="p-message-card-body align-center">
             <div class="p-public-analysis-num">{{ item.value }}</div>
-            <div class="p-public-analysis-bot display-flex m-b-large">
+            <div class="p-public-analysis-bot display-flex">
               <div class="col-6 good">正面<span class="num m-l-mini">{{ item.front }}</span></div>
               <div class="col-6 bad">负面<span class="num m-l-mini">{{ item.negative }}</span></div>
             </div>

ruoyi-ui/src/views/picture/ticket-revenue/index.vue

@@ -289,7 +289,7 @@ export default {
     getTicketIncome() {
       let mixOpts = {
         type: 'mix',
-        grid: [30, 0, 30, 30],
+        grid: [30, 0, 30, 40],
         unit: '单位：个',
         seriesType: ['bar', 'bar', 'line'],
         extra: {