From fc757b7e8dd314e0ea58de4b3605eb4bf9d68364 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 七月 2024 09:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/score/index.vue | 16
src/views/system/data-manage/data-detail/list.js | 704 +++++++++++++++++++++++++++++++++++++++++++
src/views/system/data-manage/data-detail/index.vue | 7
src/views/system/data-manage/index.vue | 103 +++---
src/api/platform/work-order.js | 9
src/views/system/work-order/index.vue | 86 ++++
6 files changed, 843 insertions(+), 82 deletions(-)
diff --git a/src/api/platform/work-order.js b/src/api/platform/work-order.js
index 14e23f3..700cd9b 100644
--- a/src/api/platform/work-order.js
+++ b/src/api/platform/work-order.js
@@ -79,6 +79,15 @@
})
}
+// 鎵归噺瀹℃牳宸ュ崟
+export function batchAuditing(data) {
+ return request({
+ url: '/work-order/batchAuditing',
+ method: 'put',
+ data: data
+ })
+}
+
// 宸ュ崟杩愮淮鎯呭喌
export function ywCondition(data) {
return request({
diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue
index f2db340..d798598 100644
--- a/src/views/system/contract/score/index.vue
+++ b/src/views/system/contract/score/index.vue
@@ -59,7 +59,7 @@
</template>
</el-table-column>
<el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" />
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="230px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">璇︽儏</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)"
@@ -123,12 +123,12 @@
<template slot-scope="{ data }">
<el-tooltip class="item" :disabled="data.label.length < 16 && !data.deductCategory" effect="dark"
:content="
- data.label.length < 16 ?
- data.deductCategory ?
- data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�' :
- '' :
- (data.deductCategory ?
- data.label + ' ' + (data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�') :
+ data.label.length < 16 ?
+ data.deductCategory ?
+ data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�' :
+ '' :
+ (data.deductCategory ?
+ data.label + ' ' + (data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�') :
data.label)"
placement="left">
<span>{{ data.label }}</span>
@@ -518,4 +518,4 @@
.el-cascader-node {
max-width: 300px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index ec1d7c2..08d602a 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -129,7 +129,7 @@
<script>
import { listPlatform, getPlatform, delPlatform, addPlatform, updatePlatform } from "@/api/platform/vehicle-data-monitor";
-import { tableColumn } from "./list";
+import { videoData, carData, faceData, equipment } from "./list";
import store from '@/store';
export default {
@@ -185,7 +185,10 @@
next();
},
created() {
- this.tableHead = tableColumn[0].columns;
+ if (this.$route.query.type === '1') this.tableHead = videoData[this.$route.query.index].columns;
+ if (this.$route.query.type === '2') this.tableHead = carData[this.$route.query.index].columns;
+ if (this.$route.query.type === '3') this.tableHead = faceData[this.$route.query.index].columns;
+ if (this.$route.query.type === '4') this.tableHead = equipment[this.$route.query.index].columns;
this.getList();
},
methods: {
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index c75e138..3648368 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -1,4 +1,4 @@
-export const tableColumn = [
+export const videoData = [
{
title: '骞冲彴鍦ㄧ嚎',
columns: [
@@ -28,5 +28,705 @@
prop: 'notUniqueDataNumber'
},
]
+ },
+ {
+ title: '涓�鏈轰竴妗�',
+ columns: [
+ {
+ label: '鍗″彛鍚嶇О',
+ align: 'center',
+ prop: 'bayonetName',
+ },
+ {
+ label: '鍗″彛缂栧彿',
+ align: 'center',
+ prop: 'bayonetNumber'
+ },
+ {
+ label: '杩囪溅鏁版嵁閲�',
+ align: 'center',
+ prop: 'vehicleDataNumber'
+ },
+ {
+ label: '涓嶅敮涓�鏁版嵁',
+ align: 'center',
+ prop: 'notUniqueData'
+ },
+ {
+ label: '涓嶅敮涓�鏁版嵁閲�',
+ align: 'center',
+ prop: 'notUniqueDataNumber'
+ },
+ ]
+ },
+ {
+ title: "鐐逛綅鍦ㄧ嚎",
+ columns: [
+ {
+ label: "琛屾斂鍖哄垝缂栫爜",
+ align: "center",
+ prop: "arealayernoCode"
+ },
+ {
+ label: "琛屾斂鍖哄垝鍚嶇О",
+ align: "center",
+ prop: "arealayernoName"
+ },
+ {
+ label: "璇婃柇鏃ユ湡",
+ align: "center",
+ prop: "diagDate"
+ },
+ {
+ label: "缁熻绾害",
+ align: "center",
+ prop: "dim"
+ },
+ {
+ label: "icmp绂荤嚎鏁�",
+ align: "center",
+ prop: "icmpOfflineNum"
+ },
+ {
+ label: "icmp鍦ㄧ嚎鏁�",
+ align: "center",
+ prop: "icmpOnlineNum"
+ },
+ {
+ label: "icmp鍦ㄧ嚎鐜�",
+ align: "center",
+ prop: "icmpOnlineRate"
+ },
+ {
+ label: "icmp璇婃柇鎬绘暟",
+ align: "center",
+ prop: "icmpTotalNum"
+ },
+ {
+ label: "绂荤嚎鏁�",
+ align: "center",
+ prop: "offlineNum"
+ },
+ {
+ label: "鍦ㄧ嚎鏁�",
+ align: "center",
+ prop: "onlineNum"
+ },
+ {
+ label: "鍦ㄧ嚎鐜�",
+ align: "center",
+ prop: "onlineRate"
+ }
+ ]
+ },
+ {
+ title: "褰曞儚鍙敤",
+ columns: [
+ {
+ label: "琛屾斂鍖哄煙鍚嶇О",
+ align: "center",
+ prop: "arealayername"
+ },
+ {
+ label: "琛屾斂鍖哄煙ID",
+ align: "center",
+ prop: "arealayerno"
+ },
+ {
+ label: "鍒涘缓鏃堕棿",
+ align: "center",
+ prop: "createTime"
+ },
+ {
+ label: "鎽勫儚鏈篒D",
+ align: "center",
+ prop: "deviceId"
+ },
+ {
+ label: "鎽勫儚鏈哄悕绉�",
+ align: "center",
+ prop: "deviceName"
+ },
+ {
+ label: "涓婚敭ID",
+ align: "center",
+ prop: "id"
+ },
+ {
+ label: "缂哄け鏃堕暱",
+ align: "center",
+ prop: "missDuration"
+ },
+ {
+ label: "鍥芥爣骞冲彴ID",
+ align: "center",
+ prop: "platId"
+ },
+ {
+ label: "褰曞儚鏃堕暱",
+ align: "center",
+ prop: "recordDuration"
+ },
+ {
+ label: "褰曞儚瀹屾暣鐘舵��",
+ align: "center",
+ prop: "recordStatus"
+ },
+ {
+ label: "缁熻鏃堕棿",
+ align: "center",
+ prop: "statTime"
+ },
+ {
+ label: "绉熸埛ID",
+ align: "center",
+ prop: "tenantId"
+ }
+ ]
+ },
+ {
+ title: "瑙嗛鏍囨敞",
+ columns: [
+ {
+ label: "鍖哄煙璺緞淇℃伅",
+ align: "center",
+ prop: "arealayerPath"
+ },
+ {
+ label: "鍖哄煙鍚嶇О",
+ align: "center",
+ prop: "arealayername"
+ },
+ {
+ label: "鍖哄煙缂栫爜",
+ align: "center",
+ prop: "arealayerno"
+ },
+ {
+ label: "璁惧 ID",
+ align: "center",
+ prop: "deviceId"
+ },
+ {
+ label: "璁惧鍚嶇О",
+ align: "center",
+ prop: "deviceName"
+ },
+ {
+ label: "鏄惁澶т簬鏈�澶у��",
+ align: "center",
+ prop: "diff"
+ },
+ {
+ label: "鎷夌爜娴佹椂闂村樊",
+ align: "center",
+ prop: "diffTime"
+ },
+ {
+ label: "IP 鍦板潃",
+ align: "center",
+ prop: "ip"
+ },
+ {
+ label: "鍥剧墖 ocr 璇嗗埆缁撴灉",
+ align: "center",
+ prop: "ocrResult"
+ },
+ {
+ label: "鍥剧墖鍦板潃",
+ align: "center",
+ prop: "imgPath"
+ },
+ {
+ label: "鐘舵�佺爜",
+ align: "center",
+ prop: "statusCode"
+ },
+ {
+ label: "鎷夌爜娴佹椂闂存牸寮�",
+ align: "center",
+ prop: "osdFormat"
+ },
+ {
+ label: "OSD 淇℃伅",
+ align: "center",
+ prop: "osdInfo"
+ },
+ {
+ label: "鍥剧墖涓婄殑瀛楀箷鏃堕棿",
+ align: "center",
+ prop: "osdTime"
+ },
+ {
+ label: "鎽勫儚鏈烘爣绛�",
+ align: "center",
+ prop: "tags"
+ },
+ {
+ label: "鏇存柊鏃堕棿",
+ align: "center",
+ prop: "updateTime"
+ },
+ {
+ label: "瑙嗛鐮佹祦鑾峰彇鏃堕棿",
+ align: "center",
+ prop: "videoGetTime"
+ }
+ ]
+ },
+ {
+ title: '閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�',
+ columns: [
+ {
+ label: "鍖哄煙璺緞淇℃伅",
+ align: "center",
+ prop: "arealayerPath"
+ },
+ {
+ label: "琛屾斂鍖哄垝缂栫爜",
+ align: "center",
+ prop: "arealayernoCode"
+ },
+ {
+ label: "琛屾斂鍖哄垝鍚嶇О",
+ align: "center",
+ prop: "arealayernoName"
+ },
+ {
+ label: "浜岃繘鍒剁鎴稩D",
+ align: "center",
+ prop: "binaryTenantId"
+ },
+ {
+ label: "妯＄硦",
+ align: "center",
+ prop: "blur"
+ },
+ {
+ label: "妯＄硦鍘熷鍒嗗��",
+ align: "center",
+ prop: "blurRaw"
+ },
+ {
+ label: "妯＄硦闃堝��",
+ align: "center",
+ prop: "blurThreshold"
+ },
+ {
+ label: "棰滆壊",
+ align: "center",
+ prop: "color"
+ },
+ {
+ label: "棰滆壊鍘熷鍒嗗��",
+ align: "center",
+ prop: "colorRaw"
+ },
+ {
+ label: "棰滆壊闃堝��",
+ align: "center",
+ prop: "colorThreshold"
+ },
+ {
+ label: "瑙ｇ爜淇℃伅",
+ align: "center",
+ prop: "decodeInfo"
+ },
+ {
+ label: "璁惧鍥芥爣ID",
+ align: "center",
+ prop: "deviceId"
+ },
+ {
+ label: "璁惧IP",
+ align: "center",
+ prop: "deviceIp"
+ },
+ {
+ label: "璁惧鍚嶇О",
+ align: "center",
+ prop: "deviceName"
+ },
+ {
+ label: "鎵╁睍JSON",
+ align: "center",
+ prop: "extJson"
+ },
+ {
+ label: "涓㈠抚鐜�",
+ align: "center",
+ prop: "frameLostRate"
+ },
+ {
+ label: "缁処D",
+ align: "center",
+ prop: "groupId"
+ },
+ {
+ label: "涓婚敭ID",
+ align: "center",
+ prop: "id"
+ },
+ {
+ label: "IFM寤惰繜",
+ align: "center",
+ prop: "ifmDelay"
+ },
+ {
+ label: "鍥惧儚璺緞",
+ align: "center",
+ prop: "imagePath"
+ },
+ {
+ label: "鍥惧儚鐘舵��",
+ align: "center",
+ prop: "imgStatus"
+ },
+ {
+ label: "鍏ョ綉鏃堕棿",
+ align: "center",
+ prop: "inTime"
+ },
+ {
+ label: "绾害",
+ align: "center",
+ prop: "latitude"
+ },
+ {
+ label: "浜害",
+ align: "center",
+ prop: "light"
+ },
+ {
+ label: "浜害鍘熷鍒嗗��",
+ align: "center",
+ prop: "lightRaw"
+ },
+ {
+ label: "浜害闃堝��",
+ align: "center",
+ prop: "lightThreshold"
+ },
+ {
+ label: "缁忓害",
+ align: "center",
+ prop: "longitude"
+ },
+ {
+ label: "鍦ㄧ嚎鐘舵��",
+ align: "center",
+ prop: "onlineStatus"
+ },
+ {
+ label: "鍘熷骞冲彴ID",
+ align: "center",
+ prop: "originalPlatId"
+ },
+ {
+ label: "璐熻浇绫诲瀷",
+ align: "center",
+ prop: "payloadType"
+ },
+ {
+ label: "鍍忕礌淇℃伅",
+ align: "center",
+ prop: "pixelInfo"
+ },
+ {
+ label: "骞冲彴ID",
+ align: "center",
+ prop: "platId"
+ },
+ {
+ label: "閬尅",
+ align: "center",
+ prop: "shade"
+ },
+ {
+ label: "閬尅鍘熷鍒嗗��",
+ align: "center",
+ prop: "shadeRaw"
+ },
+ {
+ label: "閬尅闃堝��",
+ align: "center",
+ prop: "shadeThreshold"
+ },
+ {
+ label: "鎶栧姩",
+ align: "center",
+ prop: "shake"
+ },
+ {
+ label: "鎶栧姩鍘熷鍒嗗��",
+ align: "center",
+ prop: "shakeRaw"
+ },
+ {
+ label: "鎶栧姩闃堝��",
+ align: "center",
+ prop: "shakeThreshold"
+ },
+ {
+ label: "鏃犱俊鍙�",
+ align: "center",
+ prop: "signa1"
+ },
+ {
+ label: "鏃犱俊鍙峰師濮嬪垎鍊�",
+ align: "center",
+ prop: "signa1Raw"
+ },
+ {
+ label: "鏃犱俊鍙风姸鎬�",
+ align: "center",
+ prop: "signa1Status"
+ },
+ {
+ label: "鏃犱俊鍙烽槇鍊�",
+ align: "center",
+ prop: "signa1Threshold"
+ },
+ {
+ label: "SIP寤惰繜",
+ align: "center",
+ prop: "sipDelay"
+ },
+ {
+ label: "闆姳",
+ align: "center",
+ prop: "snow"
+ },
+ {
+ label: "闆姳鍘熷鍒嗗��",
+ align: "center",
+ prop: "snowRaw"
+ },
+ {
+ label: "闆姳闃堝��",
+ align: "center",
+ prop: "snowThreshold"
+ },
+ {
+ label: "鏉＄汗",
+ align: "center",
+ prop: "stripe"
+ },
+ {
+ label: "鏉＄汗鍘熷鍒嗗��",
+ align: "center",
+ prop: "stripeRaw"
+ },
+ {
+ label: "鏉＄汗闃堝��",
+ align: "center",
+ prop: "stripeThreshold"
+ },
+ {
+ label: "鎽勫儚鏈烘爣绛�",
+ align: "center",
+ prop: "tags"
+ },
+ {
+ label: "浠诲姟鍒涘缓鏃堕棿",
+ align: "center",
+ prop: "taskCreateTime"
+ },
+ {
+ label: "浠诲姟澶嶆鏃堕棿",
+ align: "center",
+ prop: "taskRecheckTime"
+ },
+ {
+ label: "绉熸埛ID",
+ align: "center",
+ prop: "tenantId"
+ },
+ {
+ label: "瑙嗛寤惰繜",
+ align: "center",
+ prop: "videoDelay"
+ },
+ {
+ label: "瑙嗛璇婃柇鐘舵��",
+ align: "center",
+ prop: "videoDiagStatus"
+ },
+ {
+ label: "瑙嗛璇婃柇鏃堕棿",
+ align: "center",
+ prop: "videoDiagTime"
+ },
+ {
+ label: "瑙嗛鑾峰彇鐘舵��",
+ align: "center",
+ prop: "videoGetStatus"
+ },
+ {
+ label: "瑙嗛鑾峰彇鏃堕棿",
+ align: "center",
+ prop: "videoGetTime"
+ },
+ {
+ label: "澶滈棿VQD",
+ align: "center",
+ prop: "vqdAtNight"
+ }
+ ]
+ },
+ {
+ title: '瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊',
+ columns: []
+ },
+ {
+ title: "瑙嗛鍥惧儚璐ㄩ噺妫�娴嬫姤鍛�",
+ columns: [
+ {
+ label: "琛屾斂鍖哄垝缂栫爜",
+ align: "center",
+ prop: "arealayernoCode"
+ },
+ {
+ label: "琛屾斂鍖哄垝鍚嶇О",
+ align: "center",
+ prop: "arealayernoName"
+ },
+ {
+ label: "妯＄硦",
+ align: "center",
+ prop: "blur"
+ },
+ {
+ label: "妯＄硦鍘熷鍒嗗��",
+ align: "center",
+ prop: "blurRaw"
+ },
+ {
+ label: "棰滆壊",
+ align: "center",
+ prop: "color"
+ },
+ {
+ label: "棰滆壊鍘熷鍒嗗��",
+ align: "center",
+ prop: "colorRaw"
+ },
+ {
+ label: "鎽勫儚鏈�-鍥芥爣id",
+ align: "center",
+ prop: "deviceId"
+ },
+ {
+ label: "鎽勫儚鏈篿p",
+ align: "center",
+ prop: "deviceIp"
+ },
+ {
+ label: "鎽勫儚鏈鸿澶囧悕绉�",
+ align: "center",
+ prop: "deviceName"
+ },
+ {
+ label: "缁熻绾害",
+ align: "center",
+ prop: "dim"
+ },
+ {
+ label: "鍥惧儚鏄惁姝ｅ父",
+ align: "center",
+ prop: "isImgAbnormal"
+ },
+ {
+ label: "淇″彿鏄惁涓㈠け",
+ align: "center",
+ prop: "isSignalMiss"
+ },
+ {
+ label: "浜害",
+ align: "center",
+ prop: "light"
+ },
+ {
+ label: "浜害鍘熷鍒嗗��",
+ align: "center",
+ prop: "lightRaw"
+ },
+ {
+ label: "閬尅",
+ align: "center",
+ prop: "shade"
+ },
+ {
+ label: "閬尅鍘熷鍒嗗��",
+ align: "center",
+ prop: "shadeRaw"
+ },
+ {
+ label: "鎶栧姩",
+ align: "center",
+ prop: "shake"
+ },
+ {
+ label: "鎶栧姩鍘熷鍒嗗��",
+ align: "center",
+ prop: "shakeRaw"
+ },
+ {
+ label: "鏃犱俊鍙�",
+ align: "center",
+ prop: "signa1"
+ },
+ {
+ label: "鏃犱俊鍙峰師濮嬪垎鍊�",
+ align: "center",
+ prop: "signa1Raw"
+ },
+ {
+ label: "闆姳",
+ align: "center",
+ prop: "snow"
+ },
+ {
+ label: "闆姳鍘熷鍒嗗��",
+ align: "center",
+ prop: "snowRaw"
+ },
+ {
+ label: "鎺掑簭灞炴��",
+ align: "center",
+ prop: "sortFiled"
+ },
+ {
+ label: "璇婃柇鐘舵�佺紪鐮�",
+ align: "center",
+ prop: "status"
+ },
+ {
+ label: "璇婃柇鐘舵�佸悕绉�",
+ align: "center",
+ prop: "statusName"
+ },
+ {
+ label: "鏉＄汗",
+ align: "center",
+ prop: "stripe"
+ },
+ {
+ label: "鏉＄汗鍘熷鍒嗗��",
+ align: "center",
+ prop: "stripeRaw"
+ },
+ {
+ label: "璇婃柇鏃堕棿",
+ align: "center",
+ prop: "vqdTime"
+ }
+ ]
}
-]
\ No newline at end of file
+];
+
+export const carData = [];
+
+export const faceData = [];
+
+export const equipment = [];
\ No newline at end of file
diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue
index 0d72dd7..616165a 100644
--- a/src/views/system/data-manage/index.vue
+++ b/src/views/system/data-manage/index.vue
@@ -10,7 +10,7 @@
<el-row :gutter="20">
<el-col :xl="4" :lg="4" :md="6" :sm="6" :xs="12" v-for="(item, index) in videoData" :key="index"
:style="item.name == '' ? 'display:none' : ''" class="col-margin">
- <el-link @click="handleDetail(item)">
+ <el-link @click="handleDetail(item, index)">
<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>
@@ -30,7 +30,7 @@
<el-row :gutter="20">
<el-col :xl="4" :lg="4" :md="6" :sm="6" :xs="12" v-for="(item, index) in carData" :key="index"
:style="item.name == '' ? 'display:none' : ''" class="col-margin">
- <el-link @click="handleDetail(item)">
+ <el-link @click="handleDetail(item, index)">
<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>
@@ -50,7 +50,7 @@
<el-row :gutter="20">
<el-col :xl="4" :lg="4" :md="6" :sm="6" :xs="12" v-for="(item, index) in faceData" :key="index"
:style="item.name == '' ? 'display:none' : ''" class="col-margin">
- <el-link @click="handleDetail(item)">
+ <el-link @click="handleDetail(item, index)">
<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>
@@ -70,7 +70,7 @@
<el-row :gutter="20">
<el-col :xl="4" :lg="4" :md="6" :sm="6" :xs="12" v-for="(item, index) in equipment" :key="index"
:style="item.name == '' ? 'display:none' : ''" class="col-margin">
- <el-link @click="handleDetail(item)">
+ <el-link @click="handleDetail(item, index)">
<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>
@@ -89,68 +89,61 @@
data() {
return {
videoData: [
- { name: '骞冲彴鍦ㄧ嚎', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '涓�鏈轰竴妗�', icon: 'el-icon-folder', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '鐐逛綅鍦ㄧ嚎', icon: 'el-icon-search', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '褰曞儚鍙敤', icon: 'el-icon-turn-off', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '瑙嗛鏍囨敞', icon: 'el-icon-place', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�', icon: 'el-icon-film', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊', icon: 'el-icon-house', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '瑙嗛鍥惧儚璐ㄩ噺', icon: 'el-icon-set-up', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' }
+ { name: '骞冲彴鍦ㄧ嚎', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '涓�鏈轰竴妗�', icon: 'el-icon-folder', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '鐐逛綅鍦ㄧ嚎', icon: 'el-icon-search', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '褰曞儚鍙敤', icon: 'el-icon-turn-off', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '瑙嗛鏍囨敞', icon: 'el-icon-place', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�', icon: 'el-icon-film', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊', icon: 'el-icon-house', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '瑙嗛鍥惧儚璐ㄩ噺', icon: 'el-icon-set-up', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', type: '1' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', type: '1' }
],
carData: [
- { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛璁惧url鍙敤鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' }
+ { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛璁惧url鍙敤鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' },
+ { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', type: '2' }
],
faceData: [
- { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '鐩綍涓�鑷寸巼', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '璁惧鎶撴媿鍥剧墖鍚堟牸鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-thumb', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-pie-chart', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
+ { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '鐩綍涓�鑷寸巼', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '璁惧鎶撴媿鍥剧墖鍚堟牸鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-thumb', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-pie-chart', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', type: '3' },
+ { name: '', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', type: '3' },
],
equipment: [
- { name: '璧勪骇绠＄悊', icon: 'el-icon-wallet', description: '鎻忚堪淇℃伅', routerUrl: '/equipment/index' },
- { name: '', icon: 'el-icon-pie-chart', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
- { name: '', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/vehicle-data-monitor' },
+ { name: '璧勪骇绠＄悊', icon: 'el-icon-wallet', description: '鎻忚堪淇℃伅', type: '4' },
+ { name: '', icon: 'el-icon-pie-chart', description: '鎻忚堪淇℃伅', type: '4' },
+ { name: '', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', type: '4' },
+ { name: '', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', type: '4' },
+ { name: '', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', type: '4' },
+ { name: '', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', type: '4' },
]
};
},
methods: {
- handleDetail(item) {
+ handleDetail(item, index) {
this.$router.push({
- path: `/data-manage/data-detail/index/${'car'}/${1}`,
- });
- return;
- this.$router.push({
- path: item.routerUrl,
- params: {
- id: item.id
- }
+ path: `/data-manage/data-detail/index/1/1?type=${item.type}&index=${index}`,
});
}
}
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 14f07aa..121c94d 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -12,12 +12,11 @@
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="workOrderNo">
<el-select v-model="queryParams.errorType" placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
- <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"></el-option>
- <el-option label="璁惧閬楀け" value="璁惧閬楀け"></el-option>
+ <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="瀹℃牳鐘舵��" clearable @clear="handleQuery">
+ <el-select v-model="queryParams.status" placeholder="瀹℃牳鐘舵��" @change="handleQuery">
<el-option label="宸蹭笅鍙�" value="DISTRIBUTED"></el-option>
<el-option label="杩愮淮宸插鐞�" value="YW_HANDLE"></el-option>
<el-option label="瀹℃牳閫氳繃" value="AUDITING_SUCCESS"></el-option>
@@ -43,6 +42,18 @@
</el-form-item>
</el-form>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ size="mini"
+ @click="batchAuditingVisible = true; batchAuditingWorkOrder = {}"
+ v-hasPermi="['work:order:audit']"
+ >鎵归噺瀹℃牳</el-button>
+ </el-col>
+ </el-row>
+
<el-row :gutter="20">
<el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id" style="margin-bottom: 20px;">
<el-card :body-style="{ padding: '0px',display: 'flex' }">
@@ -140,12 +151,14 @@
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
<el-input v-model="auditingForm.ywPeopleName" disabled />
</el-form-item>
- <el-form-item label="鐜板満鎯呭喌" v-if="auditingForm.condition">
- <span v-html="auditingForm.condition"></span>
- </el-form-item>
- <el-form-item label="浣愯瘉鏉愭枡" v-if="auditingForm.proofMaterials">
- <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
- </el-form-item>
+ <div v-for="obj, index in ywConditions" :key="index">
+ <el-form-item :label="'鐜板満鎯呭喌' + (index + 1)" v-if="obj.ywCondition">
+ <span v-html="obj.ywCondition"></span>
+ </el-form-item>
+ <el-form-item label="浣愯瘉鏉愭枡" v-if="obj.ywProofMaterials">
+ <el-link v-for="item in obj.ywProofMaterials != null ? obj.ywProofMaterials.split(',') : obj.ywProofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ </el-form-item>
+ </div>
<el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
<el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
<el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>
@@ -184,9 +197,26 @@
</div>
</el-dialog>
+ <el-dialog title="杩愮淮鎵归噺瀹℃牳" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
+ <el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px" :rules="batchAuditingRules">
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
+ <el-select v-model="batchAuditingWorkOrder.errorType" placeholder="鏁呴殰绫诲瀷">
+ <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瀹℃牳璇存槑" prop="auditingRemark">
+ <el-input v-model="batchAuditingWorkOrder.auditingRemark" type="textarea" maxlength="30" show-word-limit />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')">瀹� 鏍�</el-button>
+ <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')">椹� 鍥�</el-button>
+ </div>
+ </el-dialog>
+
<!-- 杩囩▼鍥� -->
- <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
+ <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" append-to-body>
<div>
<el-steps :active="ywAuditingList.length != 0 ? 3 : ywHandleList.length != 0 ? 2 : 1" :space="500">
<el-step title="浜х敓宸ュ崟">
@@ -283,14 +313,19 @@
}
</style>
<script>
-import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition, getYwCondition, getYwConditionList, getYwAuditingList } from "@/api/platform/work-order";
+import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder, auditing, batchAuditing, ywCondition, getYwCondition, getYwConditionList, getYwAuditingList } from "@/api/platform/work-order";
import { addReport } from "@/api/platform/report";
+import { getDicts } from "@/api/system/dict/data";
export default {
name: "Work-order",
components: {
},
data() {
return {
+ errorTypeOptions: [],
+ ywConditions: [],
+ batchAuditingVisible: false,
+ batchAuditingWorkOrder: {},
ywHandleList: [],
ywAuditingList: [],
reportFormRules: {
@@ -388,12 +423,32 @@
{ required: true, message: "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", trigger: "blur" }
],
},
+ // 鎵归噺瀹℃牳鏍￠獙
+ batchAuditingRules: {
+ errorType: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
+ ],
+ }
};
},
created() {
this.getList();
},
methods: {
+ // 鎵归噺瀹℃牳
+ batchAuditing(result) {
+ this.batchAuditingWorkOrder.auditingResult = result;
+ this.$refs["batchAuditingWorkOrder"].validate(valid => {
+ if (valid) {
+ batchAuditing(this.batchAuditingWorkOrder).then(res => {
+ this.batchAuditingWorkOrder = {};
+ this.batchAuditingVisible = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ })
+ }
+ })
+ },
/** 涓嬭浇鎸夐挳鎿嶄綔 */
handleDownload (data) {
this.$download.resource(data);
@@ -420,10 +475,7 @@
handleAuditing(row) {
this.auditingForm = row;
getYwCondition(row.id).then(response => {
- if (response.data) {
- this.auditingForm.condition = response.data.ywCondition;
- this.auditingForm.proofMaterials = response.data.ywProofMaterials;
- }
+ this.ywConditions = response.data;
this.auditingOpen = true;
});
},
@@ -546,6 +598,10 @@
this.total = response.total;
this.loading = false;
});
+ // 鑾峰彇鏁呴殰绫诲瀷
+ getDicts("error_type").then(response => {
+ this.errorTypeOptions = response.data;
+ });
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.8.0