Merge branch 'develop' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into develop

.drone.yml

@@ -12,7 +12,7 @@ steps:
   - name: dockerconfig
     path: /root/.docker
   commands:
-  - docker build -t harbor.picaiba.com/kszny/wms-ui:00a-1.0.0 ./ && docker push harbor.picaiba.com/kszny/wms-ui:00a-1.0.0
+  - docker build -t harbor.picaiba.com/mes/mes-cigs-ui ./ && docker push harbor.picaiba.com/mes/mes-cigs-ui
 
 - name: deploy
   image: harbor.picaiba.com/tools/kubectl:1.19.8
@@ -20,9 +20,9 @@ steps:
   - echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
   #- echo "52.74.223.119 github.com" >> /etc/hosts
   - sleep 1
-  - kubectl scale --replicas=0 deployment/a-wms-ui -n wms
+  - kubectl scale --replicas=0 deployment/mes-ui -n mes-cigs
   - sleep 3
-  - kubectl scale --replicas=1 deployment/a-wms-ui -n wms
+  - kubectl scale --replicas=1 deployment/mes-ui -n mes-cigs
   depends_on:
   - build
 

.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = '/api'
 VUE_APP_REPORT_DESIGN_URL = '/ureport/designer'
 VUE_APP_REPORT_VIEW_URL = '/ureport/preview'

Dockerfile

@@ -1,7 +1,9 @@
 FROM node:12 AS builder
 WORKDIR /app
 ADD package.json /app/
-RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
+RUN npm install \
+    --registry=https://registry.npm.taobao.org \
+    --disturl=https://npm.taobao.org/dist
 ADD . /app
 RUN npm run build:prod
 

package.json

@@ -66,7 +66,6 @@
     "nprogress": "0.2.0",
     "outlayer": "^2.1.1",
     "path-to-regexp": "2.4.0",
-    "raphael": "git+https://gitee.com/shihairong/raphael",
     "screenfull": "4.2.0",
     "script-loader": "0.7.2",
     "showdown": "1.9.0",
@@ -97,7 +96,7 @@
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "10.0.1",
+    "babel-eslint": "8.2.2",
     "babel-jest": "23.6.0",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",

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'
   })
 }

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'
   })
 }

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
   })

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'
   })
 }

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',

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<ConfigItem> = []
@@ -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'

vue.config.js

@@ -46,8 +46,8 @@ module.exports = {
     // 这里写入需要代理的api和对应的目标地址
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.148:8080',
+        // target: 'http://localhost:8080',
-        target: 'http://a.wms.picaiba.com/api',
+        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',
@@ -58,7 +58,7 @@ module.exports = {
         ws: true,
         changeOrigin: true,
         pathRewrite: {
-          '^/api': ''
+          '^/portapi': ''
         }
         // 使用了proxy 就需要开启下面的选项 (http-proxy-middleware会将post请求给parse了 所以需要再次进行string化)
         // onProxyReq: (proxyReq, req, res, options) => {