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
12 changed files with 41 additions and 37 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",
--- a/src/filters/basicData/index.js
+++ b/src/filters/basicData/index.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2020-12-29 16:49:28
 * @LastEditors: zwq
- * @LastEditTime: 2021-07-21 15:56:54
+ * @LastEditTime: 2022-01-17 15:31:40
 * @FilePath: \basic-admin\src\filters\basicData\index.js
 * @Description:
 */
@@ -63,9 +63,9 @@ const table = {
    '1': i18n.t('basicDataFilter.enableState.enable')
  },
  storage: {
-    '0': i18n.t('basicDataFilter.enableState.normal'),
-    '1': i18n.t('basicDataFilter.enableState.repairing'),
-    '2': i18n.t('basicDataFilter.enableState.scrap')
+    '0': i18n.t('basicDataFilter.storage.normal'),
+    '1': i18n.t('basicDataFilter.storage.repairing'),
+    '2': i18n.t('basicDataFilter.storage.scrap')
  }
 }

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -343,6 +343,7 @@ export const constantRoutes = [
    component: Layout,
    redirect: '/user/manager',
    name: 'ArticleManager',
+    hidden: true,
    meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
    children: [
      {
--- a/src/views/basicData/Warehouse/StorageBoxInfo.vue
+++ b/src/views/basicData/Warehouse/StorageBoxInfo.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 14:03:24
+ * @LastEditTime: 2022-01-18 14:30:25
 * @Description:
 -->
 <template>
@@ -68,7 +68,7 @@ import i18n from '@/lang'

 const tableProps = [
  {
-    prop: 'code',
+    prop: 'storageCode',
    label: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
    align: 'center'
  },
--- a/src/views/orderManage/ExecutionInfo.vue
+++ b/src/views/orderManage/ExecutionInfo.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:00:35
+ * @LastEditTime: 2022-01-17 15:26:35
 * @Description:
 -->
 <template>
@@ -47,6 +47,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'
+import basicData from '@/filters/basicData'
 import i18n from '@/lang'
 /**
 * 表格表头配置项 TypeScript接口注释
@@ -90,11 +91,13 @@ const tableProps = [
  {
    prop: 'priority',
    label: i18n.t('module.basicData.Warehouse.Priority'),
+    filter: basicData('priority'),
    align: 'center'
  },
  {
    prop: 'status',
    label: i18n.t('module.basicData.Warehouse.OrderStatus'),
+    filter: basicData('workOrderStatus'),
    align: 'center'
  }
 ]
--- a/src/views/orderManage/ProcessInfo.vue
+++ b/src/views/orderManage/ProcessInfo.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:20
+ * @LastEditTime: 2022-01-17 15:32:00
 * @Description:
 -->
 <template>
@@ -47,6 +47,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'
+import basicData from '@/filters/basicData'
 import processLinkBtn from './components/processLinkBtn'
 import i18n from '@/lang'
 /**
@@ -91,11 +92,13 @@ const tableProps = [
  {
    prop: 'priority',
    label: i18n.t('module.basicData.Warehouse.Priority'),
+    filter: basicData('priority'),
    align: 'center'
  },
  {
    prop: 'status',
    label: i18n.t('module.basicData.Warehouse.OrderStatus'),
+    filter: basicData('workOrderStatus'),
    align: 'center'
  },
  {
--- a/src/views/orderManage/components/ExecutionInfoDetail.vue
+++ b/src/views/orderManage/components/ExecutionInfoDetail.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:04:42
+ * @LastEditTime: 2022-01-17 15:21:50
 * @Description:
 -->
 <template>
@@ -14,7 +14,6 @@
      <el-form
        ref="dataForm"
        :model="dataForm"
-        :rules="rules"
        size="medium"
        label-width="110px"
        label-position="left"
@@ -23,17 +22,17 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
-                <el-input v-model="dataForm.name" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderName')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.OrderName')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
-                <el-input v-model="dataForm.createTime" :placeholder="$i18nForm([$t('module.basicData.Warehouse.IssueOrderTime')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
-                <el-input v-model="dataForm.planQuantity" :placeholder="$i18nForm([$t('module.basicData.Warehouse.PlanProcessQuantity')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -42,12 +41,12 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderCode')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
-                <el-input v-model="dataForm.taskType" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderStatus')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -56,14 +55,14 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
-                <el-input v-model="dataForm.craftName" :placeholder="$i18nForm([$t('module.basicData.Warehouse.TotalProcessName')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
                <el-input
                  v-model="dataForm.subProccessName"
-                  :placeholder="$i18nForm([$t('module.basicData.Warehouse.SubProcessName')])"
+                  :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
                  readonly
                  :style="{width: '100%'}"
                />
--- a/src/views/orderManage/components/ProcessInfoDetail.vue
+++ b/src/views/orderManage/components/ProcessInfoDetail.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:04:50
+ * @LastEditTime: 2022-01-17 15:22:08
 * @Description:
 -->
 <template>
@@ -14,7 +14,6 @@
      <el-form
        ref="dataForm"
        :model="dataForm"
-        :rules="rules"
        size="medium"
        label-width="110px"
        label-position="left"
@@ -23,17 +22,17 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
-                <el-input v-model="dataForm.name" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderName')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.OrderName')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
-                <el-input v-model="dataForm.createTime" :placeholder="$i18nForm([$t('module.basicData.Warehouse.IssueOrderTime')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
-                <el-input v-model="dataForm.planQuantity" :placeholder="$i18nForm([$t('module.basicData.Warehouse.PlanProcessQuantity')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -42,12 +41,12 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderCode')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
-                <el-input v-model="dataForm.taskType" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderStatus')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -56,14 +55,14 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
-                <el-input v-model="dataForm.craftName" :placeholder="$i18nForm([$t('module.basicData.Warehouse.TotalProcessName')])" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
                <el-input
                  v-model="dataForm.subProccessName"
-                  :placeholder="$i18nForm([$t('module.basicData.Warehouse.SubProcessName')])"
+                  :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
                  readonly
                  :style="{width: '100%'}"
                />
--- 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.198: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
朱文强	f3f1c972b4	Merge pull request '更新' (#9 ) from zwq into develop Reviewed-on: #9	2022-01-18 14:40:10 +08:00
zwq	fb496d8a97	更新	2022-01-18 14:39:36 +08:00
朱文强	2455f83b74	Merge pull request '更新' (#8 ) from zwq into develop Reviewed-on: #8	2022-01-17 15:34:17 +08:00
zwq	9006efdb67	更新	2022-01-17 15:33:59 +08:00
朱文强	8f01c92374	Merge pull request '更新' (#7 ) from zwq into develop Reviewed-on: #7	2022-01-17 15:19:34 +08:00