From 4a6b6d253451a14063df0659877f3d8c4ca921a5 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 31 三月 2022 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
index ede80cb..a2d0b13 100644
--- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
+++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
@@ -64,7 +64,7 @@
</template>
</el-table-column>
</el-table>
- <div style="text-align:right">
+ <div style="text-align:right;margin-top: 20px;">
<el-pagination
v-show="recordTotal>0"
@size-change="handleSizeChange"
@@ -80,6 +80,7 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
+ :close-on-click-modal="false"
width="40%"
>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
@@ -145,7 +146,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -227,7 +228,6 @@
this.$nextTick(() => {
this.$refs["form"].clearValidate();
});
-
if (type == "新增") {
this.title = "新增";
this.form = {
@@ -257,10 +257,6 @@
title: "成功",
});
} else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
} else {
@@ -275,10 +271,7 @@
title: "成功",
});
} else {
- his.$message({
- type: "warning",
- message: res.data.message,
- });
+
}
});
}
@@ -307,6 +300,10 @@
.catch(error =>{
});
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false;
+ },
find(){
this.elementManagementL();
},
--
Gitblit v1.9.2