修改 bug

src/views/biz/device/index.vue

@@ -102,8 +102,8 @@
 				</template>
 			</template>
 		</s-table>
-	</a-card>
-	<Form ref="formRef" @successful="refresh" />
+	</a-card>/
+	<Form ref="formRef" @successful="refresh"/>
 </template>
 
 <script setup name="device">

src/views/biz/energy/threshold/index.vue

@@ -83,7 +83,7 @@
 									</a-form-item>
 								</a-col>
 								<a-col :span="6">
-									<a-form-item label="用水上线" name="waterUpper">
+									<a-form-item label="用水上限" name="waterUpper">
 										<a-input v-model:value="formSle.waterUpper" type="number">
 											<template #addonAfter>
 												<span>吨</span>

src/views/biz/user/index.vue

@@ -100,11 +100,14 @@
 						<template v-if="column.dataIndex === 'action'">
 							<a @click="formRef.onOpen(record)" v-if="hasPerm('bizUserEdit')">{{ $t('common.editButton') }}</a>
 							<a-divider type="vertical" v-if="hasPerm(['bizUserEdit', 'bizUserDelete'], 'and')" />
-							<a-popconfirm :title="$t('user.popconfirmDeleteUser')" @confirm="removeUser(record)">
-								<a-button type="link" danger size="small" v-if="hasPerm('bizUserDelete')">{{
+							<a-button type="link" @click="removeUser(record)" danger size="small" v-if="hasPerm('bizUserDelete')">{{
 									$t('common.removeButton')
 								}}</a-button>
-							</a-popconfirm>
+<!--							<a-popconfirm :title="$t('user.popconfirmDeleteUser')" @confirm="removeUser(record)">-->
+<!--								<a-button type="link" danger size="small" v-if="hasPerm('bizUserDelete')">{{-->
+<!--									$t('common.removeButton')-->
+<!--								}}</a-button>-->
+<!--							</a-popconfirm>-->
 							<a-divider
 								type="vertical"
 								v-if="hasPerm(['bizUserGrantRole', 'bizUserPwdReset', 'bizUserExportUserInfo'])"
@@ -151,7 +154,7 @@
 	/>
 </template>
 <script setup name="bizUser">
-	import { message, Empty } from 'ant-design-vue'
+	import { message, Empty, Modal } from 'ant-design-vue'
 	import { isEmpty } from 'lodash-es'
 	import tool from '@/utils/tool'
 	import downloadUtil from '@/utils/downloadUtil'
@@ -311,13 +314,21 @@
 	}
 	// 删除人员
 	const removeUser = (record) => {
-		let params = [
-			{
-				id: record.id
+		Modal.confirm({
+			title: '确定要删除这个员工吗？',
+			onOk() {
+				let params = [
+					{
+						id: record.id
+					}
+				]
+				bizUserApi.userDelete(params).then(() => {
+					table.value.refresh()
+				})
+			},
+			onCancel() {
+				console.log('Cancel')
 			}
-		]
-		bizUserApi.userDelete(params).then(() => {
-			table.value.refresh()
 		})
 	}
 	// 批量导出校验并加参数