From 9e3f3dd8691cd647ddad68907e9582e5dba14e9d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 24 十月 2024 17:19:50 +0800
Subject: [PATCH] 工单回显补全、一机一档OSd优化
---
src/views/system/data-manage/data-detail/list.js | 67 ++++++++++++++++-----------------
src/views/system/work-order/index.vue | 8 ++--
2 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index 271c90b..30f7f92 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -1962,68 +1962,62 @@
{
"label": "osd鏃堕棿鏄惁姝ｇ‘",
"align": "center",
- "prop": "osdTimeCorrect",
+ "prop": "osdTimeCorrectText",
width: 150
},
{
"label": "osd閫氶亾鍚嶆槸鍚︽纭�",
"align": "center",
- "prop": "osdNameCorrect",
+ "prop": "osdNameCorrectText",
width: 150
},
{
"label": "osd鐪佹槸鍚︽纭�",
"align": "center",
- "prop": "osdProvinceCorrect",
+ "prop": "osdProvinceCorrectText",
width: 150
},
{
"label": "osd甯傛槸鍚︽纭�",
"align": "center",
- "prop": "osdCityCorrect",
+ "prop": "osdCityCorrectText",
width: 150
},
{
"label": "osd鍖烘槸鍚︽纭�",
"align": "center",
- "prop": "osdPartCorrect",
+ "prop": "osdPartCorrectText",
width: 150
},
- {
- "label": "osd宸︿笅瑙掓槸鍚︽纭�",
- "align": "center",
- "prop": "osdLbCorrect",
- width: 150
- },
-
],
card: [
{
icon: 'el-icon-wind-power',
dataList: [
{
- label: '鐐逛綅鍚嶇О鏍囨敞姝ｇ‘鏁�'
+ label: '鎬绘暟'
},
{
- label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
+ label: 'OSD姝ｇ‘鏁�'
},
{
- label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
+ label: 'OSD閿欒鏁�'
},
{
- label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+ label: 'OSD鏈煡鏁�'
},
{
- label: '浠婃棩鏍囨敞姝ｇ‘鐜�'
+ label: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�'
},
]
}
],
options: [
{ label: '姝ｇ‘',value: 1 },
- { label: '閿欒',value: 0 },
+ { label: '閿欒',value: -1 },
+ { label: '鏈煡',value: 0 },
],
- optionsName: '鏍囨敞姝ｇ‘',
+ optionsName: 'OSD鐘舵��',
},
{
title: '閲嶇偣鐐逛綅鏍℃椂姝ｇ‘鐜�',
@@ -2068,57 +2062,62 @@
{
"label": "osd鏃堕棿鏄惁姝ｇ‘",
"align": "center",
- "prop": "osdTimeCorrect",
+ "prop": "osdTimeCorrectText",
width: 150
},
{
"label": "osd閫氶亾鍚嶆槸鍚︽纭�",
"align": "center",
- "prop": "osdNameCorrect",
+ "prop": "osdNameCorrectText",
width: 150
},
{
"label": "osd鐪佹槸鍚︽纭�",
"align": "center",
- "prop": "osdProvinceCorrect",
+ "prop": "osdProvinceCorrectText",
width: 150
},
{
"label": "osd甯傛槸鍚︽纭�",
"align": "center",
- "prop": "osdCityCorrect",
+ "prop": "osdCityCorrectText",
width: 150
},
{
"label": "osd鍖烘槸鍚︽纭�",
"align": "center",
- "prop": "osdPartCorrect",
+ "prop": "osdPartCorrectText",
width: 150
},
- {
- "label": "osd宸︿笅瑙掓槸鍚︽纭�",
- "align": "center",
- "prop": "osdLbCorrect",
- width: 150
- },
-
],
card: [
{
icon: 'el-icon-wind-power',
dataList: [
{
- label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
+ label: '鎬绘暟'
},
{
- label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+ label: 'OSD姝ｇ‘鏁�'
},
{
- label: '浠婃棩鏍℃椂姝ｇ‘鐜�'
+ label: 'OSD閿欒鏁�'
+ },
+ {
+ label: 'OSD鏈煡鏁�'
+ },
+ {
+ label: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�'
},
]
}
],
+ options: [
+ { label: '姝ｇ‘',value: 1 },
+ { label: '閿欒',value: -1 },
+ { label: '鏈煡',value: 0 },
+ ],
+ optionsName: 'OSD鏃堕棿',
showList: [
{ key: 0, label: `璁惧鍘傚晢`, visible: false },
{ key: 1, label: `琛屾斂鍖哄煙`, visible: false },
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index ac906d5..7644a2d 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -171,8 +171,8 @@
<div class="moreInfo">
<el-descriptions style="width: 100%" title="" border :column="2" size="medium">
<el-descriptions-item label="璐熻矗鍗曚綅">{{ item.unitName }}</el-descriptions-item>
- <el-descriptions-item label="璐熻矗浜�">寮犱竴灞�</el-descriptions-item>
- <el-descriptions-item label="鑱旂郴鐢佃瘽">15115115142</el-descriptions-item>
+ <el-descriptions-item label="璐熻矗浜�">{{ item.unitContact }}</el-descriptions-item>
+ <el-descriptions-item label="鑱旂郴鐢佃瘽">{{ item.unitContactPhone }}</el-descriptions-item>
</el-descriptions>
</div>
</el-carousel-item>
@@ -362,8 +362,8 @@
>
<div style="padding: 20px;font-size: 14px">
<div class="row flow-item-x">
- <div class="flex1"><p>涓婃姤鍐呭锛�</p></div>
- <div class="flex2">
+ <div class="flex1" style=""><p>涓婃姤鍐呭锛�</p></div>
+ <div class="flex2" style="color: black">
<div v-html="ywData.content"></div>
</div>
</div>
--
Gitblit v1.8.0