Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

MrShi

2024-12-04 edcdd5f3849e851888d495946685e0887cb2addf

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

 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;
      }
    }


 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{

 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'])"

 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 />

 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'])"

 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

 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;
      }
    }


 h5/pages/login.vue

@@ -33,7 +33,7 @@
  data() {
    return {
      form: {
                phone: '17878787878',
                phone: '18888888888',
                code: '1'
      },
            downTime: 0

 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>


 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(),"房源已被占用请刷新重试");
            };

 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);