bug

src/views/productionPlan/components/detail/plan.vue

@@ -105,12 +105,22 @@
       :datasource="infoData.salesOrderList"
     >
       <template v-slot:number="{ row }">
-        <el-progress
-          :percentage="20"
-          color="red"
-          :stroke-width="16"
-          :format="(percentage) => `${percentage}/100`"
-        ></el-progress>
+        <div class="progress-box">
+          <div class="gress">
+            <el-progress
+              :percentage="
+                +(((row.deliveryNum || 0) / row.contractNum) * 100).toFixed(2)
+              "
+              color="red"
+              :show-text="false"
+              text-color="#000"
+              :stroke-width="16"
+            ></el-progress
+          ></div>
+          <div :span="6">{{
+            `${row.deliveryNum || 0}/ ${row.contractNum}`
+          }}</div>
+        </div>
       </template>
     </ele-pro-table>
   </div>
@@ -180,7 +190,7 @@
             slot: 'number',
             prop: 'number',
             label: '已交付数量',
-            minWidth: 210
+            width: 280
           },
           {
             prop: 'customerName',
@@ -195,4 +205,14 @@
   .mt-20 {
     margin-top: 20px;
   }
+  .progress-box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .gress {
+      flex: 1;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/productionPlan/components/plan-view.vue

@@ -35,7 +35,7 @@
       </div>
       <div class="items">
         <span class="label">累计成型重量</span>
-        {{ (sumData.formingWeight * infoData.productUnitWeight).toFixed(4) }}kg
+        {{ sumData.formingWeight.toFixed(4) }}kg
       </div>
       <div class="items">
         <span class="label">设备数量</span>

vue.config.js

@@ -31,12 +31,12 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.38:8080', // 陈潇
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
-        target: 'http://192.168.3.51:18086', // 测试环境
+        // target: 'http://192.168.3.51:18086', // 测试环境
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {