修改答卷提示信息

src/views/dw-survey/dw-collect/DwAnswer.vue

@@ -11,7 +11,7 @@ export default {
   methods: {
     loadAnswer () {
       const sid = this.$route.params.sid
-      window.location.href=process.env.DW_WEB_URL+'/static/diaowen/answer-p.html?sid='+sid
+      window.location.href='/static/diaowen/answer-p.html?sid='+sid
     }
   }
 }

static/diaowen/answer-m.html

@@ -15,6 +15,7 @@
   <script type="text/javascript" src="js/plugs/laydate/laydate.js"></script>
   <script type="text/javascript" src="js/common/ans-common.js"></script>
   <script type="text/javascript" src="js/common/common.js"></script>
+  <script type="text/javascript" src="js/dw/an/an-pcm-common.js"></script>
   <script type="text/javascript" src="js/dw/an/ans-m-data.js"></script>
   <script type="text/javascript" src="js/dw/an/ans-m.js"></script>
 <script type="text/javascript">

static/diaowen/answer-p.html

@@ -15,6 +15,7 @@
   <script type="text/javascript" src="js/plugs/laydate/laydate.js"></script>
   <script type="text/javascript" src="js/common/ans-common.js"></script>
   <script type="text/javascript" src="js/common/common.js"></script>
+  <script type="text/javascript" src="js/dw/an/an-pcm-common.js"></script>
   <script type="text/javascript" src="js/dw/an/ans-p-data.js"></script>
   <script type="text/javascript" src="js/dw/an/ans-p.js"></script>
   <script type="text/javascript">

static/diaowen/js/dw/an/an-pcm-common.js

@@ -0,0 +1,39 @@
+function checkAnswerSurvey(sid){
+  var ctx=$("#ctx").val();
+  var ruleCode = $("#ruleCode").val();
+  var wxCode = $("#wxCode").val();
+  var url=ctx+"/response/check-answer-survey.do";
+  var data="surveyId="+$("#id").val()+"&ruleCode="+ruleCode+"&wxCode="+wxCode;
+  $.ajax({
+    url:url,
+    data:data,
+    type:"post",
+    success:function(httpResult){
+      console.debug(httpResult);
+      if(httpResult.resultCode==200){
+        var data = httpResult.data;
+        var answerCheck=data.answerCheck;
+        var answerCheckCode=data.answerCheckCode;
+        var imgCheckCode=data.imgCheckCode;
+        if(!answerCheck){
+          if(answerCheckCode===203){
+            //跳转到指定地址
+            window.location.href=data.redirectUrl;
+          }else{
+            //跳转到详情页
+            if(ruleCode!=undefined && ruleCode!=""){
+              // window.location.href="/#/diaowen-msg-code/"+sid+"/"+answerCheckCode+"/"+ruleCode;
+              window.location.href="/static/diaowen/message.html?sid="+sid+"&respType="+answerCheckCode+"&pwdCode="+ruleCode;
+            }else{
+              // window.location.href="/#/diaowen-msg/"+sid+"/"+answerCheckCode;
+              window.location.href="/static/diaowen/message.html?sid="+sid+"&respType="+answerCheckCode;
+            }
+          }
+        }
+        if(imgCheckCode){
+          $("#jcaptchaImgBody").show();
+        }
+      }
+    }
+  });
+}

static/diaowen/js/dw/an/ans-m.js

@@ -32,9 +32,6 @@ $(document).ready(function(){
     if(!$("#preview_head_top")[0]){
       checkAnswerSurvey(sid);
     }
-    // surveyLog();
-    // bindQuDateEvent();
-    // loadCommon();
   });
 });
 

static/diaowen/js/dw/an/ans-p.js

@@ -31,9 +31,6 @@ $(document).ready(function(){
       if(!$("#preview_head_top")[0]){
         checkAnswerSurvey(sid);
       }
-      // surveyLog();
-      // bindQuDateEvent();
-      // loadCommon();
     });
   });
 

static/diaowen/js/dw/an/msg.js

