From 30afdb27c62971b9b1d2cb4d91abe1f54a2c44dc Mon Sep 17 00:00:00 2001 From: KeYuan Date: Mon, 10 Jul 2017 22:18:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=90=8E=E5=A1=AB=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/diaowen-collect/collect_1.jsp | 2 - .../content/diaowen-collect/collect_2.jsp | 2 - .../diaowen-collect/collect_mail-1.jsp | 205 ----------------- .../content/diaowen-collect/collect_mail.jsp | 210 ------------------ .../diaowen-collect/collect_website.jsp | 2 - .../diaowen-collect/collect_weixin.jsp | 3 - .../page/content/diaowen-collect/test.xml | 12 - .../content/diaowen-da/default-report.jsp | 6 +- .../page/content/diaowen-da/line-chart.jsp | 1 - .../page/content/diaowen-da/pie-chart.jsp | 2 - .../content/diaowen-da/survey-answer-data.jsp | 2 - .../diaowen-design/answer-survey-mobile.jsp | 8 +- .../content/diaowen-design/answer-survey.jsp | 2 +- 13 files changed, 9 insertions(+), 448 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail-1.jsp delete mode 100644 src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail.jsp delete mode 100644 src/main/webapp/WEB-INF/page/content/diaowen-collect/test.xml diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_1.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_1.jsp index fbaeb11..5be25fe 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_1.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_1.jsp @@ -40,8 +40,6 @@
diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_2.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_2.jsp index b8513e9..7ab28bc 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_2.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_2.jsp @@ -39,8 +39,6 @@
diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail-1.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail-1.jsp deleted file mode 100644 index 8222696..0000000 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail-1.jsp +++ /dev/null @@ -1,205 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - <%@include file="/common/taglibs.jsp" %> - - - - - - -数据收集 - - - - -
-
- -
-
- -
- -
-
-
-
-
-
- -
-
- ${survey.surveyName } -
- - - 开始收集 - - - 停止收集 - - - 重新打开收集 - - - -
-
-
- - 状态:${survey.surveyState eq 0 ? '设计中':survey.surveyState eq 1?'收集中':survey.surveyState eq 2?'收集完成':'' }     - 参加人数:${survey.answerNum } - - - 发布时间: - -
-
- -
- -
-
-
-
-
-
通过邮件邀请 - 邮件收件可以跟踪保证唯一性的问卷链接 -
- -
- 添加新任务 -
- - - - - -
- - - - - - - - - - - - - -
地址姓名状态
${en.email }${en.name } - - ${en.status eq 0 ? '待发送': en.status eq 1 ? '已提交' : en.status eq 2 ? '请求投递' : en.status eq 3 ? '成功发送' : en.status eq 4 ? '打开邮件':en.status eq 5 ? '点击答卷链接' : en.status eq 100 ? '发送失败': en.status eq 201 ? '取消订阅':en.status eq 202 ? '软退信':en.status eq 203 ? '垃圾举报':'无效邮件' } - -
-
- -
- -
- - < - - - 1 - - ... - - - - - ${en } - ${en } - - - - - ... - - ${page2.totalPage } - - - > - - -
-
- -
-
-
- - - -
-
- -
-
-
- - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail.jsp deleted file mode 100644 index b564bd3..0000000 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_mail.jsp +++ /dev/null @@ -1,210 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - <%@include file="/common/taglibs.jsp" %> - - - - - - -已发送邮件 数据收集 - - - - -
-
- -
-
- -
- -
-
-
-
-
-
- -
-
- ${survey.surveyName } -
- - - 开始收集 - - - 停止收集 - - - 重新打开收集 - - - -
-
-
- - 状态:${survey.surveyState eq 0 ? '设计中':survey.surveyState eq 1?'收集中':survey.surveyState eq 2?'收集完成':'' }     - 参加人数:${survey.answerNum } - - - 发布时间: - -
-
- -
- -
-
-
-
-
-
通过邮件邀请 - 邮件收件可以跟踪保证唯一性的问卷链接 -
- -
- 添加新任务 -
- - - - -
- - - - - - - - - - - - - - - - - - - -
主题发件人回复邮箱已发送/总数状态操作
${en.subject }${en.dwSendUserName }${en.dwSendUserMail }${en.sendNum}/${en.inboxNum } - ${en.audit eq 0 ? '待审核': en.audit eq 1 ? '已经通过':'未通过'} - <%-- -${en.status eq 0 ? '未发送':en.status eq 1 ? '正在发送':en.status eq 2 ? '发送完成' : en.status eq 3 ? '发送失败':'' } --%> - 详情
-
- -
- -
- - - < - - - 1 - - ... - - - - - ${en } - ${en } - - - - - ... - - ${page.totalPage } - - - > - - - -
-
- -
-
-
- - - -
-
- -
-
-
- - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_website.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_website.jsp index a657ca3..a721f22 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_website.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_website.jsp @@ -57,8 +57,6 @@
diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_weixin.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_weixin.jsp index e59a1cd..f8944a3 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_weixin.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_weixin.jsp @@ -38,8 +38,6 @@
@@ -56,7 +54,6 @@  答卷地址  社交分享  网站组件 - <%--  IFrame嵌入 --%>  微信收集 diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-collect/test.xml b/src/main/webapp/WEB-INF/page/content/diaowen-collect/test.xml deleted file mode 100644 index 89d27af..0000000 --- a/src/main/webapp/WEB-INF/page/content/diaowen-collect/test.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - success - - 1432122793496_30345_19521_7601.sc-10_10_127_57-inbound0$912114781@qq.com - - 1432122793496_30345_19521_7601.sc-10_10_127_57-inbound1$keyuan358@163.com - - 1432122793496_30345_19521_7601.sc-10_10_127_57-inbound2$408215585@qq.com - - - diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-da/default-report.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-da/default-report.jsp index 2b96b64..5a2397b 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-da/default-report.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-da/default-report.jsp @@ -794,7 +794,6 @@ function substring(json) {
-
@@ -968,7 +967,7 @@ function substring(json) { - +
 回答数:${en.anCount }条  查看回答数:${en.anCount }条  查看  
@@ -1426,9 +1425,6 @@ function substring(json) {
- - 题型开发中.. - diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-da/line-chart.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-da/line-chart.jsp index 1fb76c7..ee697eb 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-da/line-chart.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-da/line-chart.jsp @@ -232,7 +232,6 @@ function buildPieChart(resultJson,quId){
-
diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-da/pie-chart.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-da/pie-chart.jsp index 51d4229..31a04e0 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-da/pie-chart.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-da/pie-chart.jsp @@ -289,8 +289,6 @@ function substring(json) {
 表格 -  柱状图 -  饼状图
下载报告 分享
diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-da/survey-answer-data.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-da/survey-answer-data.jsp index b9ba562..32b8d67 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-da/survey-answer-data.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-da/survey-answer-data.jsp @@ -40,7 +40,6 @@ @@ -61,7 +60,6 @@
diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-mobile.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-mobile.jsp index 83f8310..86062c4 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-mobile.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-mobile.jsp @@ -172,6 +172,9 @@ $(document).ready(function(){
+ + +
@@ -214,6 +217,9 @@ $(document).ready(function(){
+ + +
@@ -819,7 +825,7 @@ $(document).ready(function(){
- <%--请委必保留以下内容,自觉保留优先技术支持。--%> + <%--请保留以下内容--%>

Powered by DWSurvey

diff --git a/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey.jsp b/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey.jsp index b4f1da3..4a55d5d 100755 --- a/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey.jsp +++ b/src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey.jsp @@ -1872,7 +1872,7 @@ label.error{