bugfix: 8620

src/components/knowledgeExtra/AddAssess/index.vue

@@ -236,7 +236,7 @@ it .ql-editor,
                     v-model.number="table.factor"
                     @input="
                       value = table.factor + '';
-                      if (value.length > 8) value = value.slice(0, 8);
+                      if (value.length > 6) value = value.slice(0, 6);
                       table.factor = parseFloat(value);
                     "
                   />
@@ -256,7 +256,7 @@ it .ql-editor,
                     v-model.number="table.constant"
                     @input="
                       value = table.constant + '';
-                      if (value.length > 8) value = value.slice(0, 8);
+                      if (value.length > 6) value = value.slice(0, 6);
                       table.constant = parseFloat(value);
                     "
                   />

src/components/knowledgeExtra/AddAssess/scale-table.vue

@@ -288,7 +288,7 @@
                       'two_factor'
                     );
                     value = scope.row.two_factor + '';
-                    if (value.length > 8) value = value.slice(0, 8);
+                    if (value.length > 6) value = value.slice(0, 6);
                     scope.row.two_factor = parseFloat(value);
                   "
                 ></el-input>
@@ -322,7 +322,7 @@
                       'two_constant'
                     );
                     value = scope.row.two_constant + '';
-                    if (value.length > 8) value = value.slice(0, 8);
+                    if (value.length > 6) value = value.slice(0, 6);
                     scope.row.two_constant = parseFloat(value);
                   "
                 ></el-input>

src/components/knowledgeExtra/AddDevKnow.vue

@@ -110,19 +110,6 @@
               />
             </div>
           </div>
-          <div
-            class="tabs_msg"
-            v-if="tabErrMsg && staticTabShow && AssesTabSHow && AssesComSHow"
-          >
-            <div>
-              <img src="@/images/msg_close.png" alt="" />
-            </div>
-            <span
-              >{{
-                tabErrMsg
-              }}标签内有未填写项目，请填写完整或者删除该标签！</span
-            >
-          </div>
         </div>
 
         <p class="line"></p>
@@ -262,7 +249,6 @@ export default {
   },
   data() {
     return {
-      tabErrMsg: null,
       staticTabShow: true,
       AssesTabSHow: true,
       staticComShow: true,
@@ -526,7 +512,6 @@ export default {
         .then(() => {
           this.staticTabShow = false;
           this.tabActiveChange("two");
-          this.tabErrMsg = null;
         })
         .catch(() => {});
     },
@@ -542,7 +527,6 @@ export default {
           this.AssesTabSHow = false;
           this.AssesComSHow = false;
           this.tabActiveChange("one");
-          this.tabErrMsg = null;
         })
         .catch(() => {});
     },
@@ -551,7 +535,6 @@ export default {
       if (type == "two") {
         this.$refs.assessRef.resizeTable();
       }
-      this.tabErrMsg = null;
     },
     handleClear() {
       this.form.selectedTermName = "";
@@ -569,7 +552,6 @@ export default {
       this.isShowTip = false;
     },
     changeWord(newVal) {
-      this.tabErrMsg = null;
       if (newVal.typeName == "量表") {
         this.AssesComSHow = true;
       } else {
@@ -801,12 +783,12 @@ export default {
             all.push(
               new Promise((resolve, reject) => {
                 it = this.$refs.subForm[i];
-                viewHeight += it.$el.offsetHeight;
+                // viewHeight += it.$el.getBoundingClientRect().top;
                 it.$refs.form.validate((valid, object) => {
                   if (!valid) {
                     reject("f", object);
                     goOn = false;
-                    viewHeightArr.push(viewHeight);
+                    viewHeightArr.push(it.$el);
                   } else {
                     resolve(true);
                   }
@@ -842,10 +824,18 @@ export default {
             goOn = false;
           }
           this.tabActive = "one";
-          this.tabErrMsg = `"静态知识"和"评估内容"`;
+          this.$message({
+            showClose: true,
+            message: `"静态信息"和"评估内容"标签内有未填写项目，请填写完整或者删除该标签！`,
+            type: "warning"
+          });
         } else if (cErrIndex != -1 && fErrIndex == -1) {
           this.tabActive = "two";
-          this.tabErrMsg = `"评估内容"`;
+          this.$message({
+            showClose: true,
+            message: "评估内容",
+            type: "warning"
+          });
           let cErrArr = resArr.filter((item) => item.type == "c");
           if (cErrArr) {
             cErrArr = Object.keys(cErrArr[0].object);
@@ -869,30 +859,40 @@ export default {
           });
         } else if (cErrIndex == -1 && fErrIndex != -1) {
           this.tabActive = "one";
-          this.tabErrMsg = `"静态知识"`;
+          this.$message({
+            showClose: true,
+            message: `"静态信息"标签内有未填写项目，请填写完整或者删除该标签！`,
+            type: "warning"
+          });
         } else {
           assessRule = true;
         }
       });
       console.log(this.staticTabShow, goOn);
       if (this.staticTabShow && !goOn) {
-        var div = this.$refs["elscrollbar"].$refs["wrap"];
-        if (outIsVia) {
-          // 外层校验通过,跳转至下层校验具体位置
-          console.log("div.scrollTop", div.scrollTop);
-          this.$nextTick(() => {
-            if (viewHeightArr[0] >= 0) {
-              div.scrollTop += viewHeightArr[0] - 120;
-            } else {
-              div.scrollTop -= Math.abs(viewHeightArr[0]) + 120;
-            }
-          });
-        } else {
-          // 外层校验没通过,页面滚动到顶部
-          this.$nextTick(() => {
-            div.scrollTop = 0;
-          });
-        }
+        setTimeout(() => {
+          var div = this.$refs["elscrollbar"].$refs["wrap"];
+          if (outIsVia) {
+            // 外层校验通过,跳转至下层校验具体位置
+            console.log("div.scrollTop111", div.scrollTop);
+            console.log("viewHeightArr[0]", viewHeightArr[0]);
+            let sTop = viewHeightArr[0].getBoundingClientRect().top;
+            console.log("sTop", sTop);
+            this.$nextTick(() => {
+              if (sTop >= 0) {
+                div.scrollTop += sTop - 120;
+              } else {
+                div.scrollTop -= Math.abs(sTop) + 120;
+              }
+              console.log("div.scrollTop--end", div.scrollTop);
+            });
+          } else {
+            // 外层校验没通过,页面滚动到顶部
+            this.$nextTick(() => {
+              div.scrollTop = 0;
+            });
+          }
+        }, 200);
 
         return;
       }
@@ -1245,33 +1245,6 @@ export default {
 .tabs_box {
   display: flex;
   align-items: center;
-  .tabs_msg {
-    margin-left: 180px;
-    width: 502px;
-    height: 30px;
-    background: #fff1f0;
-    border-radius: 4px;
-    border: 1px solid #fde2e2;
-    display: flex;
-    align-items: center;
-    padding-left: 20px;
-    margin-top: -10px;
-    div {
-      width: 15px;
-      height: 15px;
-      margin-top: -3px;
-      margin-right: 10px;
-      img {
-        width: 100%;
-        height: 100%;
-      }
-    }
-    span {
-      color: #f56c6d;
-      line-height: 21px;
-      font-size: 14px;
-    }
-  }
 }
 .tabs {
   display: flex;