From 0d7d5a5864c5b54170bbfcc7d85cf258e030d3b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:42:38 +0800
Subject: [PATCH] 代码初始化
---
admin/src/components/common/RichEditor.vue | 4 +-
admin/src/views/business/categoryDbhType.vue | 2
admin/src/components/common/UploadAvatarImage.vue | 2
admin/src/components/common/UploadFile.vue | 2
admin/src/components/common/UploadFileCommon.vue | 2
admin/src/views/business/categorySheLocaltion.vue | 2
admin/src/views/business/managersShe.vue | 4 +-
server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java | 1
admin/src/views/business/categoryDcaProblem.vue | 2
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 21 +++++-----
admin/src/components/common/UploadAvatarVideo.vue | 2
server/src/main/java/com/doumee/dao/business/model/Managers.java | 3 +
admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue | 5 +-
admin/src/components/common/UploadFaceImg.vue | 2
admin/src/views/business/managersSheNotice.vue | 12 +++++-
admin/src/components/common/UploadImage.vue | 2
admin/src/components/common/upload.vue | 2
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue | 8 +++-
admin/src/views/business/categoryDcaLocaltion.vue | 2
admin/src/views/business/categoryDbhLocaltion.vue | 6 +--
admin/lianhelihua_admin/index.html | 2
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue | 17 ++++----
22 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/admin/lianhelihua_admin/index.html b/admin/lianhelihua_admin/index.html
index 78b9df1..44bfdcc 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.61b5bbed.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.f758ac5d.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.61b5bbed.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js"></script><script src="/lianhelihua_admin/static/js/app.f758ac5d.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.f4542b62.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.0e03d457.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js"></script><script src="/lianhelihua_admin/static/js/app.0e03d457.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 245d85b..2931dd3 100644
--- a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
@@ -46,13 +46,13 @@
<div class="label">鍙戠敓鍦扮偣</div>
<div class="value">{{ info.locationName }}</div>
</div>
- <div class="item">
- <div class="label">椋庨櫓鎻忚堪</div>
- <div class="value">{{ info.riskInfo }}</div>
- </div>
- <div class="item">
+ <div class="item" style="width: 100%">
<div class="label">閫氱煡浜�</div>
<div class="value">{{ info.memberNames }}</div>
+ </div>
+ <div class="item" style="width: 100%">
+ <div class="label">椋庨櫓鎻忚堪</div>
+ <div class="value">{{ info.riskInfo }}</div>
</div>
<div class="item" style="width: 100%">
<div class="label">鍥剧墖</div>
@@ -253,14 +253,14 @@
display: flex;
flex-wrap: wrap;
- .item {
+ .item.item {
display: flex;
- width: 40%;
+ width: 50%;
font-size: 14px;
margin-bottom: 20px;
&:nth-of-type(2n) {
- width: 60%;
+ width: 50%;
}
.label {
@@ -269,6 +269,7 @@
}
.value {
+ width: calc(100% - 100px);
color: #111111;
}
}
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
index b6e62d9..ed6b287 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
@@ -255,12 +255,12 @@
.item {
display: flex;
- width: 40%;
+ width: 50%;
font-size: 14px;
margin-bottom: 20px;
&:nth-of-type(2n) {
- width: 60%;
+ width: 50%;
}
.label {
@@ -269,6 +269,7 @@
}
.value {
+ width: calc(100% - 100px);
color: #111111;
}
}
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index 8cc3844..2d0e79d 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -272,17 +272,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;
}
}
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index d5f9b49..9b99c9b 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -41,16 +41,8 @@
<div class="value" v-else>鏈汉</div>
</div>
<div class="item">
- <div class="label">鍙戠敓鍦扮偣</div>
- <div class="value">{{ info.locationName }}</div>
- </div>
- <div class="item">
<div class="label">鍙戠幇鏃堕棿</div>
<div class="value">{{ info.happenTime }}</div>
- </div>
- <div class="item">
- <div class="label">鍏蜂綋浣嶇疆</div>
- <div class="value">{{ info.remark }}</div>
</div>
<div class="item">
<div class="label">澶栭儴灏卞尰</div>
@@ -71,6 +63,14 @@
<div class="item">
<div class="label">鍜屽伐浣滅浉鍏�</div>
<div class="value">{{ info.workRelated == "0" ? "鍚�" : "鏄�" }}</div>
+ </div>
+ <div class="item">
+ <div class="label">鍙戠敓鍦扮偣</div>
+ <div class="value">{{ info.locationName }}</div>
+ </div>
+ <div class="item">
+ <div class="label">鍏蜂綋浣嶇疆</div>
+ <div class="value">{{ info.remark }}</div>
</div>
<div class="item">
<div class="label">浜嬩欢璇存槑</div>
@@ -287,12 +287,12 @@
.item {
display: flex;
- width: 40%;
+ width: 50%;
font-size: 14px;
margin-bottom: 20px;
&:nth-of-type(2n) {
- width: 60%;
+ width: 50%;
}
.label {
@@ -301,6 +301,7 @@
}
.value {
+ width: calc(100% - 100px);
color: #111111;
}
}
diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index 91cd904..b1d27af 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/admin/src/components/common/RichEditor.vue
@@ -129,10 +129,10 @@
MENU_CONF: {
// 鍥剧墖涓婁紶
uploadImage: {
- server: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload?folder=richeditor',
+ server: process.env.VUE_APP_API_PREFIX + '/web/public/upload?folder=richeditor',
fieldName: 'file',
// 鍗曚釜鏂囦欢鐨勬渶澶т綋绉檺鍒讹紝榛樿涓� 2M
- maxFileSize: 10 * 1024 * 1024, // 10M
+ maxFileSize: 20 * 1024 * 1024, // 10M
// 鏈�澶氬彲涓婁紶鍑犱釜鏂囦欢锛岄粯璁や负 100
maxNumberOfFiles: 10,
// 閫夋嫨鏂囦欢鏃剁殑绫诲瀷闄愬埗锛岄粯璁や负 ['image/*'] 銆傚涓嶆兂闄愬埗锛屽垯璁剧疆涓� []
diff --git a/admin/src/components/common/UploadAvatarImage.vue b/admin/src/components/common/UploadAvatarImage.vue
index dfd5d22..e39f3e5 100644
--- a/admin/src/components/common/UploadAvatarImage.vue
+++ b/admin/src/components/common/UploadAvatarImage.vue
@@ -31,7 +31,7 @@
data() {
return {
loading: null,
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/upload'
}
},
diff --git a/admin/src/components/common/UploadAvatarVideo.vue b/admin/src/components/common/UploadAvatarVideo.vue
index c0e43d9..1ed4dbd 100644
--- a/admin/src/components/common/UploadAvatarVideo.vue
+++ b/admin/src/components/common/UploadAvatarVideo.vue
@@ -36,7 +36,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/upload'
}
},
diff --git a/admin/src/components/common/UploadFaceImg.vue b/admin/src/components/common/UploadFaceImg.vue
index 98e2dd1..ac68d58 100644
--- a/admin/src/components/common/UploadFaceImg.vue
+++ b/admin/src/components/common/UploadFaceImg.vue
@@ -56,7 +56,7 @@
img: null,
updateImg: false,
imageSrc: null,
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/upload'
}
},
diff --git a/admin/src/components/common/UploadFile.vue b/admin/src/components/common/UploadFile.vue
index 7dcad1f..888a670 100644
--- a/admin/src/components/common/UploadFile.vue
+++ b/admin/src/components/common/UploadFile.vue
@@ -34,7 +34,7 @@
data() {
return {
fileList:null,
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload?folder='+this.uploadData.folder
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/upload?folder='+this.uploadData.folder
}
},
diff --git a/admin/src/components/common/UploadFileCommon.vue b/admin/src/components/common/UploadFileCommon.vue
index db8be23..8ad4306 100644
--- a/admin/src/components/common/UploadFileCommon.vue
+++ b/admin/src/components/common/UploadFileCommon.vue
@@ -39,7 +39,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/upload'
}
},
diff --git a/admin/src/components/common/UploadImage.vue b/admin/src/components/common/UploadImage.vue
index c0bb2bb..12b87ab 100644
--- a/admin/src/components/common/UploadImage.vue
+++ b/admin/src/components/common/UploadImage.vue
@@ -59,7 +59,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadLocal',
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/uploadLocal',
realList: [],
srcList: [],
diff --git a/admin/src/components/common/upload.vue b/admin/src/components/common/upload.vue
index ccde115..f941a83 100644
--- a/admin/src/components/common/upload.vue
+++ b/admin/src/components/common/upload.vue
@@ -48,7 +48,7 @@
},
data () {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/web/public/upload'
}
},
diff --git a/admin/src/views/business/categoryDbhLocaltion.vue b/admin/src/views/business/categoryDbhLocaltion.vue
index 3d21b0d..e6d3443 100644
--- a/admin/src/views/business/categoryDbhLocaltion.vue
+++ b/admin/src/views/business/categoryDbhLocaltion.vue
@@ -14,9 +14,7 @@
</el-form>
</div>
<template v-slot:menu>
- <div
- style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
- 璺岀粖婊戦闄╁彂鐢熷湴鐐�</div>
+ <div style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;"> 璺岀粖婊戦闄╁彂鐢熷湴鐐�</div>
<div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
<Tree :list="treeList" :alllist="treeList" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
@callback="callback" />
@@ -59,7 +57,7 @@
import Tree from '@/components/common/Tree'
import { treeList } from '@/api/business/category'
export default {
- name: 'categorySheType',
+ name: 'categoryDbhLocaltion',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, OperaCategoryWindow },
data () {
diff --git a/admin/src/views/business/categoryDbhType.vue b/admin/src/views/business/categoryDbhType.vue
index 365dae2..79b049c 100644
--- a/admin/src/views/business/categoryDbhType.vue
+++ b/admin/src/views/business/categoryDbhType.vue
@@ -59,7 +59,7 @@
import Tree from '@/components/common/Tree'
import { treeList } from '@/api/business/category'
export default {
- name: 'categorySheType',
+ name: 'categoryDbhType',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, OperaCategoryWindow },
data () {
diff --git a/admin/src/views/business/categoryDcaLocaltion.vue b/admin/src/views/business/categoryDcaLocaltion.vue
index 33001b4..24b2667 100644
--- a/admin/src/views/business/categoryDcaLocaltion.vue
+++ b/admin/src/views/business/categoryDcaLocaltion.vue
@@ -59,7 +59,7 @@
import Tree from '@/components/common/Tree'
import { treeList } from '@/api/business/category'
export default {
- name: 'categorySheType',
+ name: 'categoryDcaLocation',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, OperaCategoryWindow },
data () {
diff --git a/admin/src/views/business/categoryDcaProblem.vue b/admin/src/views/business/categoryDcaProblem.vue
index 14937da..d35b9d3 100644
--- a/admin/src/views/business/categoryDcaProblem.vue
+++ b/admin/src/views/business/categoryDcaProblem.vue
@@ -66,7 +66,7 @@
import Tree from '@/components/common/Tree'
import { treeList } from '@/api/business/category'
export default {
- name: 'categorySheType',
+ name: 'categoryDcaProblem',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, OperaCategoryDcaProblemWindow },
data () {
diff --git a/admin/src/views/business/categorySheLocaltion.vue b/admin/src/views/business/categorySheLocaltion.vue
index c305190..e022196 100644
--- a/admin/src/views/business/categorySheLocaltion.vue
+++ b/admin/src/views/business/categorySheLocaltion.vue
@@ -59,7 +59,7 @@
import Tree from '@/components/common/Tree'
import { treeList } from '@/api/business/category'
export default {
- name: 'categorySheType',
+ name: 'categorySheLocation',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, OperaCategoryWindow },
data () {
diff --git a/admin/src/views/business/managersShe.vue b/admin/src/views/business/managersShe.vue
index 52171b8..9c97840 100644
--- a/admin/src/views/business/managersShe.vue
+++ b/admin/src/views/business/managersShe.vue
@@ -27,8 +27,8 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="memberName" label="浜哄憳濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="memberPhone" label="浜哄憳鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px"> </el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
diff --git a/admin/src/views/business/managersSheNotice.vue b/admin/src/views/business/managersSheNotice.vue
index 44b59bd..bb99811 100644
--- a/admin/src/views/business/managersSheNotice.vue
+++ b/admin/src/views/business/managersSheNotice.vue
@@ -28,14 +28,22 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="memberName" label="浜哄憳濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="memberPhone" label="浜哄憳鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px"></el-table-column>
+ <el-table-column prop="memberQwId" label="浼佸井ID" min-width="100px"></el-table-column>
+ <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px">
+ <template slot-scope="{row}">
+ <div v-if="row.memberEmail">{{row.memberEmail}}</div>
+ <div v-else style="color: #dc362e;cursor: pointer" title="鏆傛湭閰嶇疆浜哄憳閭锛岃鍓嶅線銆愪汉鍛樼鐞嗐��-銆愬憳宸ョ鐞嗐�戣彍鍗曠紪杈戣鍛樺伐淇℃伅锛岃缃偖绠变俊鎭�">
+ <el-button type="text" style="color: red" title="鏆傛湭閰嶇疆浜哄憳閭锛岃鍓嶅線銆愪汉鍛樼鐞嗐��-銆愬憳宸ョ鐞嗐�戣彍鍗曠紪杈戣鍛樺伐淇℃伅锛岃缃偖绠变俊鎭�" icon="el-icon-error" >鏈厤缃�</el-button>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="isQw" label="浼佸井閫氱煡" min-width="80px">
<template slot-scope="{row}">
<el-switch v-model="row.isQw" :active-value="1" :inactive-value="0" @change="updateInfo(row)"/>
</template>
</el-table-column>
- <el-table-column prop="isQw" label="閭欢閫氱煡" min-width="80px">
+ <el-table-column prop="isEmail" label="閭欢閫氱煡" min-width="80px">
<template slot-scope="{row}">
<el-switch v-model="row.isEmail" :active-value="1" :inactive-value="0" @change="updateEmailInfo(row)"/>
</template>
diff --git a/server/src/main/java/com/doumee/dao/business/model/Managers.java b/server/src/main/java/com/doumee/dao/business/model/Managers.java
index f257b97..7e78c07 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Managers.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Managers.java
@@ -84,4 +84,7 @@
@ApiModelProperty(value = "鍛樺伐閭")
@TableField(exist = false)
private String memberEmail;
+ @ApiModelProperty(value = "鍛樺伐浼佸井ID")
+ @TableField(exist = false)
+ private String memberQwId;
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
index 5e57bfb..c4b3fbd 100644
--- a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
@@ -166,6 +166,7 @@
queryWrapper.selectAll(Managers.class )
.selectAs(Member::getPhone,Managers::getMemberPhone)
.selectAs(Member::getName,Managers::getMemberName)
+ .selectAs(Member::getQwId,Managers::getMemberQwId)
.selectAs(Member::getEmail,Managers::getMemberEmail)
.selectAs(Member::getCompanyName,Managers::getCompanyName)
.selectAs(SystemUser::getUsername,Managers::getEditorName)
--
Gitblit v1.9.3