#91 改名字

Fusionado
zwq fusionados 1 commits de zwq en develop hace 2 años
  1. +1
    -1
      dist/index.html
  2. +1
    -1
      dist/static/css/app.0acd3c39.css
  3. +0
    -0
      dist/static/css/chunk-36801624.2958fdcc.css
  4. +0
    -0
      dist/static/css/chunk-libs.31bcf572.css
  5. +1
    -0
      dist/static/js/app.63bc9be0.js
  6. +0
    -1
      dist/static/js/app.b1b205d2.js
  7. +0
    -0
      dist/static/js/chunk-0220d172.298d872c.js
  8. +0
    -0
      dist/static/js/chunk-041e834e.07339fde.js
  9. +0
    -0
      dist/static/js/chunk-0bfb745f.7562cf74.js
  10. +0
    -0
      dist/static/js/chunk-0ebaadc4.126ef5a7.js
  11. +0
    -0
      dist/static/js/chunk-0f24abb6.1e288ea7.js
  12. +0
    -0
      dist/static/js/chunk-11aace31.bb2b0a80.js
  13. +0
    -0
      dist/static/js/chunk-1357b78a.f6c86b10.js
  14. +0
    -0
      dist/static/js/chunk-16bb1ba0.db3b57f8.js
  15. +0
    -0
      dist/static/js/chunk-19c1fc52.da8f721a.js
  16. +0
    -0
      dist/static/js/chunk-1c8763b4.62db9343.js
  17. +0
    -0
      dist/static/js/chunk-1d1d8a1a.082db841.js
  18. +0
    -0
      dist/static/js/chunk-230696e6.ae043bee.js
  19. +0
    -0
      dist/static/js/chunk-264322de.2218d547.js
  20. +0
    -0
      dist/static/js/chunk-29bfcd85.a54f5a84.js
  21. +0
    -0
      dist/static/js/chunk-2d0cc241.e6d18960.js
  22. +1
    -1
      dist/static/js/chunk-36801624.7e328916.js
  23. +0
    -0
      dist/static/js/chunk-38a3fd8e.48f19727.js
  24. +0
    -0
      dist/static/js/chunk-3dfa6e6a.8eca1353.js
  25. +0
    -0
      dist/static/js/chunk-3fefd9bc.53dc2189.js
  26. +0
    -0
      dist/static/js/chunk-42febee0.2fcf1c16.js
  27. +0
    -0
      dist/static/js/chunk-45f42266.12c8e025.js
  28. +0
    -0
      dist/static/js/chunk-49f842f0.c7405059.js
  29. +0
    -0
      dist/static/js/chunk-4e303e21.d818f720.js
  30. +0
    -0
      dist/static/js/chunk-50357256.d8f8ad5d.js
  31. +0
    -0
      dist/static/js/chunk-5190b266.2600880d.js
  32. +0
    -0
      dist/static/js/chunk-523689e4.5fd5f3fc.js
  33. +0
    -0
      dist/static/js/chunk-534c3dec.9fb3f162.js
  34. +0
    -0
      dist/static/js/chunk-556562e8.55a4a5ae.js
  35. +0
    -0
      dist/static/js/chunk-58400871.6bbea940.js
  36. +0
    -0
      dist/static/js/chunk-58cd45f6.68507c3e.js
  37. +0
    -0
      dist/static/js/chunk-6b10ed08.25eac3cb.js
  38. +0
    -0
      dist/static/js/chunk-6b9ab80e.7ac5d32b.js
  39. +0
    -0
      dist/static/js/chunk-6c5eaa2e.8aa625a3.js
  40. +0
    -0
      dist/static/js/chunk-6de8d2c1.2e7feae7.js
  41. +0
    -0
      dist/static/js/chunk-70414a8d.73f3e76b.js
  42. +0
    -0
      dist/static/js/chunk-799950e4.c4841650.js
  43. +0
    -0
      dist/static/js/chunk-799b1311.af1afe61.js
  44. +0
    -0
      dist/static/js/chunk-7b74f4e0.51b62157.js
  45. +0
    -0
      dist/static/js/chunk-9feea084.7c73661e.js
  46. +0
    -0
      dist/static/js/chunk-a375c554.46b8d479.js
  47. +0
    -0
      dist/static/js/chunk-a5e10e00.c6ce8128.js
  48. +0
    -0
      dist/static/js/chunk-a751ef04.ed16d6fa.js
  49. +0
    -0
      dist/static/js/chunk-a78d1b0e.ea8ed199.js
  50. +0
    -0
      dist/static/js/chunk-b04bb9b0.468921b6.js
  51. +0
    -0
      dist/static/js/chunk-c182234c.d6441655.js
  52. +0
    -0
      dist/static/js/chunk-c7d68bd4.78abdeee.js
  53. +0
    -0
      dist/static/js/chunk-c81a1604.27d779c6.js
  54. +0
    -0
      dist/static/js/chunk-commons.c812b3fb.js
  55. +0
    -0
      dist/static/js/chunk-d821855c.b859bd05.js
  56. +0
    -0
      dist/static/js/chunk-e27fb0b2.d0445fd1.js
  57. +0
    -0
      dist/static/js/chunk-e2929524.00031647.js
  58. +0
    -0
      dist/static/js/chunk-ee59210a.b67023d9.js
  59. +0
    -0
      dist/static/js/chunk-ff677954.c0d18e17.js
  60. +8
    -6
      src/components/Breadcrumb/index.vue
  61. +2
    -11
      src/components/Hamburger/index.vue
  62. +14
    -0
      src/icons/svg/hamburgerBtn.svg
  63. +4
    -2
      src/lang/i18n.js
  64. +2
    -2
      src/lang/i18n/en/module/dashboard.js
  65. +2
    -2
      src/lang/i18n/zh/module/dashboard.js
  66. +3
    -2
      src/settings.js
  67. +4
    -4
      vue.config.js

