From 1e118a6d5da2c86991feb0a940a0e37532d3c96d Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 8 Aug 2022 14:05:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/operationComponent.js          |  2 +-
 .../modules/monitoring/equipmentFile.vue      | 43 +++++++------
 .../modules/monitoring/equipmentGroup.vue     | 39 ++++++------
 .../monitoring/equipmentGroupAlarm.vue        | 61 +++++++++++--------
 .../modules/monitoring/equipmentType.vue      | 44 ++++++-------
 .../modules/monitoring/equipmentattr.vue      | 35 ++++++-----
 .../monitoring/workShopSectionEquipment.vue   | 18 +++---
 7 files changed, 132 insertions(+), 110 deletions(-)

diff --git a/src/components/base-table/components/operationComponent.js b/src/components/base-table/components/operationComponent.js
index 094e350..409499f 100644
--- a/src/components/base-table/components/operationComponent.js
+++ b/src/components/base-table/components/operationComponent.js
@@ -43,7 +43,7 @@ export default {
     let btns = []
     for (const optionStr of this.injectData.head?.options) {
       // btns.push(h('el-button', { props: { type: this.btnTypes[optionStr] } }, optionStr))
-      btns.push(h('el-button', { props: { type: 'text' }, style: { color: this.colors[optionStr] || '#0b58ff' } }, this.text[optionStr]))
+      btns.push(h('el-button', { props: { type: 'text' }, style: { color: this.colors[optionStr] || '#409EFF' } }, this.text[optionStr]))
     }
     return h('span', null, btns)
   }
diff --git a/src/views/modules/monitoring/equipmentFile.vue b/src/views/modules/monitoring/equipmentFile.vue
index 573eeef..d4acd99 100644
--- a/src/views/modules/monitoring/equipmentFile.vue
+++ b/src/views/modules/monitoring/equipmentFile.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": "" },
-  { "prop": "equipmentId", "name": "设备ID" },
-  { "prop": "fileId", "name": "文件ID" },
-  { "prop": "description", "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": "typeCode", "name": "文件类型编号" },
-  { "prop": "fileName", "name": "文件名字" },
-  { "prop": "fileUrl", "name": "下载地址" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'id', name: '' },
+	{ prop: 'equipmentId', name: '设备ID' },
+	{ prop: 'fileId', name: '文件ID' },
+	{ prop: 'description', 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: 'typeCode', name: '文件类型编号' },
+	{ prop: 'fileName', name: '文件名字' },
+	{ prop: 'fileUrl', 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/equipmentGroup.vue b/src/views/modules/monitoring/equipmentGroup.vue
index 1eaec03..8f3b640 100644
--- a/src/views/modules/monitoring/equipmentGroup.vue
+++ b/src/views/modules/monitoring/equipmentGroup.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,26 +56,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": "typeId", "name": "设备类型id" },
-  { "prop": "description", "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: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent },
+	// { "prop": "typeId", "name": "设备类型id" },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "description", "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: ''
 			},
@@ -89,7 +91,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue
index 37d6b05..1b87b67 100644
--- a/src/views/modules/monitoring/equipmentGroupAlarm.vue
+++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue
@@ -1,7 +1,14 @@
 <template>
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-			<el-form-item>
+			<el-form-item label="设备分组名称">
+				<el-label><strong>111</strong></el-label>
+			</el-form-item>
+
+			<el-form-item label="设备分组编码">
+				<el-label><strong>111</strong></el-label>
+			</el-form-item>
+			<!-- <el-form-item>
 				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
@@ -10,7 +17,7 @@
 				<el-button v-if="$hasPermission('monitoring:equipmengroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
 					批量删除
 				</el-button>
-			</el-form-item>
+			</el-form-item> -->
 		</el-form>
 		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -40,7 +47,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"
@@ -63,31 +70,34 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "equipmentGroupId", "name": "设备分组ID，关联t_equipment_group" },
-  { "prop": "code", "name": "编码" },
-  { "prop": "typeDictValue", "name": "报警类型 字典表关联label_value" },
-  { "prop": "gradeDictValue", "name": "报警级别 字典表关联label_value" },
-  { "prop": "alarmContent", "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": "alarmNotify", "name": "推送方式 0邮箱 1微信" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'code', name: '报警编码' },
+	{ prop: 'typeDictValue', name: '报警类型' },
+	{ prop: 'gradeDictValue', name: '报警级别' },
+	{ prop: 'alarmContent', name: '报警内容' }
+	// { prop: 'typeDictValue', name: '报警类型 字典表关联label_value' },
+	// { prop: 'gradeDictValue', name: '报警级别 字典表关联label_value' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "equipmentGroupId", "name": "设备分组ID，关联t_equipment_group" },
+	// { "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: 'alarmNotify', name: '推送方式 0邮箱 1微信' },
+	// { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -101,7 +111,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/equipmentType.vue b/src/views/modules/monitoring/equipmentType.vue
index 10bb98c..893466d 100644
--- a/src/views/modules/monitoring/equipmentType.vue
+++ b/src/views/modules/monitoring/equipmentType.vue
@@ -35,7 +35,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,29 +57,30 @@ import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
-const tableConfigs =[
-  { "prop": "id", "name": "ID" },
-  { "prop": "code", "name": "编码" },
-  { "prop": "name", "name": "名称" },
-  { "prop": "parentId", "name": "父类ID" },
-  { "prop": "parentName", "name": "父类名称" },
-  { "prop": "description", "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'] }
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '类型名称' },
+	{ prop: 'code', name: '类型编码' },
+	{ prop: 'remark', name: '备注' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "parentId", "name": "父类ID" },
+	// { "prop": "parentName", "name": "父类名称" },
+	// { "prop": "description", "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: ''
 			},
@@ -93,7 +94,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/equipmentattr.vue b/src/views/modules/monitoring/equipmentattr.vue
index 5373da2..4ddb67e 100644
--- a/src/views/modules/monitoring/equipmentattr.vue
+++ b/src/views/modules/monitoring/equipmentattr.vue
@@ -32,7 +32,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"
@@ -55,24 +55,26 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "equipmentId", "name": "设备ID" },
-  { "prop": "attrName", "name": "属性名称" },
-  { "prop": "attrValue", "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: 'equipmentId', name: '设备ID' },
+	{ prop: 'attrName', name: '属性名' },
+	{ prop: 'attrValue', name: '属性值' },
+	// { "prop": "id", "name": "ID" },
+	// { "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: ''
 			},
@@ -86,7 +88,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
diff --git a/src/views/modules/monitoring/workShopSectionEquipment.vue b/src/views/modules/monitoring/workShopSectionEquipment.vue
index 9f22c85..9ba7a45 100644
--- a/src/views/modules/monitoring/workShopSectionEquipment.vue
+++ b/src/views/modules/monitoring/workShopSectionEquipment.vue
@@ -57,19 +57,19 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-	{ prop: 'id', name: 'ID' },
+	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'workshopSectionId', name: '工段ID' },
 	{ prop: 'equipmentId', name: '设备ID' },
 	{ prop: 'sort', 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: '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'] }
 ]