Merge branch 'bug_6890' into debug

src/views/datasheet_manage/components/conditionDia.vue

@@ -133,15 +133,15 @@ export default {
       return [
         {
           label: this.$t("MixSheet.lrf_drt"),
-          value: "rgb(254,67,101)-rgb(252,157,154)", //前为文本颜色，后为填充色
+          value: "rgb(235, 49, 34)-rgb(255, 235, 235)", //前为文本颜色，后为填充色
         },
         {
           label: this.$t("MixSheet.yf_dyt"),
-          value: "rgb(255,255,224)-rgb(255,215,0)",
+          value: "rgb(255, 175, 1)-rgb(255, 248, 216)",
         },
         {
           label: this.$t("MixSheet.gf_dgt"),
-          value: "rgb(0,100,0)-rgb(0,255,0)",
+          value: "rgb(10, 147, 47)-rgb(231, 255, 231)",
         },
         {
           label: this.$t("MixSheet.lrf"),
@@ -282,9 +282,9 @@ export default {
       ruleForm: {
         LeftValue: "",
         RightValue: "",
-        Remark: "rgb(254,67,101)-rgb(252,157,154)",
-        FontColor: "rgb(254,67,101)",
-        BackgroundColor: "rgb(252,157,154)",
+        Remark: "rgb(235, 49, 34)-rgb(255, 235, 235)",
+        FontColor: "rgb(235, 49, 34)",
+        BackgroundColor: "rgb(255, 235, 235)",
         Scope: "",
       },
     };
@@ -412,9 +412,9 @@ export default {
       this.ruleForm = {
         LeftValue: "",
         RightValue: "",
-        Remark: "rgb(254,67,101)-rgb(252,157,154)",
-        FontColor: "rgb(254,67,101)",
-        BackgroundColor: "rgb(252,157,154)",
+        Remark: "rgb(235, 49, 34)-rgb(255, 235, 235)",
+        FontColor: "rgb(235, 49, 34)",
+        BackgroundColor: "rgb(255, 235, 235)",
       };
     },
     handleClickOutside(event) {