From bbe5e630759a7f660c34e6bae14af3455eed3fea Mon Sep 17 00:00:00 2001
From: Fanzink <460995166@qq.com>
Date: Mon, 6 Feb 2023 10:25:01 +0800
Subject: [PATCH] 'update'

---
 .../modules/monitoring/equipmentCurrentState.vue      |  4 ++--
 src/views/modules/monitoring/equipmentEfficiency.vue  |  4 ++--
 src/views/modules/monitoring/equipmentException.vue   |  2 +-
 .../monitoring/equipmentHistoricalParameters.vue      | 11 ++++++-----
 .../modules/monitoring/equipmentTimesequence.vue      |  6 +++---
 .../modules/monitoring/workshopSectionDialog.vue      |  2 +-
 .../monitoring/workshopSectionDialogAttrForm.vue      |  2 +-
 src/views/modules/sys/user-add-or-update.vue          |  2 +-
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/monitoring/equipmentCurrentState.vue b/src/views/modules/monitoring/equipmentCurrentState.vue
index e0dfe88..a9c78cc 100644
--- a/src/views/modules/monitoring/equipmentCurrentState.vue
+++ b/src/views/modules/monitoring/equipmentCurrentState.vue
@@ -5,7 +5,7 @@
 				{{ $t('pl.name') }}
 			</el-form-item>
 			<el-form-item>
-				<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable>
+				<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable filterable>
 					<el-option v-for="line in lineList" :key="line.code" :value="line.id" :label="line.name" />
 				</el-select>
 			</el-form-item>
@@ -13,7 +13,7 @@
 				{{ $t('eq.name') }}
 			</el-form-item>
 			<el-form-item>
-				<el-select v-model="dataForm.equipmentId" :placeholder="$t('eq.name')" clearable>
+				<el-select v-model="dataForm.equipmentId" :placeholder="$t('eq.name')" clearable filterable>
 					<el-option v-for="eq in eqList" :key="eq.code" :value="eq.id" :label="eq.name" />
 				</el-select>
 			</el-form-item>
diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue
index 70df6b5..df5614e 100644
--- a/src/views/modules/monitoring/equipmentEfficiency.vue
+++ b/src/views/modules/monitoring/equipmentEfficiency.vue
@@ -8,7 +8,7 @@
 			</el-form-item>
 			<el-form-item>
 				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
-				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" @change="handleftIdChange" clearable>
+				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" @change="handleftIdChange" clearable filterable>
 					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
 				</el-select>
 			</el-form-item>
@@ -17,7 +17,7 @@
 				{{ $t('pl.title') }}
 			</el-form-item>
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable>
+				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable filterable> 
 					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
 				</el-select>
 			</el-form-item>
diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue
index dcdb8e8..522be9d 100644
--- a/src/views/modules/monitoring/equipmentException.vue
+++ b/src/views/modules/monitoring/equipmentException.vue
@@ -14,7 +14,7 @@
 				{{ $t('pl.title') }}
 			</el-form-item>
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable>
+				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable filterable>
 					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
 				</el-select>
 			</el-form-item>
diff --git a/src/views/modules/monitoring/equipmentHistoricalParameters.vue b/src/views/modules/monitoring/equipmentHistoricalParameters.vue
index dce0dab..b1e4409 100644
--- a/src/views/modules/monitoring/equipmentHistoricalParameters.vue
+++ b/src/views/modules/monitoring/equipmentHistoricalParameters.vue
@@ -22,6 +22,7 @@
 
 		<!-- <base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" /> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 	</div>
 </template>
 
