From a12c0c68ea94848ec80e1e95e37e6b5117c001a6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 20 三月 2024 09:20:51 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/check-result/index.vue | 64 +++++++++++++--------
src/views/system/data-manage/index.vue | 33 +++++++++-
src/views/system/check-template/index.vue | 8 +-
src/router/index.js | 13 ++++
src/views/system/score/index.vue | 4
5 files changed, 87 insertions(+), 35 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index f244038..292ae17 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,6 +47,19 @@
hidden: true
},
{
+ path: '/car/vehicle-data-monitor',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'index',
+ name: 'vehicle-data-monitor',
+ component: () => import('@/views/system/vehicle-data-monitor/index'),
+ meta: { title: '杞﹁締杩囧崱鍙ｆ暟鎹竴鑷存��', activeMenu: '/system/vehicle-data-monitor' }
+ }
+ ]
+ },
+ {
path: '/register',
component: () => import('@/views/register'),
hidden: true
diff --git a/src/views/system/check-result/index.vue b/src/views/system/check-result/index.vue
index 572f380..0817e2b 100644
--- a/src/views/system/check-result/index.vue
+++ b/src/views/system/check-result/index.vue
@@ -90,8 +90,7 @@
<el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">璇︽儏</el-button>
</div>
<div class="text item">鑰冩牳<span class="time">{{ item.examineName }}</span></div>
- <div class="text item">鑰冩牳鑼冨洿<span class="time">{{ item.examineRange }}</span></div>
- <div class="text item">鑰冩牳棰戠巼<span class="time">{{ item.frequency }}</span></div>
+ <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛ｅ害鑰冩牳" }}</span></div>
<div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div>
<div class="text item">鑰冩牳鏃堕棿
<span class="time">{{ item.checkTime }}</span>
@@ -184,32 +183,30 @@
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
- 绯荤粺鍒嗘暟
+ 缁煎悎鍒嗘暟
</template>
<el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
</el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-medal"></i>
- 浜哄伐鍒嗘暟
- </template>
- <el-tag type="danger" size="small">{{detail.manualScore}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-medal"></i>
- 杞﹁締鐐逛綅鍦ㄧ嚎鐜�
- </template>
- <el-tag type="danger" size="small">{{detail.carOnlineRate}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-medal"></i>
- 缁煎悎鍒嗘暟
- </template>
- <el-tag type="danger" size="small">{{detail.systemScore}}</el-tag>
- </el-descriptions-item>
</el-descriptions>
+ <el-table
+ :data="tableData"
+ show-summary
+ style="width: 100%">
+ <el-table-column
+ prop="name"
+ label="瑙勫垯鍚�"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="content"
+ label="鎸囨爣"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="score"
+ label="寰楀垎">
+ </el-table-column>
+ </el-table>
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀硅�冩牳缁撴灉瀵硅瘽妗� -->
@@ -233,9 +230,26 @@
return {
detailTitle: '',
detailOpen: false,
- detail: {
+ detail:{
},
+ tableData: [{
+ name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�',
+ content: '97%',
+ score: '-5'
+ }, {
+ name: '涓�鏈轰竴妗�24灏忔椂鏈慨澶�',
+ content: '5涓�',
+ score: '-0.5'
+ }, {
+ name: '瀛樺偍鏁呴殰',
+ content: '5灏忔椂',
+ score: '-0.5'
+ }, {
+ name: '鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�',
+ content: '3涓�',
+ score: '-0.3'
+ }],
manualScoreOpen: false,
manualScoreForm: {},
manualScoreTitle: '',
diff --git a/src/views/system/check-template/index.vue b/src/views/system/check-template/index.vue
index 2281e80..70c8f5c 100644
--- a/src/views/system/check-template/index.vue
+++ b/src/views/system/check-template/index.vue
@@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍏徃鍚�" prop="unitName">
+ <el-form-item label="鑰冩牳瀵硅薄" prop="unitName">
<el-input
v-model="queryParams.status"
- placeholder="璇疯緭鍏ュ叕鍙稿悕"
+ placeholder="璇疯緭鍏ヨ�冩牳瀵硅薄"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -79,7 +79,7 @@
<el-table v-loading="loading" :data="checkTemplateList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="妯℃澘鍚嶇О" align="center" prop="templateName" />
- <el-table-column label="鍏徃鍚�" align="center" prop="unitName" />
+ <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitName" />
<el-table-column label="璋冩暣绯绘暟" align="center" prop="adjustCoefficient" />
<el-table-column label="璋冩暣绯绘暟璁＄畻鏂瑰紡" align="center" prop="adjustWay" />
<el-table-column label="鐘舵��" align="center" prop="status" />
@@ -115,7 +115,7 @@
<el-form-item label="妯℃澘鍚嶇О" prop="templateName">
<el-input v-model="form.templateName" placeholder="璇疯緭鍏ユā鏉垮悕绉�" />
</el-form-item>
- <el-form-item label="鍏徃鍚�" prop="unitName">
+ <el-form-item label="鑰冩牳瀵硅薄" prop="unitName">
<el-select v-model="form.unitName" placeholder="璇烽�夋嫨">
<el-option
v-for="item in unitList"
diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue
index 764f510..43b150b 100644
--- a/src/views/system/data-manage/index.vue
+++ b/src/views/system/data-manage/index.vue
@@ -1,4 +1,5 @@
<template>
+ <div>
<div class="container">
<el-row type="flex" justify="center">
<el-col :span="24">
@@ -17,6 +18,26 @@
</el-col>
</el-row>
</div>
+
+ <div class="container">
+ <el-row type="flex" justify="center">
+ <el-col :span="24">
+ <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">杞︿咯鏁版嵁寮傚父妫�娴�</h3>
+ </el-col>
+ </el-row>
+
+ <el-row type="flex" >
+ <el-col :span="6" v-for="(item, index) in carData" :key="index">
+ <el-link @click="handleDetail(item)">
+ <el-card style="width:150px;height: 150px;text-align: center;">
+ <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+ <div>{{ item.name }}</div>
+ </el-card>
+ </el-link>
+ </el-col>
+ </el-row>
+ </div>
+ </div>
</template>
<script>
@@ -24,19 +45,23 @@
data() {
return {
faceData: [
- { name: '浜鸿劯璇嗗埆鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: 'vehicle-data-monitor' },
+ { name: '浜鸿劯璇嗗埆鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/face/index' },
{ name: '浜鸿劯鎶撴媿鏁版嵁鐩戞祴', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', routerUrl: '/face/faceClock' },
{ name: '浜鸿劯鏁版嵁瓒嬪娍鍒嗘瀽', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/face/faceClock' },
{ name: '浜鸿劯鎶撴媿璁惧娲昏穬鎬�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/face/faceClock' },
{ name: '浜鸿劯鎶撴媿涓婁紶鍙婃椂鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/face/faceClock' },
{ name: '浜鸿劯鎶撴媿澶у浘鍙敤鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/face/faceClock' },
- ]
+ ],
+ carData: [
+ { name: '鍗″彛杩囪溅鏁版嵁涓�鑷存��', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+
+ ]
}
},
methods: {
handleDetail(item) {
this.$router.push({
- name: item.routerUrl,
+ path: item.routerUrl,
params: {
id: item.id
}
@@ -52,4 +77,4 @@
margin-right: 100px;
margin-top: 10px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/score/index.vue b/src/views/system/score/index.vue
index bc293b4..7ad0604 100644
--- a/src/views/system/score/index.vue
+++ b/src/views/system/score/index.vue
@@ -76,9 +76,9 @@
<el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鍗曚綅鍚�" align="center" prop="unitName" />
+ <el-table-column label=鑰冩牳瀵硅薄" align="center" prop="unitName" />
<el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="绉垎绫诲瀷" align="center" prop="scoreCategory">
+ <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="scoreCategory">
<template slot-scope="scope">
<div v-if="scope.row.scoreCategory === 1">瑙嗛鍦ㄧ嚎鐜�</div>
<div v-else-if="scope.row.scoreCategory === 2">瀛樺偍鏁呴殰</div>
--
Gitblit v1.8.0