Merge pull request '改地址2' (#25) from 11-wms-zjl into master

Reviewed-on: #25

src/layout/components/Navbar.vue

@@ -219,7 +219,7 @@ export default {
       // this.$router.push('/')
       if (sessionStorage.getItem('param')) {
         const param = JSON.parse(window.atob(sessionStorage.getItem('param')))
-        window.location = 'http://192.168.1.103:9527/#/?' + param
+        window.location = 'http://main.cnbmai.picaiba.com?' + param
       }
     },
     handleAlarm() {},

src/utils/wmsDic.js

@@ -189,7 +189,7 @@ export function getPhoneList() {
 }
 
 // 物品名称
-const goodsList = ['钢化玻璃', '磨砂玻璃', '喷砂玻璃', '压花玻璃', '夹丝玻璃', '夹层玻璃']
+const goodsList = ['盖板玻璃', '背板玻璃']
 export function getGoodsList() {
   let name = ''
   name = goodsList[parseInt(Math.random() * (goodsList.length))]

src/views/OperationalOverview/components/newPie.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: zwq
- * @LastEditTime: 2022-11-24 16:17:09
+ * @LastEditTime: 2022-11-28 15:03:58
  * @Description:
 -->
 <template>
@@ -223,8 +223,8 @@ export default {
         title: this.showCenterTitle
           ? {
             text: `${this.seriesData.reduce((pre, cur) => pre + cur.value, 0)}\n{name|总共}`,
-            top: 'center',
+            top: '44%',
-            left: '48%',
+            left: '49%',
             textAlign: 'center',
             textStyle: {
               color: '#fff',

src/views/OperationalOverview/storageCockpit.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zwq
- * @LastEditTime: 2022-11-24 16:01:46
+ * @LastEditTime: 2022-12-01 10:31:37
  * @Description:
 -->
 <template>
@@ -69,7 +69,7 @@
                       <el-col :span="12">
                         <div class="inTest" :style="{ padding: 9 * beilv + 'px' }">
                           <span class="leftText">执行叉车:</span>
-                          <span class="rightText">叉车</span>
+                          <span class="rightText">2-03</span>
                         </div>
                       </el-col>
                       <el-col :span="12">
@@ -137,7 +137,7 @@
                       <el-col :span="12">
                         <div class="outTest" :style="{ padding: 7 * beilv + 'px' }">
                           <span class="leftText">执行叉车:</span>
-                          <span class="rightText">叉车</span>
+                          <span class="rightText">1-01</span>
                         </div>
                       </el-col>
                     </el-row>
@@ -316,54 +316,49 @@ const legendData1 = [
 ]
 const legendData2 = [
   {
-    name: '2.0-1128*1716',
+    name: '丝印类',
     icon: 'circle',
     value: 128
   },
   {
-    name: '2.0-1128*2251',
+    name: '磨边类',
     icon: 'circle',
     value: 104
   },
   {
-    name: '2.0-1128*2272',
+    name: '镀膜类',
     icon: 'circle',
-    value: 24
+    value: 80
   },
   {
-    name: '3.2-1128*1716',
+    name: '包装类',
     icon: 'circle',
     value: 77
-  },
-  {
-    name: '3.2-1128*1716',
-    icon: 'circle',
-    value: 93
   }
 ]
 const legendData3 = [
   {
-    name: '2.0-1128*1716',
+    name: '磨边机备件',
     icon: 'circle',
     value: 128
   },
   {
-    name: '2.0-1128*2251',
+    name: '打孔机备件',
     icon: 'circle',
     value: 96
   },
   {
-    name: '2.0-1128*2272',
+    name: '丝印机备件',
     icon: 'circle',
     value: 201
   },
   {
-    name: '3.2-1128*1716',
+    name: '固化机备件',
     icon: 'circle',
     value: 77
   },
   {
-    name: '3.2-1128*1716',
+    name: '钢化机备件',
     icon: 'circle',
     value: 66
   }
@@ -458,21 +453,21 @@ export default {
         list: [
           {
             test1: 'RQ5055348178',
-            test2: 'D4288603319',
+            test2: '1-01',
             test3: 'CP5651696263',
             test4: '3.2-1033*2089',
             test5: '成品库D-D区-15'
           },
           {
             test1: 'RQ3722771932',
-            test2: 'D3732827773',
+            test2: '1-02',
             test3: 'CP4140258231',
             test4: '2.0-1128*2272',
             test5: '成品库B-A区-13'
           },
           {
             test1: 'RQ1342208728',
-            test2: 'D6178738555',
+            test2: '2-03',
             test3: 'CP5284407553',
             test4: '2.0-1128*1716',
             test5: '成品库A-B区-9'

src/views/wmsInventoryManagement/inventory.vue

@@ -26,7 +26,7 @@ import { getMaterialCodeList, getKQList, getProductSpecList, getGoodsList } from
 const tableProps = [
   {
     prop: 'productName',
-    label: '盖板玻璃或背板玻璃'
+    label: '品名'
   },
   {
     prop: 'spec',
@@ -54,7 +54,7 @@ export default {
         {
           type: 'input',
           label: '关键字',
-          placeholder: '盖板玻璃或背板玻璃,物料编码,库区',
+          placeholder: '品名,物料编码,库区',
           param: 'name',
           width: 250
         },

src/views/wmsInventoryManagement/inventoryQuery.vue

@@ -27,7 +27,7 @@ import moment from 'moment'
 const tableProps = [
   {
     prop: 'productName',
-    label: '盖板玻璃或背板玻璃'
+    label: '品名'
   },
   {
     prop: 'spec',

src/views/wmsInventoryManagement/stockTaking.vue

@@ -33,7 +33,7 @@ const tableProps = [
   },
   {
     prop: 'productName',
-    label: '盖板玻璃或背板玻璃'
+    label: '品名'
   },
   {
     prop: 'spec',
@@ -73,7 +73,7 @@ export default {
         {
           type: 'input',
           label: '关键字',
-          placeholder: '盘点单号,盖板玻璃或背板玻璃,物料编码',
+          placeholder: '盘点单号,品名,物料编码',
           param: 'name',
           width: 250
         },