Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

shuishen

2025-04-28 3ac9c106b8b39536d504ad6fa6a00f36319433f2

Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

 src/views/tickets/orderLog.vue

@@ -16,7 +16,7 @@
                <div class="tab-content">
                    <!-- 查询条件筛选栏 -->
                    <div class="filter-bar">
                        <el-input v-model="filters.key_word" placeholder="输入工单编号/名称/内容/姓名" class="filter-item" clearable
                        <el-input style="width: 250px" v-model="filters.key_word"  placeholder="输入工单编号/名称/内容/姓名" class="filter-item"  clearable
                            @keyup.enter="handleSearch" />

                        <el-select placeholder="请选择所属单位" v-model="filters.create_dept" @change="handleDepartmentChange"
@@ -27,7 +27,7 @@

                        <el-date-picker v-model="filters.dateRange" type="datetimerange" range-separator="至"
                            start-placeholder="开始日期" end-placeholder="结束日期" class="filter-item" style="width: 100px" />
                        <el-select v-model="filters.file_id" placeholder="请选择关联航线" class="filter-item" clearable>
                        <el-select v-model="filters.file_id" placeholder="请选择关联航线" class="filter-item frequency" clearable>
                            <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
                                :value="item.wayline_id" />
                        </el-select>
@@ -49,11 +49,11 @@
                        </el-select>
                        <el-date-picker v-model="filters.cycleDateRange" type="datetimerange" range-separator="至"
                            start-placeholder="工单周期开始日期" end-placeholder="工单周期结束时间日期" class="filter-item"
                            style="width: 240px !important" />
                        <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item">
                            style="width: 220px !important" />
                        <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item frequency">
                            <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
                        </el-select>
                        <el-time-picker style="width: 100px" v-model="filters.deal_time" placeholder="请选择执行时间"
                        <el-time-picker style="width: 150px" v-model="filters.deal_time" placeholder="请选择执行时间"
                            prop="deal_time" value-format="HH:mm" :picker-options="{
                                selectableRange: '00:00 - 23:59',
                            }" />
@@ -965,24 +965,38 @@
    },
}
</script>
<style>

</style>
<style lang="scss" scoped>


  :deep(.el-textarea__inner) {
    padding: 8px 12px;
  }

  :deep(.el-input__inner),
  :deep(.el-select),
  :deep(.el-select .el-input) {
    width: 100%; // 确保所有输入框和选择框宽度一致
  }
.tab-content {
    padding: 10px;
}

.filter-bar {
    display: flex;
    align-items: center;
    // align-items: center;
    margin-bottom: 15px;
    flex-wrap: wrap;

    .filter-item {
        margin-right: 10px;
        margin-right: 20px;
        margin-bottom: 10px;
        width: 200px;
    }

    .frequency {
      margin-left: 20px;
    }
    .date-picker {
        width: 240px;
    }

 src/views/tickets/ticket.vue

@@ -5,26 +5,26 @@
        <div class="tab-content">
          <!-- 查询条件筛选栏 -->
          <div class="filter-bar">
            <el-input v-model="filters.keyword" placeholder="请输入关键字" class="filter-item" size="small" clearable
            <el-input v-model="filters.keyword" placeholder="请输入关键字" class="filter-item"  clearable
              @keyup.enter="handleSearch" />
            <el-select v-model="filters.department" placeholder="请选择所属单位" class="filter-item" size="small" clearable>
            <el-select v-model="filters.department" placeholder="请选择所属单位" class="filter-item"  clearable>
              <el-option v-for="item in departments" :key="item.value" :label="item.label" :value="item.value" />
            </el-select>
            <el-select v-model="filters.type" placeholder="请选择工单类型" class="filter-item" size="small" clearable>
            <el-select v-model="filters.type" placeholder="请选择工单类型" class="filter-item"  clearable>
              <el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value" />
            </el-select>
            <el-date-picker v-model="filters.dateRange" type="daterange" class="filter-item" size="small"
            <el-date-picker v-model="filters.dateRange" type="daterange" class="filter-item" 
              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
            </el-date-picker>
            <el-select v-model="filters.status" placeholder="请选择状态" class="filter-item" size="small" clearable>
            <el-select v-model="filters.status" placeholder="请选择状态" class="filter-item"  clearable>
              <el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
            </el-select>
            <el-select v-model="filters.algorithm" placeholder="请选择关联算法" class="filter-item" size="small" clearable>
            <el-select v-model="filters.algorithm" placeholder="请选择关联算法" class="filter-item"  clearable>
              <el-option v-for="item in algorithms" :key="item.dict_key" :label="item.dict_value"
                :value="item.dict_key" />
            </el-select>
            <el-button type="primary" icon="el-icon-search" size="small" @click="handleSearch">查询</el-button>
            <el-button icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
            <el-button type="primary" icon="el-icon-search"  @click="handleSearch">查询</el-button>
            <el-button icon="el-icon-refresh"  @click="handleReset">重置</el-button>
          </div>

          <!-- 表格部分 -->
@@ -2317,20 +2317,20 @@
    color: #606266;
  }

  :deep(.el-input__inner) {
    height: 36px;
    line-height: 36px;
  }
  // :deep(.el-input__inner) {
  //   height: 36px;
  //   line-height: 36px;
  // }

  :deep(.el-textarea__inner) {
    padding: 8px 12px;
  }

  :deep(.el-input__inner),
  :deep(.el-select),
  :deep(.el-select .el-input) {
    width: 100%; // 确保所有输入框和选择框宽度一致
  }
  // :deep(.el-input__inner),
  // :deep(.el-select),
  // :deep(.el-select .el-input) {
  //   width: 100%; // 确保所有输入框和选择框宽度一致
  // }

  .full-width {
    width: 100%;