解决冲突
This commit is contained in:
zhouyanli
@@ -118,7 +118,6 @@ function getlist() {
|
||||
})
|
||||
getSystemUsers_employee('complainUser', queryParmas.value.value)
|
||||
.then(res => {
|
||||
console.log(res)
|
||||
searchlist.value = res.data
|
||||
})
|
||||
.finally(() => {
|
||||
|
||||
@@ -5,132 +5,158 @@
|
||||
<view class="title_box flex items-center justify-between">
|
||||
<view class="title flex items-center">
|
||||
<view class="line"> </view>
|
||||
<text>{{ info.taskName }}</text>
|
||||
</view>
|
||||
<view class="inspection_status" v-if="info.status === 0"> <text>已巡检</text> </view>
|
||||
<view class="inspection_status todo" v-else>
|
||||
<text>未巡检</text>
|
||||
<text>{{ info.villageName }} - {{ info.taskName }}</text>
|
||||
</view>
|
||||
<view class="inspection_status"> <text>已巡检</text> </view>
|
||||
</view>
|
||||
<view class="info">
|
||||
<view class="item">
|
||||
<text>巡检项目：</text>
|
||||
<text>{{ info.items.join('； ') }}</text>
|
||||
<text>{{ info.planName }}</text>
|
||||
</view>
|
||||
<view class="item">
|
||||
<text>巡检时间：</text>
|
||||
<text>{{ info.time }}</text>
|
||||
<text>{{ info.taskTime }}</text>
|
||||
</view>
|
||||
<view class="item">
|
||||
<text>巡检小区：</text>
|
||||
<text>{{ info.villageName }}</text>
|
||||
</view>
|
||||
<view class="item">
|
||||
<text>巡检路线：</text>
|
||||
<text>{{ info.planName }}</text>
|
||||
</view>
|
||||
<view class="item">
|
||||
<text>巡检点：</text>
|
||||
<text>{{ info.point.join('; ') }}</text>
|
||||
<view class="" v-for="(item, index) in baseFormData" :key="index">
|
||||
<view class="item">
|
||||
<text>巡检路线：</text>
|
||||
<text>{{ item.routeName }}</text>
|
||||
</view>
|
||||
<view class="item">
|
||||
<text>巡检点：</text>
|
||||
<text v-for="(ite, ind) in item.points" :key="ind">{{ ite.pointName }}；</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="result_box">
|
||||
<view class="result_box" v-if="baseFormData.length > 0">
|
||||
<view class="inspecton_result_title">
|
||||
<text>巡检结果</text>
|
||||
</view>
|
||||
<view class="inspection_body" v-for="(item, index) in result" :key="index">
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检点：</text>
|
||||
<text>{{ item.pointName }}</text>
|
||||
<view class="inspection_body" v-for="(item, index) in baseFormData" :key="index">
|
||||
<view v-for="(ite, ind) in item.points" :key="ind">
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检路线：</text>
|
||||
<text style="font-weight: 550">{{ item.routeName }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检点：</text>
|
||||
<text>{{ ite.pointName }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检人：</text>
|
||||
<text>{{ info.inspectorName }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">手机号码：</text>
|
||||
<text>{{ info.phoneNumber }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检时间：</text>
|
||||
<text>{{ ite.createTime }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检状态：</text>
|
||||
<text>{{ ite.status === 0 ? '正常' : '异常' }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<view class="label">巡检结果：</view>
|
||||
<!-- <view class="desction_value"> {{ ite.desition }}</view> -->
|
||||
<view class="desction_value">
|
||||
<!-- <rich-text :nodes="ite.desition"></rich-text> -->
|
||||
<textarea class="my_textarea" disabled auto-height :value="ite.desition" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<view class="label">巡检照片：</view>
|
||||
<image
|
||||
lazy-load
|
||||
class="inspection_photo"
|
||||
v-for="(it, ind) in ite.files"
|
||||
:key="ind"
|
||||
:src="it"
|
||||
mode="scaleToFill"
|
||||
></image>
|
||||
</view>
|
||||
<view class="linedash" v-show="ind + 1 !== item.points.length"> </view>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检人：</text>
|
||||
<text>{{ item.user }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">手机号码：</text>
|
||||
<text>{{ item.phone }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<text class="label">巡检时间：</text>
|
||||
<text>{{ item.time }}</text>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<view class="label">巡检结果：</view>
|
||||
<view class="desction_value">{{ item.descrtion }}</view>
|
||||
</view>
|
||||
<view class="inspection_items">
|
||||
<view class="label">巡检照片：</view>
|
||||
<image
|
||||
lazy-load
|
||||
class="inspection_photo"
|
||||
v-for="(ite, ind) in item.photos"
|
||||
:key="ind"
|
||||
:src="ite"
|
||||
mode="scaleToFill"
|
||||
></image>
|
||||
</view>
|
||||
<view class="linedash" v-show="index + 1 !== result.length"> </view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="nodata" v-else>
|
||||
<text>暂无数据</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { getInspectionMain } from '@/api/insepction.js'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
|
||||
const taskid = ref('')
|
||||
const info = ref({
|
||||
items: ['设备巡检', '电力检查'],
|
||||
time: '07:00:00-12:00:00',
|
||||
villageName: '幸福苑小区',
|
||||
taskName: '幸福苑小区-B1层地下车区',
|
||||
status: 0, // 0 已巡检 1未巡检
|
||||
planName: '常规巡检路线1',
|
||||
point: ['安全出口1号', '巡检点2号', '巡检点3号']
|
||||
planName: '',
|
||||
remindTime: '',
|
||||
routes: [],
|
||||
taskId: '',
|
||||
taskName: '',
|
||||
taskTime: '',
|
||||
inspectorName: '',
|
||||
phoneNumber: '',
|
||||
villageName: ''
|
||||
})
|
||||
const baseFormData = ref([])
|
||||
|
||||
function init() {
|
||||
if (!taskid.value) return
|
||||
getInspectionMain(taskid.value)
|
||||
.then(res => {
|
||||
info.value = res.data
|
||||
if (!res.data.routes) return
|
||||
let result = res.data.routes
|
||||
.map(item => {
|
||||
if (!item.points || item.points.length <= 0) return false
|
||||
const points = item.points.map(ite => {
|
||||
return {
|
||||
pointId: ite.pointId,
|
||||
pointName: ite.pointName,
|
||||
status: ite.status ?? 0,
|
||||
createTime: ite.createTime,
|
||||
desition: ite.remark,
|
||||
files: ite.imgUrl ? ite.imgUrl.split(',') : [],
|
||||
phone: '',
|
||||
time: '',
|
||||
resientName: ''
|
||||
}
|
||||
})
|
||||
return {
|
||||
routeName: item.routeName,
|
||||
routeId: item.routeId,
|
||||
description: item.description,
|
||||
points: points
|
||||
}
|
||||
})
|
||||
.filter(item => item !== false)
|
||||
baseFormData.value = result
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '网络异常'
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
onLoad(options => {
|
||||
taskid.value = options.id
|
||||
init()
|
||||
})
|
||||
const result = ref([
|
||||
{
|
||||
pointName: '安全出口1号',
|
||||
user: '李相龙',
|
||||
phone: '1502360831',
|
||||
time: '2026-10-25 08:10:01',
|
||||
descrtion: '设备正常运转，电力系统正常，设备使用正常',
|
||||
photos: [
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80'
|
||||
]
|
||||
},
|
||||
{
|
||||
pointName: '巡检点2号',
|
||||
user: '李相龙',
|
||||
phone: '1502360831',
|
||||
time: '2026-10-25 10:10:01',
|
||||
descrtion: '部分墙体漏水',
|
||||
photos: [
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80'
|
||||
]
|
||||
},
|
||||
{
|
||||
pointName: '巡检点3号',
|
||||
user: '李相龙',
|
||||
phone: '1502360831',
|
||||
time: '2026-10-25 12:10:01',
|
||||
descrtion: '正常',
|
||||
photos: [
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80'
|
||||
]
|
||||
}
|
||||
])
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -216,7 +242,6 @@ const result = ref([
|
||||
width: 160rpx;
|
||||
height: 160rpx;
|
||||
margin-right: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
||||
@@ -224,7 +249,6 @@ const result = ref([
|
||||
font-weight: 450;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.desction_value {
|
||||
@@ -233,11 +257,23 @@ const result = ref([
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
line-height: 36rpx;
|
||||
max-height: 250rpx; /* 最大高度，超出滚动 */
|
||||
overflow-y: auto; /* 超出滚动 */
|
||||
|
||||
.my_textarea {
|
||||
min-height: 80rpx;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
line-height: 36rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.linedash {
|
||||
width: 100%;
|
||||
border: 2rpx dashed #ccc;
|
||||
height: 0;
|
||||
border: 1rpx dashed #ccc;
|
||||
margin: 40rpx 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,45 +3,59 @@
|
||||
<view class="page_padding">
|
||||
<view class="inspection_record_box flex-1 flex flex-col">
|
||||
<navBar @clickLeft="navBack" title="巡检记录"></navBar>
|
||||
|
||||
<TabsComponents :tabslist="tabslist" @update="handleChangeTabs"></TabsComponents>
|
||||
<view class="timebox">
|
||||
<view class="daybox flex items-center">
|
||||
<uni-datetime-picker
|
||||
type="date"
|
||||
:clear-icon="false"
|
||||
@change="handleChangeTime"
|
||||
v-model="queryParmas.date"
|
||||
>
|
||||
<view class="day">{{ showDate }}</view>
|
||||
</uni-datetime-picker>
|
||||
<view class="searchiconbox flex items-center">
|
||||
<view class="arrow"> </view>
|
||||
<view class="arrow1"> </view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<scroll-view
|
||||
class="record_body record-list"
|
||||
scroll-y
|
||||
lower-threshold="60"
|
||||
lower-threshold="160"
|
||||
@scrolltolower="scrolltolower"
|
||||
v-if="list.length > 0"
|
||||
>
|
||||
<!-- v-for -->
|
||||
<view class="record_item" v-for="(item, index) in list" :key="index">
|
||||
<view class="time">
|
||||
<view>{{ item.day }}</view>
|
||||
<view
|
||||
class="record_list_item"
|
||||
v-for="(ite, index) in list"
|
||||
:key="index"
|
||||
@tap="handleTap(ite)"
|
||||
>
|
||||
<view class="title flex items-center">
|
||||
<view class="title_name"> {{ ite.taskName }} </view>
|
||||
<view class="title_status" v-if="isComputed(ite.taskStatus)"> 已巡检 </view>
|
||||
<view class="title_status noinspection" v-else> 未巡检 </view>
|
||||
</view>
|
||||
<view class="record_list_box">
|
||||
<!-- v-for -->
|
||||
<view class="record_list_item" v-for="(ite, ind) in item.list" :key="ind">
|
||||
<view class="title flex items-center">
|
||||
<view class="title_name"> {{ ite.title }} </view>
|
||||
<view class="title_status" v-if="ite.status === 0"> 已巡检 </view>
|
||||
<view class="title_status noinspection" v-else> 未巡检 </view>
|
||||
</view>
|
||||
<view class="items">
|
||||
<!-- v-for -->
|
||||
<view class="item" v-for="(it, inde) in ite.items" :key="inde">
|
||||
<text>{{ it }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="time">
|
||||
<text>巡检时间：</text>
|
||||
<text>{{ ite.time }}</text>
|
||||
</view>
|
||||
<view class="time user">
|
||||
<text>巡检人：</text>
|
||||
<text>{{ ite.user }}</text>
|
||||
</view>
|
||||
<view class="items" v-if="ite.points">
|
||||
<view class="item" v-for="(itemname, itemindex) in ite.itemslist" :key="itemindex">
|
||||
<text>{{ itemname }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="time">
|
||||
<text>巡检时间：</text>
|
||||
<text>{{ ite.taskTime }}</text>
|
||||
</view>
|
||||
<view class="time user">
|
||||
<text>巡检人：</text>
|
||||
<text>{{ ite.inspectorName }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="nodata" v-else>
|
||||
<text>暂无数据</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -49,62 +63,48 @@
|
||||
<script setup lang="ts">
|
||||
import TabsComponents from '@/components/tabs/tabs.vue'
|
||||
import navBar from '@/components/navbar/navbar.vue'
|
||||
import { ref } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import { getInspectionList } from '@/api/insepction.js'
|
||||
import { parseTime } from '@/utils/time.js'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
|
||||
const isComputed = (status: string) => {
|
||||
const awaitlist = ['未完成', '待执行', '执行中']
|
||||
return !awaitlist.includes(status)
|
||||
}
|
||||
|
||||
const tabslist = [
|
||||
{
|
||||
name: '全部',
|
||||
value: 0
|
||||
value: 2
|
||||
},
|
||||
{
|
||||
name: '未巡检',
|
||||
value: 1
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name: ' 已巡检',
|
||||
value: 2
|
||||
value: 1
|
||||
}
|
||||
]
|
||||
function handleChangeTabs(val: number) {}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
const list = ref([
|
||||
{
|
||||
day: '10月11日',
|
||||
list: [
|
||||
{
|
||||
title: '标题1',
|
||||
status: 0,
|
||||
items: ['设备巡检'],
|
||||
time: '07:00:00-09:00:00',
|
||||
user: '李兴'
|
||||
},
|
||||
{
|
||||
title: '标题3',
|
||||
status: 0,
|
||||
items: ['设备巡检'],
|
||||
time: '07:00:00-09:00:00',
|
||||
user: '湖色'
|
||||
}
|
||||
]
|
||||
}
|
||||
])
|
||||
|
||||
const list = ref([])
|
||||
const queryParmas = ref({
|
||||
date: '',
|
||||
status: 2,
|
||||
pageNum: 1,
|
||||
pageSize: 5
|
||||
pageSize: 10
|
||||
})
|
||||
const showDate = computed(() => {
|
||||
return parseTime(queryParmas.value.date, '{m}月{d}日')
|
||||
})
|
||||
const isLoading = ref(false) // 加载锁
|
||||
const hasMore = ref(true) // 是否还有更多数据
|
||||
const total = ref(21)
|
||||
function scrolltolower() {
|
||||
// 必须加这两个判断！
|
||||
if (isLoading.value || !hasMore.value) {
|
||||
return
|
||||
}
|
||||
queryParmas.value.pageNum += 1
|
||||
getlist()
|
||||
}
|
||||
const total = ref(0)
|
||||
|
||||
function getlist() {
|
||||
// 1. 如果正在加载或没有更多数据，直接返回
|
||||
if (isLoading.value || !hasMore.value) return
|
||||
@@ -114,51 +114,76 @@ function getlist() {
|
||||
title: '加载中',
|
||||
mask: true
|
||||
})
|
||||
const { pageNum, pageSize } = queryParmas.value
|
||||
|
||||
const startId = (pageNum - 1) * pageSize + 1
|
||||
const arr = Array.from({ length: pageSize }).map((_, index) => {
|
||||
const realId = startId + index // ✅ 修复 ID 错误
|
||||
|
||||
// ✅ 随机生成 0、1、2
|
||||
const randomStatus = Math.floor(Math.random() * 2)
|
||||
return {
|
||||
day: '10月' + realId + '日',
|
||||
list: [
|
||||
{
|
||||
title: '标题1',
|
||||
status: randomStatus,
|
||||
items: ['设备巡检'],
|
||||
time: '07:00:00-09:00:00',
|
||||
user: '李兴'
|
||||
},
|
||||
{
|
||||
title: '标题3',
|
||||
status: randomStatus,
|
||||
items: ['设备巡检'],
|
||||
time: '07:00:00-09:00:00',
|
||||
user: '湖色'
|
||||
}
|
||||
]
|
||||
}
|
||||
const { pageNum, pageSize, date, status } = queryParmas.value
|
||||
getInspectionList({
|
||||
pageSize,
|
||||
pageNum,
|
||||
date,
|
||||
status
|
||||
})
|
||||
|
||||
// 追加数据（正确方式）
|
||||
list.value = [...list.value, ...arr]
|
||||
// 判断是否还有更多
|
||||
hasMore.value = list.value.length < total.value
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
.then(res => {
|
||||
list.value = res.rows
|
||||
let items: Set<string> = new Set()
|
||||
res.rows.forEach(item => {
|
||||
if (!item.points || item.points.length <= 0) return
|
||||
item.points.forEach(ite => {
|
||||
ite.itemNames.forEach(it => items.add(it))
|
||||
})
|
||||
item.itemslist = Array.from(items)
|
||||
})
|
||||
hasMore.value = list.value.length < res.total
|
||||
total.value = res.total
|
||||
})
|
||||
.finally(() => {
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
})
|
||||
}
|
||||
getlist()
|
||||
function resetList() {
|
||||
list.value = []
|
||||
queryParmas.value.pageNum = 1
|
||||
|
||||
function handleChangeTime(event: string) {
|
||||
hasMore.value = true
|
||||
queryParmas.value.date = event
|
||||
getlist()
|
||||
}
|
||||
|
||||
function handleTap(ite) {
|
||||
if (isComputed(ite.taskStatus)) {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/inspection/inspection_main?id=' + ite.id
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/inspection/inspection_upload?id=' + ite.id
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function scrolltolower() {
|
||||
if (isLoading.value || !hasMore.value) {
|
||||
return
|
||||
}
|
||||
queryParmas.value.pageNum += 1
|
||||
getlist()
|
||||
}
|
||||
|
||||
function handleChangeTabs(val: number) {
|
||||
hasMore.value = true
|
||||
queryParmas.value.status = val
|
||||
queryParmas.value.pageNum = 1
|
||||
queryParmas.value.pageSize = 10
|
||||
getlist()
|
||||
}
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
function init() {
|
||||
queryParmas.value.date = parseTime(new Date(), '{y}-{m}-{d}')
|
||||
getlist()
|
||||
}
|
||||
|
||||
onShow(() => {
|
||||
hasMore.value = true
|
||||
init()
|
||||
})
|
||||
// 返回上一页
|
||||
const navBack = () => {
|
||||
uni.navigateBack()
|
||||
@@ -174,91 +199,121 @@ const navBack = () => {
|
||||
height: 100vh;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box;
|
||||
.record_body {
|
||||
.timebox {
|
||||
width: 178rpx;
|
||||
height: 48rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 24rpx;
|
||||
text-align: center;
|
||||
line-height: 48rpx;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
margin-bottom: 20rpx;
|
||||
margin-top: 20rpx;
|
||||
.daybox {
|
||||
height: 100%;
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
.day {
|
||||
flex: 1;
|
||||
font-size: 28rpx;
|
||||
text-align: left;
|
||||
padding-left: 15rpx;
|
||||
}
|
||||
.searchiconbox {
|
||||
width: 38rpx;
|
||||
height: 48rpx;
|
||||
padding-right: 10rpx;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
.arrow,
|
||||
.arrow1 {
|
||||
border: 1rpx solid #ccc;
|
||||
width: 8rpx;
|
||||
height: 8rpx;
|
||||
}
|
||||
.arrow {
|
||||
border-right-color: transparent;
|
||||
border-top-color: transparent;
|
||||
transform: rotateZ(135deg);
|
||||
}
|
||||
.arrow1 {
|
||||
border-left-color: transparent;
|
||||
border-bottom-color: transparent;
|
||||
transform: rotateZ(135deg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.record_body {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
overflow-y: auto;
|
||||
box-sizing: border-box;
|
||||
.record_item {
|
||||
& > .time {
|
||||
width: 168rpx;
|
||||
height: 48rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 24rpx;
|
||||
text-align: center;
|
||||
line-height: 48rpx;
|
||||
|
||||
.record_list_item {
|
||||
margin-bottom: 20rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 16rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx;
|
||||
// 巡检标题
|
||||
.title {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
font-size: 32rpx;
|
||||
color: #222222;
|
||||
line-height: 40rpx;
|
||||
height: 40rpx;
|
||||
margin-bottom: 25rpx;
|
||||
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
.record_list_box {
|
||||
margin-bottom: 20rpx;
|
||||
.record_list_item {
|
||||
margin-bottom: 20rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 16rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx;
|
||||
// 巡检标题
|
||||
.title {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #222222;
|
||||
line-height: 40rpx;
|
||||
height: 40rpx;
|
||||
margin-bottom: 25rpx;
|
||||
.title_status {
|
||||
width: 86rpx;
|
||||
height: 30rpx;
|
||||
background: #4d5dfa;
|
||||
border-radius: 198rpx 198rpx 198rpx 198rpx;
|
||||
text-align: center;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
color: #ffffff;
|
||||
line-height: 30rpx;
|
||||
margin-left: 5rpx;
|
||||
|
||||
.title_status {
|
||||
width: 86rpx;
|
||||
height: 30rpx;
|
||||
background: #4d5dfa;
|
||||
border-radius: 198rpx 198rpx 198rpx 198rpx;
|
||||
text-align: center;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
color: #ffffff;
|
||||
line-height: 30rpx;
|
||||
margin-left: 5rpx;
|
||||
|
||||
&.noinspection {
|
||||
background-color: #ccc;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 巡检项目
|
||||
.items {
|
||||
margin-bottom: 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
.item {
|
||||
padding: 0 10rpx;
|
||||
height: 42rpx;
|
||||
border-radius: 8rpx 8rpx 8rpx 8rpx;
|
||||
border: 1rpx solid #4d5dfa;
|
||||
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #4d5dfa;
|
||||
text-align: center;
|
||||
line-height: 42rpx;
|
||||
margin-right: 20rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
|
||||
// 巡检人 巡检时间
|
||||
& > .time {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #999999;
|
||||
&.noinspection {
|
||||
background-color: #ccc;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 巡检项目
|
||||
.items {
|
||||
margin-bottom: 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
.item {
|
||||
padding: 0 10rpx;
|
||||
height: 42rpx;
|
||||
border-radius: 8rpx 8rpx 8rpx 8rpx;
|
||||
border: 1rpx solid #4d5dfa;
|
||||
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #4d5dfa;
|
||||
text-align: center;
|
||||
line-height: 42rpx;
|
||||
margin-right: 20rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
|
||||
// 巡检人 巡检时间
|
||||
& > .time {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #999999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
<view class="inspection_title flex flex-between">
|
||||
<view class="title flex">
|
||||
<text class="line"></text>
|
||||
<text>幸福苑小区- B1层地下车库</text>
|
||||
<text>{{ info.villageName }} - {{ info.taskName }}</text>
|
||||
</view>
|
||||
<view class="status">
|
||||
<view class="status" v-if="!isComputed">
|
||||
<text>未巡检</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="inspection_item_info_box">
|
||||
<view class="inspection_item">
|
||||
<text>巡检项目：</text>
|
||||
<text>设备巡检</text>
|
||||
<text>{{ info.planName }}</text>
|
||||
</view>
|
||||
<view class="inspection_item">
|
||||
<text>巡检时间：</text>
|
||||
@@ -22,106 +22,95 @@
|
||||
</view>
|
||||
<view class="inspection_item">
|
||||
<text>巡检小区：</text>
|
||||
<text>幸福苑小区</text>
|
||||
<text>{{ info.villageName }}</text>
|
||||
</view>
|
||||
<view class="inspection_item">
|
||||
<text>巡检路线：</text>
|
||||
<text>常规巡检路线1</text>
|
||||
</view>
|
||||
<view class="inspection_item">
|
||||
<text>巡检点：</text>
|
||||
<text>安全巡检点1；</text>
|
||||
<text>安全巡检点2；</text>
|
||||
<text>安全巡检点3；</text>
|
||||
<text>安全巡检点4；</text>
|
||||
<view class="" v-for="(item, index) in baseFormData" :key="index">
|
||||
<view class="inspection_item">
|
||||
<text>巡检路线：</text>
|
||||
<text>{{ item.routeName }}</text>
|
||||
</view>
|
||||
<view class="inspection_item">
|
||||
<text>巡检点：</text>
|
||||
<text v-for="(ite, ind) in item.points" :key="ind">{{ ite.ponitName }}；</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="inspection_info_upload_box">
|
||||
<view class="header"> <text>巡检结果</text> </view>
|
||||
<view class="info_body" :key="index" v-for="(item, index) in baseFormData">
|
||||
<view class="info_title" style="margin-bottom: 20rpx"> {{ item.name }} </view>
|
||||
<uni-forms :modelValue="item" :rules="rules" label-position="left" label-width="150">
|
||||
<uni-forms-item label="巡检状态" required>
|
||||
<uni-data-checkbox
|
||||
:disabled="item.complated"
|
||||
v-model="item.status"
|
||||
:localdata="statuslist"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="巡检描述">
|
||||
<uni-easyinput
|
||||
type="textarea"
|
||||
:disabled="item.complated"
|
||||
:input-border="true"
|
||||
v-model="item.desition"
|
||||
placeholder="请输入"
|
||||
></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="巡检时间">
|
||||
<uni-datetime-picker
|
||||
type="datetime"
|
||||
:disabled="item.complated"
|
||||
return-type="timestamp"
|
||||
v-model="item.datetimesingle"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<!-- <uni-forms-item label="巡检照片">
|
||||
<uni-file-picker
|
||||
@delete="deleteFile"
|
||||
@select="select"
|
||||
mode="grid"
|
||||
v-model="item.files"
|
||||
:auto-upload="false"
|
||||
:sourceType="['camera']"
|
||||
file-mediatype="image"
|
||||
>
|
||||
<view class="filePicker flex-center">
|
||||
<uni-icons color="#a6a6a6" type="plusempty" size="25"> </uni-icons>
|
||||
</view>
|
||||
</uni-file-picker>
|
||||
</uni-forms-item> -->
|
||||
<view class="items_picker_box">
|
||||
<view class="label"> 巡检照片 </view>
|
||||
<view class="filePickerbox" v-if="!item.complated">
|
||||
<filePicker
|
||||
v-model="item.files"
|
||||
:sourceType="['camera']"
|
||||
file-field-name="file"
|
||||
:extra-data="uploadParams"
|
||||
@success="onUploadSuccess"
|
||||
@fail="onUploadFail"
|
||||
></filePicker>
|
||||
</view>
|
||||
<view class="filePickerbox showimagegrid" v-else>
|
||||
<image
|
||||
class="img"
|
||||
mode="scaleToFill"
|
||||
v-for="(ite, ind) in item.files"
|
||||
lazy-load
|
||||
:key="ind"
|
||||
:src="ite"
|
||||
@tap="previewImages(item.files, index)"
|
||||
></image>
|
||||
</view>
|
||||
</view>
|
||||
</uni-forms>
|
||||
<view class="submitbox" @tap="handleSubmit(item.id)">
|
||||
<text>提交</text>
|
||||
<view class="inspection_info_upload_box" v-if="baseFormData.length > 0">
|
||||
<view class="inspection_routes" v-for="(item, index) in baseFormData" :key="index">
|
||||
<view class="header">
|
||||
<text>{{ item.routeName }} - 巡检结果</text>
|
||||
</view>
|
||||
<view class="info_body" v-for="(ite, ind) in item.points" :key="ind">
|
||||
<view class="info_title" style="margin-bottom: 20rpx"> {{ ite.ponitName }} </view>
|
||||
<uni-forms :modelValue="ite" :rules="rules" label-position="left" label-width="150">
|
||||
<uni-forms-item label="巡检状态" required>
|
||||
<uni-data-checkbox
|
||||
:disabled="ite.complated"
|
||||
v-model="ite.status"
|
||||
:localdata="statuslist"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="巡检描述" v-if="!ite.complated">
|
||||
<uni-easyinput
|
||||
type="textarea"
|
||||
:disabled="ite.complated"
|
||||
:input-border="true"
|
||||
v-model="ite.desition"
|
||||
placeholder="请输入"
|
||||
></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<view class="items_picker_box flex" style="align-items: baseline" v-else>
|
||||
<view class="label"> 巡检描述 </view>
|
||||
<view class="desitionbox flex-1">
|
||||
<text class="desition">{{ ite.desition }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="items_picker_box">
|
||||
<view class="label">
|
||||
<text v-if="info.inspectSetting === 1" class="is-required">*</text>
|
||||
<text>巡检照片</text>
|
||||
</view>
|
||||
<view class="filePickerbox" v-if="!ite.complated">
|
||||
<filePicker
|
||||
v-model="ite.files"
|
||||
:sourceType="['camera']"
|
||||
file-field-name="file"
|
||||
:extra-data="uploadParams"
|
||||
uploadUrl="/resource/oss/upload"
|
||||
@fail="onUploadFail"
|
||||
></filePicker>
|
||||
</view>
|
||||
<view class="filePickerbox showimagegrid" v-else>
|
||||
<image
|
||||
class="img"
|
||||
mode="scaleToFill"
|
||||
v-for="(ite, ind) in ite.files"
|
||||
lazy-load
|
||||
:key="ind"
|
||||
:src="ite"
|
||||
@tap="previewImages(ite.files, index)"
|
||||
></image>
|
||||
</view>
|
||||
</view>
|
||||
</uni-forms>
|
||||
<view class="submitbox" @tap="handleSubmit(ite)" v-if="!ite.complated">
|
||||
<text>提交</text>
|
||||
</view>
|
||||
<view class="line" v-if="ind + 1 === baseFormData.length"> </view>
|
||||
</view>
|
||||
<view class="line" v-if="index + 1 !== baseFormData.length"> </view>
|
||||
</view>
|
||||
<!-- <view class="submitbox">
|
||||
<text>提交</text>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import filePicker from '@/components/filePicker/filePicker.vue'
|
||||
import { getInspectionMain } from '@/api/insepction.js'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { putInsepctionPoint } from '@/api/insepction.js'
|
||||
|
||||
const statuslist = [
|
||||
{
|
||||
@@ -133,27 +122,16 @@ const statuslist = [
|
||||
value: 1
|
||||
}
|
||||
]
|
||||
const taskid = ref('')
|
||||
const baseFormData = ref([])
|
||||
const info = ref({
|
||||
point: Array.from({ length: 4 }).map((_, index) => {
|
||||
let obj1 = {
|
||||
name: `巡检点${index + 1}`,
|
||||
id: index + ''
|
||||
}
|
||||
let obj = {
|
||||
id: index,
|
||||
name: obj1.name,
|
||||
desition: '', // 描述
|
||||
datetimesingle: '', // 时间
|
||||
status: 0, // 状态 0正常1异常
|
||||
files: [], // 图片
|
||||
complated: false, // 巡检点完成检查
|
||||
fileUrls: '' // 图片
|
||||
}
|
||||
|
||||
baseFormData.value.push(obj)
|
||||
return obj1
|
||||
})
|
||||
planName: '',
|
||||
remindTime: '',
|
||||
routes: [],
|
||||
taskId: '',
|
||||
taskName: '',
|
||||
taskTime: '',
|
||||
villageName: ''
|
||||
})
|
||||
const rules = {
|
||||
status: {
|
||||
@@ -163,39 +141,104 @@ const rules = {
|
||||
errorMessage: '巡检状态不能为空'
|
||||
}
|
||||
]
|
||||
},
|
||||
files: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: '巡检照片不能为空'
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------
|
||||
const uploadParams = ref({
|
||||
type: 'repair', // 上传类型：报修
|
||||
businessId: '123456', // 关联业务ID
|
||||
userId: '789' // 用户ID
|
||||
function init() {
|
||||
if (!taskid.value) return
|
||||
getInspectionMain(taskid.value)
|
||||
.then(res => {
|
||||
info.value = res.data
|
||||
if (!res.data.routes) return
|
||||
let result = res.data.routes
|
||||
.map(item => {
|
||||
if (!item.points || item.points.length <= 0) return false
|
||||
const points = item.points.map(ite => {
|
||||
return {
|
||||
pointId: ite.pointId,
|
||||
ponitName: ite.pointName,
|
||||
status: ite.status ?? 0,
|
||||
desition: ite.remark,
|
||||
complated: ite.status !== null,
|
||||
files: ite.imgUrl ? ite.imgUrl.split(',') : []
|
||||
}
|
||||
})
|
||||
return {
|
||||
routeName: item.routeName,
|
||||
routeId: item.routeId,
|
||||
description: item.description,
|
||||
points: points
|
||||
}
|
||||
})
|
||||
.filter(item => item !== false)
|
||||
baseFormData.value = result
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '网络异常'
|
||||
})
|
||||
})
|
||||
}
|
||||
onLoad(options => {
|
||||
taskid.value = options.id
|
||||
// taskid.value = '2044684785371725826'
|
||||
init()
|
||||
})
|
||||
|
||||
// 选择文件
|
||||
function onUploadSuccess(e) {
|
||||
console.log('上传成功', e)
|
||||
}
|
||||
// ----------------------------------------------
|
||||
const uploadParams = ref({})
|
||||
|
||||
function onUploadFail(e) {
|
||||
console.log('上传失败', e)
|
||||
}
|
||||
|
||||
function submit() {
|
||||
console.log('最终要提交的图片URL', imageList.value)
|
||||
// 这里调用你的提交接口
|
||||
}
|
||||
|
||||
/** 提交巡检点 检查情况 */
|
||||
function handleSubmit(id) {
|
||||
console.log(typeof id, id, baseFormData.value)
|
||||
const find = baseFormData.value.find(item => item.id === id)
|
||||
if (find) {
|
||||
find.complated = true
|
||||
function handleSubmit(item) {
|
||||
if (info.value.inspectSetting === 1) {
|
||||
if (item.files.length <= 0) {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
mask: true,
|
||||
title: '必须拍照'
|
||||
})
|
||||
return
|
||||
}
|
||||
}
|
||||
let obj = {
|
||||
pointId: item.pointId,
|
||||
imgUrl: item.files.length > 0 ? item.files.join(',') : '',
|
||||
remark: item.desition,
|
||||
status: item.status,
|
||||
taskId: taskid.value
|
||||
}
|
||||
putInsepctionPoint(obj)
|
||||
.then(res => {
|
||||
item.complated = true
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '网络错误'
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const isComputed = computed(() => {
|
||||
// 遍历每一项
|
||||
return baseFormData.value.every(item => {
|
||||
// 每一项里的所有 points 都必须是已完成
|
||||
return item.points.every(point => point.complated)
|
||||
})
|
||||
})
|
||||
/**
|
||||
* 预览图片
|
||||
* @param {Array} images - 所有图片的URL数组
|
||||
@@ -215,6 +258,10 @@ function previewImages(images, currentIndex) {
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.is-required {
|
||||
color: #dd524d;
|
||||
font-weight: bold;
|
||||
}
|
||||
.inspection_upload_box {
|
||||
background: #f9f9f9;
|
||||
padding: 20rpx 40rpx;
|
||||
@@ -279,12 +326,22 @@ function previewImages(images, currentIndex) {
|
||||
}
|
||||
.info_body {
|
||||
margin-bottom: 40rpx;
|
||||
.desitionbox {
|
||||
.desition {
|
||||
font-size: small;
|
||||
color: #ccc;
|
||||
line-height: 1;
|
||||
letter-spacing: 1px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.info_title {
|
||||
font-weight: 550;
|
||||
}
|
||||
.line {
|
||||
width: 100%;
|
||||
margin-top: 40rpx;
|
||||
margin-bottom: 40rpx;
|
||||
border: 1rpx dashed #ccc;
|
||||
}
|
||||
.items_picker_box {
|
||||
@@ -320,7 +377,6 @@ function previewImages(images, currentIndex) {
|
||||
color: #ffffff;
|
||||
line-height: 80rpx;
|
||||
margin-top: 40rpx;
|
||||
margin-bottom: 40rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -3,41 +3,45 @@
|
||||
<view class="today_inspection_page flex flex-col">
|
||||
<!-- 状态筛选标签 -->
|
||||
<TabsComponents :tabslist="tabslist" @update="handleTabs"></TabsComponents>
|
||||
|
||||
<!-- body -->
|
||||
<view class="inspection_body flex-1">
|
||||
<view class="inspection_body flex-1" v-if="list.length > 0">
|
||||
<view
|
||||
class="inspection_items"
|
||||
v-for="(item, index) in list"
|
||||
:key="index"
|
||||
@tap="gotoInspection(item)"
|
||||
@tap="handleTap(item)"
|
||||
>
|
||||
<view class="title">
|
||||
<text class="subtitle">
|
||||
<i></i>
|
||||
{{ item.address }}
|
||||
{{ item.taskName }}
|
||||
</text>
|
||||
<text class="noactions" v-if="item.status === 0">未巡检</text>
|
||||
<text class="noactions" v-if="!isComputed(item.taskStatus)">未巡检</text>
|
||||
<text class="noactions alaway_actions" v-else>已巡检</text>
|
||||
</view>
|
||||
<view class="inspection_item_box flex">
|
||||
<text class="inspection_item" v-for="(ite, index) in item.item" :key="index">
|
||||
<text class="inspection_item" v-for="(ite, index) in item.itemslist" :key="index">
|
||||
{{ ite }}
|
||||
</text>
|
||||
</view>
|
||||
<view class="inspection_time">
|
||||
<text>巡检时间：</text>
|
||||
<text>{{ item.time }}</text>
|
||||
<text>{{ item.taskTime }}</text>
|
||||
</view>
|
||||
<view class="inspection_time">
|
||||
<text>巡检人：</text>
|
||||
<text>{{ item.user }}</text>
|
||||
<view class="actions" v-if="item.status === 0">
|
||||
<view class="inspection_time flex items-center justify-between">
|
||||
<view class="">
|
||||
<text>巡检人：</text>
|
||||
<text>{{ item.inspectorName }}</text>
|
||||
</view>
|
||||
<view class="actions" v-if="!isComputed(item.taskStatus)">
|
||||
<text>去巡检</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="nodata" v-else>
|
||||
<text>暂无数据</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- body -->
|
||||
</view>
|
||||
@@ -46,85 +50,104 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, computed } from 'vue'
|
||||
import TabsComponents from '@/components/tabs/tabs.vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import { getInspectionList } from '@/api/insepction.js'
|
||||
import { parseTime } from '@/utils/time.js'
|
||||
|
||||
// tabs =========================================================
|
||||
const activeValue = ref(0)
|
||||
const tabslist = ref([
|
||||
{
|
||||
name: '全部',
|
||||
value: 0
|
||||
value: 2
|
||||
},
|
||||
{
|
||||
name: '未巡检',
|
||||
value: 1
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name: '已巡检',
|
||||
value: 2
|
||||
value: 1
|
||||
}
|
||||
])
|
||||
// 点击事件
|
||||
const handleTabs = (val: number) => {
|
||||
activeValue.value = val
|
||||
queryParmas.value.status = val
|
||||
init()
|
||||
}
|
||||
// tabs =========================================================
|
||||
// body =========================================================
|
||||
const isComputed = (status: string) => {
|
||||
const awaitlist = ['未完成', '待执行', '执行中']
|
||||
return !awaitlist.includes(status)
|
||||
}
|
||||
const list = ref([])
|
||||
const queryParmas = ref({
|
||||
date: '',
|
||||
status: 2,
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
})
|
||||
|
||||
const isLoading = ref(false) // 加载锁
|
||||
const hasMore = ref(true) // 是否还有更多数据
|
||||
const total = ref(0)
|
||||
|
||||
function getlist() {
|
||||
if (isLoading.value || !hasMore.value) return
|
||||
isLoading.value = true
|
||||
uni.showLoading({
|
||||
title: '加载中',
|
||||
mask: true
|
||||
})
|
||||
const { pageNum, pageSize, date, status } = queryParmas.value
|
||||
getInspectionList({
|
||||
pageSize,
|
||||
pageNum,
|
||||
status,
|
||||
date
|
||||
})
|
||||
.then(res => {
|
||||
let items: Set<string> = new Set()
|
||||
res.rows.forEach(item => {
|
||||
if (!item.points || item.points.length <= 0) return
|
||||
item.points.forEach(ite => {
|
||||
ite.itemNames.forEach(it => items.add(it))
|
||||
})
|
||||
item.itemslist = Array.from(items)
|
||||
})
|
||||
list.value = res.rows
|
||||
hasMore.value = list.value.length < res.total
|
||||
total.value = res.total
|
||||
})
|
||||
.finally(() => {
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
})
|
||||
}
|
||||
/** 跳转到巡检上传页面 */
|
||||
// 0未巡检 1已巡检
|
||||
const gotoInspection = row => {
|
||||
if (row.status === 0) {
|
||||
function handleTap(ite) {
|
||||
if (isComputed(ite.taskStatus)) {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/inspection/inspection_upload'
|
||||
url: '/pageSubPack/inspection/inspection_main?id=' + ite.id
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/inspection/inspection_main'
|
||||
url: '/pageSubPack/inspection/inspection_upload?id=' + ite.id
|
||||
})
|
||||
}
|
||||
}
|
||||
// body =========================================================
|
||||
const list = ref([
|
||||
{
|
||||
address: '幸福苑小区- B1层地下车库',
|
||||
time: '07:00:00 -09:00:00',
|
||||
item: [
|
||||
'防火设施安全巡检',
|
||||
'防火设施安全巡检',
|
||||
'防火设施安全巡检',
|
||||
'防火设施安全巡检',
|
||||
'防火设施安全巡检'
|
||||
],
|
||||
user: '李相龙',
|
||||
status: 0 // 0未巡检 1已巡检
|
||||
},
|
||||
{
|
||||
address: '幸福苑小区- B2层地下车库',
|
||||
time: '13:00:00 -15:00:00',
|
||||
item: ['设备巡检'],
|
||||
user: '李相龙',
|
||||
status: 1 // 0未巡检 1已巡检
|
||||
},
|
||||
{
|
||||
address: '幸福苑小区- B2层地下车库',
|
||||
time: '13:00:00 -15:00:00',
|
||||
item: ['设备巡检'],
|
||||
user: '李相龙',
|
||||
status: 1 // 0未巡检 1已巡检
|
||||
},
|
||||
{
|
||||
address: '幸福苑小区- B2层地下车库',
|
||||
time: '13:00:00 -15:00:00',
|
||||
item: ['设备巡检'],
|
||||
user: '李相龙',
|
||||
status: 1 // 0未巡检 1已巡检
|
||||
},
|
||||
{
|
||||
address: '幸福苑小区- B2层地下车库',
|
||||
time: '13:00:00 -15:00:00',
|
||||
item: ['设备巡检'],
|
||||
user: '李相龙',
|
||||
status: 1 // 0未巡检 1已巡检
|
||||
}
|
||||
])
|
||||
|
||||
function init() {
|
||||
hasMore.value = true
|
||||
queryParmas.value.date = parseTime(new Date(), '{y}-{m}-{d}')
|
||||
getlist()
|
||||
}
|
||||
|
||||
onShow(() => {
|
||||
init()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@@ -252,13 +275,11 @@ const list = ref([
|
||||
color: #333333;
|
||||
line-height: 36rpx;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.actions {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
|
||||
width: 140rpx;
|
||||
height: 50rpx;
|
||||
background: #4d5dfa;
|
||||
@@ -272,5 +293,12 @@ const list = ref([
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.nodata {
|
||||
color: #ccc;
|
||||
text-align: center;
|
||||
margin-top: 200rpx;
|
||||
letter-spacing: 1rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<view class="page_container addreplacement_box">
|
||||
<uni-forms border :modelValue="formData" label-position="left">
|
||||
<uni-forms-item label="仪表类型">
|
||||
<uni-data-checkbox v-model="formData.type" :localdata="items"></uni-data-checkbox>
|
||||
<uni-data-checkbox v-model="formData.deviceType" :localdata="items"></uni-data-checkbox>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="设备编号">
|
||||
<view class="flex items-center justify-between">
|
||||
@@ -14,7 +14,13 @@
|
||||
:clearable="true"
|
||||
>
|
||||
</uni-easyinput>
|
||||
<uni-icons @tap="handleScan" size="48rpx" type="scan" color="#737373"></uni-icons>
|
||||
<uni-icons
|
||||
class="scanicons"
|
||||
@tap="handleScan"
|
||||
size="48rpx"
|
||||
type="scan"
|
||||
color="#737373"
|
||||
></uni-icons>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="房屋号">
|
||||
@@ -42,19 +48,22 @@
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { AddReplaceMainList } from '@/api/instrument.js'
|
||||
|
||||
const formData = ref({
|
||||
type: 1,
|
||||
deviceType: 2,
|
||||
deviceCode: '',
|
||||
houseId: ''
|
||||
})
|
||||
// 水表，电表列表
|
||||
const items = [
|
||||
{
|
||||
text: '水表',
|
||||
value: 1
|
||||
value: 2
|
||||
},
|
||||
{
|
||||
text: '电表',
|
||||
value: 2
|
||||
value: 1
|
||||
}
|
||||
]
|
||||
|
||||
@@ -67,22 +76,57 @@ function handleClick() {
|
||||
backData: data => {
|
||||
houseName.value = data.HouseName
|
||||
formData.value.houseId = data.Houseid
|
||||
console.log(data)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
/** 处理 扫码 */
|
||||
function handleScan() {
|
||||
// 允许从相机和相册扫码
|
||||
uni.scanCode({
|
||||
success: function (res) {
|
||||
formData.value.deviceCode = res.result
|
||||
},
|
||||
error: err => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '扫描异常'
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function handleSubmit() {}
|
||||
function handleSubmit() {
|
||||
formData.value.deviceCode = formData.value.deviceCode.trim()
|
||||
formData.value.houseId = formData.value.houseId.trim()
|
||||
if (!formData.value.deviceCode.trim()) {
|
||||
uni.showToast({
|
||||
icon: 'exception',
|
||||
title: '检查设备编号'
|
||||
})
|
||||
}
|
||||
if (!formData.value.houseId.trim()) {
|
||||
uni.showToast({
|
||||
icon: 'exception',
|
||||
title: '选择房屋'
|
||||
})
|
||||
}
|
||||
AddReplaceMainList(formData.value)
|
||||
.then(() => {
|
||||
uni.showToast({
|
||||
icon: 'success',
|
||||
title: '操作成功',
|
||||
success() {
|
||||
uni.navigateBack()
|
||||
}
|
||||
})
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '检查编号'
|
||||
})
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -116,5 +160,9 @@ function handleSubmit() {}
|
||||
color: #ffffff;
|
||||
line-height: 80rpx;
|
||||
}
|
||||
|
||||
.scanicons {
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -4,23 +4,25 @@
|
||||
<view
|
||||
@click="handleClick"
|
||||
class="search_view flex-center"
|
||||
v-if="!queryParmas.keyword.trim() && Searching"
|
||||
v-if="!queryParmas.searchValue.trim() && Searching"
|
||||
>
|
||||
<uni-icons type="search" size="34rpx" color="rgba(0,0,0,0.26)"></uni-icons>
|
||||
<text>请输入关键字进行搜索</text>
|
||||
</view>
|
||||
<uni-easyinput
|
||||
@blur="handleInput"
|
||||
@change="handleSearch"
|
||||
@clear="handleInput"
|
||||
@confirm="handleSearch"
|
||||
@input="handleInputString"
|
||||
:focus="true"
|
||||
ref="inputRef"
|
||||
v-model="queryParmas.keyword"
|
||||
v-model="queryParmas.searchValue"
|
||||
v-else
|
||||
/>
|
||||
</view>
|
||||
<view class="search_list flex-1 flex">
|
||||
<scroll-view lower-threshold="160" scroll-y="true" @scrolltolower="scrolltolower">
|
||||
<radio-group @change="radioChange">
|
||||
<radio-group @change="radioChange" v-if="searchlist.length > 0">
|
||||
<label v-for="(item, index) in searchlist" :key="index">
|
||||
<view
|
||||
class="search_item flex flex-between"
|
||||
@@ -39,6 +41,9 @@
|
||||
</view>
|
||||
</label>
|
||||
</radio-group>
|
||||
<view class="noData" v-else>
|
||||
<text>暂无数据</text>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
@@ -54,18 +59,31 @@ import { getVillageHouseList_keyword } from '@/api/common.js'
|
||||
|
||||
const Searching = ref(true)
|
||||
const queryParmas = ref({
|
||||
keyword: '',
|
||||
searchValue: '',
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
})
|
||||
/** 点击时切换到input,并聚焦 */
|
||||
function handleClick() {
|
||||
Searching.value = false
|
||||
queryParmas.value.searchValue = ''
|
||||
}
|
||||
/** 判断 失去焦点时 切换回 view */
|
||||
function handleInput() {
|
||||
if (queryParmas.value.keyword.trim()) {
|
||||
const value = queryParmas.value.searchValue.trim()
|
||||
if (value) {
|
||||
handleSearch()
|
||||
} else if (value === '') {
|
||||
queryParmas.value.searchValue = ''
|
||||
Searching.value = true
|
||||
handleSearch()
|
||||
}
|
||||
}
|
||||
function handleInputString() {
|
||||
if (queryParmas.value.searchValue.trim() === '') {
|
||||
queryParmas.value.searchValue = ''
|
||||
Searching.value = true
|
||||
handleSearch()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,13 +120,20 @@ function getlist() {
|
||||
title: '加载中',
|
||||
mask: true
|
||||
})
|
||||
getVillageHouseList_keyword(queryParmas.value, queryParmas.value.keyword)
|
||||
getVillageHouseList_keyword(queryParmas.value, queryParmas.value.searchValue)
|
||||
.then(res => {
|
||||
// 追加数据（正确方式）
|
||||
searchlist.value = [...searchlist.value, ...res.rows]
|
||||
total.value = res.total
|
||||
// 判断是否还有更多
|
||||
hasMore.value = searchlist.value.length < total.value
|
||||
})
|
||||
.catch(() => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '网络异常'
|
||||
})
|
||||
})
|
||||
.finally(() => {
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
@@ -126,6 +151,7 @@ function resetList() {
|
||||
|
||||
// Search
|
||||
function handleSearch() {
|
||||
hasMore.value = true
|
||||
queryParmas.value.pageNum = 1
|
||||
queryParmas.value.pageSize = 10
|
||||
searchlist.value = []
|
||||
@@ -211,6 +237,13 @@ function handleSelecthouse() {
|
||||
}
|
||||
}
|
||||
}
|
||||
.noData {
|
||||
text-align: center;
|
||||
color: rgba(0, 0, 0, 0.26);
|
||||
font-size: larger;
|
||||
padding-top: 50rpx;
|
||||
letter-spacing: 10rpx;
|
||||
}
|
||||
|
||||
.action_btn {
|
||||
width: 670rpx;
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
<image lazy-load src="/static/imgs/home.png" class="icon" mode=""></image>
|
||||
<view class="instrument_info">
|
||||
<view class="instrument_title">
|
||||
<text>{{ item.title }}</text>
|
||||
<text>{{ item.addressCn }}</text>
|
||||
</view>
|
||||
<view class="instrument_time">
|
||||
<text>换新时间时间：{{ item.time }}</text>
|
||||
<text>换新时间时间：{{ item.createTime }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="instrument_type">
|
||||
<text v-if="item.type === 2">电表</text>
|
||||
<text v-else>水表</text>
|
||||
<text v-if="item.deviceType === '1'">电表</text>
|
||||
<text v-else-if="item.deviceType === '2'">水表</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 底部加载状态提示 -->
|
||||
@@ -42,7 +42,10 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, nextTick, ref } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import TabsComponents from '@/components/tabs/tabs.vue'
|
||||
import { getReplaceMainList } from '@/api/instrument.js'
|
||||
|
||||
/** 加载状态 */
|
||||
const statusmore = computed(() => {
|
||||
if (isLoading.value === true) {
|
||||
@@ -65,25 +68,35 @@ const tabslist = [
|
||||
},
|
||||
{
|
||||
name: '水表',
|
||||
value: 1
|
||||
value: 2
|
||||
},
|
||||
{
|
||||
name: '电表',
|
||||
value: 2
|
||||
value: 1
|
||||
}
|
||||
]
|
||||
|
||||
// 切换tabs
|
||||
function handleChangeTabs(val: number) {
|
||||
queryParmas.value.deviceType = val
|
||||
if (val === 0) {
|
||||
queryParmas.value.deviceType = undefined
|
||||
}
|
||||
queryParmas.value.pageNum = 1
|
||||
infolist.value = []
|
||||
hasMore.value = true
|
||||
getlist()
|
||||
}
|
||||
// ---------------------------------------------------------------------
|
||||
const infolist = ref([])
|
||||
const queryParmas = ref({
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
pageSize: 10,
|
||||
deviceType: undefined
|
||||
})
|
||||
const total = ref(21)
|
||||
// 总数
|
||||
const total = ref(0)
|
||||
// 上滑加载
|
||||
function scrolltolower() {
|
||||
// 必须加这两个判断！
|
||||
if (isLoading.value || !hasMore.value) {
|
||||
@@ -92,6 +105,7 @@ function scrolltolower() {
|
||||
queryParmas.value.pageNum += 1
|
||||
getlist()
|
||||
}
|
||||
|
||||
function getlist() {
|
||||
// 1. 如果正在加载或没有更多数据，直接返回
|
||||
if (isLoading.value || !hasMore.value) return
|
||||
@@ -101,29 +115,29 @@ function getlist() {
|
||||
title: '加载中',
|
||||
mask: true
|
||||
})
|
||||
const { pageNum, pageSize } = queryParmas.value
|
||||
|
||||
const startId = (pageNum - 1) * pageSize + 1
|
||||
const arr = Array.from({ length: pageSize }).map((_, index) => {
|
||||
const realId = startId + index // ✅ 修复 ID 错误
|
||||
|
||||
// ✅ 随机生成 0、1、2
|
||||
const randomStatus = Math.floor(Math.random() * 2)
|
||||
return {
|
||||
title: 'M2栋3单元18' + realId + '室（M2-3-1801）',
|
||||
time: '2023-08-01 10:05:46',
|
||||
type: randomStatus //1水表 2电表
|
||||
}
|
||||
const { pageNum, pageSize, deviceType } = queryParmas.value
|
||||
getReplaceMainList({
|
||||
pageNum,
|
||||
pageSize,
|
||||
deviceType
|
||||
})
|
||||
|
||||
// 追加数据（正确方式）
|
||||
infolist.value = [...infolist.value, ...arr]
|
||||
// 判断是否还有更多
|
||||
hasMore.value = infolist.value.length < total.value
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
.then(res => {
|
||||
infolist.value = [...infolist.value, ...res.rows]
|
||||
total.value = res.total
|
||||
hasMore.value = infolist.value.length < total.value
|
||||
})
|
||||
.finally(() => {
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
})
|
||||
}
|
||||
getlist()
|
||||
onShow(() => {
|
||||
infolist.value = []
|
||||
hasMore.value = true
|
||||
getlist()
|
||||
})
|
||||
|
||||
// 重置
|
||||
function resetList() {
|
||||
infolist.value = []
|
||||
queryParmas.value.pageNum = 1
|
||||
@@ -131,6 +145,7 @@ function resetList() {
|
||||
getlist()
|
||||
}
|
||||
|
||||
// 跳转到 仪表换新
|
||||
function handleClick() {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/instrument/addreplacement'
|
||||
|
||||
@@ -38,27 +38,29 @@
|
||||
<!-- 记录卡片 -->
|
||||
<view
|
||||
v-for="(record, index) in reportRecords"
|
||||
@tap="handleComplted(record.id)"
|
||||
@tap="handleComplted(record)"
|
||||
:key="index"
|
||||
class="record-card"
|
||||
>
|
||||
<!-- 标题 + 状态标签 -->
|
||||
<view class="card-header">
|
||||
<text class="card-title">{{ record.title }}</text>
|
||||
<view class="status-tag" :class="record.status">
|
||||
{{ getStatusText(record.status) }}
|
||||
</view>
|
||||
<text class="card-title">{{ record.item }}</text>
|
||||
<view class="status-tag pending" v-if="record.problemStatus === '0'"> 待分配 </view>
|
||||
<view class="status-tag processing" v-if="record.problemStatus === '1'"> 待解决 </view>
|
||||
<view class="status-tag completed" v-if="record.problemStatus === '2'"> 已完成 </view>
|
||||
</view>
|
||||
|
||||
<!-- 类型标签 -->
|
||||
<view class="tag-group">
|
||||
<view class="tag-item">{{ record.reportType }}</view>
|
||||
<view class="tag-item">{{ record.category }}</view>
|
||||
<view class="tag-group" v-if="record.projectTypeStr || record.maintenanceItemName">
|
||||
<view class="tag-item" v-if="record.projectTypeStr">{{ record.projectTypeStr }}</view>
|
||||
<view class="tag-item" v-if="record.maintenanceItemName">{{
|
||||
record.maintenanceItemName
|
||||
}}</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="card-content">
|
||||
{{ record.content }}
|
||||
{{ record.problem }}
|
||||
</view>
|
||||
<!-- 工单图片 -->
|
||||
<!-- <view class="card-image">
|
||||
@@ -75,10 +77,10 @@
|
||||
<!-- 底部信息 -->
|
||||
<view class="card-footer">
|
||||
<text class="create-time">{{ record.createTime }}</text>
|
||||
<text v-if="record.repairStatus === 2" class="repairman"
|
||||
>维修师傅：{{ record.repairman }}</text
|
||||
<text v-if="record.problemStatus === '1'" class="repairman"
|
||||
>维修师傅：{{ record.repairName }}</text
|
||||
>
|
||||
<view class="share" v-if="record.repairStatus === 1">
|
||||
<view class="share" v-if="record.problemStatus === '0'">
|
||||
<text>维修完成</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -90,63 +92,41 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, computed } from 'vue'
|
||||
import { onReady } from '@dcloudio/uni-app'
|
||||
import { onReady, onShow } from '@dcloudio/uni-app'
|
||||
import TabsComponents from '@/components/tabs/tabs.vue'
|
||||
import NavBar from '@/components/navbar/navbar.vue'
|
||||
|
||||
// 导航栏/标签高度（适配不同设备）
|
||||
const navHeight = ref(44)
|
||||
const statusTabHeight = ref(88)
|
||||
const typeTabHeight = ref(88)
|
||||
import { getUserTicketlist } from '@/api/ticket.js'
|
||||
|
||||
// 筛选状态
|
||||
const activeStatus = ref('all') // 全部/待分配/待解决/已完成
|
||||
const activeType = ref('all') // 全部/公共报修/个人报修
|
||||
const activeStatus = ref(0) // 全部/待分配/待解决/已完成
|
||||
const activeType = ref(-1) // 全部/公共报修/个人报修
|
||||
|
||||
// 状态筛选选项
|
||||
const statusTabs = ref([
|
||||
{ label: '全部', value: 'all' },
|
||||
{ label: '待解决', value: 'processing' },
|
||||
{ label: '已完成', value: 'completed' }
|
||||
{ label: '全部', value: 0 },
|
||||
{ label: '待解决', value: 1 },
|
||||
{ label: '已完成', value: 2 }
|
||||
])
|
||||
|
||||
// 类型筛选选项
|
||||
const typeTabs = ref([
|
||||
{ label: '全部', value: 'all' },
|
||||
{ label: '公共报修', value: 'public' },
|
||||
{ label: '个人报修', value: 'private' }
|
||||
{ label: '全部', value: -1 },
|
||||
{ label: '公共报修', value: 0 },
|
||||
{ label: '个人报修', value: 1 }
|
||||
])
|
||||
|
||||
// 模拟上报记录数据（实际项目替换为接口请求）
|
||||
const reportRecords = ref([
|
||||
{
|
||||
id: 1,
|
||||
title: '标题巴拉巴拉巴拉',
|
||||
status: 'processing', // pending/processing/completed
|
||||
reportType: '公共报修',
|
||||
category: '路灯',
|
||||
content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
|
||||
createTime: '2026-08-01 10:05:46',
|
||||
repairman: '张胜',
|
||||
images: [
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93'
|
||||
],
|
||||
repairStatus: 1 // 1待解决 2已完成
|
||||
}
|
||||
])
|
||||
const reportRecords = ref([])
|
||||
|
||||
const queryParmas = ref({
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
value: ''
|
||||
itemType: undefined,
|
||||
problemStatus: undefined
|
||||
})
|
||||
const isLoading = ref(false) // 加载锁
|
||||
const hasMore = ref(true) // 是否还有更多数据
|
||||
const total = ref(21)
|
||||
const total = ref(0)
|
||||
function scrolltolower() {
|
||||
// 必须加这两个判断！
|
||||
if (isLoading.value || !hasMore.value) {
|
||||
@@ -164,39 +144,20 @@ function getlist() {
|
||||
title: '加载中',
|
||||
mask: true
|
||||
})
|
||||
const { pageNum, pageSize } = queryParmas.value
|
||||
|
||||
const startId = (pageNum - 1) * pageSize + 1
|
||||
const arr = Array.from({ length: pageSize }).map((_, index) => {
|
||||
const realId = startId + index
|
||||
const randomStatus = Math.floor(Math.random() * 2)
|
||||
return {
|
||||
id: realId,
|
||||
title: '标题巴拉巴拉巴拉',
|
||||
status: 'processing', // pending/processing/completed
|
||||
reportType: '公共报修',
|
||||
category: '路灯',
|
||||
content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
|
||||
createTime: '2026-08-01 10:05:46',
|
||||
repairman: '',
|
||||
images: [
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93',
|
||||
'https://picsum.photos/93'
|
||||
],
|
||||
repairStatus: randomStatus // 1待解决 2已完成
|
||||
}
|
||||
})
|
||||
// 追加数据（正确方式）
|
||||
reportRecords.value = [...reportRecords.value, ...arr]
|
||||
// 判断是否还有更多
|
||||
hasMore.value = reportRecords.value.length < total.value
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
getUserTicketlist(queryParmas.value)
|
||||
.then(res => {
|
||||
reportRecords.value = [...reportRecords.value, ...res.rows]
|
||||
hasMore.value = reportRecords.value.length < total.value
|
||||
total.value = res.total
|
||||
})
|
||||
.finally(() => {
|
||||
isLoading.value = false
|
||||
uni.hideLoading()
|
||||
})
|
||||
}
|
||||
getlist()
|
||||
onShow(() => {
|
||||
getlist()
|
||||
})
|
||||
function resetList() {
|
||||
reportRecords.value = []
|
||||
queryParmas.value.pageNum = 1
|
||||
@@ -207,20 +168,29 @@ function resetList() {
|
||||
// 切换状态（全部/待分配/待解决/已完成）筛选
|
||||
const switchStatus = value => {
|
||||
activeStatus.value = value
|
||||
if (value === 0) {
|
||||
queryParmas.value.problemStatus = undefined
|
||||
} else {
|
||||
queryParmas.value.problemStatus = value
|
||||
}
|
||||
hasMore.value = true
|
||||
reportRecords.value = []
|
||||
queryParmas.value.pageNum = 1
|
||||
getlist()
|
||||
}
|
||||
|
||||
// 切换类型（公共/个人）筛选
|
||||
const switchType = value => {
|
||||
activeType.value = value
|
||||
}
|
||||
|
||||
// 获取状态文本
|
||||
const statusMap = {
|
||||
processing: '待解决',
|
||||
completed: '已完成'
|
||||
}
|
||||
const getStatusText = status => {
|
||||
return statusMap[status] || ''
|
||||
if (value === -1) {
|
||||
queryParmas.value.itemType = undefined
|
||||
} else {
|
||||
queryParmas.value.itemType = value
|
||||
}
|
||||
hasMore.value = true
|
||||
reportRecords.value = []
|
||||
queryParmas.value.pageNum = 1
|
||||
getlist()
|
||||
}
|
||||
|
||||
// 返回上一页
|
||||
@@ -228,17 +198,16 @@ const navBack = () => {
|
||||
uni.navigateBack()
|
||||
}
|
||||
// 1待解决 2已完成
|
||||
function handleComplted(id) {
|
||||
const find = reportRecords.value.find(item => item.id === id)
|
||||
if (find) {
|
||||
const status = find.repairStatus
|
||||
function handleComplted(row) {
|
||||
if (row) {
|
||||
const status = row.repairStatus
|
||||
if (status === 2) {
|
||||
uni.navigateTo({
|
||||
url: `/pageSubPack/ticket/repairMain?id=${id}&showbtn=${false}&path=myticket`
|
||||
url: `/pageSubPack/ticket/repairMain?id=${row.id}&showbtn=${false}&path=myticket`
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pageSubPack/ticket/repairMain?id=${id}&showbtn=${true}&path=myticket`
|
||||
url: `/pageSubPack/ticket/repairMain?id=${row.id}&showbtn=${true}&path=myticket`
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,11 @@
|
||||
<text>问题描述</text>
|
||||
</view>
|
||||
<view class="descrition">
|
||||
<textarea value="" placeholder-style="color:#e8e8e8;" placeholder="请描述您的问题" />
|
||||
<textarea
|
||||
v-model="form.descrition"
|
||||
placeholder-style="color:#e8e8e8;"
|
||||
placeholder="请描述您的问题"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
@@ -14,11 +18,17 @@
|
||||
<text>问题照片</text>
|
||||
</view>
|
||||
<view class="">
|
||||
<uni-file-picker v-model="form.images" file-mediatype="image">
|
||||
<!-- <uni-file-picker v-model="form.images" file-mediatype="image">
|
||||
<view class="addimages images flex flex-center">
|
||||
<uni-icons type="plusempty" color="#a6a6a6" size="27"></uni-icons>
|
||||
</view>
|
||||
</uni-file-picker>
|
||||
</uni-file-picker> -->
|
||||
<filePicker
|
||||
v-model="form.images"
|
||||
:sourceType="['camera']"
|
||||
file-field-name="file"
|
||||
uploadUrl="/resource/oss/upload"
|
||||
></filePicker>
|
||||
</view>
|
||||
</view>
|
||||
<view class="action_btn" @tap="handleSelecthouse">
|
||||
@@ -30,35 +40,39 @@
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import filePicker from '@/components/filePicker/filePicker.vue'
|
||||
import { ticketComputed } from '@/api/ticket.js'
|
||||
const form = ref({
|
||||
id: '',
|
||||
descrition: '',
|
||||
images: [
|
||||
{
|
||||
name: 'file1.png',
|
||||
extname: 'png',
|
||||
url: 'https://picsum.photos/80'
|
||||
},
|
||||
{
|
||||
name: 'file2.png',
|
||||
extname: 'png',
|
||||
url: 'https://picsum.photos/80'
|
||||
},
|
||||
{
|
||||
name: 'file3.png',
|
||||
extname: 'png',
|
||||
url: 'https://picsum.photos/80'
|
||||
},
|
||||
{
|
||||
name: 'file4.png',
|
||||
extname: 'png',
|
||||
url: 'https://picsum.photos/80'
|
||||
}
|
||||
]
|
||||
images: []
|
||||
})
|
||||
|
||||
onLoad(options => {
|
||||
form.value.id = options.id
|
||||
})
|
||||
|
||||
/** 返回上一页 */
|
||||
function handleSelecthouse() {
|
||||
console.log('compltee')
|
||||
uni.navigateBack()
|
||||
const obj = {
|
||||
id: form.value.id,
|
||||
repairDes: form.value.descrition,
|
||||
repairImageUrl: ''
|
||||
}
|
||||
if (form.value.images.length > 0) {
|
||||
obj.repairImageUrl = form.value.images.join(',')
|
||||
}
|
||||
ticketComputed(obj)
|
||||
.then(() => {
|
||||
uni.navigateBack()
|
||||
})
|
||||
.catch(() => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
title: '网络错误'
|
||||
})
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -16,12 +16,15 @@
|
||||
</view>
|
||||
<view class="flex justify-between">
|
||||
<span class="subtitle">{{ data.desc }}</span>
|
||||
<span class="subtime" v-if="currentStep > index">2026/08/01 10:30:35</span>
|
||||
<span class="subtime" v-if="currentStep == index + 1">{{
|
||||
repairInfo.updateTime
|
||||
}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</Stops>
|
||||
</view>
|
||||
|
||||
<view class="info">
|
||||
<view class="info_title">
|
||||
<text>保修信息</text>
|
||||
@@ -36,19 +39,19 @@
|
||||
<view class="item">
|
||||
<view class="label"> <text>维修项目</text> </view>
|
||||
<view class="value">
|
||||
<text>{{ repairInfo.repairProject }} </text>
|
||||
<text>{{ repairInfo.maintenanceItemName }} </text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="label"> <text>标题</text> </view>
|
||||
<view class="value">
|
||||
<text> {{ repairInfo.title }}</text>
|
||||
<text> {{ repairInfo.item }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item descrition">
|
||||
<view class="label"> <text>问题描述</text> </view>
|
||||
<view class="value">
|
||||
<text>{{ repairInfo.descrtion }}</text>
|
||||
<text>{{ repairInfo.problem }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
@@ -60,14 +63,14 @@
|
||||
<view class="item">
|
||||
<view class="label"> <text>报修时间</text> </view>
|
||||
<view class="value">
|
||||
<text> {{ repairInfo.time }} </text>
|
||||
<text> {{ repairInfo.createTime }} </text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item photobox">
|
||||
<view class="label"> <text>问题照片</text> </view>
|
||||
<view class="value">
|
||||
<view class="value" v-if="problemImageUrl.length > 0">
|
||||
<image
|
||||
v-for="(item, index) in repairInfo.photo"
|
||||
v-for="(item, index) in problemImageUrl"
|
||||
:key="index"
|
||||
class="images"
|
||||
:src="item"
|
||||
@@ -78,41 +81,47 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="info" v-if="(currentStep >= 2 && prevPath === 'hall') || currentStep > 2">
|
||||
<view
|
||||
class="info"
|
||||
v-if="
|
||||
(currentStep >= 2 && prevPath === 'hall') || (currentStep >= 2 && prevPath === 'myticket')
|
||||
"
|
||||
>
|
||||
<view class="info_title">
|
||||
<text>维修信息</text>
|
||||
</view>
|
||||
<view class="info_body">
|
||||
<view class="item">
|
||||
<view class="label"> <text>姓名</text> </view>
|
||||
<view class="value"> {{ repairInfo.repairUser.name }} </view>
|
||||
<view class="value"> {{ repairInfo.repairName }} </view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="label"> <text>状态</text> </view>
|
||||
<view class="value"> {{ repairInfo.repairUser.status }} </view>
|
||||
<view class="value"> {{ repairInfo.repairStatus === 0 ? '正常' : '异常' }} </view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="label"> <text>角色</text> </view>
|
||||
<view class="value"> {{ repairInfo.repairUser.role }} </view>
|
||||
<view class="value"> {{ repairInfo.repairRoleName }} </view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="label"> <text>手机号</text> </view>
|
||||
<view class="value"> {{ repairInfo.repairUser.phone }} </view>
|
||||
<view class="value"> {{ repairInfo.repairPhone }} </view>
|
||||
</view>
|
||||
<view class="" v-if="currentStep >= 3">
|
||||
<view class="item descrition flex-col">
|
||||
<view class="label"> <text>问题描述</text> </view>
|
||||
<view class="value"> {{ repairInfo.repairUser.descrtion }} </view>
|
||||
<view class="value" v-if="repairInfo.repairDes && repairInfo.repairDes.trim()">
|
||||
{{ repairInfo.repairDes }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item photobox">
|
||||
<view class="label"> <text>问题照片</text> </view>
|
||||
<view class="value">
|
||||
<view class="value" v-if="repairImageUrl.length > 0">
|
||||
<image
|
||||
v-for="(item, index) in repairInfo.repairUser.photo"
|
||||
v-for="(item, index) in repairImageUrl"
|
||||
:key="index"
|
||||
class="images"
|
||||
:src="item"
|
||||
mode=""
|
||||
></image>
|
||||
</view>
|
||||
</view>
|
||||
@@ -131,78 +140,120 @@
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { onLoad, onShow } from '@dcloudio/uni-app'
|
||||
import Stops from '@/components/stops/stops.vue'
|
||||
import { getTicketMainById } from '@/api/ticket.js'
|
||||
// --------------------------------------
|
||||
/** 维修步骤：0提交 1分配 2维修完成 / 待解决 3记录完成 完成*/
|
||||
const currentStep = ref(2)
|
||||
|
||||
// 步骤数据
|
||||
const stepList = ref([
|
||||
{ title: '提交维修信息', desc: '提交报修成功', time: '2026/08/01 10:30:26' },
|
||||
{ title: '待分配', desc: '等待物业派单中', time: '2026/08/01 10:32:21' },
|
||||
{ title: '维修/待解决', desc: '维修人员进行维修', time: '2026/08/01 10:38:07' },
|
||||
{ title: '维修完成', desc: '填写维修记录', time: '2026/08/01 10:40:33' }
|
||||
{ title: '提交维修信息', desc: '等待提交报修' },
|
||||
{ title: '待分配', desc: '等待物业派单中' },
|
||||
{ title: '待解决', desc: '等待维修人员' },
|
||||
{ title: '维修完成', desc: '填写维修记录' }
|
||||
])
|
||||
// --------------------------------------
|
||||
const queryParams = ref({
|
||||
id: null
|
||||
})
|
||||
// 展示 button
|
||||
const Showbtn = ref(false)
|
||||
// 上一个页面地址
|
||||
const prevPath = ref('')
|
||||
// 工单信息
|
||||
const repairInfo = ref({
|
||||
houseName: '桂花园（别墅）2号楼2层',
|
||||
repairProject: '照明-路灯',
|
||||
title: '1栋楼下道路灯不亮了',
|
||||
descrtion: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
|
||||
phone: '15688888888',
|
||||
time: '2023-08-01 15:30',
|
||||
photo: [
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80'
|
||||
],
|
||||
|
||||
repairUser: {
|
||||
name: '盘下但',
|
||||
status: '正常',
|
||||
role: '维修人员',
|
||||
phone: '15688888888',
|
||||
descrtion: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
|
||||
photo: [
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80',
|
||||
'https://picsum.photos/80'
|
||||
]
|
||||
}
|
||||
createTime: null,
|
||||
houseId: null,
|
||||
houseName: '',
|
||||
id: '',
|
||||
isCheckStr: null,
|
||||
item: '',
|
||||
maintenanceItemId: '',
|
||||
maintenanceItemName: '',
|
||||
manageIsCheck: '',
|
||||
orderDate: '',
|
||||
phone: '',
|
||||
problem: '',
|
||||
problemImageUrl: '',
|
||||
problemStatus: '1',
|
||||
projectType: null,
|
||||
projectTypeStr: '',
|
||||
repairDes: '',
|
||||
repairId: '',
|
||||
repairImageUrl: '',
|
||||
repairIsCheck: '',
|
||||
repairName: '',
|
||||
residentId: '',
|
||||
residentName: '',
|
||||
updateTime: ''
|
||||
})
|
||||
// 报修图片
|
||||
const problemImageUrl = ref([])
|
||||
// 维修图片
|
||||
const repairImageUrl = ref([])
|
||||
|
||||
onLoad(options => {
|
||||
queryParams.value.id = options.id
|
||||
Showbtn.value = JSON.parse(options.showbtn)
|
||||
prevPath.value = options.path
|
||||
})
|
||||
onShow(() => {
|
||||
getTicketById()
|
||||
})
|
||||
|
||||
function getTicketById() {
|
||||
getTicketMainById(queryParams.value.id)
|
||||
.then(res => {
|
||||
repairInfo.value = res.data
|
||||
|
||||
problemImageUrl.value = repairInfo.value.problemImageUrl
|
||||
? repairInfo.value.problemImageUrl.split(',').filter(item => item)
|
||||
: []
|
||||
|
||||
repairImageUrl.value = repairInfo.value.repairImageUrl
|
||||
? repairInfo.value.repairImageUrl.split(',').filter(item => item)
|
||||
: []
|
||||
handleStop(res.data)
|
||||
})
|
||||
.catch(err => {
|
||||
console.log(err)
|
||||
})
|
||||
}
|
||||
|
||||
// --------------------------------------
|
||||
function handleStop(row) {
|
||||
// 0 已提交 1 已分配 2已解决
|
||||
let status = row.problemStatus
|
||||
// 维修步骤：0提交 1分配 2维修完成 / 待解决 3记录完成 完成
|
||||
if (status === '0') {
|
||||
currentStep.value = 1
|
||||
stepList.value[0].desc = '提交报修成功'
|
||||
} else if (status === '1') {
|
||||
currentStep.value = 2
|
||||
stepList.value[1].title = '已派单'
|
||||
stepList.value[1].desc = '物业已派单'
|
||||
stepList.value[2].title = '待解决'
|
||||
stepList.value[2].desc = `维修人员(${row.repairName})维修中`
|
||||
} else if (status === '2') {
|
||||
currentStep.value = 4
|
||||
stepList.value[2].title = '已解决'
|
||||
stepList.value[2].desc = `维修人员(${row.repairName})已解决`
|
||||
} else {
|
||||
currentStep.value = 0
|
||||
}
|
||||
}
|
||||
/** 选择维修人员 */
|
||||
function handleSelecthouse() {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/ticket/shareUser',
|
||||
events: {
|
||||
backData: val => {
|
||||
currentStep.value += 1
|
||||
//api;
|
||||
}
|
||||
}
|
||||
url: '/pageSubPack/ticket/shareUser'
|
||||
})
|
||||
}
|
||||
|
||||
/** 跳转到维修完成 */
|
||||
function handleRepairCompluted() {
|
||||
uni.navigateTo({
|
||||
url: '/pageSubPack/ticket/repairCompleted'
|
||||
url: '/pageSubPack/ticket/repairCompleted?id=' + repairInfo.value.id
|
||||
})
|
||||
}
|
||||
</script>
|
||||
@@ -241,12 +292,12 @@ function handleRepairCompluted() {
|
||||
}
|
||||
.subtitle {
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
font-size: 22rpx;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
.subtime {
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
font-size: 22rpx;
|
||||
color: #999999;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
@@ -317,7 +368,7 @@ function handleRepairCompluted() {
|
||||
font-size: 28rpx;
|
||||
color: #222222;
|
||||
line-height: 36rpx;
|
||||
width: 45%;
|
||||
width: 35%;
|
||||
}
|
||||
.value {
|
||||
flex: 1;
|
||||
|
||||
Reference in New Issue
Block a user