theluyuan/xzs-mysql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

admin question and static update

Browse Source
This commit is contained in:
czm 2020-12-29 14:27:24 +08:00
parent 9b30d479fd
commit 78435af514
16 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/vue/xzs-admin/src/layout/index.vue
View File

@ -9,7 +9,7 @@
</div>
<app-main />
<div class="foot-copyright">
<span>Copyright © 2020 TekSystem 版权所有</span>
<span>Copyright © 2020 TekSystems</span>
</div>
<back-to-top :visibility-height="100" :back-position="0" transition-name="fade" ref="backTop"/>
</div>

4
source/vue/xzs-admin/src/views/exam/question/components/Show.vue
View File

@ -30,7 +30,9 @@
<div class="q-title" v-html="question.title"/>
</div>
<div v-else-if="qType==5" v-loading="qLoading">
<div class="q-title" v-html="question.title"/>
题干：<div class="q-title" v-html="question.title"/>
答案：<div class="q-title" v-html="question.correct"/>
解析：<div class="q-title" v-html="question.analyze"/>
</div>
<div v-else>
</div>

3
source/vue/xzs-admin/src/views/exam/question/list.vue
View File

@ -32,7 +32,8 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="id" label="Id" width="90px"/>
<el-table-column prop="skill" label="skill" :formatter="subjectFormatter" width="120px"/>
<el-table-column prop="industryName" label="industry" width="120px"/>
<el-table-column prop="skillName" label="skill" width="120px"/>
<el-table-column prop="questionType" label="题型" :formatter="questionTypeFormatter" width="70px"/>
<el-table-column prop="shortTitle" label="题干" show-overflow-tooltip/>
<!-- <el-table-column prop="score" label="分数" width="60px"/> -->

19
source/xzs/src/main/java/com/mindskip/xzs/domain/Question.java
View File

