1.中央空调-系统控制添加if条件给子组件

2.修改定时任务、表单构建样式
3.空调风柜系统温度input不可修改

src/assets/styles/element-ui.scss

@@ -1137,7 +1137,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding:10px !important;
+  padding: 10px !important;
 }
 
 /* 修改消息文本颜色 */
@@ -1362,13 +1362,14 @@
   border: 1px solid #ff4949;
   background: #ff4949;
 }
-.el-table__body tr.current-row > td.el-table__cell, .el-table__body tr.selection-row > td.el-table__cell{
+.el-table__body tr.current-row > td.el-table__cell,
+.el-table__body tr.selection-row > td.el-table__cell {
   background-color: rgba(0, 71, 125, 0.4) !important;
 }
-.el-loading-mask{
+.el-loading-mask {
   min-height: 800px;
 }
-.el-loading-spinner{
+.el-loading-spinner {
   min-height: 800px;
   display: flex;
   top: 0 !important;
@@ -1381,4 +1382,35 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
+}
+.el-tabs--border-card {
+  background: transparent;
+  border: 1px solid #0e5191 !important;
+}
+.el-tabs--border-card > .el-tabs__header {
+  background-color: transparent;
+  border-bottom: 1px solid #00386d;
+}
+.popup-main {
+  background: transparent !important;
+}
+.popup-result {
+  border: 1px solid #0e5191 !important;
+}
+.popup-result table span{
+  border: 1px solid #0e5191 !important;
+}
+.popup-result .title{
+  background: #405e7e !important;
+}
+.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+  color: #fff !important;
+  border-right-color: transparent;
+  border-left-color: transparent;
+}
+.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;
 }

src/components/Crontab/index.vue

@@ -104,9 +104,9 @@
       <CrontabResult :ex="crontabValueString"></CrontabResult>
 
       <div class="pop_btn">
-        <el-button size="small" type="primary" @click="submitFill">确定</el-button>
-        <el-button size="small" type="warning" @click="clearCron">重置</el-button>
-        <el-button size="small" @click="hidePopup">取消</el-button>
+        <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>
     </div>
   </div>

src/views/centerairC/sysControl/index.vue

@@ -43,7 +43,10 @@
             @operationControl="hadleOperationConrol"
           ></vavleheader>
         </div>
-        <div class="device-container">
+        <div
+          class="device-container"
+          v-if="coolingAndHeatingOutValve.length > 0"
+        >
           <vavleheader
             :valveList="coolingAndHeatingOutValve"
             @operationControl="hadleOperationConrol"

src/views/monitor/job/index.vue

@@ -69,7 +69,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn"  v-hasPermi="['monitor:job:add']">
+        <div class="primary-btn" v-hasPermi="['monitor:job:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -285,16 +285,17 @@
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
               <el-input
+              style="width: 76%;"
                 v-model="form.cronExpression"
                 placeholder="请输入cron执行表达式"
               >
-                <template slot="append">
-                  <el-button type="primary" @click="handleShowCron">
-                    生成表达式
-                    <i class="el-icon-time el-icon--right"></i>
-                  </el-button>
-                </template>
               </el-input>
+              <div class="primary-btn">
+                <el-button type="primary" @click="handleShowCron">
+                  生成表达式
+                  <i class="el-icon-time el-icon--right"></i>
+                </el-button>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="form.jobId !== undefined">
@@ -427,7 +428,7 @@ import Crontab from "@/components/Crontab";
 
 export default {
   components: { Crontab },
-  name: "Job",
+  // name: "Job",
   dicts: ["sys_job_group", "sys_job_status"],
   data() {
     return {

src/views/tool/build/index.vue

@@ -561,8 +561,8 @@ $lighterBlue: #409EFF;
 .center-scrollbar {
   height: calc(100vh - 42px);
   overflow: hidden;
-  border-left: 1px solid #f1e8e8;
-  border-right: 1px solid #f1e8e8;
+  border-left: 1px solid #0e5191;
+  border-right: 1px solid #0e5191 ;
   box-sizing: border-box;
 }
 .center-board {
@@ -587,7 +587,7 @@ $lighterBlue: #409EFF;
   text-align: right;
   padding: 0 15px;
   box-sizing: border-box;;
-  border: 1px solid #f1e8e8;
+  border: 1px solid  #0e5191 ;
   border-top: none;
   border-left: none;
   .delete-btn{
@@ -598,7 +598,7 @@ $lighterBlue: #409EFF;
   position: relative;
   height: 42px;
   background: #4b6e91;
-  border-bottom: 1px solid #f1e8e8;
+  border-bottom: 1px solid #0e5191;
   box-sizing: border-box;
 }
 .logo{