From 153755a112e38d41335a9b2840e9ce37e5d5f829 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 四月 2025 18:01:18 +0800
Subject: [PATCH] 代码初始化
---
admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue | 14 +++---
/dev/null | 0
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java | 2
server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java | 2
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue | 19 +++++----
server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java | 2
admin/lianhelihua_admin/index.html | 2
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 6 +-
admin/src/views/business/workorderDca.vue | 7 +++
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue | 6 +-
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java | 3 +
11 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/admin/lianhelihua_admin/index.html b/admin/lianhelihua_admin/index.html
index 3b2d24a..c60ad91 100644
--- a/admin/lianhelihua_admin/index.html
+++ b/admin/lianhelihua_admin/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>鑱斿悎鍒╁崕浜嬩欢涓婃姤绯荤粺</title><link href="/lianhelihua_admin/static/css/app.08950188.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.813d15d9.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.08950188.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js"></script><script src="/lianhelihua_admin/static/js/app.813d15d9.js"></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>鑱斿悎鍒╁崕浜嬩欢涓婃姤绯荤粺</title><link href="/lianhelihua_admin/static/css/app.80533324.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.bc1d7d83.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.80533324.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js"></script><script src="/lianhelihua_admin/static/js/app.bc1d7d83.js"></script></body></html>
\ No newline at end of file
diff --git a/admin/lianhelihua_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png b/admin/lianhelihua_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png
deleted file mode 100644
index 4ac63a2..0000000
--- a/admin/lianhelihua_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png
+++ /dev/null
Binary files differ
diff --git a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
index 3c5f0de..a9e2f01 100644
--- a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
@@ -8,9 +8,9 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
- <img v-if="info.status == '0'" class="head_bg"
- src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
- <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" 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">
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
index 334f288..93b8bc7 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
@@ -8,9 +8,9 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
- <img v-if="info.status == '0'" class="head_bg"
- src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
- <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" 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">
@@ -147,11 +147,11 @@
info: {},
statusMap: {
0: '寰呭垎閰峎TS',
- 1: '寰呭垎閰嶄换鍔�',
+ 1: '寰呭垎閰嶅伐绋嬪笀',
2: '寰呭垎閰嶄换鍔�',
- 3: '宸茶В鍐�',
- 4: '宸茶В鍐�',
- 5: '宸茶В鍐�'
+ 3: 'SHE鍏抽棴',
+ 4: 'WTS鍏抽棴',
+ 5: '宸ョ▼甯堝叧闂�'
},
cateList: {
0: 'SHE浜嬩欢宸ュ崟',
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index 3ab348b..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 == '0'" class="head_bg"
- src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
- <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" 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">
@@ -150,12 +151,12 @@
info: {},
dataList2: [],
statusMap: {
- 0: '寰呭垎閰峎TS',
- 1: '寰呭垎閰嶅伐绋嬪笀',
- 2: '寰呭垎閰嶄换鍔�',
- 3: 'SHE鍏抽棴',
- 4: 'WTS鍏抽棴',
- 5: '宸ョ▼甯堝叧闂�'
+ 0: '澶勭悊涓�',
+ 1: '澶勭悊涓�',
+ 2: '澶勭悊涓�',
+ 3: '宸插鐞�',
+ 4: '宸插鐞�',
+ 5: '宸插鐞�'
},
cateList: {
0: 'SHE浜嬩欢宸ュ崟',
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index eebea9f..83e91ab 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -8,9 +8,9 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
- <img v-if="info.status == '0'" class="head_bg"
- src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
- <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'||info.status == '6'" 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">
diff --git a/admin/src/views/business/workorderDca.vue b/admin/src/views/business/workorderDca.vue
index 84a77db..2d4faf3 100644
--- a/admin/src/views/business/workorderDca.vue
+++ b/admin/src/views/business/workorderDca.vue
@@ -64,6 +64,13 @@
</template>
</el-table-column>
<el-table-column prop="locationName" label="浣嶇疆" min-width="150px"></el-table-column>
+ <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <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="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="memberNames" label="閫氱煡浜�" min-width="150px"></el-table-column>
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
index 1b288ce..50eb1bb 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
@@ -26,7 +26,7 @@
@ExcelColumn(name="椋庨櫓绫诲瀷",index =3,width = 6)
private String typeName;
@ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
- @ExcelColumn(name="鐘舵��",index =4,width = 4, valueMapping = "0=寰呭鐞�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
+ @ExcelColumn(name="鐘舵��",index =4,width = 4, valueMapping = "0=澶勭悊涓�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
private Integer status;
@ApiModelProperty(value = "鐘舵�佹弿杩�")
@ExcelColumn(name="鐘舵�佹弿杩�",index =5,width = 8)
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java
index ddd8527..5571e59 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java
@@ -34,7 +34,7 @@
@ExcelColumn(name="涓嶇鍚堥」",index =5,width = 10)
private String problemTitle;
@ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
- @ExcelColumn(name="鐘舵��",index =6,width = 4, valueMapping = "0=寰呭鐞�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
+ @ExcelColumn(name="鐘舵��",index =6,width = 4, valueMapping = "0=澶勭悊涓�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
private Integer status;
@ApiModelProperty(value = "鐘舵�佹弿杩�")
@ExcelColumn(name="鐘舵�佹弿杩�",index =7,width = 8)
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
index 7fe4129..f647882 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
@@ -43,6 +43,9 @@
@ApiModelProperty("閫氱煡浜�")
@ExcelColumn(name="閫氱煡浜�",index =10,width = 8)
private String memberNames;
+ @ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
+ @ExcelColumn(name="鐘舵��",index =11,width = 4, valueMapping = "0=澶勭悊涓�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
+ private Integer status;
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
@ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 8)
private String memberName;
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java
index 91168ed..6e7492f 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java
@@ -38,7 +38,7 @@
@ExcelColumn(name="涓婃姤鏃堕棿",index =4 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date submitDate;
@ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
- @ExcelColumn(name="鐘舵��",index =5,width = 4, valueMapping = "0=寰呭鐞�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
+ @ExcelColumn(name="鐘舵��",index =5,width = 4, valueMapping = "0=澶勭悊涓�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
private Integer status;
@ApiModelProperty(value = "鍙戠敓鍦扮偣")
@ExcelColumn(name="鍙戠敓鍦扮偣",index =6,width = 8)
--
Gitblit v1.9.3