diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index dc34abe..1492010 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -1630,4 +1630,25 @@ export default { data }); }, + //删除基站 + deleteStation(data) { + console.log(service({ + url: setUpUrls.deleteStation, + method: "POST", + data + })) + return service({ + url: setUpUrls.deleteStation, + method: "POST", + data + }); + }, + //导出授课端日志 + downloadDeviceLog(data) { + return service({ + url: setUpUrls.downloadDeviceLog, + method: "POST", + data + }); + }, }; diff --git a/src/api/axios.js b/src/api/axios.js index fe62731..720a7c3 100644 --- a/src/api/axios.js +++ b/src/api/axios.js @@ -101,12 +101,13 @@ service.interceptors.response.use( } return; } - Message({ - message: data.info || error, - type: "error", - duration: 3 * 1000, - }); - return Promise.reject(error.response); // 返回接口返回的错误信息 + + return Promise.resolve( + { + status: status, + info: data.info || error, + } + ); // 返回接口返回的错误信息 } ); export default service; diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index 3df0c00..bdee106 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -426,4 +426,8 @@ export default { paperWordUpload: "/api_html/common/paper/upload", //删除随堂问报表 deletePaperReport: "/api_html/teaching/deletePaperReport", + //删除基站 + deleteStation: "/api_html/school/manager/deleteStation", + //导出授课端日志 + downloadDeviceLog: "/api_html/school/manager/downloadDeviceLog", } diff --git a/src/assets/images/shuazi.svg b/src/assets/images/shuazi.svg new file mode 100644 index 0000000..37bfdc0 --- /dev/null +++ b/src/assets/images/shuazi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/basic/device/index.vue b/src/views/basic/device/index.vue index 7d296ca..59bae44 100644 --- a/src/views/basic/device/index.vue +++ b/src/views/basic/device/index.vue @@ -7,37 +7,16 @@
@@ -48,16 +27,10 @@ 授课端管理
-

+

有{{ type == 1 ? stationCount : clickerCount - }}条设备异常信息，点击查看>> + }}条设备异常信息，点击查看>>

@@ -67,101 +40,39 @@

基站数量

- +
- - - + + + - - + + - 筛选 + 筛选

加载中

- - - - - + - - - -
@@ -233,151 +115,61 @@

答题器数量

- +
- - - + + + - - + + - - + + - 筛选 + 筛选

加载中

- - + - - - - + + + + + +
@@ -385,27 +177,12 @@
- - 共选择{{ selectionTabIds.length }}个授课端 - 开启自动更新 - 停止自动更新 + + 共选择{{ selectionTabIds.length }}个授课端 + 开启自动更新 + 停止自动更新

全校更新： @@ -416,102 +193,49 @@

加载中

