From d13a8ac6f523ba55aa4aa14fd76da8ff99e980c1 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 5 Jan 2026 14:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=A0=87=E7=AD=BE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BA=E5=8C=BA=E5=9F=9F=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceSync/compoents/AddNuIotForm.vue      | 18 +++++++++---------
 src/views/deviceSync/compoents/DevicesForm.vue |  2 +-
 src/views/iotsync/tplink/camera/camera.data.ts | 10 +++++-----
 .../iotsync/tq/electricity/electricity.data.ts | 10 +++++-----
 src/views/iotsync/tq/water/water.data.ts       | 10 +++++-----
 src/views/iotsync/yiweilian/humid.data.ts      | 10 +++++-----
 .../nuBaseInfo/NuBaseInfo.data.ts              |  8 ++++----
 .../nuBaseInfo/components/NuBaseInfoForm.vue   |  4 ++--
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/views/deviceSync/compoents/AddNuIotForm.vue b/src/views/deviceSync/compoents/AddNuIotForm.vue
index c4c1a52..aaa565b 100644
--- a/src/views/deviceSync/compoents/AddNuIotForm.vue
+++ b/src/views/deviceSync/compoents/AddNuIotForm.vue
@@ -18,8 +18,8 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
-                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域标签"
+              <a-form-item label="区域属性" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
+                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域属性"
                   allow-clear />
               </a-form-item>
             </a-col>
