From cecda1744d6510ad7ca6d0a3ca6fb9a992c5a8a3 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 17 Mar 2023 16:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +-
 .../mapper/basetyre/BaseCarMapper.xml         |   1 +
 ruoyi-ui/.env.development                     |   2 +-
 ruoyi-ui/index.html                           |   2 +-
 ruoyi-ui/package.json                         |   9 +-
 ruoyi-ui/src/api/report/report.js             |  10 +
 ruoyi-ui/src/views/dashboard/BarChart.vue     |   2 +-
 ruoyi-ui/src/views/dashboard/LineChart.vue    |   3 +-
 ruoyi-ui/src/views/dashboard/PanelGroup.vue   |   3 +-
 ruoyi-ui/src/views/dashboard/PieChart.vue     |   2 +-
 ruoyi-ui/src/views/dashboard/RaddarChart.vue  |   2 +-
 ruoyi-ui/src/views/dashboard/Temp.vue         | 135 ++++++++++
 ruoyi-ui/src/views/index.vue                  |  20 +-
 .../src/views/report/temppresspeed/index.vue  | 255 +++++++++++++++---
 14 files changed, 388 insertions(+), 60 deletions(-)
 create mode 100644 ruoyi-ui/src/api/report/report.js
 create mode 100644 ruoyi-ui/src/views/dashboard/Temp.vue

diff --git a/pom.xml b/pom.xml
index 5016d24..7452730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <description>雄鹰轮胎智慧互联云平台</description>
     
     <properties>
         <ruoyi.version>3.8.5</ruoyi.version>
diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
index 9eac325..4499370 100644
--- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
+++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
@@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null "> and bc.id = #{id}</if>
             <if test="isDelete != null "> and bc.is_delete = #{isDelete}</if>
             <if test="queueId != null "> and bc.car_queue_id = #{queueId}</if>