- + - - + + + +
- +
@@ -527,75 +251,33 @@ 取 消 - + - - + + - - + + - - + + - + - - + +
@@ -800,6 +482,17 @@ export default { }, }); }, + async delStation(obj) { + const { status, info } = await this.$request.deleteStation({ + id: obj.id + }); + if (status === 0) { + this._QueryData(false); + this.$message.success(info); + } else { + this.$message.error(info); + } + }, clickPieChart(obj) { this.query.onlineStatus = obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2; @@ -813,14 +506,14 @@ export default { obj.name == "1日内" ? 1 : obj.name == "3日内" - ? 2 - : obj.name == "7日内" - ? 3 - : obj.name == "1月内" - ? 4 - : obj.name == "3月内" - ? 5 - : 6; + ? 2 + : obj.name == "7日内" + ? 3 + : obj.name == "1月内" + ? 4 + : obj.name == "3月内" + ? 5 + : 6; this.query.sn = ""; this.query.classId = []; this.page = 1; @@ -865,7 +558,7 @@ export default { if (data && !data.code) { this._QueryData(false); this.selectionTabIds = []; - this.$message.success(this.upgradeFlag?"开启自动更新成功":"关闭/停止自动更新成功"); + this.$message.success(this.upgradeFlag ? "开启自动更新成功" : "关闭/停止自动更新成功"); } else { this.$message.error(data.info); } @@ -931,6 +624,20 @@ export default { this.$message.error(data.info); } }, + // 导出授课端日志 + async downloadDeviceLog(id) { + let data = await this.$request.downloadDeviceLog({ + id: id, + }); + if (data) { + let blob = new Blob([data], { + type: "application/vnd.ms-excel;charset=utf-8", + }); + downloadFile(`基站模版.xlsx`, blob); + } else { + this.$message.error("下载失败"); + } + }, async downExcel() { let data = await this.$request.stationTemplate({ id: this.id, @@ -944,8 +651,8 @@ export default { this.$message.error("下载失败"); } }, + //报表导出 async downExl() { - //报表导出 if (this.exportLoading == true) return; let query = this.setQuery(); const exportDevice = @@ -967,8 +674,8 @@ export default { this.type == 1 ? "基站管理报表.xlsx" : this.type == 2 - ? "答题器报表.xlsx" - : "授课端报表.xlsx"; + ? "答题器报表.xlsx" + : "授课端报表.xlsx"; downloadFile(txt, blob); } else { this.$message.error(data.info); @@ -1079,8 +786,8 @@ export default { item.onlineStatus == "1" ? "在线" : item.onlineStatus == 0 - ? "离线" - : "异常", + ? "离线" + : "异常", value: item.total, rate: item.rate, }; @@ -1105,14 +812,14 @@ export default { item.type == 1 ? "1日内" : item.type == 2 - ? "3日内" - : item.type == 3 - ? "7日内" - : item.type == 4 - ? "1月内" - : item.type == 5 - ? "3月内" - : "3月以上", + ? "3日内" + : item.type == 3 + ? "7日内" + : item.type == 4 + ? "1月内" + : item.type == 5 + ? "3月内" + : "3月以上", count: item.total, value: item.rate * 100, }; @@ -1276,39 +983,52 @@ export default { height: 100%; overflow-y: auto; } + .tab-box { padding: 20px 0 12px; } + .down { padding: 0 0 16px 20px; } + .error-tips { margin-bottom: 12px; } +.del{ + margin-left: 10px; +} + .content { background: #f8f8f8; border: 1px solid #e2e2e2; border-radius: 10px; overflow: hidden; + :deep(.fa-edit) { width: 12px; height: 12px; + &::before { margin-left: 2px; } } - :deep(.fa-eye) { + + :deep(.fa) { width: 12px; height: 12px; + &::before { margin-left: 1px; } } + .chart-box { display: flex; overflow: hidden; height: 240px; border-bottom: 0.5px solid #e2e2e2; + .device-num { width: 280px; border-right: 0.5px solid #e2e2e2; @@ -1316,26 +1036,32 @@ export default { flex-direction: column; justify-content: center; align-items: center; + .p1 { font-size: 28px; } } + .chart { flex: 1; height: 100%; } } + .table-box { padding: 20px 20px 0; + .loading { text-align: center; line-height: 36px; font-size: 16px; color: #666; } + .answer-header { padding: 0; margin-bottom: 12px; + .upgrade-all { display: flex; align-items: center; @@ -1343,11 +1069,14 @@ export default { } } } + .answer-header .sel-box .input-with-select { margin-right: 20px; + :deep(.el-input__suffix) { right: -5px; } + :deep(.el-button) { padding: 12px 16px 12px 10px; } diff --git a/src/views/basic/device/log.vue b/src/views/basic/device/log.vue index eb6ecea..d66e507 100644 --- a/src/views/basic/device/log.vue +++ b/src/views/basic/device/log.vue @@ -286,7 +286,7 @@ export default { for (let key in this.query) { if (this.query[key] != "") { if (key == "day" || key == "startDay" || key == "endDay") { - query[key] = this.query[key].split("-").join(""); + query[key] = this.query[key]?.split("-").join(""); } else { query[key] = this.query[key]; } diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue index c9d140e..dda8f99 100644 --- a/src/views/basic/setUp/teacher.vue +++ b/src/views/basic/setUp/teacher.vue @@ -6,93 +6,41 @@
- + + + + - + }" collapse-tags :show-all-levels="false"> + - - + + - - + +