From cefcb88c6cd0690052e503d5f1c943cb7f8a03cb Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 30 十一月 2022 09:18:32 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue b/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue
index e7a283f..1e9ede6 100644
--- a/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue
@@ -5,23 +5,12 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="设备区域名称" prop="region">
- <el-input
- class="input-length"
- v-model.trim="facilityAreaForm.region"
- placeholder="请输入设备区域名称"
- clearable
- ></el-input>
+ <el-input class="input-length" v-model.trim="facilityAreaForm.region" placeholder="请输入设备区域名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="设备区域类型" prop="regionTypeId">
- <el-select
- class="input-length"
- v-model="facilityAreaForm.regionTypeId"
- placeholder="请选择设备区域类型"
- clearable
- filterable
- >
+ <el-select class="input-length" v-model="facilityAreaForm.regionTypeId" placeholder="请选择设备区域类型" clearable filterable>
<el-option v-for="item in facilityAreaTypeList" :key="item.id" :label="item.regionType" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -31,7 +20,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowFacilityAreaDialog = !isShowFacilityAreaDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitFacilityArea" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitFacilityArea" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -76,11 +65,7 @@
});
//打开模态框
- const openFacilityAreaDialog = (
- type: string,
- value: { id: number; region: string; regionTypeId: number },
- facilityAreaTypeList: Array<facilityAreaTypeState>
- ) => {
+ const openFacilityAreaDialog = (type: string, value: { id: number; region: string; regionTypeId: number }, facilityAreaTypeList: Array<facilityAreaTypeState>) => {
state.isShowFacilityAreaDialog = true;
state.facilityAreaTypeList = facilityAreaTypeList.filter((item) => item.regionType !== '所有类型');
setTimeout(() => {
--
Gitblit v1.9.2