From 32dec5cf8ff18775149ade61eadf6e51beb0f29e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 16 Jan 2024 18:31:44 +0800
Subject: [PATCH] fix

---
 src/views/Home.vue        | 9 ++++-----
 src/views/Transaction.vue | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 33b6779..b61f5c8 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -56,11 +56,10 @@
                 <el-table-column label="实验要求"
                                  align="center">
                   <template slot-scope="scope">
-                    <quill :border="true"
-                           :readonly="true"
-                           v-model="scope.row.experimentalRequirements"
-                           :minHeight="150"
-                           :height="150" />
+                    <div class="ql-snow">
+                      <div class="ql-editor"
+                           v-html="scope.row.experimentalRequirements"></div>
+                    </div>
                   </template>
                 </el-table-column>
 
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index c4e7ba8..42702e4 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -335,12 +335,10 @@
                             <el-input class="number-input"
                                       v-model.trim="scope.row.value3"
                                       :disabled="isView || scope.row.isDisabled"
-                                      type="number"
                                       size="mini"></el-input>
                             <el-input class="number-input"
                                       v-model.trim="scope.row.value4"
                                       :disabled="isView || scope.row.isDisabled"
-                                      type="number"
                                       size="mini"></el-input>
                             <el-select :disabled="isView || scope.row.isDisabled"
                                        v-model="scope.row.value5"
@@ -1220,7 +1218,7 @@ export default {
           } else if ((!row.value3 || !row.value4) && !this.isSt) {
             this.$message.warning(`请输入交易指标区间`);
             return;
-          } else if (row.value3 && row.value4 && +row.value3 > +row.value4) {
+          } else if (row.value3 && row.value4 && !isNaN(row.value3) && !isNaN(row.value4) && +row.value3 > +row.value4) {
             this.$message.warning(`第一个指标必须小于第二个指标`);
             return;
           }