yangjun
/
hldy_yunwei_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

区域标签改名为区域属性

This commit is contained in:
yangjun 2026-01-05 14:50:27 +08:00
parent 8509a45daa
commit d13a8ac6f5
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/deviceSync/compoents/AddNuIotForm.vue
View File

@ -18,8 +18,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag"> <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="请选择区域标签" <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域属性"
allow-clear /> allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -72,8 +72,8 @@ const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false); const confirmLoading = ref<boolean>(false);
//表单验证 //表单验证
const validatorRules = reactive({ const validatorRules = reactive({
areaFlag : [{ required: true, message: '请选择区域标签!'},], areaFlag : [{ required: true, message: '请选择区域属性!'},],
iot : [{ required: true, message: '请选择摄像头!'},], // iot : [{ required: true, message: '请选择摄像头!'},],
}); });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
@ -168,11 +168,11 @@ async function submitForm() {
if (!model.id) { if (!model.id) {
model.status = "0"; model.status = "0";
} }
if(!model.iotSn){ // if(!model.iotSn){
createMessage.warning("请选择摄像头！"); // createMessage.warning("请选择摄像头！");
confirmLoading.value = false; // confirmLoading.value = false;
return; // return;
} // }
await addNuIot(model, isUpdate.value) await addNuIot(model, isUpdate.value)
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {

2
src/views/deviceSync/compoents/DevicesForm.vue
View File

@ -77,7 +77,7 @@ const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false); const confirmLoading = ref<boolean>(false);
//表单验证 //表单验证
const validatorRules = reactive({ const validatorRules = reactive({
areaFlag : [{ required: true, message: '请选择区域标签!'},], areaFlag : [{ required: true, message: '请选择区域属性!'},],
iot : [{ required: true, message: '请选择摄像头!'},], iot : [{ required: true, message: '请选择摄像头!'},],
}); });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

10
src/views/iotsync/tplink/camera/camera.data.ts
View File

@ -32,7 +32,7 @@ export const businessColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -100,7 +100,7 @@ export const selectedSourceColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -121,7 +121,7 @@ export const nusColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -135,7 +135,7 @@ export const nusColumns: BasicColumn[] = [
export const nuFormSchema: FormSchema[] = [ export const nuFormSchema: FormSchema[] = [
{ {
label: '区域标签', label: '区域属性',
field: 'areaFlag', field: 'areaFlag',
component: 'JDictSelectTag', component: 'JDictSelectTag',
componentProps: { componentProps: {
@ -190,7 +190,7 @@ export const selectedColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,

10
src/views/iotsync/tq/electricity/electricity.data.ts
View File

@ -20,7 +20,7 @@ export const businessColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -64,7 +64,7 @@ export const selectedSourceColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -85,7 +85,7 @@ export const nusColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -99,7 +99,7 @@ export const nusColumns: BasicColumn[] = [
export const nuFormSchema: FormSchema[] = [ export const nuFormSchema: FormSchema[] = [
{ {
label: '区域标签', label: '区域属性',
field: 'areaFlag', field: 'areaFlag',
component: 'JDictSelectTag', component: 'JDictSelectTag',
componentProps: { componentProps: {
@ -142,7 +142,7 @@ export const selectedColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,

10
src/views/iotsync/tq/water/water.data.ts
View File

@ -20,7 +20,7 @@ export const businessColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -88,7 +88,7 @@ export const selectedSourceColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -133,7 +133,7 @@ export const nusColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -147,7 +147,7 @@ export const nusColumns: BasicColumn[] = [
export const nuFormSchema: FormSchema[] = [ export const nuFormSchema: FormSchema[] = [
{ {
label: '区域标签', label: '区域属性',
field: 'areaFlag', field: 'areaFlag',
component: 'JDictSelectTag', component: 'JDictSelectTag',
componentProps: { componentProps: {
@ -190,7 +190,7 @@ export const selectedColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,

10
src/views/iotsync/yiweilian/humid.data.ts
View File

@ -26,7 +26,7 @@ export const businessColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -82,7 +82,7 @@ export const selectedSourceColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -103,7 +103,7 @@ export const nusColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,
@ -117,7 +117,7 @@ export const nusColumns: BasicColumn[] = [
export const nuFormSchema: FormSchema[] = [ export const nuFormSchema: FormSchema[] = [
{ {
label: '区域标签', label: '区域属性',
field: 'areaFlag', field: 'areaFlag',
component: 'JDictSelectTag', component: 'JDictSelectTag',
componentProps: { componentProps: {
@ -166,7 +166,7 @@ export const selectedColumns: BasicColumn[] = [
resizable: true, resizable: true,
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText', dataIndex: 'areaFlag_dictText',
resizable: true, resizable: true,

8
src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts
View File

@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'nuId' dataIndex: 'nuId'
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText' dataIndex: 'areaFlag_dictText'
}, },
@ -40,7 +40,7 @@ export const columnsSync: BasicColumn[] = [
dataIndex: 'nuId' dataIndex: 'nuId'
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText' dataIndex: 'areaFlag_dictText'
}, },
@ -64,7 +64,7 @@ export const selectedColumns: BasicColumn[] = [
dataIndex: 'nuId' dataIndex: 'nuId'
}, },
{ {
title: '区域标签', title: '区域属性',
align: "center", align: "center",
dataIndex: 'areaFlag_dictText' dataIndex: 'areaFlag_dictText'
}, },
@ -84,6 +84,6 @@ export const selectedColumns: BasicColumn[] = [
// 高级查询数据 // 高级查询数据
export const superQuerySchema = { export const superQuerySchema = {
nuName: {title: '区域名称',order: 0,view: 'text', type: 'string',}, 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',}, status: {title: '使用状态',order: 2,view: 'list', type: 'string',dictCode: 'nu_status',},
}; };

4
src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue
View File

@ -18,8 +18,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag"> <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" <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域属性ID"
allow-clear /> allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>