diff --git a/.env.local b/.env.local index b62d369a..846499c4 100644 --- a/.env.local +++ b/.env.local @@ -4,9 +4,9 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.74:48080' +# VITE_BASE_URL='http://192.168.0.74:48080' # VITE_BASE_URL='http://192.168.0.226:48080' -# VITE_BASE_URL='http://192.168.0.45:48080' +VITE_BASE_URL='http://192.168.0.45:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue b/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue index 9c843e44..c0b32103 100644 --- a/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue +++ b/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue @@ -54,8 +54,8 @@ const ruleFormRef = ref() const dialogFormVisible = ref(false) //列表的 const rules = reactive({ - skuInfo: [{ required: true, message: '请输入物料区域名称', trigger: 'blur' }], - areaName: [{ required: true, message: '请输入物料信息', trigger: 'blur' }] + areaName: [{ required: true, message: '请输入物料区域名称', trigger: 'blur' }], + skuInfo: [{ required: true, message: '请输入物料信息', trigger: 'blur' }] }) //新增 diff --git a/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue b/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue index 83f8b43a..de0814ed 100644 --- a/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue +++ b/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue @@ -58,9 +58,12 @@ const form = ref({ }) const open = (list) => { + console.log(list) dialogFormVisible.value = true form.value.mapItemIds = list.map((item) => item.id) - form.value.areaNumber = form.value.mapItemIds.length + form.value.areaNumber = list.reduce((sum, item) => { + return sum + item.dataList.length + }, 0) form.value.laneName = '' }