From ae8a3668c831c2578b01e7670803f230fcbc186e Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Fri, 30 Sep 2022 15:04:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E6=AE=B5=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                          |  2 +-
 src/views/modules/monitoring/equipment.vue | 37 +++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index bdd9795..402ecce 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -275,7 +275,7 @@ t.ws.code = '工段编码'
 t.ws.binded = '已绑定的设备'
 t.ws.unbind = '设备名称'
 t.ws.eqbindplaceholder = '选择一个设备进行绑定'
-t.ws.sort = '排序'
+t.ws.sort = '工段排序'
 t.ws.setorder = '请输入工段中设备的顺序'
 t.ws.bind = '绑定'
 t.ws.eqbind = '设备绑定'
diff --git a/src/views/modules/monitoring/equipment.vue b/src/views/modules/monitoring/equipment.vue
index 153bc46..88e109c 100644
--- a/src/views/modules/monitoring/equipment.vue
+++ b/src/views/modules/monitoring/equipment.vue
@@ -11,7 +11,15 @@
 			</el-form-item>
 		</el-form>
 
-		<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+		<base-table
+			:page="pageIndex"
+			:size="pageSize"
+			:data="dataList"
+			:table-head-configs="tableConfigs"
+			:max-height="calcMaxHeight(8)"
+			@operate-event="handleOperations"
+			@refreshDataList="getDataList"
+		/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -54,6 +62,7 @@ const tableConfigs = [
 	{ prop: 'groupName', name: i18n.t('eq.group') },
 	{ prop: 'enName', name: i18n.t('enname') },
 	{ prop: 'abbr', name: i18n.t('abbr') },
+	{ prop: 'sectionName', name: i18n.t('ws.title') },
 	{
 		prop: 'details',
 		name: i18n.t('detail'),
@@ -85,6 +94,17 @@ const addOrUpdateConfigs = {
 			type: 'select',
 			options: []
 		},
+		{
+			name: 'sectionId',
+			label: i18n.t('ws.title'),
+			required: true,
+			type: 'select',
+			options: []
+		},
+		{
+			name: 'sort',
+			label: i18n.t('ws.sort')
+		},
 		{
 			name: 'groupId',
 			label: i18n.t('eq.group'),
@@ -263,9 +283,24 @@ export default {
 		console.log('activated')
 		this.getDataList()
 		this.getGroupList()
+		this.getWsList()
 		this.getTypeList()
 	},
 	methods: {
+		// 获取工段列表
+		getWsList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/workshopSection/list'),
+				method: 'get'
+			}).then(({ data : res }) => {
+				const wsConfig = this.addOrUpdateConfigs.fields.find(item => item.name === 'sectionId')
+				wsConfig.options =
+					res.data?.map(item => ({
+						value: item.id,
+						label: item.name
+					})) || []
+			})
+		},
 		// 获取设备类型列表
 		getTypeList() {
 			this.$http({