From 08aa78fdb1b796c5c593d40d30bfeb1998cb4abf Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Wed, 7 Sep 2022 15:02:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0upload=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base-upload/index.vue          | 20 +++++++++++++++----
 src/views/modules/monitoring/equipment.vue    |  5 -----
 .../modules/monitoring/equipmentGroup.vue     |  4 ++++
 .../monitoring/equipmentGroupAlarm.vue        |  6 +++++-
 .../modules/monitoring/equipmentType.vue      |  4 ++++
 .../modules/monitoring/equipmentattr.vue      |  4 ++++
 src/views/modules/monitoring/factory.vue      |  4 ++++
 .../modules/monitoring/productionLine.vue     |  4 ++++
 .../monitoring/qualityInspectionDet.vue       |  6 +++++-
 .../monitoring/qualityInspectionRecord.vue    |  4 ++++
 .../monitoring/qualityInspectionType.vue      |  6 +++++-
 .../modules/monitoring/reportCategory.vue     |  6 +++++-
 .../modules/monitoring/workShopSection.vue    |  6 +++++-
 .../monitoring/workshopSectionDialog.vue      |  4 ++++
 14 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/src/components/base-upload/index.vue b/src/components/base-upload/index.vue
index 41df33a..f05663e 100644
--- a/src/components/base-upload/index.vue
+++ b/src/components/base-upload/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="base-upload" style="border-radius: 8px; margin-top: 38px; padding: 0; max-height: 500px;">
+	<div class="base-upload" style="border-radius: 8px; margin-top: 48px; padding: 0; max-height: 500px;">
 		<el-upload
 			class="yd-upload"
 			action="#"
@@ -181,12 +181,12 @@ export default {
 	margin-bottom: 20px;
 }
 
-.base-upload >>> .el-button {
+/* .base-upload >>> .el-button {
 	display: block;
 	width: 200px;
 	position: relative;
-	left: -100px;
-}
+	left: -50px;
+} */
 
 /* .base-upload >>> .el-upload--text {
 	width: 100px;
@@ -198,4 +198,16 @@ export default {
 	margin-top: 0;
 	margin-left: 5px;
 }
+
+.base-upload {
+	display: flex;
+}
+
+.yd-upload {
+	/* background-color: #efefef; */
+	flex-grow: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+}
 </style>
diff --git a/src/views/modules/monitoring/equipment.vue b/src/views/modules/monitoring/equipment.vue
index 3d1ff24..775299f 100644
--- a/src/views/modules/monitoring/equipment.vue
+++ b/src/views/modules/monitoring/equipment.vue
@@ -42,11 +42,6 @@ const tableConfigs = [
 	{
 		type: 'index',
 		name: i18n.t('index')
-		// more: {
-		// 	index: function(index) {
-		// 		return (index + 1) * 2
-		// 	}
-		// }
 	},
 	{
 		prop: 'createTime',
diff --git a/src/views/modules/monitoring/equipmentGroup.vue b/src/views/modules/monitoring/equipmentGroup.vue
index 8236fd3..8b4d61c 100644
--- a/src/views/modules/monitoring/equipmentGroup.vue
+++ b/src/views/modules/monitoring/equipmentGroup.vue
@@ -37,6 +37,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('eq.groupname') },
 	{ prop: 'code', name: i18n.t('eq.groupcode') },
diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue
index 844e509..4e4e102 100644
--- a/src/views/modules/monitoring/equipmentGroupAlarm.vue
+++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue
@@ -55,6 +55,10 @@ const dictEntries = {
 }
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'code', name: i18n.t('alarm.code') },
 	{ prop: 'typeDictValue', name: i18n.t('alarm.type') },
@@ -186,7 +190,7 @@ export default {
 				: this.dataListSelections.map(item => {
 						return item.id
 				  })
-			this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), {
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
 				confirmButtonText: i18n.t('confirm'),
 				cancelButtonText: i18n.t('cancel'),
 				type: 'warning'
diff --git a/src/views/modules/monitoring/equipmentType.vue b/src/views/modules/monitoring/equipmentType.vue
index 536fc72..fbff02a 100644
--- a/src/views/modules/monitoring/equipmentType.vue
+++ b/src/views/modules/monitoring/equipmentType.vue
@@ -37,6 +37,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('eq.type') },
 	{ prop: 'code', name: i18n.t('eq.typecode') },
diff --git a/src/views/modules/monitoring/equipmentattr.vue b/src/views/modules/monitoring/equipmentattr.vue
index 6885b95..ae9f989 100644
--- a/src/views/modules/monitoring/equipmentattr.vue
+++ b/src/views/modules/monitoring/equipmentattr.vue
@@ -36,6 +36,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'equipmentId', name: i18n.t('eq.id') },
 	{ prop: 'attrName', name: i18n.t('attrName') },
