地图修改

2 years ago · e5d115c5df
parent 2f4b86c4ae
commit e5d115c5df
10 changed files with 33 additions and 44 deletions
--- a/ruoyi-ui/src/utils/p-filter.js
+++ b/ruoyi-ui/src/utils/p-filter.js
@ -4,7 +4,7 @@ export const $ratio = getScreenRatio();
 function getScreenRatio() {
  const screenWidth = document.body.clientWidth;
  const screenHeight = document.body.clientHeight;
-  if (screenWidth <= 1920) {
+  if (screenWidth <= 4000) {
    document.querySelector("html").className = "p-font-rule";
    return 1;
  } else {
--- a/ruoyi-ui/src/views/components/p-eCharts/BaseEcharts1.vue
+++ b/ruoyi-ui/src/views/components/p-eCharts/BaseEcharts1.vue
@ -17,8 +17,6 @@ export default {
      default: () => {
      },
    },
-  },mounted() {
-    console.log('ads',this.propsData)
-  }
+  },
 }
 </script>
--- a/ruoyi-ui/src/views/picture/car-park/index.vue
+++ b/ruoyi-ui/src/views/picture/car-park/index.vue
@ -242,7 +242,6 @@ export default {
      timePeriodTrafficFlowTrend().then(response => {
        this.CarFlowTrendData.eChartData = response.data
      });
-
    },
  }
 }
--- a/ruoyi-ui/src/views/picture/division-order/index.vue
+++ b/ruoyi-ui/src/views/picture/division-order/index.vue
@ -29,7 +29,7 @@
              <base-card-body>
                <el-row :gutter="20" class="height-full">
                  <el-col :span="12" class="height-full">
-                    <map-chart id="map" :propsData="VisitorSourceData"></map-chart>
+                    <map-chart id="map" :opts="VisitorSourceOpts" :propsData="VisitorSourceData"></map-chart>
                  </el-col>
                  <el-col :span="12" class="height-full">
                    <rank-chart :propsData="VisitorSourceRank"></rank-chart>