+            <if test="queueId != null "> and bc.car_queue_id = #{queueId}</if>
         </where>
     </select>
     <select id="selectCarTyres" parameterType="BaseCar" resultMap="CarTyreResult">
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index af9ba00..690e35a 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 雄鹰轮胎智慧互联云平台
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
diff --git a/ruoyi-ui/index.html b/ruoyi-ui/index.html
index 82bd55f..29a1939 100644
--- a/ruoyi-ui/index.html
+++ b/ruoyi-ui/index.html
@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/title.ico">
-  <title>若依管理系统</title>
+  <title>雄鹰轮胎智慧互联云平台</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 6e3f760..fc261ff 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.8.4",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "雄鹰轮胎智慧互联云平台",
+  "author": "HighWay",
   "license": "MIT",
   "scripts": {
     "dev": "vite",
@@ -29,10 +29,11 @@
     "nprogress": "0.2.0",
     "pinia": "2.0.22",
     "vue": "3.2.45",
-    "vue-count-to": "1.0.13",
+    "vue-count-to": "^1.0.13",
     "vue-cropper": "1.0.3",
     "vue-i18n": "^9.2.2",
-    "vue-router": "4.1.4"
+    "vue-router": "4.1.4",
+    "vue3-count-to": "^1.1.2"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "3.1.0",
diff --git a/ruoyi-ui/src/api/report/report.js b/ruoyi-ui/src/api/report/report.js
new file mode 100644
index 0000000..d712173
--- /dev/null
+++ b/ruoyi-ui/src/api/report/report.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function Temp(query) {
+    return request({
+        url: '/basetyre/tyre/list',
+        method: 'get',
+        params: query
+    })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/ruoyi-ui/src/views/dashboard/BarChart.vue
index 075ed74..3d7c652 100644
--- a/ruoyi-ui/src/views/dashboard/BarChart.vue
+++ b/ruoyi-ui/src/views/dashboard/BarChart.vue
@@ -5,7 +5,7 @@
 <script>
 import * as echarts from 'echarts';
 // require('echarts/theme/macarons') // echarts theme
-import echarts from 'echarts/theme/macarons'
+const echart = inject('echart')
 import resize from './mixins/resize'
 
 const animationDuration = 6000
diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/ruoyi-ui/src/views/dashboard/LineChart.vue
index 211e357..09def34 100644
--- a/ruoyi-ui/src/views/dashboard/LineChart.vue
+++ b/ruoyi-ui/src/views/dashboard/LineChart.vue
@@ -4,8 +4,7 @@
 
 <script>
 import * as echarts from 'echarts';
-// require('echarts/theme/macarons') // echarts theme
-import echarts from 'echarts/theme/macarons'
+const echart = inject('echart')
 import resize from './mixins/resize'
 
 export default {
diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/ruoyi-ui/src/views/dashboard/PanelGroup.vue
index 1a1081f..64c2327 100644
--- a/ruoyi-ui/src/views/dashboard/PanelGroup.vue
+++ b/ruoyi-ui/src/views/dashboard/PanelGroup.vue
@@ -56,7 +56,8 @@
 </template>
 
 <script>
-import CountTo from 'vue-count-to'
+
+import { CountTo } from 'vue3-count-to';
 
 export default {
   components: {
diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/ruoyi-ui/src/views/dashboard/PieChart.vue
index c7af72d..90e6fec 100644
--- a/ruoyi-ui/src/views/dashboard/PieChart.vue
+++ b/ruoyi-ui/src/views/dashboard/PieChart.vue
@@ -5,7 +5,7 @@
 <script>
 import * as echarts from 'echarts';
 // require('echarts/theme/macarons') // echarts theme
-import echarts from 'echarts/theme/macarons'
+const echart = inject('echart')
 import resize from './mixins/resize'
 
 export default {
diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/ruoyi-ui/src/views/dashboard/RaddarChart.vue
index 08058d6..f05feae 100644
--- a/ruoyi-ui/src/views/dashboard/RaddarChart.vue
+++ b/ruoyi-ui/src/views/dashboard/RaddarChart.vue
@@ -5,7 +5,7 @@
 <script>
 import * as echarts from 'echarts';
 // require('echarts/theme/macarons.js') // echarts theme
-import echarts from 'echarts/theme/macarons'
+const echart = inject('echart')
 import resize from './mixins/resize'
 
 const animationDuration = 3000
diff --git a/ruoyi-ui/src/views/dashboard/Temp.vue b/ruoyi-ui/src/views/dashboard/Temp.vue
new file mode 100644
index 0000000..77cd214
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/Temp.vue
@@ -0,0 +1,135 @@
+<template>
+    <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+    import * as echarts from 'echarts';
+    const echart = inject('echart')
+    import resize from './mixins/resize'
+
+    export default {
+        mixins: [resize],
+        props: {
+            className: {
+                type: String,
+                default: 'chart'
+            },
+            width: {
+                type: String,
+                default: '100%'
+            },
+            height: {
+                type: String,
+                default: '350px'
+            },
+            autoResize: {
+                type: Boolean,
+                default: true
+            },
+            chartData: {
+                type: Object,
+                required: true
+            }
+        },
+        data() {
+            return {
+                chart: null
+            }
+        },
+        watch: {
+            chartData: {
+                deep: true,
+                handler(val) {
+                    this.setOptions(val)
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.initChart()
+            })
+        },
+        beforeDestroy() {
+            if (!this.chart) {
+                return
+            }
+            this.chart.dispose()
+            this.chart = null
+        },
+        methods: {
+            initChart() {
+                this.chart = echarts.init(this.$el, 'macarons')
+                this.setOptions(this.chartData)
+            },
+            setOptions({ expectedData, actualData } = {}) {
+                this.chart.setOption({
+                    xAxis: {
+                        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                        boundaryGap: false,
+                        axisTick: {
+                            show: false
+                        }
+                    },
+                    grid: {
+                        left: 10,
+                        right: 10,
+                        bottom: 20,
+                        top: 30,
+                        containLabel: true
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross'
+                        },
+                        padding: [5, 10]
+                    },
+                    yAxis: {
+                        axisTick: {
+                            show: false
+                        }
+                    },
+                    legend: {
+                        data: ['expected', 'actual']
+                    },
+                    series: [{
+                        name: 'expected', itemStyle: {
+                            normal: {
+                                color: '#FF005A',
+                                lineStyle: {
+                                    color: '#FF005A',
+                                    width: 2
+                                }
+                            }
+                        },
+                        smooth: true,
+                        type: 'line',
+                        data: expectedData,
+                        animationDuration: 2800,
+                        animationEasing: 'cubicInOut'
+                    },
+                        {
+                            name: 'actual',
+                            smooth: true,
+                            type: 'line',
+                            itemStyle: {
+                                normal: {
+                                    color: '#3888fa',
+                                    lineStyle: {
+                                        color: '#3888fa',
+                                        width: 2
+                                    },
+                                    areaStyle: {
+                                        color: '#f3f8ff'
+                                    }
+                                }
+                            },
+                            data: actualData,
+                            animationDuration: 2800,
+                            animationEasing: 'quadraticOut'
+                        }]
+                })
+            }
+        }
+    }
+</script>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 45f3874..6d8d913 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -35,6 +35,8 @@
   import RaddarChart from './dashboard/RaddarChart'
   import PieChart from './dashboard/PieChart'
   import BarChart from './dashboard/BarChart'
+  import * as echarts from 'echarts'
+  provide('echart', echarts)
 
   const lineChartData = {
     newVisitis: {
@@ -79,16 +81,16 @@
 
 <style lang="scss" scoped>
   .dashboard-editor-container {
-    padding: 32px;
-    background-color: rgb(240, 242, 245);
-    position: relative;
+       padding: 32px;
+       background-color: rgb(240, 242, 245);
+       position: relative;
 
-    .chart-wrapper {
-      background: #fff;
-      padding: 16px 16px 0;
-      margin-bottom: 32px;
-    }
-  }
+       .chart-wrapper {
+         background: #fff;
+         padding: 16px 16px 0;
+         margin-bottom: 32px;
+       }
+     }
 
   @media (max-width:1024px) {
     .chart-wrapper {
diff --git a/ruoyi-ui/src/views/report/temppresspeed/index.vue b/ruoyi-ui/src/views/report/temppresspeed/index.vue
index d695f11..6cf11bb 100644
--- a/ruoyi-ui/src/views/report/temppresspeed/index.vue
+++ b/ruoyi-ui/src/views/report/temppresspeed/index.vue
@@ -1,47 +1,226 @@
 <template>
-<div id="app">
-  <el-container>
-    <el-header>Header</el-header>
-    <el-main>Main</el-main>
-  </el-container>
-</div>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <div class="grid-content bg-purple">
+        <el-form :label-width=" locale ? '100px':'140px'">
+          <el-form-item label="外胎号">
+            <el-input  style="width: 200px" v-model="outerTireNumber"  placeholder="请输入外胎号" clearable @keyup.enter.native="handleQuery"></el-input>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="grid-content bg-purple">
+          <el-form-item label="安装车辆">
+                    <el-input
+                            v-model="input"
+                            :disabled="true">
+                    </el-input>
+          </el-form-item>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="grid-content bg-purple">
+          <el-form-item label="安装轮位">
+            <el-input
+                    v-model="input"
+                    :disabled="true">
+            </el-input>
+          </el-form-item>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;" v-loading="loading">
+      <div id="myChart" :style="{width: '1500px', height: '550px'}"></div>
+    </el-row>
+  </div>
 </template>
-<script name="temp" setup>
 
-</script>
-<style lang="scss">
-  @import url("//unpkg.com/element-ui@2.15.13/lib/theme-chalk/index.css");
-  .el-header, .el-footer {
-    background-color: #B3C0D1;
-    color: #333;
-    text-align: center;
-    line-height: 60px;
-  }
+<script lang="ts">
+  // 引入echarts
+  import {Temp} from "@/api/report/report";
+  import * as echarts from 'echarts'
+  let myChart = null
+  let ct = null
+  const loading = true;
+  export default {
+    data() {
+      return {
+        outerTireNumber: '1001'
+      }
+    },
+    created() {
+      // 做一些初始化工作，比如说进行ajax请求异步数据的获取、初始化数据
+    },
+    beforecreate(){
+      //可以在这加个loading事件
+   },
+    created(){
+     // 可以在这结束loading，接口请求之类的，然后做一些数据的初始化，实现函数自执行（这个在Vue的生命周期只会执行一次）
+    },
+    methods:{
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.loading = true;
+        Temp(this.data).then(response => {
+          console.log(response);
+        }).finally(() => {
+          this.loading = false;
+        });
+      },
+    },
 
-  .el-aside {
-    background-color: #D3DCE6;
-    color: #333;
-    text-align: center;
-    line-height: 200px;
-  }
 
-  .el-main {
-    background-color: #E9EEF3;
-    color: #333;
-    text-align: center;
-    line-height: 160px;
-  }
+  mounted(){
+      // 获取DOM节点，使用echarts之类的，也可以在这发起接口请求，配合路由钩子做一些事情 （会经常进行数据处理和更新）
+      const option = {
+        title: {
+          text: '胎温胎压速度变化'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          data: ['速度(千米)', '温度(℃)', '压力(Kpa)' ]
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: {}
+          }
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#000'
+            },
+            interval: 0, //显示所有X轴信息
+            rotate: -40 //倾斜角度
+          },
+          data: ['2023-03-15 08:31', '2023-03-15 08:32', '2023-03-15 08:33', '2023-03-15 08:34', '2023-03-15 08:35', '2023-03-15 08:36', '2023-03-15 08:37', '2023-03-15 08:38','2023-03-15 08:39']
+        },
+        yAxis: [
+          {
+            type: 'value',
+            name: '速度',
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: 'blue',
+              },
+            },
+            axisLabel: {
+              textStyle: {
+                color: 'blue',
+              },
+            }
+          },
+          {
+            type: 'value',
+            name: '温度',
+            position: 'left',
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: 'red',
+              },
+            },
+            axisLabel: {
+              textStyle: {
+                color: 'red',
+              },
+            },
+            offset: 30,
+          },
 
-  body > .el-container {
-    margin-bottom: 40px;
-  }
+          {
+            type: 'value',
+            name: '压力',
+            position: 'left',
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: 'green',
+              },
+            },
+            axisLabel: {
+              textStyle: {
+                color: 'green',
+              },
+            },
+            offset: 60,
+          }
+        ],
 
-  .el-container:nth-child(5) .el-aside,
-  .el-container:nth-child(6) .el-aside {
-    line-height: 260px;
-  }
+        series: [
+          {
+            name: '速度(千米)',
+            type: 'line',
+            data: [0,0,0,18,21,36,44,45,58,66],
+            symbol: "none",
+            // symbolSize: 10,
+            yAxisIndex: 0,
+            itemStyle: {
+              normal: {
+                color: 'blue',
+                lineStyle: {
+                  color: 'blue' //改变折线颜色
+                }
+              }
+            },
+          },
+          {
+            name: '温度(℃)',
+            type: 'line',
+            data: [20,20,20,25,32,40,46,53,70,87],
+            yAxisIndex: 1,//对应y轴
+            symbol: "none",
+            itemStyle: {
+              normal: {
+                color: 'red',
+                lineStyle: {
+                  color: 'red' //改变折线颜色
+                }
+              }
+            },
+          },
+          {
+            name: '压力(Kpa)',
+            type: 'line',
+            data: [600,600,600,615,616,617,620,622,622,622],
+            yAxisIndex: 2,//对应右侧的y轴
+            symbol: "none",
+            itemStyle: {
+              normal: {
+                color: 'green',
+                lineStyle: {
+                  color: 'green' //改变折线颜色
+                }
+              }
+            },
+          },
+        ]
+      }
+      ct = document.getElementById('myChart')
+      myChart = echarts.init(ct)
+      myChart.setOption(option)
+      window.addEventListener('resize', function() {
+        myChart.resize()
+      })
+    },
 
-  .el-container:nth-child(7) .el-aside {
-    line-height: 320px;
   }
-</style>
\ No newline at end of file
+</script>
+
+