吉安感知网项目-前端
罗广辉
2026-01-30 26fa7823784144744dd5efccd21661d194f71938
feat: 统一workOrderType
9 files modified
51 ■■■■ changed files
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue 8 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/flyingHand/index.vue 8 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue 8 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue 10 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue 4 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue 7 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -30,7 +30,7 @@
      </el-col>
      <el-col :span="12">
        <div class="label">擅长任务类型</div>
        <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.patrolTaskType) }}</div>
        <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.workOrderType) }}</div>
      </el-col>
      <el-col :span="12">
        <div class="label">项目经验</div>
@@ -149,7 +149,7 @@
                            :disabled="dialogType === 'view'"
                        >
                            <el-option
                                v-for="item in dictObj.patrolTaskType"
                                v-for="item in dictObj.workOrderType"
                                :key="item.dictKey"
                                :label="item.dictValue"
                                :value="item.dictKey"
@@ -309,7 +309,7 @@
        if (newData) {
            Object.assign(formData.value, newData)
            formData.value.flightHours = Number(newData.flightHours)
        }
        }
    },
    { deep: true, immediate: true }
)
@@ -374,4 +374,4 @@
        margin-bottom: 20px;
    }
}
</style>
</style>
applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -72,7 +72,7 @@
                    </el-table-column>
                    <el-table-column prop="skilledTaskType" show-overflow-tooltip label="擅长任务类型">
                        <template v-slot="{ row }">
                            {{ getDictLabel(row.skilledTaskType, dictObj.patrolTaskType) }}
                            {{ getDictLabel(row.skilledTaskType, dictObj.workOrderType) }}
                        </template>
                    </el-table-column>
                    <el-table-column label="操作" class-name="operation-btns" width="180">
@@ -136,7 +136,7 @@
const flyingHandData = ref({})
const dictObj = ref({
    patrolTaskType: [], // 擅长任务类型
    workOrderType: [], // 擅长任务类型
    skilledUavType: [], // 擅长机型
    technicalStrength: [] // 技术特长
})
@@ -212,7 +212,7 @@
// 获取字典
function getDictList() {
    getDictionaryByCode('patrolTaskType,skilledUavType,technicalStrength').then(res => {
    getDictionaryByCode('workOrderType,skilledUavType,technicalStrength').then(res => {
        dictObj.value = res.data.data
    })
}
@@ -233,4 +233,4 @@
    getFlyingHandList()
})
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss"></style>
applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue
@@ -22,7 +22,7 @@
                    @change="handleSearch"
                >
                    <el-option
                        v-for="item in dictObj.patrolTaskType"
                        v-for="item in dictObj.workOrderType"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
