xiugai

ry-bug
更新
2025-10-10 13:12:52 +08:00 · 2025-03-10 16:33:55 +08:00 · 2025-02-27 13:54:28 +08:00 · 2025-02-24 14:10:34 +08:00 · 2025-02-19 14:13:47 +08:00 · 2025-01-16 08:34:17 +08:00
356 changed files with 58652 additions and 5546 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -1,14 +1,19 @@
+###
+ # @Author: Do not edit
+ # @Date: 2023-08-29 09:40:39
+ # @LastEditTime: 2024-11-25 14:31:39
+ # @LastEditors: zwq
+ # @Description:
+###
 # 开发环境配置
 ENV = 'development'

 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 智能监控分析系统

 # 芋道管理系统/开发环境
-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.8.22:48080'
+VUE_APP_BASE_API = 'http://172.16.32.79:48082'

 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/.env.front
+++ b/.env.front
@@ -2,7 +2,7 @@
 ENV = 'development'

 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 产线监控系统

 # 芋道管理系统/本地环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
--- a/.env.prod
+++ b/.env.prod
@@ -1,14 +1,25 @@
+###
+ # @Author: zwq
+ # @Date: 2024-03-27 15:49:55
+ # @LastEditors: zwq
+ # @LastEditTime: 2024-10-30 11:08:47
+ # @Description:
+###
 # 生产环境配置
 ENV = 'production'

 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 智能监控分析系统

 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = ''

 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+# PUBLIC_PATH = 'http://192.168.0.33:8888/'
+PUBLIC_PATH = ''
+
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'

--- a/.env.stage
+++ b/.env.stage
@@ -1,7 +1,7 @@
 NODE_ENV = production

 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 产线监控系统

 # 测试环境配置
 ENV = 'staging'
--- a/.env.static
+++ b/.env.static
@@ -4,7 +4,7 @@ NODE_ENV = development
 ENV = 'staging'

 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 产线监控系统

 # 芋道管理系统/测试环境
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ selenium-debug.log
 *.local

 package-lock.json
+echarts.js
--- a/dist.zip
+++ b/dist.zip
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
  "license": "MIT",
  "scripts": {
    "local": "vue-cli-service serve --mode local",
-    "dev": "vue-cli-service serve --mode dev",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
    "front": "vue-cli-service serve --mode front",
-    "build:prod": "vue-cli-service build --mode prod",
+    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
    "build:stage": "vue-cli-service build --mode stage",
    "build:dev": "vue-cli-service build --mode dev",
    "build:static": "vue-cli-service build --mode static",
@@ -50,31 +50,40 @@
    "code-brick-zj": "^1.0.2",
    "core-js": "^3.26.0",
    "crypto-js": "^4.0.0",
+    "diagram-js": "^12.3.0",
    "echarts": "5.4.0",
    "element-ui": "2.15.12",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
    "fuse.js": "6.6.2",
    "highlight.js": "9.18.5",
+    "html2canvas": "^1.4.1",
    "js-beautify": "1.13.0",
    "jsencrypt": "3.3.1",
+    "jspdf": "^2.5.1",
    "min-dash": "3.5.2",
+    "mockjs": "^1.1.0",
    "moment": "^2.29.4",
    "nprogress": "0.2.0",
    "qrcode.vue": "^1.7.0",
+    "qs": "^6.11.2",
    "quill": "1.3.7",
    "screenfull": "5.0.2",
    "sortablejs": "1.10.2",
    "throttle-debounce": "2.1.0",
+    "video.js": "^8.5.2",
    "vue": "2.7.14",
    "vue-count-to": "1.0.13",
    "vue-cropper": "0.5.8",
    "vue-meta": "^2.4.0",
+    "vue-plugin-hiprint": "0.0.54-fix",
    "vue-quill-editor": "^3.0.6",
    "vue-router": "3.4.9",
    "vue-video-player": "^5.0.2",
    "vuedraggable": "2.24.3",
    "vuex": "3.6.2",
-    "xml-js": "1.6.11"
+    "xlsx": "^0.18.5",
+    "xml-js": "1.6.11",
+    "yorkie": "^2.0.0"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "4.5.18",
@@ -88,7 +97,7 @@
    "chalk": "4.1.0",
    "compression-webpack-plugin": "5.0.2",
    "connect": "3.6.6",
-    "eslint": "7.15.0",
+    "eslint": "6.8.0",
    "eslint-config-airbnb-base": "^14.0.0",
    "eslint-plugin-import": "^2.26.0",
    "eslint-plugin-prettier": "^3.1.0",
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -1,215 +1,218 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-		<meta name="renderer" content="webkit" />
-		<meta
-			name="viewport"
-			content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-		<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-		<title><%= webpackConfig.name %></title>
-		<!--[if lt IE 11]>
+
+<head>
+	<meta charset="utf-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+	<meta name="renderer" content="webkit" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+	<link rel="stylesheet" type="text/css" media="print" href="<%= BASE_URL %>print-lock.css">
+	<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+	<title>
+		<%= webpackConfig.name %>
+	</title>
+	<!--[if lt IE 11]>
 			<script>
 				window.location.href = 'html/ie.html';
 			</script>
 		<![endif]-->
-		<style>
-			html,
-			body,
-			#app {
-				height: 100%;
-				margin: 0px;
-				padding: 0px;
+	<style>
+		html,
+		body,
+		#app {
+			height: 100%;
+			margin: 0px;
+			padding: 0px;
+		}
+
+		.chromeframe {
+			margin: 0.2em 0;
+			background: #ccc;
+			color: #000;
+			padding: 0.2em 0;
+		}
+
+		#loader-wrapper {
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 999999;
+		}
+
+		#loader {
+			display: block;
+			position: relative;
+			left: 50%;
+			top: 50%;
+			width: 150px;
+			height: 150px;
+			margin: -75px 0 0 -75px;
+			border-radius: 50%;
+			border: 3px solid transparent;
+			border-top-color: #fff;
+			-webkit-animation: spin 2s linear infinite;
+			-ms-animation: spin 2s linear infinite;
+			-moz-animation: spin 2s linear infinite;
+			-o-animation: spin 2s linear infinite;
+			animation: spin 2s linear infinite;
+			z-index: 1001;
+		}
+
+		#loader:before {
+			content: '';
+			position: absolute;
+			top: 5px;
+			left: 5px;
+			right: 5px;
+			bottom: 5px;
+			border-radius: 50%;
+			border: 3px solid transparent;
+			border-top-color: #fff;
+			-webkit-animation: spin 3s linear infinite;
+			-moz-animation: spin 3s linear infinite;
+			-o-animation: spin 3s linear infinite;
+			-ms-animation: spin 3s linear infinite;
+			animation: spin 3s linear infinite;
+		}
+
+		#loader:after {
+			content: '';
+			position: absolute;
+			top: 15px;
+			left: 15px;
+			right: 15px;
+			bottom: 15px;
+			border-radius: 50%;
+			border: 3px solid transparent;
+			border-top-color: #fff;
+			-moz-animation: spin 1.5s linear infinite;
+			-o-animation: spin 1.5s linear infinite;
+			-ms-animation: spin 1.5s linear infinite;
+			-webkit-animation: spin 1.5s linear infinite;
+			animation: spin 1.5s linear infinite;
+		}
+
+		@-webkit-keyframes spin {
+			0% {
+				-webkit-transform: rotate(0deg);
+				-ms-transform: rotate(0deg);
+				transform: rotate(0deg);
 			}

-			.chromeframe {
-				margin: 0.2em 0;
-				background: #ccc;
-				color: #000;
-				padding: 0.2em 0;
+			100% {
+				-webkit-transform: rotate(360deg);
+				-ms-transform: rotate(360deg);
+				transform: rotate(360deg);
+			}
+		}
+
+		@keyframes spin {
+			0% {
+				-webkit-transform: rotate(0deg);
+				-ms-transform: rotate(0deg);
+				transform: rotate(0deg);
 			}

-			#loader-wrapper {
-				position: fixed;
-				top: 0;
-				left: 0;
-				width: 100%;
-				height: 100%;
-				z-index: 999999;
+			100% {
+				-webkit-transform: rotate(360deg);
+				-ms-transform: rotate(360deg);
+				transform: rotate(360deg);
 			}
+		}

-			#loader {
-				display: block;
-				position: relative;
-				left: 50%;
-				top: 50%;
-				width: 150px;
-				height: 150px;
-				margin: -75px 0 0 -75px;
-				border-radius: 50%;
-				border: 3px solid transparent;
-				border-top-color: #fff;
-				-webkit-animation: spin 2s linear infinite;
-				-ms-animation: spin 2s linear infinite;
-				-moz-animation: spin 2s linear infinite;
-				-o-animation: spin 2s linear infinite;
-				animation: spin 2s linear infinite;
-				z-index: 1001;
-			}
+		#loader-wrapper .loader-section {
+			position: fixed;
+			top: 0;
+			width: 51%;
+			height: 100%;
+			background: #7171c6;
+			z-index: 1000;
+			-webkit-transform: translateX(0);
+			-ms-transform: translateX(0);
+			transform: translateX(0);
+		}

-			#loader:before {
-				content: '';
-				position: absolute;
-				top: 5px;
-				left: 5px;
-				right: 5px;
-				bottom: 5px;
-				border-radius: 50%;
-				border: 3px solid transparent;
-				border-top-color: #fff;
-				-webkit-animation: spin 3s linear infinite;
-				-moz-animation: spin 3s linear infinite;
-				-o-animation: spin 3s linear infinite;
-				-ms-animation: spin 3s linear infinite;
-				animation: spin 3s linear infinite;
-			}
+		#loader-wrapper .loader-section.section-left {
+			left: 0;
+		}

-			#loader:after {
-				content: '';
-				position: absolute;
-				top: 15px;
-				left: 15px;
-				right: 15px;
-				bottom: 15px;
-				border-radius: 50%;
-				border: 3px solid transparent;
-				border-top-color: #fff;
-				-moz-animation: spin 1.5s linear infinite;
-				-o-animation: spin 1.5s linear infinite;
-				-ms-animation: spin 1.5s linear infinite;
-				-webkit-animation: spin 1.5s linear infinite;
-				animation: spin 1.5s linear infinite;
-			}
+		#loader-wrapper .loader-section.section-right {
+			right: 0;
+		}

-			@-webkit-keyframes spin {
-				0% {
-					-webkit-transform: rotate(0deg);
-					-ms-transform: rotate(0deg);
-					transform: rotate(0deg);
-				}
+		.loaded #loader-wrapper .loader-section.section-left {
+			-webkit-transform: translateX(-100%);
+			-ms-transform: translateX(-100%);
+			transform: translateX(-100%);
+			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+		}

-				100% {
-					-webkit-transform: rotate(360deg);
-					-ms-transform: rotate(360deg);
-					transform: rotate(360deg);
-				}
-			}
+		.loaded #loader-wrapper .loader-section.section-right {
+			-webkit-transform: translateX(100%);
+			-ms-transform: translateX(100%);
+			transform: translateX(100%);
+			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+		}

-			@keyframes spin {
-				0% {
-					-webkit-transform: rotate(0deg);
-					-ms-transform: rotate(0deg);
-					transform: rotate(0deg);
-				}
+		.loaded #loader {
+			opacity: 0;
+			-webkit-transition: all 0.3s ease-out;
+			transition: all 0.3s ease-out;
+		}

-				100% {
-					-webkit-transform: rotate(360deg);
-					-ms-transform: rotate(360deg);
-					transform: rotate(360deg);
-				}
-			}
+		.loaded #loader-wrapper {
+			visibility: hidden;
+			-webkit-transform: translateY(-100%);
+			-ms-transform: translateY(-100%);
+			transform: translateY(-100%);
+			-webkit-transition: all 0.3s 1s ease-out;
+			transition: all 0.3s 1s ease-out;
+		}

-			#loader-wrapper .loader-section {
-				position: fixed;
-				top: 0;
-				width: 51%;
-				height: 100%;
-				background: #7171c6;
-				z-index: 1000;
-				-webkit-transform: translateX(0);
-				-ms-transform: translateX(0);
-				transform: translateX(0);
-			}
+		.no-js #loader-wrapper {
+			display: none;
+		}

-			#loader-wrapper .loader-section.section-left {
-				left: 0;
-			}
+		.no-js h1 {
+			color: #222222;
+		}

-			#loader-wrapper .loader-section.section-right {
-				right: 0;
-			}
+		#loader-wrapper .load_title {
+			font-family: 'Open Sans';
+			color: #fff;
+			font-size: 19px;
+			width: 100%;
+			text-align: center;
+			z-index: 9999999999999;
+			position: absolute;
+			top: 60%;
+			opacity: 1;
+			line-height: 30px;
+		}

-			.loaded #loader-wrapper .loader-section.section-left {
-				-webkit-transform: translateX(-100%);
-				-ms-transform: translateX(-100%);
-				transform: translateX(-100%);
-				-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-				transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-			}
+		#loader-wrapper .load_title span {
+			font-weight: normal;
+			font-style: italic;
+			font-size: 13px;
+			color: #fff;
+			opacity: 0.5;
+		}
+	</style>
+</head>

-			.loaded #loader-wrapper .loader-section.section-right {
-				-webkit-transform: translateX(100%);
-				-ms-transform: translateX(100%);
-				transform: translateX(100%);
-				-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-				transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-			}
-
-			.loaded #loader {
-				opacity: 0;
-				-webkit-transition: all 0.3s ease-out;
-				transition: all 0.3s ease-out;
-			}
-
-			.loaded #loader-wrapper {
-				visibility: hidden;
-				-webkit-transform: translateY(-100%);
-				-ms-transform: translateY(-100%);
-				transform: translateY(-100%);
-				-webkit-transition: all 0.3s 1s ease-out;
-				transition: all 0.3s 1s ease-out;
-			}
-
-			.no-js #loader-wrapper {
-				display: none;
-			}
-
-			.no-js h1 {
-				color: #222222;
-			}
-
-			#loader-wrapper .load_title {
-				font-family: 'Open Sans';
-				color: #fff;
-				font-size: 19px;
-				width: 100%;
-				text-align: center;
-				z-index: 9999999999999;
-				position: absolute;
-				top: 60%;
-				opacity: 1;
-				line-height: 30px;
-			}
-
-			#loader-wrapper .load_title span {
-				font-weight: normal;
-				font-style: italic;
-				font-size: 13px;
-				color: #fff;
-				opacity: 0.5;
-			}
-		</style>
-	</head>
-
-	<body>
-		<div id="app">
-			<div id="loader-wrapper">
-				<div id="loader"></div>
-				<div class="loader-section section-left"></div>
-				<div class="loader-section section-right"></div>
-				<div class="load_title">正在加载系统资源，请耐心等待</div>
-			</div>
+<body>
+	<div id="app">
+		<div id="loader-wrapper">
+			<div id="loader"></div>
+			<div class="loader-section section-left"></div>
+			<div class="loader-section section-right"></div>
+			<div class="load_title">正在加载系统资源，请耐心等待</div>
 		</div>
