From 8dbf3003ad58153e609e44e91830cd9aff052dc0 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Fri, 6 Feb 2026 16:15:36 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E9=87=87=E9=9B=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=A0=E9=99=A4=E9=87=87=E9=9B=86=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E3=80=81=E8=BF=9E=E6=8E=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                   |  2 +-
 src/locales/zh-CN.ts                |  2 +-
 src/views/iot/device/DeviceForm.vue | 14 --------------
 src/views/iot/device/index.vue      | 15 +++++++--------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index 2d4e749a..de9490ac 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3575,7 +3575,7 @@ export default {
       protocol: 'Protocol',
       status: 'Connection Status',
       sampleCycle: 'Sample Cycle(s)',
-      isEnable: 'Yes or No',
+      isEnable: 'Enabled',
       collectionTime: 'Collection Time',
       operate: 'Operation',
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 2eab0318..32033b45 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3416,7 +3416,7 @@ export default {
       protocol: '采集协议',
       status: '连接状态',
       sampleCycle: '采集周期(s)',
-      isEnable: '是或否',
+      isEnable: '启用',
       collectionTime: '采集时间',
       operate: '操作',
 
diff --git a/src/views/iot/device/DeviceForm.vue b/src/views/iot/device/DeviceForm.vue
index 86e9e2fd..f686420e 100644
--- a/src/views/iot/device/DeviceForm.vue
+++ b/src/views/iot/device/DeviceForm.vue
@@ -79,12 +79,6 @@
             <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="t('DataCollection.Device.sampleCycle')" prop="sampleCycle">
-          <el-input
-            v-model="formData.sampleCycle"
-            :placeholder="t('DataCollection.Device.placeholderSampleCycle')"
-          />
-        </el-form-item>
         <!-- <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" placeholder="请输入备注" />
         </el-form-item> -->
@@ -102,12 +96,6 @@
       </template>
 
       <template v-else-if="formType === 'update'">
-        <el-form-item :label="t('DataCollection.Device.sampleCycle')" prop="sampleCycle">
-          <el-input
-            v-model="formData.sampleCycle"
-            :placeholder="t('DataCollection.Device.placeholderSampleCycle')"
-          />
-        </el-form-item>
         <el-form-item :label="t('DataCollection.Device.isEnable')" prop="isEnable">
           <el-radio-group v-model="formData.isEnable">
             <el-radio
@@ -180,11 +168,9 @@ const formRules = reactive({
   create: {
     deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
     deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-    sampleCycle: [{ required: true, message: '采集周期不能为空', trigger: 'blur' }],
     isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
   },
   update: {
-    sampleCycle: [{ required: true, message: '采集周期不能为空', trigger: 'blur' }],
     isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
   },
   setting: {
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 3f79b0ff..f962ee68 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -101,8 +101,6 @@
           <dict-tag :type="DICT_TYPE.IOT_GATEWAY_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column :label="t('DataCollection.Device.sampleCycle')" align="center" prop="sampleCycle" width="120px" />
-
       <!-- <el-table-column label="读主题" align="center" prop="readTopic" />
       <el-table-column label="写主题" align="center" prop="writeTopic" />
       <el-table-column label="网关id" align="center" prop="gatewayId" /> -->
@@ -165,11 +163,6 @@
           >
             {{ t('action.edit') }}
           </el-button>
-          <el-button
-            link :type="isRowConnected(scope.row) ? 'warning' : 'success'"
-            :loading="!!connectLoadingMap[scope.row.id]" @click.stop="handleToggleConnect(scope.row)">
-            {{ isRowConnected(scope.row) ? t('DataCollection.Device.disconnect') : t('DataCollection.Device.connect') }}
-          </el-button>
           <el-button
             link
             type="danger"
@@ -669,7 +662,13 @@ const handleDeviceEnableChange = async (row: DeviceVO, value: boolean) => {
   ;(row as any).isEnable = value
   try {
     await DeviceApi.updateDeviceEnabled(row.id, value ? 'true' : 'false')
-    message.success(t('common.updateSuccess'))
+    const name = (row as any).deviceName ?? (row as any).deviceCode ?? ''
+    const suffix = value ? '已启用' : '已停用'
+    if (name) {
+      message.success(`${name}${suffix}`)
+    } else {
+      message.success(suffix)
+    }
   } catch {
     ;(row as any).isEnable = oldValue
     message.error(t('common.updateFail'))