Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionPlanDetail.vue

@@ -38,9 +38,8 @@
           if(value > this.form.endTime) {
             callback(new Error('输入的计划起始时间大于计划终了时间'));
           }
-        } else {
-          callback();
         }
+        callback();
       };
       var validateEnd = (rule, value, callback) => {
         if (value === '') {
@@ -49,9 +48,8 @@
           if(this.form.startTime > value) {
             callback(new Error('输入的计划终了时间小于计划起始时间'));
           }
-        } else {
-          callback();
         }
+        callback();
       };
       return {
         addUpdateShowButton:{},

src/views/inspection/inspectiontasks.vue

@@ -21,7 +21,7 @@
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
-                   icon="el-icon-delete"
+                   class="btn1"
                    plain
                    v-if="permission.inspectiontasks_delete"
                    @click="handleDelete">批量删除
@@ -30,24 +30,28 @@
       <template slot="menuRight">
         <el-button type="primary"
                    size="small"
+                   class="btn1"
                    plain
                    @click="handleDetailAdd"
                    v-if="permission.inspectiontasks_add">新增
         </el-button>
         <el-button type="primary"
                    size="small"
+                   class="btn1"
                    plain
                    @click="handleAction"
                    v-if="permission.inspectiontasks_action">启动
         </el-button>
         <el-button type="primary"
                    size="small"
+                   class="btn1"
                    plain
                    @click="handleStop"
                    v-if="permission.inspectiontasks_stop">停止
         </el-button>
         <el-button type="primary"
                    size="small"
+                   class="btn1"
                    plain
                    @click="handleExport()"
                    v-if="permission.inspectiontasks_export">导出
@@ -113,18 +117,18 @@
           if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) {
             callback(new Error('输入的任务执行开始时间大于任务执行结束时间'));
           }
-        } else {
-          callback();
         }
+          callback();
+
       };
       var validateEndTime = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入任务执行结束时间'));
         } else if(this.resultForm.executeStartDate.trim().replaceAll('/','') >= value.trim().replaceAll('/','')) {
           callback(new Error('输入的任务执行结束时间小于任务执行开始时间'));
-        } else {
-          callback();
         }
+          callback();
+
       };
       return {
         form: {},
@@ -147,6 +151,7 @@
           calcHeight: 210,
           searchShow: true,
           searchMenuSpan: 6,
+          align: 'center',
           tip: false,
           border: true,
           index: false,
@@ -656,7 +661,11 @@
 
 <style>
 .header-class{
-  background-color: #3366cc !important;
+  background-color: #243970 !important;
+  color: #FFFFFF !important;
+}
+.btn1.el-button{
+  background-color: #3060C4 !important;
   color: #FFFFFF !important;
 }
 </style>

src/views/inspection/inspectiontasksDetail.vue

@@ -59,18 +59,16 @@ export default {
         if(this.information_form.taskEndDate < value) {
           callback(new Error('输入的任务开始日期大于任务完成日期'));
         }
-      } else {
-        callback();
       }
+        callback();
     };
     var validateEndTime = (rule, value, callback) => {
-      if (value === '') {
+      if (!value) {
         callback(new Error('请输入任务完成日期'));
       } else if(this.information_form.taskStartDate > value) {
         callback(new Error('输入的任务开始日期大于任务完成日期'));
-      } else {
-        callback();
       }
+        callback();
     };
     return {
       information_class: '',
@@ -143,7 +141,7 @@ export default {
             labelWidth: 120,
             format: 'yyyy年MM月dd日',
             valueFormat: "yyyyMMdd",
-            rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
+            rules: [{required: true, validator: validateStartTime, trigger: 'change' }]
           },
           {
             label: "任务完成日期",
@@ -513,7 +511,7 @@ export default {
 </script>
 <style>
 .header-class{
-  background-color: #3366cc !important;
+  background-color: #243970 !important;
   color: #FFFFFF !important;
 }
 .information_class .el-input__inner,