diff --git a/src/router/index.js b/src/router/index.js
index 756c8c3..e58c11b 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,6 +67,17 @@ const SetUpClazz = () => import("@/views/basic/setUp/clazz")
const Archived = () => import("@/views/basic/setUp/archived")
const DeviceError = () => import("@/views/basic/device/error")
+// v1.5 年级组长
+const gradeAnalysis = () => import("@/views/basic/askTestQuestion/gradeAnalysis")
+const gradeDetail = () => import("@/views/basic/askTestQuestion/gradeAnalysisDetail")
+
+const askTestQuestion = () => import("@/views/basic/askTestQuestion/index")
+const askTestDetail = () => import("@/views/basic/askTestQuestion/view")
+const askTestUpdate = () => import("@/views/basic/askTestQuestion/update")
+const askTestReport = () => import("@/views/basic/askTestQuestion/report")
+const askTestReportDetail = () => import("@/views/basic/askTestQuestion/detail")
+const askTestReportRecycle = () => import("@/views/basic/askTestQuestion/recycle")
+
/**
* 重写路由的push方法
*/
@@ -91,7 +102,9 @@ let defaultRouter = [
},
{
path: "/index",
- iconCls: "fa fa-home", // 图标样式class
+ iconImage: require("@/assets/images/aside/shouye-default.png"),
+ selectedIconImage: require("@/assets/images/aside/shouye-selected.png"),
+ // iconCls: "fa fa-home", // 图标样式class
name: "应用首页",
component: Layout,
alone: true,
@@ -108,7 +121,7 @@ let defaultRouter = [
{
path: "/deviceError",
iconCls: "fa fa-home", // 图标样式class
- name: "异常设备信息",
+ name: "异常设备信息菜单",
component: Layout,
hidden: true,
children: [
@@ -123,7 +136,7 @@ let defaultRouter = [
{
path: "/userInfo",
iconCls: "fa fa-user", // 图标样式class
- name: "个人信息",
+ name: "个人信息菜单",
component: Layout,
hidden: true,
children: [
@@ -151,7 +164,8 @@ let addrouters = [
iconCls: "fa fa-file-text", // 图标样式class
name: "备题组卷",
component: Layout,
- alone: true,
+ alone: false,
+ hidden: true,
children: [
{
path: "/examinationPaper",
@@ -204,96 +218,163 @@ let addrouters = [
]
},
{
- path: "/ask",
- iconCls: "fa fa-bar-chart", // 图标样式class
- name: "随堂问报表",
+ path: "/testGrade",
+ iconImage: require("@/assets/images/aside/test-default.png"),
+ name: "即时测",
component: Layout,
- alone: true,
children: [
{
- path: "/ask",
- iconCls: "fa fa-bar-chart", // 图标样式class
- name: "随堂问报表",
- component: Ask,
+ path: "/testGradeReport",
+ iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"),
+ selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"),
+ name: '即时测报表',
+ demoRoles: ["ROLE_NIANJI"],
+ component: gradeAnalysis,
children: []
-
- },
- {
- path: "/askList",
- iconCls: "fa fa-bar-chart", // 图标样式class
- name: "随堂问报表",
- component: AskList,
- children: [
- {
- path: "/askAnalysis",
- iconCls: "", // 图标样式class
- name: "随堂问报表分析",
- component: AskAnalysis,
- parent: "askList",
- children: []
- },
-
- ],
- },
- {
- path: "/askArchiving",
- iconCls: "", // 图标样式class
- name: "随堂问已归档报表分析",
- component: AskArchiving,
- parent: "ask",
+ }, {
+ path: "/testGradeReportDetail",
+ iconCls: "",
+ name: "testGradeReportDetail",
+ demoRoles: ["ROLE_NIANJI"],
+ component: gradeDetail,
hidden: true,
- meta: {
- keepAlive: true,
- },
children: []
-
}
]
},
{
- path: "/test",
- iconCls: "fa fa-pie-chart", // 图标样式class
- name: "即时测报表",
+ path: "/askTeacher",
+ iconImage: require("@/assets/images/aside/ask-default.png"),
+ name: "随堂问",
component: Layout,
- alone: true,
- children: [
- {
- path: "/test",
- iconCls: "fa fa-pie-chart", // 图标样式class
- name: "",
- component: Test,
- children: []
- },
- {
- path: "/testList",
- name: "",
- component: TestList,
-
- children: [
- {
- path: "/testAnalysis",
- iconCls: "", // 图标样式class
- name: "即时测报表分析",
- component: TestAnalysis,
- parent: "test",
- children: []
- },
- ]
- },
- {
- path: "/testArchiving",
- iconCls: "", // 图标样式class
- name: "即时测已归档报表分析",
- component: TestArchiving,
- parent: "test",
- hidden: true,
- meta: {
- keepAlive: true,
- },
- children: []
- }
-
- ]
+ children: [{
+ path: "/askPreparationQuestions",
+ iconImage: require("@/assets/images/aside/paper-default.png"),
+ selectedIconImage: require("@/assets/images/aside/paper-selected.png"),
+ name: '备题',
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestQuestion,
+ children: []
+ }, {
+ path: "/askReport",
+ iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"),
+ selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"),
+ name: '报表',
+ demoRoles: ["ROLE_JIAOSHI", "ROLE_BANZHUREN"],
+ component: askTestReport,
+ children: []
+ }, {
+ path: "/askPreparationQuestionsDetail",
+ iconCls: "",
+ name: "askPreparationQuestionsDetail",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestDetail,
+ hidden: true,
+ children: []
+ }, {
+ path: "/askPreparationQuestionsUpdate",
+ iconCls: "",
+ name: "askPreparationQuestionsUpdate",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestUpdate,
+ hidden: true,
+ children: []
+ }, {
+ path: "/askReportDetail",
+ iconCls: "",
+ name: "askReportDetail",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestReportDetail,
+ hidden: true,
+ children: []
+ }, {
+ path: "/askPreparationQuestionsRecycle",
+ iconCls: "",
+ name: "askPreparationQuestionsRecycle",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestReportRecycle,
+ hidden: true,
+ children: []
+ }, {
+ path: "/askPreparationQuestionsAdd",
+ iconCls: "",
+ name: "askPreparationQuestionsAdd",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: ExaminationPaperAddQs,
+ hidden: true,
+ children: []
+ }]
+ },
+ {
+ path: "/testTeacher",
+ iconImage: require("@/assets/images/aside/test-default.png"),
+ name: "即时测",
+ component: Layout,
+ children: [{
+ path: "/testPaper",
+ iconImage: require("@/assets/images/aside/paper-default.png"),
+ selectedIconImage: require("@/assets/images/aside/paper-selected.png"),
+ name: '组卷',
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestQuestion,
+ children: []
+ }, {
+ path: "/testReport",
+ iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"),
+ selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"),
+ name: '报表',
+ demoRoles: ["ROLE_JIAOSHI", "ROLE_BANZHUREN"],
+ component: askTestReport,
+ children: []
+ }, {
+ path: "/testPaperQuestionsDetail",
+ iconCls: "",
+ name: "testPaperQuestionsDetail",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestDetail,
+ hidden: true,
+ children: []
+ }, {
+ path: "/testPaperQuestionsUpdate",
+ iconCls: "",
+ name: "testPaperQuestionsUpdate",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestUpdate,
+ hidden: true,
+ children: []
+ }, {
+ path: "/testReportDetail",
+ iconCls: "",
+ name: "testReportDetail",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestReportDetail,
+ hidden: true,
+ children: []
+ }, {
+ path: "/testReportRecycle",
+ iconCls: "",
+ name: "testReportRecycle",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestReportRecycle,
+ hidden: true,
+ children: []
+ }, {
+ path: "/testPaperRecycle",
+ iconCls: "",
+ name: "testPaperRecycle",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: askTestReportRecycle,
+ hidden: true,
+ children: []
+ }, {
+ path: "/testPaperAdd",
+ iconCls: "",
+ name: "testPaperAdd",
+ demoRoles: ["ROLE_JIAOSHI"],
+ component: ExaminationPaperAdd,
+ hidden: true,
+ children: []
+ }]
},
{
path: "/setUpConglomerate",
@@ -327,6 +408,7 @@ let addrouters = [
},
]
},
+
{
path: "/",
iconCls: "fa fa-cog",
@@ -506,6 +588,7 @@ let addrouters = [
// ]
// },
]
+
//长水版路由表
let csAddrouters = [
{
@@ -574,7 +657,6 @@ let csAddrouters = [
keepAlive: true,
},
children: []
-
},
{
path: "/askAnalysis",
@@ -1046,7 +1128,7 @@ const addroutersPersonal = [
keepAlive: true,
},
children: []
-
+
}
]
},
diff --git a/src/store/index.js b/src/store/index.js
index 6dc062e..4b7c831 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -41,6 +41,7 @@ const store = new Vuex.Store({
localStorage.setItem("info", JSON.stringify(data));
},
setRouters: (state, routers) => {
+ console.log('current', state);
let addrouterList = []
if (state.info.showRole == 'ROLE_PERSONAL') {
addrouterList = [...addroutersPersonal]
@@ -52,13 +53,22 @@ const store = new Vuex.Store({
} else {
addrouterList = [...addrouters]
}
-
}
+
let aRouters = addrouterList.filter((item) => {
+
let path = item.children[0]?.path.replace("/", "");
- return routers?.includes(path);
- });
+ if (routers?.includes(path) == true) return item;
+ else if (item.demoRoles?.includes(state.info.showRole) == true) return item;
+ if (item.children) {
+ item.children = item.children.filter((itemFilter) => {
+ return itemFilter.demoRoles?.includes(state.info.showRole) == true
+ });
+ if (item.children.length >= 1) return item;
+ }
+ return null;
+ });
state.addRouters = aRouters; // 保存动态路由用来addRouter
state.routers = defaultRouter.concat(aRouters); // 所有有权限的路由表，用来生成菜单列表
localStorage.setItem("addRouters", JSON.stringify(routers));
@@ -91,6 +101,7 @@ const store = new Vuex.Store({
.then((res) => {
let response = res;
if (response.status == 0) {
+ console.log(response)
const userInfo = { ...response.data };
if (userInfo.permissions && userInfo.permissions.length) {
userInfo.showRoleName = response.data.permissions[0]?.roleName;
diff --git a/src/store/modules/layout/index.js b/src/store/modules/layout/index.js
index 4cff515..a3c495e 100644
--- a/src/store/modules/layout/index.js
+++ b/src/store/modules/layout/index.js
@@ -17,7 +17,7 @@ export default {
path: "/index"
}]
},
- addTab(state, arg) {
+ addTab(state, arg) {
state.isActive = arg.path
if (state.tabnavBox[0] && state.tabnavBox[0].title !== "home") {
state.tabnavBox.unshift({
diff --git a/src/utils/global.js b/src/utils/global.js
index e889291..c65be88 100644
--- a/src/utils/global.js
+++ b/src/utils/global.js
@@ -1,9 +1,28 @@
import rules from "./rules"
import request from "@/api"
+import { Loading } from 'element-ui';
export default {
- install (Vue, options) {
+ install(Vue, options) {
Vue.prototype.$request = request
Vue.prototype.$rules = rules
+ Vue.prototype.$loading = {
+ loading: null,
+ open() {
+ this.loading = Loading.service({
+ lock: true,
+ text: '加载中',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ fullscreen: true
+ });
+ },
+ close() {
+ if (this.loading) {
+ this.loading.close();
+ this.loading = null;
+ }
+ }
+ }
}
}
diff --git a/src/utils/index.js b/src/utils/index.js
index e590be2..512e885 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -21,6 +21,62 @@ export function encryptLoginPassword(data) {
}
/**
+ * 设置本周，本月，本季度
+ * @param index： 规则值
+ * @returns startDay=开始时间，endDay=结束时间
+ */
+export function setDateRules(type) {
+ var that = {};
+ let aYear = new Date().getFullYear();
+ let aMonth = new Date().getMonth() + 1;
+
+ that.day = "";
+ that.startDay = "";
+ that.endDay = "";
+
+ switch (type) {
+ case "onDay":
+ that.day = formatDate(new Date(), "yyyy-MM-dd");
+ that.startDay = that.day;
+ that.endDay = that.day;
+ break;
+ case "onWeek":
+ let day = new Date().getDay();
+ if (day == 0) {
+ //中国式星期天是一周的最后一天
+ day = 7;
+ }
+ day--;
+ let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+ that.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+ that.endDay = formatDate(new Date(), "yyyy-MM-dd");
+ break;
+ case "onMonth":
+ aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+ that.startDay = `${aYear}-${aMonth}-01`;
+ that.endDay = formatDate(new Date(), "yyyy-MM-dd");
+ break;
+ case "onQuarter":
+ if (aMonth > 0 && aMonth < 4) {
+ aMonth = "1";
+ } else if (aMonth > 3 && aMonth < 7) {
+ aMonth = "4";
+ } else if (aMonth > 6 && aMonth < 10) {
+ aMonth = "7";
+ } else {
+ aMonth = "10";
+ }
+
+ aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+ that.startDay = `${aYear}-${aMonth}-01`;
+ that.endDay = formatDate(new Date(), "yyyy-MM-dd");
+ break;
+ }
+
+ return that;
+}
+
+/**
* 对称加密
* @param secret：加密公钥
* @param data： 待加密数据
@@ -808,6 +864,17 @@ export function tablePrint(id, title, type = null) {
.hui-s.s3{width: 120px;}
.info { display: flex;flex-wrap: wrap;border-left: 1px solid #ccc;border-top: 1px solid #ccc;margin-bottom: 12px;}
.info-item {width: 25%;height: 50px;box-sizing: border-box;flex-shrink: 0;background: #f8f8f8;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;line-height: 50px;text-align: center;}
+ .row-line { width: calc(20% - 2px);
+ border: 1px solid #ebeef5;
+ background: #f5f7fa;
+ display: inline-block;
+ height: 40px;
+ line-height: 40px;
+
+ .line-subfix {
+ margin-left: 10px;
+ }}
+
.el-table__header,.el-table__body{width:100%!important;}
#print-table{max-width:1400px;margin: 0 auto;width: 100%;}
.hide{max-width:1400px;margin: 0 auto;width: 100%;border-left: 1px solid #ccc;border-spacing:0;box-sizing:border-box}
diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue
index b4b4d62..e9c4fde 100644
--- a/src/views/admin/account/index.vue
+++ b/src/views/admin/account/index.vue
@@ -161,7 +161,9 @@
-
+
取 消
-
+
- {{ item.name }}
+ {{ item.name }}
- 导出报表
- 导出报表
- 打印
+ 导出报表
+ 导出报表
+ 打印
-
+
@@ -241,8 +196,8 @@ export default {
this.type == 1
? this.$request.pPeriodQuestionReport
: this.type == 2
- ? this.$request.phaseAnswerReport
- : this.$request.phaseInteractiveReport;
+ ? this.$request.phaseAnswerReport
+ : this.$request.phaseInteractiveReport;
} else if (this.types == 3) {
queryData =
this.type == 2
@@ -262,8 +217,8 @@ export default {
this.type == 1
? this.$request.periodQuestionReport
: this.type == 2
- ? this.$request.phaseAnswerReport
- : this.$request.phaseInteractiveReport;
+ ? this.$request.phaseAnswerReport
+ : this.$request.phaseInteractiveReport;
} else if (this.types == 3) {
queryData =
this.type == 2
@@ -370,8 +325,8 @@ export default {
this.types == 1
? "随堂问-单课时报表.xlsx"
: this.types == 2
- ? `随堂问-${this.className}-${this.subjectNames[0]}汇总分析报表.xlsx`
- : `随堂问-${this.className}-多科汇总分析报表.xlsx`;
+ ? `随堂问-${this.className}-${this.subjectNames[0]}汇总分析报表.xlsx`
+ : `随堂问-${this.className}-多科汇总分析报表.xlsx`;
downloadFile(this.status ? "随堂问-已归档单课时报表.xlsx" : name, blob);
} else {
this.$message.error("下载失败");
diff --git a/src/views/basic/ask/archiving.vue b/src/views/basic/ask/archiving.vue
index 8b3f334..5340d7d 100644
--- a/src/views/basic/ask/archiving.vue
+++ b/src/views/basic/ask/archiving.vue
@@ -7,82 +7,33 @@
@@ -642,8 +344,8 @@ export default {
obj.prop == "participationRate"
? 1
: obj.prop == "answerCorrectRate"
- ? 2
- : 3;
+ ? 2
+ : 3;
this.custom.orderType = obj.order == "ascending" ? 0 : 1;
this.page = 1;
this._QueryData();
@@ -984,6 +686,7 @@ div::-webkit-scrollbar {
width: 3px;
height: 10px;
}
+
div::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color: #ccc;
@@ -993,17 +696,21 @@ div::-webkit-scrollbar-thumb {
.main {
height: 100%;
}
+
.table-box {
margin: 0 20px;
padding: 16px;
background: #f8f8f8;
border-radius: 5px;
+
.table-cont {
min-height: 300px;
}
+
:deep(.fa-arrow-right) {
padding-left: 2px;
}
+
:deep(.fa-file-text) {
padding-left: 2px;
}
@@ -1015,14 +722,17 @@ div::-webkit-scrollbar-thumb {
font-size: 16px;
margin-left: 10px;
}
+
.dia-btn {
border-radius: 20px;
margin: 0 20px;
padding: 10px 20px;
}
+
.dia-tips {
padding-bottom: 10px;
}
+
.dia-question-box {
padding: 16px 16px 1px;
background: #f8f8f8;
@@ -1034,32 +744,39 @@ div::-webkit-scrollbar-thumb {
cursor: pointer;
}
}
+
.set-questions {
display: flex;
margin-bottom: 12px;
width: 100%;
+
.qs-num {
flex-shrink: 0;
margin-right: 10px;
}
+
.qs-options {
flex: 1;
+
.ipt {
margin-bottom: 5px;
}
}
+
.delButton {
border-color: #ff6868;
background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
background-size: 19px;
color: transparent;
}
+
.ac {
border-color: #ff6868;
background: #ff6868;
color: #fff;
}
}
+
.down {
padding-top: 16px;
}
diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue
index aff922e..db57ac2 100644
--- a/src/views/basic/ask/components/answerQustion.vue
+++ b/src/views/basic/ask/components/answerQustion.vue
@@ -241,7 +241,7 @@
班级：
-
-
+
+
@@ -27,24 +17,12 @@
科目：
- 全选
+ 全选
-
- {{ item }}
+
+ {{ item }}
@@ -54,12 +32,7 @@
- {{ item }}
+ {{ item }}
@@ -67,34 +40,18 @@
日期：
-
+
~
-
+
- 本周
- 本月
- 本季度
+ 本周
+ 本月
+ 本季度
@@ -230,8 +187,8 @@ export default {
this.role == "ROLE_BANZHUREN"
? this.$request.cTClassList
: this.role == "ROLE_PERSONAL"
- ? this.$request.pClassList
- : this.$request.tClassList;
+ ? this.$request.pClassList
+ : this.$request.tClassList;
const { data, status, info } = await fetchClassList();
if (status === 0) {
this.classList = data.list.map((item) => {
@@ -250,8 +207,8 @@ export default {
this.role == "ROLE_BANZHUREN"
? this.$request.cTSubjectList
: this.role == "ROLE_PERSONAL"
- ? this.$request.pSubjectList
- : this.$request.tSubjectList;
+ ? this.$request.pSubjectList
+ : this.$request.tSubjectList;
const { data, status, info } = await fetchSubjectList({
classId: this.query.classId,
diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue
index b1ac7c7..ed6ec23 100644
--- a/src/views/basic/ask/list.vue
+++ b/src/views/basic/ask/list.vue
@@ -5,20 +5,9 @@
随堂问-数据报表
-
-
+
+
@@ -26,17 +15,10 @@
筛选
- 查看汇总报表
+ 查看汇总报表
-
+
-
+
-
-
-
- {{ scoped.row.participationRate }}%
- {{ scoped.row.answerCorrectRate }}%
+
+
+
+ {{ scoped.row.participationRate }}%
+ {{
+ scoped.row.answerCorrectRate }}%
- {{ scoped.row.classCorrectRate }}%
-
-
+ {{
+ scoped.row.classCorrectRate }}%
+
+
-
-
+
+
未设置答案
-
+
-
-
+
+
@@ -315,8 +227,8 @@ export default {
this.multipleSelection.length == 1
? 1
: subjectArr.length == 1
- ? 2
- : 3,
+ ? 2
+ : 3,
subjectNames: subjectArr.join(","),
params: this.$route.query.params,
// classId: classId,
@@ -407,8 +319,8 @@ export default {
this.role == "ROLE_BANZHUREN"
? this.$request.cTExportPhaseInteractiveReport
: this.role == "ROLE_PERSONAL"
- ? this.$request.pExportPhaseReport
- : this.$request.exportPhaseInteractiveReport;
+ ? this.$request.pExportPhaseReport
+ : this.$request.exportPhaseInteractiveReport;
const data = await exportData({ ...query });
this.exportLoading = false;
if (data) {
@@ -438,9 +350,11 @@ div::-webkit-scrollbar-thumb {
.main {
height: 100%;
}
+
.remove-test {
margin-left: 10px;
}
+
.table-box {
padding: 16px;
border-radius: 5px;
@@ -466,4 +380,4 @@ div::-webkit-scrollbar-thumb {
top: 4px;
z-index: 10;
}
-
\ No newline at end of file
+
diff --git a/src/views/basic/askTestQuestion/components/askBzrMulti.vue b/src/views/basic/askTestQuestion/components/askBzrMulti.vue
new file mode 100644
index 0000000..8724954
--- /dev/null
+++ b/src/views/basic/askTestQuestion/components/askBzrMulti.vue
@@ -0,0 +1,422 @@
+
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+
+
+
+
+ {{
+ scoped.row["periodCount" + item] ||
+ Number(scoped.row["periodCount" + item]) === 0
+ ? scoped.row["periodCount" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["questionNum" + item] ||
+ Number(scoped.row["questionNum" + item]) === 0
+ ? scoped.row["questionNum" + item]
+ : "-"
+ }}
+
+ {{
+ scoped.row["participationRate" + item] ||
+ Number(scoped.row["participationRate" + item]) === 0
+ ? scoped.row["participationRate" + item] + "%"
+ : "-"
+ }}
+
+ {{
+ scoped.row["answerCorrectRate" + item] ||
+ Number(scoped.row["answerCorrectRate" + item]) === 0
+ ? scoped.row["answerCorrectRate" + item] + "%"
+ : "-"
+ }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scoped.row["interactionsNum" + item] ||
+ Number(scoped.row["interactionsNum" + item]) === 0
+ ? scoped.row["interactionsNum" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["interactionsNum" + item] ||
+ Number(scoped.row["interactionsNum" + item]) === 0
+ ? scoped.row["interactionsNum" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["interactionsCorrectNum" + item] ||
+ Number(scoped.row["interactionsCorrectNum" + item]) === 0
+ ? scoped.row["interactionsCorrectNum" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["interactionsCorrectNum" + item] ||
+ Number(scoped.row["interactionsCorrectNum" + item]) === 0
+ ? scoped.row["interactionsCorrectNum" + item]
+ : "-"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设置答案
+ 未设置答案
+
+ 查看
+
+ 删除
+
+
+
+
+
+
+
+
diff --git a/src/views/basic/askTestQuestion/components/askSummaryReport.vue b/src/views/basic/askTestQuestion/components/askSummaryReport.vue
new file mode 100644
index 0000000..64a1358
--- /dev/null
+++ b/src/views/basic/askTestQuestion/components/askSummaryReport.vue
@@ -0,0 +1,572 @@
+
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+ 班级：
+ {{ detail.className }}
+
+
+ 科目：
+ {{ detail.subjectName }}
+
+
+ 课时数：
+ {{ $props.askReportIds.length }}
+
+
+ 上课时间：
+ {{ detail.startTime }}
+
+
+ 下课时间：
+ {{ detail.endTime }}
+
+
+
+
+ 班级人数：
+ {{ detail.classPersonNum }}
+
+
+ 签到人数：
+ {{ detail.checkInCount }}
+
+
+ 题目总数：
+ {{ detail.questionNum }}
+
+
+ 答题总数：
+ {{ detail.totalAnswersNum }}
+
+
+ 课时时长：
+ {{ setDuration(detail.duration) }}
+
+
+
+
+ 答对总数：
+ {{ detail.totalCorrectAnswersNum }}
+
+
+ 总参与度：
+ {{ detail.participationRate }}
+
+
+ 班级正确率：
+ {{ detail.classCorrectRate }}
+
+
+ 已达正确率：
+ {{ detail.answerCorrectRate }}
+
+
+ 反馈时长：
+ {{ setDuration(detail.consumingDuration) }}
+
+
+
+
+
+
+
+ 查看
+
+
+
+ {{ setSubPro(scoped.row.questionType) }}
+
+
+
+
+ {{ scoped.row.participationRate }}%
+
+
+ {{ scoped.row.classCorrectRate }}%
+
+
+
+ {{ scoped.row.answerCorrectRate }}%
+
+
+
+
+
+ {{
+ scoped.row.correctAnswer == 1 ? "✓" :
+ scoped.row.correctAnswer == 2 ? "✗" :
+ scoped.row.correctAnswer
+ }}
+
+
+
+
+ {{
+ scoped.row.fallible == 1 ? "✓" :
+ scoped.row.fallible == 2 ? "✗" :
+ scoped.row.fallible
+ }}
+
+
+
+
+
+
+
+
+ 班级：
+ {{ detail.className }}
+
+
+ 科目：
+ {{ detail.subjectName }}
+
+
+ 开始时间：
+ {{ $props.queryParams.dateRange[0] }}
+
+
+ 截止时间：
+ {{ $props.queryParams.dateRange[1] }}
+
+
+ 下课时间：
+ {{ detail.endTime }}
+
+
+
+
+ 课时数：
+ {{ $props.askReportIds.length }}
+
+
+ 总出题数：
+ {{ detail.questionNum }}
+
+
+ 查询时间：
+ {{ detail.selectDate }}
+
+
+ 查询老师：
+ {{ detail.answerCorrectRate }}
+
+
+ 课时时长：
+ {{ setDuration(detail.consumingDuration) }}
+
+
+
+
+
+
+
+
+
+ {{ scoped.row.participationRate }}%
+
+
+
+ {{ scoped.row.correctRate }}%
+
+
+
+ {{ scoped.row.answerCorrectRate }}%
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看汇总报表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}
+
+
+
+
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+
+
+ {{ scoped.row.studentName }}
+
+
+
+
+ {{
+ scoped.row["examCount" + item] ||
+ Number(scoped.row["examCount" + item]) === 0
+ ? scoped.row["examCount" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["participationCount" + item] ||
+ Number(scoped.row["participationCount" + item]) === 0
+ ? scoped.row["participationCount" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["score" + item] ||
+ Number(scoped.row["score" + item]) === 0
+ ? scoped.row["score" + item]
+ : "-"
+ }}
+
+
+ {{
+ scoped.row["classRank" + item] ||
+ Number(scoped.row["classRank" + item]) === 0
+ ? scoped.row["classRank" + item]
+ : "-"
+ }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}
+
+
+
+
+
+
+ 查看
+
+
+
+ 删除
+
+
+
+
+
+
+ 未设置答案
+
+
+
+
+
+ 录入总得分
+ 录入小题分
+
+ 录入分数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.className }}
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
diff --git a/src/views/basic/askTestQuestion/components/testSummaryReport.vue b/src/views/basic/askTestQuestion/components/testSummaryReport.vue
new file mode 100644
index 0000000..d86a91a
--- /dev/null
+++ b/src/views/basic/askTestQuestion/components/testSummaryReport.vue
@@ -0,0 +1,273 @@
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+
+
+ {{ scoped.row.studentName }}
+
+
+
+
+ {{
+ scoped.row["score" + index] ||
+ Number(scoped.row["score" + index]) === 0
+ ? scoped.row["score" + index]
+ : "-"
+ }}
+
+
+
+ {{
+ scoped.row["classRank" + index] ||
+ Number(scoped.row["classRank" + index]) === 0
+ ? scoped.row["classRank" + index]
+ : "-"
+ }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+ 班级：
+ {{ detail.className }}
+
+
+ 科目：
+ {{ detail.subjectName }}
+
+
+ 课时数：
+ {{ ids.length }}
+
+
+ 上课时间：
+ {{ detail.startTime }}
+
+
+ 下课时间：
+ {{ detail.endTime }}
+
+
+
+
+ 班级人数：
+ {{ detail.classPersonNum }}
+
+
+ 签到人数：
+ {{ detail.checkInCount }}
+
+
+ 题目总数：
+ {{ detail.questionNum }}
+
+
+ 答题总数：
+ {{ detail.totalAnswersNum }}
+
+
+ 课时时长：
+ {{ setDuration(detail.duration) }}
+
+
+
+
+ 答对总数：
+ {{ detail.totalCorrectAnswersNum }}
+
+
+ 总参与度：
+ {{ detail.participationRate }}
+
+
+ 班级正确率：
+ {{ detail.classCorrectRate }}
+
+
+ 已达正确率：
+ {{ detail.answerCorrectRate }}
+
+
+ 反馈时长：
+ {{ setDuration(detail.consumingDuration) }}
+
+
+
+
+
+
+
+ 查看
+
+
+
+ {{ setSubPro(scoped.row.questionType) }}
+
+
+
+
+ {{ scoped.row.participationRate }}%
+
+
+ {{ scoped.row.classCorrectRate }}%
+
+
+
+ {{ scoped.row.answerCorrectRate }}%
+
+
+
+
+
+ {{
+ scoped.row.correctAnswer == 1 ? "✓" :
+ scoped.row.correctAnswer == 2 ? "✗" :
+ scoped.row.correctAnswer
+ }}
+
+
+
+
+ {{
+ scoped.row.fallible == 1 ? "✓" :
+ scoped.row.fallible == 2 ? "✗" :
+ scoped.row.fallible
+ }}
+
+
+
+
+
+
+
+
+
+ {{
+ setDuration(scoped.row.consumingDuration)
+ }}
+
+
+ {{
+ scoped.row.correctAnswerTimes ||
+ Number(scoped.row.correctAnswerTimes) === 0
+ ? scoped.row.correctAnswerTimes
+ : "-"
+ }}
+
+ {{
+ scoped.row.participationRate ||
+ Number(scoped.row.participationRate) === 0
+ ? scoped.row.participationRate + "%"
+ : "-"
+ }}
+ {{
+ scoped.row.correctRate || Number(scoped.row.correctRate) === 0
+ ? scoped.row.correctRate + "%"
+ : "-"
+ }}
+ {{
+ scoped.row.answerCorrectRate ||
+ Number(scoped.row.answerCorrectRate) === 0
+ ? scoped.row.answerCorrectRate + "%"
+ : "-"
+ }}
+
+ {{
+ scoped.row["answer" + index] || "-"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 应到人数：
+ {{ detail.classPersonNum }}
+
+
+ 实到人数：
+ {{ detail.checkInCount }}
+
+
+ 迟到人数：
+ {{ detail.classPersonNum - detail.checkInCount }}
+
+
+ 未到人数：
+ {{ detail.classPersonNum - detail.checkInCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 班级：
+ {{ item.className }}
+
+
+ 试卷名称：
+ {{ item.paperName }}
+
+
+ 测验时间：
+ {{ item.testTime }}
+
+
+
+
+
+
+
+
+
+
+ {{ scoped.row.miss.join("/") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 总计
+ {{ scoped.row.details.filter(item => !item.isRight).length }} 人
+
+
+ 选{{ item.option }}：{{ item.students.join("/") }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ setSubPro(scope.row.questionType) }}
+
+
+
+
+
+
+
+ {{ scoped.row.classScoringRate
+ }}%
+ {{
+ scoped.row.correctAnswer == 1
+ ? "✓"
+ : scoped.row.correctAnswer == 2
+ ? "✗"
+ : scoped.row.correctAnswer
+ }}
+
+
+
+ {{
+ scope.row.questionType == "5"
+ ? ""
+ : scope.row["option" + index]
+ ? `${scope.row["option" + index]}(${scope.row["persent" + index]
+ })`
+ : ""
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.scoringRate }}%
+
+
+
+
+
+
+
+ {{ scope.row.objectiveScoringRate }}%
+
+
+
+
+
+
+
+ {{ scope.row.subjectiveScoringRate }}%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *
+
+ {{ scope.row["answer" + item.id] }}
+
+ -
+
+
+
+
+
+
+
+
+
+
+ {{ scoped.row.testCount }} / {{ scoped.row.classCount }}
+
+
+
+
+ {{ scoped.row.testCount / scoped.row.classCount }}
+
+
+
+
+
+
+
+
+
+ {{ scoped.row.excellenRate }}%
+
+
+
+
+ {{ scoped.row.goodRate }}%
+
+
+
+
+ {{ scoped.row.passRate }}%
+
+
+
+
+ {{ scoped.row.passRate }}%
+
+
+
+
+
+
+
+
+
+ {{ setSubPro(scope.row.questionType) }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.questionType == "5"
+ ? ""
+ : scope.row["option" + index]
+ ? `${scope.row["option" + index]}(${scope.row["persent" + index] ?? "0"
+ })`
+ : ""
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
即时测报表
+
+
+
+
+
+
+
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+ {{ scope.row?.classInfos?.map(item => item.className)?.join("/") }}
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
new file mode 100644
index 0000000..74906a8
--- /dev/null
+++ b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
@@ -0,0 +1,709 @@
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+ 已考班级:
+
+ 全选
+
+ {{ classItem.className }}
+
+
+
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+ 班级：
+ {{ item.className }}
+
+
+ 试卷名称：
+ {{ item.paperName }}
+
+
+ 测验时间：
+ {{ item.testTime }}
+
+
+
+
+
+
+
+
+
+
+ {{ scoped.row.miss.join("/") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 总计
+ {{ scoped.row.details.filter(item => !item.isRight).length }} 人
+
+
+ 选{{ item.option }}：{{ item.students.join("/") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+ {{ scoped.row.testCount }} / {{ scoped.row.classCount }}
+
+
+
+
+ {{ scoped.row.testCount / scoped.row.classCount }}
+
+
+
+
+
+
+
+
+
+ {{ scoped.row.excellenRate }}%
+
+
+
+
+ {{ scoped.row.goodRate }}%
+
+
+
+
+ {{ scoped.row.passRate }}%
+
+
+
+
+ {{ scoped.row.passRate }}%
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+ {{ setSubPro(scope.row.questionType) }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.questionType == "5"
+ ? ""
+ : scope.row["option" + index]
+ ? `${scope.row["option" + index]}(${scope.row["persent" + index] ?? "0"
+ })`
+ : ""
+ }}
+
+
+
+
+
+
+
+ 导出报表
+ 打印报表
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dataType == "1" ? '随堂问备题' : '即时测组卷' }}
+
+
+ 添加试卷
+
+ 导入试卷
+ 创建答题卡
+
+
+ 添加课件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 筛选
+
+
+ 当天
+ 本周
+ 本月
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.id }}
+
+
+ {{ item.title }}
+
+ 操作
+
+ 查看
+ 修改
+ 复制
+
+
+ 删除
+
+
+
+
+
+
+
+ 授课端同步：
+
+ {{ clazzChild.className }}
+
+
+
+ 
+
+
+
+
+
+
+
总题数：
+ {{ item.questionNum }}
+
+
+
预计时长：
+ {{ item.examsDuration }}
+ 分钟
+
+
+
+
创建人：
+ {{ item.realName }}
+
+
+
+ 
+
更新时间：
+ {{ item.modifiedTime }}
+ 已分享到非任课班级
+
+
+
+
+
+
+
+
+
+
+ {{ item.id }}
+
+
+ {{ item.title }}
+
+
+
+ 授课端同步：
+
+ {{ clazzChild.className }}
+
+
+
+
+
+
+
+
+
+
总题数：
+ {{ item.questionNum }}
+
+
+
创建人：
+ {{ item.realName }}
+
+
+
+
+
更新时间：
+ {{ item.createdTime }}
+
+
+
+ 新增
+
+
+
查看回收站
+
+
+ 第一步：
+ 下载模板,
+ 或者导出菁优网试卷/组卷网(学科网)试卷；
+ 为保证第三方试卷导入成功，请注意参考导出示例：
+
+
+
+ 菁优网示例 /
+
+
+
+ 组卷网(学科网)示例。
+
+
+
+ 第一步：导出菁优网试卷/组卷网(学科网)试卷；为保证第三方试卷导入成功，请注意参考导出示例：
+
+
+
+ 菁优网示例
+
+ /
+
+
+
+ 组卷网(学科网)示例。
+
+
+
第二步：上传完成编辑好的试卷。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 恢复
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 恢复
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 新增
+
+
+
+
{{ dataType == "1" ? '随堂问报表' : '即时测报表' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
查看回收站
+
+
+
+
+
+ {{
+ `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
+ }}老师修改了答案
+
+
+
+
+ 试卷名称：
+
+
+
+ 分享范围：
+ 任课班级分享
+ 自定义分享班级
+
+
+
+
+
+
+
题号
+
题干
+
题型
+
分数
+
漏选得分
+
选项设置
+
操作
+
+
+
+
{{ subQuestion.questionId }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
+
+ ✓
+ ✗
+
+
+
+ {{ option }}
+
+ +
+ -
+
+
+
+ {{ option }}
+
+ +
+ -
+
+
+
+
+ 修改题干
+
+
+ 修改解析
+
+
+ 修改知识点
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 年级：
+ {{ gradeName }}
+
+
+
+ 班级：
+
+
+ 全选
+
+ {{
+ item.className }}
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+ 请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+
+
{{ setSubPro(formAns.qusType) }}：
+
+
+
+
+
+
+ ✓
+ ✗
+
+
+ {{ option }}
+ ,
+
+
+ {{ option }}
+
+ x
+ ac
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择照片
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/basic/askTestQuestion/view.vue b/src/views/basic/askTestQuestion/view.vue
new file mode 100644
index 0000000..6cdad04
--- /dev/null
+++ b/src/views/basic/askTestQuestion/view.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+ 查看课件
+
+
+
+
+
+ {{ detail.title }}
+
+
通过Excel名单导入学生模板，点击
diff --git a/src/views/basic/setUp/account.vue b/src/views/basic/setUp/account.vue
index aadc9d5..db175f7 100644
--- a/src/views/basic/setUp/account.vue
+++ b/src/views/basic/setUp/account.vue
@@ -213,7 +213,7 @@
-
+
取 消
-
+
取 消
-
+
- 取 消
- -->
-
- 取 消
- 取 消
- 取 消
-
-
+
取 消
-
+
注意该操作会将所有年级升级，请谨慎操作！
- 取 消
- 关 闭
- 取 消
-
-
+
-
+
-
+
- 导出报表
- 打印
+ 导出报表
+ 打印
-
-
答卷录分
+
+
答卷录分
- 录入总得分
- 录入小题分
+ 录入总得分
+ 录入小题分
- 答卷录分
+ 答卷录分
-
- 查看题目
+
+ 查看题目
-
-
+
+
@@ -494,35 +234,16 @@
- {{ lowRange.type != 0 ? "%" : "分" }}(含)
- {{ lowRange.type != 0 ? "%" : "分" }}(含)
+ {{ lowRange.type != 0 ? "%" : "分" }}(含)
+ @keydown.native="keydownRange($event)">{{ lowRange.type != 0 ? "%" : "分" }}(含)
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
{{tipData.paperNum}}
diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue
index ea63aa1..45c58bc 100644
--- a/src/views/personal/setUp/student.vue
+++ b/src/views/personal/setUp/student.vue
@@ -90,7 +90,7 @@
-
+
取 消
-
-
+
通过Excel名单导入学生模板，点击
diff --git a/src/views/personal/test/analysis.vue b/src/views/personal/test/analysis.vue
index 6faf665..e02f4b8 100644
--- a/src/views/personal/test/analysis.vue
+++ b/src/views/personal/test/analysis.vue
@@ -402,7 +402,7 @@
>
-
+
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
index 1efa0f2..b67e781 100644
--- a/src/views/personal/test/index.vue
+++ b/src/views/personal/test/index.vue
@@ -412,7 +412,7 @@
>
-
+
-
+
取 消
-
+