Merge branch 'main' of http://47.107.152.87:3000/dyf/dyf-vue-ui

.env.production

@@ -1,11 +1,17 @@
 # 页面标题
 VITE_APP_TITLE = 物联网管理系统
 
-# 生产环境配置
+# 生产环境配置 晶全1
 VITE_APP_ENV = 'https://fuyuanshen.com/backend'
 
-# 应用访问路径 例如使用前缀 /admin/
+# 生产环境配置 富源晟2
-VITE_APP_CONTEXT_PATH = '/sys/'
+# VITE_APP_ENV = 'https://fuyuanshen.com/backend-fys'
+
+# 应用访问路径 晶全1
+VITE_APP_CONTEXT_PATH = '/jingquan/'
+
+# 应用访问路径 富源晟2
+#VITE_APP_CONTEXT_PATH = '/sys/'
 
 # 监控地址
 VITE_APP_MONITOR_ADMIN = '/admin/applications'
@@ -13,9 +19,12 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
-# 生产环境
+# 生产环境 晶全3
 VITE_APP_BASE_API = '/backend'
 
+# 生产环境 富源晟3
+#VITE_APP_BASE_API = '/backend-fys'
+
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
 

package.json

@@ -38,6 +38,7 @@
     "mitt": "^3.0.1",
     "nprogress": "0.2.0",
     "pinia": "3.0.2",
+    "qrcode-vue3": "^1.7.1",
     "screenfull": "6.0.2",
     "vue": "3.5.13",
     "vue-cropper": "1.1.1",

src/api/equipmentManagement/device/index.ts

@@ -72,12 +72,11 @@ export const userAllCustomerAll = () => {
 }
 
 // 解绑
