Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-...

chenyao

2025-04-15 1fc339c8f71c81dfbd262f5fede143225580f1e0

Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard

 src/assets/images/home/homeLeft/in‌spection-select.png

 src/assets/images/home/homeLeft/‌inspection-reset.png

 src/assets/images/task/reset.png

 src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue

@@ -54,8 +54,8 @@
                    />
                </el-form-item>
                <el-form-item>
                    <div class="reset" @click="handleReset"></div>
                    <div class="searchs" @click="handleSearch"></div>
                    <div class="reset" @click="handleReset">重置</div>
                    <div class="searchs" @click="handleSearch">搜索</div>
                </el-form-item>
            </div>
        </el-form>
@@ -86,8 +86,8 @@
                                    ? 'distributed'
                                    : scope.row.status === 3
                                    ? 'finish '
                                    : scope.row.status === 4
                                    ? 'cancel '
								
								
                                    : 'fail '
                            "
                        >
@@ -97,10 +97,9 @@
                                    : scope.row.status === 2
                                    ? '执行中'
                                    : scope.row.status === 3
                                    ? '完成'
                                    : scope.row.status === 4
                                    ? '取消'
                                    : '失败'
                                    ? '已执行'
							
                                    : '执行失败'
                            }}
                        </span>
                    </template>
@@ -151,8 +150,8 @@
    { label: '待执行', value: 1 },
    { label: '执行中', value: 2 },
    { label: '已完成', value: 3 },
    { label: '已取消', value: 4 },
    { label: '执行失败', value: 5 },
	
    { label: '执行失败', value: 4 },
]
// 设备页面参数
const devicePageParams = ref({
@@ -217,10 +216,12 @@
}
// 获取任务列表
const getJobList = () => {
// 事件状态:0 =待处理，1=待分拨，2=待处理，3=处理中，4=已完成 5=已完结
    jobList(taskDetailParams).then(res => {
        if (res.data.code !== 0) return
        taskDetailData.value = res.data.data.records
        total.value = res.data.data.total
		
    })
}
// 机巢列表数据
@@ -278,8 +279,6 @@
}

:deep() {


    .el-form-item__label {
        font-family: Segoe UI, Segoe UI;
        font-weight: 400;
@@ -303,6 +302,10 @@
    cursor: pointer;
    background: url('/src/assets/images/home/homeLeft/‌inspection-reset.png') no-repeat center;
    background-size: 100% 100%;
    color: #fff;
    font-weight: bold;
    font-size: 14px;
    text-align: center;
}
.searchs {
    margin-left: 23px;
@@ -311,6 +314,10 @@
    height: 32px;
    background: url('/src/assets/images/home/homeLeft/in‌spection-select.png') no-repeat center;
    background-size: 100% 100%;
    color: #fff;
    font-weight: bold;
    font-size: 14px;
    text-align: center;
}
.tabledata {
    padding: 0 16px;
@@ -340,8 +347,5 @@
.inspection-rask-details-dialog {
     width: 1270px;
    height: 856px;
	

	
}
</style>

 src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue

@@ -40,10 +40,10 @@
        <el-pagination
        class="ztzf-pagination"
            background
            :page-sizes="[10, 20, 30, 50]"
			
            v-model:current-page="sizeParams.current"
            v-model:page-size="sizeParams.size"
            layout="prev, pager, next,sizes, jumper"
            layout="prev, pager, next, jumper"
            :total="total"
            @change="pageChange"
        />
@@ -79,6 +79,7 @@
        const resData = res?.data?.data || {}
        list.value = resData.records
        total.value = resData.total
		
    })
    
    
@@ -127,6 +128,7 @@
// 表格
.deviceevent-table {
padding: 0 17px;

}

// 分页

 src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue

@@ -2,8 +2,9 @@
    <div class="devicejob-container">
        <div class="machineTableDetailsTitle">
            <p>
                相关任务<span>{{ total }}</span
                >次
                相关任务
                <span>{{ total }}</span>
                次
            </p>
        </div>
        <div class="devicelob-table ztzf-table">
@@ -35,10 +36,10 @@
        <el-pagination
        class="ztzf-pagination"
            background
            :page-sizes="[10, 20, 30, 50]"
			
            v-model:current-page="sizeParams.current"
            v-model:page-size="sizeParams.size"
            layout=" prev, pager, next,sizes, jumper"
            layout=" prev, pager, next, jumper"
            :total="total"
            @change="pageChange"
        />
@@ -120,8 +121,15 @@
// 表格
.devicelob-table {
    padding: 0 17px;
    // height: 280px;
    // overflow: hidden;
    // overflow-y: scroll !important;
}

// :deep(::-webkit-scrollbar) {
//     width: 0;
//     display: none;
//     background: none !important;
// }

// 分页
:deep(.el-pagination) {