@ -19,8 +19,12 @@ public class Question implements Serializable {
private Integer industryId;
private String industryName;
private Integer skillId;
private String skillName;
private Integer score;
private Integer gradeLevel;
@ -63,6 +67,21 @@ public class Question implements Serializable {
this.subjectId = subjectId;
}
public String getIndustryName() {
return industryName;
}
public void setIndustryName(String industryName) {
this.industryName = industryName;
}
public String getSkillName() {
return skillName;
}
public void setSkillName(String skillName) {
this.skillName = skillName;
}
public Integer getIndustryId() {
return industryId;

4
source/xzs/src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionResponseVM.java
View File

@ -18,8 +18,12 @@ public class QuestionResponseVM extends BaseVM {
private Integer industryId;
private String industryName;
private Integer skillId;
private String skillName;
private Integer createUser;
private String score;

24
source/xzs/src/main/resources/mapper/QuestionMapper.xml
View File

@ -6,7 +6,9 @@
<result column="question_type" jdbcType="INTEGER" property="questionType" />
<result column="subject_id" jdbcType="INTEGER" property="subjectId" />
<result column="industry_id" jdbcType="INTEGER" property="industryId" />
<result column="industry_name" jdbcType="VARCHAR" property="industryName" />
<result column="skill_id" jdbcType="INTEGER" property="skillId" />
<result column="skill_name" jdbcType="VARCHAR" property="skillName" />
<result column="score" jdbcType="INTEGER" property="score" />
<result column="grade_level" jdbcType="INTEGER" property="gradeLevel" />
<result column="difficult" jdbcType="INTEGER" property="difficult" />
@ -21,6 +23,10 @@
id, question_type, subject_id, industry_id, skill_id, score, grade_level, difficult, correct, info_text_content_id,
create_user, status, create_time, deleted
</sql>
<sql id="Page_Column_List">
q.id, q.question_type, q.subject_id, q.industry_id, i.name AS industry_name, q.skill_id, s.name AS skill_name, q.score, q.grade_level, q.difficult, q.correct, q.info_text_content_id,
q.create_user, q.status, q.create_time, q.deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@ -200,27 +206,27 @@
<select id="page" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM">
SELECT
<include refid="Base_Column_List"/>
FROM t_question
<include refid="Page_Column_List"/>
FROM t_question AS q LEFT JOIN t_industry AS i ON q.industry_id = i.id LEFT JOIN t_skill AS s ON s.id = q.skill_id
<where>
and deleted=0
and q.deleted=0
<if test="id != null ">
and id= #{id}
and q.id= #{id}
</if>
<if test="level != null ">
and grade_level= #{level}
and q.grade_level= #{level}
</if>
<if test="subjectId != null ">
and subject_id= #{subjectId}
and q.subject_id= #{subjectId}
</if>
<if test="questionType != null ">
and question_type= #{questionType}
and q.question_type= #{questionType}
</if>
<if test="industryId != null ">
and industry_id= #{industryId}
and q.industry_id= #{industryId}
</if>
<if test="skillId != null ">
and skill_id= #{skillId}
and q.skill_id= #{skillId}
</if>
</where>
</select>

2
source/xzs/src/main/resources/static/admin/index.html
View File

@ -13,4 +13,4 @@
hm.src = 'https://hm.baidu.com/hm.js?cd8218cd51f800ed2b73e5751cb3f4f9'
var s = document.getElementsByTagName('script')[0]
s.parentNode.insertBefore(hm, s)
})()</script><link href="static/css/chunk-066bbd34.c306629d.css" rel="prefetch"><link href="static/css/chunk-111f3671.d650a2aa.css" rel="prefetch"><link href="static/css/chunk-157f9069.c306629d.css" rel="prefetch"><link href="static/css/chunk-1c4df292.50289542.css" rel="prefetch"><link href="static/css/chunk-2baa78ac.c306629d.css" rel="prefetch"><link href="static/css/chunk-360c43ba.c306629d.css" rel="prefetch"><link href="static/css/chunk-3e96bd8c.c306629d.css" rel="prefetch"><link href="static/css/chunk-4010637e.c306629d.css" rel="prefetch"><link href="static/css/chunk-42236473.c306629d.css" rel="prefetch"><link href="static/css/chunk-5bc3d75d.c306629d.css" rel="prefetch"><link href="static/css/chunk-6092f506.89936c18.css" rel="prefetch"><link href="static/css/chunk-873a42e2.1951fa25.css" rel="prefetch"><link href="static/css/chunk-a85d3c1e.c8588555.css" rel="prefetch"><link href="static/css/chunk-a9d03770.c306629d.css" rel="prefetch"><link href="static/css/chunk-bab2e2c4.c306629d.css" rel="prefetch"><link href="static/js/chunk-066bbd34.140534af.js" rel="prefetch"><link href="static/js/chunk-111f3671.2e5e24f5.js" rel="prefetch"><link href="static/js/chunk-157f9069.c7c81c3e.js" rel="prefetch"><link href="static/js/chunk-16f9edc1.378287d5.js" rel="prefetch"><link href="static/js/chunk-1c4df292.38da0410.js" rel="prefetch"><link href="static/js/chunk-2baa78ac.a199e373.js" rel="prefetch"><link href="static/js/chunk-2d0c138b.b700863a.js" rel="prefetch"><link href="static/js/chunk-2d221bd2.a1b5633d.js" rel="prefetch"><link href="static/js/chunk-2d2300ef.88e7351f.js" rel="prefetch"><link href="static/js/chunk-2d230fe7.042d38d1.js" rel="prefetch"><link href="static/js/chunk-360c43ba.17196737.js" rel="prefetch"><link href="static/js/chunk-3e96bd8c.93acee3f.js" rel="prefetch"><link href="static/js/chunk-4010637e.4790a757.js" rel="prefetch"><link href="static/js/chunk-42236473.f7640463.js" rel="prefetch"><link href="static/js/chunk-5bc3d75d.a7027944.js" rel="prefetch"><link href="static/js/chunk-5bc4738d.f9bf6802.js" rel="prefetch"><link href="static/js/chunk-6092f506.272010c0.js" rel="prefetch"><link href="static/js/chunk-75f11c77.98067312.js" rel="prefetch"><link href="static/js/chunk-78234ca2.9d739182.js" rel="prefetch"><link href="static/js/chunk-793f0082.caff6d05.js" rel="prefetch"><link href="static/js/chunk-873a42e2.641597a8.js" rel="prefetch"><link href="static/js/chunk-a85d3c1e.9b67e844.js" rel="prefetch"><link href="static/js/chunk-a9d03770.bd46b6bc.js" rel="prefetch"><link href="static/js/chunk-b1da6300.fd9ae76e.js" rel="prefetch"><link href="static/js/chunk-bab2e2c4.546b2e9b.js" rel="prefetch"><link href="static/js/chunk-d0753fda.26de605d.js" rel="prefetch"><link href="static/css/chunk-vendors.ee57d822.css" rel="preload" as="style"><link href="static/css/index.f1c517dd.css" rel="preload" as="style"><link href="static/js/chunk-vendors.9dd0934b.js" rel="preload" as="script"><link href="static/js/index.e8b5834b.js" rel="preload" as="script"><link href="static/css/chunk-vendors.ee57d822.css" rel="stylesheet"><link href="static/css/index.f1c517dd.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-demo doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.9dd0934b.js"></script><script src="static/js/index.e8b5834b.js"></script></body></html>
})()</script><link href="static/css/chunk-066bbd34.c306629d.css" rel="prefetch"><link href="static/css/chunk-111f3671.d650a2aa.css" rel="prefetch"><link href="static/css/chunk-157f9069.c306629d.css" rel="prefetch"><link href="static/css/chunk-1c4df292.50289542.css" rel="prefetch"><link href="static/css/chunk-2baa78ac.c306629d.css" rel="prefetch"><link href="static/css/chunk-360c43ba.c306629d.css" rel="prefetch"><link href="static/css/chunk-3e96bd8c.c306629d.css" rel="prefetch"><link href="static/css/chunk-4010637e.c306629d.css" rel="prefetch"><link href="static/css/chunk-42236473.c306629d.css" rel="prefetch"><link href="static/css/chunk-5bc3d75d.c306629d.css" rel="prefetch"><link href="static/css/chunk-6092f506.89936c18.css" rel="prefetch"><link href="static/css/chunk-873a42e2.1951fa25.css" rel="prefetch"><link href="static/css/chunk-a85d3c1e.c8588555.css" rel="prefetch"><link href="static/css/chunk-a9d03770.c306629d.css" rel="prefetch"><link href="static/css/chunk-bab2e2c4.c306629d.css" rel="prefetch"><link href="static/js/chunk-066bbd34.140534af.js" rel="prefetch"><link href="static/js/chunk-111f3671.2e5e24f5.js" rel="prefetch"><link href="static/js/chunk-157f9069.c7c81c3e.js" rel="prefetch"><link href="static/js/chunk-16f9edc1.378287d5.js" rel="prefetch"><link href="static/js/chunk-1c4df292.38da0410.js" rel="prefetch"><link href="static/js/chunk-2baa78ac.a199e373.js" rel="prefetch"><link href="static/js/chunk-2d0c138b.b700863a.js" rel="prefetch"><link href="static/js/chunk-2d221bd2.a1b5633d.js" rel="prefetch"><link href="static/js/chunk-2d2300ef.88e7351f.js" rel="prefetch"><link href="static/js/chunk-2d230fe7.042d38d1.js" rel="prefetch"><link href="static/js/chunk-360c43ba.17196737.js" rel="prefetch"><link href="static/js/chunk-3e96bd8c.93acee3f.js" rel="prefetch"><link href="static/js/chunk-4010637e.ada51c0e.js" rel="prefetch"><link href="static/js/chunk-42236473.f7640463.js" rel="prefetch"><link href="static/js/chunk-5bc3d75d.a7027944.js" rel="prefetch"><link href="static/js/chunk-5bc4738d.f9bf6802.js" rel="prefetch"><link href="static/js/chunk-6092f506.272010c0.js" rel="prefetch"><link href="static/js/chunk-75f11c77.575d12af.js" rel="prefetch"><link href="static/js/chunk-78234ca2.ec0d4de6.js" rel="prefetch"><link href="static/js/chunk-793f0082.ad135597.js" rel="prefetch"><link href="static/js/chunk-873a42e2.641597a8.js" rel="prefetch"><link href="static/js/chunk-a85d3c1e.c270d287.js" rel="prefetch"><link href="static/js/chunk-a9d03770.bd46b6bc.js" rel="prefetch"><link href="static/js/chunk-b1da6300.469ef5f8.js" rel="prefetch"><link href="static/js/chunk-bab2e2c4.546b2e9b.js" rel="prefetch"><link href="static/js/chunk-d0753fda.12ca9d22.js" rel="prefetch"><link href="static/css/chunk-vendors.ee57d822.css" rel="preload" as="style"><link href="static/css/index.b455b9ca.css" rel="preload" as="style"><link href="static/js/chunk-vendors.9dd0934b.js" rel="preload" as="script"><link href="static/js/index.d6d95467.js" rel="preload" as="script"><link href="static/css/chunk-vendors.ee57d822.css" rel="stylesheet"><link href="static/css/index.b455b9ca.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-demo doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.9dd0934b.js"></script><script src="static/js/index.d6d95467.js"></script></body></html>

1
source/xzs/src/main/resources/static/admin/static/css/index.b455b9ca.css Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-4010637e.ada51c0e.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-75f11c77.575d12af.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-78234ca2.ec0d4de6.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-793f0082.ad135597.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-a85d3c1e.c270d287.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-b1da6300.469ef5f8.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/chunk-d0753fda.12ca9d22.js Normal file
View File

File diff suppressed because one or more lines are too long

1
source/xzs/src/main/resources/static/admin/static/js/index.d6d95467.js Normal file
View File

File diff suppressed because one or more lines are too long