-	</body>
-</html>
+	</div>
+</body>
+
+</html>
--- a/public/print-lock.css
+++ b/public/print-lock.css
@@ -0,0 +1,339 @@
+@media print {
+  body {
+    margin: 0px;
+    padding: 0px;
+  }
+}
+
+@page {
+  margin: 0;
+}
+
+.hiprint-printPaper * {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box; /* Firefox */
+  -webkit-box-sizing: border-box; /* Safari */
+}
+
+.hiprint-printPaper *:focus {
+  outline: -webkit-focus-ring-color auto 0px;
+}
+
+.hiprint-printPaper {
+  position: relative;
+  padding: 0 0 0 0;
+  page-break-after: always;
+  -webkit-user-select: none; /* Chrome/Safari/Opera */
+  -moz-user-select: none; /* Firefox */
+  user-select: none;
+  overflow-x: hidden;
+  overflow: hidden;
+}
+
+.hiprint-printPaper .hiprint-printPaper-content {
+  position: relative;
+}
+
+/* 火狐浏览器打印 第一页过后 重叠问题 */
+@-moz-document url-prefix() {
+  .hiprint-printPaper .hiprint-printPaper-content {
+    position: relative;
+    margin-top: 20px;
+    top: -20px
+  }
+}
+
+.hiprint-printPaper.design {
+  overflow: visible;
+}
+
+
+.hiprint-printTemplate .hiprint-printPanel {
+  page-break-after: always;
+}
+
+.hiprint-printPaper, hiprint-printPanel {
+  box-sizing: border-box;
+  border: 0px;
+}
+
+.hiprint-printPanel .hiprint-printPaper:last-child {
+  page-break-after: avoid;
+}
+
+.hiprint-printTemplate .hiprint-printPanel:last-child {
+  page-break-after: avoid;
+}
+
+.hiprint-printPaper .hideheaderLinetarget {
+  border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper .hidefooterLinetarget {
+  border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper.design {
+  border: 1px dashed rgba(170, 170, 170, 0.7);
+}
+
+.design .hiprint-printElement-table-content, .design .hiprint-printElement-longText-content {
+  overflow: hidden;
+  box-sizing: border-box;
+}
+
+.design .resize-panel {
+  box-sizing: border-box;
+  border: 1px dotted;
+}
+
+.hiprint-printElement-text {
+  background-color: transparent;
+  background-repeat: repeat;
+  padding: 0 0 0 0;
+  border: 0.75pt none rgb(0, 0, 0);
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  line-height: 9.75pt;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+
+.design .hiprint-printElement-text-content {
+  border: 1px dashed rgb(206, 188, 188);
+  box-sizing: border-box;
+}
+
+.hiprint-printElement-longText {
+  background-color: transparent;
+  background-repeat: repeat;
+  border: 0.75pt none rgb(0, 0, 0);
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  line-height: 9.75pt;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+  /*white-space: pre-wrap*/
+}
+
+
+.hiprint-printElement-table {
+  background-color: transparent;
+  background-repeat: repeat;
+  color: rgb(0, 0, 0);
+  border-color: rgb(0, 0, 0);
+  border-style: none;
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  padding: 0 0 0 0;
+  box-sizing: border-box;
+  line-height: 9.75pt;
+}
+
+.hiprint-printElement-table thead {
+  background: #e8e8e8;
+  font-weight: 700;
+}
+
+.hiprint-printElement-tableTarget, .hiprint-printElement-tableTarget tr, .hiprint-printElement-tableTarget td {
+  border-color: rgb(0, 0, 0);
+  /*border-style: none;*/
+  /*border: 1px solid rgb(0, 0, 0);*/
+  font-weight: normal;
+  direction: ltr;
+  padding-bottom: 0pt;
+  padding-left: 4pt;
+  padding-right: 4pt;
+  padding-top: 0pt;
+  text-decoration: none;
+  vertical-align: middle;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+  /*line-height: 9.75pt;
+  font-size: 9pt;*/
+}
+
+.hiprint-printElement-tableTarget-border-all {
+  border: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-none {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-lr {
+  border-left: 1px solid;
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-left {
+  border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-right {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-tb {
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-top {
+  border-top: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-bottom {
+  border-bottom: 1px solid;
+}
+
+.hiprint-printElement-tableTarget-border-td-none td {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:not(:last-child) {
+  border-right: 1px solid;
+}
+
+/*.hiprint-printElement-tableTarget tr,*/
+.hiprint-printElement-tableTarget td {
+  height: 18pt;
+}
+
+.hiprint-printPaper .hiprint-paperNumber {
+  font-size: 9pt;
+}
+
+.design .hiprint-printElement-table-handle {
+  position: absolute;
+  height: 21pt;
+  width: 21pt;
+  background: red;
+  z-index: 1;
+}
+
+.hiprint-printPaper .hiprint-paperNumber-disabled {
+  float: right !important;
+  right: 0 !important;
+  color: gainsboro !important;
+}
+
+.hiprint-printElement-vline, .hiprint-printElement-hline {
+  border: 0px none rgb(0, 0, 0);
+
+}
+
+.hiprint-printElement-vline {
+  border-left: 0.75pt solid #000;
+  border-right: 0px none rgb(0, 0, 0) !important;
+  border-bottom: 0px none rgb(0, 0, 0) !important;
+  border-top: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-hline {
+  border-top: 0.75pt solid #000;
+  border-right: 0px none rgb(0, 0, 0) !important;
+  border-bottom: 0px none rgb(0, 0, 0) !important;
+  border-left: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-oval, .hiprint-printElement-rect {
+  border: 0.75pt solid #000;
+}
+
+.hiprint-text-content-middle {
+}
+
+.hiprint-text-content-middle > div {
+  display: grid;
+  align-items: center;
+}
+
+.hiprint-text-content-bottom {
+}
+
+.hiprint-text-content-bottom > div {
+  display: grid;
+  align-items: flex-end;
+}
+
+.hiprint-text-content-wrap {
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-nowrap {
+  white-space: nowrap;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-clip {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: clip;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/*hi-grid-row */
+.hi-grid-row {
+  position: relative;
+  height: auto;
+  margin-right: 0;
+  margin-left: 0;
+  zoom: 1;
+  display: block;
+  box-sizing: border-box;
+}
+
+.hi-grid-row::after, .hi-grid-row::before {
+  display: table;
+  content: '';
+  box-sizing: border-box;
+}
+
+.hi-grid-col {
+  display: block;
+  box-sizing: border-box;
+  position: relative;
+  float: left;
+  flex: 0 0 auto;
+}
+
+.table-grid-row {
+  margin-left: -0pt;
+  margin-right: -0pt;
+}
+
+.tableGridColumnsGutterRow {
+  padding-left: 0pt;
+  padding-right: 0pt;
+}
+
+.hiprint-gridColumnsFooter {
+  text-align: left;
+  clear: both;
+}
--- a/public/static/videos/login.webm
+++ b/public/static/videos/login.webm
--- a/src/api/analysis/energyAnalysis.js
+++ b/src/api/analysis/energyAnalysis.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 获取走势分析数据
+export function getEnergyTrend(data) {
+  return request({
+    url: '/analysis/energy-analysis/getTrend',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取对比分析数据
+export function getCompare(data) {
+  return request({
+    url: '/analysis/energy-analysis/getCompare',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取同比分析数据(1:季度,2:月;3:日)
+export function getYoy(data) {
+  return request({
+    url: '/analysis/energy-analysis/getYoy',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取环比分析数据(1:月,2:周,3:日)
+export function getQoq(data) {
+  return request({
+    url: '/analysis/energy-analysis/getChain',
+    method: 'post',
+    data: data
+  })
+}
--- a/src/api/base/energyPlc.js
+++ b/src/api/base/energyPlc.js
@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 创建能源实时数据库plc相关
+export function createEnergyPlc(data) {
+  return request({
+    url: '/base/energy-plc/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源实时数据库plc相关
+export function updateEnergyPlc(data) {
+  return request({
+    url: '/base/energy-plc/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源实时数据库plc相关
+export function getEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得实时数据表列表(所有)
+export function getEnergyPlcAll() {
+  return request({
+    url: '/base/energy-plc/listAll',
+    method: 'get'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/energyPlcConnect.js
+++ b/src/api/base/energyPlcConnect.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建能源与对象的关联关系（一对多）
+export function createEnergyPlcConnect(data) {
+  return request({
+    url: '/base/energy-plc-connect/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源与对象的关联关系（一对多）
+export function updateEnergyPlcConnect(data) {
+  return request({
+    url: '/base/energy-plc-connect/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源与对象的关联关系（一对多）
+export function deleteEnergyPlcConnect(id) {
+  return request({
+    url: '/base/energy-plc-connect/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源与对象的关联关系（一对多）
+export function getEnergyPlcConnect(id) {
+  return request({
+    url: '/base/energy-plc-connect/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源与对象的关联关系（一对多）分页
+export function getEnergyPlcConnectPage(data) {
+  return request({
+    url: '/base/energy-plc-connect/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源与对象的关联关系（一对多） Excel
+export function exportEnergyPlcConnectExcel(query) {
+  return request({
+    url: '/base/energy-plc-connect/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/energyPlcParam.js
+++ b/src/api/base/energyPlcParam.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建能源plc详细点
+export function createEnergyPlcParam(data) {
+  return request({
+    url: '/base/energy-plc-param/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源plc详细点
+export function updateEnergyPlcParam(data) {
+  return request({
+    url: '/base/energy-plc-param/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源plc详细点
+export function deleteEnergyPlcParam(id) {
+  return request({
+    url: '/base/energy-plc-param/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源plc详细点
+export function getEnergyPlcParam(id) {
+  return request({
+    url: '/base/energy-plc-param/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源plc详细点分页
+export function getEnergyPlcParamPage(data) {
+  return request({
+    url: '/base/energy-plc-param/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源plc详细点 Excel
+export function exportEnergyPlcParamExcel(query) {
+  return request({
+    url: '/base/energy-plc-param/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/energyQuantityManual.js
+++ b/src/api/base/energyQuantityManual.js
@@ -0,0 +1,86 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-11 15:00:03
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-12 10:25:30
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得分页数据
+export function energyQuantityManualPage(query) {
+  return request({
+    url: '/base/energy-quantity-manual/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建
+export function energyQuantityManualCreate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function energyQuantityManualUpdate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/update',
+    method: 'put',
+    data: data
+  })
+}
+
+//获得能源抄表（手动）
+export function energyQuantityManualGet(query) {
+  return request({
+    url: '/base/energy-quantity-manual/get',
+    method: 'get',
+    params: query
+  })
+}
+
+//删除
+export function energyQuantityManualDelete(query) {
+  return request({
+    url: '/base/energy-quantity-manual/delete',
+    method: 'delete',
+    params: query
+  })
+}
+
+//导出
+export function energyQuantityManualExport(query) {
+  return request({
+    url: '/base/energy-quantity-manual/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得能源表名配置分页
+export function energyTablePage() {
+  return request({
+    url: '/base/energy-type-meter-bind/list',
+    method: 'get',
+  })
+}
+// 获得能源表名配置
+export function energyTableGet(query) {
+  return request({
+    url: '/base/energy-type-meter-bind/list',
+    method: 'get',
+    params: query
+  })
+}
+// 更新能源表名配置
+export function energyTableUpdate(data) {
+  return request({
+    url: '/base/energy-type-meter-bind/update',
+    method: 'put',
+    data: data
+  })
+}
--- a/src/api/base/energyQuantityRealtime.js
+++ b/src/api/base/energyQuantityRealtime.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建后端统计 能源抄表 实时
+export function createEnergyQuantityRealtime(data) {
+  return request({
+    url: '/base/energy-quantity-realtime/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新后端统计 能源抄表 实时
+export function updateEnergyQuantityRealtime(data) {
+  return request({
+    url: '/base/energy-quantity-realtime/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除后端统计 能源抄表 实时
+export function deleteEnergyQuantityRealtime(id) {
+  return request({
+    url: '/base/energy-quantity-realtime/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得后端统计 能源抄表 实时
+export function getEnergyQuantityRealtime(id) {
+  return request({
+    url: '/base/energy-quantity-realtime/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得后端统计 能源抄表 实时分页
+export function getEnergyQuantityRealtimePage(data) {
+  return request({
+    url: '/base/energy-quantity-realtime/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出后端统计 能源抄表 实时 Excel
+export function exportEnergyQuantityRealtimeExcel(data) {
+  return request({
+    url: '/base/energy-quantity-realtime/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/energyType.js
+++ b/src/api/base/energyType.js
@@ -43,6 +43,14 @@ export function getEnergyTypePage(data) {
  })
 }

+// 获得能源类型列表(获取所有)
+export function getEnergyTypeListAll() {
+  return request({
+    url: '/base/energy-type/listAll',
+    method: 'get'
+  })
+}
+
 // 获得能源类型编码
 export function getEnergyTypeCode() {
  return request({
--- a/src/api/base/equipment.js
+++ b/src/api/base/equipment.js
@@ -52,3 +52,10 @@ export function exportEquipmentExcel(query) {
    responseType: 'blob'
  })
 }
+// 获得所有设备列表
+export function getEquipmentAll() {
+  return request({
+    url: '/base/equipment/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/base/equipmentConfig.js
+++ b/src/api/base/equipmentConfig.js
@@ -0,0 +1,53 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2024-02-21 13:43:02
+ * @LastEditTime: 2024-04-30 10:07:59
+ * @LastEditors: zwq
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得关联表名
+export function getplcAllList(query) {
+  return request({
+    url: '/base/equipment-plc/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备
+export function getEquipmentList(query) {
+  return request({
+    url: '/base/core-equipment/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据产线获得工段
+export function listByParentId(query) {
+  return request({
+    url: '/base/core-workshop-section/listByParentId',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得产线工段设备树形结构
+export function getTree(query) {
+  return request({
+    url: '/base/factory/getTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备分组列表
+export function getgroupAllList(query) {
+  return request({
+    url: '/base/equipment-group/listAll',
+    method: 'get',
+    params: query
+  })
+}
--- a/src/api/base/equipmentPlc.js
+++ b/src/api/base/equipmentPlc.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-10-29 09:47:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-26 16:27:48
+ * @Description:
+ */
 import request from '@/utils/request'

 // 创建实时数据采集配置
@@ -52,3 +59,11 @@ export function exportEquipmentPlcExcel(query) {
    responseType: 'blob'
  })
 }
+
+// 获得code
+export function getCode() {
+  return request({
+    url: '/base/equipment-group/getCode',
+    method: 'get'
+  })
+}
--- a/src/api/base/factory.js
+++ b/src/api/base/factory.js
@@ -0,0 +1,15 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-10-29 09:47:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-12 09:25:11
+ * @Description:
+ */
+import request from '@/utils/request'
+// 获得工厂产线工段设备树形结构
+export function getTree() {
+  return request({
+    url: '/base/factory/getTree',
+    method: 'get'
+  })
+}
--- a/src/api/base/groupClasses.js
+++ b/src/api/base/groupClasses.js
@@ -51,6 +51,13 @@ export function getCode() {
  })
 }

+// 获得可用的班次列表
+export function listClassesEnabled() {
+  return request({
+    url: '/base/group-classes/listEnable',
+    method: 'get'
+  })
+}
 // 导出班次基础信息 Excel
 export function exportGroupClassesExcel(query) {
  return request({
--- a/src/api/base/groupSchedulingPlan.js
+++ b/src/api/base/groupSchedulingPlan.js
@@ -0,0 +1,125 @@
+import request from '@/utils/request'
+
+// 创建排班计划配置基础信息
+export function createGroupPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班计划配置基础信息
+export function updateGroupPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排班计划配置基础信息
+export function deleteGroupPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得排班计划配置基础信息
+export function getGroupPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得排班计划配置基础信息分页
+export function getGroupPlanPage(query) {
+  return request({
+    url: '/base/group-scheduling-plan/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有排班计划列表
+export function groupPlanList() {
+  return request({
+    url: '/base/group-scheduling-plan/listAll',
+    method: 'get'
+  })
+}
+// 获得排班计划相关班组列表
+export function groupPlanTeamList(id) {
+  return request({
+    url: '/base/group-scheduling-plan-team/teamListByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+// 获得排班计划相关班次列表
+export function groupPlanClassesList(id) {
+  return request({
+    url: '/base/group-scheduling-plan-classes/classesListByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/group-scheduling-plan/getCode',
+    method: 'get'
+  })
+}
+
+// 导出排班计划配置基础信息 Excel
+export function exportGroupPlanExcel(query) {
+  return request({
+    url: '/base/group-scheduling-plan/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得产线工段树形结构
+export function getGroupPlanTree() {
+  return request({
+    url: '/base/group-scheduling-plan/getLineSectionTree',
+    method: 'get'
+  })
+}
+
+// 创建排班计划产线工段
+export function createGroupPlanLine(data) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/createPlanLineSection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班计划产线工段
+export function updateGroupPlanLine(data) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/updatePlanLineSection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得排班计划配置基础信息
+export function getGroupPlanLine(id) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/getLineSectionByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+
+// 获得当前登录用户所在部门id
+export function getLoginUserDeptId() {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/getLoginUserDeptId',
+    method: 'get'
+  })
+}
--- a/src/api/base/groupSchedulingRule.js
+++ b/src/api/base/groupSchedulingRule.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 创建排班规则基础信息
+export function createGroupRule(data) {
+  return request({
+    url: '/base/group-scheduling-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+// 作废排班规则
+export function disableGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/disable?id=' + id,
+    method: 'post',
+  })
+}
+// 更新排班规则基础信息
+export function updateGroupRule(data) {
+  return request({
+    url: '/base/group-scheduling-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排班规则基础信息
+export function deleteGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得排班规则基础信息
+export function getGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得排班规则基础信息分页
+export function getGroupRulePage(query) {
+  return request({
+    url: '/base/group-scheduling-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出排班规则基础信息 Excel
+export function exportGroupRuleExcel(query) {
+  return request({
+    url: '/base/group-scheduling-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/groupTeam.js
+++ b/src/api/base/groupTeam.js
@@ -50,3 +50,57 @@ export function getCode() {
    method: 'get'
  })
 }
+
+// 获得可用的排班列表
+export function listEnabled() {
+  return request({
+    url: '/base/group-team/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
+  })
+}
--- a/src/api/base/groupTeamScheduling.js
+++ b/src/api/base/groupTeamScheduling.js
@@ -1,41 +1,41 @@
 import request from '@/utils/request'

-// 创建排班信息
-export function createGroupTeamScheduling(data) {
+// 获取某月预排班-已有排班
+export function getPreset(query) {
  return request({
-    url: '/base/group-team-scheduling/create',
+    url: '/base/group-team-scheduling/getPreset',
+    method: 'get',
+    params: query
+  })
+}
+// 获取某月预排班
+export function getScheduling(query) {
+  return request({
+    url: '/base/group-team-scheduling/getScheduling',
+    method: 'get',
+    params: query
+  })
+}
+// 批量创建-更新排班信息
+export function createOrUpdateList(data) {
+  return request({
+    url: '/base/group-team-scheduling/createOrUpdateList',
    method: 'post',
    data: data
  })
 }

-// 更新排班信息
-export function updateGroupTeamScheduling(data) {
+// 自动排班，填充上月已有的排班
+export function autoSet(query) {
  return request({
-    url: '/base/group-team-scheduling/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除排班信息
-export function deleteGroupTeamScheduling(id) {
-  return request({
-    url: '/base/group-team-scheduling/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得排班信息
-export function getGroupTeamScheduling(id) {
-  return request({
-    url: '/base/group-team-scheduling/get?id=' + id,
-    method: 'get'
+    url: '/base/group-team-scheduling/autoSet',
+    method: 'get',
+    params: query
  })
 }

 // 获得排班信息分页
-export function getGroupTeamSchedulingPage(query) {
+export function schedulingPage(query) {
  return request({
    url: '/base/group-team-scheduling/page',
    method: 'get',
@@ -43,8 +43,8 @@ export function getGroupTeamSchedulingPage(query) {
  })
 }

-// 导出排班信息 Excel
-export function exportGroupTeamSchedulingExcel(query) {
+// 导出Excel
+export function exportSchedulingExcel(query) {
  return request({
    url: '/base/group-team-scheduling/export-excel',
    method: 'get',
--- a/src/api/base/material.js
+++ b/src/api/base/material.js
@@ -0,0 +1,75 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-09 16:42:19
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 14:33:52
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原料
+export function createMaterial(data) {
+  return request({
+    url: '/base/material/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料
+export function updateMaterial(data) {
+  return request({
+    url: '/base/material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/material/autoCode',
+    method: 'POST'
+  })
+}
+// 删除原料
+export function deleteMaterial(id) {
+  return request({
+    url: '/base/material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料
+export function getMaterial(id) {
+  return request({
+    url: '/base/material/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料分页
+export function getMaterialPage(query) {
+  return request({
+    url: '/base/material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得原料列表
+export function getMaterialList() {
+  return request({
+    url: '/base/material/list',
+    method: 'get',
+  })
+}
+
+// 导出原料 Excel
+export function exportMaterialExcel(query) {
+  return request({
+    url: '/base/material/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/materialPricing.js
+++ b/src/api/base/materialPricing.js
@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-09 16:42:19
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 14:31:46
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原料
+export function createMaterialPricing(data) {
+  return request({
+    url: '/base/material-pricing/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料
+export function updateMaterialPricing(data) {
+  return request({
+    url: '/base/material-pricing/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/material-pricing/autoCode',
+    method: 'POST'
+  })
+}
+// 删除原料
+export function deleteMaterialPricing(id) {
+  return request({
+    url: '/base/material-pricing/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料
+export function getMaterialPricing(id) {
+  return request({
+    url: '/base/material-pricing/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料分页
+export function getMaterialPricingPage(query) {
+  return request({
+    url: '/base/material-pricing/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原料 Excel
+export function exportMaterialPricingExcel(query) {
+  return request({
+    url: '/base/material-pricing/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/base/productionLine.js
+++ b/src/api/base/productionLine.js
@@ -0,0 +1,23 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-03-27 15:49:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-10 14:36:19
+ * @Description:
+ */
+import request from '@/utils/request'
+// 获得所有工厂产线列表
+export function getLineAll() {
+  return request({
+    url: '/base/production-line/listAll',
+    method: 'get'
+  })
+}
+// 获得产线分页
+export function getLinePage(query) {
+  return request({
+    url: '/base/production-line/page',
+    method: 'get',
+    params: query
+  })
+}
--- a/src/api/base/worker.js
+++ b/src/api/base/worker.js
@@ -0,0 +1,26 @@
+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
+  })
+}
+
+// 获得该班组其他可选组员列表(除去现有组员)
+export function otherWorkerList(query) {
+  return request({
+    url: '/base/group-team-det/otherWorkerList',
+    method: 'get',
+    params: query
+  })
+}
--- a/src/api/base/workshopSection.js
+++ b/src/api/base/workshopSection.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// 获得所有产线工段列表
+export function getWorkShopAll() {
+  return request({
+    url: '/base/workshop-section/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/core/analysis/index.js
+++ b/src/api/core/analysis/index.js
@@ -0,0 +1,47 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-12 14:07:04
+ * @LastEditTime: 2025-01-08 15:47:17
+ * @LastEditors: zwq
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function getYieldAnalysisPageData(data) {
+  return request({
+    url: '/analysis/production-analysis/getOutput',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCT(data) {
+  return request({
+    url: '/analysis/production-analysis/getCT',
+    method: 'post',
+    data: data
+  })
+}
+// 获取产线平衡分析数据（new）
+export function getNewCTNow(data) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTNow',
+    method: 'post',
+    data: data
+  })
+}
+// 获取产线平衡分析数据趋势图（new）
+export function getNewCTCharts(data) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTCharts',
+    method: 'post',
+    data: data
+  })
+}
+// 获取产线平衡分析数据设备list（new）
+export function getNewCTDet(id) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTDet?lineId='+id,
+    method: 'get',
+  })
+}
--- a/src/api/core/base/factory.js
+++ b/src/api/core/base/factory.js
@@ -58,3 +58,12 @@ export function exportFactoryExcel(query) {
    responseType: 'blob'
  })
 }
+// 获取产线设备状态
+export function getLineEqStatus(data) {
+  return request({
+    url: '/base/production-line/getLineEqStatus',
+    method: 'post',
+    data: data
+  })
+}
+
--- a/src/api/core/base/lineBindProcess.js
+++ b/src/api/core/base/lineBindProcess.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+
+// 切换工艺
+export function switchLineBindProcess(data) {
+  return request({
+    url: '/base/line-bind-process/switch',
+    method: 'put',
+    data: data
+  })
+}
+// 获得产线工艺目前生产工艺
+export function getLineBindProcessPage(query) {
+  return request({
+    url: '/base/line-bind-process/nowList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得产线工艺log分页
+export function getLineBindProcessLogPage(query) {
+  return request({
+    url: '/base/line-bind-process/logPage',
+    method: 'get',
+    params: query
+  })
+}
--- a/src/api/core/base/lineBindProduct.js
+++ b/src/api/core/base/lineBindProduct.js
@@ -16,6 +16,14 @@ export function switchLineBindProduct(data) {
    data: data
  })
 }
+// 切换产线是否可以自动
+export function switchAutoProduct(data) {
+  return request({
+    url: '/base/line-bind-product/switchAuto',
+    method: 'put',
+    data: data
+  })
+}
 // 更新产线目前生产产品表 主要为更新
 export function updateLineBindProduct(data) {
  return request({
--- a/src/api/core/base/lineBindProductLog.js
+++ b/src/api/core/base/lineBindProductLog.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-08-28 15:30:53
+ * @LastEditTime: 2023-10-13 17:08:33
+ * @LastEditors: DY
+ * @Description: 
+ */
 import request from '@/utils/request'

 // 创建产线目前生产产品表 主要为更新
@@ -35,11 +42,11 @@ export function getLineBindProductLog(id) {
 }

 // 获得产线目前生产产品表 主要为更新分页
-export function getLineBindProductLogPage(query) {
+export function getLineBindProductLogPage(data) {
  return request({
    url: '/base/line-bind-product-log/page',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
  })
 }

--- a/src/api/core/base/workshopSection.js
+++ b/src/api/core/base/workshopSection.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-08-28 14:29:51
+ * @LastEditTime: 2023-08-31 14:33:46
+ * @LastEditors: zhp
+ * @Description:
+ */
 import request from '@/utils/request'

 // 创建产线工段
--- a/src/api/core/monitoring/auto.js
+++ b/src/api/core/monitoring/auto.js
@@ -0,0 +1,68 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-09-12 09:44:53
+ * @LastEditTime: 2025-01-07 09:57:36
+ * @LastEditors: zwq
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得工厂分页
+export function getPdlAutoReport(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReport',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得所有工厂产线列表
+export function getPdList(id) {
+  return request({
+    url: '/base/production-line/listAll' + (id ? '?id=' + id : ''),
+    method: 'get'
+  })
+}
+// 获得产线自动报表
+export function getLineAuto(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReportNew',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得产品自动报表
+export function getProductAuto(data) {
+  return request({
+    url: '/monitoring/production-monitor/getProcessAutoReportNew',
+    method: 'post',
+    data: data
+  })
+}
+
+// 班组自动报表分页
+export function getTeamReportPage(data) {
+  return request({
+		url: '/monitoring/group-off-record/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+// 班组自动报表分页详细
+export function getTeamReportPageDet(id) {
+  return request({
+    url: '/monitoring/group-off-record/get?id=' + id,
+    method: 'get',
+  })
+}
+
+export function exportGroupProductReportExcel(data) {
+  return request({
+		url: '/monitoring/group-off-record/export-det-excel',
+		method: 'get',
+		params: data,
+		responseType: 'blob',
+	});
+}
--- a/src/api/core/monitoring/data.js
+++ b/src/api/core/monitoring/data.js
@@ -0,0 +1,43 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-09-12 09:44:53
+ * @LastEditTime: 2025-03-03 10:43:34
+ * @LastEditors: zwq
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得产线统计数据查询
+export function getPdlDataSearch(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlDataSearch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得所有工厂产线列表
+export function getPdList() {
+  return request({
+    url: '/base/production-line/listAll',
+    method: 'get'
+  })
+}
+// 产线统计数据查询-历史
+export function getPdlAutoReportNewSearch(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReportNewSearch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 产线统计数据查询-当前
+export function getPdlAutoReportNewSearchNow(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
+    method: 'post',
+    data: data,
+    timeout: 60000,
+  })
+}
--- a/src/api/core/monitoring/data24.js
+++ b/src/api/core/monitoring/data24.js
@@ -0,0 +1,17 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-09-12 09:44:53
+ * @LastEditTime: 2023-09-15 14:12:26
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 获得近24小时产线生产数据
+export function getPdlDataOneDay(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlDataOneDay',
+    method: 'post',
+    data: data
+  })
+}
--- a/src/api/core/monitoring/index.js
+++ b/src/api/core/monitoring/index.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-12 14:07:04
+ * @LastEditTime: 2023-09-13 09:46:44
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function getSectionDataSearch(data) {
+  return request({
+    url: '/monitoring/production-monitor/getSectionDataSearch',
+    method: 'post',
+    data: data
+  })
+}
--- a/src/api/core/monitoring/sectionStatistics.js
+++ b/src/api/core/monitoring/sectionStatistics.js
@@ -0,0 +1,33 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-09-12 09:44:53
+ * @LastEditTime: 2023-09-14 14:01:12
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 获得工段自动统计数据查询
+export function getSectionAutoReport(data) {
+  return request({
+    url: '/monitoring/production-monitor/getSectionAutoReport',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得所有工厂产线列表
+export function getPdList() {
+  return request({
+    url: '/base/production-line/listAll',
+    method: 'get'
+  })
+}
+
+// 获得所有产线工段列表
+export function getWorkshopSectionList() {
+  return request({
+    url: '/base/workshop-section/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/cost/allCost.js
+++ b/src/api/cost/allCost.js
@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:35:13
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得总成本统计-按日期分页
+export function getCostSumPage(query) {
+  return request({
+    url: '/monitoring/cost-sum/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新总成本统计-按日期
+export function updateCostSum(data) {
+  return request({
+    url: '/monitoring/cost-sum/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片成本统计成本查询分页
+export function getRawCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-sum/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出总成本统计-按日期 Excel
+export function exportCostSumExcel(query) {
+  return request({
+    url: '/monitoring/cost-sum/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片成本统计-历史成本 Excel
+export function exportRawCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-sum/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/costDeepRatioHis.js
+++ b/src/api/cost/costDeepRatioHis.js
@@ -0,0 +1,55 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:00:09
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工良品率
+export function updateDeepRatioHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工产线良品率
+export function getDeepPDRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/page-pd',
+    method: 'get',
+    params: query
+  })
+}
+// 获得深加工工段良品率
+export function getDeepWSRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/page-ws',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工工段良品率 Excel
+export function exportDeepWSRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/export-excel-ws',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+
+// 导出深加工产线良品率 Excel
+export function exportDeepPDRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/export-excel-pd',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
--- a/src/api/cost/costEnergy.js
+++ b/src/api/cost/costEnergy.js
@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-19 16:11:19
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片能源历史
+export function updateEnergyHis(data) {
+  return request({
+    url: '/monitoring/cost-energy-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片能源历史分页
+export function getEnergyHisPage(query) {
+  return request({
+    url: '/monitoring/cost-energy-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原片能源-成本查询分页
+export function getEnergyRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-energy-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+// 导出能源成本成本查询 Excel
+export function exportEnergyRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-energy-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出能源成本历史 Excel
+export function exportEnergyHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-energy-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/costEnergyDeep.js
+++ b/src/api/cost/costEnergyDeep.js
@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:19:24
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工能源历史
+export function updateEnergyHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工能源历史分页
+export function getEnergyHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得深加工能源-成本查询分页
+export function getEnergyRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工能源成本成本查询 Excel
+export function exportEnergyRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出深加工能源成本历史 Excel
+export function exportEnergyHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/costMaterial.js
+++ b/src/api/cost/costMaterial.js
@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-05 13:55:30
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原料成本-历史
+export function updateMaterialHis(data) {
+  return request({
+    url: '/monitoring/cost-material-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原料成本-历史分页
+export function getMaterialHisPage(query) {
+  return request({
+    url: '/monitoring/cost-material-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原料成本-成本查询分页
+export function getMaterialRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-material-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原料成本成本查询 Excel
+export function exportMaterialRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-material-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原料成本历史 Excel
+export function exportMaterialHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-material-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/costOriginRatioHis.js
+++ b/src/api/cost/costOriginRatioHis.js
@@ -0,0 +1,36 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 10:53:55
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片良品率
+export function updatecostOriginRatioHis(data) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片良品率
+export function getcostOriginRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片良品率 Excel
+export function exportcostOriginRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
--- a/src/api/cost/costOthercostHis.js
+++ b/src/api/cost/costOthercostHis.js
@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-19 14:24:17
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片其他成本-历史
+export function updateRawOthercostHis(data) {
+  return request({
+    url: '/monitoring/cost-othercost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片其他成本-历史分页
+export function getRawOthercostHisPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原片其他成本-成本查询分页
+export function getRawOthercostSunPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/page-sum',
+    method: 'get',
+    params: query
+  })
+}
+// 导出原片其他成本-成本查询 Excel
+export function exportRawOthercostSunExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片其他成本-历史 Excel
+export function exportRawOthercostHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/costOthercostHisDeep.js
+++ b/src/api/cost/costOthercostHisDeep.js
@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:13:20
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工其他成本-历史
+export function updateRawOthercostHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工其他成本-历史分页
+export function getRawOthercostHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得深加工其他成本-成本查询分页
+export function getRawOthercostSunPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/page-sum',
+    method: 'get',
+    params: query
+  })
+}
+// 导出深加工其他成本-成本查询 Excel
+export function exportRawOthercostSunExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出深加工其他成本-历史 Excel
+export function exportRawOthercostHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/costOthercostLog.js
+++ b/src/api/cost/costOthercostLog.js
@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:12:09
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原片其他成本-记录
+export function createRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-othercost-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原片其他成本-记录
+export function updateRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-othercost-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原片其他成本-记录
+export function deleteRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-othercost-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原片其他成本-记录
+export function getRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-othercost-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原片其他成本-记录分页
+export function getRawOthercostLogPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片其他成本-记录 Excel
+export function exportRawOthercostLogExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/export-log-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有原片其他成本-记录列表
+export function getRawOthercostLogAll() {
+  return request({
+    url: '/monitoring/cost-othercost-log/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/cost/costOthercostLogDeep.js
+++ b/src/api/cost/costOthercostLogDeep.js
@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 14:59:35
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建深加工其他成本-记录
+export function createRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新深加工其他成本-记录
+export function updateRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除深加工其他成本-记录
+export function deleteRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得深加工其他成本-记录
+export function getRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得深加工其他成本-记录分页
+export function getRawOthercostLogPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工其他成本-记录 Excel
+export function exportRawOthercostLogExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/export-log-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有深加工其他成本-记录列表
+export function getRawOthercostLogAll() {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/cost/deepCostStatistics.js
+++ b/src/api/cost/deepCostStatistics.js
@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-02 14:43:30
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得深加工成本分页
+export function getDeepCostStatisticsPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新深加工成本-历史
+export function updateDeepCostStatistics(data) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工成本统计成本查询分页
+export function getDeepCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工成本统计成本查询 Excel
+export function exportDeepStatisticsRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 导出深加工成本统计-历史成本 Excel
+export function exportDeepCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/deepOthercostRule.js
+++ b/src/api/cost/deepOthercostRule.js
@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 14:55:00
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建深加工其他成本-配置
+export function createRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新深加工其他成本-配置
+export function updateRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除深加工其他成本-配置
+export function deleteRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得深加工其他成本-配置
+export function getRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得深加工其他成本-配置分页
+export function getRawOthercostRulePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工其他成本-配置 Excel
+export function exportRawOthercostRuleExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有深加工其他成本-配置列表
+export function getRawOthercostRuleAll() {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/cost/rawCostStatistics.js
+++ b/src/api/cost/rawCostStatistics.js
@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:35:13
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得原片成本分页
+export function getRawCostStatisticsPage(query) {
+  return request({
+    url: '/monitoring/cost-origincost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新原片成本-历史
+export function updateRawCostStatistics(data) {
+  return request({
+    url: '/monitoring/cost-origincost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片成本统计成本查询分页
+export function getRawCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-origin-cost-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片成本统计成本查询 Excel
+export function exportRawStatisticsRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-cost-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片成本统计-历史成本 Excel
+export function exportRawCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origincost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/cost/rawOthercostRule.js
+++ b/src/api/cost/rawOthercostRule.js
@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-18 15:39:12
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原片其他成本-配置
+export function createRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原片其他成本-配置
+export function updateRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原片其他成本-配置
+export function deleteRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原片其他成本-配置
+export function getRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原片其他成本-配置分页
+export function getRawOthercostRulePage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片其他成本-配置 Excel
+export function exportRawOthercostRuleExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有原片其他成本-配置列表
+export function getRawOthercostRuleAll() {
+  return request({
+    url: '/monitoring/cost-othercost-rule/listAll',
+    method: 'get'
+  })
+}
--- a/src/api/material/issue.js
+++ b/src/api/material/issue.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+// 获得工厂分页
+export function getMaterialReceiptIssuePageData(data) {
+	return request({
+		url: '/base/material-warehouse-his/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+
+export function createMaterialIssue(data) {
+	return request({
+		url: '/base/material-warehouse-his/create',
+		method: 'post',
+		data: data,
+	});
+}
--- a/src/api/monitoring/energyLimit.js
+++ b/src/api/monitoring/energyLimit.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 创建能源监控配置
+export function createEnergyLimit(data) {
+  return request({
+    url: '/monitoring/energy-limit/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源监控配置
+export function updateEnergyLimit(data) {
+  return request({
+    url: '/monitoring/energy-limit/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源监控配置
+export function deleteEnergyLimit(id) {
+  return request({
+    url: '/monitoring/energy-limit/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源监控配置
+export function getEnergyLimit(id) {
+  return request({
+    url: '/monitoring/energy-limit/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源监控配置分页
+export function getEnergyLimitPage(data) {
+  return request({
+    url: '/monitoring/energy-limit/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源监控配置 Excel
+export function exportEnergyLimitExcel(query) {
+  return request({
+    url: '/monitoring/energy-limit/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获取详细参数列表
+export function getEnergyParamList(data) {
+  return request({
+    url: '/monitoring/energy-limit/listParam',
+    method: 'post',
+    data: data
+  })
+}
--- a/src/api/monitoring/energyOverlimitLog.js
+++ b/src/api/monitoring/energyOverlimitLog.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 创建能源超限记录
+export function createEnergyOverlimitLog(data) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源超限记录
+export function updateEnergyOverlimitLog(data) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源超限记录
+export function deleteEnergyOverlimitLog(id) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源超限记录
+export function getEnergyOverlimitLog(id) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源超限记录分页
+export function getEnergyOverlimitLogPage(data) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得手动抄表记录分页
+export function getEnergyManualLogPage(data) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/pageManual',
+    method: 'post',
+    data: data
+  })
+}
+// 导出能源超限记录 Excel
+export function exportEnergyOverlimitLogExcel(query) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/monitoring/energyReport.js
+++ b/src/api/monitoring/energyReport.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+// 获得能耗统计查询分页
+export function energyReportPage(data) {
+  return request({
+    url: '/monitoring/energy-report/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得能耗统计报表分页
+export function energyReportPageAuto(data) {
+  return request({
+    url: '/monitoring/energy-report/pageAuto',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能耗统计查询
+export function energyReportPageExport(data) {
+  return request({
+    url: '/monitoring/energy-report/export',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
+
+// 导出能耗统计报表
+export function energyReportPageExportAuto(data) {
+  return request({
+    url: '/monitoring/energy-report/exportAuto',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
--- a/src/api/monitoring/energyStatistics.js
+++ b/src/api/monitoring/energyStatistics.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 创建能源统计主
+export function createEnergyStatistics(data) {
+  return request({
+    url: '/monitoring/energy-statistics/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源统计主
+export function updateEnergyStatistics(data) {
+  return request({
+    url: '/monitoring/energy-statistics/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源统计主
+export function deleteEnergyStatistics(id) {
+  return request({
+    url: '/monitoring/energy-statistics/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源统计主
+export function getEnergyStatistics(id) {
+  return request({
+    url: '/monitoring/energy-statistics/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源统计主分页
+export function getEnergyStatisticsPage(data) {
+  return request({
+    url: '/monitoring/energy-statistics/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源统计主 Excel
+export function exportEnergyStatisticsExcel(query) {
+  return request({
+    url: '/monitoring/energy-statistics/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获取编码
+export function getCode() {
+  return request({
+    url: '/monitoring/energy-statistics/getCode',
+    method: 'get'
+  })
+}
--- a/src/api/monitoring/energyStatisticsDet.js
+++ b/src/api/monitoring/energyStatisticsDet.js
@@ -0,0 +1,72 @@
+import request from '@/utils/request'
+
+// 创建能源统计详细表
+export function createEnergyStatisticsDet(data) {
+  return request({
+    url: '/monitoring/energy-statistics-det/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源统计详细表
+export function updateEnergyStatisticsDet(data) {
+  return request({
+    url: '/monitoring/energy-statistics-det/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源统计详细表
+export function deleteEnergyStatisticsDet(id) {
+  return request({
+    url: '/monitoring/energy-statistics-det/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源统计详细表
+export function getEnergyStatisticsDet(id) {
+  return request({
+    url: '/monitoring/energy-statistics-det/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源统计详细表分页
+export function getEnergyStatisticsDetPage(data) {
+  return request({
+    url: '/monitoring/energy-statistics-det/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源统计详细表 Excel
+export function exportEnergyStatisticsDetExcel(query) {
+  return request({
+    url: '/monitoring/energy-statistics-det/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得 新增参数关联 分页
+export function addParamPage(data) {
+  return request({
+    url: '/monitoring/energy-statistics-det/addParamPage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除（批量）
+export function deleteMany(data) {
+  return request({
+    url: '/monitoring/energy-statistics-det/deleteMany',
+    method: 'post',
+    data: data
+  })
+}
--- a/src/api/monitoring/equipmentAlarmLog.js
+++ b/src/api/monitoring/equipmentAlarmLog.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建设备报警日志
+export function createEquipmentAlarmLog(data) {
+  return request({
+    url: '/monitoring/equipment-alarm-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新设备报警日志
+export function updateEquipmentAlarmLog(data) {
+  return request({
+    url: '/monitoring/equipment-alarm-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备报警日志
+export function deleteEquipmentAlarmLog(id) {
+  return request({
+    url: '/monitoring/equipment-alarm-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得设备报警日志
+export function getEquipmentAlarmLog(id) {
+  return request({
+    url: '/monitoring/equipment-alarm-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备报警日志分页
+export function getEquipmentAlarmLogPage(query) {
+  return request({
+    url: '/monitoring/equipment-alarm-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出设备报警日志 Excel
+export function exportEquipmentAlarmLogExcel(query) {
+  return request({
+    url: '/monitoring/equipment-alarm-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/monitoring/equipmentAlarmRealtime.js
+++ b/src/api/monitoring/equipmentAlarmRealtime.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建设备报警实时信息
+export function createEquipmentAlarmRealtime(data) {
+  return request({
+    url: '/monitoring/equipment-alarm-realtime/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新设备报警实时信息
+export function updateEquipmentAlarmRealtime(data) {
+  return request({
+    url: '/monitoring/equipment-alarm-realtime/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备报警实时信息
+export function deleteEquipmentAlarmRealtime(id) {
+  return request({
+    url: '/monitoring/equipment-alarm-realtime/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得设备报警实时信息
+export function getEquipmentAlarmRealtime(id) {
+  return request({
+    url: '/monitoring/equipment-alarm-realtime/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备报警实时信息分页
+export function getEquipmentAlarmRealtimePage(query) {
+  return request({
+    url: '/monitoring/equipment-alarm-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出设备报警实时信息 Excel
+export function exportEquipmentAlarmRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/equipment-alarm-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
--- a/src/api/order/index.js
+++ b/src/api/order/index.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export function getOrderPage(data) {
+	return request({
+		url: '/base/core-work-order/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+export function updateOrderData(data) {
+	return request({
+		url: '/base/core-work-order/updatee',
+		method: 'put',
+		data: data,
+	});
+}
+
+export function createOrderData(data) {
+	return request({
+		url: '/base/core-work-order/create',
+		method: 'post',
+		data: data,
+	});
+}
+export function getOrderData(id) {
+  return request({
+		url: '/base/core-work-order/get?id=' + id,
+		method: 'get',
+	});
+}
+export function getOrderCode(data) {
+	return request({
+		url: '/base/core-work-order/getCode',
+		method: 'get',
+		data: data,
+	});
+}
+
+export function deleteOrder(id) {
+  return request({
+    url: '/base/core-work-order/delete?id=' + id,
+    method: 'delete'
+  })
+}
--- a/src/assets/icons/svg/Confirm.svg
+++ b/src/assets/icons/svg/Confirm.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>选择</title>
+    <g id="设备管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="设备监控-设备加工数量" transform="translate(-496.000000, -187.000000)" fill-rule="nonzero">
+            <g id="选择" transform="translate(496.000000, 187.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M13.8735116,4.65950813 C13.6725171,4.47101195 13.3555167,4.48001613 13.1670206,4.6815213 L6.49899208,11.7809972 L2.85649778,8.19199033 C2.65950812,7.99798414 2.34299153,8 2.14898534,8.19698966 C1.95497916,8.3934955 1.95747883,8.71049591 2.15449536,8.90399141 L6.16199434,12.8519823 C6.16349952,12.8534874 6.1654885,12.8539712 6.16699367,12.8554764 C6.16849884,12.8569816 6.16898266,12.8589706 6.17048783,12.8604757 C6.20198897,12.8904717 6.23999461,12.9074856 6.27649508,12.9274829 C6.29450341,12.9379922 6.3099852,12.953474 6.32898802,12.960973 C6.38798547,12.9839807 6.45047706,12.9959683 6.51248486,12.9959683 C6.57798681,12.9959683 6.64348875,12.9829593 6.70447519,12.9569682 C6.72498319,12.9484747 6.74097566,12.930977 6.75997848,12.919957 C6.79747344,12.8979438 6.83647358,12.8794517 6.86848541,12.8469561 C6.86999058,12.8454509 6.87047439,12.8429512 6.87197956,12.841446 C6.87297405,12.8399409 6.87498991,12.8394571 6.8764682,12.8379519 L13.8949604,5.36594544 C14.0849886,5.16548852 14.0745061,4.8489988 13.8735116,4.65950813 Z" id="路径" fill="#0B58FF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/Qian.svg
+++ b/src/assets/icons/svg/Qian.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>菜单</title>
+    <g id="设备管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="设备监控-设备加工数量" transform="translate(-284.000000, -164.000000)" fill-rule="nonzero">
+            <g id="编组-7" transform="translate(284.000000, 162.000000)">
+                <g id="菜单" transform="translate(0.000000, 2.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M3.00057813,4.49926562 L13.0025156,4.49926562 C13.2786563,4.49926562 13.5025156,4.27540625 13.5025156,3.99926563 C13.5025156,3.723125 13.2786563,3.49926563 13.0025156,3.49926563 L3.00057813,3.49926563 C2.7244375,3.49926563 2.50057813,3.723125 2.50057813,3.99926563 C2.50057813,4.27540625 2.7244375,4.49926562 3.00057813,4.49926562 Z M3.0004375,8.48703125 L12.9786875,8.48703125 C13.2548281,8.48703125 13.4786875,8.26317187 13.4786875,7.98703125 C13.4786875,7.71089062 13.2548281,7.48703125 12.9786875,7.48703125 L3.0004375,7.48703125 C2.72429687,7.48703125 2.5004375,7.71089062 2.5004375,7.98703125 C2.5004375,8.26317187 2.72429687,8.48703125 3.0004375,8.48703125 Z M13.0025156,11.4969063 L3.00057813,11.4969063 C2.7244375,11.4969063 2.50057813,11.7207656 2.50057813,11.9969063 C2.50057813,12.2730469 2.7244375,12.4969063 3.00057813,12.4969063 L13.0025156,12.4969063 C13.2786563,12.4969063 13.5025156,12.2730469 13.5025156,11.9969063 C13.5025156,11.7207656 13.2786563,11.4969063 13.0025156,11.4969063 L13.0025156,11.4969063 Z" id="形状" fill="#373738"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/changelogo.svg
+++ b/src/assets/icons/svg/changelogo.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>状态切换备份 3</title>
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon和插图" transform="translate(-877.000000, -246.000000)">
+            <g id="状态切换备份-3" transform="translate(885.000000, 254.000000) rotate(-270.000000) translate(-885.000000, -254.000000) translate(877.000000, 246.000000)">
+                <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="15" height="15"></rect>
+                <g id="错误" transform="translate(0.000000, 0.000000)" fill-rule="nonzero">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="6.4293957e-15" width="16" height="16"></rect>
+                    <path d="M8,1 C11.85,1 15,4.15 15,8 C15,11.85 11.85,15 8,15 C4.15,15 1,11.85 1,8 C1,4.15 4.15,1 8,1 Z M8,2.19926499 C4.80249503,2.19926499 2.18635461,4.80959575 2.18635461,8 C2.18635461,11.1904043 4.80249503,13.800735 8,13.800735 C11.197505,13.800735 13.8136454,11.1904043 13.8136454,8 C13.8136454,4.80959575 11.197505,2.19926499 8,2.19926499 Z M9.18342887,4.39602962 C9.42080763,4.39602962 9.61773566,4.56921978 9.65474747,4.7961346 L9.66099805,4.87359881 L9.66052938,9.97276858 L10.1621026,9.47231604 C10.3071657,9.32725295 10.5223305,9.29501672 10.6985498,9.37560733 L10.7713701,9.41705393 L10.837514,9.47231606 C11.0033004,9.63810246 11.0217211,9.89545015 10.8927761,10.0815835 L10.837514,10.1477274 L9.52115984,11.4640816 C9.38457467,11.600698 9.17913638,11.6415719 9.00066062,11.5676398 C8.84450229,11.5029526 8.73591407,11.3615296 8.71120699,11.1977853 L8.70585968,11.1264012 L8.70585968,4.87359881 C8.70585968,4.60984463 8.91967469,4.39602962 9.18342887,4.39602962 Z M6.99933939,4.43236016 C7.15549771,4.49704738 7.26408594,4.63847045 7.28879302,4.80221473 L7.29414032,4.87359881 L7.29414032,11.1264012 C7.29414032,11.2530604 7.24382515,11.374532 7.15426356,11.4640936 C7.06470196,11.5536552 6.94323037,11.6039704 6.81657114,11.6039704 C6.68991191,11.6039704 6.56844032,11.5536552 6.47887872,11.4640936 C6.40722945,11.3924443 6.36069788,11.3003726 6.34495123,11.2015604 L6.33900196,11.1264012 L6.33858601,6.02634681 L5.83789738,6.52768395 C5.69283427,6.67274705 5.47766955,6.70498329 5.30145018,6.62439268 L5.22862992,6.58294608 L5.162486,6.52768394 C4.9966996,6.36189754 4.97827889,6.10454984 5.10722387,5.91841648 L5.162486,5.85227257 L6.47884017,4.53591839 C6.61542534,4.39930202 6.82086362,4.35842813 6.99933939,4.43236016 Z" id="形状结合" fill="#0B58FF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/downArrow.svg
+++ b/src/assets/icons/svg/downArrow.svg
@@ -0,0 +1,13 @@
+<?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>收起箭头小备份 3</title>
+    <g id="能源管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="能源监控-同比分析" transform="translate(-848.000000, -392.000000)" fill-rule="nonzero">
+            <g id="收起箭头小备份-3" transform="translate(855.000000, 399.000000) scale(1, -1) translate(-855.000000, -399.000000) translate(848.000000, 392.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="14" height="14"></rect>
+                <path d="M6.60391666,1.57197282 L7.01633334,1.15897282 L12.70325,6.8441395 C12.9278333,7.06872283 12.93075,7.4408895 12.70325,7.6683895 C12.5941655,7.77825546 12.4457769,7.84009206 12.2909546,7.84020155 C12.1361323,7.84031104 11.9876564,7.77868438 11.8784167,7.66897282 L7.0175,2.8103895 L2.16066666,7.66955616 C2.05160439,7.77930978 1.90326864,7.84102718 1.74854166,7.84102718 C1.59381468,7.84102718 1.44547894,7.77930978 1.33641666,7.66955616 C1.10964988,7.4415567 1.1091291,7.07336285 1.33525,6.84472282 L6.58116666,1.59647282 L6.6045,1.57255616 L6.60391666,1.57197282 Z" id="路径" fill="#FFBD02"></path>
+                <path d="M6.60391666,6.57197282 L7.01633334,6.15897282 L12.70325,11.8441395 C12.9278333,12.0687228 12.93075,12.4408895 12.70325,12.6683895 C12.5941655,12.7782555 12.4457769,12.8400921 12.2909546,12.8402015 C12.1361323,12.840311 11.9876564,12.7786844 11.8784167,12.6689728 L7.0175,7.8103895 L2.16066666,12.6695562 C2.05160439,12.7793098 1.90326864,12.8410272 1.74854166,12.8410272 C1.59381468,12.8410272 1.44547894,12.7793098 1.33641666,12.6695562 C1.10964988,12.4415567 1.1091291,12.0733628 1.33525,11.8447228 L6.58116666,6.59647282 L6.6045,6.57255616 L6.60391666,6.57197282 Z" id="路径备份-2" fill="#FFBD02"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/downward.svg
+++ b/src/assets/icons/svg/downward.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" 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">
+        <g id="编组-43" transform="translate(-1870.000000, -119.000000)" fill-rule="nonzero">
+            <g id="下拉展开" transform="translate(1870.000000, 119.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="18" height="18"></rect>
+                <path d="M9.79014922,13.2165873 L16.1721224,6.15356667 C16.6092925,5.77338351 16.6092925,5.16518371 16.1721224,4.78500055 C15.964758,4.60350795 15.6800768,4.50112918 15.3827707,4.50112918 C15.0854647,4.50112918 14.8007835,4.60350795 14.5934191,4.78500055 L9.00013482,11.162609 L3.40552499,4.78387137 C3.19816065,4.60237877 2.91347942,4.5 2.61617336,4.5 C2.3188673,4.5 2.03418606,4.60237877 1.82682172,4.78387137 C1.39105943,5.16454327 1.39105943,5.77176559 1.82682172,6.15243749 L8.20879489,13.214329 C8.31400161,13.3066969 8.440317,13.3797143 8.57994259,13.4288732 C8.99637706,13.5753327 9.475517,13.4912854 9.79014922,13.2165873 Z" id="路径" fill="#0B58FF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/icon-upload.svg
+++ b/src/assets/icons/svg/icon-upload.svg
@@ -0,0 +1,14 @@
+<?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>
--- a/src/assets/icons/svg/toggle.svg
+++ b/src/assets/icons/svg/toggle.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切换</title>
+    <g id="1班组管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切换" fill="#FFFFFF" fill-rule="nonzero">
+            <rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M14.5,9.15 C14.969442,9.15 15.35,9.53055796 15.35,10 C15.35,10.4333311 15.0257376,10.7909267 14.6066222,10.8433773 L14.5,10.85 L3.523,10.8493636 L5.10448737,12.4305126 C5.26177017,12.5877954 5.34716031,12.7990496 5.34764236,13.015701 L5.34074746,13.1242515 L5.31933966,13.2323523 C5.24258033,13.518822 5.01882201,13.7425803 4.73235229,13.8193397 C4.48169128,13.8865041 4.21633806,13.832194 4.01342676,13.6770775 L3.93051263,13.6044874 L1.04232939,10.7055042 C0.831903536,10.5688042 0.689345737,10.3541899 0.656994192,10.1075365 L0.65,10 L0.65778959,9.88152374 C0.670925502,9.77175364 0.705946489,9.66606949 0.76033092,9.57061601 L0.821076439,9.47880032 L0.894170559,9.39517056 C1.02591288,9.26342824 1.19742791,9.1808136 1.37731459,9.15882561 L1.5,9.15 L14.5,9.15 Z M11.9865732,2.32292254 L12.0694874,2.39551263 L14.9508862,5.29019827 C15.1653597,5.42263107 15.3074642,5.64305498 15.3419246,5.89182346 L15.35,6 L15.3417548,6.1198336 C15.3282251,6.22918814 15.2930578,6.33441548 15.2387207,6.42946868 L15.1780851,6.52090655 L15.1052179,6.60421789 C14.9738843,6.73555151 14.8030912,6.81820523 14.622959,6.840766 L14.5,6.85 L1.5,6.85 C1.03055796,6.85 0.65,6.46944204 0.65,6 C0.65,5.56666889 0.974262406,5.20907332 1.39337781,5.15662271 L1.5,5.15 L12.475,5.14936355 L10.8955126,3.56948738 C10.7382298,3.41220459 10.6528397,3.20095039 10.6523576,2.98429905 L10.6592525,2.8757485 L10.6806603,2.76764771 C10.7478247,2.5169867 10.9275353,2.31433911 11.1633258,2.21617103 L11.2676477,2.18066033 C11.5183087,2.11349592 11.7836619,2.167806 11.9865732,2.32292254 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/upArrow.svg
+++ b/src/assets/icons/svg/upArrow.svg
@@ -0,0 +1,13 @@
+<?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>收起箭头小备份 11</title>
+    <g id="能源管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="能源监控-同比分析" transform="translate(-848.000000, -269.000000)" fill-rule="nonzero">
+            <g id="收起箭头小备份-11" transform="translate(848.000000, 269.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="14" height="14"></rect>
+                <path d="M6.60391666,1.57197282 L7.01633334,1.15897282 L12.70325,6.8441395 C12.9278333,7.06872283 12.93075,7.4408895 12.70325,7.6683895 C12.5941655,7.77825546 12.4457769,7.84009206 12.2909546,7.84020155 C12.1361323,7.84031104 11.9876564,7.77868438 11.8784167,7.66897282 L7.0175,2.8103895 L2.16066666,7.66955616 C2.05160439,7.77930978 1.90326864,7.84102718 1.74854166,7.84102718 C1.59381468,7.84102718 1.44547894,7.77930978 1.33641666,7.66955616 C1.10964988,7.4415567 1.1091291,7.07336285 1.33525,6.84472282 L6.58116666,1.59647282 L6.6045,1.57255616 L6.60391666,1.57197282 Z" id="路径" fill="#37D97F"></path>
+                <path d="M6.60391666,6.57197282 L7.01633334,6.15897282 L12.70325,11.8441395 C12.9278333,12.0687228 12.93075,12.4408895 12.70325,12.6683895 C12.5941655,12.7782555 12.4457769,12.8400921 12.2909546,12.8402015 C12.1361323,12.840311 11.9876564,12.7786844 11.8784167,12.6689728 L7.0175,7.8103895 L2.16066666,12.6695562 C2.05160439,12.7793098 1.90326864,12.8410272 1.74854166,12.8410272 C1.59381468,12.8410272 1.44547894,12.7793098 1.33641666,12.6695562 C1.10964988,12.4415567 1.1091291,12.0733628 1.33525,11.8447228 L6.58116666,6.59647282 L6.6045,6.57255616 L6.60391666,6.57197282 Z" id="路径备份-2" fill="#37D97F"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/icons/svg/upward.svg
+++ b/src/assets/icons/svg/upward.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" 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">
+        <g id="编组-43" transform="translate(-1870.000000, -485.000000)" fill-rule="nonzero">
+            <g id="编组-18备份" transform="translate(1.000000, 366.000000)">
+                <g id="收起" transform="translate(1878.000000, 128.000000) scale(1, -1) translate(-1878.000000, -128.000000) translate(1869.000000, 119.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="18" height="18"></rect>
+                    <path d="M9.79014922,13.2165873 L16.1721224,6.15356667 C16.6092925,5.77338351 16.6092925,5.16518371 16.1721224,4.78500055 C15.964758,4.60350795 15.6800768,4.50112918 15.3827707,4.50112918 C15.0854647,4.50112918 14.8007835,4.60350795 14.5934191,4.78500055 L9.00013482,11.162609 L3.40552499,4.78387137 C3.19816065,4.60237877 2.91347942,4.5 2.61617336,4.5 C2.3188673,4.5 2.03418606,4.60237877 1.82682172,4.78387137 C1.39105943,5.16454327 1.39105943,5.77176559 1.82682172,6.15243749 L8.20879489,13.214329 C8.31400161,13.3066969 8.440317,13.3797143 8.57994259,13.4288732 C8.99637706,13.5753327 9.475517,13.4912854 9.79014922,13.2165873 Z" id="路径" fill="#0B58FF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/assets/images/DataBoard.png
+++ b/src/assets/images/DataBoard.png
--- a/src/assets/images/Qian.png
+++ b/src/assets/images/Qian.png
--- a/src/assets/images/default-file-icon.png
+++ b/src/assets/images/default-file-icon.png
--- a/src/assets/images/factory-icon.png
+++ b/src/assets/images/factory-icon.png
--- a/src/assets/images/login-bg.png
+++ b/src/assets/images/login-bg.png
--- a/src/assets/images/no-data-bg.png
+++ b/src/assets/images/no-data-bg.png
--- a/src/assets/images/pay/icon/alipay_app.svg
+++ b/src/assets/images/pay/icon/alipay_app.svg
@@ -1 +1 @@
-<svg t="1627279997305" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11904" width="40" height="40"><path d="M938.7008 669.525333L938.7008 249.412267c0-90.555733-73.5232-164.078933-164.1472-164.078933L249.378133 85.333333c-90.555733 0-164.078933 73.48906699-164.078933 164.078933l0 525.2096c0 90.555733 73.454933 164.078933 164.07893301 164.078933l525.20959999 0c80.725333 0 147.8656-58.368 161.553067-135.099733-43.52-18.8416-232.106667-100.283733-330.376533-147.182933-74.786133 90.589867-153.088 144.930133-271.121067 144.930133s-196.81279999-72.704-187.357867-161.655467c6.2464-58.402133 46.2848-153.9072 220.296533-137.5232 91.682133 8.6016 133.666133 25.736533 208.418133 50.414933 19.3536-35.4304 35.4304-74.513067 47.616-116.0192L292.0448 436.565333l0-32.8704 164.0448 0 0-58.9824L256 344.712533l1e-8-36.181333 200.12373299 0L456.123733 223.3344c0 0 1.809067-13.312 16.520533-13.31200001l82.056533 1e-8 0 98.474667 213.333333 0 0 36.181333-213.333333 1e-8 0 58.98239999 174.045867 0c-16.00853301 65.1264-40.277333 124.962133-70.690133 177.220267C708.608 599.176533 938.7008 669.525333 938.7008 669.525333L938.7008 669.525333 938.7008 669.525333 938.7008 669.525333zM321.57013299 744.994133c-124.7232 0-144.452267-78.7456-137.83039999-111.65013299 6.5536-32.733867 42.666667-75.502933 112.0256-75.50293301 79.6672 0 151.04 20.445867 236.714667 62.088533C472.302933 698.333867 398.370133 744.994133 321.57013299 744.994133L321.57013299 744.994133 321.57013299 744.994133zM321.57013299 744.994133" fill="#1296db" p-id="11905"></path></svg>
+<svg t="1627279997305" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11904" width="40" height="40"><path d="M938.7008 669.525333L938.7008 249.412267c0-90.555733-73.5232-164.078933-164.1472-164.078933L249.378133 85.333333c-90.555733 0-164.078933 73.48906699-164.078933 164.078933l0 525.2096c0 90.555733 73.454933 164.078933 164.07893301 164.078933l525.20959999 0c80.725333 0 147.8656-58.368 161.553067-135.099733-43.52-18.8416-232.106667-100.283733-330.376533-147.182933-74.786133 90.589867-153.088 144.930133-271.121067 144.930133s-196.81279999-72.704-187.357867-161.655467c6.2464-58.402133 46.2848-153.9072 220.296533-137.5232 91.682133 8.6016 133.666133 25.736533 208.418133 50.414933 19.3536-35.4304 35.4304-74.513067 47.616-116.0192L292.0448 436.565333l0-32.8704 164.0448 0 0-58.9824L256 344.712533l1e-8-36.181333 200.12373299 0L456.123733 223.3344c0 0 1.809067-13.312 16.520533-13.31200001l82.056533 1e-8 0 98.474667 213.333333 0 0 36.181333-213.333333 1e-8 0 58.98239999 174.045867 0c-16.00853301 65.1264-40.277333 124.962133-70.690133 177.220267C708.608 599.176533 938.7008 669.525333 938.7008 669.525333L938.7008 669.525333 938.7008 669.525333 938.7008 669.525333zM321.57013299 744.994133c-124.7232 0-144.452267-78.7456-137.83039999-111.65013299 6.5536-32.733867 42.666667-75.502933 112.0256-75.50293301 79.6672 0 151.04 20.445867 236.714667 62.088533C472.302933 698.333867 398.370133 744.994133 321.57013299 744.994133L321.57013299 744.994133 321.57013299 744.994133zM321.57013299 744.994133" fill="#1296db" p-id="11905"></path></svg>
--- a/src/assets/images/tree-icon-1.png
+++ b/src/assets/images/tree-icon-1.png
--- a/src/assets/images/tree-icon-2.png
+++ b/src/assets/images/tree-icon-2.png
--- a/src/assets/images/tuple.png
+++ b/src/assets/images/tuple.png
--- a/src/assets/logo/cnbm.png
+++ b/src/assets/logo/cnbm.png
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -6,182 +6,217 @@
@import './btn.scss';

 body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+	height: 100%;
+	-moz-osx-font-smoothing: grayscale;
+	-webkit-font-smoothing: antialiased;
+	text-rendering: optimizeLegibility;
+	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+		Microsoft YaHei, Arial, sans-serif;
 }

-label {
-  font-weight: 700;
+// label {
+//   font-weight: 700;
+// }
+.searchBarBox .el-form-item--medium .el-form-item__label {
+  line-height: 40px;
+}
+.searchBarBox .el-form-item--medium .el-form-item__content {
+  line-height: 40px;
+}
+.searchBarBox .el-range-editor--small.el-input__inner {
+  height: 34px;
 }

 html {
-  height: 100%;
-  box-sizing: border-box;
+	height: 100%;
+	box-sizing: border-box;
 }

 #app {
-  height: 100%;
+	height: 100%;
 }

 *,
 *:before,
 *:after {
-  box-sizing: inherit;
+	box-sizing: inherit;
 }

 .no-padding {
-  padding: 0px !important;
+	padding: 0px !important;
 }

 .padding-content {
-  padding: 4px 0;
+	padding: 4px 0;
 }

 a:focus,
 a:active {
-  outline: none;
+	outline: none;
 }

 a,
 a:focus,
 a:hover {
-  cursor: pointer;
-  color: inherit;
-  text-decoration: none;
+	cursor: pointer;
+	color: inherit;
+	text-decoration: none;
 }

 div:focus {
-  outline: none;
+	outline: none;
 }

 .fr {
-  float: right;
+	float: right;
 }

 .fl {
-  float: left;
+	float: left;
 }

 .pr-5 {
-  padding-right: 5px;
+	padding-right: 5px;
 }

 .pl-5 {
-  padding-left: 5px;
+	padding-left: 5px;
 }

 .block {
-  display: block;
+	display: block;
 }

 .pointer {
-  cursor: pointer;
+	cursor: pointer;
 }

 .inlineBlock {
-  display: block;
+	display: block;
 }

 .clearfix {
-  &:after {
-    visibility: hidden;
-    display: block;
-    font-size: 0;
-    content: " ";
-    clear: both;
-    height: 0;
-  }
+	&:after {
+		visibility: hidden;
+		display: block;
+		font-size: 0;
+		content: ' ';
+		clear: both;
+		height: 0;
+	}
 }

 aside {
-  background: #eef1f6;
-  padding: 8px 24px;
-  margin-bottom: 20px;
-  border-radius: 2px;
-  display: block;
-  line-height: 32px;
-  font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  color: #2c3e50;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+	background: #eef1f6;
+	padding: 8px 24px;
+	margin-bottom: 20px;
+	border-radius: 2px;
+	display: block;
+	line-height: 32px;
+	font-size: 16px;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
+		Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+	color: #2c3e50;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;

-  a {
-    color: #337ab7;
-    cursor: pointer;
+	a {
+		color: #337ab7;
+		cursor: pointer;

-    &:hover {
-      color: rgb(32, 160, 255);
-    }
-  }
+		&:hover {
+			color: rgb(32, 160, 255);
+		}
+	}
 }

 //main-container全局样式
 .app-container {
-  padding: 16px;
+	padding: 16px;
 }

 .components-container {
-  margin: 30px 50px;
-  position: relative;
+	margin: 30px 50px;
+	position: relative;
 }

 .text-center {
-  text-align: center
+	text-align: center;
 }

 .sub-navbar {
-  height: 50px;
-  line-height: 50px;
-  position: relative;
-  width: 100%;
-  text-align: right;
-  padding-right: 20px;
-  transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+	height: 50px;
+	line-height: 50px;
+	position: relative;
+	width: 100%;
+	text-align: right;
+	padding-right: 20px;
+	transition: 600ms ease position;
+	background: linear-gradient(
+		90deg,
+		rgba(32, 182, 249, 1) 0%,
+		rgba(32, 182, 249, 1) 0%,
+		rgba(33, 120, 241, 1) 100%,
+		rgba(33, 120, 241, 1) 100%
+	);

-  .subtitle {
-    font-size: 20px;
-    color: #fff;
-  }
+	.subtitle {
+		font-size: 20px;
+		color: #fff;
+	}

-  &.draft {
-    background: #d0d0d0;
-  }
+	&.draft {
+		background: #d0d0d0;
+	}

-  &.deleted {
-    background: #d0d0d0;
-  }
+	&.deleted {
+		background: #d0d0d0;
+	}
 }

 .link-type,
 .link-type:focus {
-  color: #337ab7;
-  cursor: pointer;
+	color: #337ab7;
+	cursor: pointer;

-  &:hover {
-    color: rgb(32, 160, 255);
-  }
+	&:hover {
+		color: rgb(32, 160, 255);
+	}
 }

 .filter-container {
-  padding-bottom: 10px;
+	padding-bottom: 10px;

-  .filter-item {
-    display: inline-block;
-    vertical-align: middle;
-    margin-bottom: 10px;
-  }
+	.filter-item {
+		display: inline-block;
+		vertical-align: middle;
+		margin-bottom: 10px;
+	}
 }

 //refine vue-multiselect plugin
 .multiselect {
-  line-height: 16px;
+	line-height: 16px;
 }

 .multiselect--active {
-  z-index: 1000 !important;
+	z-index: 1000 !important;
+}
+
+.no-data-bg {
+	height: 240px;
+	background: url(../images/no-data-bg.png) 50% 100% / contain
+		no-repeat;
+	position: relative;
+
+	&::after {
+		content: '暂无数据';
+		position: absolute;
+		bottom: 12px;
+		left: 50%;
+		transform: translateX(-50%);
+		color: #ccc;
+		font-size: 18px;
+		letter-spacing: 1px;
+	}
 }
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@@ -1,10 +1,13 @@
 /* ===== PC DESIGN ===== */
-$W: 1000;
+$W: 1080;
 $H: 1920;
-$picW: 438;
-$picH: 560;
-$formW: 320;
+// $picW: 438;
+// $picH: 560;
+$picW: 1080;
+$picH: 1118;
+$formW: 420;
 $tabW: $formW / 2;
+// $rowH: 56;
 $rowH: 56;
 $buttonH: 50;

@@ -15,6 +18,7 @@ $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;
@@ -22,7 +26,8 @@ $contentBgColor: #ffffff;
 // container-content-pic
 $picWidth: round($picW / $H * 100) * 1vw;
 $picHeight: inherit;
-$picImage: '../assets/images/pic.png';
+// $picImage: '../assets/images/pic.png';
+$picImage: '../assets/images/login-bg.png';
 // container-content-field
 $fieldWidth: $contentWidth - $picWidth;
 $fieldHeight: inherit;
@@ -34,231 +39,310 @@ $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;
-    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;
-    }
-  }
+	.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;
+		}
+	}
 }

 // - - - - - PC 最小尺寸设置
@media screen and (min-width: 599px) and (max-width: 1366px) {
-  .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;
-          }
-        }
-      }
-    }
-  }
-}
+	.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;
+					}
+				}
+			}
+		}
+	}
+}

 /* ===== MOBILE DESIGN ===== */
 $mobileW: 375;
@@ -273,115 +357,142 @@ $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: 17px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    .logo {
-      display: none;
-    }
+	.container {
+		// 元素
+		background-image: url($mobileContainerBgImage);
+		min-width: 280px;
+		min-height: 568px;
+		// 文字
+		font-size: 14px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		.logo {
+			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 {
-        // 元素
-        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;
+		.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 {
          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: 20px;
-    }
-  }
+					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;
+					}
+				}

+				.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;
+		}
+	}
 }
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -5,110 +5,123 @@

 /** 基础通用 **/
 .pt5 {
-  padding-top: 5px;
+	padding-top: 5px;
 }
 .pr5 {
-  padding-right: 5px;
+	padding-right: 5px;
 }
 .pb5 {
-  padding-bottom: 5px;
+	padding-bottom: 5px;
 }
 .mt5 {
-  margin-top: 5px;
+	margin-top: 5px;
 }
 .mr5 {
-  margin-right: 5px;
+	margin-right: 5px;
 }
 .mb5 {
-  margin-bottom: 5px;
+	margin-bottom: 5px;
 }
 .mb8 {
-  margin-bottom: 8px;
+	margin-bottom: 8px;
 }
 .ml5 {
-  margin-left: 5px;
+	margin-left: 5px;
 }
 .mt10 {
-  margin-top: 10px;
+	margin-top: 10px;
 }
 .mr10 {
-  margin-right: 10px;
+	margin-right: 10px;
 }
 .mb10 {
-  margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 .ml10 {
-  margin-left: 10px;
+	margin-left: 10px;
 }
 .mt20 {
-  margin-top: 20px;
+	margin-top: 20px;
 }
 .mr20 {
-  margin-right: 20px;
+	margin-right: 20px;
 }
 .mb20 {
-  margin-bottom: 20px;
+	margin-bottom: 20px;
 }
 .ml20 {
-  margin-left: 20px;
+	margin-left: 20px;
 }

-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-  font-family: inherit;
-  font-weight: 500;
-  line-height: 1.1;
-  color: inherit;
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: inherit;
+	font-weight: 500;
+	line-height: 1.1;
+	color: inherit;
 }

-.el-message-box__status + .el-message-box__message{
-  word-break: break-word;
+.el-message-box__status + .el-message-box__message {
+	word-break: break-word;
 }

 .el-dialog:not(.is-fullscreen) {
-  margin-top: 6vh !important;
+	// margin-top: 6vh !important;
+	margin-top: 12vh !important;
 }

 .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
-  overflow: auto;
-  overflow-x: hidden;
-  max-height: 70vh;
-  padding: 10px 20px 0;
+	overflow: auto;
+	overflow-x: hidden;
+	max-height: 70vh;
+	padding: 10px 20px 0;
 }

-.el-dialog{
-  display: flex;
-  flex-direction: column;
-  max-width: calc(100% - 30px);
-  max-height: calc(100% - 70px);
-  .el-dialog__body {
-    overflow: auto;
-  }
+.el-dialog {
+	display: flex;
+	flex-direction: column;
+	max-width: calc(100% - 30px);
+	max-height: calc(100% - 70px);
+	.el-dialog__body {
+		overflow: auto;
+	}
 }

 .el-table {
-  .el-table__header-wrapper, .el-table__fixed-header-wrapper {
-    th {
-      word-break: break-word;
-      background-color: #f8f8f9;
-      color: #515a6e;
-      height: 40px;
-      font-size: 13px;
-    }
-  }
-  .el-table__body-wrapper {
-    .el-button [class*="el-icon-"] + span {
-      margin-left: 1px;
-    }
-  }
+	.el-table__header-wrapper,
+	.el-table__fixed-header-wrapper {
+		th {
+			word-break: break-word;
+			background-color: #f8f8f9;
+			color: #515a6e;
+			height: 40px;
+			font-size: 13px;
+		}
+	}
+	.el-table__body-wrapper {
+		.el-button [class*='el-icon-'] + span {
+			margin-left: 1px;
+		}
+	}
 }

 /** 表单布局 **/
 .form-header {
-  font-size:15px;
-  color:#6379bb;
-  border-bottom:1px solid #ddd;
-  margin:8px 10px 25px 10px;
-  padding-bottom:5px
+	font-size: 15px;
+	color: #6379bb;
+	border-bottom: 1px solid #ddd;
+	margin: 8px 10px 25px 10px;
+	padding-bottom: 5px;
 }

 /** 表格布局 **/
@@ -122,169 +135,171 @@

 /* tree border */
 .tree-border {
-  margin-top: 5px;
-  border: 1px solid #e5e6e7;
-  background: #FFFFFF none;
-  border-radius:4px;
+	margin-top: 5px;
+	border: 1px solid #e5e6e7;
+	background: #ffffff none;
+	border-radius: 4px;
 }

 .pagination-container .el-pagination {
-  right: 0;
-  position: absolute;
+	right: 0;
+	position: absolute;
 }

-@media ( max-width : 768px) {
-  .pagination-container .el-pagination > .el-pagination__jump {
-    display: none !important;
-  }
-  .pagination-container .el-pagination > .el-pagination__sizes {
-    display: none !important;
-  }
+@media (max-width: 768px) {
+	.pagination-container .el-pagination > .el-pagination__jump {
+		display: none !important;
+	}
+	.pagination-container .el-pagination > .el-pagination__sizes {
+		display: none !important;
+	}
 }

 .el-table .fixed-width .el-button--mini {
-  padding-left: 0;
-  padding-right: 0;
-  width: inherit;
+	padding-left: 0;
+	padding-right: 0;
+	width: inherit;
 }

 /** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
-  cursor: pointer;
-  margin-left: 5px;
+.el-table .el-dropdown-link,
+.el-table .el-dropdown-selfdefine {
+	cursor: pointer;
+	margin-left: 5px;
 }

-.el-table .el-dropdown, .el-icon-arrow-down {
-  font-size: 12px;
+.el-table .el-dropdown,
+.el-icon-arrow-down {
+	font-size: 12px;
 }

 .el-tree-node__content > .el-checkbox {
-  margin-right: 8px;
+	margin-right: 8px;
 }

 .list-group-striped > .list-group-item {
-  border-left: 0;
-  border-right: 0;
-  border-radius: 0;
-  padding-left: 0;
-  padding-right: 0;
+	border-left: 0;
+	border-right: 0;
+	border-radius: 0;
+	padding-left: 0;
+	padding-right: 0;

-  &:not(:last-child) {
-    border-bottom: 1px solid #e7eaec;
-  }
+	&:not(:last-child) {
+		border-bottom: 1px solid #e7eaec;
+	}
 }

 .list-group {
-  padding-left: 0px;
-  list-style: none;
+	padding-left: 0px;
+	list-style: none;
 }

 .list-group-item {
-  // border-bottom: 1px solid #e7eaec;
-  // border-top: 1px solid #e7eaec;
-  margin-bottom: -1px;
-  padding: 11px 0px;
-  font-size: 13px;
+	// border-bottom: 1px solid #e7eaec;
+	// border-top: 1px solid #e7eaec;
+	margin-bottom: -1px;
+	padding: 11px 0px;
+	font-size: 13px;
 }

 .pull-right {
-  float: right !important;
+	float: right !important;
 }

 .el-card__header {
-  padding: 14px 15px 7px;
-  min-height: 40px;
+	padding: 14px 15px 7px;
+	min-height: 40px;
 }

 .el-card__body {
-  padding: 15px 20px 20px 20px;
+	padding: 15px 20px 20px 20px;
 }

 .card-box {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-bottom: 10px;
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-bottom: 10px;
 }

 /* button color */
 .el-button--cyan.is-active,
 .el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
+	background: #20b2aa;
+	border-color: #20b2aa;
+	color: #ffffff;
 }

 .el-button--cyan:focus,
 .el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
-  color: #FFFFFF;
+	background: #48d1cc;
+	border-color: #48d1cc;
+	color: #ffffff;
 }

 .el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
+	background-color: #20b2aa;
+	border-color: #20b2aa;
+	color: #ffffff;
 }

 /* text color */
 .text-navy {
-  color: #1ab394;
+	color: #1ab394;
 }

 .text-primary {
-  color: inherit;
+	color: inherit;
 }

 .text-success {
-  color: #1c84c6;
+	color: #1c84c6;
 }

 .text-info {
-  color: #23c6c8;
+	color: #23c6c8;
 }

 .text-warning {
-  color: #f8ac59;
+	color: #f8ac59;
 }

 .text-danger {
-  color: #ed5565;
+	color: #ed5565;
 }

 .text-muted {
-  color: #888888;
+	color: #888888;
 }

 /* image */
 .img-circle {
-  border-radius: 50%;
+	border-radius: 50%;
 }

 .img-lg {
-  width: 120px;
-  height: 120px;
+	width: 120px;
+	height: 120px;
 }

 .avatar-upload-preview {
-  position: absolute;
-  top: 50%;
-  transform: translate(50%, -50%);
-  width: 200px;
-  height: 200px;
-  border-radius: 50%;
-  box-shadow: 0 0 4px #ccc;
-  overflow: hidden;
+	position: absolute;
+	top: 50%;
+	transform: translate(50%, -50%);
+	width: 200px;
+	height: 200px;
+	border-radius: 50%;
+	box-shadow: 0 0 4px #ccc;
+	overflow: hidden;
 }

 /* 拖拽列样式 */
-.sortable-ghost{
-  opacity: .8;
-  color: #fff!important;
-  background: #42b983!important;
+.sortable-ghost {
+	opacity: 0.8;
+	color: #fff !important;
+	background: #42b983 !important;
 }

 .top-right-btn {
-  position: relative;
-  float: right;
+	position: relative;
+	float: right;
 }
--- a/src/components/ButtonNav/index.vue
+++ b/src/components/ButtonNav/index.vue
@@ -0,0 +1,141 @@
+<template>
+  <!-- 按钮切换 -->
+  <div v-if="buttonMode" class="button-nav">
+    <button v-for="m in menus" :key="m" @click="handleClick(m)"
+      :data-text="m"
+      :class="[m === currentMenu ? 'active' : '']"
+      ></button>
+  </div>
+  <!-- 标签切换 -->
+  <div v-else class="custom-tabs" style="height: 100%; width: 100%">
+    <el-tabs class="tag-nav" v-model="currentMenu" style="height: 100%" @tab-click="handleTabClick">
+      <el-tab-pane v-for="(m, idx) in menus" :key="m" :label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
+        :name="m">
+        <slot :name="`tab${idx + 1}`"></slot>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ButtonNav",
+  props: {
+    menus: {
+      type: Array,
+      required: true,
+      default: () => [],
+      validator: (val) => val.length > 0,
+    },
+    buttonMode: {
+      type: Boolean,
+      default: true,
+    },
+    // 新增：支持外部传入选中值（v-model 绑定）
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      currentMenu: "",
+    };
+  },
+  created() {
+    // 优先使用外部传入的 value，否则默认第一个
+    this.currentMenu = this.value || this.menus[0];
+  },
+  watch: {
+    // 监听外部 value 变化，同步到内部 currentMenu
+    value(newVal) {
+      this.currentMenu = newVal;
+    },
+    // 监听内部 currentMenu 变化，通知外部
+    currentMenu(val) {
+      this.$emit("input", val); // 触发 v-model 同步
+      this.$emit("change", val); // 保留原 change 事件
+    },
+  },
+  methods: {
+    // 按钮点击事件
+    handleClick(m) {
+      this.currentMenu = m;
+    },
+    // 标签点击事件（el-tabs 自带）
+    handleTabClick(tab) {
+      this.currentMenu = tab.name;
+    },
+  },
+};
+</script>
+
+<!-- 样式不变 -->
+<style scoped lang="scss">
+.button-nav {
+  width: 100%;
+  display: flex;
+  gap: 12px;
+
+  * {
+    user-select: none;
+  }
+
+  button {
+    cursor: pointer;
+    appearance: none;
+    outline: none;
+    border: none;
+    background: #fff;
+    border-radius: 8px;
+    padding: 15px;
+    color: #888;
+    letter-spacing: 2px;
+    flex: 1;
+    box-sizing: padding-box;
+    position: relative;
+
+    &::after {
+      content: attr(data-text);
+      position: absolute;
+      top: 5px;
+      left: 50%;
+      font-size: 16px;
+      font-weight: 500;
+      transform: translate(-50%);
+    }
+
+    &.active {
+      color: #111;
+      //border-bottom: 2px solid #0b58ff;
+      box-shadow: 0px 2px 1px 1px #0b58ff;
+    }
+  }
+}
+</style>
+
+<style scoped>
+.custom-tabs>>>.el-tabs__header {
+  margin-bottom: 8px;
+  display: inline-block;
+  /* transform: translateY(-12px); */
+}
+
+.custom-tabs>>>.el-tabs__item {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+  line-height: 36px !important;
+  height: 36px;
+}
+
+.custom-tabs>>>.el-tabs__content {
+  height: calc(100% - 42px);
+}
+
+.custom-tabs>>>.el-tab-pane {
+  box-sizing: border-box;
+  height: 100%;
+  padding: 20px;
+  border: 10px solid #f002;
+}
+</style>
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -1,4 +1,4 @@
-<!-- 
+<!--
    filename: dialogForm.vue
    author: liubin
    date: 2023-08-15 10:32:36
@@ -10,6 +10,8 @@
 		ref="form"
 		:model="form"
 		:label-width="`${labelWidth}px`"
+		:size="size"
+		:label-position="labelPosition"
 		v-loading="formLoading">
 		<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
 			<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
@@ -46,28 +48,58 @@
 						:placeholder="`请选择${col.label}`"
 						value-format="timestamp"
 						v-bind="col.bind"></el-date-picker>
-					<el-upload
-						class="upload-in-dialog"
-						v-if="col.upload"
-						:file-list="uploadedFileList"
-						:action="col.url"
-						:on-success="handleUploadSuccess"
-						v-bind="col.bind">
-						<el-button
-							size="small"
-							type="primary"
-							:disabled="col.bind?.disabled || false">
-							点击上传
-						</el-button>
-						<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
-							{{ col.uploadTips || '只能上传jpg/png文件，大小不超过2MB' }}
-						</div>
-					</el-upload>
+					<el-switch
+						v-if="col.switch"
+						v-model="form[col.prop]"
+						active-color="#0b58ff"
+						inactive-color="#e1e1e1"
+						v-bind="col.bind"></el-switch>
 					<component
 						v-if="col.subcomponent"
 						:key="col.key"
 						:is="col.subcomponent"
 						:inlineStyle="col.style"></component>
+
+					<div
+						class="upload-area"
+						:class="uploadOpen ? '' : 'height-48'"
+						ref="uploadArea"
+						v-if="col.upload">
+						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
+							<el-button
+								type="text"
+								icon="el-icon-arrow-right"
+								@click="handleFilesOpen" />
+						</span>
+						<!-- :file-list="uploadedFileList" -->
+						<el-upload
+							class="upload-in-dialog"
+							v-if="col.upload"
+							:action="uploadUrl"
+							:headers="uploadHeaders"
+							:show-file-list="false"
+							icon="el-icon-upload2"
+							:before-upload="beforeUpload"
+							: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">
+								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
+							</div>
+						</el-upload>
+						<uploadedFile
+							class="file"
+							v-for="file in form[col.prop] || []"
+							:file="file"
+							:key="file.fileUrl"
+							@delete="handleDeleteFile(file)"
+							@Preview="handlePreview(file)" />
+					</div>
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -75,6 +107,9 @@
 </template>

 <script>
+import { getAccessToken } from '@/utils/auth';
+import tupleImg from '@/assets/images/tuple.png';
+
 /**
 * 找到最长的label
 * @param {*} options
@@ -83,6 +118,8 @@ function findMaxLabelWidth(rows) {
 	let max = 0;
 	rows.forEach((row) => {
 		row.forEach((opt) => {
+			// debugger;
+			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
 			}
@@ -91,6 +128,50 @@ function findMaxLabelWidth(rows) {
 	return max;
 }

+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		handlePreview() {
+			this.$emit('Preview', this.file);
+		},
+	},
+	mounted() {},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				<el-button onClick={this.handlePreview}>{this.file.fileName}</el-button>
+				<el-button
+					type="text"
+					icon="el-icon-close"
+					style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+					class="dialog__upload_component__close"
+					onClick={this.handleDelete}
+				/>
+			</div>
+		);
+	},
+};
+
 export default {
 	name: 'DialogForm',
 	model: {
@@ -98,7 +179,7 @@ export default {
 		event: 'update',
 	},
 	emits: ['update'],
-	components: {},
+	components: { uploadedFile },
 	props: {
 		rows: {
 			type: Array,
@@ -108,13 +189,33 @@ export default {
 			type: Object,
 			default: () => ({}),
 		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		hasFile: {
+			type: Boolean,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
 	},
 	data() {
 		return {
+			uploadOpen: false,
+			form: {},
 			formLoading: true,
 			optionListOf: {},
 			uploadedFileList: [],
 			dataLoaded: false,
+			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
+			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
 		};
 	},
 	computed: {
@@ -124,21 +225,10 @@ export default {
 			return max * 20;
 			// return max * 20 + 'px';
 		},
-		form: {
-			get() {
-				// if (this.dataLoaded) return this.dataForm;
-				// else return {}
-				return this.dataForm;
-			},
-			set(val) {
-				console.log('set form', val);
-			},
-		},
 	},
 	watch: {
 		rows: {
 			handler() {
-				console.log('watch triggered!');
 				this.$nextTick(() => {
 					this.handleOptions('watch');
 				});
@@ -146,6 +236,16 @@ export default {
 			deep: true,
 			immediate: false,
 		},
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (this.hasFile) {
+					this.form.files = this.form.files ?? [];
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
 	},
 	mounted() {
 		// 处理 options
@@ -159,6 +259,20 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
+		async handlePreview(file) {
+			const data = await this.$axios({
+				url: file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+			const link = document.createElement('a');
+			link.href = window.URL.createObjectURL(new Blob([data]));
+			link.download = file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+			window.URL.revokeObjectURL(link.href);
+		},
 		// getCode
 		async getCode(url) {
 			const response = await this.$axios(url);
@@ -229,7 +343,7 @@ export default {
 										}))
 									);
 								} else if (opt.input) {
-									console.log('setting code: ', response.data)
+									console.log('setting code: ', response.data);
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
 								}
@@ -258,26 +372,34 @@ export default {
 			if (!promiseList.length) this.formLoading = false;
 		},
 		// 上传成功的特殊处理
-		beforeUpload() {},
+		beforeUpload(file) {
+      console.log(file)
+    },
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
-			console.log(
-				'[dialogForm:handleUploadSuccess]',
-				response,
-				file,
-				fileList,
-				this.form
-			);
-			// 保存原始文件名
-			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
-			// 保存完整地址
-			if ('fileUrls' in this.form) this.form.fileUrls.push(response.data);
+			this.form.files.push({
+				fileName: file.name,
+				fileUrl: response.data,
+				fileType: 2,
+			});
 			this.$modal.msgSuccess('上传成功');
+			this.$emit('update', this.form);
 		},

 		getFileName(fileUrl) {
 			return fileUrl.split('/').pop();
 		},
+
+		handleFilesOpen() {
+			this.uploadOpen = !this.uploadOpen;
+		},
+
+		handleDeleteFile(file) {
+			this.form.files = this.form.files.filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+			this.$emit('update', this.form);
+		},
 	},
 };
 </script>
@@ -287,4 +409,52 @@ export default {
 .el-select {
 	width: 100%;
 }
+
+.upload-area {
+	// background: #ccc;
+	// display: grid;
+	// grid-auto-rows: 34px;
+	// grid-template-columns: repeat(6, minmax(32px, max-content));
+	// gap: 8px;
+	// align-items: center;
+	position: relative;
+	overflow: hidden;
+	transition: height 0.3s ease-out;
+}
+
+.upload-in-dialog {
+	// display: inline-block;
+	margin-right: 24px;
+	// background: #ccc;
+	position: relative;
+	// top: -13px;
+	float: left;
+}
+
+.close-icon {
+	// background: #ccc;
+	position: absolute;
+	top: 0;
+	right: 12px;
+	z-index: 100;
+	transition: transform 0.3s ease-out;
+}
+
+.close-icon.open {
+	transform: rotateZ(90deg);
+}
+</style>
+
+<style>
+.dialog__upload_component__close {
+	color: #ccc;
+}
+.dialog__upload_component__close:hover {
+	/* color: #777; */
+	color: red;
+}
+
+.height-48 {
+	height: 35px !important;
+}
 </style>
--- a/src/components/SequenceGraph/index.vue
+++ b/src/components/SequenceGraph/index.vue
@@ -0,0 +1,89 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-08-29 14:39:40
+    description: 状态时序图 
+-->
+
+<template>
+	<div class="sequence-graph">
+		<SequenceGraphItem v-for="eq in Object.keys(list)" :key="eq" />
+	</div>
+</template>
+
+<script>
+import SequenceGraphItem from './sequenceGraphItem.vue';
+export default {
+	name: 'SequenceGraph',
+	components: { SequenceGraphItem },
+	props: {
+		colors: {
+			type: Array,
+			default: () => ['', '', '', '', '', ''], // 默认颜色
+		},
+	},
+	data() {
+		return {
+			list: {
+				打孔机: {
+					equipmentId: 1,
+					equipmentName: 'EQ1',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				磨边机: {
+					equipmentId: 12,
+					equipmentName: 'EQ2',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				清洗机: {
+					equipmentId: 13,
+					equipmentName: 'EQ3',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				窑炉: {
+					equipmentId: 14,
+					equipmentName: 'EQ4',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				AGV: {
+					equipmentId: 15,
+					equipmentName: 'EQ5',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+			},
+		};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.sequence-graph {
+	padding: 24px;
+	background: #fff;
+	border-radius: 6px;
+	margin: 12px;
+	box-shadow: 0 0 32px 8px rgba($color: #000000, $alpha: 0.2);
+}
+</style>
--- a/src/components/SequenceGraph/sequenceGraphItem.vue
+++ b/src/components/SequenceGraph/sequenceGraphItem.vue
@@ -0,0 +1,51 @@
+<!-- 
+    filename: sequenceGraphItem.vue
+    author: liubin
+    date: 2023-08-29 14:40:51
+    description: 时序图最小单元
+-->
+
+<template>
+	<div class="sequence-graph-item" :style="styles">
+        <span v-if="time != null">{{ time }}</span>
+    </div>
+</template>
+
+<script>
+export default {
+	name: 'SequenceGraphItem',
+	components: {},
+	props: {
+		color: {
+			type: String,
+			default: 'black',
+		},
+        time: {
+            type: String,
+            default: null
+        }
+	},
+    computed: {
+        styles() {
+            return {
+                color: this.color
+            }
+        }
+    },
+	data() {
+		return {};
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.sequence-graph-item {
+    background: #fff;
+    padding: 12px;
+    width: 40px;
+    height: 32px;
+    display: inline-block;
+}
+</style>
--- a/src/filter/code-filter.js
+++ b/src/filter/code-filter.js
@@ -0,0 +1,94 @@
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-11 13:40:48
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  deactivate: {
+    1: '启用',
+    0: '停用',
+  },
+  wareType: {
+    1: '缓存',
+    2: '活动',
+    3: '其它',
+  },
+  reportType: {
+    2: '日',
+    3: '周',
+    4: '月',
+    5: '年',
+  },
+  manual: {
+    1: '手动',
+    0: '自动',
+  },
+}
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay(),
+    w: '',
+  }
+  const time_str = format.replace(/{([ymdhisaw])+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (key === 'w') {
+      const current = new Date(time);
+      current.setHours(0, 0, 0);
+      current.setDate(current.getDate() + 4 - (current.getDay() || 7));
+      const firstThursday = new Date(current.getFullYear(), 0, 4);
+      firstThursday.setDate(firstThursday.getDate() + 4 - (firstThursday.getDay() || 7));
+      const time1 = current.getTime() - firstThursday.getTime();
+      const weeks = Math.ceil(time1 / (7 * 24 * 3600 * 1000));
+      return (weeks + 1)
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+export default function (dictTable) {
+  return function (val) {
+    return table?.[dictTable]?.[val]
+  }
+}
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -32,7 +32,7 @@ export default {
  min-height: calc(100vh - 56px);
  min-width: calc(100vh - 280px);
  position: relative;
-  overflow: hidden;
+  overflow: visible;
  margin: 8px 14px 0px 16px;
  border-radius: 8px;
  background-color: #fff;
@@ -46,6 +46,8 @@ export default {
  .app-main {
    /* 84 = navbar + tags-view = 50 + 34 */
    min-height: calc(100vh - 120px - 8px);
+    display: flex;
+    flex-direction: column;
  }

  .fixed-header + .app-main {
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -94,7 +94,7 @@ export default {
    async logout() {
      this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => {
        this.$store.dispatch('LogOut').then(() => {
-          location.href = getPath('/index');
+          location.href = getPath('/');
        })
      }).catch(() => {});
    }
--- a/src/main.js
+++ b/src/main.js
@@ -52,6 +52,13 @@ Vue.prototype.divide = divide;
 Vue.prototype.tableHeight = function(n) {
 	return window.innerHeight - n
 }
+Vue.prototype.searchBarWidth = function(name, num) {
+	if (document.getElementById(name) && document.getElementById(name).offsetWidth < num) {
+		return true
+	} else {
+		return false
+	}
+}

 // 全局组件挂载
 Vue.component('DictTag', DictTag);
--- a/src/mixins/basic-add.js
+++ b/src/mixins/basic-add.js
@@ -0,0 +1,122 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 15:46:19
+ * @Description:
+ */
+import { listData } from "@/api/system/dict/data"; //数据字典接口
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '', //新增接口
+        updateURL: '', //编辑提交接口
+        infoURL: '', //编辑时获取单条数据接口
+        codeURL: '', //获取code接口（返回结果为dataForm.code字段）
+        optionArrUrl: [], //需要获取下拉框的方法数组
+        optionArr: {}, //需要获取下拉框的方法数组的返回结果
+        dictNameList: [], //数据字典name数组
+        dictArr: {}, //需要获取数据字典的方法数组的返回结果
+      },
+      visible: false,
+      setData: false, // 是否需要【编辑时获取单条数据接口】返回的数据操作
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || null;
+      this.visible = true;
+      if (this.urlOptions.optionArrUrl.length > 0) {
+        this.getArr()
+      }
+      if (this.urlOptions.dictNameList.length > 0) {
+        this.getDict()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+            if (this.setData) {
+              this.setDataForm()
+            }
+          });
+        } else {
+          if (this.urlOptions.codeURL) {
+            this.getCode()
+          }
+				}
+      });
+    },
+    /** 获取code */
+		getCode() {
+			this.urlOptions.codeURL()
+				.then(({ data: res }) => {
+					this.dataForm.code = res;
+				})
+				.catch(() => {});
+		},
+    /** 获取下拉框数组 */
+    getArr() {
+      const params = {
+        pageSize: 100,
+        pageNo: 1,
+      }
+      this.urlOptions.optionArrUrl.forEach((item, index) => {
+        item(params).then(({ data: res }) => {
+          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
+        })
+          .catch(() => {
+          });
+      });
+    },
+    /** 查询字典数据列表 */
+    getDict() {
+      this.urlOptions.dictNameList.forEach((item,index)=>{
+        const queryParams = {
+          pageNo: 1,
+          pageSize: 99,
+          dictType: item,
+        }
+        listData(queryParams).then(response => {
+          this.$set(this.urlOptions.dictArr, `dict${index}`, response.data.list)
+        });
+      })
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+    /** 清空form */
+    formClear() {
+      if (this.$refs.dataForm!==undefined) {
+          this.$refs.dataForm.resetFields();
+      }
+    }
+  }
+}
--- a/src/mixins/basic-page.js
+++ b/src/mixins/basic-page.js
@@ -0,0 +1,128 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-02 09:33:29
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '', //获取table接口
+        deleteURL: '', //删除接口
+        exportURL: '' //导出接口
+      },
+      tableData: [], //table数据
+      listQuery: { //分页
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false, //导出完成的加载状态是否开启
+      dataListLoading: false, //获取table的加载状态是否开启
+      addOrEditTitle: '', //dialog的title
+      addOrUpdateVisible: false, //dialog状态
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增
+    addOrUpdateHandle(id) {
+      this.addOrEditTitle = "新增";
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否确认删除${name ? '名称为"' + name + '"' : '序号为"' + index + '"'}的数据项?`, "系统提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
+    // dialog取消
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    // dialog确定
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    // dialog的父组件方法this.$emit("refreshDataList");
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '报表.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
‘937886381’	1b56696da9	xiugai	2025-10-10 13:12:52 +08:00
zwq	bbd9972761	ry-bug	2025-03-10 16:33:55 +08:00
zwq	8e9b2f6444	更新	2025-02-27 13:54:28 +08:00
zwq	c83a7afadb	更新	2025-02-24 14:10:34 +08:00
zwq	b43876fe67	更新	2025-02-19 14:13:47 +08:00
zwq	f143c5e2d9	.	2025-01-16 08:34:17 +08:00
zwq	0b03e6d44b	更新	2025-01-15 13:35:15 +08:00
zwq	19dbe38458	更新	2025-01-10 15:07:05 +08:00
zwq	43ba33062b	更新	2024-11-29 16:42:13 +08:00
zwq	ca390fd764	更新汝阳bug	2024-11-26 16:51:07 +08:00
朱文强	8ad8e3a5b4	Merge pull request '更新' (#399 ) from projects/zg-zwq into projects/zg-test Reviewed-on: #399	2024-09-26 14:14:31 +08:00
zwq	6ca512392c	更新	2024-09-26 14:13:59 +08:00
朱文强	a73502cda7	Merge pull request '更新' (#397 ) from projects/zg-zwq into projects/zg-test Reviewed-on: #397	2024-09-14 09:02:43 +08:00
zwq	e32530e459	更新	2024-09-14 09:02:07 +08:00
朱文强	64e1c1869d	Merge pull request '更新' (#396 ) from projects/zg-zwq into projects/zg-test Reviewed-on: #396	2024-09-11 13:59:37 +08:00
zwq	93ac1c4742	更新	2024-09-11 13:58:14 +08:00
朱文强	a650f0ad9d	Merge pull request '更新' (#394 ) from projects/zg-zwq into projects/zg-test Reviewed-on: #394	2024-09-10 15:21:22 +08:00
zwq	e237737830	更新	2024-09-10 15:19:44 +08:00
朱文强	09cce6c613	Merge pull request '更新自贡' (#345 ) from projects/zg-zwq into projects/zg-test Reviewed-on: #345	2024-04-22 16:56:43 +08:00
zwq	07dd135daa	更新自贡	2024-04-22 16:55:59 +08:00
朱文强	0757d2d47c	Merge pull request '更新' (#338 ) from projects/zg-zwq into projects/zg-test Reviewed-on: #338	2024-04-15 17:22:40 +08:00
zwq	4fbe72d314	更新	2024-04-15 17:22:10 +08:00
g7hoo	10219fd841	Merge pull request 'projects/line-lb' (#72 ) from projects/line-lb into projects/line-test Reviewed-on: #72	2023-11-14 09:22:16 +08:00
lb	74a2a3b8e5	Merge branch 'projects/line-lb' of http://git.picaiba.com/mt-fe-group/yudao-dev into projects/line-lb	2023-11-14 09:15:58 +08:00
lb	c3b4223e5b	update login	2023-11-14 09:15:30 +08:00
g7hoo	070e01c2c4	Merge pull request 'projects/line-lb' (#58 ) from projects/line-lb into projects/line-test Reviewed-on: #58	2023-10-30 10:53:44 +08:00
lb	2665b6a0b0	Merge branch 'projects/line-test' into projects/line-lb	2023-10-30 10:52:08 +08:00
lb	a71fb90e6a	update DialogForm v-model	2023-10-30 10:51:41 +08:00
g7hoo	ac85c83cf9	Merge pull request 'update' (#50 ) from projects/line-lb into projects/line-test Reviewed-on: #50	2023-10-19 17:07:10 +08:00
lb	c2e987aee4	update	2023-10-19 17:06:15 +08:00
g7hoo	0e4ed597cd	Merge pull request 'update ui' (#49 ) from projects/line-lb into projects/line-test Reviewed-on: #49	2023-10-18 09:15:36 +08:00
lb	3e7914ac91	update ui	2023-10-17 17:02:33 +08:00
g7hoo	9c19a6197a	Merge pull request 'update dashboard' (#48 ) from projects/line-lb into projects/line-test Reviewed-on: #48	2023-10-17 09:44:37 +08:00
lb	074b35b6a6	update dashboard	2023-10-17 09:43:44 +08:00
高天泽	9be57ad750	Merge pull request 'test' (#47 ) from test into master Reviewed-on: #47	2023-10-17 08:53:53 +08:00
g7hoo	f7313c5911	Merge pull request 'lb' (#46 ) from lb into test Reviewed-on: #46	2023-10-17 08:38:26 +08:00
lb	a7e81ad8fb	Merge branch 'test' into lb	2023-10-16 17:04:34 +08:00
lb	32cbf9076f	update 更新设备类型上传	2023-10-16 17:03:29 +08:00
hellody	9a411cc663	Merge pull request 'dy' (#45 ) from dy into test Reviewed-on: #45	2023-10-16 15:50:05 +08:00
helloDy	445a88e540	Merge branch 'test' into dy	2023-10-16 15:47:50 +08:00
helloDy	2b355aaf8f	ui	2023-10-16 15:47:31 +08:00
lb	f60a46ed1d	update 设备信息上传	2023-10-16 15:36:26 +08:00
hellody	2688896660	Merge pull request 'dy' (#44 ) from dy into test Reviewed-on: #44	2023-10-13 17:12:02 +08:00
helloDy	4a67e226e1	merge	2023-10-13 17:09:07 +08:00
helloDy	11ee0d6541	Merge branch 'test' into dy	2023-10-13 17:06:35 +08:00
g7hoo	98b3237c9a	Merge pull request 'lb' (#43 ) from lb into test Reviewed-on: #43	2023-10-13 17:06:02 +08:00
helloDy	46aaa47e07	bug	2023-10-13 17:05:01 +08:00
lb	ca0f62b2eb	Merge branch 'test' into lb	2023-10-13 17:04:18 +08:00
lb	5534104e87	update equipment edit	2023-10-13 17:01:49 +08:00
lb	b72fe1bfed	update equipment edit	2023-10-13 16:08:31 +08:00
hellody	f4493bde1c	Merge pull request 'dy' (#42 ) from dy into test Reviewed-on: #42	2023-10-12 17:06:04 +08:00
helloDy	d682ecc91c	Merge branch 'test' into dy	2023-10-12 17:05:03 +08:00
helloDy	2b76ef7d23	bug	2023-10-12 17:04:03 +08:00
lb	9ec13b35b8	update equipment	2023-10-12 17:03:07 +08:00
lb	7acccd3de0	bugfix zentao	2023-10-12 15:40:05 +08:00
juzi	e40f45a79a	Merge pull request 'zjl' (#41 ) from zjl into test Reviewed-on: #41	2023-10-12 14:43:24 +08:00
juzi	77083a84a1	merge test	2023-10-12 14:41:59 +08:00
juzi	9f53ea6981	10.12	2023-10-12 14:39:59 +08:00
lb	8f634d012c	bugfix zentao	2023-10-12 11:08:51 +08:00
juzi	03c573d5b2	Merge pull request 'zjl' (#40 ) from zjl into test Reviewed-on: #40	2023-10-11 14:34:26 +08:00
juzi	348714edaf	merge test	2023-10-11 14:33:37 +08:00
juzi	814fe4605a	UI样式修改能源&班组	2023-10-11 14:30:18 +08:00
g7hoo	bb6bfc5ab6	Merge pull request 'lb' (#39 ) from lb into test Reviewed-on: #39	2023-10-11 10:33:08 +08:00
lb	0162f338ba	Merge branch 'test' into lb	2023-10-11 10:30:25 +08:00
lb	8f99915720	add 设备看板	2023-10-11 10:29:26 +08:00
hellody	744e5d80be	Merge pull request 'dy' (#38 ) from dy into test Reviewed-on: #38	2023-10-10 17:08:40 +08:00
helloDy	d3b119ad9b	Merge branch 'test' into dy	2023-10-10 17:07:02 +08:00
helloDy	69bdab75d4	bug	2023-10-10 17:06:39 +08:00
lb	af5e0333ed	update ui	2023-10-10 17:01:57 +08:00
lb	b2ee61b8cb	update 改为抽屉展示	2023-10-10 14:22:00 +08:00
lb	723d83cc02	update 设备分组	2023-10-10 10:04:23 +08:00
lb	769830c448	update 设备分组	2023-10-09 17:01:19 +08:00
lb	907db90e93	update 设备分组的抽屉	2023-10-09 16:27:44 +08:00
lb	6e390bf12a	update	2023-10-09 13:32:33 +08:00
lb	b39f0625a1	update	2023-10-09 11:37:19 +08:00
lb	e985c73e00	update gantt	2023-10-08 17:14:18 +08:00
hellody	180fcf5ad8	Merge pull request 'dy' (#37 ) from dy into test Reviewed-on: #37	2023-10-08 17:03:04 +08:00
helloDy	b1c0d21888	Merge branch 'test' into dy	2023-10-08 16:59:31 +08:00
helloDy	96d52fafee	pdf	2023-10-08 16:59:09 +08:00
lb	4f7889ff60	done time sequence demo	2023-10-08 15:53:38 +08:00
lb	bc2c5a4787	update time sequence status	2023-10-08 15:00:38 +08:00
lb	ab8e9cb2a5	update	2023-10-08 14:30:50 +08:00
lb	57960ff8bf	update print page	2023-10-08 10:18:08 +08:00
lb	b9e39dacf1	bugfix zentao	2023-10-08 09:31:02 +08:00
lb	80ad95be6e	add print module	2023-10-07 14:29:43 +08:00
g7hoo	7dfaae02a8	Merge pull request 'lb' (#36 ) from lb into test Reviewed-on: #36	2023-09-27 17:00:53 +08:00
lb	cf2d7af94b	delete echarts	2023-09-27 17:00:33 +08:00
lb	a48b31dcbe	Merge branch 'test' into lb	2023-09-27 16:58:28 +08:00
lb	96b0a9e503	update 产品质量分析	2023-09-27 16:57:57 +08:00
lb	9c257aa24a	update demo	2023-09-27 16:19:55 +08:00
lb	7ab5f1b812	update demo	2023-09-27 14:42:38 +08:00
lb	5c796cd44f	add custom echarts demo	2023-09-27 14:01:57 +08:00
lb	fe0b5538a8	update 设备产量时序图	2023-09-27 13:22:09 +08:00
lb	90695acefd	update 检测信息记录	2023-09-27 10:14:24 +08:00
juzi	a90c5cca0c	Merge pull request 'zjl' (#35 ) from zjl into test Reviewed-on: #35	2023-09-27 09:38:02 +08:00
juzi	4d7e3c0e04	merge test	2023-09-27 09:36:20 +08:00
juzi	ee40707d2c	修改bug及能源分析样式	2023-09-27 09:33:28 +08:00
lb	20808c0975	update 产量时序图	2023-09-26 17:00:46 +08:00
lb	87f56dd9ac	update responsejson	2023-09-26 15:12:41 +08:00
lb	24ffea330d	update 设备产量分析	2023-09-26 14:56:00 +08:00
lb	a4594426c3	bugfix	2023-09-26 14:38:30 +08:00
lb	c899bb37e3	update quality inspection record	2023-09-26 11:03:34 +08:00
g7hoo	47e91d821b	Merge pull request 'lb' (#34 ) from lb into test Reviewed-on: #34	2023-09-25 17:14:23 +08:00
lb	d907d2f341	Merge branch 'test' into lb	2023-09-25 17:13:47 +08:00
lb	1116531aff	update	2023-09-25 16:58:35 +08:00
lb	8dc5bbb4d8	update	2023-09-25 16:53:31 +08:00
lb	c24d22aedd	update	2023-09-25 16:34:05 +08:00
lb	bbbfa9644d	bugfix	2023-09-25 15:47:39 +08:00
hellody	db4ecc91d6	Merge pull request 'dy' (#33 ) from dy into test Reviewed-on: #33	2023-09-22 16:59:55 +08:00
helloDy	699810f40a	Merge branch 'test' into dy	2023-09-22 16:54:40 +08:00
helloDy	d454f20bd6	bug	2023-09-22 16:54:16 +08:00
lb	56f209a27e	Merge branch 'test' into lb	2023-09-22 16:29:50 +08:00
lb	980f3468b7	update homepage	2023-09-22 16:29:31 +08:00
juzi	95da2191dd	Merge pull request 'zjl' (#32 ) from zjl into test Reviewed-on: #32	2023-09-22 11:09:34 +08:00
juzi	42550264c8	merge test	2023-09-22 11:08:58 +08:00
juzi	727f7d57c3	能源bug	2023-09-22 11:06:43 +08:00
g7hoo	aa32e4d3fb	Merge pull request 'lb' (#31 ) from lb into test Reviewed-on: #31	2023-09-22 10:54:56 +08:00
lb	dcda3a6294	bugfix	2023-09-22 10:54:21 +08:00
lb	f43b1c1eab	update 设备加工数量	2023-09-22 10:29:28 +08:00
g7hoo	ca3965e8cb	Merge pull request 'lb' (#30 ) from lb into test Reviewed-on: #30	2023-09-22 09:57:16 +08:00
lb	ee3d6f9dc6	merge	2023-09-22 09:28:41 +08:00
lb	e2a777069e	update 设备加工数量	2023-09-21 17:09:15 +08:00
lb	06fa7d40b3	update 设备加工数量	2023-09-21 17:03:07 +08:00
lb	f6f0480744	update 设备加工数量	2023-09-21 16:00:46 +08:00
lb	45e7f337bf	update 设备加工数量	2023-09-21 15:54:11 +08:00
lb	8e0d63839a	update 设备加工数量	2023-09-21 15:35:16 +08:00
lb	6c21f01fd7	update 设备加工数量	2023-09-21 15:14:38 +08:00
lb	52bc38499c	update 设备效率分析	2023-09-21 14:54:16 +08:00
lb	c600d14f8f	update 设备产量时序图	2023-09-20 17:03:39 +08:00
juzi	2265c549e6	Merge pull request 'zjl' (#29 ) from zjl into test Reviewed-on: #29	2023-09-20 16:59:53 +08:00
juzi	a74242f3b3	mrege test	2023-09-20 16:59:13 +08:00
juzi	ebcf3d4d78	修改bug	2023-09-20 16:57:20 +08:00
lb	8ad84a4d61	update 设备产量时序图	2023-09-20 14:44:39 +08:00
高天泽	ff9e93d264	Merge pull request 'dy' (#28 ) from dy into test Reviewed-on: #28	2023-09-20 14:28:21 +08:00
lb	928258e509	update 设备状态时序图	2023-09-20 14:11:36 +08:00
helloDy	ee0affc78f	Merge branch 'test' into dy	2023-09-20 13:58:36 +08:00
helloDy	dfec94be17	表格	2023-09-20 13:58:14 +08:00
lb	a12530b835	update 质量检测统计数据	2023-09-20 11:17:34 +08:00
lb	b3db8dcae8	update 检测统计数据chart	2023-09-20 10:49:17 +08:00
lb	24a0857808	update 质量检测统计数据	2023-09-20 09:50:38 +08:00
lb	e0cc022e34	update 产品质量分析样式	2023-09-20 09:11:31 +08:00
lb	71bcd14c72	update 产品质量分析chart	2023-09-19 17:06:19 +08:00
juzi	646859aeef	Merge pull request '修bug' (#27 ) from zjl into test Reviewed-on: #27	2023-09-19 15:47:12 +08:00
juzi	5a31498224	修bug	2023-09-19 15:45:16 +08:00
lb	c965dfbc5a	bugfix	2023-09-18 17:01:44 +08:00
lb	c364162a2a	update no-data-background	2023-09-18 15:14:18 +08:00
juzi	282ef45114	Merge pull request 'zjl' (#26 ) from zjl into test Reviewed-on: #26	2023-09-18 14:49:52 +08:00
juzi	0371859d14	排班及bug	2023-09-18 14:49:03 +08:00
lb	7407b97f5a	bugfix zentao	2023-09-18 13:52:36 +08:00
juzi	eff5e0d1e1	merge test	2023-09-18 08:50:53 +08:00
juzi	60dc449a27	排班	2023-09-18 08:41:14 +08:00
高天泽	159d626b30	Merge pull request 'dy' (#25 ) from dy into test Reviewed-on: #25	2023-09-16 18:00:34 +08:00
helloDy	bc5d3d44d5	页面	2023-09-16 17:51:09 +08:00
lb	a6d8a7a9da	update	2023-09-15 15:45:37 +08:00
lb	7d2bfaea18	bugfix zentao 2	2023-09-15 14:49:31 +08:00
helloDy	e9538744c3	冲突	2023-09-15 14:38:43 +08:00
helloDy	8cf2f9f7e9	生产监控	2023-09-15 14:37:30 +08:00
lb	772a4b0633	bugfix zentao 1	2023-09-15 14:30:19 +08:00
lb	27ebe39a96	update image	2023-09-13 17:06:02 +08:00
zhp	97f9b52e87	Merge pull request 'zhp' (#24 ) from zhp into test Reviewed-on: #24	2023-09-13 16:02:02 +08:00
‘937886381’	f85cb9c50f	Merge branch 'test' into zhp	2023-09-13 16:01:18 +08:00
‘937886381’	e8cc1fc50b	生产分析	2023-09-13 16:00:43 +08:00
g7hoo	f08c79fc23	Merge pull request 'update router mode' (#23 ) from lb into test Reviewed-on: #23	2023-09-13 12:28:57 +08:00
lb	f341ec7b30	update router mode	2023-09-13 12:24:52 +08:00
g7hoo	2c6a6b001c	Merge pull request 'lb' (#22 ) from lb into test Reviewed-on: #22	2023-09-12 11:13:59 +08:00
lb	b17bc0e162	update build:prod PUBLIC_PATH	2023-09-12 11:12:05 +08:00
lb	d595bf2660	Merge branch 'test' into lb	2023-09-12 11:10:45 +08:00
lb	529889fd07	update 工段设备绑定 dialogForm	2023-09-12 11:09:51 +08:00
lb	2f18299b0b	add dialogForm of equipmentbind	2023-09-11 16:47:12 +08:00
高天泽	d1c93cbf46	Merge pull request 'zhp' (#21 ) from zhp into test Reviewed-on: #21	2023-09-11 16:11:04 +08:00
‘937886381’	7d959e8ad3	Merge branch 'test' into zhp	2023-09-11 16:09:42 +08:00
‘937886381’	6f0040a0ae	生产监控更新	2023-09-11 16:09:07 +08:00
高天泽	347265853e	Merge pull request 'dy' (#20 ) from dy into test Reviewed-on: #20	2023-09-11 15:59:26 +08:00
helloDy	f1bbdf82e5	冲突	2023-09-11 15:55:58 +08:00
helloDy	645ba2843f	生产监控	2023-09-11 15:53:43 +08:00
lb	f2f3a9e850	update 设备全参数查询	2023-09-11 15:24:11 +08:00
g7hoo	14e06d9456	Merge pull request 'lb' (#19 ) from lb into test Reviewed-on: #19	2023-09-11 15:05:16 +08:00
lb	4e05b3e3d6	merge from test	2023-09-11 15:04:16 +08:00
lb	6e678f7c68	Merge branch 'equipment-module-dev' into lb	2023-09-11 15:00:49 +08:00
lb	b91b8c3d3c	update 设备加工数量	2023-09-11 14:57:55 +08:00
juzi	a445c8a61d	Merge pull request 'zjl' (#17 ) from zjl into test Reviewed-on: #17	2023-09-08 16:02:54 +08:00
juzi	df0dc6bfa0	能源分析	2023-09-08 16:01:54 +08:00
lb	c44ec6f49c	update 基本完成设备全参数查询	2023-09-08 15:57:46 +08:00
lb	6197b606f1	update 设备全参数	2023-09-08 08:42:16 +08:00
lb	c7b32ab34e	add 设备全参数测试数据	2023-09-07 11:24:07 +08:00
lb	e2527f2e30	remove 设备效率分析的查看趋势功能	2023-09-06 16:38:46 +08:00
lb	76100ad07d	update 设备全参数	2023-09-06 16:37:22 +08:00
lb	fa02c3933d	remove 产品质量监控可视化	2023-09-06 16:18:59 +08:00
lb	d63d49ccc9	add pie chart	2023-09-06 15:18:02 +08:00
lb	cd437ed7d3	update 效率分析	2023-09-06 15:02:16 +08:00
lb	052f54833c	update 更新效率分析	2023-09-06 11:28:10 +08:00
lb	e42b7035fe	update 完成时序图模块	2023-09-06 10:39:32 +08:00
lb	a505f34abc	update 设备产量时序图	2023-09-06 09:56:05 +08:00
lb	edc5d64acc	update 更新设备效率分析	2023-09-05 17:01:53 +08:00
lb	e5fed36234	update 设备产量时序图	2023-09-05 16:35:31 +08:00
lb	2dd40261a4	update 设备状态时序图	2023-09-05 16:26:52 +08:00
lb	e16b6f8ec4	update 设备状态时序图	2023-09-05 16:07:50 +08:00
juzi	9c59a7e715	能源分析	2023-09-05 15:45:59 +08:00
lb	55e8de1136	update 完成设备异常分析	2023-09-04 15:24:22 +08:00
lb	ffedc7c256	add 设备异常分析	2023-09-04 14:50:52 +08:00
lb	fbd78c6aa5	update 产品质量分析	2023-09-04 14:35:13 +08:00
lb	6f71b6a7c0	add 产品质量分析-图形弹窗	2023-09-04 13:54:37 +08:00
lb	55f90a7102	add 设备模块剩余部分页面	2023-09-04 09:41:31 +08:00
lb	b6df60a315	Merge branch 'equipment-module-dev' into lb	2023-09-01 17:05:27 +08:00
lb	31dbc025c8	done 设备数采相关	2023-09-01 17:05:05 +08:00
lb	63206d4769	add mockdata & update设备采集配置**	2023-09-01 15:08:36 +08:00
lb	b23b5256f9	update 设备数据采集	2023-09-01 10:39:54 +08:00
lb	21fbd88a32	Merge branch 'equipment-module-dev' into lb	2023-08-31 16:58:49 +08:00
lb	0158a11644	update 设备分析-状态时序图	2023-08-31 16:58:17 +08:00
lb	62256b57a5	update 设备全参数查询	2023-08-31 16:11:41 +08:00
lb	0e6c01e578	update 设备状态和参数	2023-08-31 15:12:34 +08:00
lb	0ec4238042	add 设备加工数量-图表，设备状态和参数，设备全参数查询	2023-08-31 14:26:18 +08:00
lb	fd0c14ff1c	update 设备加工数量	2023-08-30 17:02:11 +08:00
lb	72393caee1	update 设备加工数量	2023-08-30 15:36:16 +08:00
lb	14eb83932e	done 设备24小时生产记录	2023-08-30 14:32:37 +08:00
lb	0f6418fcf9	update 基本完成设备近24小时数据	2023-08-30 14:30:08 +08:00
lb	100d28fd68	add 设备加工数量	2023-08-30 14:11:24 +08:00
lb	bf52db3b6a	update more 设备24小时记录	2023-08-30 11:37:11 +08:00
lb	0f5e4b8368	update 设备24小时记录	2023-08-30 10:27:49 +08:00
lb	e37bb3f2ce	add 设备状态时序图组件	2023-08-29 14:47:32 +08:00
lb	84ed13d58f	done equipmentAlarmLog	2023-08-29 10:17:27 +08:00
lb	383f98e1d9	add 设备监控	2023-08-29 09:56:27 +08:00
juzi	50318121dc	Merge pull request '能源监控' (#15 ) from zjl into test Reviewed-on: #15	2023-08-25 16:29:10 +08:00
juzi	01fe2da523	能源监控	2023-08-25 16:27:46 +08:00
juzi	d370948705	Merge pull request '能源配置&能源抄表' (#14 ) from zjl into test Reviewed-on: #14	2023-08-21 11:14:03 +08:00
juzi	6e39dd48ff	能源配置&能源抄表	2023-08-21 11:12:23 +08:00