首页+侧边栏

src/views/abnormalWarning/components/TopNav.vue

@@ -141,7 +141,7 @@ export default {
 			const width = window.innerWidth - 700;
 			console.log(width);
 			console.log('window.innerWidth:', window.innerWidth);
-			this.visibleNumber = parseInt(width / 120);
+			this.visibleNumber = parseInt(width / 110);
 			console.log('this.visibleNumber:', this.visibleNumber);
 		},
 		// 菜单选择事件

src/views/home/components/TopNav.vue

@@ -141,7 +141,7 @@ export default {
 			const width = window.innerWidth - 700;
 			console.log(width);
 			console.log('window.innerWidth:', window.innerWidth);
-			this.visibleNumber = parseInt(width / 120);
+			this.visibleNumber = parseInt(width / 110);
 			console.log('this.visibleNumber:', this.visibleNumber);
 		},
 		// 菜单选择事件
@@ -207,6 +207,9 @@ export default {
 .homemenu-container.el-menu.el-menu--horizontal > .el-submenu.is-active {
 	--theme: none !important;
 }
+.homemenu-container.el-menu.el-menu--horizontal > .el-menu-item.is-active {
+	border-bottom: none !important;
+}
 .homemenu-container.el-menu--horizontal > .el-menu-item {
 	float: left;
 	height: 84px !important;

src/views/home/index.vue

@@ -434,3 +434,11 @@ export default {
 	}
 }
 </style>
+<style lang="scss">
+.home-page {
+	.el-progress-bar__inner {
+		background-image: url('~@/assets/img/home-progress-bg.png');
+		background-size: cover;
+	}
+}
+</style>

src/views/quality/currentData/currentTest.vue

@@ -70,7 +70,7 @@ export default {
 		};
 	},
 	mounted() {
-		this.getList();
+		// this.getList();
 	},
 	methods: {
 		/** 查询列表 */

src/views/quality/currentData/hourData.vue

@@ -24,7 +24,7 @@ export default {
 	},
 	data() {
 		return {
-			heightNum: 200,
+			heightNum: 236,
 			nameData: [],
 			list: [],
 		};

src/views/quality/currentData/index.vue

@@ -45,7 +45,7 @@ export default {
 <style scoped lang="scss">
 .currentDataContainer {
 	width: 100%;
-	min-height: calc(100vh - 120px - 8px);
+	min-height: calc(100vh - 164px);
 	background: rgba(242, 244, 249, 1);
 	.topBox {
 		.el-menu {
@@ -79,10 +79,11 @@ export default {
 		}
 	}
 	.bottomBox {
-		min-height: calc(100vh - 184px);
+		height: calc(100vh - 220px);
 		background: #fff;
 		padding: 16px;
 		border-radius: 8px;
+		overflow-y: auto;
 	}
 }
 </style>

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

@@ -48,7 +48,7 @@
 				</div>
 			</div>
 			<!-- side bar  -->
-			<div class="side-bar__left" style="width: 240px; height: 100%">
+			<div class="side-bar__left">
 				<el-tree
 					class="custom-tree-class"
 					:data="currentFactory?.children"
@@ -87,6 +87,7 @@
 									:table-props="table.tableProps"
 									:table-data="table.dataManager?.dataList ?? []"
 									:span-method="spanMethod"
+									:max-height="tableH"
 									@emitFun="(val) => handleEmitFun(table, val)"></base-table>
 								<pagination
 									:key="table.key + '__pagination'"
@@ -115,9 +116,11 @@
 <script>
 // import Graph from './graph.vue';
 import { getWorkOrderList, getTreeData } from '@/api/quality/deviceParameters';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 export default {
 	name: 'EquipmentProcessAmount',
 	// components: { Graph },
+	mixins: [tableHeightMixin],
 	props: {},
 	data() {
 		const now = new Date();
@@ -578,6 +581,10 @@ export default {
 </script>
 
 <style scoped>
+.side-bar__left {
+	width: 240px;
+	height: calc(100% - 70px);
+}
 .side-bar__left >>> .is-current {
 	padding: 0;
 	color: #111;

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

@@ -81,7 +81,7 @@ export default {
 	mixins: [tableHeightMixin],
 	data() {
 		return {
-			heightNum: 220,
+			heightNum: 256,
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi(`base:packaging-print-log:update`)