From f325e58c5a08910e081698e702a6baf3ce00db54 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 16:58:14 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue b/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue
index 1591de7..8c2afdd 100644
--- a/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue
@@ -14,7 +14,7 @@
<div class="main-card">
<el-row class="cardTop">
<el-col :span="12" class="mainCardBtn">
- <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true" v-throttle>新建</el-button>
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true" v-throttle>新增</el-button>
<el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>
<el-button type="success" size="default" plain>设置分类</el-button>
</el-col>
@@ -299,7 +299,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2