+ 1
- 1
dist/index.html
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


dist/static/css/app.0acd3c39.css
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


dist/static/css/chunk-75f75070.2958fdcc.css → dist/static/css/chunk-36801624.2958fdcc.css Ver fichero


dist/static/css/chunk-libs.56871bac.css → dist/static/css/chunk-libs.31bcf572.css Ver fichero


+ 1
- 0
dist/static/js/app.63bc9be0.js
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 0
- 1
dist/static/js/app.b1b205d2.js
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


dist/static/js/chunk-0220d172.6dcecc4a.js → dist/static/js/chunk-0220d172.298d872c.js Ver fichero


dist/static/js/chunk-041e834e.30c65e7d.js → dist/static/js/chunk-041e834e.07339fde.js Ver fichero


dist/static/js/chunk-0bfb745f.a713bfe3.js → dist/static/js/chunk-0bfb745f.7562cf74.js Ver fichero


dist/static/js/chunk-0ebaadc4.8a9f2fe7.js → dist/static/js/chunk-0ebaadc4.126ef5a7.js Ver fichero


dist/static/js/chunk-0f24abb6.361fb832.js → dist/static/js/chunk-0f24abb6.1e288ea7.js Ver fichero


dist/static/js/chunk-11aace31.423fe0e5.js → dist/static/js/chunk-11aace31.bb2b0a80.js Ver fichero


dist/static/js/chunk-1357b78a.36a55f7c.js → dist/static/js/chunk-1357b78a.f6c86b10.js Ver fichero


dist/static/js/chunk-16bb1ba0.415f8fe8.js → dist/static/js/chunk-16bb1ba0.db3b57f8.js Ver fichero


dist/static/js/chunk-19c1fc52.239025ae.js → dist/static/js/chunk-19c1fc52.da8f721a.js Ver fichero


dist/static/js/chunk-1c8763b4.f20fcf95.js → dist/static/js/chunk-1c8763b4.62db9343.js Ver fichero


dist/static/js/chunk-1d1d8a1a.dd7f30c2.js → dist/static/js/chunk-1d1d8a1a.082db841.js Ver fichero


dist/static/js/chunk-230696e6.1cdbdcf5.js → dist/static/js/chunk-230696e6.ae043bee.js Ver fichero


dist/static/js/chunk-264322de.2857a3b6.js → dist/static/js/chunk-264322de.2218d547.js Ver fichero


dist/static/js/chunk-29bfcd85.d81a4596.js → dist/static/js/chunk-29bfcd85.a54f5a84.js Ver fichero


