From d1102e547f55b55b0998971a3bd0622654f71dbb Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Mon, 1 Dec 2025 14:26:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AB=A6=E5=A8=A5(rfid):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释设备编号和读取频率相关表单项，调整界面不显示这些字段
- 修改列显隐设置，设备编号、读取频率和告警状态默认不可见
- 设置设备端口默认值为20108
- 修正规则验证，将设备编号改为设备地址必填，禁用在线状态和告警状态的必填校验
- 修复rfidLocation代码中的多余分号问题
- index视图引入并注册Element Plus图标组件
- 修改vite配置，将代理目标地址切换为localhost开发环境
---
 src/views/index.vue                   |  1 +
 src/views/rfid/rfidDevice/index.vue   | 28 +++++++++++++--------------
 src/views/rfid/rfidLocation/index.vue |  2 +-
 vite.config.ts                        |  4 ++--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index d5b73e0..cf4d107 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -125,6 +125,7 @@
 <script setup name="Index" lang="ts">
 import { onMounted, ref, getCurrentInstance, toRefs, type ComponentInternalInstance, onUnmounted } from 'vue';
 import { getHomeStats, type HomeStatsVO } from '@/api/rfid/statistics';
+import { DataAnalysis, Document, Location, Monitor } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { location_type } = toRefs<any>(proxy?.useDict('location_type'));
diff --git a/src/views/rfid/rfidDevice/index.vue b/src/views/rfid/rfidDevice/index.vue
index fdb40b2..b06dc62 100644
--- a/src/views/rfid/rfidDevice/index.vue
+++ b/src/views/rfid/rfidDevice/index.vue
@@ -29,9 +29,9 @@
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
               <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="设备编号" prop="deviceCode">
+<!--                <el-form-item label="设备编号" prop="deviceCode">
                   <el-input v-model="queryParams.deviceCode" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
+                </el-form-item>-->
                 <el-form-item label="设备名称" prop="deviceName">
                   <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
@@ -157,9 +157,9 @@
     <!-- 添加或修改设备信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="rfidDeviceFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备编号" prop="deviceCode">
+<!--        <el-form-item label="设备编号" prop="deviceCode">
           <el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
@@ -180,9 +180,9 @@
         <el-form-item label="设备端口" prop="devicePort">
           <el-input-number v-model="form.devicePort" :min="0" :max="65535" placeholder="请输入设备端口" controls-position="right" style="width: 100%" />
         </el-form-item>
-        <el-form-item label="读取频率" prop="readFrequency">
+        <!-- <el-form-item label="读取频率" prop="readFrequency">
           <el-input-number v-model="form.readFrequency" :min="0" placeholder="请输入读取频率" controls-position="right" style="width: 100%" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="在线状态" prop="onlineStatus">
           <el-radio-group v-model="form.onlineStatus">
             <el-radio
@@ -279,14 +279,14 @@ const locationOptions = ref<RfidLocationOption[]>([]);
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: '设备编号', visible: true },
+  { key: 0, label: '设备编号', visible: false },
   { key: 1, label: '设备名称', visible: true },
   { key: 2, label: '所在位置', visible: true },
   { key: 3, label: '设备地址', visible: true },
   { key: 4, label: '设备端口', visible: true },
-  { key: 5, label: '读取频率', visible: true },
+  { key: 5, label: '读取频率', visible: false },
   { key: 6, label: '在线状态', visible: false },
-  { key: 7, label: '告警状态', visible: true },
+  { key: 7, label: '告警状态', visible: false },
   { key: 8, label: '是否标识', visible: false },
   { key: 9, label: '备注', visible: false },
   { key: 10, label: '创建人', visible: false },
@@ -309,7 +309,7 @@ const initFormData: RfidDeviceForm = {
   deviceName: undefined,
   locationId: undefined,
   deviceAddress: undefined,
-  devicePort: undefined,
+  devicePort: 20108,
   readFrequency: undefined,
   onlineStatus: undefined,
   alarmStatus: undefined,
@@ -342,18 +342,18 @@ const data = reactive<PageData<RfidDeviceForm, RfidDeviceQuery>>({
     }
   },
   rules: {
-    deviceCode: [
-      { required: true, message: "设备编号不能为空", trigger: "blur" }
+    deviceAddress: [
+      { required: true, message: "设备地址不能为空", trigger: "blur" }
     ],
     deviceName: [
       { required: true, message: "设备名称不能为空", trigger: "blur" }
     ],
-    onlineStatus: [
+/*    onlineStatus: [
       { required: true, message: "在线状态不能为空", trigger: "change" }
     ],
     alarmStatus: [
       { required: true, message: "告警状态不能为空", trigger: "change" }
-    ],
+    ],*/
     isMarked: [
       { required: true, message: "是否标识不能为空", trigger: "change" }
     ],
diff --git a/src/views/rfid/rfidLocation/index.vue b/src/views/rfid/rfidLocation/index.vue
index ef14377..c063491 100644
--- a/src/views/rfid/rfidLocation/index.vue
+++ b/src/views/rfid/rfidLocation/index.vue
@@ -206,7 +206,7 @@ type RfidLocationOption = {
   children?: RfidLocationOption[];
 }
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const { location_type, is_marked } = toRefs<any>(proxy?.useDict('location_type', 'is_marked'));
 
diff --git a/vite.config.ts b/vite.config.ts
index 186e5f7..20c9dc1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,8 +25,8 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          // target: 'http://192.168.100.100:8080',
-          target: 'http://192.168.0.15:8080',
+          // target: 'http://192.168.100.100:8080''',
+          target: 'http://localhost:8080',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')