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>

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',

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') },

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'

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') },

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') },

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') },

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') },

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'

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',

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'

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'

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'

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' },
 	{