dist/static/js/chunk-2d0cc241.7bcdbb98.js → dist/static/js/chunk-2d0cc241.e6d18960.js Ver fichero


dist/static/js/chunk-36801624.7e328916.js
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


dist/static/js/chunk-38a3fd8e.a59b0504.js → dist/static/js/chunk-38a3fd8e.48f19727.js Ver fichero


dist/static/js/chunk-3dfa6e6a.f0657ee1.js → dist/static/js/chunk-3dfa6e6a.8eca1353.js Ver fichero


dist/static/js/chunk-3fefd9bc.428d29f8.js → dist/static/js/chunk-3fefd9bc.53dc2189.js Ver fichero


dist/static/js/chunk-42febee0.ff1aebd5.js → dist/static/js/chunk-42febee0.2fcf1c16.js Ver fichero


dist/static/js/chunk-45f42266.69ffc617.js → dist/static/js/chunk-45f42266.12c8e025.js Ver fichero


dist/static/js/chunk-49f842f0.74bf2c3d.js → dist/static/js/chunk-49f842f0.c7405059.js Ver fichero


dist/static/js/chunk-4e303e21.e3c14872.js → dist/static/js/chunk-4e303e21.d818f720.js Ver fichero


dist/static/js/chunk-50357256.360f91a0.js → dist/static/js/chunk-50357256.d8f8ad5d.js Ver fichero


dist/static/js/chunk-5190b266.0ca14141.js → dist/static/js/chunk-5190b266.2600880d.js Ver fichero


dist/static/js/chunk-523689e4.f77166cc.js → dist/static/js/chunk-523689e4.5fd5f3fc.js Ver fichero


dist/static/js/chunk-534c3dec.424116a6.js → dist/static/js/chunk-534c3dec.9fb3f162.js Ver fichero


dist/static/js/chunk-556562e8.918348aa.js → dist/static/js/chunk-556562e8.55a4a5ae.js Ver fichero


dist/static/js/chunk-58400871.f3b03924.js → dist/static/js/chunk-58400871.6bbea940.js Ver fichero


dist/static/js/chunk-58cd45f6.66746fc4.js → dist/static/js/chunk-58cd45f6.68507c3e.js Ver fichero


dist/static/js/chunk-6b10ed08.bc19f37e.js → dist/static/js/chunk-6b10ed08.25eac3cb.js Ver fichero


dist/static/js/chunk-6b9ab80e.c44d6fe1.js → dist/static/js/chunk-6b9ab80e.7ac5d32b.js Ver fichero


dist/static/js/chunk-6c5eaa2e.f31440cd.js → dist/static/js/chunk-6c5eaa2e.8aa625a3.js Ver fichero


dist/static/js/chunk-6de8d2c1.4a76944c.js → dist/static/js/chunk-6de8d2c1.2e7feae7.js Ver fichero


dist/static/js/chunk-70414a8d.ffda48ee.js → dist/static/js/chunk-70414a8d.73f3e76b.js Ver fichero


dist/static/js/chunk-799950e4.27abaab4.js → dist/static/js/chunk-799950e4.c4841650.js Ver fichero


dist/static/js/chunk-799b1311.c48967c8.js → dist/static/js/chunk-799b1311.af1afe61.js Ver fichero


dist/static/js/chunk-7b74f4e0.797ee908.js → dist/static/js/chunk-7b74f4e0.51b62157.js Ver fichero


dist/static/js/chunk-9feea084.ee5d3943.js → dist/static/js/chunk-9feea084.7c73661e.js Ver fichero


dist/static/js/chunk-a375c554.c047bdcf.js → dist/static/js/chunk-a375c554.46b8d479.js Ver fichero


dist/static/js/chunk-a5e10e00.1622fdb9.js → dist/static/js/chunk-a5e10e00.c6ce8128.js Ver fichero


dist/static/js/chunk-a751ef04.c38a3c10.js → dist/static/js/chunk-a751ef04.ed16d6fa.js Ver fichero


dist/static/js/chunk-a78d1b0e.dc0a02ba.js → dist/static/js/chunk-a78d1b0e.ea8ed199.js Ver fichero


dist/static/js/chunk-b04bb9b0.4056340c.js → dist/static/js/chunk-b04bb9b0.468921b6.js Ver fichero


