Merge branch 'bug_6888' into debug

src/views/datasheet_manage/components/conditionDia.vue

@@ -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,