@@ -72,8 +72,8 @@ const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
 const confirmLoading = ref<boolean>(false);
 //表单验证
 const validatorRules = reactive({
-  areaFlag : [{ required: true, message: '请选择区域标签!'},],
-  iot : [{ required: true, message: '请选择摄像头!'},],
+  areaFlag : [{ required: true, message: '请选择区域属性!'},],
+  // iot : [{ required: true, message: '请选择摄像头!'},],
 });
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
@@ -168,11 +168,11 @@ async function submitForm() {
   if (!model.id) {
     model.status = "0";
   }
-  if(!model.iotSn){
-    createMessage.warning("请选择摄像头！");
-      confirmLoading.value = false;
-  return;
-  }
+  // if(!model.iotSn){
+  //   createMessage.warning("请选择摄像头！");
+  //     confirmLoading.value = false;
+  // return;
+  // }
   await addNuIot(model, isUpdate.value)
     .then((res) => {
       if (res.success) {
diff --git a/src/views/deviceSync/compoents/DevicesForm.vue b/src/views/deviceSync/compoents/DevicesForm.vue
index b7263b0..ba2de37 100644
--- a/src/views/deviceSync/compoents/DevicesForm.vue
+++ b/src/views/deviceSync/compoents/DevicesForm.vue
@@ -77,7 +77,7 @@ const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
 const confirmLoading = ref<boolean>(false);
 //表单验证
 const validatorRules = reactive({
-  areaFlag : [{ required: true, message: '请选择区域标签!'},],
+  areaFlag : [{ required: true, message: '请选择区域属性!'},],
   iot : [{ required: true, message: '请选择摄像头!'},],
 });
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
diff --git a/src/views/iotsync/tplink/camera/camera.data.ts b/src/views/iotsync/tplink/camera/camera.data.ts
index c811b79..52ca542 100644
--- a/src/views/iotsync/tplink/camera/camera.data.ts
+++ b/src/views/iotsync/tplink/camera/camera.data.ts
@@ -32,7 +32,7 @@ export const businessColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -100,7 +100,7 @@ export const selectedSourceColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -121,7 +121,7 @@ export const nusColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -135,7 +135,7 @@ export const nusColumns: BasicColumn[] = [
 
 export const nuFormSchema: FormSchema[] = [
   {
-    label: '区域标签',
+    label: '区域属性',
     field: 'areaFlag',
     component: 'JDictSelectTag',
     componentProps: {
@@ -190,7 +190,7 @@ export const selectedColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
diff --git a/src/views/iotsync/tq/electricity/electricity.data.ts b/src/views/iotsync/tq/electricity/electricity.data.ts
index 377878a..f699f89 100644
--- a/src/views/iotsync/tq/electricity/electricity.data.ts
+++ b/src/views/iotsync/tq/electricity/electricity.data.ts
@@ -20,7 +20,7 @@ export const businessColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -64,7 +64,7 @@ export const selectedSourceColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -85,7 +85,7 @@ export const nusColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -99,7 +99,7 @@ export const nusColumns: BasicColumn[] = [
 
 export const nuFormSchema: FormSchema[] = [
   {
-    label: '区域标签',
+    label: '区域属性',
     field: 'areaFlag',
     component: 'JDictSelectTag',
     componentProps: {
@@ -142,7 +142,7 @@ export const selectedColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
diff --git a/src/views/iotsync/tq/water/water.data.ts b/src/views/iotsync/tq/water/water.data.ts
index 737e977..b7ca7de 100644
--- a/src/views/iotsync/tq/water/water.data.ts
+++ b/src/views/iotsync/tq/water/water.data.ts
@@ -20,7 +20,7 @@ export const businessColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -88,7 +88,7 @@ export const selectedSourceColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -133,7 +133,7 @@ export const nusColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -147,7 +147,7 @@ export const nusColumns: BasicColumn[] = [
 
 export const nuFormSchema: FormSchema[] = [
   {
-    label: '区域标签',
+    label: '区域属性',
     field: 'areaFlag',
     component: 'JDictSelectTag',
     componentProps: {
@@ -190,7 +190,7 @@ export const selectedColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
diff --git a/src/views/iotsync/yiweilian/humid.data.ts b/src/views/iotsync/yiweilian/humid.data.ts
index 02f8d39..786b0df 100644
--- a/src/views/iotsync/yiweilian/humid.data.ts
+++ b/src/views/iotsync/yiweilian/humid.data.ts
@@ -26,7 +26,7 @@ export const businessColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -82,7 +82,7 @@ export const selectedSourceColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -103,7 +103,7 @@ export const nusColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
@@ -117,7 +117,7 @@ export const nusColumns: BasicColumn[] = [
 
 export const nuFormSchema: FormSchema[] = [
   {
-    label: '区域标签',
+    label: '区域属性',
     field: 'areaFlag',
     component: 'JDictSelectTag',
     componentProps: {
@@ -166,7 +166,7 @@ export const selectedColumns: BasicColumn[] = [
     resizable: true,
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText',
     resizable: true,
diff --git a/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts b/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts
index 68e30a2..73c7a64 100644
--- a/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts
+++ b/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts
@@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'nuId'
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText'
   },
@@ -40,7 +40,7 @@ export const columnsSync: BasicColumn[] = [
     dataIndex: 'nuId'
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText'
   },
@@ -64,7 +64,7 @@ export const selectedColumns: BasicColumn[] = [
     dataIndex: 'nuId'
   },
   {
-    title: '区域标签',
+    title: '区域属性',
     align: "center",
     dataIndex: 'areaFlag_dictText'
   },
@@ -84,6 +84,6 @@ export const selectedColumns: BasicColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   nuName: {title: '区域名称',order: 0,view: 'text', type: 'string',},
-  areaFlag: {title: '区域标签',order: 1,view: 'list', type: 'string',dictCode: 'nu_type',},
+  areaFlag: {title: '区域属性',order: 1,view: 'list', type: 'string',dictCode: 'nu_type',},
   status: {title: '使用状态',order: 2,view: 'list', type: 'string',dictCode: 'nu_status',},
 };
diff --git a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue
index 25dc941..45dc8e6 100644
--- a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue
+++ b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue
@@ -18,8 +18,8 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
-                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域标签ID"
+              <a-form-item label="区域属性" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
+                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域属性ID"
                   allow-clear />
               </a-form-item>
             </a-col>