调整界面ui和数据取值

src/components/assemblyechart/centerRight/centerRightChart/chart.vue

@@ -1,7 +1,7 @@
 <template>
     <Echart
       :options="options"
-      id="centreRight2Chart1" style="width: 300px; height: 185px;"
+      id="centreRight2Chart1" style="width: 300px; height: 280px;position: absolute; left: 20%;"
     ></Echart>
 </template>
 

src/views/assembly/bottomRight.vue

@@ -12,7 +12,8 @@
           </div>
         </div>
       </div>
-      <div>
+      <div style="position:relative;">
+        <centerRight2Chart1 />
         <BottomRightChart />
       </div>
     </div>
@@ -20,10 +21,12 @@
 </template>
 
 <script>
+import centerRight2Chart1 from '@/components/assemblyechart/centerRight/centerRightChart'
 import BottomRightChart from "@/components/assemblyechart/bottom/bottomRightChart";
 export default {
   components: {
-    BottomRightChart
+    BottomRightChart,
+    centerRight2Chart1
   }
 };
 </script>

src/views/assembly/centerLeft_two.vue

@@ -26,7 +26,7 @@
           </div>
           <div class="item">
             <p class="colorBlue fw-b fs-xl">软件版本</p>
-            <p class="dv-dig-flop " style="font-size: 16px;"> {{ upitem.softversion }}
+            <p class="dv-dig-flop " style="font-size: 16px;"> {{ upitem.ma_softversion }}
             </p>
           </div>
           <div class="item">
@@ -44,6 +44,25 @@
             <p class="dv-dig-flop "> {{ upitem.okrate }}%
             </p>
           </div>
+          <div class="item">
+            <p class="colorBlue fw-b fs-xl">累计老化数</p>
+            <p class="dv-dig-flop "> {{ upitem.aging }}
+            </p>
+          </div>
+          <div class="item">
+            <p class="colorBlue fw-b fs-xl">累计不良数</p>
+            <p class="dv-dig-flop "> {{ upitem.ngqty }}
+            </p>
+          </div><div class="item">
+            <p class="colorBlue fw-b fs-xl">累计待维修数</p>
+            <p class="dv-dig-flop "> {{ upitem.badqty }}
+            </p>
+          </div>
+          <div class="item">
+            <p class="colorBlue fw-b fs-xl">累计已维修数</p>
+            <p class="dv-dig-flop "> {{ upitem.repairqty }}
+            </p>
+          </div>
         </div>
        <!-- <div class="up">
           <div
@@ -60,15 +79,12 @@
             </div>
           </div>
         </div>-->
-        <centerRight2Chart1 />
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import centerRight2Chart1 from '@/components/assemblyechart/centerRight/centerRightChart'
-
 export default {
   data() {
     return {
@@ -77,7 +93,7 @@ export default {
       upitem:{}
     }
   },
-  components: { centerRight2Chart1 },
+  components: {  },
   mounted() {
     this.refreshdata();
   },
@@ -92,7 +108,8 @@ export default {
       }, 30000);
     },
     async settestdata(){
-      var caller = 'MAKEQTY!ZZ';
+      // var caller = 'MAKEQTY!ZZ';
+      var caller = 'MAKEQTYNEW!ZZ';
       if (sessionStorage.getItem('li_code') == '所有'){
         caller = 'ZZ!MAKEQTY!ALL';
       }

src/views/assembly/centerRight1.vue

@@ -18,8 +18,8 @@
             <img :src="imgSrc1" class="responsive-img">
           </div>
           <div>
-            <p>拉长:{{ upitem.v_leadname }}</p>
-            <p>组装人数{{zzmancount}}</p>
+            <p>拉长: {{ upitem.v_leadname }}</p>
+            <p>产线人数: {{zzmancount}}</p>
           </div>
         </div>
         <div>
@@ -27,8 +27,8 @@
             <img :src="imgSrc2" class="responsive-img">
           </div>
           <div>
-            <p>品质:{{ upitem.v_quaname }}</p>
-            <p>包装人数{{bzmancount}}</p>
+            <p>IPQC: {{ upitem.v_quaname }}</p>
+            <p>品检人数: {{bzmancount}}</p>
           </div>
         </div>
         <div>
@@ -36,8 +36,8 @@
             <img :src="imgSrc3" class="responsive-img">
           </div>
           <div>
-            <p>PE:{{ upitem.v_engineername }}</p>
-            <p>管理人数{{glmancount}}</p>
+            <p>PE: {{ upitem.v_engineername }}</p>
+            <p>管理人数: {{glmancount}}</p>
           </div>
         </div>
       </div>
@@ -143,8 +143,8 @@ export default {
               if (null != this.upitem.v_quaimageurl && '' != this.upitem.v_quaimageurl) {
                 this.fetchImage('imgSrc2', this.upitem.v_quaimageurl);
               }
-              if (null != this.upitem.v_peimageurl && '' != this.upitem.v_peimageurl) {
-                this.fetchImage('imgSrc3', this.upitem.v_peimageurl);
+              if (null != this.upitem.v_engineerimageurl && '' != this.upitem.v_engineerimageurl) {
+                this.fetchImage('imgSrc3', this.upitem.v_engineerimageurl);
               }
             } else {
               this.upitem = {},
@@ -235,6 +235,7 @@ $box-width: 640px;
           display: block;
           height: 100%;
           width: 100%;
+          border-radius: 3px;
         }
       }
       >div:nth-child(2){