Merge remote-tracking branch 'origin/master'

张含笑

2026-01-28 23543ea3e7955f056d3b9889df4f309debc76c96

Merge remote-tracking branch 'origin/master'

 applications/task-work-order/src/styles/common/cockpit.scss

@@ -519,6 +519,7 @@
        .label {
          display: inline-block;
          width: 88px;
          flex-shrink: 0;
          font-family: Source Han Sans CN, Source Han Sans CN;
          font-weight: 500;
          font-size: 14px;
@@ -531,6 +532,8 @@

        .val {
          margin-left: 12px;
          flex: 1;
          overflow: hidden;
          font-family: Source Han Sans CN, Source Han Sans CN;
          font-weight: 400;
          font-size: 14px;
@@ -540,6 +543,13 @@
          font-style: normal;
          text-transform: none;
        }

        .val-long {
          overflow: hidden;
          text-overflow: ellipsis;
          white-space: nowrap;
          cursor: pointer;
        }
      }
    }


 applications/task-work-order/src/styles/tags.scss

@@ -39,7 +39,7 @@

    &:active  {
      color: #FFFFFF !important;
      background: #5B6BFF !important;
      background: #4C34FF !important;

      span {
        color: #fff !important;
@@ -50,7 +50,7 @@
      //padding: 0 !important;
      //padding-left: 20px !important;
      color: #FFFFFF !important;
      background: #5B6BFF !important;
      background: #4C34FF !important;

      .is-icon-close {
        //margin: 0 10px;

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

@@ -3,7 +3,13 @@
    <basic-container>
        <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
            <el-form-item label="飞手姓名" prop="flyerName">
                <el-select
                <el-input
                class="gd-input gray"
                    v-model="searchParams.flyerName"
                    placeholder="请输入飞手姓名"
                    clearable
                />
                <!-- <el-select
                            class="gd-select gray"
                            popper-class="gd-select-popper"
                            v-model="searchParams.flyerName"
@@ -15,7 +21,7 @@
                                :label="item.name"
                                :value="item.id"
                            />
                        </el-select>
                        </el-select> -->
            </el-form-item>

            <el-form-item label="擅长机型" prop="skilledUavType">

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

@@ -166,7 +166,7 @@
                                    <el-button type="primary">选择文件</el-button>
                                </template>
                                <template #tip>
                                    <div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式文件</div>
                                    <div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式</div>
                                </template>
                            </el-upload>
                        </div>
@@ -496,6 +496,9 @@
}
.upload-container {
    width: 100%;
    .el-upload__tip {
        display: inline;
    }
}
.label {
    width: 120px !important;

 applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue

@@ -69,7 +69,7 @@
                </div>
                <!--                申请中-->
                <div v-if="detailDemandStatus === '1' && !requesterProvider">
                    <div class="detail-title">数据上传</div>
                    <div class="detail-title" :style="{ marginTop:pxToRem(10)}">数据上传</div>
                    <div class="upload-container">
                        <el-upload
                        :http-request="handleHttpRequest"

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

@@ -398,6 +398,7 @@
function loadList() {
    gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
        processList.value = res.data.data
        console.log(processList.value, 'processList.value')
    })
}

@@ -511,10 +512,28 @@
</script>

<style lang="scss" scoped>
.val-long {
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
    cursor: pointer;

/* 时间线样式 */
:deep(.gd-timeline) {
 padding-left: 90px;
}

:deep(.el-timeline-item) {
  padding-bottom: 20px;
  .item-content {
     position: relative;
            .flowName {
                width: 80px;
                position: absolute;
                left: -120px;
                top: 0px;
            }
  }
}

:deep(.el-timeline-item__timestamp) {
  font-size: 12px;
  color: #999;
  margin-top: 2px;
}
</style>