From 5b93d148889f9ade54ba0022f0dea373b7075246 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 15:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/layout/Header.vue | 5
src/views/TaskManage/TaskTop/TaskTime.vue | 1
src/views/Home/HomeLeft/MachineNestList.vue | 10
src/hooks/useMapAggregation/useMapAggregation.js | 7
src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue | 3
src/views/Home/SearchBox.vue | 8
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue | 94 ++--
.env.development | 2
vite.config.mjs.timestamp-1744707003737-1868137d88f2d.mjs | 187 +++++++++
src/views/Home/HomeLeft/OverviewNext.vue | 23
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue | 8
src/components/CommonDateTime.vue | 3
src/views/TaskManage/TaskIntermediateContent/TaskMap.vue | 11
src/store/modules/home.js | 7
.env.production | 2
src/views/TaskManage/TaskIntermediateContent/AddTask.vue | 413 +++++++++++---------
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 15
src/views/TaskManage/TaskIntermediateContent/TaskTable.vue | 333 +++++++++-------
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 16
19 files changed, 709 insertions(+), 439 deletions(-)
diff --git a/.env.development b/.env.development
index 029d374..4792921 100644
--- a/.env.development
+++ b/.env.development
@@ -11,3 +11,5 @@
# 航线文件地址
VITE_APP_AIRLINE_URL = https://wrj.shuixiongit.com/minio/cloud-bucket
+#系统运维
+VITE_APP_ADMIN_URL = 'https://wrj.shuixiongit.com/manage'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 4a0e953..d4914e6 100644
--- a/.env.production
+++ b/.env.production
@@ -5,3 +5,5 @@
VITE_BUILD_COMPRESS = gzip
# ws地址
VITE_APP_WS_API_URL = wss://wrj.shuixiongit.com/drone-wss/api/v1/ws
+# 管理后台地址
+VITE_APP_ADMIN_URL = ' https://aisky.org.cn/manage'
diff --git a/src/components/CommonDateTime.vue b/src/components/CommonDateTime.vue
index 393e9b7..3876c6c 100644
--- a/src/components/CommonDateTime.vue
+++ b/src/components/CommonDateTime.vue
@@ -60,9 +60,8 @@
let timeClick = (item,index) => {
checked.value = item;
const newDateRange = dateRanges[item];
- store.commit('setEventTimeType', [checked.value, timeListEnum[index]]);
model.value = newDateRange;
- emit('change', newDateRange, timeListEnum[index]);
+ emit('change', newDateRange, timeListEnum[index],checked.value);
};
onMounted(() => {
// 如果父组件传入了值，就使用父组件的值 by cpz
diff --git a/src/hooks/useMapAggregation/useMapAggregation.js b/src/hooks/useMapAggregation/useMapAggregation.js
index 46aeb4a..c3b229b 100644
--- a/src/hooks/useMapAggregation/useMapAggregation.js
+++ b/src/hooks/useMapAggregation/useMapAggregation.js
@@ -137,14 +137,12 @@
if (arr.length !== 0) {
returnObj.childrens = arr
}
- console.log(returnObj, '111111')
return returnObj
})
}
// 获取事件聚合
function getMapEventCount (params) {
- console.log(5555555)
return getMapEvents(params).then(res => {
const resData = res?.data?.data
if (resData?.data) {
@@ -185,7 +183,6 @@
eventList = []
if (!areaCode) return
saveParams.area_code = areaCode
- console.log(type, '444')
const list = type === 'device' ? await getDeviceCount(areaCode) : await getMapEventCount(saveParams)
const splashedList = type === 'device'
? await getDeviceList(areaCode)
@@ -248,8 +245,6 @@
return
}
- handlerInit()
-
if (newValue.eventTimeType) {
saveParams = { area_code: newValue.selectedAreaCode, date_enum: store.state.home.eventTimeParams }
}
@@ -260,6 +255,8 @@
needFly = true
if (!viewer) return
+ handlerInit()
+
viewer.scene.postRender.removeEventListener(determineScaling)
initMapData(newValue.selectedAreaCode).then(() => {
diff --git a/src/layout/Header.vue b/src/layout/Header.vue
index 17a4f57..3e67c19 100644
--- a/src/layout/Header.vue
+++ b/src/layout/Header.vue
@@ -31,6 +31,7 @@
import { useRouter, useRoute } from 'vue-router';
import { Message } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
+import { ELocalStorageKey } from '@/utils/http/enums';
const router = useRouter();
const route = useRoute();
@@ -50,6 +51,10 @@
]);
const handleClick = ({ path, name }) => {
+ if (['系统运维'].includes(name)) {
+ window.open(import.meta.env.VITE_APP_ADMIN_URL + '?token=' + localStorage.getItem(ELocalStorageKey.Token), '_blank');
+ return;
+ }
if (!['首页', '任务管理'].includes(name)) return ElMessage.warning('正在加急开发中...');
// 更新 leftList 的 active 状态
leftList.value.forEach(item => {
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index 73618a3..f4b0ca8 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -117,10 +117,9 @@
dock.work_osd = info.host
}
},
- setEventTimeType : (state, data) => {
- console.log('33333')
- state.eventTimeType = data[0]
- state.eventTimeParams = data[1]
+ setEventTimeType: (state, [timeType, timeParams]) => {
+ state.eventTimeType = timeType
+ state.eventTimeParams = timeParams
},
setEventTimeRang : (state, time) => {
state.eventTimeRang = time
diff --git a/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue b/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
index 276130c..a2374d1 100644
--- a/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
+++ b/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
@@ -41,11 +41,12 @@
provide('eventOverviewParams', params)
// 时间变化
-const timeChange = (value, date_enum) => {
+const timeChange = (value, date_enum, type) => {
params.value = {
...params.value,
date_enum,
}
+ store.commit('setEventTimeType', [type, date_enum]);
}
const goBack = () => {
store.commit('setIsEventOverviewDetail', false)
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 777af0c..b5e7ed4 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -3,7 +3,7 @@
<el-dialog
class="inspection-rask-details-dialog ztzf-dialog"
v-model="isShowDetailsDialog"
- :width="pxToRem(1000)"
+ :width="pxToRem(1500)"
:close-on-click-modal="false"
:destroy-on-close="true"
>
@@ -64,7 +64,7 @@
<el-table
:data="taskDetailData"
:row-class-name="tableRowClassName"
- :row-style="{ height: '54px', fontSize: '14px', 'text-align': 'center' }"
+ :row-style="{ height: '45px', fontSize: '14px', 'text-align': 'center' }"
:header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
>
<el-table-column label="序号" type="index" width="60">
@@ -115,7 +115,7 @@
</el-table>
</div>
<!-- 分页 -->
- <div style="display: flex; justify-content: center">
+ <div style="display: flex; justify-content: center;margin:15px 0;">
<el-pagination
class="ztzf-pagination"
v-model:current-page="pageParams.current"
@@ -322,7 +322,7 @@
.tabledata {
padding: 0 16px;
overflow: hidden;
- height: 640px;
+ // height: 640px;
overflow-y: scroll !important;
}
@@ -343,9 +343,4 @@
color: #8cfea7;
}
</style>
-<style lang="scss">
-.inspection-rask-details-dialog {
- width: 1270px;
- height: 856px;
-}
-</style>
+
diff --git a/src/views/Home/HomeLeft/MachineNestList.vue b/src/views/Home/HomeLeft/MachineNestList.vue
index 016fb64..8b4ccf8 100644
--- a/src/views/Home/HomeLeft/MachineNestList.vue
+++ b/src/views/Home/HomeLeft/MachineNestList.vue
@@ -5,13 +5,17 @@
<div class="machine-nest-list">
<MachineNestTotal @searchNickName="handleSearch" />
<div class="content-wrapper">
- <div
+ <!-- <div
class="table-list"
v-if="tableList.length > 0"
infinite-scroll-distance="6"
v-infinite-scroll="loadMore"
:infinite-scroll-disabled="busy"
infinite-scroll-immediate="true"
+ > -->
+ <div
+ class="table-list"
+ v-if="tableList.length > 0"
>
<div
:class="[index % 2 === 1 ? 'table-itemeven' : 'table-item']"
@@ -73,7 +77,7 @@
// 分页参数
const pageParams = ref({
current: 1,
- size: 8,
+ size: 99,
total: 0,
})
@@ -90,7 +94,7 @@
if (res.data.code !== 0) return
if (res.data.data.records.length === 0) return (isMore.value = false)
// pageParams.value.current += 1
- pageParams.value.size += 8
+ // pageParams.value.size += 8
tableList.value = res.data.data.records;// [...tableList.value, ...res.data.data.records]
busy.value = false
})
diff --git a/src/views/Home/HomeLeft/OverviewNext.vue b/src/views/Home/HomeLeft/OverviewNext.vue
index 4d1116a..a1e4e07 100644
--- a/src/views/Home/HomeLeft/OverviewNext.vue
+++ b/src/views/Home/HomeLeft/OverviewNext.vue
@@ -8,14 +8,17 @@
<div class="name">机巢名称</div>
<div class="status">机巢状态</div>
</div>
- <div
+ <!-- <div
class="table-body"
v-if="tableList.length > 0"
infinite-scroll-distance="6"
v-infinite-scroll="loadMore"
:infinite-scroll-disabled="busy"
infinite-scroll-immediate="true"
- >
+ > -->
+ <div
+ class="table-body"
+ v-if="tableList.length > 0">
<div
class="table-item"
:class="[index % 2 === 1 ? '' : 'table-item-odd']"
@@ -66,7 +69,7 @@
// 分页参数
const pageParams = ref({
current: 1,
- size: 5,
+ size: 99,
total: 0,
})
// 机巢列表
@@ -82,24 +85,24 @@
if (res.data.code !== 0) return
if (res.data.data.records.length === 0) return (isMore.value = false)
// pageParams.value.current += 1
- pageParams.value.size += 5;
+ // pageParams.value.size += 5;
tableList.value = res.data.data.records;// [...tableList.value, ...res.data.data.records]
busy.value = false
})
}
// 加载更多数据
-const loadMore = async () => {
- busy.value = true
- if (!isMore.value) return
- getTableList()
-}
+// const loadMore = async () => {
+ // busy.value = true
+ // if (!isMore.value) return
+ // getTableList()
+// }
// 搜索数据
const handleSearch = name => {
searchText.value = name
pageParams.value.current = 1
- pageParams.value.size = 5;
+ // pageParams.value.size = 5;
tableList.value = []
isMore.value = true
getTableList()
diff --git a/src/views/Home/SearchBox.vue b/src/views/Home/SearchBox.vue
index e27cf63..5af1e0e 100644
--- a/src/views/Home/SearchBox.vue
+++ b/src/views/Home/SearchBox.vue
@@ -21,7 +21,7 @@
:load="load"
:props="props"
style="width: 240px"
- @change="treeChange"
+ @node-click="handleNodeClick"
/>
</div>
</div>
@@ -47,9 +47,9 @@
const searchBoxRef = ref(null);
const selectDownRef = ref(null);
-function treeChange(value, node) {
- areaValue.value = node.label;
- store.commit('setSelectedAreaCode', value);
+function handleNodeClick(data) {
+ areaValue.value = data.name;
+ store.commit('setSelectedAreaCode', data.code);
}
const props = {
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
index 587af5b..0edf424 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
@@ -2,45 +2,48 @@
<div class="deviceevent-container">
<div class="machineTableDetailsTitle">
<p>
- 相关事件<span>{{ total }}</span
- >件
+ 相关事件
+ <span>{{ total }}</span>
+ 件
</p>
</div>
- <div class="deviceevent-table ztzf-table" >
- <el-table :data="list" :row-class-name="tableRowClassName"
- style="width: 100%;"
- :row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
- :header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }">
- <el-table-column label="序号" type="index" width="60">
+ <div class="deviceevent-table ztzf-table">
+ <el-table
+ :data="list"
+ :row-class-name="tableRowClassName"
+ style="width: 100%"
+ :row-style="{ height: '35px', fontSize: '14px', 'text-align': 'center' }"
+ :header-cell-style="{ 'text-align': 'center', height: '30px', fontSize: '14px' }"
+ >
+ <el-table-column label="序号" type="index" width="60">
<template #default="{ $index }">
{{ ($index + 1).toString().padStart(2, '0') }}
</template>
</el-table-column>
- <el-table-column prop="id" label="事件编号" />
- <el-table-column prop="event_name" label="事件名称" />
- <el-table-column prop="create_user" label="所属单位 " />
- <el-table-column show-overflow-tooltip prop="remark" label="事件内容" />
- <el-table-column show-overflow-tooltip prop="ai_types" label="关联算法" />
- <el-table-column prop="status" label="事件状态">
- <template #default="scope">
- <div class="pending" v-if="scope.row.status === 0">待处理</div>
- <div class="reviewed" v-if="scope.row.status === 2">待审核</div>
- <div class="processing" v-if="scope.row.status === 3">处理中</div>
- <div class="done" v-if="scope.row.status === 4">已完成</div>
- <div class="ended" v-if="scope.row.status === 5">已完结</div>
- </template>
- </el-table-column>
- <el-table-column label="操作" width="80">
- <template #default="scope">
- <div class="ztzf-view" @click="distribution(scope.row)">查看</div>
- </template>
- </el-table-column>
- </el-table>
+ <el-table-column prop="id" label="事件编号" />
+ <el-table-column prop="event_name" label="事件名称" />
+ <el-table-column prop="create_user" label="所属单位 " />
+ <el-table-column show-overflow-tooltip prop="remark" label="事件内容" />
+ <el-table-column show-overflow-tooltip prop="ai_types" label="关联算法" />
+ <el-table-column prop="status" label="事件状态">
+ <template #default="scope">
+ <div class="pending" v-if="scope.row.status === 0">待处理</div>
+ <div class="reviewed" v-if="scope.row.status === 2">待审核</div>
+ <div class="processing" v-if="scope.row.status === 3">处理中</div>
+ <div class="done" v-if="scope.row.status === 4">已完成</div>
+ <div class="ended" v-if="scope.row.status === 5">已完结</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" width="80">
+ <template #default="scope">
+ <div class="ztzf-view" @click="distribution(scope.row)">查看</div>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
<el-pagination
- class="ztzf-pagination"
+ class="ztzf-pagination"
background
-
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
layout="prev, pager, next, jumper"
@@ -79,11 +82,7 @@
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
-
})
-
-
-
}
const pageChange = val => {
sizeParams.value.current = val
@@ -103,11 +102,10 @@
</script>
<style scoped lang="scss">
-
// 标题
.machineTableDetailsTitle {
margin: 0 24px;
- margin-bottom: 16px;
+ margin-bottom: 10px;
background: url('/src/assets/images/signMachineNest/machineRight/detailtitle.png') no-repeat center;
background-size: 100% 100%;
p {
@@ -127,38 +125,36 @@
}
// 表格
.deviceevent-table {
-padding: 0 17px;
-
+ padding: 0 17px;
}
// 分页
:deep(.el-pagination) {
display: flex;
justify-content: center;
-
}
:deep(.el-pagination button) {
background: center center no-repeat none !important;
color: #8eb8ea !important;
}
// 待处理
-.pending{
-color: #FF7411;
+.pending {
+ color: #ff7411;
}
// 待审核
-.reviewed{
-color: #8CFEA7;
+.reviewed {
+ color: #8cfea7;
}
// 处理中
-.processing{
-color: #FFC398;
+.processing {
+ color: #ffc398;
}
// 已完成
-.done{
-color: #AFD9FB;
+.done {
+ color: #afd9fb;
}
// 已完结
-.ended{
-color: #11C4FF;
+.ended {
+ color: #11c4ff;
}
</style>
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index 4999956..4d904db 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -12,8 +12,8 @@
:data="list"
:row-class-name="tableRowClassName"
style="width: 100%"
- :row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
- :header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
+ :row-style="{ height: '35px', fontSize: '14px', 'text-align': 'center' }"
+ :header-cell-style="{ 'text-align': 'center', height: '30px', fontSize: '14px' }"
>
<el-table-column label="序号" type="index" width="60">
<template #default="{ $index }">
@@ -100,7 +100,7 @@
// 标题
.machineTableDetailsTitle {
margin: 0 24px;
- margin-bottom: 16px;
+ margin-bottom: 10px;
background: url('/src/assets/images/signMachineNest/machineRight/detailtitle.png') no-repeat center;
background-size: 100% 100%;
p {
@@ -121,15 +121,9 @@
// 表格
.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) {
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
index f4f104f..e44d230 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
@@ -70,12 +70,10 @@
<style lang="scss">
.machineTableDetails {
- width: 1270px;
- height: 856px;
.el-pagination {
text-align: left;
- padding: 20px 20px 0 20px;
+ padding: 10px 20px 5px 10px;
}
.my-header {
display: inline-block;
@@ -90,7 +88,7 @@
display: flex;
justify-content: space-between;
align-items: center;
- margin-bottom: 14px;
+ margin-bottom: 10px;
font-size: 14px;
color: #ffffff;
.itemBox {
@@ -115,7 +113,7 @@
margin: 0 24px;
}
.machineTableDetailsTitle {
- margin-bottom: 16px;
+ margin-bottom: 10px;
background: url('/src/assets/images/signMachineNest/machineRight/detailtitle.png') no-repeat center;
background-size: 100% 100%;
span {
diff --git a/src/views/TaskManage/TaskIntermediateContent/AddTask.vue b/src/views/TaskManage/TaskIntermediateContent/AddTask.vue
index 6846ab1..5fc9f15 100644
--- a/src/views/TaskManage/TaskIntermediateContent/AddTask.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/AddTask.vue
@@ -1,49 +1,71 @@
-<!-- 机巢列表详情 -->
+<!-- 新建任务 -->
<template>
<el-dialog
+ class="ztzf-dialog"
modal-class="add-task"
v-model="isShowAddTask"
title="新建任务"
:width="pxToRem(1500)"
:close-on-click-modal="false"
- :destroy-on-close="true">
+ :destroy-on-close="true"
+ >
<!-- <el-divider content-position="left">新建任务</el-divider> -->
<div class="task-contain">
<div class="left">
<div class="search">
- <div class="item"><span class="required">*</span>任务名称：<el-input v-model="searchForm.name" placeholder="请输入任务名称"></el-input></div>
- <div class="item"><span class="required">*</span>任务日期：
+ <div class="item">
+ <el-input class="ztzf-input" v-model="searchForm.name" placeholder="请输入任务/机巢名称"></el-input>
+ </div>
+ <div class="item">
<el-date-picker
+ class="ztzf-date-picker"
v-model="taskData"
- format="YYYY-MM-DD"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
value-format="YYYY-MM-DD"
- :disabled-date="disabledDate"
+ @change="changeselect"
/>
</div>
- <div class="item">任务时间：
+ <div class="item">
+ <div class="itemchild">任务时间：</div>
<el-time-picker
+ class="ztzf-date-picker tasktimer"
v-model="timeSlot"
- placeholder="选择时间"
+ placeholder="请选择"
format="HH:mm"
- value-format="HH:mm"/>
+ value-format="HH:mm"
+ />
</div>
- <div class="item">选择航线：
+ <div class="item">
+ <div class="itemchild">选择航线：</div>
+
<el-select
+ class="ztzf-select"
v-model="searchForm.file_id"
@change="getWayLineFile"
placeholder="请选择航线"
- clearable>
+ clearable
+ >
<el-option
v-for="item in routeOptions"
:key="item.wayline_id"
:label="item.name"
- :value="item.wayline_id"/>
- </el-select>
- </div>
- <div class="item">关联算法：
- <TaskAlgorithmBusiness :showAlgorithm="true" @algorithmChange="algorithmChange"/>
- </div>
- <div class="item">任务描述：<el-input v-model="searchForm.remark" placeholder="请输入任务名称"></el-input></div>
+ :value="item.wayline_id"
+ />
+ </el-select>
+ </div>
+ <div class="item">
+
+ <div class="itemchild">关联算法：</div>
+ <TaskAlgorithmBusiness :setWidth="200" :showAlgorithm="true" @algorithmChange="algorithmChange" />
+ </div>
+ <div class="item">
+
+ <div class="itemchild">任务描述：</div>
+ <el-input class="ztzf-input" v-model="searchForm.remark" placeholder="请输入任务名称"></el-input>
+ </div>
</div>
<div class="lines">
<div class="wayline-type">
@@ -52,26 +74,29 @@
<el-radio :value="2" label="智能规划选区"></el-radio>
</el-radio-group>
</div>
- <TaskMap class="wayline-map"
+ <TaskMap
+ class="wayline-map"
:wayLineFile="wayLineFile"
:checkedTableData="checkedTableData"
- :waylineTypeTest="waylineType"
+ :waylineTypeTest="waylineType"
@clickPosition="clickSignPosition"
@saveWayline="savePlanerWayline"
/>
</div>
</div>
- <div class="right">
- <TaskTable ref="taskTableRef"
- :waylineId="waylineId"
- :waylineType="waylineType"
+ <div class="right ">
+ <TaskTable
+ ref="taskTableRef"
+ :waylineId="waylineId"
+ :waylineType="waylineType"
:singlePoint="singlePoint"
:planarPoints="planarPoints"
- @update:selected="handleSelected"
+ @update:selected="handleSelected"
/>
<div class="btn">
- <el-button type="primary" @click="cancel">取消</el-button>
- <el-button type="primary" @click="submitClick">发布</el-button>
+ <img @click="cancel" style="margin-right:23px" src="@/assets/images/task/cancel.png" alt="">
+ <img @click="submitClick" src="@/assets/images/task/publish.png" alt="">
+
</div>
</div>
</div>
@@ -79,26 +104,26 @@
</template>
<script setup>
-import { ElMessage } from 'element-plus';
-import { pxToRem } from '@/utils/rem';
-import { getWaylineList, createTask } from '@/api/home/task';
-import TaskAlgorithmBusiness from '../components/TaskAlgorithmBusiness.vue';
-import TaskMap from './TaskMap.vue';
-import TaskTable from './TaskTable.vue';
+import { ElMessage } from 'element-plus'
+import { pxToRem } from '@/utils/rem'
+import { getWaylineList, createTask } from '@/api/home/task'
+import TaskAlgorithmBusiness from '../components/TaskAlgorithmBusiness.vue'
+import TaskMap from './TaskMap.vue'
+import TaskTable from './TaskTable.vue'
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(['refresh'])
-const rangDate = ref([]);
+const rangDate = ref([])
// 航线ID
-const waylineId = ref('');
+const waylineId = ref('')
// 航线文件
-const wayLineFile = ref('');
+const wayLineFile = ref('')
// 航线类型
-const waylineType = ref(3);
+const waylineType = ref(3)
// 添加子组件引用
-const taskTableRef = ref(null);
-const taskData = ref('');
-const timeSlot = ref('');
+const taskTableRef = ref(null)
+const taskData = ref('')
+const timeSlot = ref('')
const searchForm = reactive({
name: '',
ai_types: [],
@@ -112,157 +137,157 @@
longitude: '',
latitude: '',
polygon: [],
-});
-const isShowAddTask = defineModel('show');
+})
+const isShowAddTask = defineModel('show')
// 禁用当天之前的日期
-const disabledDate = (time) => {
- return time.getTime() < Date.now() - 8.64e7; // 86400000 = 24 * 60 * 60 * 1000
-};
+const disabledDate = time => {
+ return time.getTime() < Date.now() - 8.64e7 // 86400000 = 24 * 60 * 60 * 1000
+}
// 获取航线列表数据
-const routeOptions = ref([]);
+const routeOptions = ref([])
const getRouteList = async () => {
- const res = await getWaylineList();
- if (res.data.code === 0) {
- routeOptions.value = res.data.data;
- }
-};
+ const res = await getWaylineList()
+ if (res.data.code === 0) {
+ routeOptions.value = res.data.data
+ }
+}
// 关联算法
-const algorithmChange = (val) => {
- searchForm.ai_types = val;
-};
+const algorithmChange = val => {
+ searchForm.ai_types = val
+}
// 切换航线类型
-const radioChange = (val) => {
+const radioChange = val => {
// 清空选中航线值
- searchForm.file_id = '';
+ searchForm.file_id = ''
// 航线ID也清空
- waylineId.value = '';
- wayLineFile.value = '';
- waylineType.value = val;
- searchForm.type = val;
+ waylineId.value = ''
+ wayLineFile.value = ''
+ waylineType.value = val
+ searchForm.type = val
// 清空列表数据
nextTick(() => {
- if (taskTableRef.value) {
- taskTableRef.value.clearTableData();
- }
- });
-};
+ if (taskTableRef.value) {
+ taskTableRef.value.clearTableData()
+ }
+ })
+}
// 获取航线文件
-const getWayLineFile = async (val) => {
- searchForm.type = 0;
- waylineType.value = 0;
- waylineId.value = val;
- const currentRoute = routeOptions.value.find(item => item.wayline_id === val);
- wayLineFile.value = currentRoute.object_key;
-};
+const getWayLineFile = async val => {
+ searchForm.type = 0
+ waylineType.value = 0
+ waylineId.value = val
+ const currentRoute = routeOptions.value.find(item => item.wayline_id === val)
+ wayLineFile.value = currentRoute.object_key
+}
// 获取选中机场列表数据,并且发布
-let checkedTableData = ref([]);
-const handleSelected = (val) => {
- searchForm.dock_sns = val.map(item => item.device_sn);
- checkedTableData.value = val;
-};
+let checkedTableData = ref([])
+const handleSelected = val => {
+ searchForm.dock_sns = val.map(item => item.device_sn)
+ checkedTableData.value = val
+}
// 地图点击事件 表格重新刷新数据
-let singlePoint = ref({});
-const clickSignPosition = (val) => {
- singlePoint.value = val;
- searchForm.longitude = val.longitude;
- searchForm.latitude = val.latitude;
-};
+let singlePoint = ref({})
+const clickSignPosition = val => {
+ singlePoint.value = val
+ searchForm.longitude = val.longitude
+ searchForm.latitude = val.latitude
+}
// 保存面状航线
-let planarPoints = ref([]);
-const savePlanerWayline = (val) => {
- planarPoints.value = val;
- const polygonArray = val.map(point => [point.longitude, point.latitude]);
- searchForm.polygon = polygonArray;
-};
+let planarPoints = ref([])
+const savePlanerWayline = val => {
+ planarPoints.value = val
+ const polygonArray = val.map(point => [point.longitude, point.latitude])
+ searchForm.polygon = polygonArray
+}
// 提交
const submitClick = () => {
if (!taskData.value) {
- ElMessage({
- message: '请选择任务日期',
- type: 'warning'
- });
- return;
- }
+ ElMessage({
+ message: '请选择任务日期',
+ type: 'warning',
+ })
+ return
+ }
if (!searchForm.name) {
- ElMessage({
- message: '请输入任务名称',
- type: 'warning'
- });
- return;
- }
+ ElMessage({
+ message: '请输入任务名称',
+ type: 'warning',
+ })
+ return
+ }
// 检查任务时间
- if (timeSlot.value) {
- const now = new Date();
- const today = now.toDateString();
- const selectedDate = new Date(taskData.value).toDateString();
-
- if (today === selectedDate) {
- const [hours, minutes] = timeSlot.value.split(':');
- const selectedTime = new Date();
- selectedTime.setHours(parseInt(hours), parseInt(minutes));
-
- if (selectedTime < now) {
- ElMessage({
- message: '任务时间不能小于当前时间',
- type: 'warning'
- });
- return;
- }
- }
- }
+ if (timeSlot.value) {
+ const now = new Date()
+ const today = now.toDateString()
+ const selectedDate = new Date(taskData.value).toDateString()
+
+ if (today === selectedDate) {
+ const [hours, minutes] = timeSlot.value.split(':')
+ const selectedTime = new Date()
+ selectedTime.setHours(parseInt(hours), parseInt(minutes))
+
+ if (selectedTime < now) {
+ ElMessage({
+ message: '任务时间不能小于当前时间',
+ type: 'warning',
+ })
+ return
+ }
+ }
+ }
if (searchForm.dock_sns.length === 0) {
ElMessage({
message: '请选择机场',
- type: 'warning'
- });
- return;
+ type: 'warning',
+ })
+ return
}
- searchForm.begin_time = `${taskData.value} 00:00:00`;
- searchForm.end_time = `${taskData.value} 23:59:59`;
- searchForm.execute_time_arr = timeSlot.value ? [timeSlot.value] : [];
- createTask(searchForm).then((res) => {
+ searchForm.begin_time = `${taskData.value} 00:00:00`
+ searchForm.end_time = `${taskData.value} 23:59:59`
+ searchForm.execute_time_arr = timeSlot.value ? [timeSlot.value] : []
+ createTask(searchForm).then(res => {
if (res.data.code === 0) {
- ElMessage.success('任务创建成功');
+ ElMessage.success('任务创建成功')
// 关闭当前窗口，刷新任务管理列表
- isShowAddTask.value = false;
+ isShowAddTask.value = false
// 清除数据
- cancel();
- emit('refresh');
+ cancel()
+ emit('refresh')
}
- });
-};
+ })
+}
const cancel = () => {
- isShowAddTask.value = false;
+ isShowAddTask.value = false
// 清除搜索数据
- searchForm.name = '';
- searchForm.ai_types = [];
- searchForm.file_id = '';
- searchForm.begin_time = '';
- searchForm.end_time = '';
- timeSlot.value = '';
- searchForm.remark = '';
- searchForm.dock_sns = [];
- rangDate.value = [];
- waylineId.value = '';
- wayLineFile.value = '';
- taskData.value = '';
-};
+ searchForm.name = ''
+ searchForm.ai_types = []
+ searchForm.file_id = ''
+ searchForm.begin_time = ''
+ searchForm.end_time = ''
+ timeSlot.value = ''
+ searchForm.remark = ''
+ searchForm.dock_sns = []
+ rangDate.value = []
+ waylineId.value = ''
+ wayLineFile.value = ''
+ taskData.value = ''
+}
onMounted(() => {
- getRouteList();
+ getRouteList()
})
</script>
<style lang="scss">
-.add-task{
+.add-task {
.el-pagination {
text-align: left;
padding: 20px;
@@ -273,52 +298,72 @@
<style lang="scss" scoped>
.task-contain {
display: flex;
+ padding: 20px 32px 32px 27px;
.left {
width: 68%;
+ margin-right: 35px;
.search {
display: grid;
- grid-template-columns: repeat(3, 1fr);
- grid-template-rows: repeat(2, 1fr);
- gap: 30px; // 增加间距使布局更合理
- margin-bottom: 8px; // 添加底部间距
+ grid-template-columns: repeat(3, 1fr);
+ grid-template-rows: repeat(2, 1fr);
+ gap: 30px; // 增加间距使布局更合理
+ margin-bottom: 8px; // 添加底部间距
.item {
position: relative;
- display: flex;
- align-items: center;
- :deep(.el-input),
- :deep(.el-select),
- :deep(.el-date-picker),
- :deep(.el-time-picker) {
- width: 240px;
- // margin-left: 10px;
- }
- :deep(.el-date-editor.el-input__wrapper) {
- width: 200px; // 调整日期选择器宽度
- }
- .required {
- color: #f56c6c;
- margin-left: 4px;
- position: absolute;
- left: -10px;
- top: 8px;
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ color: #ffffff;
+ .itemchild {
+ width: 68px;
+ white-space: nowrap;
+ margin-right: 5px;
}
- }
+ :deep(.el-date-editor.el-input__wrapper) {
+ width: 200px; // 调整日期选择器宽度
+ }
+
+ }
}
}
.right {
width: 32%;
display: flex;
- flex-direction: column;
- justify-content: space-between;
-
- .btn {
- margin-top: 20px;
- text-align: center;
-
- .el-button {
- margin: 0 10px;
- }
- }
+ flex-direction: column;
+ justify-content: space-between;
+
+ .btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ img {
+ width: 137px;
+ height: 32px;
+ cursor: pointer;
+ }
+
+ }
+ }
+ :deep(.tasktimer .el-input__wrapper) {
+ background: none !important;
+ color: #8ac3fd !important;
+
+ }
+ :deep(.el-input__inner) {
+ color: #8ac3fd !important;
+ &::placeholder {
+ color: #8ac3fd !important;
+ }
+ }
+ :deep(.el-radio__inner){
+ background: none !important;
+ border: 1px solid #1B5D9A !important;
+ }
+ :deep(.el-radio__label){
+ color: #fff !important;
+ }
+ :deep(.el-radio__inner:after ){
+ background: #65B5FF !important;
}
}
</style>
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskMap.vue b/src/views/TaskManage/TaskIntermediateContent/TaskMap.vue
index b360db9..73653d1 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskMap.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskMap.vue
@@ -14,7 +14,7 @@
import { getCenterPoint } from '@/utils/cesium/mapUtil'
import { getWaylineByArea } from '@/api/home/task';
import { useStore } from 'vuex';
-
+import { addBlueFilter } from '@/utils/cesium/common'
const store = useStore();
const userAreaPosition = computed(() => store.state.home.userAreaPosition);
@@ -74,7 +74,14 @@
fullscreenButton: false,
// sceneMode: Cesium.SceneMode.COLUMBUS_VIEW,
})
- viewer.imageryLayers.addImageryProvider(imageryProvider_ammapSL)
+ const gdLayer = viewer.imageryLayers.addImageryProvider(imageryProvider_ammapSL)
+ const options = {
+ bInvertColor: true,
+ bFilterColor: true,
+ filterColor: '#4e70a6'
+ }
+ // 添加蓝色滤镜
+ addBlueFilter(options,viewer,gdLayer)
viewer.scene.morphTo2D(0);
//设置默认点
const { longitude = 115.763819, latitude = 28.787374, height = 10 } = userAreaPosition.value || {};
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskTable.vue b/src/views/TaskManage/TaskIntermediateContent/TaskTable.vue
index 6d1b608..b165cf9 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskTable.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskTable.vue
@@ -1,189 +1,226 @@
<template>
- <div class="table-container">
- <el-table :data="tableData" style="width: 100%" height="400"
- @selection-change="handleSelectionChange"
- @select="handleSelect">
- <el-table-column type="selection" width="55" :selectable="checkSelectable" />
- <el-table-column type="index" label="序号" width="60" />
- <el-table-column prop="nickname" label="机巢名称" />
- <el-table-column prop="estimated_arrival_time" label="预计到达时间" />
- <el-table-column prop="exe_distance" label="执行里程" />
- </el-table>
- <div class="pagination">
- <el-pagination
- v-model:current-page="pagingParams.page"
- v-model:page-size="pagingParams.size"
- :page-sizes="[10, 20, 30]"
- layout="total, sizes, prev, pager, next"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
- </div>
+ <div class="table-container ztzf-table">
+ <div class="taskTableTitle"><span>可飞行机巢列表</span></div>
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ height="400"
+ :row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
+ :header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
+ @selection-change="handleSelectionChange"
+ @select="handleSelect"
+ >
+ <el-table-column type="selection" width="55" :selectable="checkSelectable" />
+ <el-table-column type="index" label="序号" width="60" />
+ <el-table-column show-overflow-tooltip prop="nickname" label="机巢名称" />
+ <el-table-column show-overflow-tooltip width="120" prop="estimated_arrival_time" label="预计到达时间" />
+ <el-table-column show-overflow-tooltip prop="exe_distance" label="执行里程" />
+ </el-table>
+ <div class="pagination">
+ <el-pagination
+ class="ztzf-pagination"
+ v-model:current-page="pagingParams.page"
+ v-model:page-size="pagingParams.size"
+ :page-sizes="[10, 20, 30]"
+ layout=" prev, pager, next"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
</template>
<script setup>
-import { getFlyingNestBy } from '@/api/home/task';
+import { getFlyingNestBy } from '@/api/home/task'
const props = defineProps({
- waylineId: {
- type: String,
- default: ''
- },
- waylineType: {
- type: Number,
- default: 3
- },
- singlePoint: {
- type: Object,
- default: () => ({})
- },
- planarPoints: {
- type: Array,
- default: () => ([])
- }
-});
+ waylineId: {
+ type: String,
+ default: '',
+ },
+ waylineType: {
+ type: Number,
+ default: 3,
+ },
+ singlePoint: {
+ type: Object,
+ default: () => ({}),
+ },
+ planarPoints: {
+ type: Array,
+ default: () => [],
+ },
+})
// 选中的数据
-const selectedRows = ref([]);
+const selectedRows = ref([])
// 分页参数
let pageParams = ref({
- wayline_id: props.waylineId,
- type: props.waylineType,
- longitude: props.singlePoint.longitude,
- latitude: props.singlePoint.latitude,
- polygon: [],
-});
+ wayline_id: props.waylineId,
+ type: props.waylineType,
+ longitude: props.singlePoint.longitude,
+ latitude: props.singlePoint.latitude,
+ polygon: [],
+})
let pagingParams = ref({
- current: 1,
- size: 10
-});
+ current: 1,
+ size: 10,
+})
// 获取可用机巢列表数据
-const total = ref(0);
-const tableData = ref([]);
+const total = ref(0)
+const tableData = ref([])
const getNestList = async () => {
- tableData.value = [];
- const res = await getFlyingNestBy(pageParams.value, pagingParams.value);
- if (res.data.code === 0) {
- tableData.value = res.data.data;
- }
-};
+ tableData.value = []
+ const res = await getFlyingNestBy(pageParams.value, pagingParams.value)
+ if (res.data.code === 0) {
+ tableData.value = res.data.data
+ }
+}
// 分页大小改变
-const handleSizeChange = (val) => {
- pagingParams.value.size = val;
- getNestList();
-};
+const handleSizeChange = val => {
+ pagingParams.value.size = val
+ getNestList()
+}
// 页码改变
-const handleCurrentChange = (val) => {
- pagingParams.value.current = val;
- getNestList();
-};
+const handleCurrentChange = val => {
+ pagingParams.value.current = val
+ getNestList()
+}
// 刷新数据
const refreshData = () => {
- tableData.value = [];
- pagingParams.value.current = 1;
- getNestList();
-};
+ tableData.value = []
+ pagingParams.value.current = 1
+ getNestList()
+}
-const emit = defineEmits(['update:selected']);
-const handleSelectionChange = (val) => {
- // 如果不是智能规划选区模式，才更新所有选中数据
- if (props.waylineType !== 2) {
- selectedRows.value = val;
- emit('update:selected', val);
- }
-};
+const emit = defineEmits(['update:selected'])
+const handleSelectionChange = val => {
+ // 如果不是智能规划选区模式，才更新所有选中数据
+ if (props.waylineType !== 2) {
+ selectedRows.value = val
+ emit('update:selected', val)
+ }
+}
// 控制表格行是否可选
-const checkSelectable = (row) => {
- if (props.waylineType === 2) {
- // 如果已经有选中的行，且当前行未被选中，则不允许选择
- return selectedRows.value.length === 0 || selectedRows.value.some(selected => selected.device_sn === row.device_sn);
- }
- return true;
-};
+const checkSelectable = row => {
+ if (props.waylineType === 2) {
+ // 如果已经有选中的行，且当前行未被选中，则不允许选择
+ return selectedRows.value.length === 0 || selectedRows.value.some(selected => selected.device_sn === row.device_sn)
+ }
+ return true
+}
// 处理单行选择
const handleSelect = (selection, row) => {
- if (props.waylineType === 2) {
- // 如果是智能规划选区模式，确保只能选中一行
- if (selection.length > 1) {
- // 保留最后选中的那一行
- const lastSelected = selection[selection.length - 1];
- selectedRows.value = [lastSelected];
- // 触发更新事件
- emit('update:selected', selectedRows.value);
- }
- }
-};
+ if (props.waylineType === 2) {
+ // 如果是智能规划选区模式，确保只能选中一行
+ if (selection.length > 1) {
+ // 保留最后选中的那一行
+ const lastSelected = selection[selection.length - 1]
+ selectedRows.value = [lastSelected]
+ // 触发更新事件
+ emit('update:selected', selectedRows.value)
+ }
+ }
+}
// 监听航线ID变化
-watch(() => props.waylineId, (newVal) => {
- pageParams.value.type = 0;
- if (newVal) {
- pageParams.value.wayline_id = newVal;
- refreshData();
- } else {
- // 数据为空时，清除列表数据
- tableData.value = [];
- }
-}, { deep: true });
+watch(
+ () => props.waylineId,
+ newVal => {
+ pageParams.value.type = 0
+ if (newVal) {
+ pageParams.value.wayline_id = newVal
+ refreshData()
+ } else {
+ // 数据为空时，清除列表数据
+ tableData.value = []
+ }
+ },
+ { deep: true }
+)
// 监听单点返回的数据
-watch(() => props.singlePoint, (newVal) => {
- pageParams.value.wayline_id = '';
- pageParams.value.type = 1;
- if (newVal && newVal.latitude && newVal.longitude) {
- pageParams.value.latitude = newVal.latitude;
- pageParams.value.longitude = newVal.longitude;
- refreshData();
- }
-}, { deep: true });
+watch(
+ () => props.singlePoint,
+ newVal => {
+ pageParams.value.wayline_id = ''
+ pageParams.value.type = 1
+ if (newVal && newVal.latitude && newVal.longitude) {
+ pageParams.value.latitude = newVal.latitude
+ pageParams.value.longitude = newVal.longitude
+ refreshData()
+ }
+ },
+ { deep: true }
+)
// 监听面状航线返回的数据
-watch(() => props.planarPoints, (newVal) => {
- pageParams.value.wayline_id = '';
- pageParams.value.type = 2;
- if (newVal && newVal.length > 0) {
- const polygonArray = newVal.map(point => [point.longitude, point.latitude]);
- pageParams.value.polygon = polygonArray;
- refreshData();
- }
-}, { deep: true });
+watch(
+ () => props.planarPoints,
+ newVal => {
+ pageParams.value.wayline_id = ''
+ pageParams.value.type = 2
+ if (newVal && newVal.length > 0) {
+ const polygonArray = newVal.map(point => [point.longitude, point.latitude])
+ pageParams.value.polygon = polygonArray
+ refreshData()
+ }
+ },
+ { deep: true }
+)
// 暴露给父组件的方法
const clearTableData = () => {
- tableData.value = [];
-};
+ tableData.value = []
+}
defineExpose({
- clearTableData
-});
-
-
-onMounted(() => {});
-
+ clearTableData,
+})
+// 表格隔行变色
+const tableRowClassName = ({ row, rowIndex }) => {
+ if (rowIndex % 2 === 1) {
+ return 'warning-row'
+ } else {
+ return 'success-row'
+ }
+}
+onMounted(() => {})
</script>
<style lang="scss" scoped>
.table-container {
- height: 500px;
- // display: flex;
- // flex-direction: column;
-
- .pagination {
- margin-top: 10px;
- }
-
- // :deep(.el-table) {
- // flex: 1;
- // background-color: transparent;
- // --el-table-border-color: rgba(255, 255, 255, 0.1);
- // --el-table-header-bg-color: rgba(31, 62, 122, 0.5);
- // --el-table-header-text-color: #fff;
- // --el-table-text-color: #fff;
- // }
+ height: 500px;
+ .pagination {
+ margin-top: 10px;
+ }
+
+ // 分页
+ :deep(.el-pagination) {
+ display: flex;
+ justify-content: center;
+ }
+ .taskTableTitle {
+ margin-bottom: 16px;
+ background: url('/src/assets/images/signMachineNest/machineRight/detailtitle.png') no-repeat center;
+ background-size: 100% 100%;
+ span {
+ display: inline-block;
+ margin-left: 10px;
+ font-size: 16px;
+ color: #ddf0ff;
+ line-height: 20px;
+ text-align: left;
+ margin-bottom: 8px;
+ }
+ }
+ :deep(.el-checkbox__inner){
+ background: none !important;
+ border: 1px solid #3194EF !important;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/TaskManage/TaskTop/TaskTime.vue b/src/views/TaskManage/TaskTop/TaskTime.vue
index d4a7c31..c9cb869 100644
--- a/src/views/TaskManage/TaskTop/TaskTime.vue
+++ b/src/views/TaskManage/TaskTop/TaskTime.vue
@@ -107,7 +107,6 @@
// 添加监听
watch(() => store.state.task.taskSearchParams, (newVal) => {
- console.log(newVal, '33333');
if (newVal) {
getJobNumBar(newVal);
(newVal);
diff --git a/vite.config.mjs.timestamp-1744707003737-1868137d88f2d.mjs b/vite.config.mjs.timestamp-1744707003737-1868137d88f2d.mjs
new file mode 100644
index 0000000..9ccffb4
--- /dev/null
+++ b/vite.config.mjs.timestamp-1744707003737-1868137d88f2d.mjs
@@ -0,0 +1,187 @@
+// vite.config.mjs
+import {
+ defineConfig,
+ loadEnv
+} from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/vite/dist/node/index.js";
+import { resolve } from "path";
+
+// vite/plugins/index.js
+import vue from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/auto-import.js
+import autoImport from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/unplugin-auto-import/dist/vite.js";
+function createAutoImport() {
+ return autoImport({
+ imports: ["vue", "vue-router", "vuex"],
+ dts: false
+ });
+}
+
+// vite/plugins/compression.js
+import compression from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/vite-plugin-compression/dist/index.mjs";
+function createCompression(env) {
+ const { VITE_BUILD_COMPRESS } = env;
+ const plugin = [];
+ if (VITE_BUILD_COMPRESS) {
+ const compressList = VITE_BUILD_COMPRESS.split(",");
+ if (compressList.includes("gzip")) {
+ plugin.push(
+ compression({
+ ext: ".gz",
+ deleteOriginFile: false
+ })
+ );
+ }
+ if (compressList.includes("brotli")) {
+ plugin.push(
+ compression({
+ ext: ".br",
+ algorithm: "brotliCompress",
+ deleteOriginFile: false
+ })
+ );
+ }
+ }
+ return plugin;
+}
+
+// vite/plugins/setup-extend.js
+import setupExtend from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/vite-plugin-vue-setup-extend/dist/index.mjs";
+function createSetupExtend() {
+ return setupExtend();
+}
+
+// vite/plugins/svg-plugin.js
+import { createSvgIconsPlugin } from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import path from "path";
+function createSvgPlugin() {
+ return createSvgIconsPlugin({
+ iconDirs: [path.resolve(process.cwd(), "src/assets/svg")],
+ //svg图片存放的目录
+ symbolId: "icon-[name]",
+ // symbol的id
+ inject: "body-last",
+ // 插入的位置
+ customDomId: "__svg__icons__dom__"
+ // svg的id
+ });
+}
+
+// vite/plugins/index.js
+function createVitePlugins(viteEnv, isBuild = false) {
+ const vitePlugins = [vue()];
+ vitePlugins.push(createAutoImport());
+ vitePlugins.push(createSetupExtend());
+ vitePlugins.push(createSvgPlugin());
+ isBuild && vitePlugins.push(...createCompression(viteEnv));
+ return vitePlugins;
+}
+
+// vite.config.mjs
+import postCssPxToRem from "file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/node_modules/postcss-pxtorem/index.js";
+var __vite_injected_original_dirname = "E:\\\u9648\u7476\\\u4E2D\u56FE\u667A\u98DE\\command-center-dashboard";
+var vite_config_default = ({
+ mode,
+ command
+}) => {
+ const env = loadEnv(mode, process.cwd());
+ const {
+ VITE_APP_ENV,
+ VITE_APP_BASE,
+ VITE_APP_API_URL
+ } = env;
+ const isProd = VITE_APP_ENV === "production";
+ const buildConfig = {
+ target: "esnext",
+ minify: isProd ? "terser" : "esbuild"
+ // 根据环境选择压缩工具
+ };
+ if (isProd) {
+ buildConfig.terserOptions = {
+ compress: {
+ drop_console: true,
+ // 删除 console
+ drop_debugger: true
+ // 删除 debugger
+ },
+ format: {
+ comments: false
+ // 删除所有注释
+ }
+ };
+ buildConfig.rollupOptions = {
+ output: {
+ manualChunks: {
+ "element-plus": ["element-plus"],
+ "@smallwei/avue": ["@smallwei/avue"]
+ }
+ }
+ };
+ }
+ return defineConfig({
+ base: VITE_APP_BASE,
+ define: {
+ __VUE_I18N_FULL_INSTALL__: true,
+ __VUE_I18N_LEGACY_API__: true,
+ __INTLIFY_PROD_DEVTOOLS__: false
+ },
+ server: {
+ // port: 2888,
+ proxy: {
+ "/api": {
+ target: VITE_APP_API_URL,
+ changeOrigin: true,
+ rewrite: (path2) => path2.replace(/^\/api/, "")
+ }
+ }
+ },
+ resolve: {
+ alias: {
+ "~": resolve(__vite_injected_original_dirname, "./"),
+ "@": resolve(__vite_injected_original_dirname, "./src"),
+ components: resolve(__vite_injected_original_dirname, "./src/components"),
+ styles: resolve(__vite_injected_original_dirname, "./src/styles"),
+ utils: resolve(__vite_injected_original_dirname, "./src/utils")
+ }
+ },
+ css: {
+ preprocessorOptions: {
+ scss: {
+ api: "modern-compiler",
+ additionalData: `@use "@/styles/variables.scss" as *;`
+ }
+ },
+ postcss: {
+ plugins: [
+ postCssPxToRem({
+ rootValue: 10,
+ // 指定转换基准值，通常是设计稿宽度的1/10
+ propList: ["*"],
+ // 可以从px转换为rem的属性，这里是所有属性
+ unitPrecision: 5,
+ // 允许REM单位增长到的十进制数
+ selectorBlackList: [],
+ // 选择器黑名单，忽略转换的选择器
+ replace: true,
+ // 替换包含rem的规则，而不是添加回退
+ mediaQuery: false,
+ // 允许在媒体查询中转换px
+ minPixelValue: 0
+ // 设置要替换的最小像素值
+ })
+ ]
+ }
+ },
+ plugins: createVitePlugins(env, command === "build"),
+ build: buildConfig,
+ optimizeDeps: {
+ esbuildOptions: {
+ target: "esnext"
+ }
+ }
+ });
+};
+export {
+ vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mjs", "vite/plugins/index.js", "vite/plugins/auto-import.js", "vite/plugins/compression.js", "vite/plugins/setup-extend.js", "vite/plugins/svg-plugin.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\";const __vite_injected_original_filename = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite.config.mjs\";const __vite_injected_original_import_meta_url = \"file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/vite.config.mjs\";import {\r\n  defineConfig,\r\n  loadEnv\r\n} from 'vite';\r\nimport { resolve } from 'path'\r\nimport createVitePlugins from './vite/plugins';\r\nimport postCssPxToRem from 'postcss-pxtorem'\r\n\r\n// https://vitejs.dev/config/\r\nexport default ({\r\n  mode,\r\n  command\r\n}) => {\r\n  const env = loadEnv(mode, process.cwd())\r\n  const {\r\n    VITE_APP_ENV,\r\n    VITE_APP_BASE,\r\n    VITE_APP_API_URL\r\n  } = env\r\n  // \u5224\u65AD\u662F\u6253\u751F\u4EA7\u73AF\u5883\u5305\r\n  const isProd = VITE_APP_ENV === 'production'\r\n\r\n  // \u6839\u636E\u662F\u5426\u751F\u4EA7\u73AF\u5883\uFF0C\u52A8\u6001\u8BBE\u7F6E\u538B\u7F29\u914D\u7F6E\r\n  const buildConfig = {\r\n    target: 'esnext',\r\n    minify: isProd ? 'terser' : 'esbuild', // \u6839\u636E\u73AF\u5883\u9009\u62E9\u538B\u7F29\u5DE5\u5177\r\n  };\r\n\r\n  // \u5982\u679C\u662F\u751F\u4EA7\u73AF\u5883\uFF0C\u6DFB\u52A0Terser\u7684\u914D\u7F6E\r\n  if (isProd) {\r\n    buildConfig.terserOptions = {\r\n      compress: {\r\n        drop_console: true, // \u5220\u9664 console\r\n        drop_debugger: true, // \u5220\u9664 debugger\r\n      },\r\n      format: {\r\n        comments: false // \u5220\u9664\u6240\u6709\u6CE8\u91CA\r\n      }\r\n    };\r\n    buildConfig.rollupOptions = {\r\n      output: {\r\n        manualChunks: {\r\n          'element-plus': ['element-plus'],\r\n          '@smallwei/avue': ['@smallwei/avue']\r\n        },\r\n      }\r\n    }\r\n  }\r\n  return defineConfig({\r\n    base: VITE_APP_BASE,\r\n    define: {\r\n      __VUE_I18N_FULL_INSTALL__: true,\r\n      __VUE_I18N_LEGACY_API__: true,\r\n      __INTLIFY_PROD_DEVTOOLS__: false\r\n    },\r\n    server: {\r\n      // port: 2888,\r\n      proxy: {\r\n        '/api': {\r\n          target: VITE_APP_API_URL,\r\n          changeOrigin: true,\r\n          rewrite: path => path.replace(/^\\/api/, ''),\r\n        },\r\n      },\r\n    },\r\n    resolve: {\r\n      alias: {\r\n        '~': resolve(__dirname, './'),\r\n        '@': resolve(__dirname, './src'),\r\n        components: resolve(__dirname, './src/components'),\r\n        styles: resolve(__dirname, './src/styles'),\r\n        utils: resolve(__dirname, './src/utils'),\r\n      },\r\n    },\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          api: 'modern-compiler',\r\n          additionalData: `@use \"@/styles/variables.scss\" as *;`,\r\n        },\r\n      },\r\n      postcss: {\r\n        plugins: [\r\n          postCssPxToRem({\r\n            rootValue: 10, // \u6307\u5B9A\u8F6C\u6362\u57FA\u51C6\u503C\uFF0C\u901A\u5E38\u662F\u8BBE\u8BA1\u7A3F\u5BBD\u5EA6\u76841/10\r\n            propList: ['*'], // \u53EF\u4EE5\u4ECEpx\u8F6C\u6362\u4E3Arem\u7684\u5C5E\u6027\uFF0C\u8FD9\u91CC\u662F\u6240\u6709\u5C5E\u6027\r\n            unitPrecision: 5, // \u5141\u8BB8REM\u5355\u4F4D\u589E\u957F\u5230\u7684\u5341\u8FDB\u5236\u6570\r\n            selectorBlackList: [], // \u9009\u62E9\u5668\u9ED1\u540D\u5355\uFF0C\u5FFD\u7565\u8F6C\u6362\u7684\u9009\u62E9\u5668\r\n            replace: true, // \u66FF\u6362\u5305\u542Brem\u7684\u89C4\u5219\uFF0C\u800C\u4E0D\u662F\u6DFB\u52A0\u56DE\u9000\r\n            mediaQuery: false, // \u5141\u8BB8\u5728\u5A92\u4F53\u67E5\u8BE2\u4E2D\u8F6C\u6362px\r\n            minPixelValue: 0 // \u8BBE\u7F6E\u8981\u66FF\u6362\u7684\u6700\u5C0F\u50CF\u7D20\u503C\r\n          }),\r\n        ]\r\n      }\r\n    },\r\n    plugins: createVitePlugins(env, command === 'build'),\r\n    build: buildConfig,\r\n    optimizeDeps: {\r\n      esbuildOptions: {\r\n        target: 'esnext',\r\n      },\r\n    },\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\\\\index.js\";const __vite_injected_original_import_meta_url = \"file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/vite/plugins/index.js\";import vue from '@vitejs/plugin-vue';\r\n\r\nimport createAutoImport from './auto-import';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\nimport createSvgPlugin from './svg-plugin';\r\n\r\nexport default function createVitePlugins(viteEnv, isBuild = false) {\r\n  const vitePlugins = [vue()];\r\n  vitePlugins.push(createAutoImport());\r\n  vitePlugins.push(createSetupExtend());\r\n  vitePlugins.push(createSvgPlugin());\r\n  isBuild && vitePlugins.push(...createCompression(viteEnv));\r\n  return vitePlugins;\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\\\\auto-import.js\";const __vite_injected_original_import_meta_url = \"file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/vite/plugins/auto-import.js\";import autoImport from 'unplugin-auto-import/vite';\r\n\r\nexport default function createAutoImport() {\r\n  return autoImport({\r\n    imports: ['vue', 'vue-router', 'vuex'],\r\n    dts: false,\r\n  });\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\\\\compression.js\";const __vite_injected_original_import_meta_url = \"file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/vite/plugins/compression.js\";import compression from 'vite-plugin-compression';\r\n\r\nexport default function createCompression(env) {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false,\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false,\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\\\\setup-extend.js\";const __vite_injected_original_import_meta_url = \"file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/vite/plugins/setup-extend.js\";import setupExtend from 'vite-plugin-vue-setup-extend';\r\n\r\nexport default function createSetupExtend() {\r\n  return setupExtend();\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\\u9648\u7476\\\\\u4E2D\u56FE\u667A\u98DE\\\\command-center-dashboard\\\\vite\\\\plugins\\\\svg-plugin.js\";const __vite_injected_original_import_meta_url = \"file:///E:/%E9%99%88%E7%91%B6/%E4%B8%AD%E5%9B%BE%E6%99%BA%E9%A3%9E/command-center-dashboard/vite/plugins/svg-plugin.js\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'\r\nimport path from 'path';\r\n\r\nexport default function createSvgPlugin() {\r\n  return  createSvgIconsPlugin({\r\n    iconDirs: [path.resolve(process.cwd(), \"src/assets/svg\")], //svg\u56FE\u7247\u5B58\u653E\u7684\u76EE\u5F55\r\n    symbolId: \"icon-[name]\", // symbol\u7684id\r\n    inject: \"body-last\", // \u63D2\u5165\u7684\u4F4D\u7F6E\r\n    customDomId: \"__svg__icons__dom__\" // svg\u7684id\r\n  });\r\n}\r\n"],
  "mappings": "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",
  "names": ["path"]
}

--
Gitblit v1.9.3