diff --git a/pages/attendanceStatus/attendanceStatistics.vue b/pages/attendanceStatus/attendanceStatistics.vue index d69ea14..e31b584 100644 --- a/pages/attendanceStatus/attendanceStatistics.vue +++ b/pages/attendanceStatus/attendanceStatistics.vue @@ -1,4 +1,4 @@ - + @@ -143,7 +328,6 @@ export default { @warn: #ff9f43; @danger: #ff4757; - .main { width: 100vw; min-height: 100vh; @@ -158,7 +342,6 @@ export default { left: 0; top: 0; width: 100vw; - // background: #fff; background-image: url("https://eshangtech.com/minTestImg/pageBg.png"); z-index: 99; display: flex; @@ -170,7 +353,6 @@ export default { width: 100%; height: 24px; position: absolute; - // left: 16px; z-index: 99999999999; box-sizing: border-box; display: flex; @@ -219,30 +401,11 @@ export default { color: #160002; } - .area { - font-size: 12px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #786B6C; - line-height: 40px; - margin-left: 4px; - } - .rightArrow { width: 12px; height: 12px; } - - .noticeText { - font-size: 24rpx; - font-family: PingFangSC, PingFang SC; - font-weight: 400; - color: #B6BACB; - line-height: 40rpx; - white-space: nowrap; - } } - } } } @@ -253,93 +416,211 @@ export default { width: 100%; background-color: #fff; box-sizing: border-box; - padding: 0 24rpx; + padding: 0 24rpx 8rpx; border-radius: 8rpx; - .rosterContentTop { - width: 100%; + /* 选择器行布局 */ + .selectorRow { display: flex; + gap: 24rpx; + padding: 24rpx 0; align-items: center; justify-content: space-between; + } - .dateBox { - box-sizing: border-box; - padding: 16rpx 0; + .dateBox { + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: center; + + .centerDateBox { display: flex; align-items: center; - justify-content: center; + gap: 10rpx; + border-radius: 30rpx; + background-color: #fff; + // border: 2rpx solid #27B35F; + // background: rgba(255, 255, 255, .15); - .centerDateBox { + .arrowIcon { + width: 40rpx; + height: 40rpx; + } + + .center { + .date-text { + font-size: 28rpx; + font-weight: 700; + } + } + + } + } + + /* 员工选择器 */ + .employeeSelector { + .employeePickerBox { + display: flex; + align-items: center; + justify-content: space-between; + // padding: 20rpx 24rpx; + // background: #f8f9fa; + border-radius: 30rpx; + // border: 2rpx solid #e0e0e0; + + .selectedEmployee { + font-size: 24rpx; + font-weight: 400; + color: #000; + margin-right: 8rpx; + } + + .rightArrow { + width: 26rpx; + height: 26rpx; + } + } + } + + /* 员工信息卡片 */ + .employeeDetail { + margin-bottom: 32rpx; + + .employeeCard { + background: #fff; + border-radius: 12rpx; + padding: 16rpx 24rpx; + box-shadow: @shadow; + + .employeeInfo { display: flex; align-items: center; - gap: 10rpx; - padding: 10rpx 20rpx; - border-radius: 30rpx; - background-color: #fff; - // border: 2rpx solid #27B35F; - // background: rgba(255, 255, 255, .15); - .arrowIcon { - width: 40rpx; - height: 40rpx; + .employeeName { + font-size: 28rpx; + font-weight: 600; + color: #333; + margin-right: 24rpx; } - .center { - .date-text { - font-size: 28rpx; - font-weight: 700; + .employeeJob { + font-size: 24rpx; + color: @primary; + background: rgba(39, 178, 95, 0.1); + padding: 0 16rpx; + border-radius: 20rpx; + margin-right: 24rpx; + } + + .phoneIcon { + width: 24rpx; + height: 24rpx; + margin-right: 8rpx; + } + + .employeePhone { + font-size: 24rpx; + color: #666; + } + } + } + } + + /* 日历格式排班表 */ + .calendarRoster { + background: #fff; + border-radius: 12rpx; + // padding: 32rpx; + box-shadow: @shadow; + margin-bottom: 32rpx; + + /* 星期标题 */ + .weekHeader { + display: flex; + border-bottom: 2rpx solid #e0e0e0; + // margin-bottom: 16rpx; + + .weekHeaderItem { + flex: 1; + text-align: center; + padding: 16rpx 0; + font-size: 28rpx; + font-weight: 600; + color: #333; + + &.weekend { + color: @danger; + } + } + } + + /* 日历网格 */ + .calendarGrid { + display: flex; + flex-wrap: wrap; + width: 100%; + + .calendarCell { + width: 14.28%; + height: 120rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + border: 1rpx solid #f0f0f0; + box-sizing: border-box; + position: relative; + + &.empty { + background-color: #fafafa; + } + + &.today { + background-color: rgba(39, 178, 95, 0.1); + border: 2rpx solid @primary; + } + + &.weekend { + .dateNumber { + // color: @danger; } } + .dateNumber { + font-size: 24rpx; + font-weight: 500; + color: #333; + margin-bottom: 4rpx; + } + + .scheduleInfo { + font-size: 24rpx; + padding: 2rpx 4rpx; + border-radius: 4rpx; + font-weight: 500; + text-align: center; + line-height: 1; + + &.work { + // background-color: #333; + color: #000; + } + + &.rest { + // background-color: #f5f5f5; + // color: #999; + color: red; + } + + &.empty { + visibility: hidden; + } + } } } } - .calendarBpx { - /deep/ .uni-calendar-item__weeks-box-item { - width: calc(100% / 7); - - .uni-calendar-item__weeks-box-circle { - display: none; - } - } - - /deep/ .uni-calendar-item--checked { - background-color: transparent; - color: #000 !important; - opacity: 1 !important; - } - - /deep/ .uni-calendar-item--isDay { - background-color: transparent; - color: #000 !important; - opacity: 1 !important; - } - - /deep/ .uni-calendar-item--isDay-text { - white-space: nowrap; - color: #000; - } - - /deep/ .uni-calendar__backtoday { - display: none; - } - - /* === info 文字颜色控制 === */ - .selectDateCalendar ::v-deep .uni-calendar__info { - color: #000 !important; - /* 默认黑色 */ - } - - /* 如果 info 等于“休”，文字改为红色 */ - .selectDateCalendar ::v-deep .uni-calendar__info[title="休"], - .selectDateCalendar ::v-deep .uni-calendar__info[data-info="休"] { - color: red !important; - } - } - - - } } - + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index e924fce..daffbba 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -85,7 +85,7 @@ }"> {{ subItem.name - }} + }} {{ @@ -103,7 +103,7 @@ : '', }">{{ subItem.addQOQ ? `${subItem.addQOQ}` : "" - }} + }} @@ -219,7 +219,7 @@ src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/monthIcon.svg" /> {{ $util.handleGetMonthDay(nowDay) - }} + }} /{{ howDay }} @@ -228,8 +228,8 @@ - - + + {{ currentMoney }} 实时对客销售/元 @@ -616,7 +616,8 @@ export default { StatisticsDate: this.nowDay, }; const res = await request.$webGet("CommercialApi/Revenue/GetCurRevenue", req) - this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2); + // this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2); + this.currentMoney = res.Result_Data.CurRevenueAmount.toLocaleString('zh-CN') }, // 拿到顶部轮播框的数据 @@ -1249,14 +1250,18 @@ export default { display: flex; align-items: center; justify-content: space-between; - margin-top: 24rpx; + // margin-top: 24rpx; + margin-top: 4rpx; .moneyText { - font-size: 44rpx; + display: inline-flex; font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; + font-size: 36rpx; color: #160002; - margin-right: 8rpx; + line-height: 40rpx; + text-align: right; + font-style: normal; } .moneyLabel { @@ -1267,7 +1272,6 @@ export default { color: #a69e9f; display: inline-flex; align-items: center; - margin-bottom: 12rpx; } } diff --git a/pages/summaryOfPortraits/components/mapDetail.vue b/pages/summaryOfPortraits/components/mapDetail.vue index 94aada1..cd2948d 100644 --- a/pages/summaryOfPortraits/components/mapDetail.vue +++ b/pages/summaryOfPortraits/components/mapDetail.vue @@ -81,7 +81,7 @@

取水方式

{{ info.ServerpartInfo.WATERINTAKE_TYPE === 1 ? '自来水' : info.ServerpartInfo.WATERINTAKE_TYPE === 2 ? '井水' : '' - }} + }}

