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

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/views/appUser/user-info-dialog.vue

@@ -12,7 +12,7 @@
       <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">
@@ -21,14 +21,14 @@
               <img :src="scope.row.devicePic" style="width: 40px; height: 40px; cursor: pointer;"
                 class="hover:opacity-80 transition-opacity" />
             </template>
-            <img :src="scope.row.devicePic" style="max-width: 600px; max-height: 600px;" />
+            <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="typeName" label="设备类型" />
-      <el-table-column prop="createTime" label="绑定日期" />
+      <el-table-column prop="bindingTime" label="绑定日期" />
       <el-table-column label="操作" width="100" align="center">
         <template #default="scope">
           <el-button type="danger" plain @click="handleUnbind(scope.row)">解绑</el-button>
@@ -74,6 +74,10 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryParams.pageNum = 1;
+  queryParams.deviceImei = '',
+    queryParams.deviceMac = '',
+    queryParams.deviceName = '',
+    getList()
 };
 // 列表
 const getList = async () => {

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>
@@ -104,7 +104,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item v-if="form.customerId === ''" label="账号密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入账号密码"   />
+              <el-input v-model="form.password" placeholder="请输入账号密码" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -171,8 +171,16 @@ 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' }
     ],
   }
 };
@@ -199,6 +207,7 @@ const handleQuery = () => {
 const resetQuery = () => {
   dateRange.value = ['', ''];
   queryParams.value.pageNum = 1;
+  queryParams.value.status=''
   handleQuery();
 
 };
@@ -227,19 +236,24 @@ const handleDelete = async (row?: UserVO) => {
 
 /** 用户状态修改  */
 const handleStatusChange = async (row: any) => {
-  console.log(row, '33333333');
+  // 计算新状态（取反）
-  const newStatus = row.enabled; // 获取新的状态值（取反）
+  const originalStatus = row.status;
-  const text = newStatus ? '启用' : '停用';
+  const actionText = row.status == 0 ? '启用' : '停用';
   try {
-    await proxy?.$modal.confirm(`确认要${text}"${row.nickName}"客户吗?`);
+    await proxy?.$modal.confirm(`确认要${actionText}"${row.nickName}"客户吗?`);
     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') { // 这里假设confirm方法在用户取消时reject with 'cancel'
+      console.log(err, 'errr');
+      proxy?.$modal.msgWarning('操作已取消');
+      await getList();
+    }
+
   }
 };
 

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="300px" append-to-body>
+      <div style="text-align: center;">
+        <QRCodeVue3 :value="qrCodeValue" :size="200" />
+        <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
@@ -551,7 +574,7 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
 };
 
 // 覆盖默认的上传行为，可以自定义上传的实现
-const httpRequestImg = (parm): Promise<any> => { 
+const httpRequestImg = (parm): Promise<any> => {
   return Promise.resolve();
 };
 const beforeUpload = (file) => {
@@ -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(`分配成功`)