.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-21 10:36:47
+ # @LastEditTime: 2023-11-16 14:07:34
  # @LastEditors: DY
  # @Description:
 ###
@@ -19,7 +19,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 
 # 积木报表指向地址

src/api/base/orderManage.js

@@ -113,15 +113,6 @@ export function orderMonitor(query) {
   })
 }
 
-// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id
-export function orderAssignmentList(query) {
-  return request({
-    url: '/base/order/orderAssignmentList',
-    method: 'get',
-    params: query
-  })
-}
-
 // 获得所有客户列表
 export function customerList() {
   return request({

src/api/equipment/base/inspection/settings.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-20 16:38:18
+ * @LastEditTime: 2023-11-13 08:52:12
  * @LastEditors: DY
  * @Description: 
  */
@@ -65,12 +65,4 @@ export function getcheckList(query) {
     method: 'get',
     params: query
   })
-}
-
-// 删除巡检内容
-export function deleteCheck(id) {
-  return request({
-    url: '/base/equipment-check/delete?id=' + id,
-    method: 'delete'
-  })
 }

src/api/equipment/base/maintain/record.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-21 10:50:55
+ * @LastEditTime: 2023-11-16 20:22:12
  * @LastEditors: DY
  * @Description: 
  */
@@ -14,21 +14,3 @@ export function deleteEqMaintainLog(id) {
     method: 'delete'
   })
 }
-
-// 删除设备保养计划配置
-export function deleteEqMaintainPlan(id) {
-  return request({
-    url: '/base/equipment-maintain-plan/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 导出设备保养监控
-export function exportMaintainMonitorExcel(query) {
-  return request({
-    url: '/base/equipment-maintain-plan/monitor-export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/equipment/base/spare-parts/list.js

@@ -1,16 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-22 13:59:17
- * @LastEditTime: 2023-11-22 13:59:45
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 删除设备备品备件
-export function deleteSparePart(id) {
-  return request({
-    url: '/base/equipment-spare-part/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/extend/processEquMaterialBom.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-07 19:47:48
- * @LastEditTime: 2023-11-23 13:57:41
+ * @LastEditTime: 2023-11-16 17:49:23
  * @LastEditors: zhp
  * @Description:
  */
@@ -104,18 +104,3 @@ export function getMaterialList(data) {
     data: data
   })
 }
-export function getMaterialCode(data) {
-  return request({
-    url: '/extend/process-equ-material-bom/getCode',
-    method: 'get',
-    params: data
-  })
-}
-
-export function createProcessEquMaterialBomDetList(data) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/createByList',
-    method: 'post',
-    data: data
-  })
-}

src/api/extend/processEquValueBom.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-09 09:37:14
- * @LastEditTime: 2023-11-23 14:15:45
+ * @LastEditTime: 2023-11-16 17:47:21
  * @LastEditors: zhp
  * @Description:
  */
@@ -104,19 +104,3 @@ export function getValueList(data) {
     params: data
   })
 }
-
-export function getValueCode(data) {
-  return request({
-    url: '/extend/process-equ-value-bom/getCode',
-    method: 'get',
-    params: data
-  })
-}
-
-export function createProcessEquValueBomDetList(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/createByList',
-    method: 'post',
-    data: data
-  })
-}

src/assets/icons/svg/order-monitoring.svg

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 17</title>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.695141">
-        <g id="最新参考" transform="translate(-1780.000000, -57.000000)" fill="#000000" fill-rule="nonzero">
-            <g id="编组-4" transform="translate(1772.000000, 48.000000)">
-                <g id="编组-17" transform="translate(8.000000, 9.000000)">
-                    <rect id="矩形备份-2" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                    <g id="文档" transform="translate(2.436519, 1.472460)">
-                        <path d="M9.61879642,0.990942446 C9.83682412,0.990942446 10.0548518,1.18867806 10.0548518,1.38641367 L10.0548518,11.6686655 C10.0548518,11.8664011 9.83682412,12.0641367 9.61879642,12.0641367 L3.60123204,12.0641367 L1.02850524,9.69130935 L1.02850524,1.38641367 C1.02850524,1.18867806 1.24653294,0.990942446 1.46456063,0.990942446 L9.61879642,0.990942446 M9.61879642,0.2 L1.50816617,0.2 C0.810477546,0.2 0.2,0.753659712 0.2,1.38641367 L0.2,10.0076863 L3.25238773,12.8550791 L9.61879642,12.8550791 C10.316485,12.8550791 10.9269626,12.3014194 10.9269626,11.6686655 L10.9269626,1.38641367 C10.9269626,0.753659712 10.316485,0.2 9.61879642,0.2 Z" id="形状"></path>
-                        <path d="M9.61879642,0 C10.4228194,0 11.1269626,0.638607809 11.1269626,1.38641367 L11.1269626,11.6686655 C11.1269626,12.4164713 10.4228194,13.0550791 9.61879642,13.0550791 L3.25238773,13.0550791 L3.11596256,13.0013261 L0.0635748259,10.1539333 L0,10.0076863 L0,1.38641367 C0,0.638607809 0.704143212,0 1.50816617,0 L9.61879642,0 Z M9.61879642,0.4 L1.50816617,0.4 C0.91681188,0.4 0.4,0.868711615 0.4,1.38641367 L0.4,9.921 L3.331,12.6550791 L9.61879642,12.6550791 C10.1707271,12.6550791 10.657723,12.2467792 10.7202028,11.7714283 L10.7269626,11.6686655 L10.7269626,1.38641367 C10.7269626,0.868711615 10.2101507,0.4 9.61879642,0.4 Z M9.61879642,0.790942446 C9.94315845,0.790942446 10.2548518,1.07362615 10.2548518,1.38641367 L10.2548518,11.6686655 C10.2548518,11.981453 9.94315845,12.2641367 9.61879642,12.2641367 L3.60123204,12.2641367 L3.46563766,12.2111542 L0.892910861,9.83832691 L0.828505241,9.69130935 L0.828505241,1.38641367 C0.828505241,1.07362615 1.1401986,0.790942446 1.46456063,0.790942446 L9.61879642,0.790942446 Z M9.69667678,1.08901006 L1.38668992,1.08901006 C1.27286315,1.08901006 1.14612572,1.20395189 1.14612572,1.28821491 L1.14561083,9.66174324 L3.64342649,11.9659298 L9.69667678,11.9660691 C9.79153243,11.9660691 9.8953538,11.8862484 9.92732605,11.8108781 L9.93724098,11.7668642 L9.93724098,1.28821491 C9.93724098,1.20395189 9.81050356,1.08901006 9.69667678,1.08901006 Z" id="形状"></path>
-                        <path d="M4.54092961,3.67913093 L2.25985278,3.67913093 C2.22052387,3.67913093 2.22052387,3.65291165 2.22052387,3.65291165 L2.22052387,2.91877199 C2.22052387,2.89255271 2.22052387,2.89255271 2.25985278,2.89255271 L4.54092961,2.89255271 C4.58025852,2.89255271 4.58025852,2.89255271 4.58025852,2.91877199 L4.58025852,3.65291165 L4.54092961,3.67913093 Z M8.86710981,5.44893192 L2.25985278,5.44893192 C2.22052387,5.44893192 2.22052387,5.44893192 2.22052387,5.40960301 L2.22052387,4.70168261 C2.22052387,4.6623537 2.22052387,4.6623537 2.25985278,4.6623537 L8.86710981,4.6623537 C8.90643872,4.6623537 8.90643872,4.6623537 8.90643872,4.70168261 L8.90643872,5.40960301 L8.86710981,5.44893192 Z M8.86710981,7.41537746 L2.25985278,7.41537746 C2.22052387,7.41537746 2.22052387,7.41537746 2.22052387,7.37604855 L2.22052387,6.66812815 C2.22052387,6.62879924 2.22052387,6.62879924 2.25985278,6.62879924 L8.86710981,6.62879924 C8.90643872,6.62879924 8.90643872,6.62879924 8.90643872,6.66812815 L8.90643872,7.37604855 L8.86710981,7.41537746 Z" id="形状"></path>
-                        <path d="M8.86710981,6.44841431 C9.00606257,6.44841431 9.08682365,6.5291754 9.08682365,6.66812815 L9.08682365,7.37604855 L9.03399013,7.50359996 L8.99466122,7.54292887 L8.86710981,7.59576239 L2.25985278,7.59576239 C2.12090003,7.59576239 2.04013894,7.51500131 2.04013894,7.37604855 L2.04013894,6.66812815 C2.04013894,6.5291754 2.12090003,6.44841431 2.25985278,6.44841431 L8.86710981,6.44841431 Z M8.72520451,6.80870958 L2.40090881,6.80870958 L2.40090881,7.23441802 L8.72520451,7.23441802 L8.72520451,6.80870958 Z M8.86710981,4.48196877 C9.00606257,4.48196877 9.08682365,4.56272985 9.08682365,4.70168261 L9.08682365,5.40960301 L9.03399013,5.53715441 L8.99466122,5.57648333 L8.86710981,5.62931685 L2.25985278,5.62931685 C2.12090003,5.62931685 2.04013894,5.54855576 2.04013894,5.40960301 L2.04013894,4.70168261 C2.04013894,4.56272985 2.12090003,4.48196877 2.25985278,4.48196877 L8.86710981,4.48196877 Z M8.72520451,4.84251382 L2.40090881,4.84251382 L2.40090881,5.26822226 L8.72520451,5.26822226 L8.72520451,4.84251382 Z M4.54092961,2.71216778 C4.66811215,2.71216778 4.76064346,2.77385532 4.76064346,2.91877199 L4.76064346,3.65291165 L4.68031808,3.80300099 L4.64098917,3.82922026 L4.54092961,3.85951586 L2.25985278,3.85951586 C2.18859958,3.85951586 2.12331983,3.83050264 2.08113204,3.77425225 C2.04130723,3.6964836 2.04130723,3.6964836 2.04013894,3.65291165 L2.04013894,2.91877199 C2.04013894,2.77385532 2.13267025,2.71216778 2.25985278,2.71216778 L4.54092961,2.71216778 Z M4.39957385,3.07293764 L2.40090881,3.07293764 L2.40090881,3.49864608 L4.39957385,3.49864608 L4.39957385,3.07293764 Z" id="形状"></path>
-                        <path d="M3.50158987,12.5394187 L3.50158987,9.83587533 L0.88525753,9.83587533 L0.88525753,8.96376455 L3.93764526,8.96376455 C4.19927849,8.96376455 4.37370065,9.1381867 4.37370065,9.39981994 L4.37370065,12.5394187 L3.50158987,12.5394187 Z" id="路径"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/styles/login.scss

@@ -37,9 +37,6 @@ $tabWidth: $tabW * 1px;
 $rowHeight: $rowH * 1px;
 $buttonHeight: $buttonH * 1px;
 
-// 1080px 高度为基准的 1px
-$base1px: 0.15vh; // 1px / 1080px;
-
 // - - - - - 页面基础设置
 .container {
 	.login-code {
@@ -90,7 +87,7 @@ $base1px: 0.15vh; // 1px / 1080px;
 		width: 100%;
 		height: 100%;
 		background-color: #ffffff;
-		// box-shadow: 0px calc(16 * 0.12vh) 40px rgba(0, 0, 0, 0.07);
+		// box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
 		// border-radius: 20px;
 		// 定位
 		position: relative;
@@ -103,7 +100,6 @@ $base1px: 0.15vh; // 1px / 1080px;
 			// 元素
 			// width: $picWidth;
 			height: $picHeight;
-			// height: 10vh;
 			background-image: url($picImage);
 			background-repeat: no-repeat;
 			background-size: 100% 100%;
@@ -122,7 +118,7 @@ $base1px: 0.15vh; // 1px / 1080px;
 		}
 		.field {
 			position: relative;
-			margin-top: 14vh;
+			margin-top: 8%;
 			flex: 2;
 			// width: 800px;
 			display: flex;
@@ -134,36 +130,17 @@ $base1px: 0.15vh; // 1px / 1080px;
 				text-align: center;
 				clear: both;
 				position: relative;
-				top: calc(-32 * $base1px);
+				top: -36px;
-				height: calc(128 * $base1px);
+				height: 128px;
 
 				.title {
 					margin: 0;
-					margin-left: calc(28 * 0.12vh);
+					margin-left: 32px;
 					font-weight: 400;
 					user-select: none;
 					color: #000;
-					font-size: calc(28 * 0.12vh);
+					font-size: 36px;
-					line-height: calc(40 * 0.12vh);
+					line-height: 54px;
-					letter-spacing: calc(2 * 0.12vh);
-
-					.cnbm_logo {
-						height: calc(40 * 0.12vh);
-						width: calc(40 * 0.12vh);
-						position: relative;
-						top: calc(8 * 0.12vh);
-						right: calc(8 * 0.12vh);
-					}
-				}
-
-				.sub-title {
-					margin: 0;
-					margin-left: calc(28 * 0.12vh);
-					font-weight: 400;
-					user-select: none;
-					color: #000;
-					font-size: calc(28 * 0.12vh);
-					line-height: calc(48 * 0.12vh);
 					letter-spacing: 2px;
 				}
 			}
@@ -182,10 +159,10 @@ $base1px: 0.15vh; // 1px / 1080px;
 			.footer {
 				user-select: none;
 				// 元素
-				margin: calc(12 * 0.12vh) 0;
+				margin: 12px 0;
-				height: calc(16 * 0.12vh);
+				height: 16px;
-				line-height: calc(16 * 0.12vh);
+				line-height: 16px;
-				font-size: calc(12 * 0.12vh);
+				font-size: 12px;
 				color: #8c8c8c;
 
 				a,
@@ -199,8 +176,12 @@ $base1px: 0.15vh; // 1px / 1080px;
 			.form {
 				margin-top: 0;
 				box-sizing: border-box;
+				// width: $formWidth;
 				width: 100%;
-
+				// - - - tab
+				:deep(.el-tabs__nav) {
+					// background: #f0f3;
+				}
 				:deep(.el-tabs__content) {
 					padding: 20px 0 0;
 				}
@@ -208,13 +189,12 @@ $base1px: 0.15vh; // 1px / 1080px;
 					user-select: none;
 					// 元素
 					width: $tabWidth;
-					// height: $rowHeight;
+					height: $rowHeight;
-					height: calc(54 * 0.12vh);
 					padding: 0;
 					// 文字
 					line-height: $rowHeight;
 					color: #666666;
-					font-size: calc(14 * 0.12vh);
+					font-size: 18px;
 					font-weight: 400;
 					text-align: center;
 				}
@@ -230,8 +210,7 @@ $base1px: 0.15vh; // 1px / 1080px;
 				:deep(.el-input__inner) {
 					// 元素
 					width: 100%;
-					// height: $rowHeight;
+					height: $rowHeight;
-					height: calc(72 * 0.12vh);
 					background: #f5f5f5;
 					border: 0;
 					border-radius: 28px;
@@ -301,7 +280,7 @@ $base1px: 0.15vh; // 1px / 1080px;
 					margin-bottom: 20px;
 					// 文字
 					line-height: 26px;
-					font-size: calc(18 * 0.12vh);
+					font-size: 20px;
 					color: #ffffff;
 				}
 				.button-active {
@@ -320,14 +299,13 @@ $base1px: 0.15vh; // 1px / 1080px;
 		:deep(.el-input__inner) {
 			// 元素
 			width: 420px;
-			height: calc(52 * 0.12vh);
+			height: 66px;
-			// height: 66px;
 			color: #262626;
-			font-size: calc(14 * 0.12vh);
+			font-size: 18px;
 		}
 		:deep(.el-checkbox__label) {
-			font-size: calc(14 * 0.12vh);
+			font-size: 18px;
-			line-height: calc(12 * 0.12vh);
+			line-height: 14px;
 		}
 	}
 }
@@ -336,42 +314,19 @@ $base1px: 0.15vh; // 1px / 1080px;
 @media screen and (min-width: 1920px) {
 	.container {
 		.content {
+
 			.field {
 				flex: initial;
-				// width: 800px;
+				width: 800px;
-				width: 40vw;
 			}
 		}
 	}
 }
 
-@media screen and (min-height: 1024px) {
-	.container {
-		.content {
-			.field {
-				margin-top: 16vh;
-			}
-		}
-	}
-}
-
-@media screen and (max-height: 1024px) {
-	.container {
-		.content {
-			.field {
-				margin-top: 8vh;
-			}
-		}
-	}
-}
-
-
 
 @media screen and (min-width: 599px) and (max-width: 1366px) {
 	.container {
-		// min-width: 599px;
+		min-width: 599px;
-		min-width: 42vw;
-
 		.content {
 			// width: 710px;
 			// height: 397px;
@@ -382,7 +337,6 @@ $base1px: 0.15vh; // 1px / 1080px;
 				display: none;
 			}
 			.field {
-				// margin-top: 6vh;
 				// width: calc(710px - 314px);
 				// left: 314px;
 				// justify-content: center;
@@ -409,14 +363,6 @@ $base1px: 0.15vh; // 1px / 1080px;
 	}
 }
 
-// @media screen and (max-height: 1080px) {
-// 	.container {
-// 		.field {
-// 			transform: scale(0.74);
-// 		}
-// 	}
-// }
-
 /* ===== MOBILE DESIGN ===== */
 $mobileW: 375;
 $mobileH: 812;
@@ -557,7 +503,7 @@ $iconBgImage: '../assets/images/icon.png';
 
 		.footer {
 			// 元素
-			font-size: calc(12 * 0.12vh);
+			font-size: 12px;
 			font-family: PingFang SC;
 			font-weight: 400;
 			line-height: 17px;
@@ -565,7 +511,7 @@ $iconBgImage: '../assets/images/icon.png';
 			opacity: 0.6;
 			// 定位
 			// position: absolute;
-			bottom: -calc(32 * 0.12vh);
+			bottom: -32px;
 		}
 	}
 }