@@ -56,7 +57,7 @@ export default {
 	mouted() {
 		this.getDataList()
 	},
-	created(){
+	created() {
 		// console.log('params',this.$route.params)
 	},
 	methods: {
@@ -73,7 +74,9 @@ export default {
 				url: this.$http.adornUrl(`/monitoring/equipmentValueMonitor/runLog/${this.$route.params.id}`),
 				method: 'get'
 			}).then(({ data: res }) => {
-				console.log('res',res)
+				console.log('res', res)
+				this.equipmentName = res.data[0].data[0].equName
+				this.equipmentCode = res.data[0].data[0].equCode
 				if (
 					res &&
 					res.code === 0 &&
@@ -84,9 +87,7 @@ export default {
 					res.data[0].data &&
 					res.data[0].data.length > 0
 				) {
-					this.equipmentName = res.data[0].data[0].equName
-					this.equipmentCode = res.data[0].data[0].equCode
-					console.log(this.equipmentName)
+					// console.log(this.equipmentName)
 					this.setTableProps(res.data[0].nameData)
 					this.setTableData(res.data[0].data)
 				} else {
diff --git a/src/views/modules/monitoring/equipmentTimesequence.vue b/src/views/modules/monitoring/equipmentTimesequence.vue
index ed44d5b..a2a715f 100644
--- a/src/views/modules/monitoring/equipmentTimesequence.vue
+++ b/src/views/modules/monitoring/equipmentTimesequence.vue
@@ -7,7 +7,7 @@
 				{{ $t('pl.title') }}
 			</el-form-item>
 			<el-form-item>
-				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" @change="handleProductLineChange" clearable>
+				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" @change="handleProductLineChange" clearable filterable>
 					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id"
 						:label="productLine.name" />
 				</el-select>
@@ -18,7 +18,7 @@
 			</el-form-item>
 			<el-form-item>
 				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
-				<el-select v-model="dataForm.wsId" :placeholder="$t('pl.process')" clearable>
+				<el-select v-model="dataForm.wsId" :placeholder="$t('pl.process')" clearable filterable>
 					<el-option v-for="ws in wsList" :key="ws.id" :value="ws.id" :label="ws.name" />
 				</el-select>
 			</el-form-item>
@@ -47,7 +47,7 @@
 		</div>
 
 		<el-dialog :visible.sync="dialogVisible" :title="$t('pl.add')" width="30%">
-			<el-select v-model="eqId" style="width: 100%" :placeholder="$t('pl.choose')" clearable>
+			<el-select v-model="eqId" style="width: 100%" :placeholder="$t('pl.choose')" clearable filterable>
 				<el-option v-for="eq in dialogEqList" :key="eq.id" :label="eq.name" :value="eq.id" />
 			</el-select>
 			<div slot="footer">
diff --git a/src/views/modules/monitoring/workshopSectionDialog.vue b/src/views/modules/monitoring/workshopSectionDialog.vue
index db912b0..560218a 100644
--- a/src/views/modules/monitoring/workshopSectionDialog.vue
+++ b/src/views/modules/monitoring/workshopSectionDialog.vue
@@ -20,7 +20,7 @@
 				<el-row :gutter="20">
 					<el-col :span="12"
 						><el-form-item :label="$t('ws.belong')" prop="productionLineId">
-							<el-select v-model="dataForm.productionLineId" :placeholder="$t('ws.belong')">
+							<el-select v-model="dataForm.productionLineId" :placeholder="$t('ws.belong')" filterable>
 								<el-option v-for="line in lineList" :key="line.id" :value="line.id" :label="line.name" />
 							</el-select> </el-form-item
 					></el-col>
diff --git a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue
index ac66350..da4b922 100644
--- a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue
+++ b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue
@@ -5,7 +5,7 @@
 				<el-row :gutter="20">
 					<el-col :span="12">
 						<el-form-item :label="edit ? $t('ws.binded') : $t('ws.unbind')" prop="equipmentId">
-							<el-select v-if="!edit" clearable v-model="dataForm.equipmentId" :placeholder="$t('ws.eqbindplaceholder')">
+							<el-select v-if="!edit" clearable v-model="dataForm.equipmentId" :placeholder="$t('ws.eqbindplaceholder')" filterable>
 								<el-option v-for="eq in eqList" :key="eq.id" :label="eq.name" :value="eq.id" />
 							</el-select>
 							<el-input v-else disabled v-model="bindedEquipmentName" /> </el-form-item
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 167d95b..bf91990 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -26,7 +26,7 @@
 				<el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input>
 			</el-form-item>
 			<el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
-				<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
+				<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')" filterable>
 					<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
 				</el-select>
 			</el-form-item>