Merge remote-tracking branch 'origin/feature/v7.0/7.0.2' into feature/v7.0/...

张含笑

2025-10-25 39abebc6d54083556a393441e0628bc3d93b46c7

 src/views/algorithmRepository/algorithmRepository.vue

@@ -49,15 +49,15 @@
            </div>
            <div class="item">
              <div class="itemchild">机巢查询：</div>
              <el-select v-model="params.device_name" placeholder="请选择" class="filter-item" @change="handleSearch">
              <el-select v-model="params.device_name" placeholder="请选择" class="filter-item" @change="handleSearch"  clearable>
                <el-option v-for="item in jcoptions" :key="item" :label="item" :value="item" />
              </el-select>
            </div>
          </div>
          <div class="search-btn">
            <el-button type="primary" icon="el-icon-back" @click="goback">返回</el-button>
            <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
            <el-button icon="el-icon-delete" @click="handleReset">清空</el-button>
            <el-button type="primary" icon="el-icon-back" @click="goback">返回</el-button>
          </div>
        </div>

@@ -181,7 +181,7 @@
// { areaCode: userAreaCode.value }
  selectDeviceList().then(res => {
    jcoptions.value = res.data.data;
    console.log('机巢数',jcoptions.value );

    
  });
};
@@ -199,7 +199,7 @@
  getList();
};
const handleSearch = () => {
// console.log('taskData',taskData.value);

if(taskData.value === null){
    params.value.start_date = null; // 重置开始日期参数
  params.value.end_date = null; // 重置结束日期参数
@@ -242,16 +242,17 @@

<style scoped lang="scss">
.algorithContainer {
height: 100%;
overflow: auto;
height: calc(100vh - 130px); 
}
.algorithItem {
  // padding: 20px;
  height: 100%;
  overflow-y: auto;
  overflow-x: hidden; 
  display: grid;
  grid-template-columns: repeat(5, 1fr);
  // gap: 13px;
  text-align: center;
  vertical-align: middle;
 
  .item {
    height: 267px;
    display: flex;
@@ -363,7 +364,7 @@
  }
  .search {
    display: flex;
    justify-content: space-between;
    //justify-content: space-between;
  }
  .searchBox {
    display: flex;
@@ -379,7 +380,7 @@
    .item {
      display: flex;
      align-items: center;
      margin-right: 49px;
      margin-right: 40px;
    }
  }
  .search-btn {