src/components/DialogForm/index.vue

@@ -347,8 +347,6 @@ export default {
 									console.log('setting code: ', response.data);
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
-									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
-									this.$emit('update', this.form)
 								}
 							});
 						}

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-23 11:14:30
+ * @LastEditTime: 2023-11-22 13:58:30
  * @Description:
 -->
 <template>
@@ -730,21 +730,21 @@ export default {
     }
   },
 
-  watch: {
+  // watch: {
-    clientWidth(val) {
+  //   clientWidth(val) {
-      if (!this.timer) {
+  //     if (!this.timer) {
-        this.clientWidth = val
+  //       this.clientWidth = val
-        this.beilv2 = this.clientWidth / 1920
+  //       this.beilv2 = this.clientWidth / 1920
-        this.timer = true
+  //       this.timer = true
-        let _this = this
+  //       let _this = this
-        setTimeout(function () {
+  //       setTimeout(function () {
-          _this.timer = false
+  //         _this.timer = false
-        }, 500)
+  //       }, 500)
-      }
+  //     }
-      // 这里可以添加修改时的方法
+  //     // 这里可以添加修改时的方法
-      this.windowWidth(val);
+  //     this.windowWidth(val);
-    }
+  //   }
-  },
+  // },
   created() {
     // this.fetchList('exception-alarm')
     // this.fetchList('inAndOutOfEachLine')
@@ -941,7 +941,7 @@ export default {
 
 </style>
 
-<style lang="scss" >
+<style lang="scss">
 .visual-container {
   ::-webkit-scrollbar {
     width: 8px;

src/views/OperationalOverview/coldBoard.vue

@@ -60,7 +60,7 @@
                 <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
                   <base-container1 :beilv="1" :title="'设备状态监控'" :title-icon="'1_5'">
                     <div class="visual-select">
-                      <el-select class="coldSelect" v-model="modelMonth" size="mini" placeholder="">
+                      <el-select v-model="modelMonth" size="mini" placeholder="">
                         <el-option key="1" value="钢1线" label="钢1线" default />
                       </el-select>
                     </div>
@@ -634,21 +634,21 @@ export default {
       }
     }
   },
-  // watch: {
+  watch: {
-  //   clientWidth(val) {
+    clientWidth(val) {
-  //     if (!this.timer) {
+      if (!this.timer) {
-  //       this.clientWidth = val
+        this.clientWidth = val
-  //       this.beilv2 = this.clientWidth / 1920
+        this.beilv2 = this.clientWidth / 1920
-  //       this.timer = true
+        this.timer = true
-  //       let _this = this
+        let _this = this
-  //       setTimeout(function () {
+        setTimeout(function () {
-  //         _this.timer = false
+          _this.timer = false
-  //       }, 500)
+        }, 500)
-  //     }
+      }
-  //     // 这里可以添加修改时的方法
+      // 这里可以添加修改时的方法
-  //     this.windowWidth(val);
+      this.windowWidth(val);
-  //   }
+    }
-  // },
+  },
   created() {
     // this.fetchList('exception-alarm')
     // this.fetchList('inAndOutOfEachLine')
@@ -658,7 +658,6 @@ export default {
     this.windowWidth(document.documentElement.clientWidth)
   },
   mounted() {
-    console.log(1111);
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
     window.onresize = () => {
@@ -687,7 +686,6 @@ export default {
   methods: {
     windowWidth(value) {
       this.clientWidth = value
-      this.beilv2 = this.clientWidth / 1920
     },
     // erd.listenTo(document.getElementById("box"), (element) => {
     //   var width = element.offsetWidth;
@@ -1059,7 +1057,7 @@ export default {
 }
 </style>
 
-<style lang="scss" >
+<style lang="scss">
 .visual-container {
   ::-webkit-scrollbar {
     width: 8px;
@@ -1098,25 +1096,23 @@ export default {
     background-color: rgba($color: #5bc4be, $alpha: 1);
   }
 }
-.coldSelect{
+     .el-input {
-  .el-input {
+       min-height: 10px;
-      min-height: 10px;
+     }
-    }
 
-    .el-input__inner {
+     .el-input__inner {
-      background-color: rgba($color: #31878c, $alpha: 0.29);
+       background-color: rgba($color: #31878c, $alpha: 0.29);
-      border: rgba($color: #31878c, $alpha: 0.29);
+       border: rgba($color: #31878c, $alpha: 0.29);
-      color: aliceblue;
+       color: aliceblue;
-    }
+     }
 
-    .el-divider--vertical {
+     .el-divider--vertical {
-      height: 174px;
+       height: 174px;
-      width: 1px;
+       width: 1px;
-      border: rgba(255, 255, 255, 0.15);
+       border: rgba(255, 255, 255, 0.15);
-      color: rgba(255, 255, 255, 0.15);
+       color: rgba(255, 255, 255, 0.15);
-      margin-left: 3em;
+       margin-left: 3em;
-    }
+     }
-}
 </style>
 
 <style scoped>

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-23 11:11:35
+ * @LastEditTime: 2023-10-17 11:10:22
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
           <base-container :title="'各工序缺陷汇总'" :title-icon="'5_2'">
             <div class="visual-select">
-              <el-select class="coldSelect" v-model="modelMonth" size="mini" placeholder="">
+              <el-select v-model="modelMonth" size="mini" placeholder="">
                 <el-option key="1" value="钢1线" label="钢1线" default />
               </el-select>
             </div>
@@ -740,16 +740,16 @@ export default {
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
+    this.windowWidth(document.documentElement.clientWidth)
   },
   mounted() {
-    this.windowWidth(document.documentElement.clientWidth)
+    const _this = this;
-    // const _this = this;
+    window.onresize = () => {
-    // window.onresize = () => {
+      return (() => {
-    //   return (() => {
+        _this.clientWidth = `${document.documentElement.clientWidth}`
-    //     _this.clientWidth = `${document.documentElement.clientWidth}`
+        this.beilv2 = _this.clientWidth / 1920
-    //     this.beilv2 = _this.clientWidth / 1920
+      })()
-    //   })()
+    }
-    // }
     // this.beilv2 = window.innerWidth / 1920
     // addEventListener('resize', resizeFun = () => {
     //   this.beilv2 = window.innerWidth / 1920
@@ -770,7 +770,6 @@ export default {
   methods: {
     windowWidth(value) {
       this.clientWidth = value
-      this.beilv2 = this.clientWidth / 1920
     },
     // fetchList(type) {
     //   switch (type) {
@@ -933,8 +932,7 @@ export default {
     background-color: rgba($color: #5bc4be, $alpha: 1);
   }
 }
-.coldSelect{
+    .el-input {
-  .el-input {
       min-height: 10px;
     }
 
@@ -951,7 +949,6 @@ export default {
       color: rgba(255, 255, 255, 0.15);
       margin-left: 3em;
     }
-}
 
 </style>
 

src/views/base/coreCustomer/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:27:50
+ * @LastEditTime: 2023-11-03 10:53:43
  * @Description:
 -->
 <template>
@@ -77,8 +77,8 @@ export default {
         remark: undefined
 			},
 			dataRule: {
-        code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
 				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
@@ -87,12 +87,10 @@ export default {
               if (value) {
 								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
 									callback(new Error("手机号格式错误"));
-								} else {
-									callback();
 								}
 							} else {
-								callback();
+                callback();
-							}
+              }
             }, trigger: "blur"
           }
         ]

src/views/base/coreCustomer/index.vue

@@ -105,8 +105,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '客户名称',
+					label: '名称',
-					placeholder: '客户名称',
+					placeholder: '专业',
 					param: 'name',
 				},
 				{

src/views/base/coreDepartment/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:32:10
+ * @LastEditTime: 2023-11-02 14:16:30
  * @Description:
 -->
 <template>
@@ -89,6 +89,7 @@ export default {
 			const menu = { id: 0, name: '总部门', children: [] };
 			menu.children = this.handleTree(this.departmentlList, "id")
 			this.menuOptions.push(menu)
+			console.log('你好', this.menuOptions)
 		},
 		/** 转换菜单数据结构 */
     normalizer(node) {

src/views/base/coreDepartment/index.vue

@@ -134,11 +134,6 @@ export default {
     //     this.dataListLoading = false;
     //   });
     // },
-		successSubmit() {
-      this.handleCancel()
-      this.getDataList()
-			this.$refs.addOrUpdate.getDict()
-    },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':

src/views/base/coreEquipment/index.vue

@@ -123,7 +123,7 @@ export default {
 				},
 				{ prop: 'name', label: '设备名称' },
 				{ width: 256, prop: 'code', label: '设备编码' },
-				{ prop: 'equipmentTypeName', label: '设备类型' },
+				{ prop: 'equipmentType', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
 				// {
@@ -256,19 +256,11 @@ export default {
 						datetime: true,
 						label: '生产日期',
 						prop: 'productionTime',
-						bind: {
-							format: 'yyyy-MM-dd',
-							clearable: true,
-						},
 					},
 					{
 						datetime: true,
 						label: '进厂日期',
 						prop: 'enterTime',
-						bind: {
-							format: 'yyyy-MM-dd',
-							clearable: true,
-						},
 					},
 					{
 						input: true,

src/views/base/coreEquipmentType/index.vue

@@ -91,15 +91,15 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '类型名称' },
+				{ prop: 'name', label: '设备类型名称' },
-				{ prop: 'code', label: '类型编号' },
+				{ prop: 'code', label: '检测类型编码' },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
 					label: '设备类型',
-					placeholder: '设备类型',
+					placeholder: '请输入设备类型名称',
 					param: 'name',
 				},
 				{
@@ -133,19 +133,18 @@ export default {
 				[
 					{
 						input: true,
-						label: '类型名称',
+						label: '设备类型名称',
 						prop: 'name',
-						rules: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备类型名不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }
 					},
 					{
 						input: true,
-						label: '类型编号',
+						label: '设备类型编码',
 						prop: 'code',
 						url: '/base/core-equipment-type/getCode',
-						rules: [{ required: true, message: '类型编号不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -175,13 +174,7 @@ export default {
 				name: '',
 			},
 			// 表单参数
-			form: {
+			form: {},
-				code: undefined,
-				name: undefined,
-				id: undefined,
-				parentId: undefined,
-				remark: undefined
-			},
 		};
 	},
 	watch: {
@@ -275,7 +268,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除设备类型"' + row.name + '"的数据项?')
+				.confirm('是否确认删除设备类型"' + row.name + '"?')
 				.then(function () {
 					return deleteEquipmentType(id);
 				})

src/views/base/coreMajor/index.vue

@@ -97,8 +97,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '专业名称',
+					label: '名称',
-					placeholder: '专业名称',
+					placeholder: '专业',
 					param: 'name',
 				},
 				{

src/views/base/coreProduct/index.vue

@@ -107,8 +107,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '产品名称',
+					label: '工单名称',
-					placeholder: '产品名称',
+					placeholder: '工单名称',
 					param: 'name'
 				},
 				{

src/views/base/coreProductionLine/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-21 18:59:54
+ * @LastEditTime: 2023-11-03 19:28:06
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px">
+		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="产线名称" prop="name">
@@ -30,8 +30,7 @@
 					<el-select
 						v-model="dataForm.factoryId"
 						filterable
-						placeholder="请选择工厂"
+						placeholder="请选择工厂">
-						style="width: 100%">
 						<el-option
 							v-for="dict in factoryList"
 							:key="dict.id"
@@ -95,8 +94,8 @@ export default {
 			},
 			factoryList: [],
 			dataRule: {
-        code: [{ required: true, message: "产线编号不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "产线名称不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
 				factoryId: [{ required: true, message: "工厂不能为空", trigger: "blur" }]
       }
 		};

src/views/base/coreProductionLine/index.vue

@@ -71,10 +71,6 @@ const tableProps = [
 		label: '当前状态',
 		filter: codeFilter('lineStatus')
 	},
-	{
-		prop: 'tvalue',
-		label: '产线TT值(h)'
-	},
 	{
 		prop: 'description',
 		label: '描述'

src/views/base/coreSupplier/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:27:43
+ * @LastEditTime: 2023-11-03 11:00:47
  * @Description:
 -->
 <template>
@@ -77,8 +77,8 @@ export default {
         remark: undefined
 			},
 			dataRule: {
-        code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
 				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
@@ -87,12 +87,10 @@ export default {
 							if (value) {
 								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
 									callback(new Error("手机号格式错误"));
-								} else {
-									callback();
 								}
 							} else {
-								callback();
+                callback();
-							}
+              }
             }, trigger: "blur"
           }
         ]
@@ -100,31 +98,6 @@ export default {
 		};
 	},
 	mounted() {},
-	methods: {
+	methods: {}
-		// 表单提交
-    dataFormSubmit() {
-			console.log('你好', this.dataForm)
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false; 
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
-	}
 };
 </script>

src/views/base/coreWorkOrder/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-20 16:51:24
+ * @LastEditTime: 2023-11-06 14:38:20
  * @Description:
 -->
 <template>
@@ -95,8 +95,7 @@ const tableProps = [
 	},
 	{
 		prop: 'material',
-		label: '原料名称',
+		label: '原料名称'
-		filter: publicFormatter('material')
 	},
 	{
 		prop: 'origin',
@@ -104,7 +103,7 @@ const tableProps = [
 		filter: (val) => ['', '内部', '采购'][val]
 	},
 	{
-		prop: 'supplierName',
+		prop: 'supplierId',
 		label: '供应商',
 	},
 	{
@@ -196,7 +195,7 @@ export default {
 				...this.listQuery,
 				workOrderId: this.dataForm.id,
 			}).then((response) => {
-				this.materialList = response.data.records;
+				this.materialList = response.data.list;
 				this.listQuery.total = response.data.total;
 			});
 		},

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -26,8 +26,8 @@
         </el-form-item>
       </el-col>
       <el-col :span='12'>
-        <el-form-item label="产品规格" prop="specifications">
+        <el-form-item label="产品规格" prop="productSpec">
-          <el-input v-model="dataForm.specifications" />
+          <el-input v-model="dataForm.productSpec" disabled></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -35,9 +35,9 @@
       <el-col :span='12'>
         <el-form-item label="计划开始时间">
           <el-date-picker
-            v-model="dataForm.planStartTime"
+            v-model="planStartTime"
             type="datetime"
-            value-format="timestamp"
+            value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%;"
             placeholder="选择日期">
           </el-date-picker>
@@ -46,9 +46,9 @@
       <el-col :span='12'>
         <el-form-item label="计划完成时间">
           <el-date-picker
-            v-model="dataForm.planFinishTime"
+            v-model="planFinishTime"
             type="datetime"
-            value-format="timestamp"
+            value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%;"
             placeholder="选择日期">
           </el-date-picker>
@@ -83,8 +83,8 @@
       <el-col :span='12'>
         <el-form-item label="物料计算方式" prop="materialMethod">
           <el-radio-group v-model="dataForm.materialMethod" @change="materialMethodChange">
-            <el-radio :label="1">产品基础BOM</el-radio>
+            <el-radio :label="1">产品基础</el-radio>
-            <el-radio :label="2">工艺扩展BOM</el-radio>
+            <el-radio :label="2">工艺扩展</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -168,7 +168,7 @@ export default {
         name: '',
         code: '',
         planProductId: '',
-        specifications: '',
+        productSpec: '',
         planStartTime: '',
         planFinishTime: '',
         planAssignQuantity: 0,
@@ -186,7 +186,7 @@ export default {
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
         planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
-        productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }]
+        productLineIds: [{ required: true, message: "产品不能为空", trigger: "change" }]
       },
       productList: [],
       processFlowList: [],
@@ -232,10 +232,6 @@ export default {
         if (this.dataForm.id) {
           getCoreWO(id).then(response => {
             this.dataForm = response.data;
-            if (this.dataForm.priority !== undefined) {
-              this.dataForm.priority = String(this.dataForm.priority)
-            }
-            this.dataForm.priority 
           });
         } else {
           if (this.urlOptions.isGetCode) {
@@ -268,11 +264,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            console.log('121', this.dataForm.name)
+            this.$emit("refreshDataList", true);
-            this.$emit("refreshDataList", {
-              id: response.data,
-              name: this.dataForm.name
-            });
           }).catch(() => {
             this.$emit("refreshDataList");        
           });

src/views/base/coreWorkOrder/attr-add.vue

@@ -62,7 +62,7 @@
 				<el-input
 					v-model="dataForm.batch"
 					clearable
-					placeholder="请输入批次号" />
+					placeholder="请输入规格" />
 			</el-form-item>
 			<el-form-item label="数量" prop="num">
 				<el-input-number
@@ -143,19 +143,13 @@ export default {
 		},
 		init(id) {
 			this.dataForm.id = id || '';
+			console.log('1', this.dataForm.id)
 			this.visible = true;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
 					getCoreWOMa(this.dataForm.id).then((res) => {
 						this.dataForm = res.data
-						if (this.dataForm.unit !== undefined) {
-							this.dataForm.unit = String(this.dataForm.unit)
-						}
-						if (this.dataForm.material !== undefined) {
-							this.dataForm.material = String(this.dataForm.material)
-						}
-						console.log('111', this.dataForm)
 					});
 				}
 			});

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 09:47:53
+ * @LastEditTime: 2023-11-16 13:45:13
  * @Description:
 -->
 <template>
@@ -16,7 +16,6 @@
 		<!-- <small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title> -->
-		<el-button style="float: right" type="primary" @click="goback()">返回</el-button>
 		<div v-show="workOrderButton.length">
 			<el-button  v-for="(work, index) in workOrderButton" :key="index" type="primary" @click="init(work.id, true)">{{ work.name }}</el-button>
 		</div>
@@ -34,7 +33,7 @@
 					<el-col :span="8">工单名称:{{ dataForm.name }}</el-col>
 					<el-col :span="8">工单来源:{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}</el-col>
 					<el-col :span="8">所属订单:
-						<span v-for="(item, index) in orderList" :key="index" style="margin-right: 10px">{{ item.orderName }}</span>
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px">{{ item.name }}</span>
 					</el-col>
 				</el-row>
 				<el-row :gutter="20">
@@ -43,7 +42,7 @@
 					<el-col :span="8">计划生产数量:{{ dataForm.planQuantity }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="8">预计用时(小时):{{ dataForm.remainingTime }}</el-col>
+					<el-col :span="8">预计用时(小时):{{ dataForm.expectedTime }}</el-col>
 					<el-col :span="8">计划投入数量:{{ dataForm.planAssignQuantity }}</el-col>
 					<el-col :span="8">优先级:{{ fitlerP(dataForm.priority) }}</el-col>
 				</el-row>
@@ -64,7 +63,9 @@
 			</small-title>
 			<div class="formContent">
 				<el-row :gutter="20">
-					<el-col :span="8">工单创建时间:{{ parseTime(dataForm.createTime) }}</el-col>
+					<el-col :span="8">订单创建时间:
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: pre-wrap">{{ parseTime(item.createTime) }}</span>
+					</el-col>
 					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
 					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
 				</el-row>
@@ -142,7 +143,7 @@
 <script>
 // import basicAdd from '../../core/mixins/basic-add';
 import { getCoreWO, getMaterialBomPage, getConOrderList, getCoreWOListById } from "@/api/base/coreWorkOrder";
-// import { orderList } from "@/api/base/orderManage";
+import { orderList } from "@/api/base/orderManage";
 import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
@@ -185,7 +186,7 @@ const tableProps = [
 const tableProps1 = [
 	{
 		prop: 'materialName',
-		label: '物料名称'
+		label: '原料名称'
 	},
 	{
 		prop: 'unit',
@@ -222,7 +223,7 @@ export default {
 			dataForm: {},
 			orderList: [],
 			materialList: [],
-			// orderArray: [],
+			orderArray: [],
 			visible: false,
 			isdetail: false,
 			workOrderButton: [],
@@ -335,11 +336,12 @@ export default {
 				});
 			}
 			// 获取订单相关信息
-			// orderList({
+			orderList({
-			// 	workOrderId: this.dataForm.id
+				workOrderId: this.dataForm.id
-			// }).then((response) => {
+			}).then((response) => {
-			// 	this.orderArray = response.data;
+				this.orderArray = response.data;
-			// });
+				// this.listQuery.total = response.data.total;
+			});
 		},
 		init(id, isdetail) {
 			this.initData();
@@ -372,7 +374,8 @@ export default {
 			});
 		},
 		goback() {
-			this.$router.go(-1);
+			this.visible = false;
+			this.$emit('refreshDataList');
 			// this.initData();
 		},
 		goEdit() {

src/views/base/coreWorkOrder/index.vue

@@ -213,7 +213,7 @@ export default {
 								{
 									name: 'status',
 									type: 'equal',
-									value: 2
+									value: 3
 								},
 								{
 									name: 'status',
@@ -313,15 +313,7 @@ export default {
 		refreshWorkOrder(val) {
 			console.log(val)
 			if (val) {
-				// 预使用原料信息
+				console.log('打印')
-				console.log('预使用原料信息')
-				this.handleCancel()
-      	this.getDataList()
-				this.materialVisible = true;
-        this.addOrEditTitle = "预使用主原料信息";
-        this.$nextTick(() => {
-          this.$refs.material.init(val, true);
-        });
 			} else {
 				this.successSubmit()
 			}

src/views/base/coreWorker/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:26:58
+ * @LastEditTime: 2023-11-03 11:01:24
  * @Description:
 -->
 <template>
@@ -211,12 +211,10 @@ export default {
               if (value) {
 								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
 									callback(new Error("手机号格式错误"));
-								} else {
-									callback();
 								}
 							} else {
-								callback();
+                callback();
-							}
+              }
             }, trigger: "blur"
           }
         ],
@@ -245,32 +243,13 @@ export default {
 		setOut(val) {
 			if (val === 1) {
 				this.isOut = true
-				this.dataForm.outTime = ''
 			} else {
 				this.isOut = false
 			}
 		},
-		reset() {
-			this.dataForm = {
-				id: undefined,
-        code: undefined,
-        name: undefined,
-				fileUrl: undefined,
-				sex: 0,
-				telephone: undefined,
-				departmentId: undefined,
-				position: undefined,
-				entryTime: new Date().getTime(),
-				status: 1,
-				outTime: undefined,
-				education: undefined,
-				workCost: undefined,
-        remark: undefined
-			}
-			this.majorIdList = undefined
-		},
 		// 表单提交
     dataFormSubmit() {
+			console.log('111', this.dataForm)
       this.$refs["dataForm"].validate((valid) => {
         if (!valid) {
           return false;
@@ -313,8 +292,7 @@ export default {
       });
     },
 		init(id) {
-			this.reset()
+      this.dataForm.id = id || "";
-      this.dataForm.id = id || undefined;
       this.visible = true;
       if (this.urlOptions.getOption) {
         this.getArr()

src/views/base/coreWorkshopSection/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 08:55:37
+ * @LastEditTime: 2023-11-03 19:31:25
  * @Description:
 -->
 <template>
@@ -82,8 +82,8 @@ export default {
 			},
 			proLineList: [],
 			dataRule: {
-        code: [{ required: true, message: "工段编号不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "工段名称不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
 				productionLineId: [{ required: true, message: "产线不能为空", trigger: "blur" }],
         sort: [{ required: true, message: "排序不能为空", trigger: "blur" }]
       }

src/views/base/custom/index.vue

@@ -202,11 +202,12 @@ export default {
     }
   },
   created() {
-    // $('.hiprintEpContainer').empty()
+    // this.init()
+    // console.log('aaaaaa')
+    // this.otherPaper()
   },
   destroyed () {
     $('.hiprintEpContainer').empty()
-    console.log(11111)
   },
   methods: {
     // handleClose() {
@@ -214,7 +215,6 @@ export default {
     // },
     closed() {
       $('.hiprintEpContainer').empty()
-      $('.hiprint-printTemplate').empty()
     },
     init(data) {
       this.drawer = true
@@ -256,17 +256,17 @@ export default {
 
         // console.log(this.modelData)
         // console.log($('#hiprint-printTemplate').empty())
-        // if () {
+        if (this.modelData != {}) {
-          // console.log(this.modelData);
+          console.log(this.modelData);
-          // $('.hiprintEpContainer').empty()
+          $('.hiprintEpContainer').empty()
-          // hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
+          hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
-          // $('.hiprint-printTemplate').empty()
+          $('.hiprint-printTemplate').empty()
-          // hiprintTemplate = new hiprint.PrintTemplate({
+          hiprintTemplate = new hiprint.PrintTemplate({
-          //   template: JSON.parse(this.modelData),
+            template: JSON.parse(this.modelData),
-          //   settingContainer: '#PrintElementOptionSetting',
+            settingContainer: '#PrintElementOptionSetting',
-          //   paginationContainer: '.hiprint-printPagination'
+            paginationContainer: '.hiprint-printPagination'
-          // })
+          })
-        // } else {
+        } else {
           $('.hiprintEpContainer').empty()
           console.log(this.modelData);
           hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
@@ -275,11 +275,11 @@ export default {
           const template = provider.value
           // console.log(template)
           hiprintTemplate = new hiprint.PrintTemplate({
-            template: this.modelData != '' ? JSON.parse(this.modelData) : {},
+            template: template,
             settingContainer: '#PrintElementOptionSetting',
             paginationContainer: '.hiprint-printPagination'
           })
-        // }
+        }
         hiprintTemplate.design('#hiprint-printTemplate')
         // console.log(hiprintTemplate)
         console.log(hiprintTemplate);

src/views/base/custom/providers.js

@@ -236,10 +236,212 @@ export const aProvider = function (ops) {
   };
 };
 
+// 自定义设计元素2
+export const bProvider = function (ops) {
+  var addElementTypes = function (context) {
+    context.removePrintElementTypes("bProviderModule");
+    context.addPrintElementTypes(
+      "bProviderModule",
+      [
+        new hiprint.PrintElementTypeGroup("常规", [
+          {
+            tid: 'bProviderModule.header', title: '单据表头', data: '单据表头', type: 'text',
+            options: {
+              testData: '单据表头',
+              height: 17,
+              fontSize: 16.5,
+              fontWeight: "700",
+              textAlign: "center",
+              hideTitle: true
+            }
+          },
+          {
+            tid: 'bProviderModule.type', title: '单据类型', data: '单据类型', type: 'text',
+            options: {
+              testData: '单据类型',
+              height: 16,
+              fontSize: 15,
+              fontWeight: "700",
+              textAlign: "center",
+              hideTitle: true
+            }
+          },
+          {
+            tid: 'bProviderModule.order', title: '订单编号', data: 'XS888888888', type: 'text',
+            options: {
+              field: 'orderId',
+              testData: 'XS888888888',
+              height: 16,
+              fontSize: 6.75,
+              fontWeight: "700",
+              textAlign: "left",
+              textContentVerticalAlign: "middle"
+            }
+          },
+          {
+            tid: 'bProviderModule.date', title: '业务日期', data: '2020-01-01', type: 'text',
+            options: {
+              field: 'date',
+              testData: '2020-01-01',
+              height: 16,
+              fontSize: 6.75,
+              fontWeight: "700",
+              textAlign: "left",
+              textContentVerticalAlign: "middle"
+            }
+          },
+          {
+            tid: 'bProviderModule.barcode', title: '条形码', data: 'XS888888888', type: 'text',
+            options: {
+              field: 'barcode',
+              testData: 'XS888888888',
+              height: 32,
+              fontSize: 12,
+              lineHeight: 18,
+              textType: "barcode"
+            }
+          },
+          {
+            tid: 'bProviderModule.qrcode', title: '二维码', data: 'XS888888888', type: 'text',
+            options: {
+              field: 'qrcode',
+              testData: 'XS888888888',
+              height: 32,
+              fontSize: 12,
+              lineHeight: 18,
+              textType: "qrcode"
+            }
+          },
+          {
+            tid: 'bProviderModule.platform', title: '平台名称', data: '平台名称', type: 'text',
+            options: {
+              testData: '平台名称',
+              height: 17,
+              fontSize: 16.5,
+              fontWeight: "700",
+              textAlign: "center",
+              hideTitle: true
+            }
+          },
+          {tid: 'bProviderModule.image',  title: 'Logo', data: 'data: image/png;base64iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAHVklEQVR4nO2dT2wUVRzHv2/2T5eSAlvFilwgQUH+eLACaUxEiJLAxdh44MDZi2ChUIrSFtoCgbbSP4GDdwgeEA8kRTAI0iIGBL1ITLxgLAlCsCKBYndnx7zd35pl2+7On/de387OJ9l00515/z7z/szMmzfs7869mD0yCjw2gZAB4VhAiln4/dUaRGdU18aOnzw9dn24ioGJj0soFsJr1z2yNm+qN2/fvRFL8XyMYqTmFfxZ+TwMc1xKDsL/f2Ms8xGeLwuIRpCKx99MHf/i4uPrw5GQ9jIAfsCMXfw2HkuOX03Wb1qLh4+uIGFJjzecPoS5iEhUTg1hDMaM2GuRk6cGMTQUCYmPQQq86CMAkkPDkQirGAzXf7Du34ejN9IHmETCRjQGPL6D+4NnYDEJDQmXbaY6on/dm2Vm/jHdZe0Almm6Ll+YNQbzasX7765BNHI1o0sOYRghwExg7MG9dDQSiqsdwHuZmlFKMjLwQ3QcFtjlSxHTenLO3Lp7vfU09AOS41Ka+HC6CjIDIaqmguvIPgBtIgOcDhjVlMTQtarKOScumR/teCdpxoeNZGJCapjFt7Rcywrb2MYtnQBatCpZTzCkYCF+5suKRXf+6EvOmv0GSzwrhB/QpmGkBYZSpqvIZAlp8ZeMLFwKUH3z2gqWyd/+3F/5b1yRQQMCN8gQspeaKt+SAItSCxCiPjIjhDEkjRAMxmCZSbgZkYke537qdxl57KM8C0OkkD0ADohMXIlwgPIuBFFC9uS3p2XGflFSRAgpdxlZeBl84jUQr0ImjDTKGWZZBwE0eCkCL0J20UgjgGCwEDHNPjB86PbiilshfGRxOBCRD0tLCSWTnzMLO9yE4EbIzjIdTdmGpc8/rB4qK0c4FcKbqe7pyWZJ0k1lZhsnQnZq3EzV00dHDjupKXaFNGtcM7YA+Io+WzRIz2R0UxkWxY6QJgCHlCbfPlzAsZytj2ks5RCVZUGKCdkOoEt+Wl3RkCcjyzGv5wIS6aIynZJCQni7d0TTjPFaMFDg9wGNa8qRQn3KVEI+1rjPmKpm5KNzTemmMp7AZEK2AehXmz7bbC1SM/IZoH10pJ/K+hnyhXBrvZpmoBHAURf7HaV9daQ3v6Zk7hhWVr4AYDOAzzRNeKPHAyW7r459Yj/deUynMcyqqpY9/fXW+RTwkiF/ms5pADcd7nMbwAkBcfMM3wOwwOF+rys46TxCt+T72d2NG0YSg2fnC58ANDkbAZyVH41QNgAYVBTXNiMxeLYG6qawvagmGqGoTHOfwcAe6T8TvWwYlTC7OsALgRDNCIRoRiBEMwIhmhEI0YxAiGYEQjRDtZCY9iUyEaVpVi3kvuL4RKA0zSqF8Ad5TimMTxSnKO1KUCWEZ6hDVaYk0KFKigohbSUuI0uHiieKZQtp89kM+U7ZUmQKafHp4wpSH/eWJaTT5zPkD8g62GQI8cXqDTZok/HEsWgh+3Of2y4D2kU/0idKyEOaJdgqKLxSotXlfLFJESXkicKZGTrys6g0iRIyD8AvAFYLCq+UWC1yACOyD+Hrf1wAUCcwTN2pozzXiEqn6E59JoBvANQKDldHaimvM0WmTcawlydw2Oc1pY7yKFQGJJ4YxqiTXyEp/OlkBeVNyn0SmZdO5gC47rOOfjXlaY6sCGRfXKwA8LVP+pRaykuFzEhUXH7nR9P3AFYqiEsWKykP0mpGFlU3qKI0IlmlKD6RrKK0R1VEpvIW7uwSHXnVUdqVoHqSwz+K4xOB0jQH87I0IxCiGYEQzQiEaEYgRDMCIZoRCNGMQIhmBEI0gwuJK0xScKZemHiY1mzqUxThYgBLHO7zQOAzGnMBPOdwn8WC4rbDNjaSWVajQaEUp9wBsB7ALY/hLAVwHsB89VmwRXrhuGwf0q/xIl/z6f6105qVyxIKQ1cZjdlV/HI79V6N1yjk/dxlAMtc7LuM9lXZVzqhIXdxtvxR1kCxZUynkbl0o2ihgyQspH3mapqn7flrSE427O3TuKbwGZI/AlhuY9vltO08Belyw6T99lTnIQN2VmGeJqppskGhpfoW0DbVmuahaarVVQudGPZo3tH/RCOnfJbSbzp34D1T/VjsTL3X6esWFMJngJwDsCgnykX0P+mzQ1yyq9jqqtnzkGI0a7wgPz9pfJm+/6ZxB77bzus+7L7pkwdkarr8OBdwJee7jjQVaqZysVtDsuwK3j3lmGYnb5hwerW3S+PRl440OX3dh5vL7z0iXzXqY/bYbaZycXs/5KDdV/iUKc1URo7xcoOqq0yfui1Gq5e3EoUava1qzS/aJQGs8xKIj2jx+gCoVyGcoUBKGs8yIEgIAiliZEDwJAehL3ovIYS+2F9UDckyRH/fFhmoxuwTvdaJaCGc7+gyi9+br1YZSzTJEAIaffHrZG/JCFwDpK16JEsI5yK9uMdvzVe7zAUxZQrhXKKBwxqZkSikQ8aiZbnIFgKS4oea0i5bBhQJgQ+kKJEBhUJAUkqxo+cduJqVrQH8B6xBgBhvJFNDAAAAAElFTkSuQmCC', type: 'image',   options: {
+            src: 'data: image/png;base64iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAHVklEQVR4nO2dT2wUVRzHv2/2T5eSAlvFilwgQUH+eLACaUxEiJLAxdh44MDZi2ChUIrSFtoCgbbSP4GDdwgeEA8kRTAI0iIGBL1ITLxgLAlCsCKBYndnx7zd35pl2+7On/de387OJ9l00515/z7z/szMmzfs7869mD0yCjw2gZAB4VhAiln4/dUaRGdU18aOnzw9dn24ioGJj0soFsJr1z2yNm+qN2/fvRFL8XyMYqTmFfxZ+TwMc1xKDsL/f2Ms8xGeLwuIRpCKx99MHf/i4uPrw5GQ9jIAfsCMXfw2HkuOX03Wb1qLh4+uIGFJjzecPoS5iEhUTg1hDMaM2GuRk6cGMTQUCYmPQQq86CMAkkPDkQirGAzXf7Du34ejN9IHmETCRjQGPL6D+4NnYDEJDQmXbaY6on/dm2Vm/jHdZe0Almm6Ll+YNQbzasX7765BNHI1o0sOYRghwExg7MG9dDQSiqsdwHuZmlFKMjLwQ3QcFtjlSxHTenLO3Lp7vfU09AOS41Ka+HC6CjIDIaqmguvIPgBtIgOcDhjVlMTQtarKOScumR/teCdpxoeNZGJCapjFt7Rcywrb2MYtnQBatCpZTzCkYCF+5suKRXf+6EvOmv0GSzwrhB/QpmGkBYZSpqvIZAlp8ZeMLFwKUH3z2gqWyd/+3F/5b1yRQQMCN8gQspeaKt+SAItSCxCiPjIjhDEkjRAMxmCZSbgZkYke537qdxl57KM8C0OkkD0ADohMXIlwgPIuBFFC9uS3p2XGflFSRAgpdxlZeBl84jUQr0ImjDTKGWZZBwE0eCkCL0J20UgjgGCwEDHNPjB86PbiilshfGRxOBCRD0tLCSWTnzMLO9yE4EbIzjIdTdmGpc8/rB4qK0c4FcKbqe7pyWZJ0k1lZhsnQnZq3EzV00dHDjupKXaFNGtcM7YA+Io+WzRIz2R0UxkWxY6QJgCHlCbfPlzAsZytj2ks5RCVZUGKCdkOoEt+Wl3RkCcjyzGv5wIS6aIynZJCQni7d0TTjPFaMFDg9wGNa8qRQn3KVEI+1rjPmKpm5KNzTemmMp7AZEK2AehXmz7bbC1SM/IZoH10pJ/K+hnyhXBrvZpmoBHAURf7HaV9daQ3v6Zk7hhWVr4AYDOAzzRNeKPHAyW7r459Yj/deUynMcyqqpY9/fXW+RTwkiF/ms5pADcd7nMbwAkBcfMM3wOwwOF+rys46TxCt+T72d2NG0YSg2fnC58ANDkbAZyVH41QNgAYVBTXNiMxeLYG6qawvagmGqGoTHOfwcAe6T8TvWwYlTC7OsALgRDNCIRoRiBEMwIhmhEI0YxAiGYEQjRDtZCY9iUyEaVpVi3kvuL4RKA0zSqF8Ad5TimMTxSnKO1KUCWEZ6hDVaYk0KFKigohbSUuI0uHiieKZQtp89kM+U7ZUmQKafHp4wpSH/eWJaTT5zPkD8g62GQI8cXqDTZok/HEsWgh+3Of2y4D2kU/0idKyEOaJdgqKLxSotXlfLFJESXkicKZGTrys6g0iRIyD8AvAFYLCq+UWC1yACOyD+Hrf1wAUCcwTN2pozzXiEqn6E59JoBvANQKDldHaimvM0WmTcawlydw2Oc1pY7yKFQGJJ4YxqiTXyEp/OlkBeVNyn0SmZdO5gC47rOOfjXlaY6sCGRfXKwA8LVP+pRaykuFzEhUXH7nR9P3AFYqiEsWKykP0mpGFlU3qKI0IlmlKD6RrKK0R1VEpvIW7uwSHXnVUdqVoHqSwz+K4xOB0jQH87I0IxCiGYEQzQiEaEYgRDMCIZoRCNGMQIhmBEI0gwuJK0xScKZemHiY1mzqUxThYgBLHO7zQOAzGnMBPOdwn8WC4rbDNjaSWVajQaEUp9wBsB7ALY/hLAVwHsB89VmwRXrhuGwf0q/xIl/z6f6105qVyxIKQ1cZjdlV/HI79V6N1yjk/dxlAMtc7LuM9lXZVzqhIXdxtvxR1kCxZUynkbl0o2ihgyQspH3mapqn7flrSE427O3TuKbwGZI/AlhuY9vltO08Belyw6T99lTnIQN2VmGeJqppskGhpfoW0DbVmuahaarVVQudGPZo3tH/RCOnfJbSbzp34D1T/VjsTL3X6esWFMJngJwDsCgnykX0P+mzQ1yyq9jqqtnzkGI0a7wgPz9pfJm+/6ZxB77bzus+7L7pkwdkarr8OBdwJee7jjQVaqZysVtDsuwK3j3lmGYnb5hwerW3S+PRl440OX3dh5vL7z0iXzXqY/bYbaZycXs/5KDdV/iUKc1URo7xcoOqq0yfui1Gq5e3EoUava1qzS/aJQGs8xKIj2jx+gCoVyGcoUBKGs8yIEgIAiliZEDwJAehL3ovIYS+2F9UDckyRH/fFhmoxuwTvdaJaCGc7+gyi9+br1YZSzTJEAIaffHrZG/JCFwDpK16JEsI5yK9uMdvzVe7zAUxZQrhXKKBwxqZkSikQ8aiZbnIFgKS4oea0i5bBhQJgQ+kKJEBhUJAUkqxo+cduJqVrQH8B6xBgBhvJFNDAAAAAElFTkSuQmCC',
+            fit: 'none'
+            }},
+        ]),
+        new hiprint.PrintElementTypeGroup("客户", [
+          {
+            tid: 'bProviderModule.khname', title: '客户名称', data: '高级客户', type: 'text',
+            options: {
+              field: 'name',
+              testData: '高级客户',
+              height: 16,
+              fontSize: 6.75,
+              fontWeight: "700",
+              textAlign: "left",
+              textContentVerticalAlign: "middle"
+            }
+          },
+          {
+            tid: 'bProviderModule.tel', title: '客户电话', data: '18888888888', type: 'text',
+            options: {
+              field: 'tel',
+              testData: '18888888888',
+              height: 16,
+              fontSize: 6.75,
+              fontWeight: "700",
+              textAlign: "left",
+              textContentVerticalAlign: "middle"
+            }
+          },
+        ]),
+        new hiprint.PrintElementTypeGroup("表格/其他", [
+          {
+            tid: 'bProviderModule.table', title: '订单数据',
+            type: 'table',
+            options: {
+              field: 'table',
+              fields: [
+                {text: '名称', field: 'NAME'},
+                {text: '数量', field: 'SL'},
+                {text: '规格', field: 'GG'},
+                {text: '条码', field: 'TM'},
+                {text: '单价', field: 'DJ'},
+                {text: '金额', field: 'JE'},
+                {text: '备注', field: 'DETAIL'},
+              ],
+            },
+            editable: true,
+            columnDisplayEditable: true,//列显示是否能编辑
+            columnDisplayIndexEditable: true,//列顺序显示是否能编辑
+            columnTitleEditable: true,//列标题是否能编辑
+            columnResizable: true, //列宽是否能调整
+            columnAlignEditable: true,//列对齐是否调整
+            columns: [
+              [
+                {title: '名称', align: 'center', field: 'NAME', width: 100},
+                {title: '数量', align: 'center', field: 'SL', width: 100},
+                {title: '条码', align: 'center', field: 'TM', width: 100},
+                {title: '规格', align: 'center', field: 'GG', width: 100},
+                {title: '单价', align: 'center', field: 'DJ', width: 100},
+                {title: '金额', align: 'center', field: 'JE', width: 100},
+                {title: '备注', align: 'center', field: 'DETAIL', width: 100},
+              ]
+            ],
+            footerFormatter: function (options, rows, data, currentPageGridRowsData) {
+              if (data && data['totalCap']) {
+                return `<td style="padding:0 10px" colspan="100">${'应收金额大写: ' + data['totalCap']}</td>`
+              }
+              return '<td style="padding:0 10px" colspan="100">应收金额大写: </td>'
+            },
+          },
+          {tid: 'bProviderModule.customText', title: '文本', customText: '自定义文本', custom: true, type: 'text'},
+          {
+            tid: 'bProviderModule.longText', title: '长文本', type: 'longText', options: {
+              field: 'test.longText',
+              width: 200,
+              testData: '长文本分页/不分页测试'
+            },
+          }
+        ]),
+        new hiprint.PrintElementTypeGroup("辅助", [
+          {
+            tid: 'bProviderModule.hline',
+            title: '横线',
+            type: 'hline'
+          },
+          {
+            tid: 'bProviderModule.vline',
+            title: '竖线',
+            type: 'vline'
+          },
+          {
+            tid: 'bProviderModule.rect',
+            title: '矩形',
+            type: 'rect'
+          },
+          {
+            tid: 'bProviderModule.oval',
+            title: '椭圆',
+            type: 'oval'
+          }
+        ])
+      ]
+    );
+  };
+  return {
+    addElementTypes: addElementTypes
+  };
+};
+
 // type: 1供货商 2经销商
 export default [{
   name: 'A设计',
   value: 'aProviderModule',
   type: 1,
   f: aProvider()
+}, {
+  name: 'B设计',
+  value: 'bProviderModule',
+  type: 2,
+  f: bProvider()
 }]

src/views/base/material/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:22:38
+ * @LastEditTime: 2023-11-06 19:44:24
  * @Description:
 -->
 <template>
@@ -127,17 +127,12 @@
 					物料属性
 				</small-title>
 
-				<div v-if="!isdetail" class="action_btn">
-          <template>
-            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
-            </span>
-          </template>
-        </div>
 				<base-table
 					:table-props="tableProps"
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
+					:add-button-show="isdetail ? null : '添加属性'"
+					@emitButtonClick="addNew()"
 					:table-data="materialAttrList">
 					<method-btn
 						v-if="!isdetail"
@@ -157,11 +152,11 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
+				<el-button style="" @click="goback()">取消</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button v-if="isdetail" type="primary" @click="goEdit()">
 					编辑
-				</el-button> -->
+				</el-button>
-				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
+				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
 		</div>
 
@@ -430,12 +425,4 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
-.action_btn {
-  float: right;
-  margin: -35px 15px;
-  font-size: 14px;
-}
-.add {
-	color: #0b58ff;
-}
 </style>

src/views/base/materialProductBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:09:44
+ * @LastEditTime: 2023-11-06 20:04:03
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="产品BOM编码" prop="code">
-								<el-input v-model="dataForm.code" :disabled="isdetail" placeholder="请输入产品Bom编码" />
+								<el-input v-model="dataForm.code" disabled placeholder="请输入产品Bom编码" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -154,11 +154,11 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
+				<el-button style="" @click="goback()">取消</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button v-if="isdetail" type="primary" @click="goEdit()">
 					编辑
-				</el-button> -->
+				</el-button>
-				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
+				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
 		</div>
 
@@ -304,16 +304,15 @@ export default {
 				}
 				return row.materialId === item.id
 			})
-			if (tempM[0].unit) {
+			this.unitList.filter(u => {
-				this.unitList.filter(u => {
+				if (tempM[0].unit === u.value) {
-					if (tempM[0].unit === u.value) {
+					row.unit = u.value
-						row.unit = u.value
+					row.mUnit = u.label
-						row.mUnit = u.label
+				}
-					}
+			})
-				})
-			}
 			// row.materialCode = tempList[0].code
 			// row.unit = tempList[0].unit
+			console.log('row', row)
 		},
 		edit(row) {
 			row.isEdit = true

src/views/base/materialProductBom/index.vue

@@ -151,7 +151,7 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-					this.listQuery.productName = val.name ? val.name : undefined;
+					this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
 				case 'reset':

src/views/base/materialUseLog/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:40:08
+ * @LastEditTime: 2023-11-06 19:27:57
  * @Description:
 -->
 <template>
@@ -151,7 +151,7 @@ export default {
 				equipmentId: undefined,
         userName: undefined,
 				userNames: [],
-				useTime: new Date().getTime(),
+				useTime: undefined,
         address: undefined,
 				num: 0,
 				source: undefined,

src/views/base/materialUseLog/index.vue

@@ -130,7 +130,7 @@ export default {
           type: 'datePicker',
           label: '使用时间段',
           dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           rangeSeparator: '-',
           startPlaceholder: '开始时间',

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:40:59
+ * @LastEditTime: 2023-11-07 19:28:18
  * @Description:
 -->
 <template>
@@ -77,7 +77,7 @@ const tableProps = [
   {
     prop: 'printStatus',
     label: '打印状态',
-    filter: (val) => val == 1 ? '未打印' : '已打印',
+    // subcomponent: unitDict,
   },
 	{
     prop: 'createTime',
@@ -96,11 +96,7 @@ export default {
 				exportURL: exportPackingExcel,
 			},
 			tableProps,
-      tableBtn: [
+			tableBtn: [
-        {
-          type: 'print',
-          btnName: '打印',
-        },
         this.$auth.hasPermi(`base:packaging-print-log:update`)
 					? {
 							type: 'edit',
@@ -113,6 +109,10 @@ export default {
 							btnName: '删除',
 					  }
           : undefined,
+        {
+          type: 'print',
+          btnName: '打印',
+        },
 			].filter((v) => v),
 			tableData: [],
       formConfig: [

src/views/base/packagingPrintModel/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:40:07
+ * @LastEditTime: 2023-11-01 10:28:29
  * @Description:
 -->
 <template>
@@ -33,11 +33,6 @@ import {
 } from '@/api/base/printModel';
 
 const tableProps = [
-  {
-    prop: 'createTime',
-    label: '创建时间',
-    filter: parseTime
-  },
 	{
     prop: 'name',
     label: '模板名称'
@@ -69,11 +64,7 @@ export default {
 			},
       tableProps,
       modelShow:false,
-      tableBtn: [
+			tableBtn: [
-        {
-          type: 'print',
-          btnName: '查看',
-        },
         this.$auth.hasPermi(`base:packaging-print-model:update`)
 					? {
 							type: 'edit',
@@ -86,6 +77,10 @@ export default {
 							btnName: '删除',
 					  }
           : undefined,
+        {
+          type: 'print',
+          btnName: '查看',
+        },
 			].filter((v) => v),
 			tableData: [],
 			formConfig: [

src/views/base/packagingPrintType/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:36:33
+ * @LastEditTime: 2023-10-18 16:11:22
  * @Description:
 -->
 <template>
@@ -107,12 +107,12 @@ export default {
         //   valueFormat: 'yyyy-MM-dd',
         //   param: 'createTime',
 				// },
-				// {
+				{
-				// 	type: 'button',
+					type: 'button',
-				// 	btnName: '搜索',
+					btnName: '搜索',
-				// 	name: 'search',
+					name: 'search',
-				// 	color: 'primary',
+					color: 'primary',
-				// },
+				},
 				// {
 				// 	type: 'separate',
 				// },
@@ -125,7 +125,7 @@ export default {
 					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:packaging-print-type:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',

src/views/delivery/deliveryLog/components/deliveryLogDetail.vue

@@ -69,7 +69,7 @@ const tableProps = [
     prop: 'createTime',
     label: '添加时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'deliveryCarCode',
@@ -81,7 +81,7 @@ const tableProps = [
     prop: 'loadTime',
     label: '装车时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'productName',

src/views/delivery/deliveryLog/index.vue

@@ -78,7 +78,7 @@ const tableProps = [
     prop: 'deliveryTime',
     label: '发货时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'code',

src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue

@@ -122,7 +122,7 @@ const tableProps = [
     prop: 'deliveryTime',
     label: '发货时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'code',
@@ -151,7 +151,7 @@ const tableProps2 = [
     prop: 'createTime',
     label: '添加时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'deliveryCarCode',
@@ -162,7 +162,7 @@ const tableProps2 = [
     prop: 'loadTime',
     label: '装车时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'productName',

src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue

@@ -39,12 +39,14 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="12">
+      <el-col :span="24">
         <el-form-item label="是否采集" prop="collection">
           <el-switch v-model="form.collection"></el-switch>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+    </el-row>
+    <el-row>
+      <el-col :span="24">
         <el-form-item label="描述" prop="description">
           <el-input v-model="form.description"></el-input>
         </el-form-item>

src/views/energy/base/energyPlcConnect/index.vue

@@ -37,7 +37,6 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-      width='30%'
     >
       <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
     </base-dialog>

src/views/energy/base/energyType/components/InnerTable.vue

@@ -9,7 +9,7 @@
         width="120">
       </el-table-column>
     </el-table>
-    <span v-if='singlePrice'><span class='priceTitle'>单价(元): </span>{{ singlePrice.toFixed(2) }}</span>
+    <span v-if='singlePrice'><span class='priceTitle'>单价(元): </span>{{ singlePrice }}</span>
     <el-button
       slot="reference"
       type="text"
@@ -32,8 +32,7 @@ const temp1 = [
   },
   {
     prop: 'price',
-    label: '单价(元)',
+    label: '单价(元)'
-    align: 'right'
   }
 ]
 const temp2 = [
@@ -47,8 +46,7 @@ const temp2 = [
   },
   {
     prop: 'price',
-    label: '单价(元)',
+    label: '单价(元)'
-    align: 'right'
   }
 ]
 export default {
@@ -80,20 +78,12 @@ export default {
           console.log(res)
           if (res.data.pricingMethod === 0) {
             this.tableProps = this.temp1
+            this.tableData = res.data.segPriceList
             this.singlePrice = ''
-            let arr1 = res.data.segPriceList
-            for (let item of arr1) {
-              item.price = item.price.toFixed(2)
-            }
-            this.tableData = arr1
           } else if (res.data.pricingMethod === 1) {
             this.tableProps = this.temp2
+            this.tableData = res.data.usedPriceList
             this.singlePrice = ''
-            let arr2 = res.data.usedPriceList
-            for (let item of arr2) {
-              item.price = item.price.toFixed(2)
-            }
-            this.tableData = arr2
           } else {
             this.tableProps = []
             this.tableData = []

src/views/energy/base/energyType/components/energyTypeAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+  <el-form ref="form" :rules="rules" label-width="80px" :model="form">
     <el-row>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="name">

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -27,18 +27,6 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="12">
-        <el-form-item label="指标类型" prop="limitType">
-          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span="12">
         <el-form-item label="监控模式" prop="type">
           <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
@@ -47,14 +35,6 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="消耗量阈值">
-          <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 50%;"></el-input-number>
-          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 50%;"></el-input-number>
-        </el-form-item>
-      </el-col>
       <el-col :span="12">
         <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
           <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
@@ -68,6 +48,26 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="指标类型" prop="limitType">
+          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="消耗量阈值">
+          <el-input-number v-model="form.minValue" placeholder="最小值" :max="10000000000000000" style="width: 50%;"></el-input-number>
+          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="10000000000000000" style="width: 50%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 <script>

src/views/energy/monitoring/energyLimit/index.vue

@@ -37,7 +37,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-      width='50%'
+      width='60%'
     >
       <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
     </base-dialog>

src/views/energy/monitoring/energyReport/index.vue

@@ -40,13 +40,13 @@ const tableProps = [
     prop: 'startTime',
     label: '开始时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'endTime',
     label: '结束时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'statisticName',

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -70,7 +70,7 @@ export default {
         },
         {
           type: 'datePicker',
-          label: '时间',
+          label: '时间(必填)',
           dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: "timestamp",
@@ -80,8 +80,7 @@ export default {
           param: 'timeVal',
           defaultSelect: [],
           width: 350,
-          clearable: false,
+          clearable: false
-          required:true
         },
         {
           type: 'button',

src/views/energy/monitoring/orderEnergy/index.vue

@@ -172,11 +172,11 @@ export default {
         this.$modal.msgWarning('工单不能为空')
         return false
       }
-      if (!val.energyTypeId) {
+      if (!val.objType) {
         this.$modal.msgWarning('能源类型不能为空')
         return false
       }
-      if (!val.objType) {
+      if (!val.energyTypeId) {
         this.$modal.msgWarning('对象维度不能为空')
         return false
       }

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -61,7 +61,7 @@
 					rows: drawerBaseInfoRows,
 				},
 				{
-					name: '采集参数',
+					name: '属性列表',
 					key: 'attrs',
 					props: drawerListProps,
 					url: '/base/equipment-plc-param/page',
@@ -75,26 +75,18 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						{
+						this.$auth.hasPermi('equipment:collection-config-param:update')
-							type: 'edit',
+							? {
-							btnName: '修改',
+									type: 'edit',
-						},
+									btnName: '修改',
-						{
+							  }
-							type: 'delete',
+							: undefined,
-							btnName: '删除',
+						this.$auth.hasPermi('equipment:collection-config-param:delete')
-						},
+							? {
-						// this.$auth.hasPermi('equipment:collection-config-param:update')
+									type: 'delete',
-						// 	? {
+									btnName: '删除',
-						// 			type: 'edit',
+							  }
-						// 			btnName: '修改',
+							: undefined,
-						// 	  }
-						// 	: undefined,
-						// this.$auth.hasPermi('equipment:collection-config-param:delete')
-						// 	? {
-						// 			type: 'delete',
-						// 			btnName: '删除',
-						// 	  }
-						// 	: undefined,
 					].filter((v) => v),
 					allowAdd: true,
 				},
@@ -114,6 +106,7 @@ import {
 	getEquipmentPlcConnectPage,
 	exportEquipmentPlcConnectExcel,
 } from '@/api/base/equipmentPlcConnect';
+import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 // import './http';
 import BasicDrawer from './components/BasicDrawer.vue';
@@ -189,15 +182,13 @@ export default {
 					placeholder: '请选择设备',
 					param: 'equipmentId',
 					selectOptions: [],
-					filterable: true
 				},
 				{
 					type: 'select',
-					label: '关联表编码',
+					label: '编码',
-					placeholder: '请选择关联表编码',
+					placeholder: '请选择编码',
 					param: 'plcId',
 					selectOptions: [],
-					filterable: true
 				},
 				{
 					type: 'button',
@@ -233,9 +224,7 @@ export default {
 						prop: 'plcId',
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
-						rules: [
+						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
-							{ required: true, message: '关联表名不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -247,9 +236,7 @@ export default {
 						label: '设备',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [
+						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -275,9 +262,7 @@ export default {
 						input: true,
 						label: '设备名',
 						prop: 'equipmentName',
-						rules: [
+						rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
-							{ required: true, message: '设备名不能为空', trigger: 'blur' },
-						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -311,8 +296,7 @@ export default {
 					label: '生产参数类型',
 					filter: (val) =>
 						val != null
-							// ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
-							? ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
 							: '-',
 				},
 				{

src/views/equipment/base/config/DataCollection/TableConfig.vue

@@ -59,6 +59,7 @@ import {
 	getEquipmentPlcPage,
 	exportEquipmentPlcExcel,
 } from '@/api/base/equipmentPlc';
+import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 const switchBtn = {
@@ -351,7 +352,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该配置?')
+				.confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?')
 				.then(function () {
 					return deleteEquipmentPlc(id);
 				})

src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue

@@ -194,17 +194,13 @@ export default {
 						input: true,
 						label: '参数列名',
 						prop: 'plcParamName',
-						rules: [
+						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
-							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
-						],
 					},
 					{
 						input: true,
 						label: '参数名称',
 						prop: 'name',
-						rules: [
+						rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
-							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
-						],
 					},
 				],
 				[
@@ -234,35 +230,19 @@ export default {
 							{ label: '工艺参数', value: 2 },
 							{ label: '报警参数', value: 3 },
 						],
-						rules: [
+						rules: [{ required: true, message: '设备参数类型不能为空', trigger: 'blur' }],
-							{
-								required: true,
-								message: '设备参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
 					},
 					{
 						select: true,
 						label: '生产参数类型',
 						prop: 'production_param_type',
 						options: [
-							// { label: '进片数量', value: 1 },
+							{ label: '进片数量', value: 1 },
-							// { label: '出片数量', value: 2 },
+							{ label: '出片数量', value: 2 },
-							// { label: '破损数量', value: 3 },
+							{ label: '破损数量', value: 3 },
-							// { label: '无类型', value: 4 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-							{ label: '损耗计数', value: 3 },
 							{ label: '无类型', value: 4 },
 						],
-						rules: [
+						rules: [{ required: true, message: '生产参数类型不能为空', trigger: 'blur' }],
-							{
-								required: true,
-								message: '生产参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
 					},
 				],
 				[
@@ -325,7 +305,6 @@ export default {
 			infoQuery: null, // 基本信息的请求
 			attrFormSubmitting: false,
 			attrListLoading: false,
-			shouldRefreshPageView: false,
 		};
 	},
 	computed: {
@@ -344,12 +323,10 @@ export default {
 			});
 		},
 		tableBtn() {
-			return this.sections[1].tableBtn;
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-			// return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
 		},
 	},
 	mounted() {
-		this.shouldRefreshPageView = false;
 		this.mode = this.defaultMode || 'detail';
 		for (const section of this.sections) {
 			// 请求具体信息
@@ -426,9 +403,6 @@ export default {
 		},
 
 		handleCancel() {
-			if (this.shouldRefreshPageView) {
-				this.$emit('refreshDataList');
-			}
 			this.visible = false;
 		},
 
@@ -452,7 +426,7 @@ export default {
 				remark: '',
 				alarmContent: '',
 			};
-			this.attrTitle = '添加参数绑定信息';
+			this.attrTitle = '添加设备绑定信息';
 			this.attrFormVisible = true;
 		},
 
@@ -465,14 +439,14 @@ export default {
 			});
 			if (res.code == 0) {
 				this.attrForm = res.data;
-				this.attrTitle = '编辑参数绑定信息';
+				this.attrTitle = '编辑设备绑定信息';
 				this.attrFormVisible = true;
 			}
 		},
 
 		// 删除属性
 		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该参数?', '提示', {
+			this.$confirm('确定删除该分组报警?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -484,7 +458,6 @@ export default {
 						params: { id: attrId },
 					});
 					if (res.code == 0) {
-						this.shouldRefreshPageView = true;
 						this.$message({
 							message: '删除成功',
 							type: 'success',
@@ -499,37 +472,35 @@ export default {
 		},
 
 		// 提交属性表
-		submitAttrForm() {
+		async submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
+			this.$refs['attrForm'].validate((valid) => {
 				if (!valid) {
 					return;
 				}
+			});
+			const isEdit = this.attrForm.id != null;
+			this.attrFormSubmitting = true;
+			const res = await this.$axios({
+				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+				method: isEdit ? 'put' : 'post',
+				data: {
+					...this.attrForm,
+					connectId: this.infoData.id,
+				},
+			});
 
-				const isEdit = this.attrForm.id != null;
+			if (res.code == 0) {
-				this.attrFormSubmitting = true;
+				this.closeAttrForm();
-				const res = await this.$axios({
+				this.$message({
-					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+					message: `${isEdit ? '更新' : '创建'}成功`,
-					method: isEdit ? 'put' : 'post',
+					type: 'success',
-					data: {
+					duration: 1500,
-						...this.attrForm,
+					onClose: () => {
-						connectId: this.infoData.id,
+						this.getAttrList();
 					},
 				});
-
+			}
-				if (res.code == 0) {
+			this.attrFormSubmitting = false;
-					this.closeAttrForm();
-					this.$message({
-						message: `${isEdit ? '更新' : '创建'}成功`,
-						type: 'success',
-						duration: 1500,
-						onClose: () => {
-							this.getAttrList();
-							this.shouldRefreshPageView = true;
-						},
-					});
-				}
-				this.attrFormSubmitting = false;
-			});
 		},
 
 		closeAttrForm() {
@@ -538,7 +509,7 @@ export default {
 
 		handleClick(raw) {
 			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该参数?`, '提示', {
+				this.$confirm(`确定删除该报警?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning',

src/views/equipment/base/inspection/Content/index.vue

@@ -52,7 +52,6 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
-import { deleteCheck } from "@/api/equipment/base/inspection/settings";
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -164,12 +163,7 @@ export default {
 				content: null,
 			},
 			// 表单参数
-			form: {
+			form: {},
-				code: '',
-				program: '',
-				id: undefined,
-				content: ''
-			},
 			basePath: '/base/equipment-check',
 			mode: null,
 		};
@@ -230,7 +224,7 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			// this.reset();
+			this.reset();
 			this.open = true;
 			this.title = '添加巡检内容';
 		},
@@ -271,10 +265,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除巡检项目名称为"' + row.program + '"的数据项?')
+				.confirm('是否确认删除记录"' + row.name + '"?')
 				.then(function () {
-					// return this.delete({ id });
+					return this.delete({ id });
-					return deleteCheck(id)
 				})
 				.then(() => {
 					this.getList();

src/views/equipment/base/inspection/Settings/index.vue

@@ -103,7 +103,8 @@ export default {
 				{ prop: 'equipmentName', label: '设备' },
 				{ prop: 'responsible', label: '负责人' },
 				{ prop: 'equipmentCode', label: '描述' },
-				{ prop: 'checkNumber', label: '巡检条数' } // TODO: 操作 选项，四个，群里询问
+				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{

src/views/equipment/base/maintain/Monitor/index.vue

@@ -51,7 +51,6 @@
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 
 const remainBox = {
 	name: 'RemainBox',
@@ -125,7 +124,7 @@ export default {
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'maintenancePeriod', label: '保养频率' },
+				{ prop: 'maintainDuration', label: '保养频率' },
 				{
 					prop: 'maintainType',
 					label: '保养类型',
@@ -196,24 +195,6 @@ export default {
 		this.getList();
 	},
 	methods: {
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备保养监控数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportMaintainMonitorExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备保养监控.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => { });
-		},
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(

src/views/equipment/base/maintain/PlanConfig/index.vue

@@ -50,7 +50,6 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'
 
 export default {
 	name: 'PlanConfig',
@@ -89,7 +88,7 @@ export default {
 				},
 				{ prop: 'name', label: '计划名称' },
 				{ prop: 'code', label: '计划编号' },
-				{ prop: 'enabled', label: '启用状态', filter: (val) => ['停用', '启用'][val] },
+				{ prop: 'enabled', label: '启用状态' },
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备名称' },
@@ -221,7 +220,6 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
-						rules: [{ required: true, message: '保养频率不能为空', trigger: 'blur' }],
 					},
 				],
 				[{ input: true, label: '备注', prop: 'remark' }],
@@ -346,9 +344,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除计划名称为"' + row.name + '"的数据项?')
+				.confirm('是否确认删除设备类型"' + row.name + '"?')
 				.then(function () {
-					return deleteEqMaintainPlan(id);
+					return this.del(id);
 				})
 				.then(() => {
 					this.getList();

src/views/equipment/base/maintain/Record/index.vue

@@ -440,7 +440,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否删除设备名称为"' + row.equipmentName + '"的数据项?')
+				.confirm(
+					'是否删除设备保养单号为"' + row.maintainOrderNumber + '"的数据项?'
+				)
 				.then(function () {
 					return deleteEqMaintainLog(id);
 				})

src/views/equipment/base/repair/index.vue

@@ -112,7 +112,7 @@ export default {
 				{
 					prop: 'maintenanceStatus',
 					label: '维修状态',
-					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
+					filter: (v) => (v != null ? ['未完成', '完成'][v] : ''),
 				},
 				{ prop: 'maintenanceDuration', label: '维修时长(h)' },
 				{ prop: 'lineName', label: '产线' },
@@ -138,23 +138,8 @@ export default {
 					selectOptions: [
 						{ name: '未完成', id: '0' },
 						{ name: '完成', id: '1' },
-						{ name: '进行中', id: '2' },
 					],
 				},
-				// 时间段
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					// valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'createTime'
-				},
 				{
 					type: 'button',
 					btnName: '查询',

src/views/equipment/base/spareParts/List/index.vue

@@ -52,7 +52,6 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
-import { deleteSparePart } from '@/api/equipment/base/spare-parts/list'
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -132,7 +131,6 @@ export default {
 						input: true,
 						label: '备件名称',
 						prop: 'name',
-						rules: [{ required: true, message: '备件名称不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -315,9 +313,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除备件名称为"' + row.name + '"的数据项?')
+				.confirm('是否确认删除记录"' + row.name + '"?')
 				.then(function () {
-					return deleteSparePart(id);
+					return this.delete({ id });
 				})
 				.then(() => {
 					this.getList();

src/views/equipment/timing-diagram/output/index.vue

@@ -482,7 +482,7 @@ export default {
 
 		async submitForm() {
 			const { code, data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/quantity-series',
+				url: '/analysis/equipment-analysis/quantity',
 				method: 'get',
 				params: this.queryParams,
 			});

src/views/equipment/timing-diagram/status/index.vue

@@ -6,29 +6,19 @@
 -->
 
 <template>
-	<div
+	<div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		class="status-timegraph-container"
+		<el-row class="" style="
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row
-			class=""
-			style="
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px 16px 0;
 				border-radius: 8px;
 			">
 			<div class="blue-title">生产节拍时序图</div>
-			<SearchBar
+			<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" :remove-blue="true"
-				:formConfigs="searchBarFormConfig"
+				@select-changed="handleSearchBarSelectChange" @headBtnClick="handleSearchBarBtnClick" />
-				ref="search-bar"
-				:remove-blue="true"
-				@select-changed="handleSearchBarSelectChange"
-				@headBtnClick="handleSearchBarBtnClick" />
 		</el-row>
 
-		<el-row
+		<el-row class="" style="
-			class=""
-			style="
 				height: 1px;
 				flex: 1;
 				margin-bottom: 12px;
@@ -57,36 +47,17 @@
 					</div>
 				</el-col>
 			</el-row>
-			<div
+			<div class="main-area" style="flex: 1; display: flex; flex-direction: column">
-				class="main-area"
+				<div class="graphs" v-show="graphList.length" id="status-chart" style="height: 1px; flex: 1"></div>
-				style="flex: 1; display: flex; flex-direction: column">
-				<div
-					class="graphs"
-					v-show="graphList.length"
-					id="status-chart"
-					style="height: 1px; flex: 1"></div>
 				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
 			</div>
 		</el-row>
 
 		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
+		<base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
-			dialogTitle="添加设备"
-			:dialogVisible="open"
-			width="500px"
-			@close="open = false"
-			@cancel="open = false"
 			@confirm="submitForm">
-			<el-select
+			<el-select v-if="open" style="width: 100%" v-model="queryParams.equipmentId" placeholder="请选择一个设备">
-				v-if="open"
+				<el-option v-for="eq in eqList" :key="eq.id" :value="eq.id" :label="eq.name"></el-option>
-				style="width: 100%"
-				v-model="queryParams.equipmentId"
-				placeholder="请选择一个设备">
-				<el-option
-					v-for="eq in eqList"
-					:key="eq.id"
-					:value="eq.id"
-					:label="eq.name"></el-option>
 			</el-select>
 		</base-dialog>
 	</div>
@@ -158,7 +129,7 @@ export default {
 			open: false,
 			eqList: [],
 			startTime: null,
-			gantt: null,
+			gantt: null
 			// demo: [
 			// 	[
 			// 		{
@@ -188,7 +159,7 @@ export default {
 		this.initEquipment();
 		// this.getList();
 	},
-	mounted() {},
+	mounted() { },
 	watch: {
 		graphList: {
 			handler(val) {
@@ -200,6 +171,7 @@ export default {
 							return;
 						}
 						this.gantt.update(val);
+
 					});
 				}
 				return;
@@ -243,9 +215,7 @@ export default {
 				params: this.queryParams,
 			});
 			if (code == 0) {
-				this.existingEquipments = Object.values(data).map(
+				this.existingEquipments = Object.values(data).map((eq) => eq[0].equipmentId);
-					(eq) => eq[0].equipmentId
-				);
 				this.graphList = this.objectToArray(data);
 			}
 		},
@@ -332,26 +302,26 @@ export default {
 						return;
 					}
 
-					this.startTime = new Date(payload.recordTime);
+					this.startTime = new Date(payload.recordTime)
 					this.queryParams.lineId = payload.lineId || null;
 					this.queryParams.sectionId = payload.sectionId || null;
 					this.queryParams.equipmentId = payload.equipmentId || null;
 					this.queryParams.recordTime = payload.recordTime
 						? [
-								payload.recordTime,
+							payload.recordTime,
-								new Date(
+							new Date(
-									new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
+								new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
-								)
+							)
-									.toLocaleDateString()
+								.toLocaleDateString()
-									.split('/')
+								.split('/')
-									.map((value, index) => {
+								.map((value, index) => {
-										if (index == 1 || index == 2) {
+									if (index == 1 || index == 2) {
-											return value.padStart(2, '0');
+										return value.padStart(2, '0');
-										}
+									}
-										return value;
+									return value;
-									})
+								})
-									.join('-') + ' 00:00:00',
+								.join('-') + ' 00:00:00',
-						  ]
+						]
 						: null;
 					this.getList();
 					break;
@@ -367,7 +337,7 @@ export default {
 				return;
 			}
 			const { code, data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/status-series',
+				url: '/analysis/equipment-analysis/status',
 				method: 'get',
 				params: this.queryParams,
 			});
@@ -474,7 +444,7 @@ export default {
 }
 
 .running {
-	background-color: #288aff;
+	background-color: #288AFF;
 	// background-color: #84f04e;
 }
 
@@ -485,7 +455,7 @@ export default {
 
 .fault {
 	// background-color: #ea5b5b;
-	background-color: #fc9c91;
+	background-color: #FC9C91;
 }
 
 .full {
@@ -499,7 +469,7 @@ export default {
 }
 
 .stop {
-	background-color: #ffdc94;
+	background-color: #FFDC94;
 }
 
 .legend-row {
@@ -508,7 +478,7 @@ export default {
 	display: flex;
 	justify-content: flex-end;
 
-	> .legend:not(:last-child) {
+	>.legend:not(:last-child) {
 		margin-right: 12px;
 	}
 
@@ -551,7 +521,7 @@ export default {
 	background: #ccc;
 }
 
-.echarts__status-chart > div {
+.echarts__status-chart>div {
 	height: 100% !important;
 	width: 100% !important;
 }

src/views/extend/processEquMaterialBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 16:50:55
+ * @LastEditTime: 2023-11-10 16:26:08
  * @Description:
 -->
 <template>
@@ -100,8 +100,7 @@ import {
   updateProcessEquMaterialBom,
   getEquipmentList,
   processEquMaterialBomDetPage,
-  deleteProcessEquMaterialBomDet,
+  deleteProcessEquMaterialBomDet
-  getMaterialCode
 } from '@/api/extend/processEquMaterialBom';
 import SmallTitle from './SmallTitle';
 import { parseTime } from '../../core/mixins/code-filter';
@@ -198,6 +197,7 @@ export default {
 		};
 	},
   mounted() {
+    this.getDict()
   },
   methods: {
     getCode(val) {
@@ -223,9 +223,6 @@ export default {
         // console.log(response);
         this.equipmentList = res.data
       })
-      getMaterialCode().then(res => {
-        this.dataForm.code = res.data
-      })
     },
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@@ -270,8 +267,7 @@ export default {
 			});
 		},
 		init(id, isdetail) {
-      this.initData()
+			this.initData();
-      this.getDict()
 			this.isdetail = isdetail || false;
 			this.dataForm.id = id || undefined;
 			this.visible = true;

src/views/extend/processEquMaterialBom/attr-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-11-23 14:27:59
+ * @LastEditTime: 2023-11-09 14:11:02
  * @LastEditors: zhp
  * @Description:
 -->
@@ -18,16 +18,13 @@
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
       @keyup.enter.native="dataFormSubmit()">
       <el-form-item label="物料名称" prop="materialId">
-        <el-select v-model="dataForm.materialId" filterable placeholder="请选择物料名称" multiple>
+        <el-select v-model="dataForm.materialId" filterable placeholder="请选择物料名称">
           <el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="数量" prop="num">
         <el-input v-model="dataForm.num" placeholder="请输入数量" clearable />
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="请输入备注" clearable />
-      </el-form-item>
     </el-form>
 
     <el-row style="text-align: right">
@@ -40,7 +37,7 @@
 <script>
 import {
   getProcessEquMaterialBomDet,
-  createProcessEquMaterialBomDetList,
+  createProcessEquMaterialBomDet,
   updateProcessEquMaterialBomDet,
   getMaterialList
 } from '@/api/extend/processEquMaterialBom';
@@ -59,13 +56,11 @@ export default {
 			dataForm: {
 				id: undefined,
         bomId: undefined,
-        materialId:[],
+        materialId:null,
         num: undefined,
-        remark:undefined
 			},
 			dataRule: {
-        materialId: [{ required: true, message: '名称不能为空', trigger: 'change' }],
+				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-        num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
 			},
 		};
   },
@@ -84,11 +79,8 @@ export default {
           getProcessEquMaterialBomDet({
 						id: this.dataForm.id
 					}).then((res) => {
-            this.dataForm = res.data
+            this.dataForm = res.data;
-            const arr = []
+            // this.dataForm.materialId = materialId;
-            arr.push(res.data.materialId)
-            this.dataForm.materialId =arr
-            console.log(this.dataForm.materialId);
 						// this.dataForm.value = value;
 					});
 				}
@@ -105,16 +97,10 @@ export default {
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
-          if (this.dataForm.id) {
+					if (this.dataForm.id) {
-            const dataObj = {
-              materialId: this.dataForm.materialId.toString(),
-              bomId: this.dataForm.bomId,
-              num: this.dataForm.num,
-              id: this.dataForm.id,
-              remark: this.dataForm.remark
-            }
 						updateProcessEquMaterialBomDet({
-              ...dataObj
+							...this.dataForm,
+							productId: this.productId,
 						}).then((response) => {
 							this.$modal.msgSuccess('修改成功');
 							this.visible = false;
@@ -122,16 +108,11 @@ export default {
 						});
 						return;
 					}
-          // 添加的提交
+					// 添加的提交
-          const dataArr = this.dataForm.materialId.map(ele => {
+					createProcessEquMaterialBomDet({
-            return {
+						...this.dataForm,
-              materialId: ele,
+						productId: this.productId,
-              bomId: this.dataForm.bomId,
+					}).then((response) => {
-              num: this.dataForm.num,
-              remark: this.dataForm.remark
-            }
-          });
-          createProcessEquMaterialBomDetList(dataArr).then((response) => {
 						this.$modal.msgSuccess('新增成功');
 						this.visible = false;
 						this.$emit('refreshDataList');

src/views/extend/processEquValueBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-23 09:20:12
+ * @LastEditTime: 2023-11-09 14:49:16
  * @Description:
 -->
 <template>
@@ -53,7 +53,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="isdetail" class="drawer-body__footer">
+      <div class="drawer-body__footer">
         <el-button style="" @click="goback()">取消</el-button>
         <el-button v-if="isdetail" type="primary" @click="goEdit()">
           编辑
@@ -63,7 +63,7 @@
 
       <div class="attr-list" v-if="idAttrShow">
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-          设备参数
+          设备物料明细
         </small-title>
 
         <div v-if="!isdetail" class="action_btn">
@@ -100,8 +100,7 @@ import {
   updateProcessEquValueBom,
   getEquipmentList,
   processEquValueBomDetPage,
-  deleteProcessEquValueBomDet,
+  deleteProcessEquValueBomDet
-  getValueCode
 } from '@/api/extend/processEquValueBom';
 import SmallTitle from './SmallTitle';
 import { parseTime } from '../../core/mixins/code-filter';
@@ -209,6 +208,7 @@ export default {
 		};
 	},
   mounted() {
+    this.getDict()
   },
   methods: {
     getCode(val) {
@@ -234,9 +234,6 @@ export default {
         // console.log(response);
         this.equipmentList = res.data
       })
-      getValueCode().then(res => {
-        this.dataForm.code = res.data
-      })
     },
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@@ -280,9 +277,8 @@ export default {
 				this.listQuery.total = response.data.total;
 			});
 		},
-    init(id, isdetail) {
+		init(id, isdetail) {
-      this.getDict()
+      this.initData();
-      this.initData()
       console.log(isdetail);
 			this.isdetail = isdetail || false;
 			this.dataForm.id = id || undefined;

src/views/extend/processEquValueBom/attr-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-11-23 14:26:54
+ * @LastEditTime: 2023-11-09 14:44:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -18,19 +18,19 @@
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
       @keyup.enter.native="dataFormSubmit()">
       <el-form-item label="参数名称" prop="paramId">
-        <el-select v-model="dataForm.paramId" filterable placeholder="参数名称" @change="getData" multiple >
+        <el-select v-model="dataForm.paramId" filterable placeholder="参数名称" @change="getData">
           <el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" />
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="参数编码" prop="code">
         <el-input v-model="dataForm.code" placeholder="请输入参数编码" clearable />
       </el-form-item> -->
-      <!-- <el-form-item label="标准最小值" prop="standardMinValue">
+      <el-form-item label="标准最小值" prop="standardMinValue">
         <el-input v-model="dataForm.standardMinValue" placeholder="请输入标准最小值" clearable />
       </el-form-item>
       <el-form-item label="标准最大值" prop="standardMaxValue">
         <el-input v-model="dataForm.standardMaxValue" placeholder="请输入标准最大值" clearable />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="工艺最小值" prop="minValue">
         <el-input v-model="dataForm.minValue" placeholder="请输入工艺最小值" clearable />
       </el-form-item>
@@ -55,7 +55,7 @@
 <script>
 import {
   getProcessEquValueBomDet,
-  createProcessEquValueBomDetList,
+  createProcessEquValueBomDet,
   updateProcessEquValueBomDet,
   getValueList
 } from '@/api/extend/processEquValueBom';
@@ -74,7 +74,7 @@ export default {
 			dataForm: {
 				id: undefined,
         bomId: undefined,
-        paramId:[],
+        paramId:undefined,
         minValue:undefined,
         maxValue: undefined,
         defaultValue: undefined,
@@ -117,10 +117,6 @@ export default {
 						id: this.dataForm.id
 					}).then((res) => {
             this.dataForm = res.data;
-            const arr = []
-            arr.push(res.data.paramId)
-            this.dataForm.paramId = arr
-            console.log(this.dataForm.paramId);
             // this.dataForm.materialId = materialId;
 						// this.dataForm.value = value;
 					});
@@ -141,41 +137,22 @@ export default {
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
-          if (this.dataForm.id) {
+					if (this.dataForm.id) {
-            const dataObj = {
-              paramId: this.dataForm.paramId.toString(),
-              bomId: this.dataForm.bomId,
-              minValue: this.dataForm.minValue,
-              maxValue: this.dataForm.maxValue,
-              defaultValue: this.dataForm.defaultValue,
-              standardMinValue: this.dataForm.standardMinValue,
-              standardMaxValue: this.dataForm.standardMaxValue,
-              remark: this.dataForm.remark,
-              id: this.dataForm.id
-            }
 						updateProcessEquValueBomDet({
-              ...dataObj,
+							...this.dataForm,
+							productId: this.productId,
 						}).then((response) => {
 							this.$modal.msgSuccess('修改成功');
 							this.visible = false;
 							this.$emit('refreshDataList');
 						});
 						return;
-          }
+					}
-          const dataArr = this.dataForm.paramId.map(ele => {
-            return {
-              paramId: ele,
-              bomId: this.dataForm.bomId,
-              minValue: this.dataForm.minValue,
-              maxValue: this.dataForm.maxValue,
-              defaultValue: this.dataForm.defaultValue,
-              standardMinValue: this.dataForm.standardMinValue,
-              standardMaxValue: this.dataForm.standardMaxValue,
-              remark: this.dataForm.remark
-            }
-          });
 					// 添加的提交
-          createProcessEquValueBomDetList(dataArr).then((response) => {
+					createProcessEquValueBomDet({
+						...this.dataForm,
+						productId: this.productId,
+					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
 						this.visible = false;
 						this.$emit('refreshDataList');

src/views/extend/processTraceability/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:23:40
+ * @LastEditTime: 2023-11-10 10:23:33
  * @Description:
 -->
 <template>
@@ -70,7 +70,7 @@ const tableProps = [
   },
   {
     prop: 'yield',
-    label: '合格率'
+    label: '成品率'
   }
 ];
 
@@ -115,19 +115,19 @@ export default {
           valueField: 'id',
           param: 'orderName'
         },
-        {
+        // {
-          type: 'datePicker',
+        //   type: 'datePicker',
-          label: '工单开始时间',
+        //   label: '时间段',
-          dateType: 'daterange',
+        //   dateType: 'daterange',
-          format: 'yyyy-MM-dd',
+        //   format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
+        //   valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
+        //   rangeSeparator: '-',
-          startPlaceholder: '开始时间',
+        //   startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
+        //   endPlaceholder: '结束时间',
-          param: 'timeVal',
+        //   param: 'timeVal',
-          defaultSelect: [],
+        //   defaultSelect: [],
-          width: 250
+        //   width: 250
-        },
+        // },
         {
           type: 'button',
           btnName: '搜索',
@@ -238,13 +238,13 @@ export default {
       if (val.btnName === 'search') {
         this.listQuery.orderName = val.orderName ? val.orderName :undefined
         // this.queryParams.status = val.status
-        if (val.timeVal && val.timeVal.length != 0 ) {
+        // if (val.timeVal && val.timeVal.length != 0 ) {
-        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
+        // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
+        // this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
-        } else {
+        // } else {
-          this.listQuery.startTime = undefined
+        //   this.listQuery.startTime = undefined
-          this.listQuery.endTime = undefined
+        //   this.listQuery.endTime = undefined
-        }
+        // }
         this.getList()
       } else {
         // this.handleExport()

src/views/group/base/groupTeam/index.vue

@@ -58,7 +58,7 @@ const tableProps = [
     prop: 'createTime',
     label: '创建时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'name',

src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue

@@ -2,16 +2,14 @@
   <div>
     <el-drawer title="查看详情" :visible.sync="visible" size="70%">
       <div class="box">
-        <el-row class="topBox">
+        <el-form :inline="true">
-          <el-col :span="6">
+          <el-form-item label="工单名称">
-            <p class="boldTitle">工单名称</p>
+            <el-input v-model="queryParams.workOrderName" size='small' readonly></el-input>
-            <p class="lightText">{{ queryParams.workOrderName ? queryParams.workOrderName : '-' }}</p>
+          </el-form-item>
-          </el-col>
+          <el-form-item label="班组名称">
-          <el-col :span="6">
+            <el-input v-model="queryParams.teamName" size='small' readonly></el-input>
-            <p class="boldTitle">班组名称</p>
+          </el-form-item>
-            <p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>
+        </el-form>
-          </el-col>
-        </el-row>
         <base-table
           :table-props="tableProps"
           :table-data="tableData"
@@ -29,13 +27,13 @@ const tableProps = [
     prop: 'startTime',
     label: '开始时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'endTime',
     label: '结束时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'num',
@@ -51,15 +49,17 @@ export default {
   data() {
     return {
       visible: false,
+      workOrderName: '',
+      teamName: '',
       tableProps,
       tableData: [],
-      tableH: this.tableHeight(260),
+      tableH: this.tableHeight(200),
       queryParams: {}
     }
   },
   created() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
+      this.tableH = this.tableHeight(200)
     })
   },
   methods: {
@@ -79,23 +79,5 @@ export default {
 <style lang="scss" scoped>
 .box {
   padding: 0 32px;
-  .topBox {
-    padding-bottom: 30px;
-    margin-bottom: 30px;
-    border-bottom: 1px solid #E9E9E9;
-    .boldTitle {
-      font-size: 14px;
-      font-weight: 600;
-      color: rgba(0,0,0,0.85);
-      margin: 0;
-      margin-bottom: 10px;
-    }
-    .lightText {
-      font-size: 14px;
-      font-weight: 400;
-      color: rgba(102,102,102,0.75);
-      margin: 0;
-    }
-  }
 }
 </style>

src/views/group/monitoring/groupTeamView/index.vue

@@ -59,8 +59,7 @@ export default {
           label: '工单',
           selectOptions: [],
           param: 'workOrderId',
-          clearable: false,
+          clearable: false
-          filterable: true
         },
         {
           type: 'button',

src/views/group/monitoring/teamProduction/index.vue

@@ -17,7 +17,7 @@
       <method-btn
         v-if="tableBtn.length"
         slot="handleBtn"
-        :width="80"
+        :width="160"
         label="操作"
         :method-list="tableBtn"
         @clickBtn="handleClick"
@@ -42,7 +42,7 @@ const tableProps = [
     prop: 'createTime',
     label: '排班创建时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'startDay',
@@ -53,13 +53,13 @@ const tableProps = [
     prop: 'startTime',
     label: '上班时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'endTime',
     label: '下班时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'classesName',
@@ -120,8 +120,8 @@ export default {
       tableBtn: [
       this.$auth.hasPermi('base:team-production:detail')
           ? {
-              type: 'detail',
+              type: 'viewDetail',
-              btnName: '详情'
+              btnName: '查看生产情况'
             }
           : undefined
       ].filter((v) => v),

src/views/login.vue

@@ -71,11 +71,29 @@
 						<img
 							src="../assets/logo/cnbm.png"
 							alt="cnbm_logo"
-							style=""
+							style="
-							class="cnbm_logo" />
+								height: 48px;
+								width: 48px;
+								position: relative;
+								top: 12px;
+								right: 8px;
+							" />
 						<span>中建材智能自动化研究院有限公司</span>
 					</h3>
-					<h3 class="sub-title" style="">MES</h3>
+					<h3
+						class="sub-title"
+						style="
+							margin: 0;
+							margin-left: 32px;
+							font-weight: 400;
+							user-select: none;
+							color: #000;
+							font-size: 36px;
+							line-height: 54px;
+							letter-spacing: 2px;
+						">
+						MES
+					</h3>
 				</h2>
 
 				<!-- 表单 -->
@@ -175,9 +193,9 @@
 												style="
 													cursor: pointer;
 													color: #0b58ff;
-													font-size: calc(12 * 0.12vh);
+													font-size: 18px;
-													line-height: calc(54 * 0.12vh);
+													line-height: 66px;
-													padding-right: calc(10 * 0.12vh);
+													padding-right: 12px;
 												">
 												获取验证码
 											</span>
@@ -197,11 +215,7 @@
 									:loading="loading"
 									size="medium"
 									type="primary"
-									style="
+									style="width: 100%; height: 66px; font-size: 18px"
-										width: 100%;
-										height: calc(52 * 0.12vh);
-										font-size: calc(14 * 0.12vh);
-									"
 									@click.native.prevent="getCode">
 									<span v-if="!loading">登 录</span>
 									<span v-else>登 录 中...</span>
@@ -335,7 +349,7 @@ export default {
 		};
 	},
 	created() {
-		// document.body.style['min-height'] = '1024px';
+		document.body.style['min-height'] = '1024px';
 		// 租户开关
 		this.tenantEnable = getTenantEnable();
 		if (this.tenantEnable) {

src/views/order/base/orderManage/index.vue

@@ -65,7 +65,7 @@ const tableProps = [
     prop: 'createTime',
     label: '添加时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'name',
@@ -101,12 +101,12 @@ const tableProps = [
   {
     prop: 'planQuantity',
     label: '计划加工量',
-    width: 100
+    width: 90
   },
   {
     prop: 'actualQuantity',
     label: '实际加工量',
-    width: 100
+    width: 90
   },
   {
     prop: 'productName',
@@ -341,7 +341,6 @@ export default {
                     item.customerId = i.name
                   }
                 }
-                item.price = item.price.toFixed(2)
               })
               this.list = arr
             }

src/views/order/base/orderManage/orderDetailData.vue

@@ -5,7 +5,6 @@
         <span class="blueTitle"></span>
         <span>订单编码: {{orderMsg.code}}</span>
       </div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage">返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='3'>
@@ -134,7 +133,7 @@ const tableProps1 = [
     prop: 'issueTime',
     label: '下发时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'name',
@@ -148,19 +147,19 @@ const tableProps1 = [
     minWidth: 150
   },
   {
-    prop: 'planAssignmentQuantity',
+    prop: 'planQuantity',
     label: '计划加工量',
-    width: 100
+    width: 90
   },
   {
     prop: 'actualQuantity',
     label: '实际加工量',
-    width: 100
+    width: 90
   },
   {
     prop: 'actualArea',
     label: '加工平方数',
-    width: 100
+    width: 90
   },
   {
     prop: 'status',
@@ -171,13 +170,13 @@ const tableProps1 = [
     prop: 'startProduceTime',
     label: '开始时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'finishProduceTime',
     label: '结束时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'productLineNames',
@@ -279,10 +278,6 @@ export default {
           }
         })
       })
-    },
-    // 返回
-    returnOrderManage() {
-      this.$router.push({path: '/order/base/order-manage'})
     }
   }
 }

src/views/order/monitoring/components/monitoringRingCharts.vue

@@ -1,168 +0,0 @@
-<template>
-  <div>
-    <div class="boxTitle">
-      <span class="blueTitle"></span>
-      <span>各订单环形图</span>
-    </div>
-    <div class="chartBox" id='orderChartBox' v-show='chartList.length'>
-      <div class="chartItem" v-for="(item, index) in chartList" :key='index' :style="{width: 388*beilv+'px',height: 286*beilv+'px',padding:14*beilv+'px',marginRight:9*beilv+'px',marginBottom:9*beilv+'px'}">
-        <div class="topTitle" :style="{fontSize: 14 * beilv + 'px'}">
-          <svg-icon icon-class="order-monitoring" :style="{fontSize: 16*beilv+'px'}"/>
-          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderName}}</span>
-          <span>订单计划数量{{item.num}}</span>
-        </div>
-        <div
-          :id="item.id"
-          :style="{width: 166*beilv+'px',height: 166*beilv+'px',margin: 'auto'}"
-        ></div>
-        <div class="legend" :style="{height: 54 * beilv + 'px', marginTop: 10*beilv+'px'}">
-          <div class="legendItem" v-for="(subItem, i) in item.workOrder" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
-            <span class="itemNum" :style="{fontSize: 18 * beilv + 'px'}">{{subItem.value}}</span>
-            <div>
-              <span class="itemName" :style="{fontSize: 14 * beilv + 'px'}">
-                <span class="smallBlock" :style="{backgroundColor:subItem.color,width:8*beilv+'px',height:8*beilv+'px'}"></span>
-                {{subItem.name}}
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 空图 -->
-    <div class="no-data-bg" v-show='!chartList.length'></div>
-  </div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import { debounce } from '@/utils/debounce'
-export default {
-  name: 'MonitoringRingCharts',
-  props: {
-    chartList: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      myChart: [],
-      beilv: 1,
-      canvasReset: ''
-    }
-  },
-  mounted() {
-    this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
-    this.canvasReset = debounce(() => {
-      this.initChart()
-    }, 500)
-    window.addEventListener('resize', () => {
-      this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
-      this.canvasReset()
-    })
-  },
-  methods: {
-    // 饼图
-    initChart() {
-      if (this.chartList.length <= 0) {
-        return false
-      }
-      // 销毁实例
-      for (let j = 0;j < this.chartList.length; j++) {
-        if (this.myChart[j]) {
-          this.myChart[j].dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-        }
-      }
-      for (let i = 0; i < this.chartList.length; i++) {
-        var chartDom = document.getElementById(this.chartList[i].id);
-        this.myChart[i] = echarts.init(chartDom);
-        let colorList = []
-        this.chartList[i].workOrder.map(item => {
-          colorList.push(item.color)
-        })
-        let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
-        var option = {
-          color: colorList,
-          series: [
-            {
-              name: 'Access From',
-              type: 'pie',
-              radius: ['75%', '95%'],
-              avoidLabelOverlap: false,
-              itemStyle: {
-                borderRadius: 5,
-                borderColor: '#fff',
-                borderWidth: 2
-              },
-              label: {
-                show: true,
-                position: 'center',
-                color: '#000',
-                formatter: [
-                    '{a|'+percentage+'%}',
-                    '{b|生产'+this.chartList[i].sunNum+'}'
-                ].join('\n\n'),
-                rich: {
-                  a: {
-                      fontSize: this.beilv*24 +'px'
-                  },
-                  b: {
-                      fontSize: this.beilv*12 +'px'
-                  }
-                }
-              },
-              emphasis: {
-                disabled: true
-              },
-              labelLine: {
-                show: false
-              },
-              data: this.chartList[i].workOrder
-            }
-          ]
-        };
-        option && this.myChart[i].setOption(option)
-      }
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.chartBox {
-  width: 100%;
-  padding-right: 6px;
-  height: calc(100vh - 310px);
-  display: flex;
-  flex-flow: row wrap;
-  overflow: auto;
-  align-content: flex-start;
-  .chartItem {
-    border-radius: 8px;
-    border: 1px solid #CACACA;
-    .topTitle {
-      margin-bottom: 10px;
-      .orderName {
-        border-right: 1px solid #CACACA;
-      }
-    }
-    .legend {
-      text-align: center;
-      white-space: nowrap;
-      overflow: auto;
-      .legendItem {
-        display: inline-block;
-        border-right: 1px solid #E8E8E8;
-        .itemName {
-          .smallBlock {
-            display: inline-block;
-          }
-        }
-      }
-      .legendItem:last-child {
-        border: none;
-      }
-    }
-  }
-}
-</style>

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -6,45 +6,59 @@
       ref="searchBarForm"
       @headBtnClick="buttonClick"
     />
-    <el-tabs v-model="activeName" @tab-click="toggleTab">
+    <base-table
-      <el-tab-pane label="数据列表" name="dataList"></el-tab-pane>
+      :page="1"
-      <el-tab-pane label="环形图" name="barChart"></el-tab-pane>
+      :limit="5000"
-    </el-tabs>
+      :table-props="tableProps"
-    <!-- 表 -->
+      :table-data="list"
-    <div v-if="activeName === 'dataList'">
+      :max-height="tableH"
-      <base-table
+    >
-        :page="queryParams.pageNo"
+      <method-btn
-        :limit="queryParams.pageSize"
+        v-if="tableBtn.length"
-        :table-props="tableProps"
+        slot="handleBtn"
-        :table-data="list"
+        :width="250"
-        :max-height="tableH"
+        label="操作"
-      >
+        :method-list="tableBtn"
-        <method-btn
+        @clickBtn="handleClick"
-          v-if="tableBtn.length"
-          slot="handleBtn"
-          :width="250"
-          label="操作"
-          :method-list="tableBtn"
-          @clickBtn="handleClick"
-        />
-      </base-table>
-      <pagination
-        :page.sync="queryParams.pageNo"
-        :limit.sync="queryParams.pageSize"
-        :total="total"
-        @pagination="getPage"
       />
-    </div>
+    </base-table>
-    <!-- 图 -->
+    <!-- <el-tabs v-model="activeName" @tab-click="toggleTab">
-    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
+      <el-tab-pane label="数据列表" name="dataList">
+        <base-table
+          :page="queryParams.pageNo"
+          :limit="queryParams.pageSize"
+          :table-props="tableProps"
+          :table-data="list"
+          :max-height="tableH"
+        >
+          <method-btn
+            v-if="tableBtn.length"
+            slot="handleBtn"
+            :width="250"
+            label="操作"
+            :method-list="tableBtn"
+            @clickBtn="handleClick"
+          />
+        </base-table>
+      </el-tab-pane>
+      <el-tab-pane label="环形图" name="barChart">
+        <div class="boxTitle">
+          <span class="blueTitle"></span>
+          <span>各订单环形图</span>
+        </div>
+        <div 
+          id="orderPieBar"
+          style="width: 182px; height: 180px;"
+        ></div>
+      </el-tab-pane>
+    </el-tabs> -->
   </div>
 </template>
 <script>
+import * as echarts from 'echarts'
 import { parseTime } from '@/utils/ruoyi'
 import { publicFormatter } from '@/utils/dict'
-import { orderMonitor, orderAssignmentList } from '@/api/base/orderManage'
+import { orderMonitor, orderList } from '@/api/base/orderManage'
-import MonitoringRingCharts from './../components/monitoringRingCharts'
-import moment from "moment"
 const tableProps = [
   {
     prop: 'name',
@@ -62,13 +76,13 @@ const tableProps = [
     prop: 'planStartTime',
     label: '计划开始时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'planFinishTime',
     label: '计划完成时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'status',
@@ -79,13 +93,13 @@ const tableProps = [
     prop: 'startProduceTime',
     label: '实际开始时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'finishProduceTime',
     label: '实际完成时间',
     filter: parseTime,
-    minWidth: 160
+    minWidth: 150
   },
   {
     prop: 'productLines',
@@ -111,7 +125,7 @@ const tableProps = [
   {
     prop: 'workOrderNum',
     label: '关联工单数量',
-    width: 110
+    width: 100
   }
 ]
 export default {
@@ -120,8 +134,9 @@ export default {
     return {
       formConfig: [
         {
-          type: 'input',
+          type: 'select',
           label: '订单名称',
+          selectOptions: [],
           param: 'name'
         },
         {
@@ -147,14 +162,15 @@ export default {
       activeName: 'dataList',
       // 查询参数
       queryParams: {
-        pageNo: 1,
+        // pageNo: 1,
-        pageSize: 20,
+        // pageSize: 5000,
         name: null,
         startProduceTime: []
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(315),
+      // tableH: this.tableHeight(270),
+      tableH: this.tableHeight(230),
       total: 0,
       tableBtn: [
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@@ -175,79 +191,149 @@ export default {
               btnName: '发货详情'
             }
           : undefined
-      ].filter((v) => v),
+      ].filter((v) => v)
-      chartList: []
     }
   },
-  components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(315)
+      // this.tableH = this.tableHeight(270)
+      this.tableH = this.tableHeight(230)
     })
-    let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
+    this.getOrderList()
-    let end = moment().format('yyyy-MM-DD')
-    this.formConfig[1].defaultSelect = [start, end]
-    this.queryParams.startProduceTime[0] = start + ' 00:00:00'
-    this.queryParams.startProduceTime[1] = end + ' 23:59:59'
     this.getPage()
   },
   methods: {
-    getPage() {
+    getOrderList() {
-      // 表数据
+      orderList({}).then(res => {
-      orderMonitor({...this.queryParams}).then(res => {
+        this.formConfig[0].selectOptions = res.data || []
-        this.list = res.data.records || []
-        this.total = res.data.total || 0
-        if (this.list.length > 0) {
-          let orderIdList = []
-          this.list.map(item => {
-            orderIdList.push(item.orderid)
-          })
-          // 图的数据
-          orderAssignmentList({orderIdList:orderIdList}).then(res => {
-            let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
-            let tempArr = res.data || {}
-            let tempArr2 = []
-            for (let key in tempArr) {
-              let tempArr3 = []
-              let obj = {}
-              obj.orderName = tempArr[key][0].orderName
-              obj.id = key
-              obj.num = tempArr[key][0].planQuantity
-              let sunNum = 0
-              for (let i = 0; i < tempArr[key].length; i++) {
-                let subObj = {}
-                subObj.value = tempArr[key][i].actualAssignmentQuantity
-                subObj.name = tempArr[key][i].woName
-                if (i < 5) {
-                  subObj.color = color[i]
-                } else {
-                  subObj.color = color[i%5]
-                }
-                sunNum+=tempArr[key][i].actualAssignmentQuantity
-                tempArr3.push(subObj)
-              }
-              tempArr3.push({
-                value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
-                name: '未下发',
-                color: '#F5F5F5'
-              })
-              obj.sunNum = sunNum
-              obj.workOrder = tempArr3
-              tempArr2.push(obj)
-            }
-            this.chartList = tempArr2
-            if (this.activeName === 'barChart' && this.chartList.length > 0) {
-              this.$nextTick(() => {
-                this.$refs.monitoringRingCharts.initChart()
-              })
-            }
-          })
-        }else{
-          // 显示无数据的图片
-          this.chartList = []
-        }
       })
     },
+    getPage() {
+      orderMonitor({...this.queryParams}).then(res => {
+        this.list = res.data || []
+        // this.getPieChart()
+      })
+    },
+    // 饼图
+    getPieChart() {
+      var chartDom = document.getElementById('orderPieBar');
+      var myChart = echarts.init(chartDom);
+      var option = {
+        color:['#288AFF','#7164FF','#fff','#63BDFF','#8EF0AB','#FFCE6A'],
+        series: [
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: ['92%', '100%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: true,
+              position: 'center'
+            },
+            emphasis: {
+              disabled: true,
+              scale:false,
+              scaleSize: 0
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 1000, name: '1' }
+            ]
+          },
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: ['84%', '92%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              disabled: true,
+              scale:false,
+              scaleSize: 0
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 50 ,name: '2' },
+              { value: 500, name: 'xxx' }
+            ]
+          },
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: ['76%', '84%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              disabled: true,
+              scale:false,
+              scaleSize: 0
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 250, name: '3' },
+              { value: 750, name: 'xxx' }
+            ]
+          },
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: ['68%', '76%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              disabled: true,
+              scale:false,
+              scaleSize: 0
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 800, name: '4' },
+              { value: 1048, name: 'xxx' }
+            ]
+          },
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: ['60%', '68%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              disabled: true,
+              scale:false,
+              scaleSize: 0
+            },
+            labelLine: {
+              show: false
+            },
+            data: [
+              { value: 800, name: '5' },
+              { value: 1048, name: 'xxx' }
+            ]
+          }
+        ]
+      }
+      option && myChart.setOption(option)
+    },
     // 查询
     buttonClick(val) {
       this.queryParams.name = val.name
@@ -279,10 +365,8 @@ export default {
         }
     },
     toggleTab() {
-      if (this.activeName === 'barChart' && this.chartList.length > 0) {
+      if (this.activeName === 'barChart') {
-        this.$nextTick(() => {
+        this.getPieChart()
-          this.$refs.monitoringRingCharts.initChart()
-        })
       }
     }
 }
@@ -298,6 +382,7 @@ export default {
     width: 100%;
     height: 2px;
     background-color: #e4e7ed;
+    /* z-index: 1; */
   }
   .el-tabs__nav-wrap::after {
     width: 0;
@@ -319,7 +404,7 @@ export default {
     font-size: 16px;
     font-weight: 400;
     color: #000000;
-    margin:0 10px 16px 0;
+    margin:0 10px 20px 0;
   }
   .blueTitle {
     content: '';