From 323df6a80616eec19125feba8bdb47adb25334a0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 12 十二月 2024 00:59:09 +0800
Subject: [PATCH] 一机一档OSD
---
src/views/system/data-manage/data-detail/list.js | 116 ++++++++++++++++++++--------------------------------------
src/views/system/data-manage/data-detail/index.vue | 4 +
2 files changed, 43 insertions(+), 77 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index 01dfd99..99220e2 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -111,7 +111,9 @@
<div>
<el-table v-loading="loading" :data="tableData.list">
- <el-table-column :prop="item.prop" :label="item.label" :width="item.width" v-for="(item, index) in tableHead"
+<!-- <el-table-column :prop="item.prop" :label="item.label" :width="item.width" v-for="(item, index) in tableHead"-->
+<!-- :key="index" v-if="showListPD(item)">-->
+ <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead"
:key="index" v-if="showListPD(item)">
<template slot-scope="scope">
<span :class="{'error-text': scope.row[item.error]}"> {{ scope.row[item.prop] }} </span>
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index d2e0b1e..47f7865 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -1356,73 +1356,55 @@
"label": "璁惧缂栫爜",
"align": "center",
"prop": "deviceNo",
- width: 190
+ width: 200
},
{
"label": "璁惧鍚嶇О",
"align": "center",
"prop": "osdName",
- width: 200
- },
- {
- "label": "鍝佺墝",
- "align": "center",
- "prop": "deviceBrandStr",
- width: 150
+ "error": "osdNameError",
+ width: 370
},
{
"label": "osd鐪�",
"align": "center",
"prop": "osdProvince",
- width: 150
+ "error": "osdProvinceError",
+ width: 180
},
{
"label": "osd甯�",
"align": "center",
"prop": "osdCity",
- width: 150
+ "error": "osdCityError",
+ width: 180
},
{
"label": "osd鍖�",
"align": "center",
"prop": "osdPart",
- width: 150
+ "error": "osdPartError",
+ width: 180
},
{
"label": "osd宸︿笅瑙�",
"align": "center",
"prop": "osdLB",
- width: 150
+ "error": "osdLBError",
+ width: 180
},
{
- "label": "osd鏃堕棿鏄惁姝ｇ‘",
+ "label": "osd鏃堕棿",
"align": "center",
- "prop": "osdTimeCorrectText",
- width: 150
+ "prop": "setTime",
+ "error": "osdTimeError",
+ width: 200
},
{
- "label": "osd閫氶亾鍚嶆槸鍚︽纭�",
+ "label": "妫�娴嬫椂闂�",
"align": "center",
- "prop": "osdNameCorrectText",
- width: 150
- },
- {
- "label": "osd鐪佹槸鍚︽纭�",
- "align": "center",
- "prop": "osdProvinceCorrectText",
- width: 150
- },
- {
- "label": "osd甯傛槸鍚︽纭�",
- "align": "center",
- "prop": "osdCityCorrectText",
- width: 150
- },
- {
- "label": "osd鍖烘槸鍚︽纭�",
- "align": "center",
- "prop": "osdPartCorrectText",
- width: 150
+ "prop": "checkTime",
+ width: 200
},
],
card: [
@@ -1461,11 +1443,8 @@
{key: 3, label: `osd甯俙, visible: true},
{key: 4, label: `osd鍖篳, visible: true},
{key: 5, label: `osd宸︿笅瑙抈, visible: true},
- {key: 6, label: `osd鏃堕棿鏄惁姝ｇ‘`, visible: true},
- {key: 7, label: `osd閫氶亾鍚嶆槸鍚︽纭甡, visible: true},
- {key: 7, label: `osd鐪佹槸鍚︽纭甡, visible: true},
- {key: 7, label: `osd甯傛槸鍚︽纭甡, visible: true},
- {key: 7, label: `osd鍖烘槸鍚︽纭甡, visible: true},
+ {key: 6, label: `osd鏃堕棿`, visible: true},
+ {key: 7, label: `妫�娴嬫椂闂碻, visible: true},
],
},
{
@@ -1476,67 +1455,55 @@
"label": "璁惧缂栫爜",
"align": "center",
"prop": "deviceNo",
- width: 190
+ width: 200
},
{
"label": "璁惧鍚嶇О",
"align": "center",
"prop": "osdName",
- width: 200
+ "error": "osdNameError",
+ width: 370
},
{
"label": "osd鐪�",
"align": "center",
"prop": "osdProvince",
- width: 150
+ "error": "osdProvinceError",
+ width: 180
},
{
"label": "osd甯�",
"align": "center",
"prop": "osdCity",
- width: 150
+ "error": "osdCityError",
+ width: 180
},
{
"label": "osd鍖�",
"align": "center",
"prop": "osdPart",
- width: 150
+ "error": "osdPartError",
+ width: 180
},
{
"label": "osd宸︿笅瑙�",
"align": "center",
"prop": "osdLB",
- width: 150
+ "error": "osdLBError",
+ width: 180
},
{
- "label": "osd鏃堕棿鏄惁姝ｇ‘",
+ "label": "osd鏃堕棿",
"align": "center",
- "prop": "osdTimeCorrectText",
- width: 150
+ "prop": "setTime",
+ "error": "osdTimeError",
+ width: 200
},
{
- "label": "osd閫氶亾鍚嶆槸鍚︽纭�",
+ "label": "妫�娴嬫椂闂�",
"align": "center",
- "prop": "osdNameCorrectText",
- width: 150
- },
- {
- "label": "osd鐪佹槸鍚︽纭�",
- "align": "center",
- "prop": "osdProvinceCorrectText",
- width: 150
- },
- {
- "label": "osd甯傛槸鍚︽纭�",
- "align": "center",
- "prop": "osdCityCorrectText",
- width: 150
- },
- {
- "label": "osd鍖烘槸鍚︽纭�",
- "align": "center",
- "prop": "osdPartCorrectText",
- width: 150
+ "prop": "checkTime",
+ width: 200
},
],
card: [
@@ -1575,11 +1542,8 @@
{key: 3, label: `osd甯俙, visible: true},
{key: 4, label: `osd鍖篳, visible: true},
{key: 5, label: `osd宸︿笅瑙抈, visible: true},
- {key: 6, label: `osd鏃堕棿鏄惁姝ｇ‘`, visible: true},
- {key: 7, label: `osd閫氶亾鍚嶆槸鍚︽纭甡, visible: true},
- {key: 7, label: `osd鐪佹槸鍚︽纭甡, visible: true},
- {key: 7, label: `osd甯傛槸鍚︽纭甡, visible: true},
- {key: 7, label: `osd鍖烘槸鍚︽纭甡, visible: true},
+ {key: 6, label: `osd鏃堕棿`, visible: true},
+ {key: 7, label: `妫�娴嬫椂闂碻, visible: true},
],
},
{
--
Gitblit v1.8.0