bugfix zentao 1

2023-09-15 14:30:19 +08:00
parent 27ebe39a96
commit 772a4b0633
29 changed files with 594 additions and 385 deletions
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -86,84 +86,72 @@ export default {
 			// 		: undefined,
 			// ].filter((v) => v),
 			tableProps: [
-				{ prop: 'factoryName', label: '工厂', align: 'center' },
-				{ prop: 'lineName', label: '产线', align: 'center' },
-				{ prop: 'sectionName', label: '工段', align: 'center' },
-				{ prop: 'equipmentName', label: '设备', align: 'center' },
+				{ prop: 'factoryName', label: '工厂' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备' },
 				{
 					label: '有效时间',
-					align: 'center',
 					children: [
 						{
 							width: 128,
 							prop: 'workTime',
 							label: '工作时长',
-							align: 'center',
 						},
 						{
 							width: 128,
 							prop: 'workRate',
 							label: '百分比',
-							align: 'center',
 							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
 				{
 					label: '关机时间',
-					align: 'center',
 					children: [
 						{
 							width: 128,
 							prop: 'stopTime',
 							label: '停机时长',
-							align: 'center',
 						},
-						{ width: 128, prop: 'stopRate', label: '百分比', align: 'center' },
+						{ width: 128, prop: 'stopRate', label: '百分比' },
 					],
 				},
 				{
 					label: '中断损失',
-					align: 'center',
 					children: [
 						{
 							width: 128,
 							prop: 'downTime',
 							label: '故障时长',
-							align: 'center',
 							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
-						{ width: 128, prop: 'downRate', label: '百分比', align: 'center' },
+						{ width: 128, prop: 'downRate', label: '百分比' },
 						{
 							width: 128,
 							prop: 'timeEfficiency',
 							label: '时间开动率',
-							align: 'center',
 							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
 				{
 					label: '速度损失',
-					align: 'center',
 					children: [
 						{
 							width: 128,
 							prop: 'realProcSpeed',
 							label: '实际加工速度',
-							align: 'center',
 						},
 						{
 							width: 128,
 							prop: 'designProcSpeed',
 							label: '理论加工速度',
-							align: 'center',
 						},
 						{
 							width: 128,
 							prop: 'peEfficiency',
 							label: '速度开动率',
-							align: 'center',
 							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
@@ -171,19 +159,17 @@ export default {
 				{
 					prop: 'oee',
 					label: 'OEE',
-					align: 'center',
 					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 				},
 				{
 					prop: 'teep',
 					label: 'TEEP',
-					align: 'center',
 					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 				},
 				// {
 				// 	_action: 'view-trend',
 				// 	label: '趋势',
-				// 	align: 'center',
+				// 	,
 				// 	subcomponent: {
 				// 		props: ['injectData'],
 				// 		render: function (h) {
--- a/src/views/equipment/analysis/exception/index.vue
+++ b/src/views/equipment/analysis/exception/index.vue
@@ -65,24 +65,22 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'lineName', label: '产线', align: 'center' },
-				{ prop: 'sectionName', label: '工段', align: 'center' },
-				{ prop: 'equipmentName', label: '设备', align: 'center' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备' },
 				{
 					width: 188,
 					prop: 'mtbf',
 					label: '平均故障间隔时间[MTBF](h)',
-					align: 'center',
 				},
 				{
 					width: 180,
 					prop: 'mttr',
 					label: '平均维修时间[MTTR](h)',
-					align: 'center',
 				},
-				{ prop: 'workTime', label: '工作时长(h)', align: 'center' },
-				{ prop: 'downTime', label: '故障时长(h)', align: 'center' },
-				{ prop: 'downCount', label: '故障次数', align: 'center' },
+				{ prop: 'workTime', label: '工作时长(h)' },
+				{ prop: 'downTime', label: '故障时长(h)' },
+				{ prop: 'downCount', label: '故障次数' },
 			],
 			searchBarFormConfig: [
 				{
@@ -162,15 +160,13 @@ export default {
 						this.queryParams.recordTime = [
 							moment()
 								.month(btn.month - 1)
-								.format('YYYY-MM')+'-01 00:00:00',
-							moment()
-								.month(btn.month)
-								.format('YYYY-MM')+'-01 00:00:00',
+								.format('YYYY-MM') + '-01 00:00:00',
+							moment().month(btn.month).format('YYYY-MM') + '-01 00:00:00',
 						];
 					} else {
 						this.queryParams.recordTime = null;
 					}
-                    this.queryParams.lineId = btn.lineId || null;
+					this.queryParams.lineId = btn.lineId || null;
 					this.handleQuery();
 					break;
 			}
--- a/src/views/equipment/analysis/quality/index.vue
+++ b/src/views/equipment/analysis/quality/index.vue
@@ -35,6 +35,7 @@
 </template>

 <script>
+import moment from 'moment';
 import LineChart from './components/lineChart.vue';

 export default {
@@ -42,6 +43,8 @@ export default {
 	components: { LineChart },
 	props: {},
 	data() {
+		const now = new Date();
+		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
 		return {
 			dialogVisible: false,
 			urls: {
@@ -72,13 +75,30 @@ export default {
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					// valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'recordTime',
+					defaultSelect: [
+						new Date(y, m, d)
+							.toLocaleString()
+							.split('/')
+							.map((item, index) => {
+								if (index == 1 || index == 2) return item.padStart(2, '0');
+								return item;
+							})
+							.join('-'),
+						new Date(y, m, d, 23, 59, 59)
+							.toLocaleString()
+							.split('/')
+							.map((item, index) => {
+								if (index == 1 || index == 2) return item.padStart(2, '0');
+								return item;
+							})
+							.join('-'),
+					],
 				},
 				{
 					type: 'button',
@@ -86,9 +106,9 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
+				// {
+				// 	type: 'separate',
+				// },
 				// {
 				// 	type: 'button',
 				// 	btnName: '列表数据',
@@ -111,43 +131,36 @@ export default {
 					// width: 160,
 					prop: 'sectionName',
 					label: '工段',
-					align: 'center',
 				},
 				{
 					// width: 160,
 					prop: 'equipmentName',
 					label: '设备名称',
-					align: 'center',
 				},
 				{
 					// width: 160,
 					prop: 'products',
 					label: '产品名称',
-					align: 'center',
 				},
 				{
 					// width: 160,
 					prop: 'inQuantity',
 					label: '进片数量',
-					align: 'center',
 				},
 				{
 					// width: 160,
 					prop: 'outQuantity',
 					label: '出片数量',
-					align: 'center',
 				},
 				{
 					// width: 160,
 					prop: 'nokQuantity',
 					label: '破损/不合格数',
-					align: 'center',
 				},
 				{
 					// width: 160,
 					prop: 'passRate',
 					label: '合格率',
-					align: 'center',
 				},
 			],
 			lineChartConfig: {
@@ -161,14 +174,14 @@ export default {
 					top: 0,
 					left: 0,
 					padding: 5,
-                    icon: 'roundRect',
-                    itemWidth: 12,
-                    itemHeight: 12,
-                    itemGap: 20,
+					icon: 'roundRect',
+					itemWidth: 12,
+					itemHeight: 12,
+					itemGap: 20,
 					textStyle: {
-                        fontSize: 14,
-                        lineHeight: 14
-                    },
+						fontSize: 14,
+						lineHeight: 14,
+					},
 				},
 				xAxis: {
 					type: 'category',
@@ -176,13 +189,13 @@ export default {
 				},
 				yAxis: {
 					type: 'value',
-                    name: '合格率',
-                    nameLocation: 'end',
-                    nameTextStyle: {
-                        fontSize: 14,
-                        align: 'right'
-                    },
-                    nameGap: 26
+					name: '合格率',
+					nameLocation: 'end',
+					nameTextStyle: {
+						fontSize: 14,
+						align: 'right',
+					},
+					nameGap: 26,
 				},
 				series: [
 					{