HB
/
ruoyi-miniapp
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

执法记录详情空列表占位

master
爱~海~爱海爱海~右 8 months ago
parent
df53ea3259
commit
a793e7ef20
14 changed files with 321 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      pages/enterprise.vue
  2. 11
      pages/index.vue
  3. 5
      pages/task.vue
  4. 3
      sub/enterprise/detail.vue
  5. 1
      sub/inspection/record.vue
  6. 96
      sub/owner/jobInfo.vue
  7. 8
      sub/task/detail.vue
  8. 1
      sub/task/enforce.vue
  9. 8
      sub/task/locate.vue
  10. 1
      sub/task/record.vue
  11. 21
      uni_modules/s-components/s-header/index.vue
  12. 54
      wxcomponents/vant/common/style/hairline.wxss
  13. 166
      wxcomponents/vant/field/index.wxss
  14. 2
      wxcomponents/vant/search/index.wxss

9
pages/enterprise.vue
Unescape View File

@ -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 {

11
pages/index.vue
Unescape View File

@ -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})`
}
}
}

5
pages/task.vue
Unescape View File

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

3
sub/enterprise/detail.vue
Unescape View File

@ -110,7 +110,7 @@
</view>
</view>
</view>
<view class="status">
<view class="status" v-if="prove.status != 1">
<cs-dict-tag
:dict="dictMap.enterprise_qualification_status"
:value="prove.status"
@ -373,6 +373,7 @@ export default {
display: flex;
padding: 24rpx 0;
align-items: center;
font-weight: bold;
justify-content: center;
}
.green {

1
sub/inspection/record.vue
Unescape View File

@ -59,6 +59,7 @@
></image>
</view>
</view>
<cs-emty v-if="list.length == 0"></cs-emty>
</scroll-view>
</template>

96
sub/owner/jobInfo.vue
Unescape View File

@ -45,8 +45,12 @@
<!-- 加载更多状态组件 -->
<uni-load-more :status="loadMoreStatus" />
<cs-bottom-wrapper>
<view class="operation">
<view class="add-btn" @click="handleAdd">新增</view>
</view>
</cs-bottom-wrapper>
<!-- 新增按钮 -->
<button class="add-btn" @click="handleAdd">新增</button>
</view>
</template>
@ -225,7 +229,7 @@ export default {
<style lang="scss">
.jobInfo-container {
background: #f9f9f9;
min-height: 100vh;
height: 100vh;
display: flex;
flex-direction: column;
padding-bottom: calc(88rpx + 68rpx); // 底部按钮高度 + 间距
@ -233,17 +237,29 @@ export default {
.search-box {
padding: 24rpx;
background: #ffffff;
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 1;
::v-deep .van-search {
padding: 0;
.van-search__content {
height: 44px;
border-radius: 16rpx;
align-items: center;
.van-icon {
font-size: 40rpx;
font-weight: bold;
}
.van-field__body {
height: 100%;
}
.select-title {
font-size: 26rpx;
}
}
}
}
.jobInfo-list {
flex: 1;
margin-top: 120rpx; // 搜索框高度 + padding
// margin-top: 120rpx; // 搜索框高度 + padding
.jobInfo-scroll {
height: calc(
100vh - 120rpx - 156rpx
@ -262,30 +278,32 @@ export default {
}
.jobInfo-title {
font-size: 28rpx;
color: #333333;
font-size: 30rpx;
font-weight: bold;
color: #071437;
line-height: 40rpx;
margin-bottom: 8rpx;
}
.jobInfo-time {
font-size: 24rpx;
color: #999999;
line-height: 34rpx;
font-size: 28rpx;
color: #78829d;
}
.item-btns {
display: flex;
gap: 16rpx;
gap: 24rpx;
button {
flex: 1;
height: 64rpx;
line-height: 64rpx;
text-align: center;
font-size: 28rpx;
border-radius: 8rpx;
border: none;
padding: 16rpx 0;
display: flex;
justify-content: center;
align-items: center;
}
.btn-preview {
@ -302,33 +320,25 @@ export default {
}
}
.add-btn {
position: fixed;
bottom: 68rpx; // 修改为 34px = 68rpx
left: 24rpx;
right: 24rpx;
height: 88rpx;
line-height: 88rpx;
background: #17c653;
color: #ffffff;
font-size: 32rpx;
border-radius: 8rpx;
text-align: center;
border: none;
}
.search-box {
.operation {
padding: 12px;
display: flex;
align-items: center;
justify-content: center;
gap: 12px;
background-color: #fff;
padding: 24rpx;
background: #ffffff;
::v-deep .van-search {
padding: 0;
background: transparent;
.van-search__content {
background: #f5f5f5;
border-radius: 8rpx;
}
.add-btn {
background: #17c653;
color: #ffffff;
flex: 1;
font-size: 32rpx;
border-radius: 8px;
display: flex;
padding: 12px 0;
align-items: center;
justify-content: center;
font-weight: bold;
}
}
</style>

8
sub/task/detail.vue
Unescape View File

@ -63,11 +63,7 @@
ref="optionRef"
id="options"
>
<van-dropdown-menu
safe-area-tab-bar
active-color="#17C653"
style="flex: 1"
>
<van-dropdown-menu active-color="#17C653" style="flex: 1">
<van-dropdown-item
v-if="showItem(['director'])"
:value="queryParams.departmentId"
@ -100,7 +96,7 @@
"
/>
</van-dropdown-menu>
<view class="wd-font-600" style="flex: 0 0 200rpx">
<view style="flex: 0 0 200rpx">
(当前
<text style="color: #17c653">{{ list.length }}</text>
条记录)

1
sub/task/enforce.vue
Unescape View File

@ -258,6 +258,7 @@ export default {
padding: 24rpx 0;
align-items: center;
justify-content: center;
font-weight: bold;
}
.green {
background-color: $cs-color-main;

8
sub/task/locate.vue
Unescape View File

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

1
sub/task/record.vue
Unescape View File

@ -386,6 +386,7 @@ export default {
padding: 24rpx 0;
align-items: center;
justify-content: center;
font-weight: bold;
}
.green {
background-color: $cs-color-main;

21
uni_modules/s-components/s-header/index.vue
Unescape View File

@ -5,7 +5,7 @@
<slot></slot>
</view>
<view v-else>
<view class="operation" v-if="isTab">
<view class="operation" v-if="isTab" :style="{ ...operatStyle }">
<u--image
src="/static/images/tabbers/logo.png"
width="48rpx"
@ -22,7 +22,9 @@
export default {
name: 's-header',
data() {
return {}
return {
operatStyle: {}
}
},
props: {
title: String,
@ -35,7 +37,21 @@ export default {
default: false
}
},
mounted() {
this.getSetRect()
},
methods: {
getSetRect() {
const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
this.operatStyle = {}
Object.keys(menuButtonInfo).forEach(i => {
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;

54
wxcomponents/vant/common/style/hairline.wxss
Unescape View File

@ -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}
.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
}

166
wxcomponents/vant/field/index.wxss
Unescape View File

@ -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)}
@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)
}

2
wxcomponents/vant/search/index.wxss
Unescape View File

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

Write Preview
Loading…
Cancel
Save