merge master

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',
-            left: '48%',
+            top: '44%',
+            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-11-28 16:07:41
  * @Description:
 -->
 <template>
@@ -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'