From a793e7ef20083d92028c9ca700fb7114fc6f9262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
=?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Wed, 12 Mar 2025 11:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E7=A9=BA=E5=88=97=E8=A1=A8=E5=8D=A0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/enterprise.vue | 9 +-
pages/index.vue | 11 +-
pages/task.vue | 5 +-
sub/enterprise/detail.vue | 3 +-
sub/inspection/record.vue | 1 +
sub/owner/jobInfo.vue | 96 ++++++-----
sub/task/detail.vue | 8 +-
sub/task/enforce.vue | 1 +
sub/task/locate.vue | 8 +-
sub/task/record.vue | 1 +
uni_modules/s-components/s-header/index.vue | 21 ++-
wxcomponents/vant/common/style/hairline.wxss | 54 +++++-
wxcomponents/vant/field/index.wxss | 166 ++++++++++++++++++-
wxcomponents/vant/search/index.wxss | 2 +-
14 files changed, 321 insertions(+), 65 deletions(-)
diff --git a/pages/enterprise.vue b/pages/enterprise.vue
index b7b6766..44c5a0a 100644
--- a/pages/enterprise.vue
+++ b/pages/enterprise.vue
@@ -355,6 +355,9 @@ export default {
position: relative;
overflow: hidden;
font-size: 24rpx;
+ &:last-child {
+ margin-bottom: 48rpx;
+ }
.address {
color: $uni-text-color-grey;
white-space: nowrap;
@@ -385,7 +388,7 @@ export default {
height: fit-content !important;
font-size: 26rpx;
justify-content: space-between;
- // padding: 12rpx 24rpx;
+ padding: 12rpx 24rpx;
}
}
::v-deep .van-search {
@@ -396,10 +399,14 @@ export default {
align-items: center;
.van-icon {
font-size: 40rpx;
+ font-weight: bold;
}
.van-field__body {
height: 100%;
}
+ .select-title {
+ font-size: 26rpx;
+ }
}
}
::v-deep .u-list {
diff --git a/pages/index.vue b/pages/index.vue
index a75ae73..240face 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -236,7 +236,7 @@ export default {
if (!this.$roles.checkRole(['director'])) {
this.queryParams.deptId = this.$store.getters.deptId
}
- await this.init()
+ // await this.init()
},
onReady() {
this.$nextTick(() => {
@@ -326,8 +326,7 @@ export default {
colorMap.push(color)
return res
})
- colorMap.push('#F9F9F9')
- this.color = colorMap
+ this.color = [...colorMap, '#F9F9F9']
this.detail.legendData = data
this.setPieData(data, this.detail.taskCompletionRate)
this.getList()
@@ -385,7 +384,7 @@ export default {
this.chartData = {
series: [
{
- data: [...pieData]
+ data: pieData
}
]
}
@@ -422,8 +421,8 @@ export default {
return realVal
},
getGradientColor(index, total) {
- const opacity = 1 - index / total + 0.1
- return `rgba(4, 180, 64, ${opacity})`
+ let opacity = 1 - index / total + 0.1
+ return `rgba(4, 180, 64, ${opacity > 1 ? 1 : opacity})`
}
}
}
diff --git a/pages/task.vue b/pages/task.vue
index 4fa77a1..b00ae29 100644
--- a/pages/task.vue
+++ b/pages/task.vue
@@ -324,7 +324,10 @@ export default {
position: relative;
overflow: hidden;
font-size: 24rpx;
- border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+ border: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+ &:last-child {
+ margin-bottom: 48rpx;
+ }
&:active {
background-color: $cs-color-touch;
}
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index 022f74e..bde15e4 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -110,7 +110,7 @@
-
+
+
diff --git a/sub/owner/jobInfo.vue b/sub/owner/jobInfo.vue
index aa21bd6..84caa87 100644
--- a/sub/owner/jobInfo.vue
+++ b/sub/owner/jobInfo.vue
@@ -45,8 +45,12 @@
+
+
+ 新增
+
+
-
@@ -225,7 +229,7 @@ export default {
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index f4ee1d0..1e0661b 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -63,11 +63,7 @@
ref="optionRef"
id="options"
>
-
+
-
+
(当前
{{ list.length }}
条记录)
diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue
index d3b55a5..a8000b0 100644
--- a/sub/task/enforce.vue
+++ b/sub/task/enforce.vue
@@ -258,6 +258,7 @@ export default {
padding: 24rpx 0;
align-items: center;
justify-content: center;
+ font-weight: bold;
}
.green {
background-color: $cs-color-main;
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index 6b9b69c..48fa8b1 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -324,7 +324,8 @@ export default {
async getDistance() {
if (this.enterpriseGps) {
uni.showLoading({
- title: '正在计算位置...'
+ title: '正在计算位置...',
+ mask: true
})
const that = this
this.$map.calculateDistance({
@@ -334,7 +335,9 @@ export default {
success: res => {
that.distance = res.result.elements[0].distance
console.log('distance', that.distance)
- uni.hideLoading()
+ setTimeout(function () {
+ uni.hideLoading()
+ }, 1000)
},
fail: err => {
console.log('获取定位失败', err)
@@ -473,6 +476,7 @@ export default {
padding: 12px 0;
align-items: center;
justify-content: center;
+ font-weight: bold;
}
.green {
background-color: $cs-color-main;
diff --git a/sub/task/record.vue b/sub/task/record.vue
index eba19b4..2f338c6 100644
--- a/sub/task/record.vue
+++ b/sub/task/record.vue
@@ -386,6 +386,7 @@ export default {
padding: 24rpx 0;
align-items: center;
justify-content: center;
+ font-weight: bold;
}
.green {
background-color: $cs-color-main;
diff --git a/uni_modules/s-components/s-header/index.vue b/uni_modules/s-components/s-header/index.vue
index 941b577..629e41c 100644
--- a/uni_modules/s-components/s-header/index.vue
+++ b/uni_modules/s-components/s-header/index.vue
@@ -5,7 +5,7 @@
-
+
{
+ this.operatStyle[i] = `${menuButtonInfo[i] * 2}rpx`
+ })
+ delete this.operatStyle.left
+ delete this.operatStyle.right
+ delete this.operatStyle.bottom
+ delete this.operatStyle.width
+ },
goback() {
this.$emit('goback')
}
@@ -57,6 +73,7 @@ export default {
flex-flow: row nowrap;
align-items: center;
gap: 8rpx;
+ position: absolute;
.title {
color: #071437;
font-size: 32rpx;
diff --git a/wxcomponents/vant/common/style/hairline.wxss b/wxcomponents/vant/common/style/hairline.wxss
index f7c6260..f76ef8d 100644
--- a/wxcomponents/vant/common/style/hairline.wxss
+++ b/wxcomponents/vant/common/style/hairline.wxss
@@ -1 +1,53 @@
-.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{border:0 solid #ebedf0;bottom:-50%;box-sizing:border-box;content:" ";left:-50%;pointer-events:none;position:absolute;right:-50%;top:-50%;transform:scale(.5);transform-origin:center}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
+.van-hairline,
+.van-hairline--bottom,
+.van-hairline--left,
+.van-hairline--right,
+.van-hairline--surround,
+.van-hairline--top,
+.van-hairline--top-bottom {
+ position: relative
+}
+
+.van-hairline--bottom:after,
+.van-hairline--left:after,
+.van-hairline--right:after,
+.van-hairline--surround:after,
+.van-hairline--top-bottom:after,
+.van-hairline--top:after,
+.van-hairline:after {
+ border: 0 solid #ebedf0;
+ bottom: -50%;
+ box-sizing: border-box;
+ content: " ";
+ left: -50%;
+ pointer-events: none;
+ position: absolute;
+ right: -50%;
+ top: -50%;
+ transform: scale(.5);
+ transform-origin: center
+}
+
+.van-hairline--top:after {
+ border-top-width: 1px
+}
+
+.van-hairline--left:after {
+ border-left-width: 1px
+}
+
+.van-hairline--right:after {
+ border-right-width: 1px
+}
+
+.van-hairline--bottom:after {
+ border-bottom-width: 1px
+}
+
+.van-hairline--top-bottom:after {
+ border-width: 1px 0
+}
+
+.van-hairline--surround:after {
+ border-width: 1px
+}
\ No newline at end of file
diff --git a/wxcomponents/vant/field/index.wxss b/wxcomponents/vant/field/index.wxss
index 5f7d306..407cdb9 100644
--- a/wxcomponents/vant/field/index.wxss
+++ b/wxcomponents/vant/field/index.wxss
@@ -1 +1,165 @@
-@import '../common/index.wxss';.van-field{--cell-icon-size:var(--field-icon-size,16px)}.van-field__label{color:var(--field-label-color,#646566)}.van-field__label--disabled{color:var(--field-disabled-text-color,#c8c9cc)}.van-field__body{align-items:center;display:flex}.van-field__body--textarea{box-sizing:border-box;line-height:1.2em;min-height:var(--cell-line-height,24px);padding:3.6px 0}.van-field__control:empty+.van-field__control{display:block}.van-field__control{background-color:initial;border:0;box-sizing:border-box;color:var(--field-input-text-color,#323233);display:none;height:var(--cell-line-height,24px);line-height:inherit;margin:0;min-height:var(--cell-line-height,24px);padding:0;position:relative;resize:none;text-align:left;width:100%}.van-field__control:empty{display:none}.van-field__control--textarea{height:var(--field-text-area-min-height,18px);min-height:var(--field-text-area-min-height,18px)}.van-field__control--error{color:var(--field-input-error-text-color,#ee0a24)}.van-field__control--disabled{background-color:initial;color:var(--field-input-disabled-text-color,#c8c9cc);opacity:1}.van-field__control--center{text-align:center}.van-field__control--right{text-align:right}.van-field__control--custom{align-items:center;display:flex;min-height:var(--cell-line-height,24px)}.van-field__placeholder{color:var(--field-placeholder-text-color,#c8c9cc);left:0;pointer-events:none;position:absolute;right:0;top:0}.van-field__placeholder--error{color:var(--field-error-message-color,#ee0a24)}.van-field__icon-root{align-items:center;display:flex;min-height:var(--cell-line-height,24px)}.van-field__clear-root,.van-field__icon-container{line-height:inherit;margin-right:calc(var(--padding-xs, 8px)*-1);padding:0 var(--padding-xs,8px);vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{flex-shrink:0}.van-field__clear-root{color:var(--field-clear-icon-color,#c8c9cc);font-size:var(--field-clear-icon-size,16px)}.van-field__icon-container{color:var(--field-icon-container-color,#969799);font-size:var(--field-icon-size,16px)}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:var(--padding-xs,8px)}.van-field__button:empty{display:none}.van-field__error-message{color:var(--field-error-message-color,#ee0a24);display:block;font-size:var(--field-error-message-text-font-size,12px);text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}.van-field__word-limit{color:var(--field-word-limit-color,#646566);font-size:var(--field-word-limit-font-size,12px);line-height:var(--field-word-limit-line-height,16px);margin-top:var(--padding-base,4px);text-align:right}.van-field__word-num{display:inline}.van-field__word-num--full{color:var(--field-word-num-full-color,#ee0a24)}
\ No newline at end of file
+@import '../common/index.wxss';
+
+.van-field {
+ --cell-icon-size: var(--field-icon-size, 16px)
+}
+
+.van-field__label {
+ color: var(--field-label-color, #646566)
+}
+
+.van-field__label--disabled {
+ color: var(--field-disabled-text-color, #c8c9cc)
+}
+
+.van-field__body {
+ align-items: center;
+ display: flex
+}
+
+.van-field__body--textarea {
+ box-sizing: border-box;
+ line-height: 1.2em;
+ min-height: var(--cell-line-height, 24px);
+ padding: 3.6px 0
+}
+
+.van-field__control:empty+.van-field__control {
+ display: block
+}
+
+.van-field__control {
+ background-color: initial;
+ border: 0;
+ box-sizing: border-box;
+ color: var(--field-input-text-color, #323233);
+ display: none;
+ height: var(--cell-line-height, 24px);
+ line-height: inherit;
+ margin: 0;
+ min-height: var(--cell-line-height, 24px);
+ padding: 0;
+ position: relative;
+ resize: none;
+ text-align: left;
+ width: 100%
+}
+
+.van-field__control:empty {
+ display: none
+}
+
+.van-field__control--textarea {
+ height: var(--field-text-area-min-height, 18px);
+ min-height: var(--field-text-area-min-height, 18px)
+}
+
+.van-field__control--error {
+ color: var(--field-input-error-text-color, #ee0a24)
+}
+
+.van-field__control--disabled {
+ background-color: initial;
+ color: var(--field-input-disabled-text-color, #c8c9cc);
+ opacity: 1
+}
+
+.van-field__control--center {
+ text-align: center
+}
+
+.van-field__control--right {
+ text-align: right
+}
+
+.van-field__control--custom {
+ align-items: center;
+ display: flex;
+ min-height: var(--cell-line-height, 24px)
+}
+
+.van-field__placeholder {
+ color: var(--field-placeholder-text-color, #99A1B7);
+ left: 0;
+ pointer-events: none;
+ position: absolute;
+ right: 0;
+ top: 0
+}
+
+.van-field__placeholder--error {
+ color: var(--field-error-message-color, #ee0a24)
+}
+
+.van-field__icon-root {
+ align-items: center;
+ display: flex;
+ min-height: var(--cell-line-height, 24px)
+}
+
+.van-field__clear-root,
+.van-field__icon-container {
+ line-height: inherit;
+ margin-right: calc(var(--padding-xs, 8px)*-1);
+ padding: 0 var(--padding-xs, 8px);
+ vertical-align: middle
+}
+
+.van-field__button,
+.van-field__clear-root,
+.van-field__icon-container {
+ flex-shrink: 0
+}
+
+.van-field__clear-root {
+ color: var(--field-clear-icon-color, #c8c9cc);
+ font-size: var(--field-clear-icon-size, 16px)
+}
+
+.van-field__icon-container {
+ color: var(--field-icon-container-color, #969799);
+ font-size: var(--field-icon-size, 16px)
+}
+
+.van-field__icon-container:empty {
+ display: none
+}
+
+.van-field__button {
+ padding-left: var(--padding-xs, 8px)
+}
+
+.van-field__button:empty {
+ display: none
+}
+
+.van-field__error-message {
+ color: var(--field-error-message-color, #ee0a24);
+ display: block;
+ font-size: var(--field-error-message-text-font-size, 12px);
+ text-align: left
+}
+
+.van-field__error-message--center {
+ text-align: center
+}
+
+.van-field__error-message--right {
+ text-align: right
+}
+
+.van-field__word-limit {
+ color: var(--field-word-limit-color, #646566);
+ font-size: var(--field-word-limit-font-size, 12px);
+ line-height: var(--field-word-limit-line-height, 16px);
+ margin-top: var(--padding-base, 4px);
+ text-align: right
+}
+
+.van-field__word-num {
+ display: inline
+}
+
+.van-field__word-num--full {
+ color: var(--field-word-num-full-color, #ee0a24)
+}
\ No newline at end of file
diff --git a/wxcomponents/vant/search/index.wxss b/wxcomponents/vant/search/index.wxss
index 033cace..451f06f 100644
--- a/wxcomponents/vant/search/index.wxss
+++ b/wxcomponents/vant/search/index.wxss
@@ -8,7 +8,7 @@
}
.van-search__content {
- background-color: var(--search-background-color, #f7f8fa);
+ background-color: var(--search-background-color, #F9F9F9);
border-radius: 2px;
display: flex;
flex: 1;