dist/static/js/chunk-c182234c.06aef4fe.js → dist/static/js/chunk-c182234c.d6441655.js Ver fichero


dist/static/js/chunk-c7d68bd4.ce8b5fba.js → dist/static/js/chunk-c7d68bd4.78abdeee.js Ver fichero


dist/static/js/chunk-c81a1604.61c4f872.js → dist/static/js/chunk-c81a1604.27d779c6.js Ver fichero


dist/static/js/chunk-commons.362bfd6c.js → dist/static/js/chunk-commons.c812b3fb.js Ver fichero


dist/static/js/chunk-d821855c.a5c58816.js → dist/static/js/chunk-d821855c.b859bd05.js Ver fichero


dist/static/js/chunk-e27fb0b2.e1bc413b.js → dist/static/js/chunk-e27fb0b2.d0445fd1.js Ver fichero


dist/static/js/chunk-e2929524.6393baed.js → dist/static/js/chunk-e2929524.00031647.js Ver fichero


dist/static/js/chunk-ee59210a.e8b98629.js → dist/static/js/chunk-ee59210a.b67023d9.js Ver fichero


dist/static/js/chunk-ff677954.a3813890.js → dist/static/js/chunk-ff677954.c0d18e17.js Ver fichero


+ 8
- 6
src/components/Breadcrumb/index.vue Ver fichero

