Commit c4eb9615b76fa62ceb4edc2b70b458f6d2ebe154
1 parent
76693d69
日志页面调整
Showing
3 changed files
with
10 additions
and
23 deletions
src/views/device/index.vue
| @@ -697,6 +697,7 @@ export default { | @@ -697,6 +697,7 @@ export default { | ||
| 697 | this.query.onlineStatus = | 697 | this.query.onlineStatus = |
| 698 | obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2; | 698 | obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2; |
| 699 | this.query.sn = ""; | 699 | this.query.sn = ""; |
| 700 | + this.query.classId = []; | ||
| 700 | this.page = 1; | 701 | this.page = 1; |
| 701 | this._QueryData(false); | 702 | this._QueryData(false); |
| 702 | }, | 703 | }, |
| @@ -714,6 +715,7 @@ export default { | @@ -714,6 +715,7 @@ export default { | ||
| 714 | ? 5 | 715 | ? 5 |
| 715 | : 6; | 716 | : 6; |
| 716 | this.query.sn = ""; | 717 | this.query.sn = ""; |
| 718 | + this.query.classId = []; | ||
| 717 | this.page = 1; | 719 | this.page = 1; |
| 718 | this._QueryData(false); | 720 | this._QueryData(false); |
| 719 | }, | 721 | }, |
src/views/device/log.vue
| @@ -81,18 +81,11 @@ | @@ -81,18 +81,11 @@ | ||
| 81 | prop="operationType" | 81 | prop="operationType" |
| 82 | label="请求类型" | 82 | label="请求类型" |
| 83 | align="center" | 83 | align="center" |
| 84 | - width="200" | 84 | + width="160" |
| 85 | ><template slot-scope="scoped">{{ | 85 | ><template slot-scope="scoped">{{ |
| 86 | setOperationType(scoped.row.operationType) | 86 | setOperationType(scoped.row.operationType) |
| 87 | }}</template></el-table-column | 87 | }}</template></el-table-column |
| 88 | > | 88 | > |
| 89 | - <el-table-column | ||
| 90 | - v-if="type == 2" | ||
| 91 | - width="100" | ||
| 92 | - prop="submit" | ||
| 93 | - label="提交次数" | ||
| 94 | - align="center" | ||
| 95 | - ></el-table-column> | ||
| 96 | <el-table-column | 89 | <el-table-column |
| 97 | v-if="type == 2" | 90 | v-if="type == 2" |
| 98 | prop="electricity" | 91 | prop="electricity" |
| @@ -106,11 +99,11 @@ | @@ -106,11 +99,11 @@ | ||
| 106 | align="center" | 99 | align="center" |
| 107 | width="200" | 100 | width="200" |
| 108 | ></el-table-column> | 101 | ></el-table-column> |
| 109 | - <el-table-column | ||
| 110 | - prop="content" | ||
| 111 | - label="日志内容" | ||
| 112 | - align="center" | ||
| 113 | - ></el-table-column> | 102 | + <el-table-column prop="content" label="日志内容" align="center" |
| 103 | + ><template slot-scope="scoped"> | ||
| 104 | + <p style="text-align: left">{{ scoped.row.content }}</p></template | ||
| 105 | + ></el-table-column | ||
| 106 | + > | ||
| 114 | </el-table> | 107 | </el-table> |
| 115 | </div> | 108 | </div> |
| 116 | <div class="pagination-box"> | 109 | <div class="pagination-box"> |
src/views/login/index.vue
| @@ -93,16 +93,8 @@ export default { | @@ -93,16 +93,8 @@ export default { | ||
| 93 | disableClick: true, | 93 | disableClick: true, |
| 94 | passwordType: "password", | 94 | passwordType: "password", |
| 95 | loginForm: { | 95 | loginForm: { |
| 96 | - // username: "15911715665", | ||
| 97 | - // password: "715665", | ||
| 98 | - // username: "18314340313", | ||
| 99 | - // password: "Pw340313#", | ||
| 100 | - // username: "18687826606", | ||
| 101 | - // password: "Pw826606#", | ||
| 102 | - // username: "18893712576", | ||
| 103 | - // password: "712576", | ||
| 104 | - username: "13247726488", | ||
| 105 | - password: "726488", | 96 | + username: "", |
| 97 | + password: "", | ||
| 106 | }, | 98 | }, |
| 107 | loginRules: { | 99 | loginRules: { |
| 108 | username: [ | 100 | username: [ |