Merge remote-tracking branch 'origin/master'

罗广辉

2025-04-18 1d578fe788c14afa331ec970f3d118cb6d56afe1

Merge remote-tracking branch 'origin/master'

 src/views/Home/HomeLeft/OverviewNext.vue

@@ -155,11 +155,11 @@
            margin-bottom: 13px;
            .name {
                margin-left: 46px;
			
            }
        }
        .table-body {
            height: 190px;

            overflow: auto;
            &::-webkit-scrollbar {
                width: 0;
@@ -211,8 +211,7 @@
            }
            .active {
                color: #ffa768;
                background: linear-gradient(90deg, rgba(12, 45, 92, 1) 0%, #154671 50%, rgba(12, 45, 92, 1) 100%),
                    linear-gradient(90deg, rgba(12, 45, 92, 1) 0%, rgba(12, 45, 92, 1) 50%, rgba(12, 45, 92, 1) 100%);
				
            }
            .idle-active {
                color: #8effac;

 src/views/Home/HomeRight/EventOverview.vue

@@ -20,10 +20,10 @@
            <CommonDateTime class="dateTime" v-model="timeArr" @change="timeChange" />

            <el-select
            :teleported="false"
                :teleported="false"
                class="homeRightSelect ztzf-select"
                v-model="params.device_sn"
                placeholder="请选择"
                placeholder="请选择机巢"
                size="large"
                filterable
                :remote-method="remoteMethod"
@@ -274,9 +274,6 @@
    getTableList()
})
</script>
<style lang="scss">

</style>
<style scoped lang="scss">
.homeRightSelect {
    width: 356px;

 src/views/TaskManage/SearchBox.vue

@@ -43,12 +43,12 @@
          <TaskAlgorithmBusiness :setWidth="186" :showAlgorithm="true" @algorithmChange="algorithmChange"/>
        </el-form-item>
        <el-form-item label="所属部门:" v-if="isExpand">
          <el-select class="ztzf-select" v-model="searchForm.create_dept" placeholder="请选择部门" clearable>
          <el-select :teleported="false" class="ztzf-select" v-model="searchForm.create_dept" placeholder="请选择部门" clearable>
            <el-option v-for="item in deptData" :key="item.id" :label="item.deptName" :value="item.id" />
          </el-select>
        </el-form-item>
        <el-form-item label="任务状态:" v-if="isExpand">
          <el-select class="ztzf-select" v-model="searchForm.status" placeholder="请选择状态" clearable>
          <el-select :teleported="false" class="ztzf-select" v-model="searchForm.status" placeholder="请选择状态" clearable>
            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
        </el-form-item>

 src/views/TaskManage/components/TaskAlgorithmBusiness.vue

@@ -1,12 +1,12 @@
<!-- 关联算法和综合业务 -->
<template>
  <div class="task-algorithm" v-if="showAlgorithm">
    <el-select class="ztzf-select" :style="{ width: pxToRem(setWidth) }" v-model="ai_types" multiple collapse-tags collapse-tags-tooltip placeholder="请选择算法" clearable @change="handleAlgorithmChange">
    <el-select :teleported="false" class="ztzf-select" :style="{ width: pxToRem(setWidth) }" v-model="ai_types" multiple collapse-tags collapse-tags-tooltip placeholder="请选择算法" clearable @change="handleAlgorithmChange">
      <el-option v-for="item in taskAlgorithm" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
    </el-select>
  </div>
  <div class="task-business" v-if="showBusiness">
    <el-select class="ztzf-select" :style="{ width: pxToRem(setWidth) }" v-model="industry_type" placeholder="请选择类型" clearable @change="handleBusinessChange">
    <el-select :teleported="false" class="ztzf-select" :style="{ width: pxToRem(setWidth) }" v-model="industry_type" placeholder="请选择类型" clearable @change="handleBusinessChange">
      <el-option v-for="item in taskBusiness" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
    </el-select>
  </div>