@@ -4,9 +4,7 @@ $(document).ready(function(){
     var answerId = $.getUrlParam("answerId");
     var pwdCode = $.getUrlParam("pwdCode");
     resultStatus2Msg(respType,sid,pwdCode);
-    answerAfterData(respType,answerId,function(){
-      querySurveyData(respType,sid);
-    });
+    querySurveyData(respType,sid);
 });
 
 function resultStatus2Msg(resptype,sid,ruleCode) {
@@ -24,8 +22,7 @@ function resultStatus2Msg(resptype,sid,ruleCode) {
   }else if(resptype==='4'){
     tempMsg.resultNote = '验证码不正确，操作未成功!';
     tempMsg.resultColor = "#e70f0f";
-    // setReqUrl({reqUrl:'/#/diaowen/'+sid,urlText:'重新答卷'})
-    setReqUrl({reqUrl:'/static/diaowen/diaowen.html?sid='+sid,urlText:'重新答卷'})
+    setReqUrl({reqUrl:'/static/diaowen/answer-p.html?sid='+sid,urlText:'重新答卷'})
   }else if(resptype==='5'){
     tempMsg.resultNote = '发生未知异常，操作未成功!';
     tempMsg.resultColor = "#e70f0f";
@@ -83,24 +80,7 @@ function querySurveyData(respType,sid){
     querySurvey(sid,function(httpResult){
       if(httpResult!=null && httpResult.hasOwnProperty('resultCode') && httpResult.resultCode === 200 ){
         var resultData = httpResult.data;
-        // console.debug(resultData);
         $("#surveyName").html(resultData.surveyName);
-        if(resultData.hasOwnProperty("surveyDetail")) {
-          var surveyDetail = resultData.surveyDetail;
-          var reqUrlType = surveyDetail.reqUrlType;
-
-          if(respType==='6'){
-            clearSurveyStorage(resultData.id);
-          }
-
-          if(reqUrlType===1) {
-            window.location.href=surveyDetail.reqUrl;
-          }
-          if(reqUrlType===2 && respType==='6'){
-            // setReqUrl(surveyDetail.reqUrl);
-            setReqUrl({reqUrl:surveyDetail.reqUrl,urlText:surveyDetail.urlText})
-          }
-        }
       }
     });
   }
@@ -127,51 +107,3 @@ function setReqUrl(reqObj){
   reqUrlDiv.empty();
   reqUrlDiv.append("<a href=\""+reqObj.reqUrl+"\">"+reqObj.urlText+"</a>");
 }
-
-// AnserAfter
-function answerAfterData(respType,answerId,callback){
-  if (respType==='6' && answerId != null) {
-    // console.debug(answerId);
-    answerAfter(answerId,function(httpResult){
-      // console.debug(httpResult);
-      if(httpResult!=null && httpResult.hasOwnProperty('resultCode') && httpResult.resultCode === 200 ){
-        var resultData = httpResult.data;
-        if(resultData!=null) {
-          var surveyId = resultData.surveyId;
-          var totalScoreStatus = resultData.totalScoreStatus;
-          var totalScore = resultData.totalScore;
-          // /static/diaowen/answer-data.html?id=fd258239-4cc1-433b-abb1-aabd2f7198cc&surveyId=1a020ff9-0060-4cd3-aac7-7cbbb4a5de19&tag=1
-          var sssw = "<a href=\"/static/diaowen/answer-data.html?id="+answerId+"&surveyId="+surveyId+"&tag=1\" >总得分："+totalScore+"分，点击看详情</a>";
-          if(totalScoreStatus!=null && totalScoreStatus===1) setTotalScoreText(sssw);
-        }
-        if(callback!=null){
-          callback();
-        }
-      }
-    });
-  }else{
-    if(callback!=null){
-      callback();
-    }
-  }
-}
-
-function answerAfter(answerId,callback){
-  var url = '/api/dwsurvey/anon/response/answer-after.do';
-  var data = "answerId="+answerId;
-  $.ajax({
-    url:url,
-    data:data,
-    // type:"json",
-    success:function(httpResult){
-      console.debug(httpResult);
-      if(callback!=null){
-        callback(httpResult);
-      }
-    }
-  });
-}
-
-function setTotalScoreText(sssw){
-  $("#totalScore").html(sssw);
-}

static/diaowen/message.html

@@ -1,12 +1,11 @@
-<!DOCTYPE html>
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <title>答卷提交结果</title>
   <script type="text/javascript" src="js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js"></script>
   <script type="text/javascript" src="js/common/common.js" ></script>
-  <script type="text/javascript" src="js/dw/an/answer.js" ></script>
   <script type="text/javascript" src="js/dw/an/msg.js" ></script>
 </head>
 <body style="padding: 0px;margin: 0px;">