From c424fbd04b0c838b1870dd070427b536cb1d1ff8 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Tue, 3 Feb 2026 15:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8A=9F=E8=83=BD=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=8E=A7=E5=88=B6=E6=94=AF=E6=8C=81=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?,=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=B1=BB=E5=9E=8B=E6=89=A9?=
 =?UTF-8?q?=E5=A4=A7=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue                |  4 ++--
 src/views/equipmentManagement/deviceType/index.vue | 13 +++++++++++++
 src/views/equipmentManagement/devices/eqDetail.vue |  2 +-
 src/views/equipmentManagement/devices/index.vue    |  4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 1767b1b..55afc4c 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -57,9 +57,9 @@ const props = defineProps({
   // 数量限制
   limit: propTypes.number.def(5),
   // 大小限制(MB)
-  fileSize: propTypes.number.def(5),
+  fileSize: propTypes.number.def(200),
   // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']),
+  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf','apk','wgt']),
   // 是否显示提示
   isShowTip: propTypes.bool.def(true),
   // 禁用组件（仅查看文件）
diff --git a/src/views/equipmentManagement/deviceType/index.vue b/src/views/equipmentManagement/deviceType/index.vue
index 7ac68f3..439c8e6 100644
--- a/src/views/equipmentManagement/deviceType/index.vue
+++ b/src/views/equipmentManagement/deviceType/index.vue
@@ -34,6 +34,19 @@
 
       <el-table v-loading="loading" border :data="deviceTypeList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="50" align="center" />
+         <el-table-column prop="devicePic" label="设备图片">
+            <template #default="scope">
+              <el-popover placement="right" trigger="click">
+                <template #reference>
+                  <img v-if="scope.row.devicePic" :src="scope.row.devicePic"
+                    style="width: 50px; height: 50px; cursor: pointer; object-fit: contain"
+                    class="hover:opacity-80 transition-opacity" />
+                  <img v-else src="@/assets/index/IMG.png" alt="" style="width: 40px; height: 40px;">
+                </template>
+                <img :src="scope.row.devicePic" style="max-width: 600px; max-height: 600px; object-fit: contain" />
+              </el-popover>
+            </template>
+          </el-table-column>
         <el-table-column label="型号名称" align="center" prop="typeName" />
         <el-table-column label="类型code" align="center" prop="appModelDictionary">
           <template #default="scope">
diff --git a/src/views/equipmentManagement/devices/eqDetail.vue b/src/views/equipmentManagement/devices/eqDetail.vue
index 80aab69..aee2718 100644
--- a/src/views/equipmentManagement/devices/eqDetail.vue
+++ b/src/views/equipmentManagement/devices/eqDetail.vue
@@ -24,7 +24,7 @@
         
         <div class="item">
           <div class="lable">通讯方式<span>：</span></div>
-          <div class="val">{{ detailData?.communicationMode===1 ?'蓝牙':'4G' }}</div>
+          <div class="val">{{ detailData?.communicationMode===1 ?'4G':'蓝牙' }}</div>
         </div>
         <div class="item">
           <div class="lable">蓝牙名称<span>：</span></div>
diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index eecd950..053da91 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="queryParams.deviceImei" placeholder="请输入设备IMEI" clearable />
               </el-form-item>
               <el-form-item label="设备类型" prop="deviceType" >
-                <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable>
+                <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable filterable>
                   <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                     :value="item.id" />
                 </el-select>
@@ -227,7 +227,7 @@
           <el-col :span="24">
             <el-form-item label="设备类型" prop="deviceType">
               <el-select v-model="form.deviceType" placeholder="设备类型" @change="(id) => handleDeviceTypeChange(id)"
-                :disabled="form.id != ''">
+                >
                 <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                   :value="item.id" />
               </el-select>