From edcdd5f3849e851888d495946685e0887cb2addf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 十二月 2024 17:35:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/operation/components/deviceDetail.vue | 8 ++++----
h5/pages/workOrder/detail.vue | 4 ++--
admin/src/views/operation/components/maintainDetail.vue | 5 +++--
admin/src/views/system/user.vue | 2 +-
admin/src/views/project/components/OperaYwBuildingWindow.vue | 2 +-
admin/src/views/project/buildingList.vue | 2 +-
h5/pages/login.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java | 3 ++-
admin/src/views/project/projectList.vue | 2 +-
admin/src/views/workorder/components/detail.vue | 5 +++--
11 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/admin/src/views/operation/components/deviceDetail.vue b/admin/src/views/operation/components/deviceDetail.vue
index 5dad8e6..f3181aa 100644
--- a/admin/src/views/operation/components/deviceDetail.vue
+++ b/admin/src/views/operation/components/deviceDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow width="720px" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ <GlobalWindow width="720px" title="璁惧璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
<div class="main">
<div class="title">
@@ -25,7 +25,7 @@
</div>
<div class="item">
<div class="la">璁惧绠＄悊鍛�</div>
- <div class="val">{{ info.realName }}</div>
+ <div class="val">{{ info.realName || info.realname }}</div>
</div>
<div class="item">
<div class="la">鎵�鍦ㄤ綅缃�</div>
@@ -138,7 +138,7 @@
.item {
width: 33.3%;
- margin-bottom: 12px;
+ margin-bottom: 14px;
.photo {
width: 92px;
@@ -147,7 +147,7 @@
.la {
color: #7f7f7f;
- margin-top: 2px;
+ margin-bottom: 6px;
}
}
diff --git a/admin/src/views/operation/components/maintainDetail.vue b/admin/src/views/operation/components/maintainDetail.vue
index 0ab9cd3..048a182 100644
--- a/admin/src/views/operation/components/maintainDetail.vue
+++ b/admin/src/views/operation/components/maintainDetail.vue
@@ -90,10 +90,11 @@
.item {
width: 33.33%;
- margin-bottom: 8px;
+ margin-bottom: 14px;
.la {
- color: #7f7f7f
+ color: #7f7f7f;
+ margin-bottom: 6px;
}
}
.max{
diff --git a/admin/src/views/project/buildingList.vue b/admin/src/views/project/buildingList.vue
index cb453d9..a94db6f 100644
--- a/admin/src/views/project/buildingList.vue
+++ b/admin/src/views/project/buildingList.vue
@@ -35,7 +35,7 @@
<el-table-column prop="projectName" label="鎵�灞為」鐩�" min-width="100px"></el-table-column>
<el-table-column prop="code" label="妤煎畤缂栫爜" min-width="80px"></el-table-column>
<el-table-column prop="area" label="寤虹瓚闈㈢Н(m虏)" min-width="80px"></el-table-column>
- <el-table-column prop="cqArea" label="绠＄悊闈㈢Н(m虏)" min-width="80px"></el-table-column>
+ <el-table-column prop="manageArea" label="绠＄悊闈㈢Н(m虏)" min-width="80px"></el-table-column>
<el-table-column prop="roomNum" label="鎴块棿鎬绘暟(闂�)" min-width="80px"></el-table-column>
<el-table-column prop="roomRentNum" label="鍙嫑鍟嗘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
<el-table-column v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
diff --git a/admin/src/views/project/components/OperaYwBuildingWindow.vue b/admin/src/views/project/components/OperaYwBuildingWindow.vue
index 3a4c986..83fecbe 100644
--- a/admin/src/views/project/components/OperaYwBuildingWindow.vue
+++ b/admin/src/views/project/components/OperaYwBuildingWindow.vue
@@ -19,7 +19,7 @@
<el-input type="textarea" :rows="4" v-model="form.remark" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="寤虹瓚闈㈢Н(m虏)" prop="area">
- <el-input v-model="form.area" placeholder="璇疯緭鍏ョ畝鐩撮潰绉�(m虏)" v-trim />
+ <el-input v-model="form.area" placeholder="璇疯緭鍏ュ缓绛戦潰绉�(m虏)" v-trim />
</el-form-item>
<el-form-item label="浜ф潈闈㈢Н(m虏)" prop="cqArea">
<el-input v-model="form.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉�(m虏)" v-trim />
diff --git a/admin/src/views/project/projectList.vue b/admin/src/views/project/projectList.vue
index a150378..383fc76 100644
--- a/admin/src/views/project/projectList.vue
+++ b/admin/src/views/project/projectList.vue
@@ -22,7 +22,7 @@
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="椤圭洰鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="area" label="绠＄悊闈㈢Н(m)" min-width="100px"></el-table-column>
+ <el-table-column prop="area" label="绠＄悊闈㈢Н(m虏)" min-width="100px"></el-table-column>
<el-table-column prop="roomNum" label="鎬绘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
<el-table-column prop="roomRentNum" label="鍙嫑鍟嗘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
<el-table-column v-if="containPermissions(['business:ywproject:update', 'business:ywproject:delete'])"
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 73d74f4..ee79e9f 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -28,7 +28,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['system:user:create', 'system:user:delete']">
- <li v-permissions="['system:user:create']"><el-button icon="el-icon-plus" type="primary" @click="$refs.operaUserWindow.open('鏂板缓鐢ㄦ埛')">鏂板缓</el-button></li>
+ <!-- <li v-permissions="['system:user:create']"><el-button icon="el-icon-plus" type="primary" @click="$refs.operaUserWindow.open('鏂板缓鐢ㄦ埛')">鏂板缓</el-button></li> -->
<li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table
diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue
index 55f1e8d..d5337ea 100644
--- a/admin/src/views/workorder/components/detail.vue
+++ b/admin/src/views/workorder/components/detail.vue
@@ -70,6 +70,7 @@
<div class="name">{{ item.title }}</div>
<div class="time">鎿嶄綔鏃堕棿锛歿{ item.createDate }}</div>
<div class="creator">鎿嶄綔浜猴細{{ item.param1 }}</div>
+ <div class="creator" v-if="item.param2">鎸囨淳缁欙細{{ item.param2 }}</div>
</div>
</div>
</div>
@@ -330,11 +331,11 @@
.item {
width: 33.3%;
- margin-bottom: 12px;
+ margin-bottom: 14px;
.la {
color: #7f7f7f;
- margin-top: 2px;
+ margin-bottom: 6px;
}
}
diff --git a/h5/pages/login.vue b/h5/pages/login.vue
index 666d529..4c32dbc 100644
--- a/h5/pages/login.vue
+++ b/h5/pages/login.vue
@@ -33,7 +33,7 @@
data() {
return {
form: {
- phone: '17878787878',
+ phone: '18888888888',
code: '1'
},
downTime: 0
diff --git a/h5/pages/workOrder/detail.vue b/h5/pages/workOrder/detail.vue
index 6e74b6a..f1726d3 100644
--- a/h5/pages/workOrder/detail.vue
+++ b/h5/pages/workOrder/detail.vue
@@ -23,9 +23,9 @@
<view class="la">涓婃姤浜猴細</view>
<view class="val">{{ info.creatorName }}{{info.creatorCompany ? '-' + info.creatorCompany : ''}}</view>
</view>
- <view class="line" v-if="info.creatorPhone">
+ <view class="line" v-if="info.creatorPhone || info.creatorMobile">
<view class="la">鑱旂郴鐢佃瘽锛�</view>
- <view class="val">{{ info.creatorPhone }}</view>
+ <view class="val">{{ info.creatorMobile || info.creatorPhone }}</view>
</view>
<view class="line">
<view class="la">涓婃姤鏃堕棿锛�</view>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 2e5a8ff..b6d5a9f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -131,8 +131,8 @@
.eq(YwContractRoom::getType,Constants.ZERO)
.in(YwContractRoom::getRoomId,roomIds)
.in(YwContract::getStatus,Constants.THREE)
- .apply(" ( t.START_DATE < '"+DateUtil.getFomartDate(model.getBtDate(),"yyyy-MM-dd HH:mm:ss")+"' " +
- " and t.END_DATE > '"+DateUtil.getFomartDate(model.getStartDate(),"yyyy-MM-dd HH:mm:ss")+"' ) " )
+ .apply(" ( t.START_DATE < '"+DateUtil.getFomartDate(model.getEndDate(),"yyyy-MM-dd HH:mm:ss")+"' " +
+ " and t.BT_DATE > '"+DateUtil.getFomartDate(model.getStartDate(),"yyyy-MM-dd HH:mm:ss")+"' ) " )
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎴挎簮宸茶鍗犵敤璇峰埛鏂伴噸璇�");
};
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
index e47627a..7fb54c0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
@@ -30,6 +30,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -296,7 +297,7 @@
for (YwRoom data:ywRoomList) {
ProjectDataVO projectDataVO = new ProjectDataVO();
BeanUtils.copyProperties(data,projectDataVO);
- projectDataVO.setName(data.getCode() + " " + data.getArea() +"銕�");
+ projectDataVO.setName(data.getCode() + " " + data.getArea().setScale(2, BigDecimal.ROUND_HALF_UP) +"銕�");
projectDataVO.setPId(data.getFloor());
projectDataVO.setLv(Constants.THREE);
projectDataVOList.add(projectDataVO);
--
Gitblit v1.9.3