新增文件

master
Yangwl 2 years ago
parent bb1015b556
commit cecda1744d

@ -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>

@ -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">

@ -1,5 +1,5 @@
# 页面标题
VITE_APP_TITLE = 若依管理系统
VITE_APP_TITLE = 雄鹰轮胎智慧互联云平台
# 开发环境配置
VITE_APP_ENV = 'development'

@ -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,

@ -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",

@ -0,0 +1,10 @@
import request from '@/utils/request'
// 查询列表
export function Temp(query) {
return request({
url: '/basetyre/tyre/list',
method: 'get',
params: query
})
}

@ -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

@ -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 {

@ -56,7 +56,8 @@
</template>
<script>
import CountTo from 'vue-count-to'
import { CountTo } from 'vue3-count-to';
export default {
components: {

@ -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 {

@ -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

@ -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>

@ -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 {

@ -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(){
// loadingVue
},
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>
</script>

Loading…
Cancel
Save