同步前端修改内容

wkeyuan · Dec 22, 2021 · 1151118 · 1151118
1 parent 3e49165
commit 1151118
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 27 deletions.
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=static/diaowen/images/favicon.ico type=image/x-icon><title>DWSurvey-调问开源问卷-社区版</title><link href=/static/css/app.6be5c5a3f95498116b81a50834f8325a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.f03de514a6e6e9148c3a.js></script><script type=text/javascript src=/static/js/app.a73c6a7b95256791b839.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=static/diaowen/images/favicon.ico type=image/x-icon><title>DWSurvey-调问开源问卷-社区版</title><link href=/static/css/app.87037a1e635196120cdebcd7ffa6aa29.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.f03de514a6e6e9148c3a.js></script><script type=text/javascript src=/static/js/app.ba05fbe971394f479030.js></script></body></html>
diff --git a/src/main/resources/static/static/css/app.6be5c5a3f95498116b81a50834f8325a.css b/src/main/resources/static/static/css/app.6be5c5a3f95498116b81a50834f8325a.css
diff --git a/src/main/resources/static/static/css/app.6be5c5a3f95498116b81a50834f8325a.css.map b/src/main/resources/static/static/css/app.6be5c5a3f95498116b81a50834f8325a.css.map
diff --git a/src/main/resources/static/static/css/app.87037a1e635196120cdebcd7ffa6aa29.css b/src/main/resources/static/static/css/app.87037a1e635196120cdebcd7ffa6aa29.css
diff --git a/src/main/resources/static/static/css/app.87037a1e635196120cdebcd7ffa6aa29.css.map b/src/main/resources/static/static/css/app.87037a1e635196120cdebcd7ffa6aa29.css.map
diff --git a/src/main/resources/static/static/diaowen/design.html b/src/main/resources/static/static/diaowen/design.html
@@ -300,7 +300,7 @@
                         <input type="hidden" name="randOrder" value="0">
                         <input type="hidden" name="cellCount" value="0">
 
-                        <input type="hidden" name="paramInt01" value="1">
+                        <input type="hidden" name="paramInt01" value="0">
                         <input type="hidden" name="paramInt02" value="5">
                         <div class="quLogicInputCase">
                           <input type="hidden" name="quLogicItemNum" value="0">

diff --git a/src/main/resources/static/static/diaowen/js/dw/an/ans-m.js b/src/main/resources/static/static/diaowen/js/dw/an/ans-m.js
@@ -1003,20 +1003,29 @@ function sww(){
 
         validateStatus=true;
         var quScoreOptionTrs=quItemBody.find(".mFillblankTableTr");
-        $.each(quScoreOptionTrs,function(){
-          var scoreNumInput=$(this).find(".dwMFillblankInput");
-          if(scoreNumInput.val()===""){
-            validateStatus=false;
-          }
-          if(validateStatus){
-            var curTextValue = scoreNumInput.val();
-            checkType = $(this).parents(".mFillblankTableTr").find(".checkType").val();
-            validateStatus = checkoutData(checkType, curTextValue);
+        var paramInt01 = 0;
+        if(quItemBody.find(".paramInt01")[0]){
+          paramInt01 = quItemBody.find(".paramInt01").val();
+        }
+        var anNum = 0;
+        $.each(quScoreOptionTrs,function() {
+          var scoreNumInput = $(this).find(".dwMFillblankInput");
+          if (scoreNumInput.val() != "") {
+            anNum++;
           }
-          if(!validateStatus){
-            return false;
+        })
+
+        if(validateStatus){
+          if(paramInt01!=0){
+            if(anNum<paramInt01){
+              validateStatus=false;
+            }
+          }else{
+            if(anNum<quScoreOptionTrs.size()){
+              validateStatus=false;
+            }
           }
-        });
+        }
 
       }else if(quType==="submitSurveyBtn" || quType==="PARAGRAPH" || quType==="PAGETAG"){
         return true;

diff --git a/src/main/resources/static/static/diaowen/js/dw/an/ans-p.js b/src/main/resources/static/static/diaowen/js/dw/an/ans-p.js
@@ -1006,14 +1006,29 @@ function validateCheck(quItemBody,isSubForm){
 
       validateStatus=true;
       var quScoreOptionTrs=quItemBody.find(".mFillblankTableTr");
-      $.each(quScoreOptionTrs,function(){
-        var scoreNumInput=$(this).find(".dwMFillblankInput");
-        if(scoreNumInput.val()===""){
-          validateStatus=false;
-          return false;
+      var paramInt01 = 0;
+      if(quItemBody.find(".paramInt01")[0]){
+        paramInt01 = quItemBody.find(".paramInt01").val();
+      }
+      var anNum = 0;
+      $.each(quScoreOptionTrs,function() {
+        var scoreNumInput = $(this).find(".dwMFillblankInput");
+        if (scoreNumInput.val() != "") {
+          anNum++;
         }
-      });
+      })
 
+      if(validateStatus){
+        if(paramInt01!=0){
+          if(anNum<paramInt01){
+            validateStatus=false;
+          }
+        }else{
+          if(anNum<quScoreOptionTrs.size()){
+            validateStatus=false;
+          }
+        }
+      }
     }else if(quType==="submitSurveyBtn" || quType==="PARAGRAPH" || quType==="PAGETAG"){
       return true;
     }

diff --git a/src/main/resources/static/static/js/app.a73c6a7b95256791b839.js b/src/main/resources/static/static/js/app.a73c6a7b95256791b839.js
diff --git a/src/main/resources/static/static/js/app.a73c6a7b95256791b839.js.map b/src/main/resources/static/static/js/app.a73c6a7b95256791b839.js.map
diff --git a/src/main/resources/static/static/js/app.ba05fbe971394f479030.js b/src/main/resources/static/static/js/app.ba05fbe971394f479030.js
diff --git a/src/main/resources/static/static/js/app.ba05fbe971394f479030.js.map b/src/main/resources/static/static/js/app.ba05fbe971394f479030.js.map
diff --git a/src/main/resources/static/static/js/manifest.2ae2e69a05c33dfc65f8.js.map b/src/main/resources/static/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=static/diaowen/images/favicon.ico type=image/x-icon><title>DWSurvey-调问开源问卷-社区版</title><link href=/static/css/app.6be5c5a3f95498116b81a50834f8325a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.f03de514a6e6e9148c3a.js></script><script type=text/javascript src=/static/js/app.a73c6a7b95256791b839.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=static/diaowen/images/favicon.ico type=image/x-icon><title>DWSurvey-调问开源问卷-社区版</title><link href=/static/css/app.87037a1e635196120cdebcd7ffa6aa29.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.f03de514a6e6e9148c3a.js></script><script type=text/javascript src=/static/js/app.ba05fbe971394f479030.js></script></body></html>