Browse Source

Merge branch 'master' of http://8.136.199.33:3000/eta_gn_front/eta_front

shanbinzhang 1 month ago
parent
commit
fef6300570
1 changed files with 11 additions and 9 deletions
  1. 11 9
      src/views/datasheet_manage/components/conditionDia.vue

+ 11 - 9
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: "",
       },
     };
@@ -325,6 +325,8 @@ export default {
     saveHandle() {
       this.momentRef = "";
       this.$refs["ruleForm"].validate(async (valid) => {
+        if(this.chooseType == 3 && (+this.ruleForm.LeftValue >= +this.ruleForm.RightValue)) 
+          return this.$message.warning('介于规则不允许前值大于等于后值');
         if (valid) {
           const params = {
             ...this.ruleForm,
@@ -410,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) {