@@ -1,8 +1,8 @@
<!--
* @Author: your name
* @Date: 2021-01-27 10:07:42
* @LastEditTime: 2021-01-28 16:26:15
* @LastEditors: gtz
* @LastEditTime: 2022-06-20 16:57:55
* @LastEditors: zwq
* @Description: In User Settings Edit
* @FilePath: \mt-bus-fe\src\components\Breadcrumb\index.vue
-->
@@ -10,7 +10,7 @@
<el-breadcrumb class="app-breadcrumb" separator="/">
<transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1">{{ item.meta.title }}</span>
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="isredirect">{{ item.meta.title }}</span>
<span v-else class="no-redirect">{{ item.meta.title }}</span>
<!-- @click.prevent="handleLink(item)" -->
</el-breadcrumb-item>
@@ -80,11 +80,13 @@ export default {
.app-breadcrumb.el-breadcrumb {
display: inline-block;
font-size: 14px;
line-height: 50px;
line-height: 48px;
margin-left: 8px;

.isredirect {
color: rgba(0, 0, 0, 0.65);
}
.no-redirect {
color: #97a8be;
color: #8C8C8C;
cursor: text;
}
}


+ 2
- 11
src/components/Hamburger/index.vue Ver fichero

@@ -1,15 +1,6 @@
<template>
<div style="padding: 0 15px;" @click="toggleClick">
<svg
:class="{'is-active':isActive}"
class="hamburger"
viewBox="0 0 1024 1024"
xmlns="http://www.w3.org/2000/svg"
width="64"
height="64"
>
<path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
</svg>
<div style="padding: 5px 15px 5px 32px;" @click="toggleClick">
<svg-icon style="width: 24px; height: 24px" class="item-icon hamburger" :class="{'is-active':isActive}" icon-class="hamburgerBtn" />
</div>
</template>



+ 14
- 0
src/icons/svg/hamburgerBtn.svg Ver fichero

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>outdent</title>
<g id="质量管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="质量追溯_设备参数追溯" transform="translate(-368.000000, -20.000000)" fill="#000000" fill-rule="nonzero">
<g id="编组-18" transform="translate(336.000000, 0.000000)">
<g id="outdent" transform="translate(44.000000, 32.000000) scale(-1, 1) translate(-44.000000, -32.000000) translate(32.000000, 20.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
<path d="M9.5625,10.359375 L20.8125,10.359375 C20.915625,10.359375 21,10.275 21,10.171875 L21,8.859375 C21,8.75625 20.915625,8.671875 20.8125,8.671875 L9.5625,8.671875 C9.459375,8.671875 9.375,8.75625 9.375,8.859375 L9.375,10.171875 C9.375,10.275 9.459375,10.359375 9.5625,10.359375 Z M9.375,15.140625 C9.375,15.24375 9.459375,15.328125 9.5625,15.328125 L20.8125,15.328125 C20.915625,15.328125 21,15.24375 21,15.140625 L21,13.828125 C21,13.725 20.915625,13.640625 20.8125,13.640625 L9.5625,13.640625 C9.459375,13.640625 9.375,13.725 9.375,13.828125 L9.375,15.140625 Z M21.1875,3.75 L2.8125,3.75 C2.709375,3.75 2.625,3.834375 2.625,3.9375 L2.625,5.25 C2.625,5.353125 2.709375,5.4375 2.8125,5.4375 L21.1875,5.4375 C21.290625,5.4375 21.375,5.353125 21.375,5.25 L21.375,3.9375 C21.375,3.834375 21.290625,3.75 21.1875,3.75 Z M21.1875,18.5625 L2.8125,18.5625 C2.709375,18.5625 2.625,18.646875 2.625,18.75 L2.625,20.0625 C2.625,20.165625 2.709375,20.25 2.8125,20.25 L21.1875,20.25 C21.290625,20.25 21.375,20.165625 21.375,20.0625 L21.375,18.75 C21.375,18.646875 21.290625,18.5625 21.1875,18.5625 Z M2.7046875,12.1617187 L6.36796875,15.046875 C6.50390625,15.1546875 6.70546875,15.0585937 6.70546875,14.8851562 L6.70546875,9.11484375 C6.70546875,8.94140625 6.50625,8.8453125 6.36796875,8.953125 L2.7046875,11.8382812 C2.59921875,11.9203125 2.59921875,12.0796875 2.7046875,12.1617187 Z" id="形状" fill-opacity="0.65"></path>
</g>
</g>
</g>
</g>
</svg>

+ 4
- 2
src/lang/i18n.js Ver fichero

@@ -1,7 +1,9 @@
export default {
title: {
en: 'ARI WMS',
zh: '中建材自动化智能仓库管理系统'
en: 'SCC System',
zh: '供应链协同管理系统'
// en: 'ARI WMS',
// zh: '中建材自动化智能仓库管理系统'
},
btn: {
start: {


+ 2
- 2
src/lang/i18n/en/module/dashboard.js Ver fichero

@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: zwq
* @LastEditTime: 2022-06-06 15:53:29
* @LastEditTime: 2022-06-21 11:23:55
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
*/
@@ -10,7 +10,7 @@
export default {
first: 'First Row',
second: 'Second Row',
title: 'WMS Inventory Information',
title: 'Inventory Information',
pageHeader: 'No.',
pageFooter: ' Page',
isEmpty: 'Is Empty',


+ 2
- 2
src/lang/i18n/zh/module/dashboard.js Ver fichero

@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: zwq
* @LastEditTime: 2022-06-07 15:08:30
* @LastEditTime: 2022-06-21 11:23:46
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
*/
@@ -10,7 +10,7 @@
export default {
first: '第一排',
second: '第二排',
title: 'WMS库存信息',
title: '库存信息',
pageHeader: '第',
pageFooter: '页',
isEmpty: '是否为空',


+ 3
- 2
src/settings.js Ver fichero

@@ -1,13 +1,14 @@
/*
* @Date: 2020-12-14 09:07:03
* @LastEditors: zwq
* @LastEditTime: 2022-06-06 15:58:41
* @LastEditTime: 2022-06-21 11:24:50
* @FilePath: \basic-admin\src\settings.js
* @Description:
*/

module.exports = {
title: 'ARI WMS',
title: 'SCC System',
// title: 'ARI WMS',

/**
* @type {boolean} true | false


+ 4
- 4
vue.config.js Ver fichero

@@ -47,15 +47,15 @@ module.exports = {
proxy: {
'/api': {
// target: 'http://localhost:8080',
// target: 'http://192.168.0.148:8080',
target: 'http://a.wms.picaiba.com/api',
// target: 'http://192.168.1.38:8080',
target: 'http://a.wms.picaiba.com',
// target: 'http://192.168.0.127:8080',
// target: 'http://192.168.0.165:8080',
// target: 'http://192.168.43.105:8080',
// target: 'http://127.0.0.1:8080',
// target: 'http://192.168.0.70:8080',
// target: 'http://192.168.0.199:8080',
ws: true,
changeOrigin: true,
pathRewrite: {
@@ -188,4 +188,4 @@ module.exports = {
}
)
}
}
}

Cargando…
Cancelar
Guardar