Merge remote-tracking branch 'origin/master'

罗广辉

11 hours ago 5f694550ed7bf0f6147c66feaa4406034ae62e54

Merge remote-tracking branch 'origin/master'

 applications/task-work-order/src/views/orderView/orderManage/eventManage/index.vue

@@ -184,6 +184,8 @@
    queryParamsRef.value?.resetFields()
    dateRange.value = []
    searchParams.value.current = 1
    searchParams.value.eventStatus = ''
    searchParams.value.keyword = ''
    getList()
}


 applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue

@@ -766,7 +766,7 @@

        .gd-cesium {
            position: relative;
            //overflow: hidden;
            overflow: hidden;
            width: 100%;
            height: 390px;
        }

 uniapps/work-app/src/pages/work/index.vue

@@ -128,6 +128,7 @@
    keyword: '',
    eventStatus: '',
})
let requestSeq = 0 // 请求序列号，用于丢弃快速切换tab时的过期响应
const mockGeojson =
    '[{"score":0.89990234375,"bbox":{"x_cen":195.5,"y_cen":326.5,"width":117.0,"height":265.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"},{"score":0.89306640625,"bbox":{"x_cen":1194.5,"y_cen":559.5,"width":115.0,"height":261.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"},{"score":0.88720703125,"bbox":{"x_cen":179.0,"y_cen":955.5,"width":124.0,"height":249.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"},{"score":0.88330078125,"bbox":{"x_cen":1198.5,"y_cen":260.5,"width":115.0,"height":285.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"},{"score":0.84716796875,"bbox":{"x_cen":204.5,"y_cen":71.5,"width":115.0,"height":143.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"},{"score":0.83203125,"bbox":{"x_cen":186.0,"y_cen":657.5,"width":114.0,"height":269.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"},{"score":0.78662109375,"bbox":{"x_cen":1205.5,"y_cen":49.5,"width":117.0,"height":99.0},"class_name":"car","algorithmId":"e71116098eeb1d60cfebd04d30653b151"}]'
const canvasSize = ref({
@@ -233,8 +234,10 @@
}

const getDataList = () => {
    if (loading.value || !hasMore.value) return
    if (!hasMore.value) return

    // 每次请求自增序列号，响应回来时校验是否过期
    const seq = ++requestSeq
    loading.value = true
    const params = {
        current: listParams.value.current,
@@ -245,6 +248,8 @@
    }
    getGdList(params)
        .then(async res => {
            // 已有新请求发出，丢弃过期响应
            if (seq !== requestSeq) return
            const resData = res.data.data
            const response = resData.records
            const list = []
@@ -257,6 +262,8 @@
                    list.push({ ...item, aiImg })
                }
            }
            // 画图为异步耗时操作，完成后再次校验是否过期
            if (seq !== requestSeq) return
            // 根据当前页码决定是替换还是追加数据
            if (listParams.value.current === 1) {
                dataList.value = list
@@ -271,7 +278,8 @@
            }
        })
        .finally(() => {
            loading.value = false
            // 仅在最新一次请求结束时关闭loading，避免过早关闭
            if (seq === requestSeq) loading.value = false
        })
}
const getstatusCountData = () => {

 uniapps/work-app/src/subPackages/workDetail/HandleWork/index.vue

@@ -113,8 +113,12 @@
}

function uploadHadle() {
    // 取最后一条记录的状态值，列表为空时取页面进入时的状态
    const status = recordList.value.length
        ? recordList.value[recordList.value.length - 1]?.disposeStatus
        : eventStatus.value
    uni.navigateTo({
        url: `/subPackages/workDetail/HandleWorking/index?id=${eventId.value}&eventStatus=${eventStatus.value}`,
        url: `/subPackages/workDetail/HandleWorking/index?id=${eventId.value}&eventStatus=${status}`,
    })
}

@@ -141,7 +145,12 @@

<style scoped lang="scss">
.handle-work-page {
    padding-top: 188rpx;
    // #ifdef APP-PLUS
  padding-top: 188rpx;
  // #endif
  // #ifdef H5
  padding-top: 88rpx;
  // #endif
    :deep() {
        .u-navbar__content {
            background: url('https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/bg.png')
@@ -180,7 +189,7 @@
    align-items: center;
    justify-content: flex-end;
    padding-right: 24rpx;
    margin: 0 0 12rpx 0; // 上下间距
    // margin: 0 0 12rpx 0; // 上下间距
    color: #1d6fe9;
    font-size: 28rpx;
    flex-shrink: 0; // 防止被压缩
@@ -190,7 +199,7 @@
.record-scroll {
    flex: 1; // 占满剩余高度
    // padding-top: 24rpx;
    padding: 0 24rpx 24rpx 24rpx; // 左右下内边距
    padding: 10rpx 24rpx 24rpx 24rpx; // 左右下内边距
    box-sizing: border-box;
}


 uniapps/work-app/src/subPackages/workDetail/HandleWorking/index.vue

@@ -275,7 +275,8 @@
      disposeContent: formData.value.disposeContent,
      // targetEventStatus: eventStatus.value == 1 ? 3 : eventStatus.value,
      // updateEventStatus: Number(eventStatus.value) == 1 ? true : false,
      targetEventStatus: eventStatus.value,
      // 初始状态为处置中时固定传3；初始状态为已处置时传当前选中的值
      targetEventStatus: Number(initialEventStatus.value) === 1 ? 3 : eventStatus.value,
      // 已处置状态进入且未切换成处置中时，不更新工单状态
      updateEventStatus: !(Number(initialEventStatus.value) === 3 && Number(eventStatus.value) === 3),
      attachUrl: attachmentList.value.map(file => file.link),
@@ -315,7 +316,12 @@

<style scoped lang="scss">
.handle-page {
  // #ifdef APP-PLUS
  padding-top: 188rpx;
  // #endif
  // #ifdef H5
    padding-top: 88rpx;
    // #endif
  :deep() {
    .u-navbar__content {
      background: url('https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/bg.png')

 uniapps/work-app/src/subPackages/workDetail/index.vue

@@ -416,7 +416,7 @@
            recordType: 1,
            targetEventStatus: 4,
            updateEventStatus: true,
            attachUrl: ''
            // attachUrl: ''
        })
        uni.showToast({ title: '操作成功', icon: 'success' })
        setTimeout(() => {