diff --git a/.env.dev b/.env.dev index b27e5248..ce003711 100644 --- a/.env.dev +++ b/.env.dev @@ -4,7 +4,7 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.189:48080' +VITE_BASE_URL='http://192.168.10.134:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/.env.local b/.env.local index 4eaec172..cd9dc520 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.189:48080' +VITE_BASE_URL='http://192.168.10.134:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/.vscode/settings.json b/.vscode/settings.json index f145f386..c50fc364 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -62,7 +62,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescript]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescriptreact]": { "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" @@ -141,5 +141,6 @@ "package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore" }, "terminal.integrated.scrollback": 10000, - "nuxt.isNuxtApp": false + "nuxt.isNuxtApp": false, + "liveServer.settings.port": 5502 } diff --git a/src/api/map/mapTask.ts b/src/api/map/mapTask.ts new file mode 100644 index 00000000..3a47801a --- /dev/null +++ b/src/api/map/mapTask.ts @@ -0,0 +1,36 @@ +import request from '@/config/axios' + +//获取取货位置 +export const getLocationByName = (data) => { + return request.post({ url: '/system/ware/house-location/getLocationByName', data }) +} + +//获得任务号 +export const getTaskNo = async (id: number) => { + return await request.get({ url: `/system/robot/task/getTaskNo?id=` + id }) +} + +// 查询能正常使用的车辆 +export const getCanUseRobot = () => { + return request.post({ url: '/system/robot/information/getCanUseRobot' }) +} + +// 创建机器人任务主表 +export const createTask = (data) => { + return request.post({ url: '/system/robot/task/create', data }) +} + +// 删除机器人任务主表 +export const deleteTask = (id: number) => { + return request.delete({ url: '/system/robot/task/delete?id=' + id }) +} + +// 更新机器人任务主表 +export const updateTask = (data) => { + return request.put({ url: '/system/robot/task/update', data }) +} + +//获得机器人任务主表分页 +export const getTaskPageList = async (params) => { + return await request.get({ url: `/system/robot/task/page`, params }) +} diff --git a/src/components/ContentWrap/src/ContentWrap.vue b/src/components/ContentWrap/src/ContentWrap.vue index e6035963..ff3b533a 100644 --- a/src/components/ContentWrap/src/ContentWrap.vue +++ b/src/components/ContentWrap/src/ContentWrap.vue @@ -11,7 +11,7 @@ const prefixCls = getPrefixCls('content-wrap') defineProps({ title: propTypes.string.def(''), message: propTypes.string.def(''), - bodyStyle: propTypes.object.def({ padding: '10px' }) + bodyStyle: propTypes.object.def({ padding: '16px' }) }) diff --git a/src/components/bpmnProcessDesigner/package/theme/element-variables.css b/src/components/bpmnProcessDesigner/package/theme/element-variables.css new file mode 100644 index 00000000..15fab3f7 --- /dev/null +++ b/src/components/bpmnProcessDesigner/package/theme/element-variables.css @@ -0,0 +1,76 @@ +@charset "UTF-8"; +/* 改变主题色变量 */ +/* 改变 icon 字体路径变量,必需 */ +@use '~element-ui/packages/theme-chalk/src/index'; +.el-table td, +.el-table th { + color: #333; +} + +.el-drawer__header { + padding: 16px 16px 8px 16px; + margin: 0; + line-height: 24px; + font-size: 18px; + color: #303133; + box-sizing: border-box; + border-bottom: 1px solid #e8e8e8; +} + +div[class^='el-drawer']:focus, +span:focus { + outline: none; +} + +.el-drawer__body { + box-sizing: border-box; + padding: 16px; + width: 100%; + overflow-y: auto; +} + +.el-dialog { + margin-top: 50vh !important; + transform: translateY(-50%); + overflow: hidden; +} + +.el-dialog__wrapper { + overflow: hidden; + max-height: 100vh; +} + +.el-dialog__header { + padding: 16px 16px 8px 16px; + box-sizing: border-box; + border-bottom: 1px solid #e8e8e8; +} + +.el-dialog__body { + padding: 16px; + max-height: 80vh; + box-sizing: border-box; + overflow-y: auto; +} + +.el-dialog__footer { + padding: 16px; + box-sizing: border-box; + border-top: 1px solid #e8e8e8; +} + +.el-dialog__close { + font-weight: 600; +} + +.el-select { + width: 100%; +} + +.el-divider:not(.el-divider--horizontal) { + margin: 0 8px; +} + +.el-divider.el-divider--horizontal { + margin: 16px 0; +} diff --git a/src/components/bpmnProcessDesigner/package/theme/element-variables.min.css b/src/components/bpmnProcessDesigner/package/theme/element-variables.min.css new file mode 100644 index 00000000..d89aea3e --- /dev/null +++ b/src/components/bpmnProcessDesigner/package/theme/element-variables.min.css @@ -0,0 +1 @@ +@use '~element-ui/packages/theme-chalk/src/index';.el-table td,.el-table th{color:#333}.el-drawer__header{padding:16px 16px 8px 16px;margin:0;line-height:24px;font-size:18px;color:#303133;box-sizing:border-box;border-bottom:1px solid #e8e8e8}div[class^='el-drawer']:focus,span:focus{outline:none}.el-drawer__body{box-sizing:border-box;padding:16px;width:100%;overflow-y:auto}.el-dialog{margin-top:50vh !important;transform:translateY(-50%);overflow:hidden}.el-dialog__wrapper{overflow:hidden;max-height:100vh}.el-dialog__header{padding:16px 16px 8px 16px;box-sizing:border-box;border-bottom:1px solid #e8e8e8}.el-dialog__body{padding:16px;max-height:80vh;box-sizing:border-box;overflow-y:auto}.el-dialog__footer{padding:16px;box-sizing:border-box;border-top:1px solid #e8e8e8}.el-dialog__close{font-weight:600}.el-select{width:100%}.el-divider:not(.el-divider--horizontal){margin:0 8px}.el-divider.el-divider--horizontal{margin:16px 0} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1134152b..c935ed02 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -239,5 +239,9 @@ export enum DICT_TYPE { IOT_PRODUCT_FUNCTION_TYPE = 'iot_product_function_type', // IOT 产品功能类型 IOT_DATA_TYPE = 'iot_data_type', // IOT 数据类型 IOT_UNIT_TYPE = 'iot_unit_type', // IOT 单位类型 - IOT_RW_TYPE = 'iot_rw_type' // IOT 读写类型 + IOT_RW_TYPE = 'iot_rw_type', // IOT 读写类型 + + // ========== wcs 地图 ========== + ROBOT_TASK_STATUS = 'robot_task_status', //机器人的任务状态 + ROBOT_QUEST_PHASES = 'robot_quest_phases' //机器人的任务阶段 } diff --git a/src/views/mapPage/realTimeMap/components/createTaskDialog.vue b/src/views/mapPage/realTimeMap/components/createTaskDialog.vue new file mode 100644 index 00000000..600b77dc --- /dev/null +++ b/src/views/mapPage/realTimeMap/components/createTaskDialog.vue @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 若需要发起拼接任务,请点击前往 + 任务管理 + + + + + 确 定 + 取 消 + + + + + + diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index b7e8d1aa..90487478 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -99,8 +99,8 @@ onMounted(() => { display: flex; align-items: center; justify-content: center; - width: 100px; - height: 50px; + width: 90px; + height: 40px; margin: 10px; text-align: center; border-radius: 4px; diff --git a/src/views/mapPage/realTimeMap/index.vue b/src/views/mapPage/realTimeMap/index.vue index bd78db4f..7de2e008 100644 --- a/src/views/mapPage/realTimeMap/index.vue +++ b/src/views/mapPage/realTimeMap/index.vue @@ -1,36 +1,42 @@ - - - - - - - - - - - - + + 新建任务 + + + + + + + + + + + diff --git a/src/views/mapPage/taskManagement/createTask.vue b/src/views/mapPage/taskManagement/createTask.vue new file mode 100644 index 00000000..e2681056 --- /dev/null +++ b/src/views/mapPage/taskManagement/createTask.vue @@ -0,0 +1,204 @@ + + + + + 发起任务 + + 重置 + 确认 + + + + + + + + + + 任务基本信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 任务基本信息 + + + + + + + + + + + + + + + + + + diff --git a/src/views/mapPage/taskManagement/taskList.vue b/src/views/mapPage/taskManagement/taskList.vue new file mode 100644 index 00000000..9dd2b5dc --- /dev/null +++ b/src/views/mapPage/taskManagement/taskList.vue @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +