Merge pull request '改名字' (#91) from zwq into develop

Reviewed-on: #91

src/components/Breadcrumb/index.vue

@@ -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;
   }
 }

src/components/Hamburger/index.vue

@@ -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>
 

src/icons/svg/hamburgerBtn.svg

@@ -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>

src/lang/i18n.js

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

src/lang/i18n/en/module/dashboard.js

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

src/lang/i18n/zh/module/dashboard.js

@@ -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: '是否为空',

src/settings.js

@@ -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

vue.config.js

@@ -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 = {
         }
       )
   }
-}
+}