修改看板

hw-ui/src/views/board/production/secondFloor.vue

@@ -111,7 +111,7 @@ export default {
         '工单计划',
         '小时产量',
         '七日产量对比',
-        '设备OEE统计',
+        '粉尘数据走势',
         '设备时长统计',
         '计划数量:',
         '完成数量:',
@@ -387,6 +387,15 @@ export default {
         bottom: "2%",
         containLabel: true,
       },
+      legend:{
+        textStyle:{
+          color:'#fff'
+        }
+      },
+
+      tooltip:{
+        trigger:'axis'
+      },
       xAxis: {
         type: "category",
         data: ["14", "15", "16", "17", "18", "19", "20", "21", "22", "23"],
@@ -442,7 +451,7 @@ export default {
       ],
       series: [
         {
-          name: "产量",
+          name: "pm1",
           type: "line",
           smooth: true, //是否平滑曲线显示
           showAllSymbol: true,
@@ -466,10 +475,68 @@ export default {
             borderWidth: 3,
           },
           tooltip: {
-            show: false,
+            // show: false,
+          },
+          data: [493, 538, 585, 731, 789, 924, 1087, 1100, 1200, 1300],
+        },
+        {
+          name: "pm2",
+          type: "line",
+          smooth: true, //是否平滑曲线显示
+          showAllSymbol: true,
+          symbol: "circle",
+          symbolSize: 6,
+          lineStyle: {
+            normal: {
+              color: "#f0f", // 线条颜色
+            },
+          },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
+            },
+          },
+          itemStyle: {
+            color: "red",
+            borderColor: "#fff",
+            borderWidth: 3,
+          },
+          tooltip: {
+            // show: false,
           },
           data: [393, 438, 485, 631, 689, 824, 987, 1000, 1100, 1200],
         },
+        {
+          name: "pm10",
+          type: "line",
+          smooth: true, //是否平滑曲线显示
+          showAllSymbol: true,
+          symbol: "circle",
+          symbolSize: 6,
+          lineStyle: {
+            normal: {
+              color: "#ff0", // 线条颜色
+            },
+          },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
+            },
+          },
+          itemStyle: {
+            color: "red",
+            borderColor: "#fff",
+            borderWidth: 3,
+          },
+          tooltip: {
+            // show: false,
+          },
+          data: [593, 638, 685, 831, 889, 1024, 1187, 1200, 1300, 1400],
+        },
       ],
     })
     this.$refs.chart4.setData({

hw-ui/src/views/board/production/thirdFloor.vue

@@ -111,8 +111,8 @@ export default {
       title: [
         '工单计划',
         '生产完成统计',
-        '设备状态统计',
+        '温湿度统计',
-        '产品合格统计',
+        '原材料入库时间',
         '生产统计数据',
         '计划数量:',
         '完成数量:',
@@ -355,63 +355,133 @@ export default {
       ],
     })
     this.$refs.chart2.setData({
-      tooltip: {
+      grid: {
-        trigger: "item",
+        top: 30,
-        formatter: "{a} <br/>{b} : {c} ({d}%)",
+        left: "2%",
+        right: "5%",
+        bottom: "2%",
+        containLabel: true,
       },
-      legend: {
+      legend:{
-        type: "scroll",
+        textStyle:{
-        orient: "vertical",
+          color:'#fff'
-        left: "70%",
+        }
-        align: "left",
+      },
-        top: "middle",
+
-        textStyle: {
+      tooltip:{
-          color: "#8C8C8C",
+        trigger:'axis'
+      },
+      xAxis: {
+        type: "category",
+        data: ["14", "15", "16", "17", "18", "19", "20", "21", "22", "23"],
+        axisLabel: {
+          margin: 10,
+          color: "#ffffff63",
+        },
+        axisLine: {
+          show: false,
+        },
+        axisTick: {
+          show: true,
+          lineStyle: {
+            color: "#ffffff1f",
+          },
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            type: 'dashed',
+            color: "#ffffff1f",
+          },
         },
-        height: 250,
       },
-      series: [
+      yAxis: [
         {
-          name: "库存情况",
+          type: "value",
-          type: "pie",
+          axisLabel: {
-          radius: ["20%", "70%"],
+            margin: 10,
-          center: ["35%", "50%"],
+            color: "#ffffff63",
-          clockwise: false,
+          },
-          data: [
+
-            {
+          axisTick: {
-              value: 45,
+            show: true,
-              name: "已过期",
+            lineStyle: {
+              color: "#ffffff1f",
             },
-            {
+          },
-              value: 25,
+          splitLine: {
-              name: "半年内",
+            show: true,
+            lineStyle: {
+              type: 'dashed',
+              color: "#ffffff1f",
             },
-            {
+          },
-              value: 15,
+          axisLine: {
-              name: "三个月内",
+            lineStyle: {
+              color: "#fff",
+              width: 2,
             },
-            {
+          },
-              value: 8,
+        },
-              name: "一个月内",
+      ],
+      series: [
+        {
+          name: "温度",
+          type: "line",
+          smooth: true, //是否平滑曲线显示
+          showAllSymbol: true,
+          symbol: "circle",
+          symbolSize: 6,
+          lineStyle: {
+            normal: {
+              color: "#0a2ad7", // 线条颜色
             },
-          ],
+          },
           label: {
-            normal: {
+            show: true,
-              position: "inner",
+            position: "top",
-              textStyle: {
+            textStyle: {
-                color: "#fff",
+              color: "#fff",
-                fontSize: 14,
-              },
-              formatter: (e) => {
-                return e.percent.toFixed(2) + '%'
-              }
             },
           },
-          labelLine: {
+          itemStyle: {
+            color: "red",
+            borderColor: "#fff",
+            borderWidth: 3,
+          },
+          tooltip: {
+            // show: false,
+          },
+          data: [493, 538, 585, 731, 789, 924, 1087, 1100, 1200, 1300],
+        },
+        {
+          name: "湿度",
+          type: "line",
+          smooth: true, //是否平滑曲线显示
+          showAllSymbol: true,
+          symbol: "circle",
+          symbolSize: 6,
+          lineStyle: {
             normal: {
-              show: false,
+              color: "#0bcb98", // 线条颜色
+            },
+          },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
             },
           },
+          itemStyle: {
+            color: "red",
+            borderColor: "#fff",
+            borderWidth: 3,
+          },
+          tooltip: {
+            // show: false,
+          },
+          data: [393, 438, 485, 631, 689, 824, 987, 1000, 1100, 1200],
         },
       ],
     })

hw-ui/src/views/board/warehouse/secondFloor.vue

@@ -111,8 +111,8 @@ export default {
     return {
       title: [
         '库存总量统计',
-        '库位动态',
+        '库位变化',
-        '物料时效统计',
+        '入库时段统计',
         '库位原理统计',
       ],
       titlePosition: [

hw-ui/src/views/board/warehouse/thirdFloor.vue

@@ -81,10 +81,10 @@
     <div class="num1 num1_15" style="top: 26.7%;left:90%;color:#f60008">0</div>
     <div class="num1 num1_16" style="top: 26.7%;left:93%;color:#f60008">0</div>
     <div class="span" style="top: 14.7%; left: 41%; color:#7ba9cb;font-size: 1.2vw">仓库库位/出入库统计</div>
-    <div class="span" style="top: 21.7%; left: 42%; color:#7ba9cb;font-size: 0.9vw">仓库1-单日入库量</div>
+    <div class="span" style="top: 21.7%; left: 42%; color:#7ba9cb;font-size: 0.9vw">单日入库量</div>
     <div class="span" style="top: 21.7%; left: 55%; color:#7ba9cb;font-size: 0.9vw">单日出库量</div>
-    <div class="span" style="top: 21.7%; left: 69.6%; color:#7ba9cb;font-size: 0.9vw">仓库2-单日入库量</div>
+    <div class="span" style="top: 21.7%; left: 69.6%; color:#7ba9cb;font-size: 0.9vw">单月入库量</div>
-    <div class="span" style="top: 21.7%; left: 83%; color:#7ba9cb;font-size: 0.9vw">单日出库量</div>
+    <div class="span" style="top: 21.7%; left: 83%; color:#7ba9cb;font-size: 0.9vw">单月出库量</div>
     <div class="span" style="top: 38.7%; left: 42%; color:#7ba9cb;font-size: 0.9vw">仓库1-库位统计</div>
     <div class="span" style="top: 38.7%; left: 87%; color:#7ba9cb;font-size: 0.9vw">仓库2-库位统计</div>
     <div class="span1" style="top: 46.7%; left: 45.5%; color:#7ba9cb;font-size: 0.9vw">空库位</div>

hw-ui/src/views/mes/productplan/editProductPlan.vue

@@ -203,6 +203,9 @@
                 size="mini"
                 type="primary"
                 @click="handleApplyRawOutstock(scope.row)"
+                v-if="scope.row.processType === PROCESS_TYPE.AUTO && scope.row.planId!=null && scope.row.planId!==''
+                      && scope.row.planStatus !== PLAN_STATUS.FINISHED
+                      && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"
               >投料
               </el-button>
 
@@ -1201,7 +1204,7 @@ export default {
           this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId] = groupAttachFileList ? this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId] : [];
           this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId].push(groupAttachFile);
           this.$modal.closeLoading();
-          }, (err) => {
+        }, (err) => {
           this.$refs.drawingUpload.clearFiles();  //上传失败后清除当前上传的图片
           this.$modal.closeLoading();
         }
@@ -1323,7 +1326,7 @@ export default {
           this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId] = groupSopFileList ? this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId] : [];
           this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId].push(groupSopFile);
           this.$modal.closeLoading();
-          }, (err) => {
+        }, (err) => {
           this.$refs.drawingUpload.clearFiles();  //上传失败后清除当前上传的图片
           this.$modal.closeLoading();
         }
@@ -1405,14 +1408,14 @@ export default {
     },
 
     handleApplyRawOutstock(row) {
-      // if (row.processType === this.PROCESS_TYPE.AUTO) {
+      if (row.processType === this.PROCESS_TYPE.AUTO) {
         this.applyRawOutstockOpen = true;
         this.productPlanData.planCode = row.planCode;
         this.productPlanData.planId = row.planId;
         this.productPlanData.dispatchAmount = row.dispatchAmount;
         this.productPlanData.saleOrderId = this.form.saleOrderId;
         this.productPlanData.materialBomId = this.form.materialBomId;
-      // }
+      }
     },
 
     closeRawOutstockDialog() {