From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index 8cc3844..5aeee8c 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -8,15 +8,16 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
- <img v-if="info.status == '3'" class="head_bg"
- src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
- <img v-else-if="info.status == '4'" class="head_bg"
+ <!-- <img v-if="info.status == '0'" class="head_bg"
+ src="@/assets/task/bg_shenhe_fail@2x.png" alt="">-->
+ <img v-if="info.status == '4' || info.status == '3'||info.status == '5'||info.status == '6'" class="head_bg"
src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
<img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">
<div class="left">
<div class="h1">{{ cateList[type] }}</div>
<div class="time">鎻愪氦鏃堕棿锛歿{ info.createDate }}</div>
</div>
+ <div class="right" :class="{ scs: info.status == '3' || info.status == '4' || info.status == '5', msg: info.status == '6' }">{{statusMap[info.status] }}</div>
</div>
<div class="info"> <div class="title">宸ュ崟淇℃伅</div>
<div class="list">
@@ -82,7 +83,7 @@
<el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
<template slot-scope="scope">{{ scope.$index+1}}</template>
</el-table-column>
- <el-table-column label="宸ュ崟鍙�" prop="code" min-width="100">
+ <el-table-column label="宸ュ崟鍙�" prop="code" min-width="120">
<template slot-scope="{row}">
<span style="color: #2E68EC;cursor: pointer" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA涓嶇鍚堥」宸ュ崟璇︽儏', row)" >{{ row.code || '-'}}</span>
</template>
@@ -90,14 +91,19 @@
<el-table-column label="涓�绾т富棰�" prop="typeName" min-width="60"> </el-table-column>
<el-table-column label="浜岀骇涓婚" prop="categoryName" min-width="60"> </el-table-column>
<el-table-column label="瑙傚療椤�" prop="problemTitle" min-width="100"> </el-table-column>
- <el-table-column label="涓嶇鍚堝師鍥�" prop="eventInfo" min-width="120" />
- <el-table-column label="澶勭悊鐘舵��" prop="status" min-width="80">
+ <el-table-column label="鐘舵��" prop="status" min-width="80">
<template slot-scope="{row}">
<!-- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
<span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
<span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
</template>
</el-table-column>
+ <el-table-column prop="statusInfo" label="鐘舵�佹弿杩�" min-width="100px">
+ <template slot-scope="{row}">
+ <span :class="'statusInfo'+row.status" >{{ row.statusName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="涓嶇鍚堝師鍥�" prop="eventInfo" min-width="180" />
<el-table-column label="鎿嶄綔" prop="status" min-width="80">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA涓嶇鍚堥」宸ュ崟璇︽儏', row)" icon="el-icon-zoom-out" >鏌ョ湅璇︽儏</el-button>
@@ -112,7 +118,7 @@
<el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
<template slot-scope="scope">{{ scope.$index+1}}</template>
</el-table-column>
- <el-table-column label="涓�绾т富棰�" prop="typeName" min-width="160"> </el-table-column>
+ <el-table-column label="涓�绾т富棰�" prop="typeName" min-width="140"> </el-table-column>
<el-table-column label="浜岀骇涓婚" prop="categoryName" min-width="150"> </el-table-column>
<el-table-column label="瑙傚療椤�" prop="problemTitle" min-width="400"> </el-table-column>
</el-table>
@@ -145,12 +151,12 @@
info: {},
dataList2: [],
statusMap: {
- 0: '寰呭垎閰峎TS',
- 1: '寰呭垎閰嶄换鍔�',
- 2: '寰呭伐绋嬪笀澶勭悊',
- 3: '宸茶В鍐�',
- 4: '宸茶В鍐�',
- 5: '宸茶В鍐�'
+ 0: '澶勭悊涓�',
+ 1: '澶勭悊涓�',
+ 2: '澶勭悊涓�',
+ 3: '宸插鐞�',
+ 4: '宸插鐞�',
+ 5: '宸插鐞�'
},
cateList: {
0: 'SHE浜嬩欢宸ュ崟',
@@ -249,7 +255,7 @@
.modal_wrap {
display: flex;
- height: 100%;
+ height: auto;
.modal_content {
flex: 1;
@@ -272,17 +278,21 @@
flex-wrap: wrap;
.item {
display: flex;
- width: 30%;
+ width: 50%;
font-size: 14px;
margin-bottom: 20px;
+
&:nth-of-type(2n) {
- width: 30%;
+ width: 50%;
}
+
.label {
color: #888888;
width: 100px;
}
+
.value {
+ width: calc(100% - 100px);
color: #111111;
}
}
--
Gitblit v1.9.3