-
+export const deviceUnbind = (params:any) => {
-export const deviceUnbind = (data:any) => {
   return request({
     url: '/api/device/unbind',
-    method: 'post',
+    method: 'GET',
-    data
+    params
   })
 }
 // 撤回

src/api/userApp/index.ts

@@ -4,7 +4,7 @@ import { AxiosPromise } from 'axios';
  * 查询设备列表
  * @param query
  */
-export const userList = (params): AxiosPromise => {
+export const userList = (params: any): AxiosPromise => {
   return request({
     url: '/app/user/list',
     method: 'get',
@@ -12,7 +12,7 @@ export const userList = (params): AxiosPromise => {
   });
 };
 // 绑定设备列表
-export const deviceList = (params): AxiosPromise => {
+export const deviceList = (params: any): AxiosPromise => {
   return request({
     url: '/api/app/device',
     method: 'get',
@@ -20,12 +20,24 @@ export const deviceList = (params): AxiosPromise => {
   });
 };
 // 账号状态
-export const userStatus = (data): AxiosPromise => {
+export const userStatus = (data: any): AxiosPromise => {
   return request({
     url: '/api/app/device',
     method: 'put',
     data
   });
 };
+// 解绑设备
+export const deviceUnBind = (data: any): AxiosPromise => {
+  return request({
+    url: '/api/app/device/unBind',
+    method: 'delete',
+    data,
+    headers: {
+      'Content-Type': 'multipart/form-data',  //设置正确的 Content-Type
+    },
+  });
+};
 
-export default { userList,deviceList,userStatus }
+
+export default { userList, deviceList, userStatus, deviceUnBind }

src/router/index.ts

@@ -1,29 +1,6 @@
 import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
 /* Layout */
 import Layout from '@/layout/index.vue';
-
-/**
- * Note: 路由配置项
- *
- * hidden: true                     // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
- * alwaysShow: true                 // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- *                                  // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
- *                                  // 若你想不管路由下面的 children 声明的个数都显示你的根路由
- *                                  // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
- * redirect: noRedirect             // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name'               // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
- * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数
- * roles: ['admin', 'common']       // 访问路由的角色权限
- * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
- * meta : {
-    noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
-    activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
-  }
- */
-
 // 公共路由
 export const constantRoutes: RouteRecordRaw[] = [
   {

src/views/appUser/index.vue

@@ -34,9 +34,9 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="loginDate" width="180">
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.loginDate) }}</span>
+            <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center">

src/views/appUser/user-info-dialog.vue

@@ -12,23 +12,23 @@
       <el-button icon="Refresh" @click="resetQuery">重置</el-button>
     </div>
     <!-- 表格 -->
-    <el-table v-loading="bindingLoading" :data="boundDevices" style="width: 100%; margin-top: 20px;" height="400">
+    <el-table v-loading="bindingLoading" :data="boundDevices" style="margin-top: 20px;">
       <el-table-column prop="deviceName" label="设备名称" />
       <el-table-column prop="devicePic" label="设备图片">
         <template #default="scope">
-          <el-image style="width: 40px; height: 40px" :src="scope.row.devicePic"
+          <el-popover placement="right" trigger="click">
-            :preview-src-list="[scope.row.devicePic]" />
+            <template #reference>
+              <img :src="scope.row.devicePic" style="width: 40px; height: 40px; cursor: pointer;"
+                class="hover:opacity-80 transition-opacity" />
+            </template>
+            <img :src="scope.row.devicePic" />
+          </el-popover>
         </template>
       </el-table-column>
       <el-table-column prop="deviceMac" label="设备MAC" />
       <el-table-column prop="deviceImei" label="设备IMEI" />
-      <el-table-column prop="deviceTypeName" label="设备类型" />
+      <el-table-column prop="typeName" label="设备类型" />
-      <el-table-column prop="deviceStatus" label="状态">
+      <el-table-column prop="bindingTime" label="绑定日期" />
-        <template #default="scope">
-          <span>{{ scope.row.deviceStatus === 1 ? '正常' : '失效' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="绑定日期" />
       <el-table-column label="操作" width="100" align="center">
         <template #default="scope">
           <el-button type="danger" plain @click="handleUnbind(scope.row)">解绑</el-button>
@@ -58,8 +58,6 @@ const queryParams = reactive({
   deviceImei: ''
 })
 function openDialog(row: OperLogForm) {
-  console.log(row,'roe11');
-  
   info.value = row;
   open.value = true;
   getList();
@@ -76,27 +74,40 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryParams.pageNum = 1;
+  queryParams.deviceImei = '',
+    queryParams.deviceMac = '',
+    queryParams.deviceName = '',
+    getList()
 };
 // 列表
 const getList = async () => {
   bindingLoading.value = true;
-  const res = await api.deviceList(queryParams);
+  let data = {
+    bindingUserId: info.value.userId,
+    pageNum: queryParams.pageNum,
+    pageSize: queryParams.pageSize,
+    deviceName: queryParams.deviceName,
+    deviceMac: queryParams.deviceMac,
+    deviceImei: queryParams.deviceImei
+
+  }
+  const res = await api.deviceList(data);
   boundDevices.value = res.rows;
   total.value = res.total;
   bindingLoading.value = false;
 };
 // 解绑
 const handleUnbind = (row) => {
-  proxy?.$modal.confirm.confirm('此操作将解绑设备 "' + row.deviceName + '", 是否继续?', '提示', {
+  proxy?.$modal.confirm('此操作将解绑设备 "' + row.deviceName + '", 是否继续?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
     const data = {
-      deviceMac: row.deviceMac,
+      // deviceMac: row.deviceMac,
-      customerId: info.value.id
+      id: row.id
     }
-    api.deviceList(data).then(() => {
+    api.deviceUnBind(data).then(() => {
       proxy?.$modal.msgSuccess({ type: 'success', message: '解绑成功!' })
       getList()
     })

src/views/customerManagement/index.vue

@@ -9,10 +9,10 @@
               <el-input v-model="queryParams.blurry" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="客户状态" prop="status">
-              <el-select v-model="queryParams.enabled" clearable placeholder="客户状态" class="filter-item">
+              <el-select v-model="queryParams.status" clearable placeholder="客户状态" class="filter-item">
                 <el-option label="全部" :value="''" />
-                <el-option label="启用" :value="true" />
+                <el-option label="启用" :value="0" />
-                <el-option label="禁用" :value="false" />
+                <el-option label="禁用" :value="1" />
               </el-select>
             </el-form-item>
             <el-form-item label="创建时间" style="width: 308px">
@@ -53,10 +53,10 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="客户名称" align="center" prop="nickName" />
         <el-table-column label="客户账号" align="center" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="客户状态" align="center" prop="enabled">
+        <el-table-column label="客户状态" align="center" prop="status">
           <template #default="scope">
             <div @click="handleStatusChange(scope.row)">
-              <el-switch v-model="scope.row.enabled" />
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" />
             </div>
           </template>
         </el-table-column>
@@ -121,22 +121,48 @@
 
 <script setup name="User" lang="ts">
 import api from '@/api/customerManagement';
-import { UserForm, UserQuery, UserVO } from '@/api/customerManagement/types';
 import { to } from 'await-to-js';
+import { ComponentInternalInstance, getCurrentInstance, onMounted, reactive, ref, toRefs } from 'vue';
+import { ElDialog, ElForm, ElFormItem, ElInput, ElRow, ElCol, ElButton, ElCard, ElSelect, ElOption, ElDatePicker, ElTable, ElTableColumn, ElTooltip, ElSwitch } from 'element-plus';
+
+// 定义接口
+interface UserVO {
+  customerId: string | number;
+  nickName: string;
+  userName: string;
+  status: string;
+  createTime: string;
+  userId: number;
+}
+
+interface UserForm extends UserVO {
+  password?: string;
+  enabled?: boolean;
+}
+
+interface UserQuery {
+  pageNum: number;
+  pageSize: number;
+  blurry: string;
+  status: string;
+  enabled: string;
+}
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const customerList = ref<UserVO[]>();
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref<Array<number | string>>([]);
+const ids = ref<UserVO[]>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const initPassword = ref<string>('');
-const queryFormRef = ref<ElFormInstance>();
+const queryFormRef = ref<InstanceType<typeof ElForm>>();
-const userFormRef = ref<ElFormInstance>();
+const userFormRef = ref<InstanceType<typeof ElForm>>();
-const formDialogRef = ref<ElDialogInstance>();
+const formDialogRef = ref<InstanceType<typeof ElDialog>>();
 const loadingIng = ref(false)
+
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -144,19 +170,27 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: UserForm = {
   userName: '',
-  nickName: undefined,
+  nickName: '',
   password: '',
   enabled: true,
-  customerId: ''
+  customerId: '',
+  status: '',
+  createTime: '',
+  userId: 0,
 };
 
-const initData: PageData<UserForm, UserQuery> = {
+const initData: {
+  form: UserForm,
+  queryParams: UserQuery,
+  rules: any
+} = {
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     blurry: '',
     enabled: '',
+    status: ''
   },
   rules: {
     nickName: [
@@ -171,14 +205,22 @@ const initData: PageData<UserForm, UserQuery> = {
         trigger: 'blur'
       }
     ],
+
     password: [
       { required: true, message: '请输入账号密码', trigger: 'blur' },
+      {
+        min: 5,
+        max: 20,
+        message: '用户密码长度必须介于 5 和 20 之间',
+        trigger: 'blur'
+      },
+      { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
     ],
   }
 };
-const data = reactive<PageData<UserForm, UserQuery>>(initData);
+const data = reactive(initData);
 
-const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
+const { queryParams, form, rules } = toRefs(data);
 
 /** 查询用户列表 */
 const getList = async () => {
@@ -198,28 +240,24 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
+  queryParams.value.status=''
   handleQuery();
 
 };
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: UserVO) => {
-  // 批量删除逻辑
+  const customerIds = row ? [row.customerId] : ids.value.map(item => item.customerId);
-  let arrey = ids.value.map((item) => item.customerId);
+  const nickNames = row ? row.nickName : ids.value.map(item => item.nickName).join(',');
-  if (!row) {
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + nickNames + '"的数据项？', '系统提示', {
-    const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`) as any);
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }) as any);
   if (!err) {
-      await api.deleteCustomer(arrey);
+    await api.deleteCustomer(customerIds);
-      await getList();
-      proxy?.$modal.msgSuccess('删除成功');
-    }
-    return;
-  }
-  // 单行删除逻辑
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.nickName + '"的数据项？') as any);
-  if (!err) {
-    await api.deleteCustomer([row.customerId]);
     await getList();
     proxy?.$modal.msgSuccess('删除成功');
   }
@@ -227,25 +265,33 @@ const handleDelete = async (row?: UserVO) => {
 
 /** 用户状态修改  */
 const handleStatusChange = async (row: any) => {
-  console.log(row, '33333333');
+  const originalStatus = row.status;
-  const newStatus = row.enabled; // 获取新的状态值（取反）
+  const actionText = row.status == 0 ? '启用' : '停用';
-  const text = newStatus ? '启用' : '停用';
   try {
-    await proxy?.$modal.confirm(`确认要${text}"${row.nickName}"客户吗?`);
+    await proxy?.$modal.confirm(`确认要${actionText}"${row.nickName}"客户吗?`, '系统提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
     await api.updateCustomer({
       customerId: row.customerId,
-      enabled: newStatus
+      enabled: originalStatus == 0 ? true : false
     });
-    proxy?.$modal.msgSuccess(text + '成功');
+    proxy?.$modal.msgSuccess(actionText + '成功');
     await getList();
   } catch (err) {
-    row.enabled = !newStatus; // 回滚状态
+    if (err == 'cancel') {
+      console.log(err, 'errr');
+      proxy?.$modal.msgWarning('操作已取消');
+      await getList();
+    }
   }
 };
 
+
 /** 选择条数  */
 const handleSelectionChange = (selection: UserVO[]) => {
-  ids.value = selection.map((item) => item);
+  ids.value = selection;
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
@@ -277,11 +323,10 @@ const handleUpdate = async (row?: UserForm) => {
   dialog.title = '修改客户';
   try {
     if (row) {
-      // 从行内按钮调用，直接使用行数据
       Object.assign(form.value, row);
     } else {
-      const customerId = ids.value[0];
+      const selectedId = ids.value[0];
-      Object.assign(form.value, customerId);
+      Object.assign(form.value, selectedId);
     }
   } catch (error) {
     dialog.visible = false;
@@ -290,15 +335,17 @@ const handleUpdate = async (row?: UserForm) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-
   userFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      loadingIng.value = true
+      loadingIng.value = true;
+      try {
         form.value.customerId ? await api.updateCustomer(form.value) : await api.addCustomer(form.value);
         proxy?.$modal.msgSuccess('操作成功');
         dialog.visible = false;
         await getList();
-      loadingIng.value = false
+      } finally {
+        loadingIng.value = false;
+      }
     }
   });
 };
@@ -317,11 +364,10 @@ const closeDialog = () => {
 const resetForm = () => {
   userFormRef.value?.resetFields();
   userFormRef.value?.clearValidate();
-  form.value.customerId = undefined;
+  form.value.customerId = '';
 };
+
 onMounted(() => {
   getList(); // 初始化列表数据
-
 });
-
 </script>

src/views/equipmentManagement/deviceType/index.vue

@@ -136,42 +136,58 @@
 
 <script setup name="User" lang="ts">
 import api from '@/api/equipmentManagement/deviceType/index';
-import { UserForm, deviceTypeQuery, deviceTypeVO } from '@/api/equipmentManagement/deviceType/types';
+import { deviceTypeQuery } from '@/api/equipmentManagement/deviceType/types';
-import { UserQuery, UserVO } from '@/api/system/user/types';
+import { to } from 'await-to-js';
+import { ComponentInternalInstance, getCurrentInstance, onMounted, reactive, ref, toRefs } from 'vue';
+import { ElDialog, ElForm, ElFormItem, ElInput, ElRow, ElCol, ElButton, ElCard, ElSelect, ElOption, ElDatePicker, ElTable, ElTableColumn, ElTooltip, ElSwitch } from 'element-plus';
+
+interface deviceTypeVO {
+  id: string | number;
+  typeName: string;
+  isSupportBle: boolean;
+  locateMode: string;
+  communicationMode: string;
+  createTime: string;
+  createByName: string;
+}
+
+interface DeviceTypeForm extends deviceTypeVO {
+  // 可能有其他字段
+}
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const deviceTypeList = ref<deviceTypeVO[]>();
-import { to } from 'await-to-js';
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref<Array<number | string>>([]);
+const ids = ref<deviceTypeVO[]>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const initPassword = ref<string>('');
+const queryFormRef = ref<InstanceType<typeof ElForm>>();
-const queryFormRef = ref<ElFormInstance>();
+const userFormRef = ref<InstanceType<typeof ElForm>>();
-const userFormRef = ref<ElFormInstance>();
+const formDialogRef = ref<InstanceType<typeof ElDialog>>();
-const formDialogRef = ref<ElDialogInstance>();
 const loadingIng = ref(false)
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
-const initFormData: UserForm = {
+const initFormData: DeviceTypeForm = {
   typeName: '',
-  isSupportBle: '',
+  isSupportBle: false,
   locateMode: '',
   communicationMode: '',
-  id: ''
+  id: '',
+  createTime: '',
+  createByName: '',
 };
 
-const initData: PageData<UserForm, deviceTypeQuery> = {
+const initData = {
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     typeName: '',
-
   },
   rules: {
     typeName: [
@@ -185,8 +201,15 @@ const initData: PageData<UserForm, deviceTypeQuery> = {
     ],
   }
 };
-const data = reactive<PageData<UserForm, UserQuery>>(initData);
+
-const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
+const data = reactive<{
+  form: DeviceTypeForm,
+  queryParams: deviceTypeQuery,
+  rules: any
+}>(initData);
+
+const { queryParams, form, rules } = toRefs(data);
+
 /** 查询用户列表 */
 const getList = async () => {
   loading.value = true;
@@ -196,7 +219,6 @@ const getList = async () => {
   total.value = res.total;
 };
 
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -204,42 +226,34 @@ const handleQuery = () => {
 };
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryParams.value.typeName = ''
+  queryFormRef.value?.resetFields();
   queryParams.value.pageNum = 1;
   getList();
-
 };
 
 /** 删除按钮操作 */
-const handleDelete = async (row?: UserVO) => {
+const handleDelete = async (row?: deviceTypeVO) => {
-  // 批量删除逻辑
+  const deviceTypeIds = row ? [row.id] : ids.value.map(item => item.id);
-  let arrey = ids.value.map((item) => item.id);
+  const typeNames = row ? row.typeName : ids.value.map(item => item.typeName).join(',');
-  if (!row) {
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + typeNames + '"的数据项？', '系统提示', {
-    const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`) as any);
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }) as any);
   if (!err) {
-      await api.deleteDeviceType(arrey);
+    await api.deleteDeviceType(deviceTypeIds);
-      await getList();
-      proxy?.$modal.msgSuccess('删除成功');
-    }
-    return;
-  }
-  // 单行删除逻辑
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.typeName + '"的数据项？') as any);
-  if (!err) {
-    await api.deleteDeviceType([row.id]);
     await getList();
     proxy?.$modal.msgSuccess('删除成功');
   }
 };
 
 /** 选择条数  */
-const handleSelectionChange = (selection: UserVO[]) => {
+const handleSelectionChange = (selection: deviceTypeVO[]) => {
-  ids.value = selection.map((item) => item);
+  ids.value = selection;
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
 
-
 /** 重置操作表单 */
 const reset = () => {
   form.value = { ...initFormData };
@@ -256,21 +270,19 @@ const handleAdd = async () => {
   reset();
   dialog.visible = true;
   dialog.title = '新增设备类型';
-  form.value.password = initPassword.value.toString();
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: UserForm) => {
+const handleUpdate = async (row?: DeviceTypeForm) => {
   reset();
   dialog.visible = true;
   dialog.title = '修改设备类型';
   try {
     if (row) {
-      // 从行内按钮调用，直接使用行数据
       Object.assign(form.value, row);
     } else {
-      const customerId = ids.value[0];
+      const selectedId = ids.value[0];
-      Object.assign(form.value, customerId);
+      Object.assign(form.value, selectedId);
     }
   } catch (error) {
     dialog.visible = false;
@@ -282,12 +294,15 @@ const submitForm = () => {
   userFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       loadingIng.value = true;
+      try {
         form.value.id ? await api.updateDeviceType(form.value) : await api.addDeviceType(form.value);
         proxy?.$modal.msgSuccess('操作成功');
         dialog.visible = false;
         await getList();
+      } finally {
         loadingIng.value = false;
       }
+    }
   });
 };
 
@@ -297,7 +312,6 @@ const submitForm = () => {
 const closeDialog = () => {
   dialog.visible = false;
   resetForm();
-  loadingIng.value = false;
 };
 
 /**
@@ -306,11 +320,11 @@ const closeDialog = () => {
 const resetForm = () => {
   userFormRef.value?.resetFields();
   userFormRef.value?.clearValidate();
-  form.value.customerId = undefined;
+  form.value.id = '';
 };
+
 onMounted(() => {
   getList(); // 初始化列表数据
-
 });
 
 </script>

src/views/equipmentManagement/devices/index.vue

@@ -116,7 +116,7 @@
             <el-tooltip v-if="scope.row.id !== 1 && scope.row.deviceStatus == 1" content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip v-if="scope.row.id !== 1" content="删除" placement="top">
+            <el-tooltip v-if="!scope.row.customerName && scope.row.deviceStatus == 1" content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.deviceStatus == 1 && !scope.row.customerName" content="分配" placement="top">
@@ -129,6 +129,9 @@
               placement="top">
               <el-button link type="primary" icon="Refresh" @click="handleUnbind(scope.row)"></el-button>
             </el-tooltip>
+            <el-tooltip v-if="scope.row.deviceImei" content="查看二维码" placement="top">
+              <el-button link type="primary" icon="Postcard" @click="showQrCode(scope.row)"></el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -271,10 +274,23 @@
         </div>
       </template>
     </el-dialog>
+    <!-- IMEI 二维码弹窗 -->
+    <el-dialog v-model="qrCodeDialogVisible" title="设备IMEI二维码" width="20%" append-to-body>
+      <div style="text-align: center;">
+        <QRCodeVue3 :value="qrCodeValue" :size="100" />
+        <p style="margin-top: 10px;">{{ qrCodeValue }}</p>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="qrCodeDialogVisible = false">关闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="User" lang="ts">
+import QRCodeVue3 from 'qrcode-vue3';
 import api from '@/api/equipmentManagement/device/index';
 import { deviceForm, deviceQuery, deviceVO, deviceTypeOption } from '@/api/equipmentManagement/device/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -305,6 +321,8 @@ const loadingIng = ref(false)
 const assignCustomerId = ref(); //分配客户id
 const batchAssignCustomerId = ref() //批量分配客户id
 const customerList = ref()
+const qrCodeDialogVisible = ref(false);
+const qrCodeValue = ref('');
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -371,7 +389,7 @@ const handleDelete = async (row?: deviceVO) => {
   // 批量删除逻辑
   let arrey = ids.value.map((item) => item.id);
   if (!row) {
-    const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`));
+    const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }));
     if (!err) {
       await api.deleteDevice(arrey);
       await getList();
@@ -380,7 +398,7 @@ const handleDelete = async (row?: deviceVO) => {
     return;
   }
   // 单行删除逻辑
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项？'));
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }));
   if (!err) {
     await api.deleteDevice([row.id]);
     await getList();
@@ -405,12 +423,15 @@ const handleUnbind = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    api.deviceUnbind(row).then(res => {
+    let data = {
-      if (res.code === 0) {
+      id: row.id
-        proxy?.$modal.msgSuccess('解绑成功')
+    }
+    api.deviceUnbind(data).then(res => {
+      if (res.code == 200) {
+        proxy?.$modal.msgSuccess(res.msg)
         getList(); // 初始化列表数据
       } else {
-        proxy?.$modal.msgError(res.msg || '解绑失败')
+        proxy?.$modal.msgError(res.msg)
       }
     })
   }).catch(() => {
@@ -425,7 +446,7 @@ const handleWithdraw = (row: any) => {
     type: 'warning'
   }).then(() => {
     api.withdrawDevice([row.id]).then(res => {
-      if (res.code === 0) {
+      if (res.code === 200) {
         proxy?.$modal.msgSuccess('撤回成功')
         getList(); // 初始化列表数据
       } else {
@@ -480,6 +501,8 @@ const handleUpdate = async (row?: deviceForm) => {
   getDeviceType();
   try {
     if (row) {
+      // 使用 nextTick 确保对话框完全渲染后再设置表单值
+      await nextTick();
       Object.assign(form.value, row);
       form.value.image = row.devicePic
       // 编辑时根据已有值显示字段
@@ -531,7 +554,7 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
       return;
     }
     const res = await api.getCommunicationMode({ id: deviceTypeId });
-    if (res.code === 0 && res.data) {
+    if (res.code == 200 && res.data) {
       communicationModeInfo.value = res.data;
       // 根据通讯方式确定显示哪个字段
       if (res.data.communicationMode == '1') { // 蓝牙设备 - 显示MAC
@@ -622,7 +645,7 @@ const submitForm = async () => {
         'Content-Type': 'multipart/form-data'
       }
     });
-    if (res.code == 0) {
+    if (res.code == 200) {
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       loadingIng.value = false;
@@ -652,6 +675,13 @@ const closeDialog = () => {
   resetForm();
 };
 
+const showQrCode = (row: any) => {
+  if (row.deviceImei) {
+    qrCodeValue.value = row.deviceImei;
+    qrCodeDialogVisible.value = true;
+  }
+};
+
 /**
  * 重置表单
  */
@@ -663,7 +693,7 @@ const resetForm = () => {
 // 设备类型
 const getDeviceType = () => {
   api.deviceTypeAll().then(res => {
-    if (res.code == 0) {
+    if (res.code == 200) {
       deviceTypeOptions.value = res.data
     }
   }).catch(err => {
@@ -673,7 +703,7 @@ const getDeviceType = () => {
 // 客户下拉框
 const getAllCustomerAll = () => {
   api.userAllCustomerAll().then(res => {
-    if (res.code == 0) {
+    if (res.code == 200) {
       customerList.value = res.data
     }
   })
@@ -699,7 +729,7 @@ const handleAssignConfirm = () => {
     deviceIds: [assignRow.value.id]
   }
   api.deviceAssignCustomer(data).then((res) => {
-    if (res.code == 0) {
+    if (res.code == 200) {
       loadingIng.value = false;
       const customer = customerList.value.find(c => c.id === assignCustomerId.value)
       const customerName = customer ? customer.nickName : `ID: ${assignCustomerId.value}`
@@ -733,7 +763,7 @@ const handleBatchImport = () => {
 const downloadTemplate = () => {
   // 这里可用 window.open 或 a 标签下载模板
   const link = document.createElement('a');
-  link.href = 'http://fuyuanshen.com:81/images/excel/equipmenttemplate.xlsx';
+  link.href = 'https://fuyuanshen.com/fys/Equipmentimporttemplate/EquipmentImportTemplate.xlsx';
   link.download = '设备数据导入模板.xlsx'; // 可选：指定下载文件名
   link.style.display = 'none'; // 隐藏标签
   document.body.appendChild(link);
@@ -751,7 +781,7 @@ const beforeImportUpload = (file: any) => {
 //添加tokenf方法head_upload 直接返回 getBearerToken() 
 const head_upload = () => getBearerToken();
 const handleImportSuccess = (response: any) => {
-  if (response.code === 0) {
+  if (response.code == 200) {
     importResult.value.isShow = true
     if (response.data) {
       importResult.value.succeed = response.data.successCount || 0
@@ -785,7 +815,7 @@ const handleBatchAssignConfirm = () => {
     deviceIds: selectedIds // 选中的设备ID数组
   }
   api.deviceAssignCustomer(data).then((res) => {
-    if (res.code == 0) {
+    if (res.code == 200) {
       batchAssignDialogVisible.value = false
       getList();
       return proxy?.$modal.msgSuccess(`分配成功`)