From c15671c4965e862f459261a73351e597f048e9ed Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 8 Aug 2022 15:02:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=A7=E5=93=81=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E3=80=81=E6=8A=A5=E8=A1=A8=E5=92=8C=E8=B4=A8=E9=87=8F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentGroupAlarm.vue        |  6 +--
 src/views/modules/monitoring/productArrt.vue  | 43 ++++++++-------
 .../monitoring/qualityInspectionDet.vue       | 35 ++++++------
 .../monitoring/qualityInspectionRecord.vue    | 54 ++++++++++---------
 .../monitoring/qualityInspectionType.vue      | 33 ++++++------
 src/views/modules/monitoring/reportSheet.vue  | 41 ++++++++------
 .../monitoring/reportSheetCategory.vue        | 39 +++++++-------
 7 files changed, 138 insertions(+), 113 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue
index 1b87b67..a7d935b 100644
--- a/src/views/modules/monitoring/equipmentGroupAlarm.vue
+++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue
@@ -1,12 +1,10 @@
 <template>
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-			<el-form-item label="设备分组名称">
-				<el-label><strong>111</strong></el-label>
-			</el-form-item>
+			<el-form-item label="设备分组名称"> <strong>111</strong></el-form-item>
 
 			<el-form-item label="设备分组编码">
-				<el-label><strong>111</strong></el-label>
+				<strong>111</strong>
 			</el-form-item>
 			<!-- <el-form-item>
 				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
diff --git a/src/views/modules/monitoring/productArrt.vue b/src/views/modules/monitoring/productArrt.vue
index f038496..cb03238 100644
--- a/src/views/modules/monitoring/productArrt.vue
+++ b/src/views/modules/monitoring/productArrt.vue
@@ -36,7 +36,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -59,28 +59,30 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "code", "name": "编码" },
-  { "prop": "name", "name": "名称" },
-  { "prop": "productId", "name": "产品id,关联产品表" },
-  { "prop": "value", "name": "属性值" },
-  { "prop": "description", "name": "描述" },
-  { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
-  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '属性名称' },
+	{ prop: 'code', name: '属性编码' },
+	{ prop: 'productId', name: '产品id,关联产品表' },
+	{ prop: 'value', name: '属性值' },
+	{ prop: 'description', name: '描述' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'externalCode', name: '外部编码，用于对照外部系统的编码' },
+	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	// { prop: 'remark', name: '备注' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -94,7 +96,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/qualityInspectionDet.vue b/src/views/modules/monitoring/qualityInspectionDet.vue
index e6ea6fe..91b59b6 100644
--- a/src/views/modules/monitoring/qualityInspectionDet.vue
+++ b/src/views/modules/monitoring/qualityInspectionDet.vue
@@ -34,7 +34,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -57,24 +57,26 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "typeId", "name": "检测类型id" },
-  { "prop": "content", "name": "检测内容" },
-  { "prop": "code", "name": "检测编码" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'typeId', name: '检测类型id' },
+	{ prop: 'content', name: '检测内容' },
+	{ prop: 'code', name: '检测编码' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -88,7 +90,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue
index cf858f3..9d84a29 100644
--- a/src/views/modules/monitoring/qualityInspectionRecord.vue
+++ b/src/views/modules/monitoring/qualityInspectionRecord.vue
@@ -39,7 +39,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -62,32 +62,37 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "inspectionDetId", "name": "检测内容id" },
-  {
-    "prop": "inspectionDetContent",
-    "name": "检测内容（设备推送消息时，可能无对应id，只填这个字段）"
-  },
-  { "prop": "productionId", "name": "产线id" },
-  { "prop": "sectionId", "name": "工段id" },
-  { "prop": "checkPerson", "name": "检测人员，可以多个" },
-  { "prop": "checkTime", "name": "检测时间" },
-  { "prop": "source", "name": "来源 1，手动（默认） 2，自动" },
-  { "prop": "explainText", "name": "描述" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '添加时间' },
+	{
+		prop: 'inspectionDetContent',
+		name: '检测内容'
+		// "name": "检测内容（设备推送消息时，可能无对应id，只填这个字段）"
+	},
+	{ prop: 'checkTime', name: '检测时间' },
+	{ prop: 'productionId', name: '产线id' },
+	{ prop: 'sectionId', name: '工段id' },
+	{ prop: 'checkPerson', name: '检测人员' },
+	// { prop: 'checkPerson', name: '检测人员，可以多个' },
+	{ prop: 'source', name: '来源' },
+	// { prop: 'source', name: '来源 1，手动（默认） 2，自动' },
+	{ prop: 'explainText', name: '描述' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'inspectionDetId', name: '检测内容id' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -101,7 +106,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/qualityInspectionType.vue b/src/views/modules/monitoring/qualityInspectionType.vue
index 3a4bb09..7a3be21 100644
--- a/src/views/modules/monitoring/qualityInspectionType.vue
+++ b/src/views/modules/monitoring/qualityInspectionType.vue
@@ -33,7 +33,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -56,23 +56,25 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "name", "name": "检测类型名称" },
-  { "prop": "code", "name": "检测类型编码" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '检测类型名称' },
+	{ prop: 'code', name: '检测类型编码' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -86,7 +88,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/reportSheet.vue b/src/views/modules/monitoring/reportSheet.vue
index 2ebb856..570e8b3 100644
--- a/src/views/modules/monitoring/reportSheet.vue
+++ b/src/views/modules/monitoring/reportSheet.vue
@@ -37,7 +37,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -60,24 +60,32 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "name", "name": "检测类型名称" },
-  { "prop": "code", "name": "检测类型编码" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '创建时间' },
+	{ prop: 'name', name: '报表名称' },
+	{ prop: 'code', name: '报表编码' },
+	{ prop: 'category', name: '报表分类' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'category', name: '分类：关联report_sheet_category' },
+	{ prop: 'fileName', name: '文件名称' },
+	{ prop: 'url', name: '链接地址' },
+	{ prop: 'description', name: '描述' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'content', name: '报表内容' },
+	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -91,7 +99,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/reportSheetCategory.vue b/src/views/modules/monitoring/reportSheetCategory.vue
index 5bf7e61..003d21b 100644
--- a/src/views/modules/monitoring/reportSheetCategory.vue
+++ b/src/views/modules/monitoring/reportSheetCategory.vue
@@ -36,7 +36,7 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -59,26 +59,28 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "code", "name": "编码" },
-  { "prop": "name", "name": "名称" },
-  { "prop": "description", "name": "描述" },
-  { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
-  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '分类名称' },
+	{ prop: 'code', name: '分类编码' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "remark", "name": "备注" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -92,7 +94,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()