src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-16 13:44:14
+ * @LastEditTime: 2024-04-11 09:55:04
  * @LastEditors: zhp
  * @Description:
 -->
@@ -635,7 +635,6 @@ export default {
           // this.cutConfig.data = cutArr
           // this.$refs['cutScrollBoard'].updateRows(cutArr)
         } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
-          if (this.cutWsData.coldDetData.length !== 0) {
           let nameList = []
           let nameWasteList = []
           let topNameList = []
@@ -663,7 +662,6 @@ export default {
             this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
           })
         }
-        }
       };
       // if (typeof (WebSocket) === 'undefined') {
       //   alert('您的浏览器不支持WebSocket')

src/views/OperationalOverview/components/ISRAChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-04-16 13:43:05
+ * @LastEditTime: 2024-04-15 09:28:21
  * @LastEditors: zhp
  * @Description:
 -->
@@ -126,22 +126,22 @@ export default {
 						color: '#fff00',
 					},
 				},
-				// legend: {
+				legend: {
-				// 	bottom: '10%',
+					bottom: '10%',
-				// 	left: 'center',
+					left: 'center',
-				// 	itemWidth: 12,
+					itemWidth: 12,
-				// 	itemHeight:12,
+					itemHeight:12,
-        //   icon: 'roundRect',
+          icon: 'roundRect',
-				// 	textStyle: {
+					textStyle: {
-				// 		color: '#fff'
+						color: '#fff'
-				// 	},
+					},
-				// 	data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({
+					data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({
-				// 		name:item.name,
+						name:item.name,
-				// 		itemStyle:{
+						itemStyle:{
-				// 			color: this.colors[index%4]
+							color: this.colors[index%4]
-				// 		}
+						}
-				// 	}))
+					}))
-				// },
+				},
 				series:[{
 						name: 'ISRA缺陷检测',
             type: 'pie',
@@ -168,7 +168,7 @@ export default {
               },
               textStyle: {            // 提示文字的样式
                 // color: '#595959',
-                fontSize: 18
+                fontSize: 16
               }
             }
 						},

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-16 13:39:25
+ * @LastEditTime: 2024-04-09 15:24:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -156,8 +156,6 @@ export default {
       this.chart.setOption({
         // color: colors,
         tooltip: {
-          trigger: 'item',
-          className: "isra-chart-tooltip",
           trigger: 'axis',
           axisPointer: {
             type: 'cross'
@@ -320,16 +318,8 @@ export default {
 }
 </script>
 <style>
+
 .coldProductChart{
   top: -10px;
 }
-.isra-chart-tooltip {
-  background: #0a2b4f77 !important;
-  border: none !important;
-  backdrop-filter: blur(12px);
-  }
-
- .isra-chart-tooltip * {
-  color: #fff !important;
-  }
 </style>

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-16 13:37:38
+ * @LastEditTime: 2024-04-09 15:24:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -162,8 +162,6 @@ export default {
         this.chart.setOption({
           // color: colors,
           tooltip: {
-            trigger: 'item',
-            className: "isra-chart-tooltip",
             trigger: 'axis',
             axisPointer: {
               type: 'cross'
@@ -329,13 +327,4 @@ export default {
   width: 100%;
   top: -30px;
 }
-    .isra-chart-tooltip {
-      background: #0a2b4f77 !important;
-      border: none !important;
-      backdrop-filter: blur(12px);
-    }
-
-    .isra-chart-tooltip * {
-      color: #fff !important;
-    }
 </style>

src/views/OperationalOverview/components/linearBarChart.vue

@@ -128,8 +128,6 @@ export default {
         this.chart.setOption({
           tooltip: {
             trigger: 'axis',
-            trigger: 'item',
-            className: "isra-chart-tooltip",
             axisPointer: {
               // 坐标轴指示器，坐标轴触发有效
               type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
@@ -228,13 +226,4 @@ export default {
   width: 100%;
   top: -30px;
 }
-.isra-chart-tooltip {
-  background: #0a2b4f77 !important;
-  border: none !important;
-  backdrop-filter: blur(12px);
-}
-
-.isra-chart-tooltip * {
-  color: #fff !important;
-}
 </style>

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-04-16 13:16:34
+ * @LastEditTime: 2024-04-03 18:12:18
  * @LastEditors: zhp
  * @Description:
 -->
@@ -101,9 +101,6 @@ export default {
       });;
     },
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
-      if (topNameList.length === 0 && nameWasteList.length === 0 && passRateList === 0 && wasteList === 0) {
-        return
-      } else {
       let rawData = []
       let colors = ['#0fdedb', '#2359ec']
         rawData.push(passRateList, wasteList)
@@ -260,8 +257,6 @@ export default {
           this.resize()
         },1000);
       })
-      }
-
       // this.chart.resize({
       //   width: 'auto',
       //   height: 90

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-16 14:03:31
+ * @LastEditTime: 2024-04-10 16:10:11
  * @Description:
 -->
 <template>
@@ -42,7 +42,6 @@
               <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
                 <!-- <el-col :span="12"> -->
                 <!-- <div style="height: 34px;"> -->
-                <span style="display: inline-block;width: 330px;">
                 <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
                 <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
                 <!-- <span v-if="op.size" class="split"></span> -->
@@ -51,7 +50,6 @@
                 <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
                 <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
                 op.planQuantity }}</span>
-                </span>
                 <span v-if="op.actualQuantity" class="orderFinish"
                   style="font-size: 14px;opacity: calc(.6);margin-left: 130px;">{{
                   op.actualQuantity
@@ -110,80 +108,80 @@ const qualityYearList = [
 	{
 		name: '翻转机',
 		code: 'EQ20240110112358000235',
-		status: '正常',
+		status: '运行',
-    error: 'true',
+		error: '否',
 	},
 	{
 		name: '烘干炉',
 		code: 'EQ20240110112537000241',
-		status: '计划停机',
+		status: '运行',
-    error: 'true',
+		error: '否',
 	},
 	{
 		name: '清洗机',
 		code: '	EQ20240110112310000232',
-    status: '正常',
+		status: '运行',
-    error: 'true',
+		error: '否',
 	},
 	{
 		name: '钢化清洗机',
 		code: 'EQ20240110111700000208',
-    status: '正常',
+		status: '运行',
-    error: 'true',
+		error: '否',
 	},
 	{
 		name: '固化机',
 		code: 'EQ20240110111700000201',
-    status: '正常',
+		status: '运行',
-    error: 'true',
+		error: '否',
 	},
 	{
 		name: '磨边清洗机',
 		code: '	EQ20240110111700000208',
-    status: '正常',
+		status: '运行',
-    error: 'true',
+		error: '否',
 	},
 	{
 		name: '预热机',
 		code: 'EQ20240110111700000205',
 		status: '故障',
-    error: 'true',
+		error: '是',
 	},
 	{
 		name: '下片机',
 		code: 'EQ20240115151435000279',
-    status: '正常',
+		status: '运行',
-		error: 'false',
+		error: '否',
 	},
 	{
 		name: '冷却机',
 		code: 'EQ20240110111700000203',
-    status: '正常',
+		status: '运行',
-		error: 'false',
+		error: '否',
 	},
 	{
 		name: 'A储片机106',
 		code: 'EQ20240110111700000202',
-    status: '正常',
+		status: '运行',
-		error: 'false',
+		error: '否',
 	},
 	{
 		name: '二次清洗机',
 		code: 'EQ20240110111700000209',
-    status: '正常',
+		status: '运行',
-		error: 'false',
+		error: '否',
 	},
 	{
 		name: '二次磨边机',
 		code: '	EQ20240110110927000181',
-    status: '正常',
+		status: '故障',
-		error: 'false',
+		error: '是',
 	},
 	{
 		name: '测试设备',
 		code: 'EQ20240110111700000201',
-    status: '正常',
+		status: '运行',
-		error: 'true',
+		error: '否',
 	},
 ];
 const qualityMonthList = [
@@ -382,7 +380,7 @@ export default {
         progressRate: 0.933333,
         specifications: '1100*5554*22',
         plan: 11111,
-        actualQuantity:111,
+        finish:111,
 			},
 			{
 				id: '2',
@@ -390,7 +388,7 @@ export default {
         progressRate: 0.932323,
         size: '1100*5554*22',
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
 			},
 			{
 				id: '3',
@@ -398,7 +396,7 @@ export default {
         progressRate: 0.23232,
         size: '1100*5554*22',
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
 			},
 			{
 				id: '4',
@@ -406,7 +404,7 @@ export default {
         progressRate: 0.32323,
         size: '1100*5554*22',
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
       },
       {
         id: '5',
@@ -414,7 +412,7 @@ export default {
         progressRate: 0.32323,
         size: '1100*5554*22',
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
       },
       {
         id: '6',
@@ -422,7 +420,7 @@ export default {
         size: '1100*5554*22',
         progressRate: 0.32323,
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
       },
       {
         id: '7',
@@ -430,7 +428,7 @@ export default {
         size: '1100*5554*22',
         progressRate: 0.32323,
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
       },
       {
         id: '8',
@@ -438,7 +436,7 @@ export default {
         progressRate: 0.32323,
         size: '1100*5554*22',
         plan: 11111,
-        actualQuantity: 111,
+        finish: 111,
       },
 			// {
 			//   id: '5',
@@ -458,7 +456,7 @@ export default {
           progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
           specifications: ele.specifications ?  '规格' + ele.specifications :null,
           planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
-          actualQuantity: ele.actualQuantity + '片',
+          finish: ele.finish + '片',
 				};
 			}
 		});
@@ -482,8 +480,8 @@ export default {
           <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
             </span>`,
 			`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
+      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
-      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '}"></div>  ${item.error || ''}</span>`,
+      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.error || ''}</span>`,
 		]);
     this.eqConfig.data = eqArr;
     let data = [
@@ -749,8 +747,8 @@ export default {
 						`<span style="color:rgba(255,255,255,0.5)">${
 							item.code || ''
 						}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error || ''}</span>`,
 					]);
           this.eqConfig.data = eqArr;
           // this.$nextTick(() => {
@@ -792,23 +790,7 @@ export default {
               outputNumList
             );
           })
-        } else if (this.SJGWsData.type === 'inspection') {
+				} else if (this.SJGInitWebSocket === 'inspection') {
-          let processArr = this.SJGWsData.detData.map((item, index) => [
-            `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-            </span>`,
-            `<span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
-            </span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''
-            }</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.count || ''
-            }</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''
-            }</span>`,
-          ]);
-          this.processConfig.data = processArr;
-          // this.$nextTick(() => {
-          this.$refs['processScrollBoard'].updateRows(processArr);
-          // })
 				}
 			};
 		},