diff --git a/src/api/operate-type/index.ts b/src/api/operate-type/index.ts index 76f7803..c7866d4 100644 --- a/src/api/operate-type/index.ts +++ b/src/api/operate-type/index.ts @@ -36,3 +36,10 @@ export function editOperateTypeFile(fileId?: number, operateName?: string) { method: "PUT", }); } +export function deleteOperateType(ids: any[]) { + return request({ + url: "/api/operate/v1/delete", + method: "POST", + data: ids, + }); +} diff --git a/src/views/resources/customer/components/AddCustom.vue b/src/views/resources/customer/components/AddCustom.vue index 4ca9202..d13bcc9 100644 --- a/src/views/resources/customer/components/AddCustom.vue +++ b/src/views/resources/customer/components/AddCustom.vue @@ -94,7 +94,7 @@ { }; const currentDevId = ref(0); const handleDevChange = (val: EquipmentTableVO) => { - currentDevId.value = val.devId; + if (val.devId != null) { + currentDevId.value = val.devId; + } }; async function loadDomainOptions() { await getDomainOptions().then(({ data }) => { diff --git a/src/views/resources/customer/index.vue b/src/views/resources/customer/index.vue index 149d0a6..03fa685 100644 --- a/src/views/resources/customer/index.vue +++ b/src/views/resources/customer/index.vue @@ -9,6 +9,7 @@ v-model="queryForm.selectName" placeholder="请选择" style="width: 240px" + @change="resetSelect" clearable > - + + + + (false); const tableData = ref([]); const total = ref(0); const router = useRouter(); -const options = ref([{ label: "客户名称", value: "customName" }]); +const domainOptions = ref([]); +const options = ref([ + { label: "客户名称", value: "customName" }, + { label: "系统管理域", value: "regionAreaId" }, +]); const buttonColSpan = computed(() => { return queryForm.value.selectName === undefined ? 18 : 12; }); @@ -222,6 +245,17 @@ const skipAddCustom = () => { path: `/resources/custom-add`, }); }; +const resetSelect = () => { + queryForm.value.selectValue = undefined; +}; +async function loadDomainOptions() { + await getDomainOptions().then(({ data }) => { + domainOptions.value = data; + }); +} +onMounted(() => { + loadDomainOptions(); +}); diff --git a/src/views/resources/equipment/index.vue b/src/views/resources/equipment/index.vue index 4f0b81f..4bca292 100644 --- a/src/views/resources/equipment/index.vue +++ b/src/views/resources/equipment/index.vue @@ -198,7 +198,10 @@ const queryForm = ref({ pageSize: 10, }); const loading = ref(false); -const options = ref([{ label: "AD编号", value: "devAdNo" }]); +const options = ref([ + { label: "AD编号", value: "devAdNo" }, + { label: "设备序列号", value: "devSno" }, +]); const buttonColSpan = computed(() => { return queryForm.value.selectName === undefined ? 18 : 12; }); diff --git a/src/views/resources/operate-type/index.vue b/src/views/resources/operate-type/index.vue index cf6d2fc..3599264 100644 --- a/src/views/resources/operate-type/index.vue +++ b/src/views/resources/operate-type/index.vue @@ -9,11 +9,34 @@ 新增 - 删除 + + +
- + + @@ -90,7 +114,11 @@