From 6b929b3a19e0580e255c02c2702895f361784d90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 四月 2025 17:47:44 +0800
Subject: [PATCH] 代码初始化
---
admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue | 6 +++---
admin/src/views/business/companyMember.vue | 2 +-
admin/src/views/business/workorderShe.vue | 2 +-
admin/src/views/business/workorderDbh.vue | 2 +-
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java | 10 +++++-----
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue | 10 +++++-----
admin/src/views/business/workorderDcaChild.vue | 1 +
server/src/main/resources/application.yml | 2 +-
admin/lianhelihua_admin/index.html | 2 +-
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 4 ++--
server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java | 2 +-
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue | 4 ++--
12 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/admin/lianhelihua_admin/index.html b/admin/lianhelihua_admin/index.html
index 641fe9c..3b2d24a 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.fa0e49b1.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.85dbe4af.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.fa0e49b1.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.85dbe4af.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.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
diff --git a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
index a0ea013..3c5f0de 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 == '3'" class="head_bg"
+ <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'" class="head_bg"
+ <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" 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 1fc299f..334f288 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 == '3'" class="head_bg"
+ <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'" class="head_bg"
+ <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" 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">
@@ -46,7 +46,7 @@
<div class="label">鍙戠幇鏃堕棿</div>
<div class="value">{{ info.happenTime}}</div>
</div>
- <div class="item">
+ <div class="item" style="width: 100%">
<div class="label">閫氱煡浜�</div>
<div class="value">{{ info.memberNames }}</div>
</div>
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index b0c5718..3ab348b 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -8,9 +8,9 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
- <img v-if="info.status == '3'" class="head_bg"
+ <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'" class="head_bg"
+ <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" 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">
@@ -82,7 +82,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,7 +90,6 @@
<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">
<template slot-scope="{row}">
<!-- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
@@ -103,6 +102,7 @@
<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>
@@ -117,7 +117,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>
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index db08016..eebea9f 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 == '3'" class="head_bg"
+ <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'" class="head_bg"
+ <img v-else-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/companyMember.vue b/admin/src/views/business/companyMember.vue
index 1280bff..851f003 100644
--- a/admin/src/views/business/companyMember.vue
+++ b/admin/src/views/business/companyMember.vue
@@ -153,7 +153,7 @@
this.loading = true
memberSync({})
.then(res => {
- this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.$tip.apiSuccess( '鍚屾鎴愬姛')
this.search()
})
.catch(e => {
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index a913132..15c8cea 100644
--- a/admin/src/views/business/workorderDbh.vue
+++ b/admin/src/views/business/workorderDbh.vue
@@ -85,7 +85,7 @@
<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="locationName" label="鍙戠敓鍦扮偣" min-width="150px"></el-table-column>
- <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="200px"></el-table-column>
+ <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="250px" show-overflow-tooltip ></el-table-column>
<el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="150px">
<template slot-scope="{row}">
<span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
diff --git a/admin/src/views/business/workorderDcaChild.vue b/admin/src/views/business/workorderDcaChild.vue
index af54536..6da6a13 100644
--- a/admin/src/views/business/workorderDcaChild.vue
+++ b/admin/src/views/business/workorderDcaChild.vue
@@ -96,6 +96,7 @@
<el-table-column prop="locationName" label="浣嶇疆" min-width="150px"></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="eventInfo" label="涓嶇鍚堝師鍥�" min-width="250px" show-overflow-tooltip ></el-table-column>
<el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="150px">
<template slot-scope="{row}">
<span v-if="row.memberPhone" >{{row.memberName}}/{{row.memberPhone }}</span>
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
index 4e073ac..7bee81a 100644
--- a/admin/src/views/business/workorderShe.vue
+++ b/admin/src/views/business/workorderShe.vue
@@ -98,7 +98,7 @@
<span v-else>鍚�</span>
</template>
</el-table-column>
- <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="200px"></el-table-column>
+ <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="200px" show-overflow-tooltip ></el-table-column>
<el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="150px">
<template slot-scope="{row}">
<span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
diff --git a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
index 4170d18..a501b01 100644
--- a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
+++ b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
@@ -118,7 +118,7 @@
try {
String[] interfaceUrl = QywxConstant.GET_MEDIA;
String url = qyUtil.qiweiUrl+interfaceUrl[0].replace("${accesstoken}",token).replace("${media_id}",media);
- log.error("浼佷笟寰俊涓存椂绱犳潗鑾峰彇url=========="+url);
+ log.info("浼佷笟寰俊涓存椂绱犳潗鑾峰彇url=========="+url);
return HttpsUtil.connectionInputsteam(url,"GET",null,null);
}catch (Exception e){
e.printStackTrace();
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 c6528e7..ddd8527 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
@@ -37,20 +37,20 @@
@ExcelColumn(name="鐘舵��",index =6,width = 4, valueMapping = "0=寰呭鐞�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
private Integer status;
@ApiModelProperty(value = "鐘舵�佹弿杩�")
- @ExcelColumn(name="鐘舵�佹弿杩�",index =5,width = 8)
+ @ExcelColumn(name="鐘舵�佹弿杩�",index =7,width = 8)
private String statusName;
@ApiModelProperty(value = "涓婃姤鏃堕棿", example = "1")
- @ExcelColumn(name="涓婃姤鏃堕棿",index =7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="涓婃姤鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date submitDate;
@ApiModelProperty(value = "鍙戠幇鏃堕棿", example = "1")
- @ExcelColumn(name="鍙戠幇鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="鍙戠幇鏃堕棿",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date happenTime;
@ApiModelProperty(value = "浣嶇疆", example = "1")
- @ExcelColumn(name="浣嶇疆",index =9 ,width = 6)
+ @ExcelColumn(name="浣嶇疆",index =10 ,width = 6)
private String locationName;
@ApiModelProperty(value = "涓嶇鍚堝師鍥�", example = "1")
- @ExcelColumn(name="涓嶇鍚堝師鍥�",index =10,width = 10)
+ @ExcelColumn(name="涓嶇鍚堝師鍥�",index =11,width = 10)
private String eventInfo;
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
@ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 8)
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index d2aa372..1936abe 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,7 @@
spring:
profiles:
- active: dev
+ active: test
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3