diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 26cc2dc..7233a92 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -1247,4 +1247,21 @@ export function findByProjectId(data) { url: `/autoSR/customer/message/findByProjectId?id=${data}`, method: 'GET', }) -} \ No newline at end of file +} +// 设备日志 +export function findByImeiAndHours(data) { + return request({ + url: `/autoSR/zk/equipment/findByImeiAndHours`, + method: 'GET', + params: data + }) +} +// 导出设备日志 +export function findByImeiExport(data) { + return request({ + url: `/autoSR/zk/equipment/findByImeiExport?imei=${data}`, + method: 'GET', + }) +} + + diff --git a/src/router/views/index.js b/src/router/views/index.js index 5d1678a..7679999 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -15,7 +15,7 @@ export default [ { path: "/help/index", name: "帮助中心", - component: () => import( "@/views/admin/help/index"), + component: () => import("@/views/admin/help/index"), }, { path: "/Statistics/Insightintothedetails", @@ -58,6 +58,16 @@ export default [ ), name: "更新", }, + { + path: "/Equipment/equlog", + component: () => + import( + /* webpackChunkName: "views" */ "@/views/Equipment/equlog" + ), + name: "设备日志", + }, + + ], }, { @@ -72,4 +82,5 @@ export default [ }, ], }, + ]; diff --git a/src/views/Equipment/equlog.vue b/src/views/Equipment/equlog.vue new file mode 100644 index 0000000..667aa72 --- /dev/null +++ b/src/views/Equipment/equlog.vue @@ -0,0 +1,196 @@ + + + + + + + + 设备编号: + {{ paramsObj.imei }} + + + 领用人: + {{ paramsObj.name }} + + + + + 导出 + 返回 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index af92d5c..dc812e2 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -493,7 +493,12 @@ row.recCmd == "start" ? "关闭" : "开启" }} + 设备日志 + + @@ -668,7 +673,7 @@ import { exportMethodPost } from "@/util/util"; export default { data() { return { - isOpen:false, + isOpen: false, options: [ { value: "1", @@ -871,6 +876,11 @@ export default { }, computed: { ...mapGetters(["permissions"]), + getMenuReal() { + return name => { + return this.permissions[name] + } + } }, created() { this.equ_state_open = this.permissions["equ_state_open"]; @@ -896,15 +906,15 @@ export default { this.searchForm.electricity = this.$route.query.electricity; } } - if (this.$route.query.selValue) this.selValue = this.$route.query.selValue + if (this.$route.query.selValue) this.selValue = this.$route.query.selValue; // asd this.getList(); // 获取列表 this.zkhousePage(); }, methods: { - isSystoleForm(){ - this.isOpen = !this.isOpen + isSystoleForm() { + this.isOpen = !this.isOpen; }, downLoad() { let obj = { @@ -1082,7 +1092,7 @@ export default { item.electricity = 0; item.signalDevice = 0; } - if (item.onLine==0) { + if (item.onLine == 0) { item.electricity = 0; item.signalDevice = 0; } @@ -1289,6 +1299,17 @@ export default { this.userList = res.data; }); }, + // 跳转设备日志页面 + equlog(row) { + this.$router.push({ + path: '/Equipment/equlog', + query: { + id: row.imei, + names: row.userName + } + }) + }, + voiceOpen(row) { this.$confirm( `确认${row.recCmd == "start" ? "关闭" : "开启"}录音吗?`, @@ -1541,7 +1562,7 @@ export default { margin-left: 15px; min-width: 78px; } - .btn-group{ + .btn-group { margin-left: 20px; } .toptimeqhuan { @@ -1569,27 +1590,27 @@ export default { .div-inp { width: 250px; } -/deep/ .el-table__header-wrapper{ - thead{ - tr{ - th{ - background: #F5F7FA; +/deep/ .el-table__header-wrapper { + thead { + tr { + th { + background: #f5f7fa; color: #333333; } } } } -/deep/ .el-dialog--center{ +/deep/ .el-dialog--center { border-radius: 8px; - .el-dialog__title{ + .el-dialog__title { font-weight: bold; } } -/deep/ .el-button--primary{ - background: #2671E2 !important; - border: 1px solid #2671E2 !important; +/deep/ .el-button--primary { + background: #2671e2 !important; + border: 1px solid #2671e2 !important; } -/deep/ .el-button--text{ - color: #2671E2; +/deep/ .el-button--text { + color: #2671e2; }