Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
2c18a9dc
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1439
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
“af15f6f0380a3975239d7d4a6c7c682f4058d309”上不存在“paddle/fluid/framework/ir/fc_gru_fuse_pass.cc”
提交
2c18a9dc
编写于
1月 04, 2019
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
默认保存矩阵多选题,矩阵评分题,矩阵填空题完成
上级
db11c2ba
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
1514 addition
and
28 deletion
+1514
-28
logs/skyeye.log
logs/skyeye.log
+1474
-0
skyeye-promote/src/main/java/com/skyeye/common/constans/QuType.java
...mote/src/main/java/com/skyeye/common/constans/QuType.java
+13
-4
skyeye-promote/src/main/java/com/skyeye/eve/controller/DwSurveyDirectoryController.java
...om/skyeye/eve/controller/DwSurveyDirectoryController.java
+1
-1
skyeye-promote/src/main/java/com/skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java
...skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java
+8
-2
skyeye-promote/src/main/resources/mapping/reqdwsurvey.xml
skyeye-promote/src/main/resources/mapping/reqdwsurvey.xml
+2
-1
skyeye-promote/src/main/resources/template/js/dwsurveydesign/dwsurveydesign.js
...in/resources/template/js/dwsurveydesign/dwsurveydesign.js
+3
-5
skyeye-promote/src/main/resources/template/tpl/dwsurveydesign/dwsurveydesignbean.tpl
...ources/template/tpl/dwsurveydesign/dwsurveydesignbean.tpl
+13
-15
未找到文件。
logs/skyeye.log
浏览文件 @
2c18a9dc
此差异已折叠。
点击以展开。
skyeye-promote/src/main/java/com/skyeye/common/constans/QuType.java
浏览文件 @
2c18a9dc
...
...
@@ -7,9 +7,6 @@ public enum QuType {
CHECKBOX
(
"多选题"
,
"checkbox"
,
2
),
FILLBLANK
(
"填空题"
,
"fillblank"
,
3
),
COMPRADIO
(
"复合单选"
,
"comp-radio"
,
17
),
COMPCHECKBOX
(
"复合多选"
,
"comp-checkbox"
,
18
),
MULTIFILLBLANK
(
"多项填空题"
,
"multi-fillblank"
,
4
),
// 组合填空题
ANSWER
(
"多行填空题"
,
"answer"
,
5
),
// 原问答题
BIGQU
(
"大题"
,
"bigqu"
,
6
),
...
...
@@ -26,7 +23,10 @@ public enum QuType {
UPLOADFILE
(
"文件上传题"
,
"sendfile"
,
15
),
PAGETAG
(
"分页标记"
,
"pagetag"
,
16
),
PARAGRAPH
(
"段落说明"
,
"paragraph"
,
17
),
CHENSCORE
(
"矩阵评分题"
,
"chen-score"
,
18
);
CHENSCORE
(
"矩阵评分题"
,
"chen-score"
,
18
),
COMPRADIO
(
"复合单选"
,
"comp-radio"
,
19
),
COMPCHECKBOX
(
"复合多选"
,
"comp-checkbox"
,
20
);
private
String
cnName
;
private
String
actionName
;
...
...
@@ -70,5 +70,14 @@ public enum QuType {
}
return
null
;
}
public
static
int
getIndex
(
String
actionName
){
for
(
QuType
q
:
QuType
.
values
()){
if
(
q
.
getActionName
().
replaceAll
(
"-"
,
""
).
equals
(
actionName
.
toLowerCase
())){
return
q
.
index
;
}
}
return
-
1
;
}
}
skyeye-promote/src/main/java/com/skyeye/eve/controller/DwSurveyDirectoryController.java
浏览文件 @
2c18a9dc
...
...
@@ -227,7 +227,7 @@ public class DwSurveyDirectoryController {
/**
*
* @Title: addQuChenMation
* @Description: 添加矩阵单选题
* @Description: 添加矩阵单选题
,矩阵多选题,矩阵评分题,矩阵填空题
* @param @param inputObject
* @param @param outputObject
* @param @throws Exception 参数
...
...
skyeye-promote/src/main/java/com/skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java
浏览文件 @
2c18a9dc
...
...
@@ -696,7 +696,7 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
/**
*
* @Title: addQuChenMation
* @Description: 添加矩阵单选题
* @Description: 添加矩阵单选题
,矩阵多选题,矩阵评分题,矩阵填空题
* @param @param inputObject
* @param @param outputObject
* @param @throws Exception 参数
...
...
@@ -706,7 +706,13 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
@Override
public
void
addQuChenMation
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
inputObject
.
getParams
();
map
.
put
(
"quType"
,
QuType
.
CHENRADIO
.
getIndex
());
int
quType
=
QuType
.
getIndex
(
map
.
get
(
"quType"
).
toString
());
if
(-
1
==
quType
){
outputObject
.
setreturnMessage
(
"参数值错误!"
);
return
;
}
else
{
map
.
put
(
"quType"
,
quType
);
}
String
quId
=
""
;
if
(
ToolUtil
.
isBlank
(
map
.
get
(
"quId"
).
toString
())){
quId
=
ToolUtil
.
getSurFaceId
();
...
...
skyeye-promote/src/main/resources/mapping/reqdwsurvey.xml
浏览文件 @
2c18a9dc
...
...
@@ -145,10 +145,11 @@
<property
id=
"cellCount"
name=
"cellCount"
ref=
"required,num"
var=
"按列显示时,列数"
/>
<property
id=
"logic"
name=
"logic"
ref=
""
var=
"逻辑设置json串"
/>
</url>
<url
id=
"dwsurveydirectory014"
path=
"/post/DwSurveyDirectoryController/addQuChenMation"
val=
"添加矩阵单选题"
allUse=
"1"
>
<url
id=
"dwsurveydirectory014"
path=
"/post/DwSurveyDirectoryController/addQuChenMation"
val=
"添加矩阵单选题
,矩阵多选题,矩阵评分题,矩阵填空题
"
allUse=
"1"
>
<property
id=
"quId"
name=
"quId"
ref=
""
var=
"问题id"
/>
<property
id=
"belongId"
name=
"belongId"
ref=
"required"
var=
"问卷id"
/>
<property
id=
"quTitle"
name=
"quTitle"
ref=
"required"
var=
"问题标题"
/>
<property
id=
"quType"
name=
"quType"
ref=
"required"
var=
"问题类型"
/>
<property
id=
"orderById"
name=
"orderById"
ref=
"required,num"
var=
"序号"
/>
<property
id=
"tag"
name=
"tag"
ref=
""
var=
"表示题目是问卷题还是题库中题"
/>
<property
id=
"isRequired"
name=
"isRequired"
ref=
"required,num"
var=
"是否必选"
/>
...
...
skyeye-promote/src/main/resources/template/js/dwsurveydesign/dwsurveydesign.js
浏览文件 @
2c18a9dc
...
...
@@ -2634,7 +2634,7 @@ layui.config({
/** 矩阵单选题 **/
/**
*
新
保存矩阵单选题
* 保存矩阵单选题
**/
function
saveChen
(
quItemBody
,
callback
)
{
var
saveTag
=
quItemBody
.
find
(
"
input[name='saveTag']
"
).
val
();
...
...
@@ -2643,6 +2643,7 @@ layui.config({
belongId
:
parent
.
rowId
,
orderById
:
quItemBody
.
find
(
"
input[name='orderById']
"
).
val
(),
tag
:
svTag
,
quType
:
quItemBody
.
find
(
"
input[name='quType']
"
).
val
(),
quId
:
quItemBody
.
find
(
"
input[name='quId']
"
).
val
(),
isRequired
:
quItemBody
.
find
(
"
input[name='isRequired']
"
).
val
(),
hv
:
quItemBody
.
find
(
"
input[name='hv']
"
).
val
(),
...
...
@@ -2650,6 +2651,7 @@ layui.config({
cellCount
:
quItemBody
.
find
(
"
input[name='cellCount']
"
).
val
(),
quTitle
:
''
,
};
console
.
log
(
data
);
var
quTitleSaveTag
=
quItemBody
.
find
(
"
input[name='quTitleSaveTag']
"
).
val
();
if
(
quTitleSaveTag
==
0
)
{
var
quTitle
=
quItemBody
.
find
(
"
.quCoTitleEdit
"
).
html
();
...
...
@@ -2833,10 +2835,8 @@ layui.config({
var
curEditTd
=
$
(
curEditObj
).
parents
(
"
td
"
);
var
curEditTdClass
=
curEditTd
.
attr
(
"
class
"
);
if
(
curEditTdClass
.
indexOf
(
"
Column
"
)
>=
0
)
{
// deleteChenRadioColumnOption();
deleteChenColumnOption
();
}
else
{
// deleteChenRadioRowOption();
deleteChenRowOption
();
}
}
...
...
@@ -2951,7 +2951,6 @@ layui.config({
});
}
else
{
$
.
each
(
quItemInputCases
,
function
()
{
// var optionText=$(this).prev().text();
var
optionText
=
$
(
this
).
parent
().
find
(
"
label.quCoOptionEdit
"
).
text
();
var
optionId
=
$
(
this
).
find
(
"
input[name='quItemId']
"
).
val
();
eachTag
=
true
;
...
...
@@ -2978,7 +2977,6 @@ layui.config({
var
logicQuSel
=
lastTr
.
find
(
"
.logicQuSel
"
);
var
quItemBodys
=
$
(
"
#dwSurveyQuContent .surveyQuItemBody
"
);
$
.
each
(
quItemBodys
,
function
()
{
//logicQuSels
if
(
$
(
this
).
find
(
"
.quCoTitleEdit
"
)[
0
])
{
var
quCoNumText
=
$
(
this
).
find
(
"
.quCoNum
"
).
text
();
var
quTitleText
=
$
(
this
).
find
(
"
.quCoTitleEdit
"
).
text
();
...
...
skyeye-promote/src/main/resources/template/tpl/dwsurveydesign/dwsurveydesignbean.tpl
浏览文件 @
2c18a9dc
...
...
@@ -875,20 +875,20 @@
<table
class=
"quCoChenTable"
>
<tr>
<td></td>
{
{
#
each
columns
}
}
{
{
#
each
questionChenColumn
}
}
<td
class=
"quChenColumnTd"
><label
class=
"editAble quCoOptionEdit"
>
{
{
optionName
}
}
</label>
<div
class=
"quItemInputCase"
><input
type=
"hidden"
name=
"quItemId"
value=
"{
{
id
}
}"
><input
type=
"hidden"
name=
"quItemSaveTag"
value=
"1"
></div>
</td>
{
{/
each
}
}
</tr>
{
{
#
each
rows1
}
}
{
{
#
each
questionChenRow
}
}
<tr
class=
"quChenRowTr"
>
<td
class=
"quChenRowTd"
><label
class=
"editAble quCoOptionEdit"
>
{
{
optionName
}
}
</label>
<div
class=
"quItemInputCase"
><input
type=
"hidden"
name=
"quItemId"
value=
"{
{
id
}
}"
><input
type=
"hidden"
name=
"quItemSaveTag"
value=
"1"
></div>
</td>
<c:forEach
items=
"{
{
columns
}
}"
var=
"columnItem"
>
{
{
#
each
questionChenColumn
}
}
<td><input
type=
"checkbox"
>
</td>
</c:forEach>
{
{/
each
}
}
</tr>
{
{/
each
}
}
</table>
...
...
@@ -989,20 +989,20 @@
<table
class=
"quCoChenTable"
>
<tr>
<td></td>
{
{
#
each
columns
}
}
{
{
#
each
questionChenColumn
}
}
<td
class=
"quChenColumnTd"
><label
class=
"editAble quCoOptionEdit"
>
{
{
optionName
}
}
</label>
<div
class=
"quItemInputCase"
><input
type=
"hidden"
name=
"quItemId"
value=
"{
{
id
}
}"
><input
type=
"hidden"
name=
"quItemSaveTag"
value=
"1"
></div>
</td>
{
{/
each
}
}
</tr>
{
{
#
each
rows1
}
}
{
{
#
each
questionChenRow
}
}
<tr
class=
"quChenRowTr"
>
<td
class=
"quChenRowTd"
><label
class=
"editAble quCoOptionEdit"
>
{
{
optionName
}
}
</label>
<div
class=
"quItemInputCase"
><input
type=
"hidden"
name=
"quItemId"
value=
"{
{
id
}
}"
><input
type=
"hidden"
name=
"quItemSaveTag"
value=
"1"
></div>
</td>
<c:forEach
items=
"{
{
columns
}
}"
var=
"columnItem"
>
{
{
#
each
questionChenColumn
}
}
<td><input
type=
"text"
>
</td>
</c:forEach>
{
{/
each
}
}
</tr>
{
{/
each
}
}
</table>
...
...
@@ -1098,22 +1098,20 @@
<table
class=
"quCoChenTable"
>
<tr>
<td></td>
{
{
#
each
columns
}
}
{
{
#
each
questionChenColumn
}
}
<td
class=
"quChenColumnTd"
><label
class=
"editAble quCoOptionEdit"
>
{
{
optionName
}
}
</label>
<div
class=
"quItemInputCase"
><input
type=
"hidden"
name=
"quItemId"
value=
"{
{
id
}
}"
><input
type=
"hidden"
name=
"quItemSaveTag"
value=
"1"
></div>
</td>
{
{/
each
}
}
</tr>
{
{
#
each
rows1
}
}
{
{
#
each
questionChenRow
}
}
<tr
class=
"quChenRowTr"
>
<td
class=
"quChenRowTd"
><label
class=
"editAble quCoOptionEdit"
>
{
{
optionName
}
}
</label>
<div
class=
"quItemInputCase"
><input
type=
"hidden"
name=
"quItemId"
value=
"{
{
id
}
}"
><input
type=
"hidden"
name=
"quItemSaveTag"
value=
"1"
></div>
</td>
<c:forEach
items=
"{
{
columns
}
}"
var=
"columnItem"
>
<td>
</td>
</c:forEach>
{
{
#
each
questionChenColumn
}
}
<td>
评分
</td>
{
{/
each
}
}
</tr>
{
{/
each
}
}
</table>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录