@@ -76,7 +76,7 @@
                    <el-table-column prop="taskNo" show-overflow-tooltip label="巡查任务编号" />
                    <el-table-column prop="patrolTaskType" show-overflow-tooltip label="巡查任务类型">
                        <template v-slot="{ row }">
                            {{ getDictLabel(row.patrolTaskType, dictObj.patrolTaskType) }}
                            {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
@@ -146,7 +146,7 @@
    children: 'children',
}
const dictObj = ref({
    patrolTaskType: [], // 巡查任务类型
    workOrderType: [], // 巡查任务类型
    taskStatus: [], // 巡查任务状态
})
@@ -196,7 +196,7 @@
// 获取字典
function getDictList() {
    getDictionaryByCode('patrolTaskType,taskStatus').then(res => {
    getDictionaryByCode('workOrderType,taskStatus').then(res => {
        dictObj.value = res.data.data
    })
}
applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
@@ -22,7 +22,7 @@
                    @change="handleSearch"
                >
                    <el-option
                        v-for="item in dictObj.patrolTaskType"
                        v-for="item in dictObj.workOrderType"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
@@ -56,7 +56,7 @@
                    <!-- <el-table-column prop="resultType" show-overflow-tooltip label="文档类型" /> -->
                    <el-table-column prop="resultType" show-overflow-tooltip label="文档类型">
                        <template v-slot="{ row }">
                            {{ getDictLabel(row.resultType, dictObj.patrolTaskType) }}
                            {{ getDictLabel(row.resultType, dictObj.workOrderType) }}
                        </template>
                    </el-table-column>
                    <el-table-column label="操作" class-name="operation-btns">
@@ -102,7 +102,7 @@
                        clearable
                    >
                        <el-option
                            v-for="item in dictObj.patrolTaskType"
                            v-for="item in dictObj.workOrderType"
                            :key="item.dictKey"
                            :label="item.dictValue"
                            :value="item.dictKey"
@@ -174,7 +174,7 @@
const uploadName = ref('')
const dictObj = ref({
    patrolTaskType: [], // 巡查任务类型
    workOrderType: [], // 巡查任务类型
})
const searchParams = ref(initSearchParams()) // 查询参数
@@ -203,7 +203,7 @@
// 获取字典
function getDictList() {
    getDictionaryByCode('patrolTaskType').then(res => {
    getDictionaryByCode('workOrderType').then(res => {
        dictObj.value = res.data.data
    })
}
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -86,7 +86,7 @@
                                    @change="handlePatrolTaskTypeChange($index, $event)"
                                >
                                    <el-option
                                        v-for="item in dictObj.patrolTaskType"
                                        v-for="item in dictObj.workOrderType"
                                        :key="item.dictKey"
                                        :label="item.dictValue"
                                        :value="item.dictKey"
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -39,7 +39,7 @@
                        </el-col>
                        <el-col :span="12">
                            <div class="label">巡查任务类型</div>
                            <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.patrolTaskType) }}</div>
                            <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.workOrderType) }}</div>
                        </el-col>
                        <el-col :span="12">
                            <div class="label">任务执行时间</div>
@@ -106,7 +106,7 @@
                                    clearable
                                >
                                    <el-option
                                        v-for="item in dictObj.patrolTaskType"
                                        v-for="item in dictObj.workOrderType"
                                        :key="item.dictKey"
                                        :label="item.dictValue"
                                        :value="item.dictKey"
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -25,7 +25,7 @@
                    @change="handleSearch"
                >
                    <el-option
                        v-for="item in dictObj.patrolTaskType"
                        v-for="item in dictObj.workOrderType"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
@@ -84,7 +84,7 @@
                    <el-table-column prop="taskNo" show-overflow-tooltip label="巡查任务编号" />
                    <el-table-column prop="patrolTaskType" show-overflow-tooltip label="巡查任务类型">
                        <template v-slot="{ row }">
                            {{ getDictLabel(row.patrolTaskType, dictObj.patrolTaskType) }}
                            {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
@@ -163,7 +163,6 @@
const dialogVisible = ref(false)
const viewDiaLogVisible = ref(false)
const dictObj = ref({
    patrolTaskType: [], // 巡查任务类型
    workOrderType: [], // 工单类型
    deviceLoadDemand: [], // 设备负载需求
    taskStatus: [], // 巡查任务状态
@@ -247,7 +246,7 @@
// 获取字典
function getDictList() {
    getDictionaryByCode('patrolTaskType,workOrderType,deviceLoadDemand,taskStatus').then(res => {
    getDictionaryByCode('workOrderType,deviceLoadDemand,taskStatus').then(res => {
        dictObj.value = res.data.data
    })
}
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -67,7 +67,7 @@
                            <el-table-column prop="patrolTaskName" show-overflow-tooltip label="巡查任务名称" />
                            <el-table-column prop="patrolTaskType" show-overflow-tooltip label="巡查任务类型">
                                <template v-slot="{ row }">
                                    {{ getDictLabel(row.patrolTaskType, dictObj.patrolTaskType) }}
                                    {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
                                </template>
                            </el-table-column>
                            <el-table-column prop="taskStatus" show-overflow-tooltip label="任务状态">
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -276,7 +276,7 @@
// 获取字典
function getDictList() {
    getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,patrolTaskType,taskStatus').then(res => {
    getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,taskStatus').then(res => {
        dictObj.value = res.data.data
    })
}