Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
X
x-training
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
EzijingWeb
x-training
Commits
596f11b7
提交
596f11b7
authored
7月 02, 2021
作者:
pengxiaohui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
版本优化,案例产品概况显示答案,特征支持单选,获取学校信息接口替换
上级
363a0c5d
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
37 行增加
和
17 行删除
+37
-17
common.js
src/api/common.js
+2
-1
index.vue
src/pages/caseSelection/index.vue
+1
-0
practice1.vue
src/pages/practice/components/practice1.vue
+1
-0
practice2.vue
src/pages/practice/components/practice2.vue
+33
-16
没有找到文件。
src/api/common.js
浏览文件 @
596f11b7
...
@@ -13,7 +13,8 @@ export function uploadFile(data) {
...
@@ -13,7 +13,8 @@ export function uploadFile(data) {
* 获取学生信息
* 获取学生信息
*/
*/
export
function
getUserSchoolInfo
()
{
export
function
getUserSchoolInfo
()
{
return
httpRequest
.
get
(
'/api/zy/user/getinfo'
)
// return httpRequest.get('/api/zy/user/getinfo')
return
httpRequest
.
get
(
'/api/zy/user/get-student-info'
)
}
}
/**
/**
...
...
src/pages/caseSelection/index.vue
浏览文件 @
596f11b7
...
@@ -126,5 +126,6 @@ app-container {
...
@@ -126,5 +126,6 @@ app-container {
background
:
url(@/assets/images/out.png)
;
background
:
url(@/assets/images/out.png)
;
background-size
:
100%
100%
;
background-size
:
100%
100%
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
</
style
>
</
style
>
src/pages/practice/components/practice1.vue
浏览文件 @
596f11b7
...
@@ -91,6 +91,7 @@ export default {
...
@@ -91,6 +91,7 @@ export default {
// console.log('casee', this.data)
// console.log('casee', this.data)
this
.
formData
.
production_detail
=
caseStorageData
.
production_detail
.
map
(
item
=>
{
this
.
formData
.
production_detail
=
caseStorageData
.
production_detail
.
map
(
item
=>
{
item
.
content
=
''
item
.
content
=
''
if
(
item
.
show_answer
)
item
.
content
=
item
.
show_answer
return
item
return
item
})
})
if
(
this
.
formData
.
production_detail
.
length
>
0
)
this
.
tabBtnText
.
push
(
'产品概括'
)
if
(
this
.
formData
.
production_detail
.
length
>
0
)
this
.
tabBtnText
.
push
(
'产品概括'
)
...
...
src/pages/practice/components/practice2.vue
浏览文件 @
596f11b7
...
@@ -31,9 +31,12 @@
...
@@ -31,9 +31,12 @@
<div
class=
"name"
>
{{
item
.
name
}}
</div>
<div
class=
"name"
>
{{
item
.
name
}}
</div>
<div
class=
"checkbox-box"
>
<div
class=
"checkbox-box"
>
<!--
<el-checkbox
class=
"mar-none"
border
:indeterminate=
"isIndeterminate"
v-model=
"item.answerCount"
@
change=
"handleCheckAllChange"
>
全选
</el-checkbox>
-->
<!--
<el-checkbox
class=
"mar-none"
border
:indeterminate=
"isIndeterminate"
v-model=
"item.answerCount"
@
change=
"handleCheckAllChange"
>
全选
</el-checkbox>
-->
<el-checkbox-group
v-model=
"item.answerCount"
@
change=
"handleCheckedCitiesChange"
>
<el-checkbox-group
v-
if=
"!item.is_single_choice"
v-
model=
"item.answerCount"
@
change=
"handleCheckedCitiesChange"
>
<el-checkbox
border
v-for=
"city in item.options"
:label=
"city.option"
:key=
"city.option_name"
>
{{
city
.
option_name
}}
</el-checkbox>
<el-checkbox
border
v-for=
"city in item.options"
:label=
"city.option"
:key=
"city.option_name"
>
{{
city
.
option_name
}}
</el-checkbox>
</el-checkbox-group>
</el-checkbox-group>
<el-radio-group
v-else
v-model=
"item.answerCount"
@
change=
"handleCheckedCitiesChange"
>
<el-radio
border
v-for=
"city in item.options"
:label=
"city.option"
:key=
"city.option_name"
>
{{
city
.
option_name
}}
</el-radio>
</el-radio-group>
</div>
</div>
</li>
</li>
<!--
</
template
>
-->
<!--
</
template
>
-->
...
@@ -82,9 +85,12 @@
...
@@ -82,9 +85,12 @@
<div
class=
"name"
>
{{
item
.
name
}}
</div>
<div
class=
"name"
>
{{
item
.
name
}}
</div>
<div
class=
"checkbox-box"
>
<div
class=
"checkbox-box"
>
<!--
<el-checkbox
class=
"mar-none"
border
:indeterminate=
"isIndeterminate"
v-model=
"item.answerCount"
@
change=
"handleCheckAllChange"
>
全选
</el-checkbox>
-->
<!--
<el-checkbox
class=
"mar-none"
border
:indeterminate=
"isIndeterminate"
v-model=
"item.answerCount"
@
change=
"handleCheckAllChange"
>
全选
</el-checkbox>
-->
<el-checkbox-group
disabled
v-model=
"item.answerCount"
@
change=
"handleCheckedCitiesChange"
>
<el-checkbox-group
v-if=
"!item.is_single_choice"
disabled
v-model=
"item.answerCount"
@
change=
"handleCheckedCitiesChange"
>
<el-checkbox
border
v-for=
"city in getOptData(item.options)"
:label=
"city.option"
:key=
"city.option_name"
>
{{
city
.
option_name
}}
</el-checkbox>
<el-checkbox
border
v-for=
"city in getOptData(item.options)"
:label=
"city.option"
:key=
"city.option_name"
>
{{
city
.
option_name
}}
</el-checkbox>
</el-checkbox-group>
</el-checkbox-group>
<el-radio-group
v-else
v-model=
"item.answerCount"
disabled
>
<el-radio
border
v-for=
"city in getOptData(item.options)"
:label=
"city.option"
:key=
"city.option_name"
>
{{
city
.
option_name
}}
</el-radio>
</el-radio-group>
</div>
</div>
</div>
</div>
</li>
</li>
...
@@ -118,6 +124,7 @@
...
@@ -118,6 +124,7 @@
</template>
</template>
<
script
>
<
script
>
import
*
as
api
from
'@/api/common.js'
import
*
as
api
from
'@/api/common.js'
import
_
from
'lodash'
const
cityOptions
=
[]
const
cityOptions
=
[]
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -155,7 +162,8 @@ export default {
...
@@ -155,7 +162,8 @@ export default {
dataArr
.
push
(
c
.
option
)
dataArr
.
push
(
c
.
option
)
})
})
// item.answerCount = dataArr
// item.answerCount = dataArr
item
.
answerCount
=
[]
if
(
item
.
is_single_choice
===
1
)
item
.
answerCount
=
''
else
item
.
answerCount
=
[]
item
.
options
.
map
(
chi
=>
{
item
.
options
.
map
(
chi
=>
{
chi
.
answer
=
0
chi
.
answer
=
0
return
chi
return
chi
...
@@ -211,7 +219,12 @@ export default {
...
@@ -211,7 +219,12 @@ export default {
nullFlag
=
true
nullFlag
=
true
}
}
return
item
.
options
.
map
(
allOpt
=>
{
return
item
.
options
.
map
(
allOpt
=>
{
const
itemFind
=
item
.
answerCount
.
find
(
c
=>
{
return
c
===
allOpt
.
option
})
let
itemFind
if
(
item
.
is_single_choice
===
1
)
{
itemFind
=
item
.
answerCount
===
allOpt
.
option
}
else
{
itemFind
=
item
.
answerCount
.
find
(
c
=>
{
return
c
===
allOpt
.
option
})
}
if
(
itemFind
)
{
if
(
itemFind
)
{
allOpt
.
answer
=
1
allOpt
.
answer
=
1
}
else
{
}
else
{
...
@@ -235,7 +248,11 @@ export default {
...
@@ -235,7 +248,11 @@ export default {
const
param
=
{}
const
param
=
{}
param
.
case_id
=
this
.
data
.
id
param
.
case_id
=
this
.
data
.
id
param
.
characteristic_id
=
this
.
data
.
characteristics
[
0
].
id
param
.
characteristic_id
=
this
.
data
.
characteristics
[
0
].
id
param
.
characteristic_detail
=
this
.
checkboxData
const
characDetail
=
_
.
cloneDeep
(
this
.
checkboxData
)
characDetail
.
forEach
(
item
=>
{
if
(
item
.
is_single_choice
===
1
)
item
.
answerCount
=
[
item
.
answerCount
]
})
param
.
characteristic_detail
=
characDetail
api
api
.
submitCharacteristics
(
param
)
.
submitCharacteristics
(
param
)
.
then
(
response
=>
{
.
then
(
response
=>
{
...
@@ -272,7 +289,7 @@ export default {
...
@@ -272,7 +289,7 @@ export default {
// background: #fff;
// background: #fff;
}
}
::v-deep
{
::v-deep
{
.el-checkbox
{
.el-checkbox
,
.el-radio
{
margin
:
0
0
0
20px
!
important
;
margin
:
0
0
0
20px
!
important
;
}
}
.mar-none
{
.mar-none
{
...
@@ -544,14 +561,14 @@ export default {
...
@@ -544,14 +561,14 @@ export default {
}
}
}
}
::v-deep
{
::v-deep
{
.el-checkbox.is-checked
{
.el-checkbox.is-checked
,
.el-radio.is-checked
{
background
:
#194162
;
background
:
#194162
;
opacity
:
0
.8
;
opacity
:
0
.8
;
}
}
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
.el-checkbox__input.is-checked
+
.el-checkbox__label
,
.el-radio__input.is-checked
+
.el-radio__label
{
color
:
#68829C
;
color
:
#68829C
;
}
}
.el-checkbox__input.is-checked
.el-checkbox__inner
{
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.el-radio__input.is-checked
.el-radio__inner
{
border-color
:
#68829C
;
border-color
:
#68829C
;
}
}
}
}
...
@@ -622,32 +639,32 @@ export default {
...
@@ -622,32 +639,32 @@ export default {
}
}
}
}
::v-deep
{
::v-deep
{
.el-checkbox.is-bordered
{
.el-checkbox.is-bordered
,
.el-radio.is-bordered
{
// background: rgba(61, 135, 162, 1);
// background: rgba(61, 135, 162, 1);
box-shadow
:inset
0px
0px
20px
0px
#3D87A2
;
box-shadow
:inset
0px
0px
20px
0px
#3D87A2
;
border
:
none
;
border
:
none
;
}
}
.el-checkbox.is-checked
{
.el-checkbox.is-checked
,
.el-radio.is-checked
{
box-shadow
:
none
;
box-shadow
:
none
;
background
:
#6BE7FF
;
background
:
#6BE7FF
;
}
}
.el-checkbox__input.is-checked
.el-checkbox__inner
{
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.el-radio__input.is-checked
.el-radio__inner
{
border-color
:
#fff
;
border-color
:
#fff
;
background
:
none
;
background
:
none
;
}
}
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
.el-checkbox__input.is-checked
+
.el-checkbox__label
,
.el-radio__input.is-checked
+
.el-radio__label
{
font-size
:
14px
;
font-size
:
14px
;
color
:
#FEFFFF
;
color
:
#FEFFFF
;
font-weight
:
normal
;
font-weight
:
normal
;
}
}
.el-checkbox__inner
{
.el-checkbox__inner
,
.el-radio__inner
{
border-color
:
#71CDF9
;;
border-color
:
#71CDF9
;;
background
:
none
;
background
:
none
;
}
}
.el-checkbox__label
{
.el-checkbox__label
,
.el-radio__label
{
color
:
#71CDF9
;
color
:
#71CDF9
;
}
}
.el-checkbox__input.is-focus
.el-checkbox__inner
{
.el-checkbox__input.is-focus
.el-checkbox__inner
,
.el-radio__input.is-focus
.el-radio__inner
{
border-color
:
#71CDF9
;
border-color
:
#71CDF9
;
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论