From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 42075d7..a6a26d2 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1,10 +1,10 @@
<style scoped>
- .ins-order-plan-main .title {
+ .title {
height: 60px;
line-height: 60px;
}
- .ins-order-plan-main .search {
+ .search {
width: 100%;
margin-bottom: 10px;
height: 140px;
@@ -18,7 +18,7 @@
padding-left: 50px;
}
- .ins-order-plan-main .center {
+ .center {
width: calc(100% - 40px);
height: calc(100% - 60px - 80px - 40px);
background-color: #fff;
@@ -27,7 +27,7 @@
}
</style>
<style>
- .ins-order-plan-main .el-form-item__label{
+ .el-form-item__label{
color: #000;
}
.el-drawer__header::before {
@@ -45,7 +45,7 @@
}
</style>
<template>
- <div class="ins-order-plan-main">
+ <div>
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">鏍峰搧璇︽儏</el-col>
<el-col :span="12" style="text-align: right;">
--
Gitblit v1.9.3