污水处理

@@ -91,12 +91,12 @@

市区县镇

{{ info.ServerpartInfo.SERVERPART_ADDRESS ? info.ServerpartInfo.SERVERPART_ADDRESS : '' - }} + }}

管理单位

{{ info.ServerpartInfo.MANAGERCOMPANY ? info.ServerpartInfo.MANAGERCOMPANY : '' - }} + }}

产权单位

@@ -125,7 +125,7 @@

建筑面积

{{ info.ServerpartInfo.SERVERPART_AREA - }}m² + }}m²
@@ -727,9 +727,10 @@ export default { font-size: 12px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #160002; + color: #fff; + // color: #160002; padding: 0 6px; - background: #EAEAEA; + background: #43C677; border-radius: 2px; display: inline-block; width: 80rpx; diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue index 0beebfb..eeaad72 100644 --- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue +++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue @@ -83,6 +83,7 @@ * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}] * @property {Boolean} showMonth 是否选择月份为背景 + * @property {Boolean} maskClosable = [true|false] 点击蒙层是否关闭日历，默认为false * @event {Function} change 日期改变，`insert :ture` 时生效 * @event {Function} confirm 确认选择`insert :false` 时生效 * @event {Function} monthSwitch 切换月份时触发 @@ -131,6 +132,10 @@ clearDate: { type: Boolean, default: true + }, + maskClosable: { + type: Boolean, + default: false } }, data() { @@ -208,8 +213,13 @@ this.init(this.date) }, methods: { - // 取消穿透 - clean() {}, + // 点击蒙层处理 + clean() { + // 如果允许点击蒙层关闭，则关闭日历 + if (this.maskClosable) { + this.close(); + } + }, bindDateChange(e) { const value = e.detail.value + '-1' this.setDate(value)