Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

2 years ago · 82f48b3f81
parent 5c60459be5 f201dc4f41
commit 82f48b3f81
1 changed files with 1 additions and 1 deletions
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@ -82,7 +82,7 @@
 			<el-table-column label="仪器ID" align="center" prop="id" />
 			<el-table-column label="仪器类型" align="center" prop="type">
 				<template slot-scope="scope">
-					<span v-show="scope.row.type == 1">普通仪器</span>
+					<span v-show="scope.row.type == 1">非iot仪器</span>
 					<span v-show="scope.row.type == 2">iot仪器</span>
 				</template>
 			</el-table-column>