From b800893ea5cd9295ab605bdff04d997484300e31 Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Tue, 18 Jan 2022 17:02:15 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=98=E5=AF=B9=E6=8E=A5=E5=8F=A3=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicData/Cache/area.js | 2 +- src/api/basicData/Cache/cache.js | 2 +- src/api/basicData/Cache/storageBox.js | 4 +- src/api/basicData/Equipment/equipmentInfo.js | 2 +- src/router/index.js | 39 ++++++++++++++++++++ src/views/basicData/Cache/cache.vue | 3 +- vue.config.js | 4 +- 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/api/basicData/Cache/area.js b/src/api/basicData/Cache/area.js index 856032d..ec39efc 100644 --- a/src/api/basicData/Cache/area.js +++ b/src/api/basicData/Cache/area.js @@ -41,7 +41,7 @@ export function areaAdd(data) { // 新增缓存区区域信息单条数据 export function areaCode() { // 获取缓存区区域信息code return request({ - url: '/api/wms/area/get-code', + url: '/api/wms/area/getCode', method: 'post' }) } diff --git a/src/api/basicData/Cache/cache.js b/src/api/basicData/Cache/cache.js index cf33218..30f715e 100644 --- a/src/api/basicData/Cache/cache.js +++ b/src/api/basicData/Cache/cache.js @@ -41,7 +41,7 @@ export function cacheAdd(data) { // 新增缓存区信息单条数据 export function cacheCode() { // 获取缓存区信息code return request({ - url: '/api/wms/area/get-code', + url: '/api/wms/area/getCode', method: 'post' }) } diff --git a/src/api/basicData/Cache/storageBox.js b/src/api/basicData/Cache/storageBox.js index ea1f238..ceddaf4 100644 --- a/src/api/basicData/Cache/storageBox.js +++ b/src/api/basicData/Cache/storageBox.js @@ -41,7 +41,7 @@ export function storageBoxAdd(data) { // 新增存储箱单条数据 export function storageBoxCode() { // 获取存储箱code return request({ - url: '/api/wms/storagebox/get-code', + url: '/api/wms/storagebox/getCode', method: 'post' }) } @@ -56,7 +56,7 @@ export function storageBoxDelete(id) { // 删除存储箱单条数据 export function PositionDetailInfoAdd(data) { // 新增存储箱地址单条数据 return request({ - url: '/api/wms/storagebox-site/add', + url: '/api/wms/storagebox/add', method: 'post', data }) diff --git a/src/api/basicData/Equipment/equipmentInfo.js b/src/api/basicData/Equipment/equipmentInfo.js index 61747b3..fee35a8 100644 --- a/src/api/basicData/Equipment/equipmentInfo.js +++ b/src/api/basicData/Equipment/equipmentInfo.js @@ -41,7 +41,7 @@ export function equipmentInfoAdd(data) { // 新增设备信息单条数据 export function equipmentInfoCode() { // 获取设备信息code return request({ - url: '/api/wms/equipment/get-code', + url: '/api/wms/equipment/getCode', method: 'post' }) } diff --git a/src/router/index.js b/src/router/index.js index a9304c8..81600c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -224,6 +224,45 @@ export const constantRoutes = [ ] }, { + // path: '/form', + // component: Layout, + // redirect: '/form', + // name: 'formManage', + // meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false }, + // children: [{ + // path: 'report', + // component: () => import('@/views/report-manage/ReportSortChoise'), + // name: 'Report', + // meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true } + // }, + // { + // path: 'report-sort-list', + // component: () => import('@/views/report-manage/Report'), + // name: 'ReportSortList', + // hidden: true, + // meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true } + // }, + // { + // path: 'report-view', + // component: () => import('@/views/report-manage/ReportView'), + // name: 'ReportDesign', + // meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true }, + // hidden: true + // }, + // { + // path: 'report-design', + // component: () => import('@/views/report-manage/ReportDesign'), + // name: 'ReportDesign', + // meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true } + // }, + // { + // path: 'report-sort', + // component: () => import('@/views/report-manage/ReportSort/index'), + // name: 'ReportSort', + // meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true } + // }] + // }, + // { path: '/interface', component: Layout, redirect: '/interface', diff --git a/src/views/basicData/Cache/cache.vue b/src/views/basicData/Cache/cache.vue index fc94aed..71fa389 100644 --- a/src/views/basicData/Cache/cache.vue +++ b/src/views/basicData/Cache/cache.vue @@ -44,6 +44,7 @@ import BaseTable from '@/components/BaseTable' import Pagination from '@/components/Pagination' // Secondary package based on el-pagination import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import { timeFormatter } from '@/filters' + /** * 表格表头配置项 TypeScript接口注释 * tableConfig = [] @@ -133,7 +134,7 @@ export default { methods: { handleClick(raw) { if (raw.type === 'delete') { - this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), { + this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.tareaName}]?`, this.$t('module.basicData.visual.Tips'), { confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'), type: 'warning' diff --git a/vue.config.js b/vue.config.js index b85eedc..0dedbbf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - target: 'http://localhost:8080', - // target: 'http://192.168.0.188:8080', + // target: 'http://localhost:8080', + target: 'http://192.168.0.148:8080', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080',