班组&能源基础

.env.dev

@@ -9,13 +9,11 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/base/customer.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// 获得所有客户列表
+export function getCustomerList() {
+  return request({
+    url: '/base/core-customer/listAll',
+    method: 'get'
+  })
+}

src/api/base/factory.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 获得工厂产线工段设备树形结构
 export function getTree() {
   return request({
-    url: '/base/factory/getTree',
+    url: '/base/core-factory/getTree',
     method: 'get'
   })
 }

src/api/base/groupTeam.js

@@ -58,3 +58,49 @@ export function listEnabled() {
     method: 'get'
   })
 }
+
+// 获得班组组员信息分页
+export function groupTeamPage(query) {
+  return request({
+    url: '/base/group-team-det/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得班组组员信息
+export function groupTeamDet(query) {
+  return request({
+    url: '/base/group-team-det/get',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 创建班组组员信息
+export function teamDetCreate(data) {
+  return request({
+    url: '/base/group-team-det/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新班组组员信息
+export function teamDetUpdate(data) {
+  return request({
+    url: '/base/group-team-det/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除班组组员信息
+export function teamDetDelete(query) {
+  return request({
+    url: '/base/group-team-det/delete',
+    method: 'delete',
+    params: query
+  })
+}

src/api/base/groupTeamScheduling.js

@@ -25,4 +25,13 @@ export function autoSet(query) {
     method: 'get',
     params: query
   })
+}
+
+// 获得排班信息分页 建议size 150
+export function groupTeamSchedulingPage(query) {
+  return request({
+    url: '/base/group-team-scheduling/page',
+    method: 'get',
+    params: query
+  })
 }

src/api/base/orderManage.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+// 条件获得订单列表
+export function orderList(query) {
+  return request({
+    url: '/base/order/listbyfilter',
+    method: 'get',
+    params: query
+  })
+}
+
+// 条件获得工单列表
+export function workOrderList(query) {
+  return request({
+    url: '/base/core-work-order/listbyfilter',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得订单分页
+export function getOrderPage(query) {
+  return request({
+    url: '/base/order/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取订单code
+export function getOrderCode() {
+  return request({
+    url: '/base/order/getOrderCode',
+    method: 'get'
+  })
+}
+
+// 获得订单
+export function getOrderById(query) {
+  return request({
+    url: '/base/order/get',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/product.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// 获得产品列表
+export function getProductAll() {
+  return request({
+    url: '/base/core-product/listAll',
+    method: 'get'
+  })
+}

src/api/base/productionLine.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 获得所有工厂产线列表
 export function getLineAll() {
   return request({
-    url: '/base/production-line/listAll',
+    url: '/base/core-production-line/listAll',
     method: 'get'
   })
 }

src/api/base/workOrder.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// 获得工单列表
+export function workOrderList() {
+  return request({
+    url: '/base/core-work-order/listbyfilter',
+    method: 'get'
+  })
+}

src/api/base/worker.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+// 获得所有员工列表
+export function getWorkerList() {
+  return request({
+    url: '/base/core-worker/listAll',
+    method: 'get'
+  })
+}
+
+// 获得员工
+export function getWorker(query) {
+  return request({
+    url: '/base/core-worker/get',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/workshopSection.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 获得所有产线工段列表
 export function getWorkShopAll() {
   return request({
-    url: '/base/workshop-section/listAll',
+    url: '/base/core-workshop-section/listAll',
     method: 'get'
   })
 }

src/api/monitoring/groupTeamView.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+// 执行班组追溯 根据工单
+export function getByWorkOrder(query) {
+  return request({
+    url: '/monitoring/schedulingmonitoring/getByWorkOrder',
+    method: 'get',
+    params: query
+  })
+}
+
+// 执行班组追溯详情 根据工单班组
+export function getByTeam(query) {
+  return request({
+    url: '/monitoring/schedulingmonitoring/getByTeam',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取某次排班的生产情况详情
+export function getByScheduling(query) {
+  return request({
+    url: '/monitoring/schedulingmonitoring/getByScheduling',
+    method: 'get',
+    params: query
+  })
+}

src/api/monitoring/orderEnergy.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+// 获取工单信息
+export function getWorkOrderMsg(data) {
+  return request({
+    url: '/monitoring/energy-work-order/getWorkOrderMsg',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取工单能源消耗数据
+export function getOrderEnergyData(data) {
+  return request({
+    url: '/monitoring/energy-work-order/getData',
+    method: 'post',
+    data: data
+  })
+}
+

src/assets/icons/svg/icon-upload.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>上传</title>
-    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.65">
-        <g id="上传_Resources/Button" transform="translate(-12.000000, -9.000000)">
-            <g id="上传" transform="translate(12.000000, 9.000000)">
-                <g id="upload" transform="translate(0.875000, 0.875000)" fill="currentColor" fill-rule="nonzero">
-                    <path d="M5.80371094,0.138085937 C5.8953125,0.046484375 6.01699219,0 6.13867188,0 C6.26035156,0 6.38066406,0.046484375 6.47363281,0.138085937 L8.60371094,2.26953125 C8.78828125,2.45410156 8.78828125,2.75351562 8.60371094,2.93808594 C8.51484375,3.02695312 8.39589844,3.07617188 8.27011719,3.07617188 C8.14433594,3.07617188 8.02539062,3.02695312 7.93652344,2.93808594 L6.61171875,1.61328125 L6.61171875,9.51289062 C6.61171875,9.77402344 6.39980469,9.9859375 6.13867188,9.9859375 C5.87753906,9.9859375 5.665625,9.77402344 5.665625,9.51289062 L5.665625,1.61328125 L4.34082031,2.93808594 C4.15625,3.12265625 3.85683594,3.12265625 3.67363281,2.93808594 C3.4890625,2.75351562 3.4890625,2.45410156 3.67226563,2.26953125 L5.80371094,0.138085937 Z M11.7769531,7.88046875 C11.5158203,7.88046875 11.3039063,8.09238281 11.3039063,8.35351563 L11.3039063,11.025 C11.3039063,11.1794922 11.178125,11.3066406 11.0222656,11.3066406 L1.22636719,11.3066406 C1.071875,11.3066406 0.944726562,11.1808594 0.944726562,11.025 L0.944726562,8.35214844 C0.944726562,8.09101563 0.7328125,7.87910156 0.471679688,7.87910156 C0.210546875,7.87910156 0,8.09238281 0,8.35214844 L0,11.3996094 C0,11.8685547 0.381445313,12.2486328 0.849023437,12.2486328 L11.4009766,12.2486328 C11.8699219,12.2486328 12.25,11.8671875 12.25,11.3996094 L12.25,8.35214844 C12.25,8.09238281 12.0380859,7.88046875 11.7769531,7.88046875 Z" id="Shape"></path>
-                </g>
-                <rect id="Rectangle-49" x="0" y="0" width="14" height="14"></rect>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/styles/login.scss

@@ -1,13 +1,10 @@
 /* ===== PC DESIGN ===== */
-$W: 1080;
+$W: 1000;
 $H: 1920;
-// $picW: 438;
-// $picH: 560;
-$picW: 1080;
-$picH: 1118;
-$formW: 420;
+$picW: 438;
+$picH: 560;
+$formW: 320;
 $tabW: $formW / 2;
-// $rowH: 56;
 $rowH: 56;
 $buttonH: 50;
 
@@ -18,7 +15,6 @@ $containerBgImage: '../assets/images/bg.png';
 $logoWidth: 417px;
 $logoHeight: 64px;
 $logoImage: '../assets/logo/login-logo.png';
-$cnbmLogo: '../assets/logo/cnbm.png';
 // container-content
 $contentWidth: round($W / $H * 100) * 1vw;
 $contentHeight: round($picH / $W * 100) / 100 * $contentWidth;
@@ -26,8 +22,7 @@ $contentBgColor: #ffffff;
 // container-content-pic
 $picWidth: round($picW / $H * 100) * 1vw;
 $picHeight: inherit;
-// $picImage: '../assets/images/pic.png';
-$picImage: '../assets/images/login-bg.png';
+$picImage: '../assets/images/pic.png';
 // container-content-field
 $fieldWidth: $contentWidth - $picWidth;
 $fieldHeight: inherit;
@@ -39,311 +34,232 @@ $buttonHeight: $buttonH * 1px;
 
 // - - - - - 页面基础设置
 .container {
-	.login-code {
-		width: 33%;
-		height: 38px;
-		float: right;
-		img {
-			cursor: pointer;
-			width: 100%;
-			max-width: 100px;
-			height: auto;
-			vertical-align: middle;
-		}
-	}
-	// 元素
-	width: inherit;
-	height: inherit;
-	min-width: 1080px;
-	min-height: 620px;
-	background-color: $containerBgColor;
-	// background-image: url($containerBgImage);
-	background-size: cover;
-	// 定位
-	position: relative;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	// 文字
-	font-size: 14px;
-	font-family: Microsoft YaHei;
-	font-weight: 400;
-	.logo {
-		// 元素
-		width: $logoWidth;
-		height: $logoHeight;
-		// background-image: url($logoImage);
-		// background-size: contain;
-		// 定位
-		position: absolute;
-		top: 50px;
-		left: 50%;
-		margin-left: -$logoWidth/2;
-	}
-	.content {
-		// 元素
-		// width: $contentWidth;
-		// height: $contentHeight;
-		width: 100%;
-		height: 100%;
-		background-color: #ffffff;
-		// box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
-		// border-radius: 20px;
-		// 定位
-		position: relative;
-		display: flex;
-
-		.pic {
-			// 元素
-			width: $picWidth;
-			height: $picHeight;
-			background-image: url($picImage);
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			background-position: 0 0;
-			position: relative;
-
-			&::after {
-        content: '';
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 100%;
-				height: 100%;
-        // background: #f003;
-        display: inline-block;
-			}
-		}
-		.field {
-			// background: #ccc3;
-			position: relative;
-			padding-top: 196px;
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			// justify-content: center;
-			align-items: center;
-			.pc-title {
-				width: 100%;
-				text-align: center;
-				clear: both;
-				position: relative;
-				top: -36px;
-
-				// h3.title {
-				// 	position: relative;
-
-				// 	&::before {
-				// 		content: '';
-				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
-				// 		height: 48px;
-				// 		width: 48px;
-				// 		position: absolute;
-				// 		left: 0px;
-				// 		top: 4px;
-				// 		display: inline-block;
-				// 	}
-				// }
-			}
-			.mobile-title,
-			.mobile-switch {
-				display: none;
-			}
-			.form {
-				margin-top: 32px;
-				box-sizing: border-box;
-				// width: $formWidth;
-				width: 100%;
-				// - - - tab
-				:deep(.el-tabs__nav) {
-					// background: #f0f3;
-				}
-				:deep(.el-tabs__content) {
-					padding: 20px 0 0;
-				}
-				:deep(.el-tabs__item) {
-					user-select: none;
-					// 元素
-					width: $tabWidth;
-					height: $rowHeight;
-					padding: 0;
-					// 文字
-					line-height: $rowHeight;
-					color: #666666;
-					font-size: 18px;
-					font-weight: 400;
-					text-align: center;
-				}
-				:deep(.el-tabs__item.is-active) {
-					font-weight: 500;
-					color: #2f53eb;
-				}
-				:deep(.el-tabs__active-bar) {
-					height: 3px;
-					border-radius: 2px;
-				}
-				// - - - input
-				:deep(.el-input__inner) {
-					// 元素
-					width: 100%;
-					height: $rowHeight;
-					background: #f5f5f5;
-					border: 0;
-					border-radius: 28px;
-					// 文字
-					text-align: center;
-					line-height: 19px;
-					color: #262626;
-				}
-				.code:deep(.el-input__inner) {
-					padding: 0 24px;
-					// 文字
-					text-align: left;
-				}
-				:deep(.el-input__inner::-webkit-input-placeholder) {
-					/* WebKit browsers */
-					font-weight: 400;
-					color: #8c8c8c;
-				}
-				:deep(.el-input__inner:-moz-placeholder) {
-					/* Mozilla Firefox 4 to 18 */
-					font-weight: 400;
-					color: #8c8c8c;
-				}
-				:deep(.el-input__inner::-moz-placeholder) {
-					/* Mozilla Firefox 19+ */
-					font-weight: 400;
-					color: #8c8c8c;
-					opacity: 1;
-				}
-				:deep(.el-input__inner:-ms-input-placeholder) {
-					/* Internet Explorer 10+ */
-					font-weight: 400;
-					color: #8c8c8c !important;
-				}
-				:deep(.el-form-item) {
-					position: relative;
-					.button-code {
-						// 元素
-						height: $rowHeight;
-						box-sizing: border-box;
-						// 定位
-						position: absolute;
-						top: 0;
-						right: 20px;
-						z-index: 1;
-						// 文字
-						line-height: 20px;
-						font-size: 14px;
-						font-family: PingFang SC;
-						font-weight: 400;
-						color: #2f53eb;
-						span {
-							padding-left: 15px;
-							border-left: 2px solid #d9d9d9;
-						}
-					}
-				}
-				:deep(.el-form-item__error) {
-					padding-left: 24px;
-				}
-				.button {
-					width: 100%;
-					height: $buttonHeight;
-					background: rgba(24, 144, 255, 0.2);
-					border: 0;
-					border-radius: 24px;
-					margin-bottom: 20px;
-					// 文字
-					line-height: 26px;
-					font-size: 20px;
-					color: #ffffff;
-				}
-				.button-active {
-					background: #2f53eb;
-					box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2);
-				}
-			}
-		}
-	}
-
-	.login-form {
-		* {
-			user-select: none;
-		}
-		// - - - input
-		:deep(.el-input__inner) {
-			// 元素
-			width: 420px;
-			height: 66px;
-			color: #262626;
-			font-size: 18px;
-		}
-		:deep(.el-checkbox__label) {
-			font-size: 18px;
-			line-height: 14px;
-		}
-	}
-
-	.footer {
-		user-select: none;
-		// 元素
-		height: 16px;
-		line-height: 16px;
-		font-size: 12px;
-		color: #8c8c8c;
-		// 定位
-		position: absolute;
-		bottom: 30px;
-		a,
-		a:hover,
-		a:active {
-			color: inherit;
-			text-decoration: none;
-		}
-	}
+  .login-code {
+    width: 33%;
+    height: 38px;
+    float: right;
+    img {
+      cursor: pointer;
+      width:100%;max-width:100px; height:auto;
+      vertical-align: middle;
+    }
+  }
+  // 元素
+  width: inherit;
+  height: inherit;
+  min-width: 1080px;
+  min-height: 620px;
+  background-color: $containerBgColor;
+  background-image: url($containerBgImage);
+  background-size: cover;
+  // 定位
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  // 文字
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  .logo {
+    // 元素
+    width: $logoWidth;
+    height: $logoHeight;
+    // background-image: url($logoImage);
+    // background-size: contain;
+    // 定位
+    position: absolute;
+    top: 50px;
+    left: 50%;
+    margin-left: -$logoWidth/2;
+  }
+  .content {
+    // 元素
+    width: $contentWidth;
+    height: $contentHeight;
+    background-color: #ffffff;
+    box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
+    border-radius: 20px;
+    // 定位
+    position: relative;
+    .pic {
+      // 元素
+      width: $picWidth;
+      height: $picHeight;
+      background-image: url($picImage);
+      background-repeat: no-repeat;
+      background-size: cover;
+      border-radius: 20px 0 0 20px;
+      // 定位
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+    .field {
+      width: $fieldWidth;
+      height: $fieldHeight;
+      // 定位
+      position: absolute;
+      top: 0;
+      left: $picWidth;
+      display:flex;
+      justify-content: center;
+      align-items: center;
+      .pc-title{ width: 100%; clear: both;}
+      .mobile-title,
+      .mobile-switch {
+        display: none;
+      }
+      .form {
+        box-sizing: border-box;
+        width: $formWidth;
+        // - - - tab
+        :deep(.el-tabs__content) {
+          padding: 20px 0 0;
+        }
+        :deep(.el-tabs__item) {
+          // 元素
+          width: $tabWidth;
+          height: $rowHeight;
+          padding: 0;
+          // 文字
+          line-height: $rowHeight;
+          color: #666666;
+        }
+        :deep(.el-tabs__item.is-active) {
+          font-weight: bold;
+          color: #2F53EB;
+        }
+        :deep(.el-tabs__active-bar) {
+          height: 3px;
+          border-radius: 2px;
+        }
+        // - - - input
+        :deep(.el-input__inner) {
+          // 元素
+          width: 100%;
+          height: $rowHeight;
+          background: #f5f5f5;
+          border: 0;
+          border-radius: 28px;
+          // 文字
+          text-align: center;
+          line-height: 19px;
+          color: #262626;
+        }
+        .code:deep(.el-input__inner) {
+          padding: 0 24px;
+          // 文字
+          text-align: left;
+        }
+        :deep(.el-input__inner::-webkit-input-placeholder) { /* WebKit browsers */
+          font-weight: 400;
+          color: #8C8C8C;
+        }
+        :deep(.el-input__inner:-moz-placeholder) { /* Mozilla Firefox 4 to 18 */
+          font-weight: 400;
+          color: #8C8C8C;
+        }
+        :deep(.el-input__inner::-moz-placeholder) { /* Mozilla Firefox 19+ */
+          font-weight: 400;
+          color: #8C8C8C;
+          opacity:1;
+        }
+        :deep(.el-input__inner:-ms-input-placeholder) { /* Internet Explorer 10+ */
+          font-weight: 400;
+          color: #8C8C8C !important;
+        }
+        :deep(.el-form-item) {
+          position: relative;
+          .button-code {
+            // 元素
+            height: $rowHeight;
+            box-sizing: border-box;
+            // 定位
+            position: absolute;
+            top: 0;
+            right: 20px;
+            z-index: 1;
+            // 文字
+            line-height: 20px;
+            font-size: 14px;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #2F53EB;
+            span {
+              padding-left: 15px;
+              border-left: 2px solid #D9D9D9;
+            }
+          }
+        }
+        :deep(.el-form-item__error) {
+          padding-left: 24px;
+        }
+        .button {
+          width: 100%;
+          height: $buttonHeight;
+          background: rgba(24, 144, 255, 0.2);
+          border: 0;
+          border-radius: 24px;
+          margin-bottom: 20px;
+          // 文字
+          line-height: 26px;
+          font-size: 20px;
+          color: #FFFFFF;
+        }
+        .button-active {
+          background: #2F53EB;
+          box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2);
+        }
+      }
+    }
+  }
+  .footer {
+    // 元素
+    height: 16px;
+    line-height: 16px;
+    font-size: 12px;
+    color: #8c8c8c;
+    // 定位
+    position: absolute;
+    bottom: 30px;
+    a,
+    a:hover,
+    a:active {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
 }
 
 // - - - - - PC 最小尺寸设置
 @media screen and (min-width: 599px) and (max-width: 1366px) {
-	.container {
-		min-width: 599px;
-		.content {
-			// width: 710px;
-			// height: 397px;
-			width: 100%;
-			height: 100%;
-			.pic {
-				// width: 314px;
-				display: none;
-			}
-			.field {
-				// width: calc(710px - 314px);
-				// left: 314px;
-				// justify-content: center;
-				width: 100%;
-
-				.pc-title {
-					h3 {
-						font-size: 2.4rem !important;
-					}
-				}
-
-				.form {
-					// width: 320px;
-					:deep(.el-input__inner) {
-						width: 320px;
-						height: 56px;
-					}
-					.button {
-						height: 50px;
-					}
-				}
-			}
-		}
-	}
+  .container {
+    .content {
+      width: 710px;
+      height: 397px;
+      .pic {
+        width: 314px;
+      }
+      .field {
+        width: calc(710px - 314px);
+        left: 314px;
+        .form {
+          width: 320px;
+          :deep(.el-input__inner) {
+            width: 320px;
+            height: 56px;
+          }
+          .button {
+            height: 50px;
+          }
+        }
+      }
+    }
+  }
 }
 
+
 /* ===== MOBILE DESIGN ===== */
 $mobileW: 375;
 $mobileH: 812;
@@ -357,142 +273,115 @@ $mobileButtonH: 48;
 $mobileContainerBgImage: '../assets/images/bg-mobile.png';
 // container-content
 $mobileContentWidth: round($mobileContentW / $mobileW * 100) * 1vw;
-$mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 *
-	$mobileContentWidth;
+$mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 * $mobileContentWidth;
 // container-content-field-form
-$mobileFormWidth: round($mobileFormW / $mobileW * 100) * 1vw;
+$mobileFormWidth: round($mobileFormW / $mobileW *100) * 1vw;
 $mobileRowHeight: $mobileRowH * 1px;
 $mobileButtonHeight: $mobileButtonH * 1px;
 $iconBgImage: '../assets/images/icon.png';
 
 // - - - - - 移动端设置
 @media screen and (max-width: 599px) {
-	.container {
-		// 元素
-		background-image: url($mobileContainerBgImage);
-		min-width: 280px;
-		min-height: 568px;
-		// 文字
-		font-size: 14px;
-		font-family: PingFang SC;
-		font-weight: bold;
-		.logo {
-			display: none;
-		}
+  .container {
+    // 元素
+    background-image: url($mobileContainerBgImage);
+    min-width: 280px;
+    min-height: 568px;
+    // 文字
+    font-size: 17px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    .logo {
+      display: none;
+    }
 
-		.pc-title {
-			display: none;
-		}
-
-		.content {
-			// 元素
-			width: $mobileContentWidth;
-			height: $mobileContentHeight;
-			min-width: 250px;
-			min-height: 340px;
-			// 定位
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			.pic {
-				display: none;
-			}
-			.field {
-        padding: 0;
-				// 元素
-				width: inherit;
-				min-height: inherit;
-				// 定位
-				left: 0;
-				display: flex;
-				flex-direction: column;
-
-				.mobile-title {
-					// 元素
-					margin: 0;
-					display: block;
-				}
-
-				.form {
+    .content {
+      // 元素
+      width: $mobileContentWidth;
+      height: $mobileContentHeight;
+      min-width: 250px;
+      min-height: 340px;
+      // 定位
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .pic {
+        display: none;
+      }
+      .field {
+        // 元素
+        width: inherit;
+        min-height: inherit;
+        // 定位
+        left: 0;
+        display: flex;
+        flex-direction: column;
+        .mobile-title {
+          // 元素
+          margin: 0 0 20px;
+          display: block;
+        }
+        .form {
+          width: $mobileFormWidth;
+          // - - - tab
+          :deep(.el-tabs__header) {
+            display: none;
+          }
+          :deep(.el-tabs__content) {
+            padding: 0;
+          }
+          // - - - input
+          :deep(.el-input__inner) {
+            height: $mobileRowHeight;
+            line-height: 24px;
+            // 文字
+            text-align: center;
+            color: #262626;
+          }
+          :deep(.el-form-item) {
+            .button-code {
+              // 元素
+              height: $mobileRowHeight;
+            }
+          }
+          .button {
+            height: $mobileButtonHeight;
+            line-height: 24px;
+            color: #FFFFFF;
+          }
+        }
+        .mobile-switch {
+          display: block;
+          line-height: 20px;
+          font-size: 14px;
+          font-weight: 400;
+          color: #595959;
           margin: 0;
-					width: $mobileFormWidth;
-					// - - - tab
-					:deep(.el-tabs__header) {
-						display: none;
-					}
-					:deep(.el-tabs__content) {
-						padding: 0;
-					}
-					// - - - input
-					:deep(.el-input__inner) {
-						height: $mobileRowHeight;
-						line-height: 24px;
-						// 文字
-						text-align: center;
-						color: #262626;
-					}
-					:deep(.el-form-item) {
-						.button-code {
-							// 元素
-							height: $mobileRowHeight;
-						}
-					}
-					.button {
-						height: $mobileButtonHeight;
-						line-height: 24px;
-						color: #ffffff;
-					}
-				}
+          .icon {
+            width: 14px;
+            height: 14px;
+            display: inline-block;
+            background-image: url($iconBgImage);
+            background-size: cover;
+          }
+        }
+        .mobile-switch:hover {
+          cursor: pointer;
+        }
+      }
+    }
+    .footer {
+      // 元素
+      font-size: 12px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      line-height: 17px;
+      color: #333333;
+      opacity: 0.6;
+      // 定位
+      position: absolute;
+      bottom: 20px;
+    }
+  }
 
-				.login-form {
-					:deep(.el-input__inner) {
-						height: $mobileRowHeight;
-						line-height: 24px;
-						// 文字
-						text-align: center;
-						color: #262626;
-					}
-
-          :deep(#button-form-item) {
-            margin: 0 !important;
-						button {
-							// 元素
-							height: $mobileRowHeight;
-						}
-					}
-				}
-				.mobile-switch {
-					display: block;
-					line-height: 20px;
-					font-size: 14px;
-					font-weight: 400;
-					color: #595959;
-					margin: 0;
-					.icon {
-						width: 14px;
-						height: 14px;
-						display: inline-block;
-						background-image: url($iconBgImage);
-						background-size: cover;
-					}
-				}
-				.mobile-switch:hover {
-					cursor: pointer;
-				}
-			}
-		}
-
-		.footer {
-			// 元素
-			font-size: 12px;
-			font-family: PingFang SC;
-			font-weight: 400;
-			line-height: 17px;
-			color: #333333;
-			opacity: 0.6;
-			// 定位
-			// position: absolute;
-			bottom: -32px;
-		}
-	}
 }

src/components/DialogForm/index.vue

@@ -83,9 +83,6 @@
 							:on-success="handleUploadSuccess"
 							v-bind="col.bind">
 							<el-button size="mini" :disabled="col.bind?.disabled || false">
-								<svg-icon
-									icon-class="icon-upload"
-									style="color: inherit"></svg-icon>
 								上传文件
 							</el-button>
 							<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
@@ -97,7 +94,6 @@
 							class="file"
 							v-for="file in form[col.prop] || []"
 							:file="file"
-							:key="file.fileUrl"
 							@delete="handleDeleteFile(file)" />
 					</div>
 				</el-form-item>
@@ -136,6 +132,7 @@ const uploadedFile = {
 	},
 	methods: {
 		handleDelete() {
+			console.log('emit delete event')
 			this.$emit('delete', this.file);
 		},
 	},
@@ -190,10 +187,6 @@ export default {
 			type: Boolean,
 			default: false,
 		},
-		hasFile: {
-			type: Boolean,
-			default: false,
-		},
 		labelPosition: {
 			type: String,
 			default: 'right',
@@ -226,6 +219,7 @@ export default {
 	watch: {
 		rows: {
 			handler() {
+				console.log('watch triggered!');
 				this.$nextTick(() => {
 					this.handleOptions('watch');
 				});
@@ -236,9 +230,6 @@ export default {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
-				if (this.hasFile) {
-					this.form.files = this.form.files ?? [];
-				}
 			},
 			deep: true,
 			immediate: true,
@@ -376,9 +367,7 @@ export default {
 		},
 
 		handleDeleteFile(file) {
-			this.form.files = this.form.files.filter(
-				(item) => item.fileUrl != file.fileUrl
-			);
+			this.form.files = this.form.files.filter(item => item.fileUrl != file.fileUrl);
 			this.$emit('update', this.form);
 		},
 	},

src/utils/dict.js

@@ -95,7 +95,12 @@ export const DICT_TYPE = {
   MONITOR_INDEX_TYPE: 'monitor_index_type',
   OBJECT_TYPE: 'object_type',
   STATISTIC_TYPE: 'statistic_type',
-  TIME_DIM: 'time_dim'
+  TIME_DIM: 'time_dim',
+
+  // ============== ORDER - 订单模块 =============
+  ORDER_STATUS: 'order_status',
+  ORDER_ORIGIN: 'order_origin',
+  ORDER_PRIORITY: 'order_priority'
 }
 
 /**

src/views/base/dataBoard/index.vue

@@ -6,9 +6,7 @@
 -->
 
 <template>
-	<div ref="dataBoard" class="data-board">
-		<el-button type="text" @click="goback" class="go-back--btn">返回</el-button>
-	</div>
+	<div ref="dataBoard" class=""></div>
 </template>
 
 <script>
@@ -26,42 +24,39 @@ export default {
 			mainFooter: null, // dom
 		};
 	},
-	// mounted() {
-	// 	this.$nextTick(() => {
-	// 		this.modify();
-	// 	});
-	// },
-	// activated() {
-	// 	this.modify();
-	// },
-	// deactivated() {
-	// 	this.recover();
-	// },
-	// beforeDestroy() {
-	// 	this.recover();
-	// },
+	mounted() {
+		this.$nextTick(() => {
+			this.modify();
+		});
+	},
+	activated() {
+		this.modify();
+	},
+	deactivated() {
+		this.recover();
+	},
+	beforeDestroy() {
+		this.recover();
+	},
 	methods: {
-		// modify() {
-		// 	// 在这个页面临时修改下父类的margin，结束时需还原
-		// 	this.appMain = document.querySelector('.app-main');
-		// 	// this.appMain.style.minHeight = 'calc(100vh - 90px)';
-		// 	this.appMain.style.margin = 0;
-		// 	// 在这个页面临时删除 main-footer 元素，结束时需还原
-		// 	// this.mainFooter = document.querySelector('.main-footer').cloneNode(true);
-		// 	// document.querySelector('.main-footer').remove();
-        //     this.$refs.dataBoard.classList.add('data-board');
-		// },
-		// recover() {
-        //     this.$refs.dataBoard.classList.remove('data-board');
-		// 	this.$nextTick(() => {
-		// 		this.appMain.style.margin = this.parentStyle.margin;
-		// 		// this.appMain.style.minHeight = this.parentStyle.minHeight;
-		// 		// this.appMain.insertAdjacentElement('afterend', this.mainFooter);
-		// 	});
-		// },
-		goback() {
-			this.$router.go(-1);
-		}
+		modify() {
+			// 在这个页面临时修改下父类的margin，结束时需还原
+			this.appMain = document.querySelector('.app-main');
+			// this.appMain.style.minHeight = 'calc(100vh - 90px)';
+			this.appMain.style.margin = 0;
+			// 在这个页面临时删除 main-footer 元素，结束时需还原
+			// this.mainFooter = document.querySelector('.main-footer').cloneNode(true);
+			// document.querySelector('.main-footer').remove();
+            this.$refs.dataBoard.classList.add('data-board');
+		},
+		recover() {
+            this.$refs.dataBoard.classList.remove('data-board');
+			this.$nextTick(() => {
+				this.appMain.style.margin = this.parentStyle.margin;
+				// this.appMain.style.minHeight = this.parentStyle.minHeight;
+				// this.appMain.insertAdjacentElement('afterend', this.mainFooter);
+			});
+		},
 	},
 };
 </script>
@@ -76,25 +71,4 @@ export default {
 	background: url('../../../assets/images/DataBoard.png') 100% 100% / contain
 		no-repeat;
 }
-
-.go-back--btn {
-	position: fixed;
-	top: 28px;
-	left: 24px;
-	color: #fff;
-	font-size: 18px;
-	letter-spacing: 6px;
-
-	&:hover {
-		text-decoration: underline;
-	}
-
-	&::after {
-		content: "\2BAA";
-		position: absolute;
-		top: 6px;
-		right: -26px;
-		font-size: 24px;
-	}
-}
 </style>

src/views/base/equipmentBindGroup/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

src/views/base/equipmentGroup/components/BasicDrawer.vue

@@ -36,7 +36,7 @@
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
-							v-model="form"
+							:dataForm="form"
 							:rows="formRows" />
 					</div>
 

src/views/base/equipmentGroup/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows"/>
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

src/views/base/equipmentPlc/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>

src/views/base/equipmentPlcConnect/components/BasicDrawer.vue

@@ -36,7 +36,7 @@
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
-							v-model="form"
+							:dataForm="form"
 							:rows="formRows" />
 					</div>
 

src/views/base/equipmentPlcConnect/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

src/views/base/equipmentPlcParam/index.vue

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>

src/views/core/base/equipment/components/AssetsUpload.vue

@@ -18,16 +18,9 @@
 				预览
 			</div> -->
 		</section>
-		<section
-			class="file-area"
-			:style="{
-				height: expand ? 'auto' : isPicMode ? '180px' : '152px',
-				gap: isPicMode ? '0 24px' : '24px',
-				gridAutoRows: isPicMode ? '180px' : '152px',
-			}">
+		<section class="file-area">
 			<el-upload
 				class="equipment-upload"
-				:style="{ marginBottom: isPicMode ? '48px' : '24px' }"
 				:disabled="disabled"
 				drag
 				:action="uploadUrl"
@@ -63,6 +56,7 @@
 				v-for="(file, index) in files"
 				:key="file.fileName"
 				:style="{
+					display: index > 3 && !expand ? 'none' : 'block',
 					background: isPicMode
 						? `url(${file.fileUrl}) no-repeat`
 						: `url(${defaultBg}) no-repeat`,
@@ -232,7 +226,7 @@ export default {
 				clearTimeout(this.updateTimer);
 			}
 			this.updateTimer = setTimeout(() => {
-				// console.log('[AssetsUpload] 更新上传列表');
+				console.log('[AssetsUpload] 更新上传列表');
 				this.emitFilelist();
 				clearTimeout(this.updateTimer);
 				this.updateTimer = null;
@@ -320,6 +314,7 @@ export default {
 }
 
 :deep(.equipment-upload) {
+	background: #ccc4;
 	.el-upload-dragger {
 		width: 188px;
 		height: 128px;
@@ -351,10 +346,6 @@ export default {
 	}
 }
 
-.equipment-upload {
-	margin-bottom: 24px;
-}
-
 .file-list {
 	padding: 12px;
 	border: 1px solid #ccc;
@@ -363,14 +354,13 @@ export default {
 // custom
 .file-area {
 	display: grid;
-	grid-template-columns: repeat(auto-fill, 188px);
-	grid-auto-rows: 152px;
-	gap: 48px 24px;
-	overflow: hidden;
+	grid-template-columns: repeat(5, 188px);
+	grid-auto-rows: 128px;
+	gap: 24px 18px;
+	place-content: center;
 }
 
 .file-list__item {
-	height: 128px;
 	background-color: #fff;
 	border: 1px dashed #d9d9d9;
 	border-radius: 6px;

src/views/core/base/equipment/components/EquipmentAssets.vue

@@ -0,0 +1,32 @@
+<!-- 
+    filename: EquipmentAssets.vue
+    author: liubin
+    date: 2023-08-22 11:11:18
+    description: 设备资产
+-->
+
+<template>
+    <div class="equipment-assets"></div>
+</template>
+
+<script>
+export default {
+    name: "EquipmentAssets",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+.equipment-assets {
+    background: #f1f1f1;
+    padding: 12px;
+    min-height: 128px;
+    margin-top: 8px;
+}
+</style>

src/views/core/base/equipment/components/EquipmentPics.vue

@@ -0,0 +1,111 @@
+<!-- 
+    filename: EquipmentPics.vue
+    author: liubin
+    date: 2023-08-18 16:29:39
+    description: 
+-->
+
+<template>
+	<div class="equipment-pics">
+		<div v-for="(url, idx) in images" :key="url">
+			<img :src="url" :alt="url" />
+			<figure class="big-img" :style="inlineStyle">
+				<img :src="url" :alt="url" />
+				<figcaption>{{ desc[idx] }}</figcaption>
+			</figure>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'EquipmentPics',
+	components: {},
+	props: {
+		inlineStyle: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			desc: [
+				'车间设备 - 1',
+				'车间设备 - 2',
+				'车间设备 - 3',
+				'车间设备 - 4',
+				'车间设备 - 5',
+				'车间设备 - 6',
+				'车间设备 - 7',
+				'车间设备 - 8',
+				'车间设备 - 9',
+				'车间设备 - 10',
+				'车间设备 - 11',
+				'车间设备 - 12',
+			],
+			images: Array(10)
+				.fill(1)
+				.map((_, index) => require(`../assets/eq${index + 1}.jpg`)),
+		};
+	},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.equipment-pics {
+	// background: #cfcfcf;
+	padding: 12px;
+	// margin: 8px;
+	display: flex;
+	overflow-x: auto;
+}
+
+.equipment-pics > div {
+	height: 100px;
+	position: relative;
+	cursor: pointer;
+}
+
+.equipment-pics > div:not(:last-child) {
+	margin-right: 12px;
+}
+
+.equipment-pics > div > img {
+	height: 95%;
+}
+
+.equipment-pics > div > figure {
+	display: none;
+	position: fixed;
+	// inset: 0;
+	// margin: auto;
+	top: 0;
+	right: 0;
+	// width: 640px;
+	// height: 480px;
+	background: #000;
+	overflow: hidden;
+	padding: 8px 8px 0;
+}
+
+.equipment-pics > div:hover > figure {
+	margin: 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.equipment-pics > div > figure > img {
+	flex: 1;
+}
+
+.equipment-pics > div > figure > figcaption {
+	height: 24px;
+	margin-top: 8px;
+	font-size: 18px;
+	line-height: 1;
+	color: #fff;
+}
+</style>

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

@@ -44,9 +44,8 @@
 				ref="form"
 				label-position="top"
 				size="small"
-				v-model="form"
-				:rows="computedRows"
-				:has-file="true" />
+				:dataForm="form"
+				:rows="computedRows" />
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
@@ -106,6 +105,9 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { getAccessToken } from '@/utils/auth';
+import EquipmentPics from './components/EquipmentPics';
+import EquipmentAssets from './components/EquipmentAssets';
 import EquipmentDrawer from './components/EquipmentDrawer';
 
 import {
@@ -130,12 +132,6 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermi(`base:equipment:update`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 				this.$auth.hasPermi('base:equipment:update')
 					? {
 							type: 'edit',
@@ -148,6 +144,12 @@ export default {
 							btnName: '删除',
 					  }
 					: undefined,
+				this.$auth.hasPermi(`base:equipment:update`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
 			].filter((v) => v),
 			tableProps: [
 				{
@@ -211,13 +213,6 @@ export default {
 				{
 					type: 'separate',
 				},
-				{
-					type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
-					btnName: '导出',
-					name: 'export',
-					plain: true,
-					color: 'primary',
-				},
 				{
 					type: this.$auth.hasPermi('base:equipment:create') ? 'button' : '',
 					btnName: '新增',
@@ -225,6 +220,12 @@ export default {
 					plain: true,
 					color: 'success',
 				},
+				{
+					type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
 			],
 			rows: [
 				[

src/views/core/base/equipmentType/index.vue

@@ -37,12 +37,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="rows"
-				:has-file="true" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>
@@ -212,6 +207,8 @@ export default {
 				name: undefined,
 				parentId: undefined,
 				remark: undefined,
+				fileNames: [],
+				fileUrls: [],
 			};
 			this.resetForm('form');
 		},

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

@@ -20,9 +20,6 @@
         @change="selectObj"
         clearable></el-cascader>
     </el-form-item>
-    <el-form-item label="对象备注" prop="remark">
-      <el-input v-model="form.remark"/>
-    </el-form-item>
   </el-form>
 </template>
 <script>
@@ -42,8 +39,7 @@ export default {
         id: '',
         plcId: '',
         bindObjectId: '',
-        bindObjectType: '',
-        remark: ''
+        bindObjectType: ''
       },
       objIds: [],// 回显数组
       plcList: [],
@@ -130,7 +126,6 @@ export default {
       this.form.plcId = ''
       this.form.bindObjectId = ''
       this.form.bindObjectType = ''
-      this.form.remark = ''
       this.objIds = []
       this.isEdit = false
     }

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

@@ -61,10 +61,6 @@ const tableProps = [
     prop: 'objCode',
     label: '对象编码'
   },
-  {
-    prop: 'remark',
-    label: '对象备注'
-  },
   {
     prop: 'plcTableName', 
     label: '关联表名'

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

@@ -38,8 +38,8 @@ const tableProps = [
     label: '统计对象'
   },
   {
-    prop: 'objRemark',
-    label: '对象备注'
+    prop: 'objCode',
+    label: '对象编码'
   },
   {
     prop: 'energyTypeName',

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

@@ -55,9 +55,8 @@ const tableProps = [
     label: '监控对象'
   },
   {
-    prop: 'objectType',
-    label: '对象备注',
-    filter: publicFormatter('object_type')
+    prop: 'objCode',
+    label: '对象编码'
   },
   {
     prop: 'energyType',

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

@@ -34,8 +34,8 @@ const tableProps = [
     label: '监控对象'
   },
   {
-    prop: 'objRemark',
-    label: '对象备注'
+    prop: 'objCode',
+    label: '对象编码'
   },
   {
     prop: 'energyType',

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -54,8 +54,8 @@ const tableProps = [
     label: '所属对象'
   },
   {
-    prop: 'objRemark',
-    label: '对象备注'
+    prop: 'objCode',
+    label: '对象编码'
   },
   {
     prop: 'paramName',

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue

@@ -41,8 +41,8 @@ const tableProps = [
     label: '所属对象'
   },
   {
-    prop: 'objRemark',
-    label: '对象备注'
+    prop: 'objCode',
+    label: '对象编码'
   },
   {
     prop: 'paramName',

src/views/energy/monitoring/orderEnergy/components/barChart.vue

@@ -0,0 +1,93 @@
+<template>
+  <div 
+    id="orderEnergyChart"
+    style="width: 100%"
+    :style="{ height: chartHeight + 'px' }"
+  ></div>
+</template>
+<script>
+import * as echarts from 'echarts'
+import resize from '@/utils/chartMixins/resize'
+export default {
+  name: "BarChart",
+  mixins: [resize],
+  data() {
+    return {
+      chartDom: '',
+      chart: '',
+      chartHeight: this.tableHeight(430)
+    }
+  },
+  props: {
+    chartData: {
+      type: Array,
+      required: true,
+      default: () => {
+        return []
+      }
+    }
+  },
+  watch: {
+    chartData: function () {
+      this.getChart()
+    }
+  },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.chartHeight = this.tableHeight(430)
+    })
+  },
+  methods: {
+    getChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+      }
+      this.chartDom = document.getElementById('orderEnergyChart')
+      this.chart = echarts.init(this.chartDom)
+      console.log(this.chartData)
+      let xData = []
+      let yData = []
+      this.chartData && this.chartData.map(item =>{
+        xData.push(item.objName)
+        yData.push(item.useNum)
+      })
+      var option = {
+        color:['#288AFF'],
+        grid: {
+          left: '2%',
+          right: '1%',
+          bottom: '1%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: xData,
+          axisLabel: {
+            rotate: "45"
+          }
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: yData,
+            type: 'bar',
+            barMaxWidth: 20,
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      };
+
+      option && this.chart.setOption(option);
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,269 @@
+<template>
+  <div class="orderEnergyContainer">
+    <div class="box1">
+      <!-- 搜索工作栏 -->
+      <search-bar
+        :formConfigs="formConfig"
+        ref="searchBarForm"
+        @headBtnClick="buttonClick"
+      />
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>工单信息</span>
+      </div>
+      <el-row>
+        <el-col :span='4'>
+          <div class="blodTip">工单名称</div>
+          <div class="lightTip">{{ orderMsg.name }}</div>
+        </el-col>
+        <el-col :span='4'>
+          <div class="blodTip">产品名称</div>
+          <div class="lightTip">{{orderMsg.productName }}</div>
+        </el-col>
+        <el-col :span='4'>
+          <div class="blodTip">计划完成数量</div>
+          <div class="lightTip">{{orderMsg.planQuantity }}</div>
+        </el-col>
+        <el-col :span='4'>
+          <div class="blodTip">实际开始时间</div>
+          <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
+        </el-col>
+        <el-col :span='4'>
+          <div class="blodTip">实际完成时间</div>
+          <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
+        </el-col>
+        <el-col :span='4'>
+          <div class="blodTip">实际加工数量</div>
+          <div class="lightTip">{{orderMsg.actualQuantity }}</div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="box3">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>能耗信息</span>
+      </div>
+      <div class="toggleTabBox">
+        <div :class="{ active: activeModule === 'dataList' }" @click="toggleTab('dataList')">数据列表</div>
+        <div :class="{ active: activeModule === 'barChart' }" @click="toggleTab('barChart')">柱状图</div>
+      </div>
+      <div>
+        <div  v-show="activeModule === 'dataList'">
+          <!-- 表格 -->
+          <base-table
+            :page="queryParams.pageNo"
+            :limit="queryParams.pageSize"
+            :table-props="tableProps"
+            :table-data="tableData"
+            :max-height="tableH"
+          />
+        </div>
+        <!-- 图形 -->
+        <div v-show="activeModule === 'barChart'">
+          <bar-chart ref="orderEnergyChart" :chartData="chartData"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+const tableProps = [
+  {
+    prop: 'objName',
+    label: '对象名称'
+  },
+  {
+    prop: 'objCode',
+    label: '对象编码'
+  },
+  {
+    prop: 'energyType',
+    label: '能源类型'
+  },
+  {
+    prop: 'startNum',
+    label: '工单开始值'
+  },
+  {
+    prop: 'endNum',
+    label: '工单结束值/当前值'
+  },
+  {
+    prop: 'useNum',
+    label: '使用量'
+  }
+]
+import { getEnergyTypeListAll } from '@/api/base/energyType'
+import { orderList, workOrderList } from '@/api/base/orderManage'
+import { getWorkOrderMsg, getOrderEnergyData } from '@/api/monitoring/orderEnergy'
+import BarChart from "./components/barChart"
+export default {
+  name: 'OrderEnergy',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '订单',
+          selectOptions: [],
+          param: 'energyTypeId'
+        },
+        {
+          type: 'select',
+          label: '工单',
+          selectOptions: [],
+          param: 'energyTypeId1'
+        },
+        {
+          type: 'select',
+          label: '能源类型',
+          selectOptions: [],
+          param: 'energyTypeId2',
+          filterable: true,
+          width: 120
+        },
+        {
+          type: 'select',
+          label: '对象维度',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'energyTypeId3',
+          width: 100
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        }
+      ],
+      tableProps,
+      tableData: [],
+      tableH: this.tableHeight(400),
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10000
+      },
+      orderMsg: {},
+      chartData: [],
+      activeModule: 'dataList'
+    }
+  },
+  components: { BarChart },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(400)
+    })
+    this.getListArr()
+  },
+  methods: {
+    getListArr() {
+      getEnergyTypeListAll().then(res => {
+        this.formConfig[2].selectOptions = res.data || []
+      })
+      orderList().then(res => {
+        console.log(res)
+      })
+      workOrderList().then(res => {
+        console.log(res)
+      })
+    },
+    buttonClick() {
+      getWorkOrderMsg({
+        "workOrderId": 1,
+        "objType": "3",
+        "energyTypeId": '1681183397517406210'
+      }).then(res => {
+        console.log(res)
+        this.orderMsg = res.data || {}
+        getOrderEnergyData({
+          "workOrderId": 1,
+          "objType": "3",
+          "energyTypeId": '1681183397517406210',
+          "startProduceTime": "1694239523000",
+          "finishProduceTime": "1694498723000"
+        }).then(res => {
+          console.log(res)
+          this.tableData = res.data || []
+          this.chartData = res.data || []
+        })
+      })
+    },
+    toggleTab(val) {
+      this.activeModule = val
+      if (this.activeModule === 'barChart') {
+        this.$nextTick((res) => {
+          this.$refs.orderEnergyChart.getChart()
+        })
+      }
+    },
+    headBtnClick() {}
+  }
+}
+</script>
+<style lang='scss' scoped>
+.orderEnergyContainer {
+  background-color: rgb(242, 244, 249);
+  .box1, .box2, .box3 {
+    background-color: #fff;
+    border-radius: 9px;
+  }
+  .box1 {
+    height: 64px;
+    padding: 12px 16px 0;
+  }
+  .box2 {
+    height: 122px;
+    margin: 8px 0;
+    padding: 16px;
+    .blodTip {
+      font-weight: 600;
+      color: rgba(0,0,0,0.85);
+      margin-bottom: 8px;
+    }
+    .lightTip {
+      font-weight: 400;
+      color: rgba(102,102,102,0.75);
+    }
+  }
+  .box3 {
+    padding: 16px;
+    height: calc(100vh - 330px);
+    .toggleTabBox {
+      display: inline-block;
+      div {
+        display: inline-block;
+        padding:0 8px 4px;
+        color: rgba(102, 102, 102, 0.5);
+        border-bottom: 2px solid rgba(242, 244, 249, 1);
+        cursor: pointer;
+      }
+      .active {
+        color: rgba(0,0,0,0.85);
+        border-bottom-color: #0B58FF;
+      }
+    }
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    content: '';
+    display: inline-block;
+    width: 4px;
+    height: 18px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: bottom;
+  }
+}
+</style>

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

@@ -108,20 +108,22 @@ export default {
       ],
       tableProps,
       tableBtn: [
-          {
-            type: 'cancel',
-            btnName: '作废',
-            showParam: {
-              type: '&',
-              data: [
-                {
-                  type: 'unequal',
-                  name: 'status',
-                  value: '不可用'
-                }
-              ]
+      this.$auth.hasPermi('base:group-classes:cancel')
+          ? {
+              type: 'cancel',
+              btnName: '作废',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'unequal',
+                    name: 'status',
+                    value: '不可用'
+                  }
+                ]
+              }
             }
-          },
+          : undefined,
         this.$auth.hasPermi('base:group-classes:update')
           ? {
               type: 'edit',

src/views/group/base/groupTeam/components/groupTeamAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="80px" :model="form">
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-row>
       <el-col :span="12">
         <el-form-item label="班组名称" prop="name">
@@ -14,13 +14,20 @@
     </el-row>
     <el-row>
       <el-col :span="12">
-        <el-form-item label="班组人数" prop="num">
-          <el-input-number v-model="form.num" :min="1" :max="99999999" style="width: 100%;"></el-input-number>
+        <el-form-item label="班组组长" prop="leaderId">
+          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" @change="selectLeader">
+            <el-option
+              v-for="item in workerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="班组组长" prop="leaderName">
-          <el-input v-model="form.leaderName"></el-input>
+        <el-form-item label="手机号" prop="telephone">
+          <el-input v-model="form.telephone" disabled></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -28,6 +35,7 @@
 </template>
 <script>
 import { getGroupTeam, updateGroupTeam, createGroupTeam, getCode } from '@/api/base/groupTeam'
+import { getWorkerList } from '@/api/base/worker'
 export default {
   name: 'groupTeamAdd',
   data() {
@@ -36,23 +44,28 @@ export default {
         id: '',
         name: '',
         code: '',
-        num: null,
-        leaderName: ''
+        leaderId: '',
+        telephone: ''
       },
       isEdit: false, //是否是编辑
       rules: {
-        name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }]
-      }
+        name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
+        code: [{ required: true, message: '请输入班组编码', trigger: 'blur' }],
+        leaderId: [{ required: true, message: '请选择组长', trigger: 'select' }]
+      },
+      workerList: []
     }
   },
   methods: {
     init(id) {
+      this.getWorkerList()
       if (id) {
         this.isEdit = true
         this.form.id = id
         getGroupTeam( id ).then((res) => {
           if (res.code === 0) {
             this.form = res.data
+            this.selectLeader()
           }
         })
       } else {
@@ -63,6 +76,24 @@ export default {
         })
       }
     },
+    // 获取员工list
+    getWorkerList() {
+      getWorkerList().then(res => {
+        this.workerList = res.data
+      })
+    },
+    // 获取手机号
+    selectLeader() {
+      if (this.form.leaderId) {
+        this.workerList.map(item => {
+          if (item.id === this.form.leaderId) {
+            this.form.telephone = item.telephone || ''
+          }
+        })
+      } else {
+        this.form.telephone = ''
+      }
+    },
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {

src/views/group/base/groupTeam/components/statusBtn.vue

@@ -12,8 +12,7 @@ export default {
   },
   data() {
     return {
-      state: false,
-      payload: {}
+      state: false
     }
   },
   computed: {
@@ -31,9 +30,16 @@ export default {
       }
     },
     changeHandler() {
-      this.payload.id = this.injectData.id
-      this.payload.enabled = this.state ? '1' : '0'
-      this.$emit('emitData', this.payload)
+      let params = {}
+      let payload = {}
+      params.name = 'state'
+      payload.id = this.injectData.id
+      payload.enabled = this.state ? '1' : '0'
+      payload.code = this.injectData.code
+      payload.name = this.injectData.name
+      payload.leaderId = this.injectData.leaderId
+      params.payload = payload
+      this.$emit('emitData', params)
     }
   }
 }

src/views/group/base/groupTeam/components/workerEdit.vue

@@ -0,0 +1,298 @@
+<template>
+  <div>
+    <el-drawer :title="title" :visible.sync="visible" size="70%" @close='closeD'>
+      <div class="box">
+        <el-row class="topBox">
+          <el-col :span="6">
+            <p class="boldTitle">班组名称</p>
+            <p class="lightText">{{ teamData.teamName }}</p>
+          </el-col>
+          <el-col :span="6">
+            <p class="boldTitle">班组长</p>
+            <p class="lightText">{{ teamData.leaderName }}</p>
+          </el-col>
+          <el-col :span="6">
+            <p class="boldTitle">班组人数</p>
+            <p class="lightText">{{ teamData.teamNum }}</p>
+          </el-col>
+          <el-col :span="6">
+            <p class="boldTitle">手机号</p>
+            <p class="lightText">{{ teamData.leaderTelephone }}</p>
+          </el-col>
+        </el-row>
+        <div class="bottomBox">
+          <!-- 搜索工作栏 -->
+          <search-bar
+            v-if="visible"
+            :formConfigs="formConfig"
+            @headBtnClick="buttonClick"
+          />
+          <base-table
+            :page="queryParams.pageNo"
+            :limit="queryParams.pageSize"
+            :table-props="tableProps"
+            :table-data="tableData"
+            :max-height="tableH"
+          >
+            <method-btn
+              v-if="tableBtn.length"
+              slot="handleBtn"
+              :width="100"
+              label="操作"
+              :method-list="tableBtn"
+              @clickBtn="handleClick"
+            />
+          </base-table>
+          <pagination
+            :page.sync="queryParams.pageNo"
+            :limit.sync="queryParams.pageSize"
+            :total="total"
+            @pagination="getList"
+          />
+        </div>
+      </div>
+    </el-drawer>
+    <!-- 新增编辑组员 -->
+    <base-dialog
+      :dialogTitle="addOrEditTitle"
+      :dialogVisible="centervisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+    >
+      <worker-team-add ref="workerTeamAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+const tableProps = [
+  {
+    prop: 'workerName',
+    label: '人员姓名'
+  },
+  {
+    prop: 'workerMajorName',
+    label: '专业'
+  },
+  {
+    prop: 'workerTelephone',
+    label: '手机'
+  },
+  {
+    prop: 'remark',
+    label: '备注'
+  }
+]
+import { groupTeamPage, teamDetDelete } from '@/api/base/groupTeam'
+import { getWorker } from '@/api/base/worker'
+import WorkerTeamAdd from './workerTeamAdd.vue'
+export default {
+  name: 'WorkerEdit',
+  data() {
+    return {
+      visible: false,
+      title: '',
+      formConfig: [],
+      teamData: {
+        teamName: '',
+        leaderName: '',
+        teamNum: '',
+        leaderTelephone: '-',
+        teamId: ''
+      },
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        teamId: '',
+        workerName: ''
+      },
+      tableProps,
+      tableData: [],
+      tableBtn: [],
+      tableH: this.tableHeight(320),
+      total: 0,
+      // 弹出层标题
+      addOrEditTitle: "",
+      // 是否显示弹出层
+      centervisible: false
+    }
+  },
+  components: { WorkerTeamAdd },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(320)
+    })
+  },
+  methods: {
+    init(val) {
+      this.visible = true
+      this.teamData.teamName = val.payload.name
+      this.teamData.leaderName = val.payload.leaderName
+      this.teamData.teamNum = val.payload.num
+      this.teamData.teamId = val.payload.teamId
+      this.queryParams.teamId = val.payload.id
+      getWorker({id:val.payload.leaderId}).then(res => {// 获取组长手机号
+        this.teamData.leaderTelephone = res.data.telephone || '-'
+      })
+      this.getList()
+      if (val.name === 'view') {
+        this.title = '查看组员'
+        this.tableBtn = []
+        this.formConfig = [
+          {
+            type: 'input',
+            label: '关键字',
+            placeholder: '关键字',
+            param: 'workerName'
+          },
+          {
+            type: 'button',
+            btnName: '查询',
+            name: 'search',
+            color: 'primary'
+          }
+        ]
+      }else{
+        this.title = '编辑组员'
+        this.tableBtn = [
+            {
+              type: 'edit',
+              btnName: '编辑'
+            },
+            {
+              type: 'delete',
+              btnName: '删除'
+            }
+          ]
+        this.formConfig = [
+          {
+            type: 'input',
+            label: '关键字',
+            placeholder: '关键字',
+            param: 'workerName'
+          },
+          {
+            type: 'button',
+            btnName: '查询',
+            name: 'search',
+            color: 'primary'
+          },
+          {
+            type: 'separate'
+          },
+          {
+            type: 'button',
+            btnName: '新增',
+            name: 'add',
+            color: 'success',
+            plain: true
+          }
+        ]
+      }
+    },
+    getList() {
+      groupTeamPage({ ...this.queryParams }).then(res => {
+        if (res.code === 0 && res.data.list.length > 0) {
+          let arr = []
+          res.data.list.map(item => {
+            let obj = {}
+            obj.workerName = item.worker.name
+            obj.workerMajorName = item.worker.majorName
+            obj.workerTelephone = item.worker.telephone
+            obj.remark = item.remark
+            obj.id = item.id
+            arr.push(obj)
+          })
+          this.tableData = arr
+          this.total = res.data.total
+        } else {
+          this.tableData = []
+          this.total = 0
+        }
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.workerName = val.workerName
+        this.queryParams.pageNo = 1
+        this.getList()
+      }else if (val.btnName === 'add') {
+       this.addNew()
+      }
+    },
+    // 新增
+    addNew() {
+      this.addOrEditTitle = '新增'
+      this.centervisible = true
+      this.$nextTick(() => {
+        this.$refs.workerTeamAdd.init({'teamId': this.queryParams.teamId, id: ''})
+      })
+    },
+    handleCancel() {
+      this.$refs.workerTeamAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.workerTeamAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    },
+    handleClick(val) {
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.workerTeamAdd.init({'teamId': this.queryParams.teamId, id: val.data.id})
+          })
+          break
+        default:
+          this.handleDelete(val.data)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      console.log(row)
+      this.$modal.confirm('是否确认删除人员"' + row.workerName + '"的数据项?').then(function() {
+          return teamDetDelete({id: row.id});
+        }).then(() => {
+          this.queryParams.pageNo = 1;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    closeD() {
+      this.$emit('closeDrawer')
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.box {
+  padding:0 30px;
+  .topBox {
+    padding-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;
+    }
+  }
+  .bottomBox {
+    padding-top: 30px;
+  }
+}
+</style>

src/views/group/base/groupTeam/components/workerOperate.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="workerOperate">
+    <div class="operateBtn">
+      <span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
+      <span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'WorkerOperate',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  methods: {
+    emitParams(data) {
+      let params = {}
+      params.name = data
+      params.payload = this.injectData
+      this.$emit('emitData', params)
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.workerOperate {
+  .operateBtn{
+    color: #0B58FF;
+    .view {
+      margin-right: 10px;
+      cursor: pointer;
+    }
+    .edit {
+      cursor: pointer;
+    }
+  }
+}
+</style>

src/views/group/base/groupTeam/components/workerTeamAdd.vue

@@ -0,0 +1,113 @@
+<template>
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+    <el-form-item label="员工" prop="workerId">
+      <el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
+        <el-option
+          v-for="item in workerList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="专业" prop="majorName">
+      <el-input v-model="form.majorName" disabled></el-input>
+    </el-form-item>
+    <el-form-item label="备注" prop="remark">
+      <el-input v-model="form.remark"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { getWorkerList } from '@/api/base/worker'
+import { teamDetCreate, teamDetUpdate, groupTeamDet } from '@/api/base/groupTeam'
+export default {
+  name: 'WorkerTeamAdd',
+  data() {
+    return {
+      workerList: [],
+      form: {
+        teamId: '',
+        workerId: '',
+        remark: '',
+        majorName: '',
+        id: ''
+      },
+      rules: {
+        workerId: [{ required: true, message: '员工不能为空', trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    init(param) {
+      this.form.teamId = param.teamId
+      getWorkerList().then(res => {
+        this.workerList = res.data || []
+        if (param.id) {
+          this.isEdit = true
+          this.form.id = param.id
+          groupTeamDet({id: this.form.id}).then((res) => {
+            if (res.code === 0) {
+              this.form.workerId = res.data.workerId
+              this.selectWorker()
+              this.form.remark = res.data.remark
+            }
+          })
+        } else {
+          this.isEdit = false
+          this.form.id = ''
+        }
+      })
+    },
+    selectWorker() {
+      if (this.form.workerId) {
+        this.workerList.map(item => {
+          if (item.id === this.form.workerId) {
+            this.form.majorName = item.majorName
+          }
+        })
+      }else{
+        this.form.majorName = ''
+      }
+    },
+    // 确定
+    submitForm() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            // 编辑
+            teamDetUpdate({
+              teamId: this.form.teamId,
+              workerId: this.form.workerId,
+              remark: this.form.remark,
+              id: this.form.id
+            }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            teamDetCreate({
+              teamId: this.form.teamId,
+              workerId: this.form.workerId,
+              remark: this.form.remark
+            }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.form.resetFields()
+      this.isEdit = false
+    }
+  }
+}
+</script>

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

@@ -41,14 +41,18 @@
     >
       <group-team-add ref="groupList" @successSubmit="successSubmit" />
     </base-dialog>
+    <!-- 组员编辑 -->
+    <worker-edit v-if='paramVisible' ref='workerEditParam' @closeDrawer="closeDrawer"></worker-edit>
   </div>
 </template>
 
 <script>
 import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/groupTeam";
 import { parseTime } from '@/utils/ruoyi'
-import GroupTeamAdd from './components/groupTeamAdd.vue'
+import GroupTeamAdd from './components/groupTeamAdd'
 import StatusBtn from './components/statusBtn.vue'
+import WorkerOperate from './components/workerOperate.vue'
+import WorkerEdit from './components/workerEdit.vue';
 const tableProps = [
   {
     prop: 'createTime',
@@ -62,7 +66,7 @@ const tableProps = [
   },
   {
     prop: 'code',
-    label: '班组编码',
+    label: '编码',
     minWidth: 220
   },
   {
@@ -71,17 +75,22 @@ const tableProps = [
   },
   {
     prop: 'leaderName',
-    label: '班组组长'
+    label: '组长'
   },
   {
     prop: 'enabled',
     label: '班组状态',
     subcomponent: StatusBtn
-  }
+  },
+  {
+    prop: 'workerName',
+    label: '组员',
+    subcomponent: WorkerOperate
+  },
 ]
 export default {
   name: "GroupTeam",
-  components: { GroupTeamAdd },
+  components: { GroupTeamAdd, WorkerEdit },
   data() {
     return {
       formConfig: [
@@ -93,9 +102,9 @@ export default {
         },
         {
           type: 'input',
-          label: '班组编码',
-          placeholder: '班组编码',
-          param: 'code'
+          label: '组长',
+          placeholder: '组长',
+          param: 'leaderName'
         },
         {
           type: 'button',
@@ -144,7 +153,8 @@ export default {
         pageSize: 20,
         name: null,
         code: null
-      }
+      },
+      paramVisible: false
     };
   },
   created() {
@@ -158,8 +168,8 @@ export default {
       switch (val.btnName) {
         case 'search':
           this.queryParams.pageNo = 1;
+          this.queryParams.leaderName = val.leaderName
           this.queryParams.name = val.name
-          this.queryParams.code = val.code
           this.getList()
           break
         default:
@@ -191,12 +201,20 @@ export default {
       }
     },
     // 班组状态
-    handleTableEvents(data) {
-      updateGroupTeam({ ...data }).then((res) => {
-        if (res.code === 0) {
-          this.$modal.msgSuccess("操作成功");
-        }
-      })
+    handleTableEvents(params) {
+      console.log(params)
+      if (params.name === 'state') {// 班组状态
+        updateGroupTeam({ ...params.payload }).then((res) => {
+          if (res.code === 0) {
+            this.$modal.msgSuccess("操作成功");
+          }
+        })
+      }else {// 编辑&查看
+        this.paramVisible = true
+        this.$nextTick(() => {
+          this.$refs.workerEditParam.init(params)
+        })
+      }
     },
     handleCancel() {
       this.$refs.groupList.formClear()
@@ -219,6 +237,9 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
+    },
+    closeDrawer() {
+      this.getList()
     }
   }
 };

src/views/group/monitoring/groupTeamScheduling/components/schedulingMonitoringDetail.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <el-drawer title="查看详情" :visible.sync="visible" size="70%">
+      <div class="box">
+        <base-table
+          :table-props="tableProps"
+          :table-data="tableData"
+          :max-height="tableH"
+        />
+      </div>
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getByScheduling } from '@/api/monitoring/groupTeamView'
+export default {
+  name: 'schedulingMonitoringDetail',
+  data() {
+    return {
+      visible: false,
+      tableProps: [],
+      tableData: [],
+      tableH: this.tableHeight(200)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(200)
+    })
+  },
+  methods: {
+    init(id) {
+      this.visible = true
+      console.log(id)
+      getByScheduling({id}).then(res => {
+        console.log(res)
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.box {
+  padding: 0 32px;
+}
+</style>

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

@@ -0,0 +1,154 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <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="160"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 查看生产情况 -->
+    <scheduling-monitoring-detail v-if='paramVisible' ref='schedulingMonitoringDetail'/>
+  </div>
+</template>
+<script>
+import { groupTeamSchedulingPage } from '@/api/base/groupTeamScheduling'
+import { parseTime } from '@/utils/ruoyi'
+import SchedulingMonitoringDetail from './components/schedulingMonitoringDetail'
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '排班创建时间',
+    filter: parseTime
+  },
+  {
+    prop: 'startDay',
+    label: '上班日期'
+  },
+  {
+    prop: 'startTime',
+    label: '上班时间',
+    filter: parseTime
+  },
+  {
+    prop: 'endTime',
+    label: '下班时间',
+    filter: parseTime
+  },
+  {
+    prop: 'classesName',
+    label: '班次名称'
+  },
+  {
+    prop: 'teamName',
+    label: '班组名称'
+  }
+]
+const tableBtn = [
+  {
+    type: 'viewDetail',
+    btnName: '查看生产情况'
+  }
+]
+export default {
+  name: 'GroupTeamScheduling',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '班次信息',
+          selectOptions: [],
+          param: 'classesId'
+        },
+        {
+          type: 'input',
+          label: '班组信息',
+          placeholder: '班组信息',
+          param: 'teamName'
+        },
+        {
+          type: 'datePicker',
+          label: '上班日期',
+          dateType: 'date',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "timestamp",
+          param: 'startDay',
+          defaultSelect: '',
+          width: 200
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        classesId: '',
+        teamName: '',
+        startDay: ''
+      },
+      tableProps,
+      tableBtn,
+      list: [],
+      tableH: this.tableHeight(220),
+      total: 0,
+      paramVisible: false
+    }
+  },
+  components: { SchedulingMonitoringDetail },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(220)
+    })
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.cnName = val.cnName
+      this.getList()
+    },
+    getList() {
+      groupTeamSchedulingPage().then(res => {
+        console.log(res)
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    handleClick(val) {
+      console.log(val)
+      this.paramVisible = true
+      this.$nextTick(() => {
+        this.$refs.schedulingMonitoringDetail.init(val.data.id)
+      })
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <el-drawer title="查看详情" :visible.sync="visible" size="70%">
+      <div class="box">
+        <el-form :inline="true">
+          <el-form-item label="工单名称">
+            <el-input v-model="queryParams.workOrderName" size='small' readonly></el-input>
+          </el-form-item>
+          <el-form-item label="班组名称">
+            <el-input v-model="queryParams.teamName" size='small' readonly></el-input>
+          </el-form-item>
+        </el-form>
+        <base-table
+          :table-props="tableProps"
+          :table-data="tableData"
+          :max-height="tableH"
+        />
+      </div>
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getByTeam } from '@/api/monitoring/groupTeamView'
+import { parseTime } from '@/utils/ruoyi'
+const tableProps = [
+  {
+    prop: 'startTime',
+    label: '开始时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'endTime',
+    label: '结束时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'num',
+    label: '人数'
+  },
+  {
+    prop: 'workTime',
+    label: '工作时长'
+  }
+]
+export default {
+  name: 'GroupTeamViewDetail',
+  data() {
+    return {
+      visible: false,
+      workOrderName: '',
+      teamName: '',
+      tableProps,
+      tableData: [],
+      tableH: this.tableHeight(200),
+      queryParams: {}
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(200)
+    })
+  },
+  methods: {
+    init(params) {
+      console.log(params)
+      this.visible = true
+      this.queryParams = params
+      getByTeam({
+        teamId: this.queryParams.teamId,
+        workOrderId: this.queryParams.workOrderId
+      }).then(res => {
+        console.log(res)
+        this.tableData = res.data || []
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.box {
+  padding: 0 32px;
+}
+</style>

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

@@ -0,0 +1,130 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <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="160"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <!-- 查看详情 -->
+    <group-team-view-detail v-if="paramVisible" ref="groupTeamViewDetail"/>
+  </div>
+</template>
+<script>
+import { getByWorkOrder } from '@/api/monitoring/groupTeamView'
+import { workOrderList } from '@/api/base/workOrder'
+import GroupTeamViewDetail from './components/groupTeamViewDetail.vue'
+const tableProps = [
+  {
+    prop: 'name',
+    label: '班组名称'
+  },
+  {
+    prop: 'leaderName',
+    label: '班组长'
+  },
+  {
+    prop: 'num',
+    label: '人数'
+  },
+  {
+    prop: 'workCount',
+    label: '上班次数'
+  }
+]
+const tableBtn = [
+  {
+    type: 'detail',
+    btnName: '详情'
+  }
+]
+export default {
+  name: 'GroupTeamView',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '工单名称',
+          placeholder: '工单名称',
+          param: 'cnName'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 1000,
+        workOrderId: ''
+      },
+      workOrderName: '工单名称ddd',
+      tableBtn,
+      tableProps,
+      tableH: this.tableHeight(220),
+      list: [],
+      paramVisible: false
+    }
+  },
+  components: { GroupTeamViewDetail },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(220)
+    })
+  },
+  methods: {
+    // 获取工单list
+    getOrderList() {
+      workOrderList().then(res => {
+        
+      })
+    },
+    // 查询
+    buttonClick(val) {
+      // this.queryParams.workOrderId = val.id
+      this.queryParams.workOrderId = 1
+      this.getList()
+    },
+    // 获取table数据
+    getList() {
+      getByWorkOrder({ id: this.queryParams.workOrderId }).then(res => {
+        console.log(res)
+        this.list = res.data
+      })
+    },
+    handleClick(val) {
+      console.log(val)
+      this.paramVisible = true
+      let params = {}
+      params.teamId = val.data.id
+      params.teamName = val.data.name
+      params.workOrderId = this.queryParams.workOrderId
+      params.workOrderName = this.workOrderName
+      this.$nextTick(() => {
+        this.$refs.groupTeamViewDetail.init(params)
+      })
+    }
+  }
+}
+</script>

src/views/login.vue

@@ -1,238 +1,81 @@
 <template xmlns="">
-	<div class="container">
-		<div class="logo"></div>
-		<!-- 登录区域 -->
-		<div class="content">
-			<!-- 配图 -->
-			<div class="pic">
-				<div
-					class="welcome"
-					style="
-						position: absolute;
-						top: 15%;
-						left: 20%;
-						user-select: none;
-						display: flex;
-						flex-direction: column;
-						align-items: flex-start;
-					">
-					<strong
-						style="
-							letter-spacing: 1px;
-							font-family: Arial, Helvetica, sans-serif;
-							font-weight: 500;
-							font-size: 88px;
-						">
-						<span style="color: #26b9de">Wel</span>
-						<span style="color: #fff">come</span>
-					</strong>
-					<p
-						style="
-							margin: 0;
-							font-size: 26px;
-							letter-spacing: 1px;
-							color: #26b9de;
-							opacity: 75%;
-						">
-						<span
-							style="
-								display: inline-block;
-								height: 20px;
-								width: 20px;
-								margin-left: 8px;
-								margin-right: 12px;
-								border-radius: 100%;
-								background: #26b9de;
-							"></span>
-						产线生产监控系统
-					</p>
-				</div>
-				<video
-					src="/static/videos/login.webm"
-					muted
-					autoplay
-					loop
-					style="
-						user-select: none;
-						position: absolute;
-						top: 28%;
-						width: 100%;
-						height: 70%;
-					"></video>
-			</div>
-			<!-- 表单 -->
-			<div class="field">
-				<!-- [移动端]标题 -->
-				<h2 class="mobile-title">
-					<h3 class="title">中建材智能自动化研究院有限公司</h3>
-				</h2>
-				<h2 class="pc-title" style="">
-					<h3
-						class="title"
-						style="
-							margin: 0;
-							margin-left: 32px;
-							font-weight: 400;
-							user-select: none;
-							color: #000;
-							font-size: 36px;
-							line-height: 54px;
-							letter-spacing: 2px;
-						">
-						<img
-							src="../assets/logo/cnbm.png"
-							alt="cnbm_logo"
-							style="
-								height: 48px;
-								width: 48px;
-								position: relative;
-								top: 12px;
-								right: 8px;
-							" />
-						<span>中建材智能自动化研究院有限公司</span>
-					</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;
-						">
-						产线生产监控系统
-					</h3>
-				</h2>
+  <div class="container">
+    <div class="logo"></div>
+    <!-- 登录区域 -->
+    <div class="content">
+      <!-- 配图 -->
+      <div class="pic"></div>
+      <!-- 表单 -->
+      <div class="field">
+        <!-- [移动端]标题 -->
+        <h2 class="mobile-title">
+          <h3 class="title">芋道后台管理系统</h3>
+        </h2>
 
-				<!-- 表单 -->
-				<div class="form-cont">
-					<el-tabs
-						class="form"
-						v-model="loginForm.loginType"
-						style="float: none">
-						<el-tab-pane label="账号密码登录" name="uname"></el-tab-pane>
-						<el-tab-pane label="短信验证码登录" name="sms"></el-tab-pane>
-					</el-tabs>
-					<div style="">
-						<el-form
-							ref="loginForm"
-							:model="loginForm"
-							:rules="LoginRules"
-							class="login-form">
-							<el-form-item prop="tenantName" v-if="tenantEnable">
-								<el-input
-									v-model="loginForm.tenantName"
-									type="text"
-									auto-complete="off"
-									placeholder="租户">
-									<!-- <svg-icon
-										slot="prefix"
-										icon-class="tree"
-										class="el-input__icon input-icon" /> -->
-								</el-input>
-							</el-form-item>
-							<!-- 账号密码登录 -->
-							<div v-if="loginForm.loginType === 'uname'">
-								<el-form-item prop="username">
-									<el-input
-										v-model="loginForm.username"
-										type="text"
-										auto-complete="off"
-										placeholder="账号">
-										<!-- <svg-icon
-											slot="prefix"
-											icon-class="user"
-											class="el-input__icon input-icon" /> -->
-									</el-input>
-								</el-form-item>
-								<el-form-item prop="password">
-									<el-input
-										v-model="loginForm.password"
-										type="password"
-										auto-complete="off"
-										placeholder="密码"
-										@keyup.enter.native="getCode">
-										<!-- <svg-icon
-											slot="prefix"
-											icon-class="password"
-											class="el-input__icon input-icon" /> -->
-									</el-input>
-								</el-form-item>
-								<el-checkbox
-									v-model="loginForm.rememberMe"
-									style="margin: 0 0 25px 0">
-									记住密码
-								</el-checkbox>
-							</div>
+        <!-- 表单 -->
+        <div class="form-cont">
+          <el-tabs class="form" v-model="loginForm.loginType" style=" float:none;">
+            <el-tab-pane label="账号密码登录" name="uname">
+            </el-tab-pane>
+            <el-tab-pane label="短信验证码登录" name="sms">
+            </el-tab-pane>
+          </el-tabs>
+          <div>
+            <el-form ref="loginForm" :model="loginForm" :rules="LoginRules" class="login-form">
+              <el-form-item prop="tenantName" v-if="tenantEnable">
+                <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
+                  <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon" />
+                </el-input>
+              </el-form-item>
+              <!-- 账号密码登录 -->
+              <div v-if="loginForm.loginType === 'uname'">
+                <el-form-item prop="username">
+                  <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+                    <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                  </el-input>
+                </el-form-item>
+                <el-form-item prop="password">
+                  <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
+                    @keyup.enter.native="getCode">
+                    <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                  </el-input>
+                </el-form-item>
+                <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住密码</el-checkbox>
+              </div>
 
-							<!-- 短信验证码登录 -->
-							<div v-if="loginForm.loginType === 'sms'">
-								<el-form-item prop="mobile">
-									<el-input
-										v-model="loginForm.mobile"
-										type="text"
-										auto-complete="off"
-										placeholder="请输入手机号">
-										<!-- <svg-icon
-											slot="prefix"
-											icon-class="phone"
-											class="el-input__icon input-icon" /> -->
-									</el-input>
-								</el-form-item>
-								<el-form-item prop="mobileCode">
-									<el-input
-										v-model="loginForm.mobileCode"
-										type="text"
-										auto-complete="off"
-										placeholder="短信验证码"
-										class="sms-login-mobile-code-prefix"
-										@keyup.enter.native="handleLogin">
-										<!-- <template>
-											<svg-icon
-												slot="prefix"
-												icon-class="password"
-												class="el-input__icon input-icon" />
-										</template> -->
-										<template slot="suffix">
-											<span
-												v-if="mobileCodeTimer <= 0"
-												class="getMobileCode"
-												@click="getSmsCode"
-												style="
-													cursor: pointer;
-													color: #0b58ff;
-													font-size: 18px;
-													line-height: 66px;
-													padding-right: 12px;
-												">
-												获取验证码
-											</span>
-											<span v-if="mobileCodeTimer > 0" class="getMobileCode">
-												{{ mobileCodeTimer }}秒后可重新获取
-											</span>
-										</template>
-									</el-input>
-								</el-form-item>
-							</div>
+              <!-- 短信验证码登录 -->
+              <div v-if="loginForm.loginType === 'sms'">
+                <el-form-item prop="mobile">
+                  <el-input v-model="loginForm.mobile" type="text" auto-complete="off" placeholder="请输入手机号">
+                    <svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon" />
+                  </el-input>
+                </el-form-item>
+                <el-form-item prop="mobileCode">
+                  <el-input v-model="loginForm.mobileCode" type="text" auto-complete="off" placeholder="短信验证码"
+                    class="sms-login-mobile-code-prefix" @keyup.enter.native="handleLogin">
+                    <template>
+                      <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                    </template>
+                    <template slot="append">
+                      <span v-if="mobileCodeTimer <= 0" class="getMobileCode" @click="getSmsCode"
+                        style="cursor: pointer;">获取验证码</span>
+                      <span v-if="mobileCodeTimer > 0" class="getMobileCode">{{ mobileCodeTimer }}秒后可重新获取</span>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </div>
 
-							<!-- 下方的登录按钮 -->
-							<el-form-item id="button-form-item" style="width: 100%; margin-top: 32px">
-								<el-button
-									:loading="loading"
-									size="medium"
-									type="primary"
-									style="width: 100%; height: 66px; font-size: 18px;"
-									@click.native.prevent="getCode">
-									<span v-if="!loading">登 录</span>
-									<span v-else>登 录 中...</span>
-								</el-button>
-							</el-form-item>
+              <!-- 下方的登录按钮 -->
+              <el-form-item style="width:100%;">
+                <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
+                  @click.native.prevent="getCode">
+                  <span v-if="!loading">登 录</span>
+                  <span v-else>登 录 中...</span>
+                </el-button>
+              </el-form-item>
 
-							<!--  社交登录 -->
-							<!-- <el-form-item style="width:100%;">
+              <!--  社交登录 -->
+              <!-- <el-form-item style="width:100%;">
                   <div class="oauth-login" style="display:flex">
                     <div class="oauth-login-item" v-for="item in SysUserSocialTypeEnum" :key="item.type" @click="doSocialLogin(item)">
                       <img :src="item.img" height="25px" width="25px" alt="登录" >
@@ -240,305 +83,265 @@
                     </div>
                 </div>
               </el-form-item> -->
-						</el-form>
-					</div>
-				</div>
+            </el-form>
+          </div>
+        </div>
+      </div>
+    </div>
 
-				<!-- footer -->
-				<div class="footer">
-					Copyright © 2023 中建材智能自动化院 All Rights Reserved.
-				</div>
-			</div>
-		</div>
+    <!-- 图形验证码 -->
+    <Verify ref="verify" :captcha-type="'blockPuzzle'" :img-size="{ width: '400px', height: '200px' }"
+      @success="handleLogin" />
 
-		<!-- 图形验证码 -->
-		<Verify
-			ref="verify"
-			:captcha-type="'blockPuzzle'"
-			:img-size="{ width: '400px', height: '200px' }"
-			@success="handleLogin" />
-	</div>
+    <!-- footer -->
+    <div class="footer">
+      Copyright © 2023 中建材智能自动化院 All Rights Reserved.
+    </div>
+  </div>
 </template>
 
 <script>
-import { sendSmsCode, socialAuthRedirect } from '@/api/login';
-import { getTenantIdByName } from '@/api/system/tenant';
-import { SystemUserSocialTypeEnum } from '@/utils/constants';
-import { getCaptchaEnable, getTenantEnable } from '@/utils/ruoyi';
+import { sendSmsCode, socialAuthRedirect } from "@/api/login";
+import { getTenantIdByName } from "@/api/system/tenant";
+import { SystemUserSocialTypeEnum } from "@/utils/constants";
+import { getCaptchaEnable, getTenantEnable } from "@/utils/ruoyi";
 import {
-	getPassword,
-	getRememberMe,
-	getTenantName,
-	getUsername,
-	removePassword,
-	removeRememberMe,
-	removeTenantName,
-	removeUsername,
-	setPassword,
-	setRememberMe,
-	setTenantId,
-	setTenantName,
-	setUsername,
-} from '@/utils/auth';
+  getPassword,
+  getRememberMe, getTenantName,
+  getUsername,
+  removePassword, removeRememberMe, removeTenantName,
+  removeUsername,
+  setPassword, setRememberMe, setTenantId, setTenantName,
+  setUsername
+} from "@/utils/auth";
 
 import Verify from '@/components/Verifition/Verify';
-import { resetUserPwd } from '@/api/system/user';
+import { resetUserPwd } from "@/api/system/user";
 
 export default {
-	name: 'Login',
-	components: {
-		Verify,
-	},
-	data() {
-		return {
-			codeUrl: '',
-			captchaEnable: true,
-			tenantEnable: true,
-			mobileCodeTimer: 0,
-			loginForm: {
-				loginType: 'uname',
-				username: 'admin',
-				password: 'admin123',
-				captchaVerification: '',
-				mobile: '',
-				mobileCode: '',
-				rememberMe: false,
-				tenantName: '技术中心',
-			},
-			scene: 21,
+  name: "Login",
+  components: {
+    Verify
+  },
+  data() {
+    return {
+      codeUrl: "",
+      captchaEnable: true,
+      tenantEnable: true,
+      mobileCodeTimer: 0,
+      loginForm: {
+        loginType: "uname",
+        username: "admin",
+        password: "admin123",
+        captchaVerification: "",
+        mobile: "",
+        mobileCode: "",
+        rememberMe: false,
+        tenantName: "技术中心",
+      },
+      scene: 21,
 
-			LoginRules: {
-				username: [
-					{ required: true, trigger: 'blur', message: '用户名不能为空' },
-				],
-				password: [
-					{ required: true, trigger: 'blur', message: '密码不能为空' },
-				],
-				mobile: [
-					{ required: true, trigger: 'blur', message: '手机号不能为空' },
-					{
-						validator: function (rule, value, callback) {
-							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();
-							}
-						},
-						trigger: 'blur',
-					},
-				],
-				tenantName: [
-					{ required: true, trigger: 'blur', message: '租户不能为空' },
-					{
-						validator: (rule, value, callback) => {
-							// debugger
-							getTenantIdByName(value).then((res) => {
-								const tenantId = res.data;
-								if (tenantId && tenantId >= 0) {
-									// 设置租户
-									setTenantId(tenantId);
-									callback();
-								} else {
-									callback('租户不存在');
-								}
-							});
-						},
-						trigger: 'blur',
-					},
-				],
-			},
-			loading: false,
-			redirect: undefined,
-			// 枚举
-			SysUserSocialTypeEnum: SystemUserSocialTypeEnum,
-		};
-	},
-	created() {
-		// 租户开关
-		this.tenantEnable = getTenantEnable();
-		if (this.tenantEnable) {
-			getTenantIdByName(this.loginForm.tenantName).then((res) => {
-				// 设置租户
-				const tenantId = res.data;
-				if (tenantId && tenantId >= 0) {
-					setTenantId(tenantId);
-				}
-			});
-		}
-		// 验证码开关
-		this.captchaEnable = getCaptchaEnable();
-		// 重定向地址
-		this.redirect = this.$route.query.redirect
-			? decodeURIComponent(this.$route.query.redirect)
-			: undefined;
-		this.getCookie();
-	},
-	methods: {
-		getCode() {
-			// 情况一，未开启：则直接登录
-			if (!this.captchaEnable) {
-				this.handleLogin({});
-				return;
-			}
+      LoginRules: {
+        username: [
+          { required: true, trigger: "blur", message: "用户名不能为空" }
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "密码不能为空" }
+        ],
+        mobile: [
+          { required: true, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+              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();
+              }
+            }, trigger: "blur"
+          }
+        ],
+        tenantName: [
+          { required: true, trigger: "blur", message: "租户不能为空" },
+          {
+            validator: (rule, value, callback) => {
+              // debugger
+              getTenantIdByName(value).then(res => {
+                const tenantId = res.data;
+                if (tenantId && tenantId >= 0) {
+                  // 设置租户
+                  setTenantId(tenantId)
+                  callback();
+                } else {
+                  callback('租户不存在');
+                }
+              });
+            },
+            trigger: 'blur'
+          }
+        ]
+      },
+      loading: false,
+      redirect: undefined,
+      // 枚举
+      SysUserSocialTypeEnum: SystemUserSocialTypeEnum,
+    };
+  },
+  created() {
+    // 租户开关
+    this.tenantEnable = getTenantEnable();
+    if (this.tenantEnable) {
+      getTenantIdByName(this.loginForm.tenantName).then(res => { // 设置租户
+        const tenantId = res.data;
+        if (tenantId && tenantId >= 0) {
+          setTenantId(tenantId)
+        }
+      });
+    }
+    // 验证码开关
+    this.captchaEnable = getCaptchaEnable();
+    // 重定向地址
+    this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined;
+    this.getCookie();
+  },
+  methods: {
+    getCode() {
+      // 情况一，未开启：则直接登录
+      if (!this.captchaEnable) {
+        this.handleLogin({})
+        return;
+      }
 
-			// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
-			// 弹出验证码
-			this.$refs.verify.show();
-		},
-		getCookie() {
-			const username = getUsername();
-			const password = getPassword();
-			const rememberMe = getRememberMe();
-			const tenantName = getTenantName();
-			this.loginForm = {
-				...this.loginForm,
-				username: username ? username : this.loginForm.username,
-				password: password ? password : this.loginForm.password,
-				rememberMe: rememberMe ? getRememberMe() : false,
-				tenantName: tenantName ? tenantName : this.loginForm.tenantName,
-			};
-		},
-		handleLogin(captchaParams) {
-			this.$refs.loginForm.validate((valid) => {
-				if (valid) {
-					this.loading = true;
-					// 设置 Cookie
-					if (this.loginForm.rememberMe) {
-						setUsername(this.loginForm.username);
-						setPassword(this.loginForm.password);
-						setRememberMe(this.loginForm.rememberMe);
-						setTenantName(this.loginForm.tenantName);
-					} else {
-						removeUsername();
-						removePassword();
-						removeRememberMe();
-						removeTenantName();
-					}
-					this.loginForm.captchaVerification =
-						captchaParams.captchaVerification;
-					// 发起登陆
-					// console.log("发起登录", this.loginForm);
-					this.$store
-						.dispatch(
-							this.loginForm.loginType === 'sms' ? 'SmsLogin' : 'Login',
-							this.loginForm
-						)
-						.then(() => {
-							this.$router.push({ path: this.redirect || '/' }).catch(() => {});
-						})
-						.catch(() => {
-							this.loading = false;
-						});
-				}
-			});
-		},
-		async doSocialLogin(socialTypeEnum) {
-			// 设置登录中
-			this.loading = true;
-			let tenant = false;
-			if (this.tenantEnable) {
-				await this.$prompt('请输入租户名称', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-				})
-					.then(async ({ value }) => {
-						await getTenantIdByName(value).then((res) => {
-							const tenantId = res.data;
-							tenant = true;
-							if (tenantId && tenantId >= 0) {
-								setTenantId(tenantId);
-							}
-						});
-					})
-					.catch(() => {
-						// 取消登录按钮 loading状态
-						this.loading = false;
+      // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
+      // 弹出验证码
+      this.$refs.verify.show()
+    },
+    getCookie() {
+      const username = getUsername();
+      const password = getPassword();
+      const rememberMe = getRememberMe();
+      const tenantName = getTenantName();
+      this.loginForm = {
+        ...this.loginForm,
+        username: username ? username : this.loginForm.username,
+        password: password ? password : this.loginForm.password,
+        rememberMe: rememberMe ? getRememberMe() : false,
+        tenantName: tenantName ? tenantName : this.loginForm.tenantName,
+      };
+    },
+    handleLogin(captchaParams) {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          // 设置 Cookie
+          if (this.loginForm.rememberMe) {
+            setUsername(this.loginForm.username)
+            setPassword(this.loginForm.password)
+            setRememberMe(this.loginForm.rememberMe)
+            setTenantName(this.loginForm.tenantName)
+          } else {
+            removeUsername()
+            removePassword()
+            removeRememberMe()
+            removeTenantName()
+          }
+          this.loginForm.captchaVerification = captchaParams.captchaVerification
+          // 发起登陆
+          // console.log("发起登录", this.loginForm);
+          this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
+            this.$router.push({ path: this.redirect || "/" }).catch(() => {
+            });
+          }).catch(() => {
+            this.loading = false;
+          });
+        }
+      });
+    },
+    async doSocialLogin(socialTypeEnum) {
+      // 设置登录中
+      this.loading = true;
+      let tenant = false;
+      if (this.tenantEnable) {
+        await this.$prompt('请输入租户名称', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消"
+        }).then(async ({ value }) => {
+          await getTenantIdByName(value).then(res => {
+            const tenantId = res.data;
+            tenant = true
+            if (tenantId && tenantId >= 0) {
+              setTenantId(tenantId)
+            }
+          });
+        }).catch(() => {
+          // 取消登录按钮 loading状态
+          this.loading = false;
 
-						return false;
-					});
-			} else {
-				tenant = true;
-			}
-			if (tenant) {
-				// 计算 redirectUri
-				const redirectUri =
-					location.origin +
-					'/social-login?' +
-					encodeURIComponent(
-						'type=' +
-							socialTypeEnum.type +
-							'&redirect=' +
-							(this.redirect || '/')
-					); // 重定向不能丢
-				// const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback';
-				// const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback';
-				// 进行跳转
-				socialAuthRedirect(
-					socialTypeEnum.type,
-					encodeURIComponent(redirectUri)
-				).then((res) => {
-					// console.log(res.url);
-					window.location.href = res.data;
-				});
-			}
-		},
-		/** ========== 以下为升级短信登录 ========== */
-		getSmsCode() {
-			if (this.mobileCodeTimer > 0) return;
-			this.$refs.loginForm.validate((valid) => {
-				if (!valid) return;
-				sendSmsCode(
-					this.loginForm.mobile,
-					this.scene,
-					this.loginForm.uuid,
-					this.loginForm.code
-				).then((res) => {
-					this.$modal.msgSuccess('获取验证码成功');
-					this.mobileCodeTimer = 60;
-					let msgTimer = setInterval(() => {
-						this.mobileCodeTimer = this.mobileCodeTimer - 1;
-						if (this.mobileCodeTimer <= 0) {
-							clearInterval(msgTimer);
-						}
-					}, 1000);
-				});
-			});
-		},
-	},
+          return false
+        });
+      } else {
+        tenant = true
+      }
+      if (tenant) {
+        // 计算 redirectUri
+        const redirectUri = location.origin + '/social-login?'
+          + encodeURIComponent('type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/")); // 重定向不能丢
+        // const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback';
+        // const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback';
+        // 进行跳转
+        socialAuthRedirect(socialTypeEnum.type, encodeURIComponent(redirectUri)).then((res) => {
+          // console.log(res.url);
+          window.location.href = res.data;
+        });
+      }
+    },
+    /** ========== 以下为升级短信登录 ========== */
+    getSmsCode() {
+      if (this.mobileCodeTimer > 0) return;
+      this.$refs.loginForm.validate(valid => {
+        if (!valid) return;
+        sendSmsCode(this.loginForm.mobile, this.scene, this.loginForm.uuid, this.loginForm.code).then(res => {
+          this.$modal.msgSuccess("获取验证码成功")
+          this.mobileCodeTimer = 60;
+          let msgTimer = setInterval(() => {
+            this.mobileCodeTimer = this.mobileCodeTimer - 1;
+            if (this.mobileCodeTimer <= 0) {
+              clearInterval(msgTimer);
+            }
+          }, 1000);
+        });
+      });
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
-@import '~@/assets/styles/login.scss';
+@import "~@/assets/styles/login.scss";
+
 
 .oauth-login {
-	display: flex;
-	align-items: center;
-	cursor: pointer;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
 }
 
 .oauth-login-item {
-	display: flex;
-	align-items: center;
-	margin-right: 10px;
+  display: flex;
+  align-items: center;
+  margin-right: 10px;
 }
 
 .oauth-login-item img {
-	height: 25px;
-	width: 25px;
+  height: 25px;
+  width: 25px;
 }
 
 .oauth-login-item span:hover {
-	text-decoration: underline red;
-	color: red;
+  text-decoration: underline red;
+  color: red;
 }
 
 .sms-login-mobile-code-prefix {
-	:deep(.el-input__prefix) {
-		top: 22%;
-	}
-}
-</style>
+  :deep(.el-input__prefix) {
+    top: 22%;
+  }
+}</style>

src/views/monitoring/equipmentStatusAndParams/index.vue

@@ -77,6 +77,7 @@ export default {
 					label: '设备名称',
 				},
 				{
+					width: 128,
 					prop: 'equipmentCode',
 					label: '设备编码',
 				},
@@ -116,7 +117,6 @@ export default {
 				{
 					_action: 'params-monitor',
 					label: '操作',
-					width: 56,
 					subcomponent: {
 						props: ['injectData'],
 						render: function (h) {
@@ -124,10 +124,10 @@ export default {
 							return h(
 								'el-button',
 								{
-									class: 'iconfont icon-detail',
 									props: { type: 'text' },
 									on: {
 										click: function () {
+											console.log('inejctdata', _this.injectData);
 											_this.$emit('emitData', {
 												action: _this.injectData._action,
 												// value: _this.injectData.id,
@@ -135,8 +135,8 @@ export default {
 											});
 										},
 									},
-								}
-								// '查看详情'
+								},
+								'查看详情'
 							);
 						},
 					},

src/views/order/base/orderManage/components/orderAdd.vue

@@ -0,0 +1,243 @@
+<template>
+  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form">
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="订单名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="订单号" prop="code">
+          <el-input v-model="form.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="计划加工数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="单价" prop="price">
+          <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="产品规格" prop="productSpec">
+          <el-input v-model="form.productSpec" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="客户" prop="customerId">
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in customerList"
+              :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="priority">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="包装规格" prop="packSpec">
+          <el-input v-model="form.packSpec" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="form.workers"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="关联工艺" prop="processFlowId">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in customerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="物料计算方式" prop="materialMethod">
+          <el-radio-group v-model="form.materialMethod">
+            <el-radio :label="1">产品基础</el-radio>
+            <el-radio :label="2">工艺扩展</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="订单计划开始时间" prop="planStartTime">
+          <el-date-picker
+            v-model="form.planStartTime"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="订单计划完成时间" prop="planFinishTime">
+          <el-date-picker
+            v-model="form.planFinishTime"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='24'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </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>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getOrderCode, getOrderById } from '@/api/base/orderManage'
+import { getProductAll } from '@/api/base/product'
+import { getCustomerList } from '@/api/base/customer'
+export default {
+  name: 'OrderAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        planQuantity: '',
+        planProductId: '',
+        price: '',
+        productSpec: '',
+        customerId: '',
+        priority: '',
+        packSpec: '',
+        workers: '',
+        processFlowId: '',
+        materialMethod: '1',
+        planStartTime: '',
+        planFinishTime: '',
+        remark: '',
+        description: ''
+      },
+      rules: {
+        name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
+        planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
+      },
+      productList: [],
+      customerList: [],
+      isEdit: false //是否是编辑
+    }
+  },
+  methods: {
+    init(id) {
+      this.getList()
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        getOrderById(id).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            // this.selectLeader()
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 订单号
+        getOrderCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    getList() {
+      // 产品
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+      // 客户
+      getCustomerList().then(res => {
+        this.customerList = res.data || []
+      })
+      // 工艺
+    },
+    submitForm() {
+      this.$refs['orderAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            //编辑
+            updateGroupTeam({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            createGroupTeam({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.orderAddForm.resetFields()
+      this.isEdit = false
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,244 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <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="80"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 新增&编辑 -->
+    <base-dialog
+      :dialogTitle="addOrEditTitle"
+      :dialogVisible="centervisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width='70%'
+    >
+      <order-add ref="orderAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+    <!-- 查看详情 -->
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { getOrderPage } from '@/api/base/orderManage'
+import OrderAdd from './components/orderAdd.vue'
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'name',
+    label: '订单名称'
+  },
+  {
+    prop: 'code',
+    label: '订单编码',
+    minWidth: 220
+  },
+  {
+    prop: 'num',
+    label: '客户'
+  },
+  {
+    prop: 'leaderName',
+    label: '来源'
+  },
+  {
+    prop: 'leaderName1',
+    label: '优先级'
+  },
+  {
+    prop: 'leaderNam1e',
+    label: '订单状态'
+  },
+  {
+    prop: 'leaderName3',
+    label: '计划加工量'
+  },
+  {
+    prop: 'leaderName9',
+    label: '实际加工量'
+  },
+  {
+    prop: 'leaderN4ame',
+    label: '产品'
+  },
+  {
+    prop: 'leade2rName',
+    label: '单位'
+  },
+  {
+    prop: 'leaderN11ame',
+    label: '单价(元)'
+  },
+  {
+    prop: 'leaderName22',
+    label: '工单数量'
+  }
+]
+export default {
+  name: 'OrderManage',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名称',
+          placeholder: '订单名称',
+          param: 'name'
+        },
+        {
+          type: 'select',
+          label: '状态',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'status'
+        },
+        {
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: 'separate'
+        },
+        {
+          type: 'button',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        status: null,
+        lastIssuedTime: []
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+        this.$auth.hasPermi('base:group-team:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:group-team:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ].filter((v) => v),
+      addOrEditTitle: '',
+      centervisible: false
+    }
+  },
+  components: { OrderAdd },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    this.getList();
+  },
+  methods: {
+    getList() {
+      getOrderPage({...this.queryParams}).then(res => {
+        console.log(res)
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.queryParams.status = val.status
+        if (val.timeVal.length > 0) {
+          this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
+          this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
+        } else {
+          this.queryParams.lastIssuedTime = []
+        }
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+      }
+    },
+    handleClick(val) {
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.$nextTick(() => {
+            this.$refs.groupList.init(val.data.id)
+          })
+          this.centervisible = true
+          break
+        default:
+        this.handleDelete(val.data)
+      }
+    },
+    // 新增
+    handleCancel() {
+      this.$refs.orderAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.orderAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    },
+  }
+}
+</script>

src/views/quality/base/qualityInspectionDet/index.vue

@@ -42,7 +42,7 @@
 			<DialogForm
 				v-if="open"
 				ref="form"
-				v-model="form"
+				:dataForm="form"
 				:rows="[
 					[
 						{

src/views/quality/base/qualityInspectionType/index.vue

@@ -40,7 +40,7 @@
 			<DialogForm
 				v-if="open"
 				ref="form"
-				v-model="form"
+				:dataForm="form"
 				:rows="[
 					[
 						{

src/views/quality/monitoring/qualityStatistics/graphPage.vue

@@ -64,7 +64,6 @@ export default {
 				name: item.inspectionContent,
 				type: 'bar',
 				barCategoryGap: 12,
-				barWidth: 20,
 				data: [],
 			};
 

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       ['/proxy-api']: {
-        target: `http://localhost:48080`,
+        target: `http://localhost:80`,
         // target: `http://api-dashboard.yudao.iocoder.cn`,
         changeOrigin: true,
         pathRewrite: {

yarn.lock

@@ -1979,15 +1979,20 @@
   "resolved" "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz"
   "version" "7.2.0"
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.1", "acorn@^7.4.0":
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.4.1":
+  "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
+  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
+  "version" "6.4.2"
+
+"acorn@^7.1.1":
   "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
   "version" "7.4.1"
 
-"acorn@^6.4.1":
-  "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
-  "version" "6.4.2"
+"acorn@^7.4.0":
+  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
+  "version" "7.4.1"
 
 "acorn@^8.8.2":
   "integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
@@ -2009,7 +2014,7 @@
   "resolved" "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
   "version" "1.3.1"
 
-"aes-decrypter@^4.0.1", "aes-decrypter@4.0.1":
+"aes-decrypter@^4.0.1":
   "integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
   "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
   "version" "4.0.1"
@@ -2036,6 +2041,16 @@
     "global" "^4.4.0"
     "pkcs7" "^1.0.4"
 
+"aes-decrypter@4.0.1":
+  "integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
+  "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.5"
+    "global" "^4.4.0"
+    "pkcs7" "^1.0.4"
+
 "aggregate-error@^3.0.0":
   "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="
   "resolved" "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
@@ -2074,6 +2089,11 @@
   "resolved" "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-3.2.4.tgz"
   "version" "3.2.4"
 
+"ansi-colors@^4.1.1":
+  "integrity" "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="
+  "resolved" "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.3.tgz"
+  "version" "4.1.3"
+
 "ansi-escapes@^4.2.1", "ansi-escapes@^4.3.0":
   "integrity" "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="
   "resolved" "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
@@ -2111,28 +2131,21 @@
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz"
   "version" "2.2.1"
 
-"ansi-styles@^3.1.0":
+"ansi-styles@^3.1.0", "ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
   "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
   "version" "3.2.1"
   dependencies:
     "color-convert" "^1.9.0"
 
-"ansi-styles@^3.2.0":
-  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
-  "version" "3.2.1"
+"ansi-styles@^4.0.0":
+  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
+  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  "version" "4.3.0"
   dependencies:
-    "color-convert" "^1.9.0"
+    "color-convert" "^2.0.1"
 
-"ansi-styles@^3.2.1":
-  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
-  "version" "3.2.1"
-  dependencies:
-    "color-convert" "^1.9.0"
-
-"ansi-styles@^4.0.0", "ansi-styles@^4.1.0":
+"ansi-styles@^4.1.0":
   "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
   "version" "4.3.0"
@@ -2821,28 +2834,7 @@
   "resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz"
   "version" "3.1.2"
 
-"cacache@^12.0.2":
-  "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
-  "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
-  "version" "12.0.4"
-  dependencies:
-    "bluebird" "^3.5.5"
-    "chownr" "^1.1.1"
-    "figgy-pudding" "^3.5.1"
-    "glob" "^7.1.4"
-    "graceful-fs" "^4.1.15"
-    "infer-owner" "^1.0.3"
-    "lru-cache" "^5.1.1"
-    "mississippi" "^3.0.0"
-    "mkdirp" "^0.5.1"
-    "move-concurrently" "^1.0.1"
-    "promise-inflight" "^1.0.1"
-    "rimraf" "^2.6.3"
-    "ssri" "^6.0.1"
-    "unique-filename" "^1.1.1"
-    "y18n" "^4.0.0"
-
-"cacache@^12.0.3":
+"cacache@^12.0.2", "cacache@^12.0.3":
   "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
   "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
   "version" "12.0.4"
@@ -3335,14 +3327,7 @@
     "map-visit" "^1.0.0"
     "object-visit" "^1.0.0"
 
-"color-convert@^1.9.0":
-  "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
-  "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
-  "version" "1.9.3"
-  dependencies:
-    "color-name" "1.1.3"
-
-"color-convert@^1.9.3":
+"color-convert@^1.9.0", "color-convert@^1.9.3":
   "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
   "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
   "version" "1.9.3"
@@ -3356,16 +3341,16 @@
   dependencies:
     "color-name" "~1.1.4"
 
-"color-name@^1.0.0", "color-name@~1.1.4":
-  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
-  "version" "1.1.4"
-
-"color-name@1.1.3":
+"color-name@^1.0.0", "color-name@1.1.3":
   "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
   "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
   "version" "1.1.3"
 
+"color-name@~1.1.4":
+  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
+  "version" "1.1.4"
+
 "color-string@^1.6.0":
   "integrity" "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="
   "resolved" "https://registry.npmmirror.com/color-string/-/color-string-1.9.1.tgz"
@@ -3394,22 +3379,7 @@
   dependencies:
     "delayed-stream" "~1.0.0"
 
-"commander@*", "commander@2.17.x":
-  "integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
-  "version" "2.17.1"
-
-"commander@^2.18.0":
-  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
-  "version" "2.20.3"
-
-"commander@^2.19.0":
-  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
-  "version" "2.20.3"
-
-"commander@^2.20.0":
+"commander@*", "commander@^2.18.0", "commander@^2.19.0", "commander@^2.20.0":
   "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
   "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
   "version" "2.20.3"
@@ -3424,6 +3394,11 @@
   "resolved" "https://registry.npmmirror.com/commander/-/commander-2.19.0.tgz"
   "version" "2.19.0"
 
+"commander@2.17.x":
+  "integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
+  "version" "2.17.1"
+
 "commondir@^1.0.1":
   "integrity" "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
   "resolved" "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz"
@@ -4310,7 +4285,7 @@
   "resolved" "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
   "version" "1.0.8"
 
-"domutils@^1.5.1":
+"domutils@^1.5.1", "domutils@^1.7.0":
   "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
   "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
   "version" "1.7.0"
@@ -4318,15 +4293,16 @@
     "dom-serializer" "0"
     "domelementtype" "1"
 
-"domutils@^1.7.0":
-  "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
-  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
-  "version" "1.7.0"
+"domutils@^2.5.2":
+  "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
+  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
+  "version" "2.8.0"
   dependencies:
-    "dom-serializer" "0"
-    "domelementtype" "1"
+    "dom-serializer" "^1.0.1"
+    "domelementtype" "^2.2.0"
+    "domhandler" "^4.2.0"
 
-"domutils@^2.5.2", "domutils@^2.8.0":
+"domutils@^2.8.0":
   "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
   "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
   "version" "2.8.0"
@@ -4510,6 +4486,14 @@
     "memory-fs" "^0.5.0"
     "tapable" "^1.0.0"
 
+"enquirer@>= 2.3.0 < 3":
+  "integrity" "sha512-ehu97t6FTYK2I3ZYtnp0BZ9vt0mvEL/cnHBds7Ct6jo9VX1VIkiFhOvVRWh6eblQqd7KOoICIQV+syZ3neXO/Q=="
+  "resolved" "https://registry.npmmirror.com/enquirer/-/enquirer-2.4.0.tgz"
+  "version" "2.4.0"
+  dependencies:
+    "ansi-colors" "^4.1.1"
+    "strip-ansi" "^6.0.1"
+
 "entities@^1.1.1":
   "integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
   "resolved" "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz"
@@ -4541,7 +4525,7 @@
   dependencies:
     "stackframe" "^1.3.4"
 
-"es-abstract@^1.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
+"es-abstract@^1.17.2", "es-abstract@^1.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
   "integrity" "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="
   "resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.1.tgz"
   "version" "1.22.1"
@@ -5147,11 +5131,6 @@
   "resolved" "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
   "version" "2.0.5"
 
-"file-uri-to-path@1.0.0":
-  "integrity" "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-  "resolved" "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
-  "version" "1.0.0"
-
 "filesize@^3.6.1":
   "integrity" "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
   "resolved" "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz"
@@ -5494,14 +5473,7 @@
     "is-glob" "^3.1.0"
     "path-dirname" "^1.0.0"
 
-"glob-parent@^5.0.0":
-  "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
-  "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
-  "version" "5.1.2"
-  dependencies:
-    "is-glob" "^4.0.1"
-
-"glob-parent@~5.1.2":
+"glob-parent@^5.0.0", "glob-parent@~5.1.2":
   "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
   "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
   "version" "5.1.2"
@@ -5704,7 +5676,7 @@
   "resolved" "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz"
   "version" "1.0.1"
 
-"has-symbols@^1.0.2", "has-symbols@^1.0.3":
+"has-symbols@^1.0.1", "has-symbols@^1.0.2", "has-symbols@^1.0.3":
   "integrity" "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
   "resolved" "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz"
   "version" "1.0.3"
@@ -6343,7 +6315,16 @@
     "is-data-descriptor" "^0.1.4"
     "kind-of" "^5.0.0"
 
-"is-descriptor@^1.0.0", "is-descriptor@^1.0.2":
+"is-descriptor@^1.0.0":
+  "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
+  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "is-accessor-descriptor" "^1.0.0"
+    "is-data-descriptor" "^1.0.0"
+    "kind-of" "^6.0.2"
+
+"is-descriptor@^1.0.2":
   "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
   "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
   "version" "1.0.2"
@@ -6367,11 +6348,6 @@
   "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
   "version" "0.1.1"
 
-"is-extendable@^0.1.1":
-  "integrity" "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
-  "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
-  "version" "0.1.1"
-
 "is-extendable@^1.0.1":
   "integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
   "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
@@ -6573,7 +6549,7 @@
   dependencies:
     "is-docker" "^2.0.0"
 
-"isarray@^1.0.0":
+"isarray@^1.0.0", "isarray@~1.0.0", "isarray@1.0.0":
   "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
   "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
   "version" "1.0.0"
@@ -6583,16 +6559,6 @@
   "resolved" "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
   "version" "2.0.5"
 
-"isarray@~1.0.0":
-  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
-  "version" "1.0.0"
-
-"isarray@1.0.0":
-  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
-  "version" "1.0.0"
-
 "isexe@^2.0.0":
   "integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
   "resolved" "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
@@ -6801,7 +6767,14 @@
   "resolved" "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz"
   "version" "1.0.1"
 
-"kind-of@^3.0.2", "kind-of@^3.0.3":
+"kind-of@^3.0.2":
+  "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
+  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
+  "version" "3.2.2"
+  dependencies:
+    "is-buffer" "^1.1.5"
+
+"kind-of@^3.0.3":
   "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
   "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
   "version" "3.2.2"
@@ -7060,23 +7033,7 @@
   "resolved" "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
   "version" "1.1.4"
 
-"lru-cache@^4.0.1":
-  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
-  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
-  "version" "4.1.5"
-  dependencies:
-    "pseudomap" "^1.0.2"
-    "yallist" "^2.1.2"
-
-"lru-cache@^4.1.2":
-  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
-  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
-  "version" "4.1.5"
-  dependencies:
-    "pseudomap" "^1.0.2"
-    "yallist" "^2.1.2"
-
-"lru-cache@^4.1.5":
+"lru-cache@^4.0.1", "lru-cache@^4.1.2", "lru-cache@^4.1.5":
   "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
   "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
   "version" "4.1.5"
@@ -7395,7 +7352,18 @@
     "component-query" "^0.0.3"
     "domify" "^1.3.1"
 
-"min-dom@^3.1.0", "min-dom@^3.1.3":
+"min-dom@^3.1.0":
+  "integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
+  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
+  "version" "3.2.1"
+  dependencies:
+    "component-event" "^0.1.4"
+    "domify" "^1.3.1"
+    "indexof" "0.0.1"
+    "matches-selector" "^1.2.0"
+    "min-dash" "^3.8.1"
+
+"min-dom@^3.1.3":
   "integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
   "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
   "version" "3.2.1"
@@ -7522,22 +7490,38 @@
     "for-in" "^1.0.2"
     "is-extendable" "^1.0.1"
 
-"mkdirp@^0.5.1", "mkdirp@^0.5.3", "mkdirp@^0.5.6", "mkdirp@~0.5.1":
+"mkdirp@^0.5.1":
   "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
   "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
   "version" "0.5.6"
   dependencies:
     "minimist" "^1.2.6"
 
-"mkdirp@^1.0.3":
+"mkdirp@^0.5.3":
+  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
+  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
+  "version" "0.5.6"
+  dependencies:
+    "minimist" "^1.2.6"
+
+"mkdirp@^0.5.6":
+  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
+  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
+  "version" "0.5.6"
+  dependencies:
+    "minimist" "^1.2.6"
+
+"mkdirp@^1.0.3", "mkdirp@^1.0.4":
   "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
   "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
   "version" "1.0.4"
 
-"mkdirp@^1.0.4":
-  "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
-  "version" "1.0.4"
+"mkdirp@~0.5.1":
+  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
+  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
+  "version" "0.5.6"
+  dependencies:
+    "minimist" "^1.2.6"
 
 "mockjs@^1.1.0":
   "integrity" "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ=="
@@ -7940,7 +7924,7 @@
     "define-properties" "^1.1.4"
     "es-abstract" "^1.20.4"
 
-"object.getownpropertydescriptors@^2.0.3":
+"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
   "integrity" "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="
   "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"
   "version" "2.1.6"
@@ -8010,7 +7994,14 @@
   dependencies:
     "mimic-fn" "^1.0.0"
 
-"onetime@^5.1.0", "onetime@^5.1.2":
+"onetime@^5.1.0":
+  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
+  "resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
+  "version" "5.1.2"
+  dependencies:
+    "mimic-fn" "^2.1.0"
+
+"onetime@^5.1.2":
   "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
   "resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
   "version" "5.1.2"
@@ -8751,7 +8742,7 @@
     "source-map" "^0.5.6"
     "supports-color" "^3.2.3"
 
-"postcss@^7.0.0", "postcss@^7.0.1", "postcss@^7.0.14", "postcss@^7.0.27", "postcss@^7.0.32", "postcss@^7.0.36", "postcss@^7.0.5", "postcss@^7.0.6", "postcss@>4 <9":
+"postcss@^7.0.0":
   "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
   "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
   "version" "7.0.39"
@@ -8759,16 +8750,63 @@
     "picocolors" "^0.2.1"
     "source-map" "^0.6.1"
 
-"postcss@^8.1.10":
-  "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
-  "version" "8.4.27"
+"postcss@^7.0.1":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
   dependencies:
-    "nanoid" "^3.3.6"
-    "picocolors" "^1.0.0"
-    "source-map-js" "^1.0.2"
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
 
-"postcss@^8.4.14":
+"postcss@^7.0.14":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
+  dependencies:
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
+
+"postcss@^7.0.27":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
+  dependencies:
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
+
+"postcss@^7.0.32":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
+  dependencies:
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
+
+"postcss@^7.0.36":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
+  dependencies:
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
+
+"postcss@^7.0.5":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
+  dependencies:
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
+
+"postcss@^7.0.6":
+  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  "version" "7.0.39"
+  dependencies:
+    "picocolors" "^0.2.1"
+    "source-map" "^0.6.1"
+
+"postcss@^8.1.10", "postcss@^8.4.14", "postcss@>4 <9":
   "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
   "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
   "version" "8.4.27"
@@ -9350,21 +9388,7 @@
   "resolved" "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz"
   "version" "1.0.1"
 
-"rimraf@^2.5.4":
-  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
-  "version" "2.7.1"
-  dependencies:
-    "glob" "^7.1.3"
-
-"rimraf@^2.6.1":
-  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
-  "version" "2.7.1"
-  dependencies:
-    "glob" "^7.1.3"
-
-"rimraf@^2.6.3":
+"rimraf@^2.5.4", "rimraf@^2.6.1", "rimraf@^2.6.3":
   "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
   "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
   "version" "2.7.1"
@@ -9592,17 +9616,32 @@
   dependencies:
     "node-forge" "^0.10.0"
 
-"semver@^5.5.0":
+"semver@^5.5.0", "semver@^5.6.0", "semver@2 || 3 || 4 || 5":
   "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
   "version" "5.7.2"
 
-"semver@^5.6.0":
-  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
-  "version" "5.7.2"
+"semver@^6.0.0":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
 
-"semver@^6.0.0", "semver@^6.1.0", "semver@^6.1.2", "semver@^6.3.0", "semver@^6.3.1":
+"semver@^6.1.0":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^6.1.2":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^6.3.0":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^6.3.1":
   "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
   "version" "6.3.1"
@@ -9628,11 +9667,6 @@
   dependencies:
     "lru-cache" "^6.0.0"
 
-"semver@2 || 3 || 4 || 5":
-  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
-  "version" "5.7.2"
-
 "send@0.18.0":
   "integrity" "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="
   "resolved" "https://registry.npmmirror.com/send/-/send-0.18.0.tgz"
@@ -10310,7 +10344,14 @@
   dependencies:
     "has-flag" "^3.0.0"
 
-"supports-color@^7.0.0", "supports-color@^7.1.0":
+"supports-color@^7.0.0":
+  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
+  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
+  "version" "7.2.0"
+  dependencies:
+    "has-flag" "^4.0.0"
+
+"supports-color@^7.1.0":
   "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
   "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
   "version" "7.2.0"
@@ -10963,7 +11004,17 @@
   "resolved" "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
   "version" "1.0.2"
 
-"util.promisify@~1.0.0", "util.promisify@1.0.0":
+"util.promisify@~1.0.0":
+  "integrity" "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="
+  "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.1.tgz"
+  "version" "1.0.1"
+  dependencies:
+    "define-properties" "^1.1.3"
+    "es-abstract" "^1.17.2"
+    "has-symbols" "^1.0.1"
+    "object.getownpropertydescriptors" "^2.1.0"
+
+"util.promisify@1.0.0":
   "integrity" "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="
   "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.0.tgz"
   "version" "1.0.0"
@@ -11271,7 +11322,7 @@
   dependencies:
     "deepmerge" "^4.2.2"
 
-"vue-plugin-hiprint@0.0.54-fix":
+"vue-plugin-hiprint@^0.0.54-fix":
   "integrity" "sha512-WVUQdTIsxixS1VFr5nNIa0Hztrb9szJgS3z4MPUvu9gdqdu32lU3Jhux8QBTeVYrjIfNGuiNKNn5WUb+A5RK5Q=="
   "resolved" "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.54-fix.tgz"
   "version" "0.0.54-fix"
@@ -11479,7 +11530,7 @@
     "source-list-map" "^2.0.0"
     "source-map" "~0.6.1"
 
-"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
+"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
   "integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
   "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
   "version" "4.46.0"
@@ -11629,14 +11680,7 @@
   dependencies:
     "mkdirp" "^0.5.1"
 
-"ws@^6.0.0":
-  "integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
-  "resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
-  "version" "6.2.2"
-  dependencies:
-    "async-limiter" "~1.0.0"
-
-"ws@^6.2.1":
+"ws@^6.0.0", "ws@^6.2.1":
   "integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
   "resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
   "version" "6.2.2"