productDev/dmMes.git

			@@ -54,7 +54,7 @@
			<div class="scroll_item_row">{{ item.materialName }}</div>
			<div class="scroll_item_row">{{ item.materialCode }}</div>
			<div class="scroll_item_row">{{ item.num }}</div>
			<div class="scroll_item_row">
			<div class="scroll_item_row" style="text-align: left;">
			<el-tooltip v-for="(child, i) in item.procedureList" :key="i" effect="dark"
			:content="'已报工良品数' + child.doneNum + '；工序计划数' + child.planNum" placement="top">
			<div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
			@@ -137,8 +137,8 @@
			<div v-for="(item, index) in data.log" :key="index"
			:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
			<div class="scroll_item_row">{{ item.userName }}</div>
			<div class="scroll_item_row">{{ item.materialName }}</div>
			<div class="scroll_item_row">{{ item.procedureName }}</div>
			<div class="scroll_item_row">{{ item.materialCode }}</div>
			<div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
			<div class="scroll_item_row">{{ item.qualifiedNum \|\| 0 }}</div>
			<div class="scroll_item_row">{{ item.unqualifiedNum \|\| 0 }}</div>
			@@ -157,7 +157,7 @@
			<span>近7天不良品分布</span>
			</div>
			<div class="content_right_top_nr">


			<div class="content_right_top_nr_top" id="lineChrat"></div>
			<div class="content_right_top_nr_bottom">
			<div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
			@@ -166,7 +166,7 @@
			</div>
			<div id="pieChart"></div>
			</div>


			</div>
			</div>
			<!-- 设备巡检记录 -->
			@@ -187,7 +187,10 @@
			:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
			<div class="scroll_item_row">{{ dateToSub(item.checkdate) }}</div>
			<div class="scroll_item_row">{{ item.deviceName }}</div>
			<div class="scroll_item_row">{{ item.status == 0 ? '合格' : '不合格' }}</div>
			<div class="scroll_item_row">
			<span v-if="item.status == 0">正常</span>
			<span v-else style="color: #F84F26">异常</span>
			</div>
			<div class="scroll_item_row">{{ item.userName }}</div>
			</div>
			</div>
			@@ -218,10 +221,11 @@
			dayDistribution: [],
			typeDistribution: [],
			num: 0,
			baseNum: 0
			baseNum: 0,
			bottomAuthHeight: 284
			})

			let { baseNum } = toRefs(data)
			let { baseNum, bottomAuthHeight } = toRefs(data)

			let timer = ref(null)
			let timer1 = ref(null)
			@@ -229,7 +233,6 @@
			let timer3 = ref(null)
			let timer4 = ref(null)
			let timer5 = ref(null)
			let bottomAuthHeight = 284;
			let scrollContainer = ref(null)
			let scrollContainer1 = ref(null)
			let scrollContainer2 = ref(null)
			@@ -316,8 +319,8 @@
			}
			}
			})




			// 报工日志
			getRecordLogPage(companyId.value, departId.value, {
			capacity: 20,
			@@ -376,8 +379,7 @@
			}
			function setBottomHeight(){
			const pageHeight = window.innerHeight;
			bottomAuthHeight = pageHeight -700;
			// bottom1.style.height=bottomAuthHeight;
			bottomAuthHeight = pageHeight - 700;
			}

			/**
			@@ -550,14 +552,6 @@
			}
			option && myChart.setOption(option);
			}

			// onBeforeUnmount(()=>{
			// clearTimeout(timer.value)
			// clearTimeout(timer1.value)
			// clearTimeout(timer2.value)
			// clearTimeout(timer3.value)
			// clearTimeout(timer4.value)
			// })
			onUnmounted(() => {
			clearTimeout(timer.value)
			clearTimeout(timer1.value)
			@@ -667,15 +661,16 @@
			if (scrollDom.offsetHeight == 0) {
			scrollDom = scrollContainer.value
			} else {
			let maxLength = scrollDom.clientHeight/34
			// 如果列表数量过少不进行滚动
			if (scrollDom.children.length < 6) {
			if (scrollDom.children.length <= maxLength) {
			clearTimeout(timer.value)
			return
			}
			// 组件进行滚动
			scrollDom.scrollTop += 1
			scrollDom.scrollTop += 2
			// 判断是否滚动到底部
			if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
			if (Math.floor(scrollDom.scrollTop) >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
			// 获取组件第一个节点
			let first = scrollDom.children[0]
			// 删除节点
			@@ -693,14 +688,14 @@
			scrollDom = scrollContainer1.value
			} else {
			// 如果列表数量过少不进行滚动
			if (scrollDom.children.length < 7) {
			if (scrollDom.children.length < 6) {
			clearTimeout(timer1.value)
			return
			}
			// 组件进行滚动
			scrollDom.scrollTop += 1
			scrollDom.scrollTop += 2
			// 判断是否滚动到底部
			if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
			if (scrollDom.scrollTop+2 >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
			// 获取组件第一个节点
			let first = scrollDom.children[0]
			// 删除节点
			@@ -783,7 +778,7 @@
			// 组件进行滚动
			scrollDom.scrollTop += 2
			// 判断是否滚动到底部
			if (scrollDom.scrollTop <(scrollDom.scrollHeight - scrollDom.clientHeight)) {
			if (scrollDom.scrollTop+1 >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
			// 获取组件第一个节点
			let first = scrollDom.children[0]
			// 删除节点
			@@ -805,6 +800,8 @@
			</script>

			<style lang="scss" scoped>

			$fixed-height: 690px;
			.content1 {
			flex: 1;
			width: 100%;
			@@ -843,7 +840,7 @@

			.content_left_item1_content {
			width: 100%;
			height: calc(100% - 38px);
			height: calc(100% - 36px);
			padding: 20px;
			overflow: hidden;
			box-sizing: border-box;
			@@ -854,7 +851,8 @@
			display: flex;
			align-items: center;
			justify-content: space-between;
			margin-bottom: 13px;
			// margin-bottom: 13px;
			padding: 7px 0;

			&:last-child {
			margin: 0;
			@@ -1094,8 +1092,8 @@
			color: #01D9FE;

			&:nth-child(5) {
			flex: 2.7;

			flex: 3;

			}
			}
			}
			@@ -1135,7 +1133,7 @@

			&:nth-child(5) {
			flex: 3;

			justify-content: start;
			}
			.scroll_item_row_item {
			margin-top: -11px;
			@@ -1433,8 +1431,8 @@
			left: 50%;
			transform: translate(-50%, -50%);
			z-index: 999;
			width: 114px;
			height: 114px;
			width: 100px;
			height: 100px;
			border-radius: 50%;
			border: 2px dashed #01D9FE;
			display: flex;