fix: 🐛 修正构建包安装顺序

fix: 🏗️ 修复raphael依赖找不到问题
fix: 🐛 修正构建脚本
2022-02-23 13:22:42 +08:00 · 2022-02-23 12:46:46 +08:00 · 2022-02-23 11:40:13 +08:00 · 2022-02-23 11:23:47 +08:00 · 2022-02-23 11:23:07 +08:00 · 2022-02-23 11:05:47 +08:00
11 changed files with 17 additions and 58 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,7 +12,7 @@ steps:
  - name: dockerconfig
    path: /root/.docker
  commands:
-  - docker build -t harbor.picaiba.com/mes/mes-cigs-ui ./ && docker push harbor.picaiba.com/mes/mes-cigs-ui
+  - 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

 - 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/mes-ui -n mes-cigs
+  - kubectl scale --replicas=0 deployment/a-wms-ui -n wms
  - sleep 3
-  - kubectl scale --replicas=1 deployment/mes-ui -n mes-cigs
+  - kubectl scale --replicas=1 deployment/a-wms-ui -n wms
  depends_on:
  - build

--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@
 ENV = 'production'

 # base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = ''
 VUE_APP_REPORT_DESIGN_URL = '/ureport/designer'
-VUE_APP_REPORT_VIEW_URL = '/ureport/preview'
+VUE_APP_REPORT_VIEW_URL = '/ureport/preview'
--- a/4
+++ b/4
@@ -1,9 +1,7 @@
 FROM node:12 AS builder
 WORKDIR /app
 ADD package.json /app/
-RUN npm install \
-    --registry=https://registry.npm.taobao.org \
-    --disturl=https://npm.taobao.org/dist
+RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
 ADD . /app
 RUN npm run build:prod

--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
    "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",
@@ -96,7 +97,7 @@
    "@vue/test-utils": "1.0.0-beta.29",
    "autoprefixer": "^9.5.1",
    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "8.2.2",
+    "babel-eslint": "10.0.1",
    "babel-jest": "23.6.0",
    "chalk": "2.4.2",
    "chokidar": "2.1.5",
--- 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/getCode',
+    url: '/api/wms/area/get-code',
    method: 'post'
  })
 }
--- 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/getCode',
+    url: '/api/wms/area/get-code',
    method: 'post'
  })
 }
--- 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/getCode',
+    url: '/api/wms/storagebox/get-code',
    method: 'post'
  })
 }
@@ -56,7 +56,7 @@ export function storageBoxDelete(id) { // 删除存储箱单条数据

 export function PositionDetailInfoAdd(data) { // 新增存储箱地址单条数据
  return request({
-    url: '/api/wms/storagebox/add',
+    url: '/api/wms/storagebox-site/add',
    method: 'post',
    data
  })
--- 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/getCode',
+    url: '/api/wms/equipment/get-code',
    method: 'post'
  })
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -224,45 +224,6 @@ 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',
--- a/src/views/basicData/Cache/cache.vue
+++ b/src/views/basicData/Cache/cache.vue
@@ -44,7 +44,6 @@ 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> = []
@@ -134,7 +133,7 @@ export default {
  methods: {
    handleClick(raw) {
      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.tareaName}]?`, this.$t('module.basicData.visual.Tips'), {
+        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
          type: 'warning'
--- 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.148:8080',
+        // target: 'http://192.168.0.148:8080',
+        target: 'http://a.wms.picaiba.com/api',
        // 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: {
-          '^/portapi': ''
+          '^/api': ''
        }
        // 使用了proxy 就需要开启下面的选项 (http-proxy-middleware会将post请求给parse了 所以需要再次进行string化)
        // onProxyReq: (proxyReq, req, res, options) => {
Author	SHA1	Message	Date
thomas	bb4f3e2c0e	fix: 🐛 修正构建包安装顺序	2022-02-23 13:22:42 +08:00
thomas	0338bf1a15	fix: 🏗️ 修复raphael依赖找不到问题	2022-02-23 12:46:46 +08:00
thomas	5fadd533de	fix: 🐛 修正构建脚本	2022-02-23 11:40:13 +08:00
朱文强	f2c038d543	Merge pull request '修改api' (#11 ) from zwq into develop Reviewed-on: #11	2022-02-23 11:23:47 +08:00
zwq	30cfedec07	修改api	2022-02-23 11:23:07 +08:00
朱文强	898803c514	Merge pull request '修改api' (#10 ) from zwq into develop Reviewed-on: #10	2022-02-23 11:05:47 +08:00
zwq	4af403b22b	修改api	2022-02-23 11:05:13 +08:00