Merge remote-tracking branch 'origin/dev' into dev

罗广辉

2025-04-21 1a065aadb1c3bcb23888b6a1e9306b70ef665a4a

Merge remote-tracking branch 'origin/dev' into dev

 src/components/DeviceJobDetails/DeviceJobDetails.vue

@@ -24,7 +24,7 @@
                    </div>
                    <div class="itemBoxRight">
                        <div class="itemTitle">关联算法：</div>
                        <div class="itemValue">{{ flystatus ? flystatus :'' }}</div>
                        <div class="itemValue">{{ flystatus ? flystatus : '' }}</div>
                    </div>
                </div>
                <JobRelatedEvents v-if="props.wayLineJodInfoId" />
@@ -103,9 +103,8 @@
const achievementList = ref([])

const props = defineProps(['wayLineJodInfoId'])
const wayLineJodInfoId = computed(()=> props.wayLineJodInfoId)
provide('wayLineJodInfoId',wayLineJodInfoId)

const wayLineJodInfoId = computed(() => props.wayLineJodInfoId)
provide('wayLineJodInfoId', wayLineJodInfoId)

const getAchievement = () => {
    getJobInfoFiles({ jobInfoId: wayLineJodInfoId.value }).then(res => {
@@ -229,6 +228,9 @@
                    margin-bottom: 24px;
                }
            }
            .itemBoxLeft > :last-child:nth-child(odd) {
                grid-column: 1 / -1;
            }
            .itemTitle {
                color: #fff;
            }

 src/views/Home/AINowFly.vue

@@ -3,15 +3,15 @@
        <div class="title">智引即飞<img @click="closeClick" src="@/assets/images/aiNowFly/close.png"/></div>
        <el-form ref="ruleFormRef" :model="params" :rules="rules" label-width="auto" size="small" status-icon>
            <el-form-item label="任务名称" prop="name">
                <el-input v-model="params.name" />
                <el-input class="ztzf-input" v-model="params.name" />
            </el-form-item>
            <el-form-item label="关联算法" prop="ai_types">
                <el-select v-model="params.ai_types" placeholder="请选择" multiple collapse-tags collapse-tags-tooltip>
                <el-select :teleported="false" class="ztzf-select" v-model="params.ai_types" placeholder="请选择" multiple collapse-tags collapse-tags-tooltip>
                    <el-option v-for="item in taskAlgorithm" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                </el-select>
            </el-form-item>
            <el-form-item label="地址">
                <el-input disabled type="text" v-model="di" placeholder="地名&经纬度"/>
                <el-input class="ztzf-input" disabled type="text" v-model="di" placeholder="地名&经纬度"/>
            </el-form-item>
            <!--            todo-->
            <el-form-item label="飞行事件">
@@ -353,13 +353,16 @@
    :deep(.el-select),
    :deep(.el-select__wrapper) {
      background-color: #021740;
      box-shadow: 0 0 0 1px #026AD6;

      &.is-focus {
        box-shadow: 0 0 0 1px #026AD6;
      }
    }

:deep(.el-tag, .el-tag.el-tag--primary),
:deep(.el-tag.el-tag--info) {
    --el-tag-bg-color: none !important; 
     --el-tag-border-color: none !important; 
    --el-tag-hover-color: none !important; 
}
    :deep(.el-input__wrapper.is-disabled) {
      background-color: #021740;
      box-shadow: 0 0 0 1px #026AD6;