1.解决冲突

2.修改系统监测页面样式

src/assets/styles/element-ui.scss

@@ -1397,17 +1397,10 @@
 .popup-result {
   border: 1px solid #0e5191 !important;
 }
-<<<<<<< HEAD
 .popup-result table span {
   border: 1px solid #0e5191 !important;
 }
 .popup-result .title {
-=======
-.popup-result table span {
-  border: 1px solid #0e5191 !important;
-}
-.popup-result .title {
->>>>>>> dev
   background: #405e7e !important;
 }
 .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
@@ -1415,13 +1408,6 @@
   border-right-color: transparent;
   border-left-color: transparent;
 }
-<<<<<<< HEAD
-.el-tabs--border-card > .el-tabs__header .el-tabs__item{
-  color: #c3cbd4;
-}
-.drawing-item:hover > .el-form-item, .drawing-row-item:hover > .el-form-item {
-  background: #b6b6b6 !important;
-=======
 .el-tabs--border-card > .el-tabs__header .el-tabs__item {
   color: #c3cbd4;
 }
@@ -1452,5 +1438,4 @@
   flex-direction: row;
   align-items: center;
   flex-wrap: nowrap;
->>>>>>> dev
 }

src/components/Crontab/index.vue

@@ -104,27 +104,9 @@
       <CrontabResult :ex="crontabValueString"></CrontabResult>
 
       <div class="pop_btn">
-<<<<<<< HEAD
-        <div class="primary-btn">
-          <el-button size="small" type="primary" @click="submitFill"
-            >确定</el-button
-          >
-        </div>
-        <div class="warning-btn">
-          <el-button size="small" type="warning" @click="clearCron"
-            >重置</el-button
-          >
-        </div>
-        <div class="cancel-btn">
-          <el-button size="small" type="cancel" @click="hidePopup"
-            >取消</el-button
-          >
-        </div>
-=======
         <div class="primary-btn"><el-button size="small" type="primary" @click="submitFill">确定</el-button></div>
         <div class="warning-btn"><el-button size="small" type="warning" @click="clearCron">重置</el-button></div>
         <div class="cancel-btn"><el-button size="small" type="cancel" @click="hidePopup">取消</el-button></div>
->>>>>>> dev
       </div>
     </div>
   </div>

src/views/monitor/job/index.vue

@@ -285,11 +285,7 @@
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
               <el-input
-<<<<<<< HEAD
-                style="width: 76%"
-=======
               style="width: 76%;"
->>>>>>> dev
                 v-model="form.cronExpression"
                 placeholder="请输入cron执行表达式"
               >

src/views/tool/build/index.vue

@@ -599,11 +599,7 @@ $lighterBlue: #409eff;
   height: calc(100vh - 42px);
   overflow: hidden;
   border-left: 1px solid #0e5191;
-<<<<<<< HEAD
-  border-left: 1px solid #0e5191;
-=======
   border-right: 1px solid #0e5191 ;
->>>>>>> dev
   box-sizing: border-box;
 }
 .center-board {
@@ -627,13 +623,8 @@ $lighterBlue: #409eff;
   height: 42px;
   text-align: right;
   padding: 0 15px;
-<<<<<<< HEAD
-  box-sizing: border-box;
-  border: 1px solid #0e5191;
-=======
   box-sizing: border-box;;
   border: 1px solid  #0e5191 ;
->>>>>>> dev
   border-top: none;
   border-left: none;
   .delete-btn {