diff --git a/src/views/modules/monitoring/factory.vue b/src/views/modules/monitoring/factory.vue
index 9fb7cb4..56cecc4 100644
--- a/src/views/modules/monitoring/factory.vue
+++ b/src/views/modules/monitoring/factory.vue
@@ -37,6 +37,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('factory.name') },
 	{ prop: 'code', name: i18n.t('factory.code') },
diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue
index 902ba0e..c91a572 100644
--- a/src/views/modules/monitoring/productionLine.vue
+++ b/src/views/modules/monitoring/productionLine.vue
@@ -36,6 +36,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'factoryName', name: i18n.t('factory.title') },
 	{ prop: 'name', name: i18n.t('pl.name') },
diff --git a/src/views/modules/monitoring/qualityInspectionDet.vue b/src/views/modules/monitoring/qualityInspectionDet.vue
index 99b3f47..4de83dc 100644
--- a/src/views/modules/monitoring/qualityInspectionDet.vue
+++ b/src/views/modules/monitoring/qualityInspectionDet.vue
@@ -37,6 +37,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'typeName', name: i18n.t('inspect.type') },
 	{ prop: 'content', name: i18n.t('inspect.det') },
@@ -169,7 +173,7 @@ export default {
 				: this.dataListSelections.map(item => {
 						return item.id
 				  })
-			this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), {
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
 				confirmButtonText: i18n.t('confirm'),
 				cancelButtonText: i18n.t('cancel'),
 				type: 'warning'
diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue
index 2e85ef5..32400f8 100644
--- a/src/views/modules/monitoring/qualityInspectionRecord.vue
+++ b/src/views/modules/monitoring/qualityInspectionRecord.vue
@@ -46,6 +46,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{
 		prop: 'inspectionDetContent',
diff --git a/src/views/modules/monitoring/qualityInspectionType.vue b/src/views/modules/monitoring/qualityInspectionType.vue
index 51378b5..b45b817 100644
--- a/src/views/modules/monitoring/qualityInspectionType.vue
+++ b/src/views/modules/monitoring/qualityInspectionType.vue
@@ -36,6 +36,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('inspect.typename') },
 	{ prop: 'code', name: i18n.t('inspect.typename') },
@@ -140,7 +144,7 @@ export default {
 				: this.dataListSelections.map(item => {
 						return item.id
 				  })
-			this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), {
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
 				confirmButtonText: i18n.t('confirm'),
 				cancelButtonText: i18n.t('cancel'),
 				type: 'warning'
diff --git a/src/views/modules/monitoring/reportCategory.vue b/src/views/modules/monitoring/reportCategory.vue
index 77dc86a..88055da 100644
--- a/src/views/modules/monitoring/reportCategory.vue
+++ b/src/views/modules/monitoring/reportCategory.vue
@@ -37,6 +37,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import { calcMaxHeight } from '@/utils'
 import { timeFilter } from '@/utils/filters'
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('categoryName') },
 	{ prop: 'operations', name: i18n.t('handle'), width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
@@ -138,7 +142,7 @@ export default {
 				: this.dataListSelections.map(item => {
 						return item.id
 				  })
-			this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), {
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
 				confirmButtonText: i18n.t('confirm'),
 				cancelButtonText: i18n.t('cancel'),
 				type: 'warning'
diff --git a/src/views/modules/monitoring/workShopSection.vue b/src/views/modules/monitoring/workShopSection.vue
index 9c92302..a76dc8f 100644
--- a/src/views/modules/monitoring/workShopSection.vue
+++ b/src/views/modules/monitoring/workShopSection.vue
@@ -37,6 +37,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
 	{ prop: 'name', name: i18n.t('ws.name') },
 	{ prop: 'code', name: i18n.t('ws.code') },
@@ -166,7 +170,7 @@ export default {
 				: this.dataListSelections.map(item => {
 						return item.id
 				  })
-			this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), {
+			this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
 				confirmButtonText: i18n.t('confirm'),
 				cancelButtonText: i18n.t('cancel'),
 				type: 'warning'
diff --git a/src/views/modules/monitoring/workshopSectionDialog.vue b/src/views/modules/monitoring/workshopSectionDialog.vue
index 401b297..4494099 100644
--- a/src/views/modules/monitoring/workshopSectionDialog.vue
+++ b/src/views/modules/monitoring/workshopSectionDialog.vue
@@ -67,6 +67,10 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import AttrForm from './workshopSectionDialogAttrForm.vue'
 import { calcMaxHeight } from '@/utils'
 const tableProps = [
+	{
+		type: 'index',
+		name: i18n.t('index')
+	},
 	{ name: i18n.t('eq.name'), prop: 'equipmentName' },
 	{ name: i18n.t('dept.sort'), prop: 'sort' },
 	{