@ -106,6 +106,7 @@ export default {
      //性别占比 数据
      SexRatioData:  {'man': '', 'woman': ''},
      //客源地分布 数据
+      VisitorSourceOpts: {},
      VisitorSourceData: [],
      VisitorSourceRank: {},
      //分时段预约趋势 数据
@ -152,11 +153,10 @@ export default {

    //获得 客源地分布 数据
    getVisitorSource() {
-      let Opts = {
-        type: 'map',
-        unit:'个',
-        grid: [0, 0, 0, 0],
+      let Opts={
+        layoutSize:'120%'
      }
+      this.VisitorSourceOpts=Opts
      getProvinceTop10().then(response => {
        //获取地图数据
        let VisitorSourceData = response.data.map((item, index) => {
--- a/ruoyi-ui/src/views/picture/hotel-analysis/index.vue
+++ b/ruoyi-ui/src/views/picture/hotel-analysis/index.vue
@ -38,7 +38,7 @@
            <base-module-card cardTitle="客源地分布" cardType="small">
              <el-row :gutter="20" class="height-full">
                <el-col :span="12" class="height-full">
-                  <map-chart id="map" :propsData="VisitorSourceData"></map-chart>
+                  <map-chart id="map" :opts="VisitorSourceOpts" :propsData="VisitorSourceData"></map-chart>
                </el-col>
                <el-col :span="12" class="height-full">
                  <rank-chart :propsData="VisitorSourceRank"></rank-chart>
@ -129,6 +129,7 @@ export default {
      //房间类型分析 数据
      RoomTypeData: {eChartOpts: {}, eChartData: {}},
      //客源地分布 数据
+      VisitorSourceOpts:{},
      VisitorSourceData: [],
      VisitorSourceRank: {},
      //过夜游客分析 数据
@ -190,6 +191,10 @@ export default {
    },
    //获取 客源地分布 数据
    getVisitorSource() {
+      let Opts={
+        layoutSize:'120%'
+      }
+      this.VisitorSourceOpts=Opts
      getSourceCustomers(1).then(response => {
        //获取地图数据
        let VisitorSourceData = response.data.seriesData.map((item, index) => {
--- a/ruoyi-ui/src/views/picture/scenic-flow/index.vue
+++ b/ruoyi-ui/src/views/picture/scenic-flow/index.vue
@ -120,13 +120,7 @@ export default {
      FlowYearData: {eChartOpts: {}, eChartData: {}},
      //区域客流监测 数据
      FlowAreaData: {
-        tableHead: {th1: "饱和度", th2: "区域名称", th3: "客流量", th4: "最大承载量"},
-        tableBody: [
-          {td1: '', td2: '', td3: '', td4: ''},
-          {td1: '', td2: '', td3: '', td4: ''},
-          {td1: '', td2: '', td3: '', td4: ''},
-          {td1: '', td2: '', td3: '', td4: ''},
-        ]
+        tableBody: []
      },
      //按日客流分析 数据
      FlowTodayData: {eChartOpts: {}, eChartData: {}},
@ -135,14 +129,7 @@ export default {
      TodayData: '',
      //客流同环比分析 数据
      FlowRingData: {
-        tableHead: {th1: "饱和度", th2: "本期人次", th3: "去年同期", th4: "人次同比", th5: "人次环比"},
-        tableBody: [
-          {td1: '今日数据', td2: '', td3: '', td4: '', td5: ''},
-          {td1: '昨日数据', td2: '', td3: '', td4: '', td5: ''},
-          {td1: '本周累计', td2: '', td3: '', td4: '', td5: ''},
-          {td1: '本月累计', td2: '', td3: '', td4: '', td5: ''},
-          {td1: '本年累计', td2: '', td3: '', td4: '', td5: ''},
-        ]
+        tableBody: []
      },
      //按月客流分析 数据
      FlowMoonData: {eChartOpts: {}, eChartData: {}},
@ -264,7 +251,7 @@ export default {
    //获取 客流同环比分析 数据
    getFlowRing() {
      getFlowRatio().then(response => {
-        this.FlowRingData.tableBody = response.data
+        this.FlowRingData= response.data
      });
    },

--- a/ruoyi-ui/src/views/picture/scenic-flow/scenic-area.vue
+++ b/ruoyi-ui/src/views/picture/scenic-flow/scenic-area.vue
@ -3,10 +3,10 @@
  <div class="p-small-table m-t-small">
    <div class="p-small-table-head">
      <div class="p-small-table-tr">
-        <div class="th col-2 text-center">{{ propsData.tableHead.th1 }}</div>
-        <div class="th flex-auto">{{ propsData.tableHead.th2 }}</div>
-        <div class="th col-2 text-center">{{ propsData.tableHead.th3 }}</div>
-        <div class="th col-2 text-center">{{ propsData.tableHead.th4 }}</div>
+        <div class="th col-2 text-center">饱和度</div>
+        <div class="th flex-auto">区域名称</div>
+        <div class="th col-2 text-center">客流量</div>
+        <div class="th col-2 text-center">最大承载量</div>
      </div>
    </div>
    <div class="p-small-table-body">
--- a/ruoyi-ui/src/views/picture/scenic-flow/scenic-ring.vue
+++ b/ruoyi-ui/src/views/picture/scenic-flow/scenic-ring.vue
@ -3,15 +3,15 @@
  <div class="p-small-table m-t-small">
    <div class="p-small-table-head">
      <div class="p-small-table-tr">
-        <div class="th col-2 text-center"><span v-if="tableData.tableHead.th1==null">{{ tableData.tableHead.th1 }}</span></div>
-        <div class="th col-2 text-center">{{ tableData.tableHead.th2 }}</div>
-        <div class="th col-2 text-center">{{ tableData.tableHead.th3 }}</div>
-        <div class="th col-2 text-center">{{ tableData.tableHead.th4 }}</div>
-        <div class="th col-4 text-center">{{ tableData.tableHead.th5}}</div>
+        <div class="th col-2 text-center"></div>
+        <div class="th col-2 text-center">本期人次</div>
+        <div class="th col-2 text-center">去年同期</div>
+        <div class="th col-2 text-center">人次同比</div>
+        <div class="th col-4 text-center">人次环比</div>
      </div>
    </div>
    <div class="p-small-table-body">
-      <div class="p-small-table-tr" v-for="(item,index) in tableData.tableBody" :key="index" v-if="tableData.tableBody.length>0">
+      <div class="p-small-table-tr" v-for="(item,index) in tableData" :key="index" v-if="tableData.length>0">
        <div class="td col-2 num text-center">{{  $filter.textFilter(item.name)}}</div>
        <div class="td col-2 num text-center">{{ $filter.textFilter(item.sameTime) }}</div>
        <div class="td col-2 num text-center">{{ $filter.textFilter(item.lastYear) }}</div>
--- a/ruoyi-ui/src/views/picture/visitor-portrait/index.vue
+++ b/ruoyi-ui/src/views/picture/visitor-portrait/index.vue
@ -15,7 +15,7 @@
              <base-card-body>
                <el-row :gutter="20" class="height-full">
                  <el-col :span="12" class="height-full">
-                    <map-chart id="map" :propsData="VisitorSourceData"></map-chart>
+                    <map-chart id="map" :opts="VisitorSourceOpts" :propsData="VisitorSourceData"></map-chart>
                  </el-col>
                  <el-col :span="12" class="height-full">
                    <rank-chart :propsData="VisitorSourceRank"></rank-chart>
@ -103,6 +103,7 @@ export default {
  data() {
    return {
      //客源地分布 数据
+      VisitorSourceOpts:{},
      VisitorSourceData: [],
      VisitorSourceRank: {},
      //游客画像 数据
@ -139,11 +140,10 @@ export default {
    //获取 客源地分布 数据
    getVisitorSource() {
      getProvinceTop10().then(response => {
-        let Opts = {
-          type: 'map',
-          unit:'个',
-          grid: [0, 0, 0, 0],
+        let Opts={
+          layoutSize:'120%'
        }
+        this.VisitorSourceOpts=Opts
        //获取地图数据
        let VisitorSourceData = response.data.seriesData.map((item, index) => {
          let lat = this.$filter.chinaGeoCoordMap.filter((currentValue) => {
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@ -35,8 +35,8 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
-        // target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
+        //target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
+         target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
        // target: `http://192.168.130.102:8080/`,//用户名:admin 密码Cjy@123abc
        changeOrigin: true,
        pathRewrite: {