Merge pull request 'projects/mesxc-zhp' (#202) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: #202

.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-21 18:47:20
+ # @LastEditTime: 2024-02-23 16:03:51
- # @LastEditors: DY
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置
@@ -28,7 +28,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # socket地址
-VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 # 积木报表指向地址

src/views/OperationalOverview/components/baseContainer/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-01-19 15:58:17
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-20 15:25:02
+ * @LastEditTime: 2024-02-22 10:26:59
  * @Description: file content
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
@@ -157,12 +157,12 @@ export default {
 
 <style lang="scss" scoped>
 
+
 .base-container {
   color: #fff;
   width: 100%;
   // background-color: rgba($color: #061027, $alpha: 0.15);
   position: relative;
-  // filter: blur(.5px);
   opacity: calc(.8);
   // border: 2px solid;
     // background: url('../../../../assets/img/energy.png') no-repeat;
@@ -170,24 +170,45 @@ export default {
       &__small {
           background: url(../../../../assets/img/short.png) no-repeat;
           background-size: 100% 100%;
-          // background-position: 0 0;
+          backdrop-filter: blur(5px);
         }
-
+      // &__small::after {
+      //       content: "";
+      //       position: absolute;
+      //       top: 0;
+      //       left: 0;
+      //       filter: blur(20px);
+      //       z-index: -1;
+      //   }
         &__middle {
           background: url(../../../../assets/img/middle.png) no-repeat;
           background-size: 100% 100%;
-          // background-position: 0 0;
+          backdrop-filter: blur(5px);
         }
 
         &__large {
           background: url(../../../../assets/img/high.png) no-repeat;
           background-size: 100% 100%;
-          // background-position: 0 0;
+          backdrop-filter: blur(5px);
         }
         &__eqStatus {
-          background: url(../../../../assets/img/short.png) no-repeat;
+          background: url(../../../../assets/img/high.png) no-repeat;
           background-size: 100% 100%;
+          backdrop-filter: blur(5px);
         }
+                  	// &::after {
+                  	//   content: " ";
+                  	//   // display: block;
+                  	//   position: absolute;
+                  	//   left: 0;
+                  	//   top: 0;
+                  	//   right: 0;
+                  	//   bottom: 0;
+                  	//   // background: inherit;
+                  	//   /* 设置模糊，不用 filter */
+                  	//   backdrop-filter: blur(5px);
+                  	//   z-index: -1;
+                  	// }
   //   border-radius: 40px 0px 40px 0px;
   // border-image: linear-gradient(360deg, rgba(157, 246, 254, 0.05), rgba(100, 233, 252, 0.9)) 2 2;
   // .line {

src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelector.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-30 10:53:32
- * @LastEditTime: 2024-02-01 14:47:03
+ * @LastEditTime: 2024-02-23 15:16:35
  * @LastEditors: zhp
  * @Description:
 -->
@@ -203,8 +203,11 @@ export default {
 				// 如果没找到这个
         this.selectedEquipments.push(equipmentId);
         console.log(this.selected.indexOf(equipmentId))
-        this.selected.forEach((ele,index) => {
+        console.log(equipmentId);
-          if (ele.equipmentId === equipmentId ) {
+        this.selected.forEach((ele, index) => {
+          console.log(ele);
+          if (ele.equipmentId === equipmentId) {
+            console.log(22222);
             this.selected[index].children.push({ id: bomId })
           }
         })
@@ -214,11 +217,12 @@ export default {
 				// 	equMaterialBomId: bomId,
 				// });
 				// 强制更新'设备'一栏
-				this.refreshKey = Math.random();
+        this.refreshKey = Math.random();
+        console.log(this.selected)
 				// this.$emit('update', this.selected);
 				return;
       } else {
-        console.log(selected);
+        console.log(selected)
         this.selected.forEach((ele, index) => {
           ele.children.forEach((e, i) => {
             console.log(e)
@@ -228,10 +232,10 @@ export default {
           })
         })
       }
+      console.log(this.selected)
       // this.$emit('getData', this.dataForm)
 			// selectedItem && (selectedItem.equMaterialBomId = selected ? bomId : null);
       // this.currentSelectedMaterialBomId = selected ? bomId : null;
-      console.log(this.selected)
 		},
 
 		// handleValueBomChange(equipmentId, bomId, selected) {

src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue

@@ -154,7 +154,7 @@ export default {
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
         this.tableData = res.data.list.map((item) => {
           return {
-            datas: item.strList.toString(),
+            datas: item.strList ? item.strList.toString() : null,
             nickName: item.nickName,
             userName: item.userName,
             userId: item.userId

src/views/quality/monitoring/originalGlassRetrace/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-20 08:46:05
+ * @LastEditTime: 2024-02-23 09:16:24
  * @Description:
 -->
 <template>
@@ -31,6 +31,11 @@ import {
 } from '@/api/quality/rawMaterialTraceability';
 
 const tableProps = [
+
+  {
+    prop: 'orderName',
+    label: '订单名称',
+  },
   {
     prop: 'workOrderName',
     label: '工单名称',
@@ -48,7 +53,7 @@ const tableProps = [
     label: '包装条码',
   },
   {
-    prop: '',
+    prop: 'originalGlassLineName',
     label: '原片产线',
   },
   {
@@ -57,7 +62,7 @@ const tableProps = [
     filter: parseTime
   },
   {
-    prop: 'batch',
+    prop: 'deepProcessingLineName',
     label: '深加工产线',
   },
   {
@@ -70,11 +75,11 @@ const tableProps = [
     label: '深加工下片时间',
     filter: parseTime
   },
-  {
+  // {
-    prop: 'scrapDetail',
+  //   prop: 'scrapDetail',
-    label: '详情',
+  //   label: '详情',
-    filter: parseTime
+  //   filter: parseTime
-  }
+  // }
 ];
 
 export default {