前端页面

ruoyi-ui/src/api/picture/car-park/carPark.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function vehicleStatistics() {
   return request({
     url: 'carParkDataAnalyze/vehicleStatistics',
-    method: 'get'
+    method: 'get',
   })
 }
 

ruoyi-ui/src/api/picture/scenic-monitor/scenicMonitor.js

@@ -9,17 +9,19 @@ export function getWorkingPersonnel() {
 }
 
 //实时
-export function getMonitoringFlowStat() {
+export function getMonitoringFlowStat(params) {
   return request({
     url: '/scenic/flow/monitoringFlowStat',
-    method: 'get'
+    method: 'get',
+    params:params
   })
 }
 
 //客流地排行
-export function getSelectTouristSource() {
+export function getSelectTouristSource(params) {
   return request({
     url: '/tourists/selectTouristSource',
-    method: 'get'
+    method: 'get',
+    params:params
   })
 }

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

@@ -415,8 +415,6 @@ function getMonth(monthNum, num) {
   return y + '-' + m;
 }
 
-
-
 // 获取输入日期的前三月
 export function getMonths (num) {
   let date = new Date();

ruoyi-ui/src/views/components/p-dict/BaseDict.vue

@@ -0,0 +1,49 @@
+<template>
+  <span>
+    <template v-for="(item, index) in options">
+      <template v-if="values[index]==index">
+        {{ item.label }}
+      </template>
+    </template>
+  </span>
+</template>
+
+<script>
+export default {
+  name: "BaseDict",
+  props: {
+    options: {
+      type: Array,
+      default: null,
+    },
+    value: [Number, String, Array],
+  },
+  data() {
+    return {
+      status: false
+    }
+  },
+  computed: {
+    values() {
+      let length = this.options.length
+      if (this.value !== null && typeof this.value !== 'undefined') {
+        return this.options.map((item, index) => {
+          let array = item.value.split('-')
+          if (parseFloat(array[0]) <= parseFloat(this.value) && parseFloat(this.value) < parseFloat(array[1])) {
+            return index
+          }else if (1 <= parseFloat(this.value)) {
+            return length-1
+          }
+        });
+      }  else {
+        return '';
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>

ruoyi-ui/src/views/components/p-flow/BaseFlow.vue

@@ -16,7 +16,7 @@
         </div>
       </div>
     </div>
-    <BaseSaturation type="car" :startText="$filter.dictsArea(flowData.saturatio.percentage,dict.type.comfort_match)"
+    <BaseSaturation type="car"
                     endText="预警值" :endValue="String(flowData.alarm)" :percentage="flowData.saturatio.percentage"></BaseSaturation>
   </div>
 </template>

ruoyi-ui/src/views/components/p-saturation/BaseSaturation.vue

@@ -4,7 +4,10 @@
     <div class="p-flow-saturation-top display-flex display-center">
       <span class="p-flow-saturation-level"></span>
       <div class="m-l-mini flex-auto display-flex"><i class="iconfont m-r-mini" :class="'icon-'+ getTypeClass(type)"></i>
-        <div class="p-flow-saturation-text">{{ startText }}</div>
+        <div class="p-flow-saturation-text">
+          <base-dict :options="dict.type.comfort_match" :value='percentage' v-if="type=='car'" />
+          <base-dict :options="dict.type.comfort_match" :value='percentage'  v-if="type=='flow'"/>
+        </div>
       </div>
       <div class="p-flow-saturation-tip">{{ endText }}：<span class="num">{{ endValue }}</span>
       </div>
@@ -19,7 +22,10 @@
 </template>
 
 <script>
+import BaseDict from "@/views/components/p-dict/BaseDict";
 export default {
+  dicts: ['comfort_match','passenger_comfort'],
+  components:{BaseDict},
   name: "BaseSaturation",
   props: {
     startText: {

ruoyi-ui/src/views/picture/car-park/car-flow.vue

@@ -16,7 +16,7 @@
         </div>
       </div>
     </div>
-    <BaseSaturation type="car" :startText="$filter.dictsArea(flowData.saturatio.percentage,dict.type.comfort_match)"
+    <BaseSaturation type="car"
                     endText="预警值" :endValue="String(flowData.alarm)" :percentage="flowData.saturatio.percentage"></BaseSaturation>
   </div>
 </template>
@@ -26,7 +26,6 @@
 import BaseSaturation from "@/views/components/p-saturation/BaseSaturation";
 
 export default {
-  dicts: ['comfort_match'],
   name: "car-flow",
   components: {BaseSaturation},
   props: {

ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/tour-detail.vue

@@ -479,6 +479,7 @@ export default {
     }
   },
   created() {
+    console.log('detailData',this.detailData)
     this.getAreaData1()
     this.getAreaData2()
     this.pieEcharts()

ruoyi-ui/src/views/picture/scenic-flow/index.vue

@@ -266,7 +266,7 @@ export default {
     //获取 客流同环比分析 数据
     getFlowRing() {
       getFlowRatio().then(response => {
-        this.FlowRingData = response.data
+        this.FlowRingData.tableBody = response.data
       });
     },
 

ruoyi-ui/src/views/picture/scenic-flow/scenic-time.vue

@@ -10,9 +10,8 @@
         </div>
       </div>
     </div>
-    <BaseSaturation type="flow" :startText="$filter.dictsArea(flowData.ratio, dict.type.comfort_match)"
-                    endText="最大承载量" :endValue="flowData.maxLoad"
-                    :percentage="flowData.ratio"></BaseSaturation>
+    <BaseSaturation type="flow"
+                    endText="最大承载量" :endValue="flowData.maxLoad" :percentage="flowData.ratio"></BaseSaturation>
   </div>
 </template>
 
@@ -22,7 +21,7 @@ import BaseSaturation from "@/views/components/p-saturation/BaseSaturation";
 import baseNumBox from "@/views/components/p-num-box/BaseNumBox";
 
 export default {
-  dicts: ['comfort_match'],
+  dicts: ['passenger_comfort'],
   name: "scenic-time",
   components: {baseNumBox, BaseSaturation},
   props: {
@@ -40,7 +39,6 @@ export default {
   watch: {
     propsData(val) {
       this.flowData = val
-      console.log(this.flowData)
     }
   },
 

ruoyi-ui/src/views/picture/scenic-monitor/index.vue

@@ -3,8 +3,10 @@
   <div class="p-pages-box p-pages-bg">
     <!-- 页面头部 -->
     <base-header title="景区综合监测"></base-header>
+    <div class="p-pages-filter">筛选</div>
     <!-- 页面主体 -->
     <div class="p-pages-main p-container">
+
       <el-row :gutter="20">
 
         <el-col :span="6">
@@ -75,6 +77,7 @@
 </template>
 
 <script>
+import { getScenicList} from "@/api/tour/tour"
 //引入 数据显示 组件
 import baseDataIcon from "@/views/components/p-data/BaseDataIcon";
 //引入 排行榜 组件
@@ -119,6 +122,8 @@ export default {
   },
   data() {
     return {
+      cityOptions: [],
+      cityValue:'',
       //今日天气 数据
       TodayWeatherData: {
         temperature: '', weather: '', humidity: '', windForce: '', windDirection: ''
@@ -155,6 +160,7 @@ export default {
     }
   },
   created() {
+    this.getScenicList()
     //获取 今日天气 数据
     this.getTodayWeather()
     //获取 景区预约统计 数据
@@ -170,7 +176,20 @@ export default {
     //获取 客流地排行 数据
     this.getFlowRank()
   },
+  watch: {
+    cityValue(newValue, oldValue) {
+      let params = {"resourceId":newValue}
+      this.getFlowSource(params)
+      this.getFlowRank(params)
+    }
+  },
   methods: {
+    getScenicList() {
+      getScenicList().then(response => {
+        this.cityOptions = response.data
+        console.log('asdfasdfa',this.cityOptions)
+      });
+    },
     //获取 今日天气 数据
     getTodayWeather() {
       getRealtime().then(response => {
@@ -190,14 +209,14 @@ export default {
       });
     },
     //获取 客流来源地 数据
-    getFlowSource() {
-      getMonitoringFlowStat().then(response => {
+    getFlowSource(params) {
+      getMonitoringFlowStat(params).then(response => {
         this.FlowComeData = response.data
       });
     },
     //获取 实时车流统计 数据
-    getActualCar() {
-      vehicleStatistics().then(response => {
+    getActualCar(params) {
+      vehicleStatistics(params).then(response => {
         this.ActualCarData = {
           saturatio: {name: response.data.saturation, percentage: response.data.percentage},
           Total: response.data.placeNum,
@@ -219,10 +238,9 @@ export default {
       }
     },
     //获取 客流地排行 数据
-    getFlowRank() {
-      getSelectTouristSource().then(response => {
+    getFlowRank(params) {
+      getSelectTouristSource(params).then(response => {
         this.FlowRankData = response.data.seriesData.slice(0, 5)
-
         this.FlowSourceDataCity = response.data.city
         //获取地图数据
         this.FlowSourceData = response.data.seriesData.map((item, index) => {