Commit 277915e378bfb9f6cec8e67af7e09b10335cb373
1 parent
1365ef5e
使用分析数据问题
Showing
2 changed files
with
13 additions
and
29 deletions
src/views/analysis/index.vue
| @@ -107,43 +107,29 @@ | @@ -107,43 +107,29 @@ | ||
| 107 | > | 107 | > |
| 108 | <template v-if="role == 'ROLE_JITUAN'"> | 108 | <template v-if="role == 'ROLE_JITUAN'"> |
| 109 | <el-table-column | 109 | <el-table-column |
| 110 | - :prop="'periodCount' + type == 1 ? item.schoolId : item.grade" | 110 | + :prop="'periodCount' + (type == 1 ? item.schoolId : item.grade)" |
| 111 | label="课时数" | 111 | label="课时数" |
| 112 | align="center" | 112 | align="center" |
| 113 | - ><template slot-scope="scoped">{{ | ||
| 114 | - scoped.row[ | ||
| 115 | - "periodCount" + type == 1 ? item.schoolId : item.grade | ||
| 116 | - ] || "--" | ||
| 117 | - }}</template></el-table-column | ||
| 118 | > | 113 | > |
| 114 | + <template slot-scope="scoped">{{scoped.row['periodCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template> | ||
| 115 | + </el-table-column> | ||
| 119 | <el-table-column | 116 | <el-table-column |
| 120 | - :prop="'examCount' + type == 1 ? item.schoolId : item.grade" | 117 | + :prop="'examCount' + (type == 1 ? item.schoolId : item.grade)" |
| 121 | label="测练数" | 118 | label="测练数" |
| 122 | align="center" | 119 | align="center" |
| 123 | - ><template slot-scope="scoped">{{ | ||
| 124 | - scoped.row[ | ||
| 125 | - "examCount" + type == 1 ? item.schoolId : item.grade | ||
| 126 | - ] || "--" | ||
| 127 | - }}</template></el-table-column | ||
| 128 | - > | 120 | + ><template slot-scope="scoped">{{scoped.row['examCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template></el-table-column> |
| 129 | </template> | 121 | </template> |
| 130 | <template v-else> | 122 | <template v-else> |
| 131 | <el-table-column | 123 | <el-table-column |
| 132 | - :prop="'periodCount' + item.grade || item.classId" | 124 | + :prop="'periodCount' + (item.grade || item.classId)" |
| 133 | label="课时数" | 125 | label="课时数" |
| 134 | align="center" | 126 | align="center" |
| 135 | - ><template slot-scope="scoped">{{ | ||
| 136 | - scoped.row["periodCount" + item.grade || item.classId] || "--" | ||
| 137 | - }}</template></el-table-column | ||
| 138 | - > | 127 | + ><template slot-scope="scoped">{{scoped.row['periodCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column> |
| 139 | <el-table-column | 128 | <el-table-column |
| 140 | - :prop="'examCount' + item.grade || item.classId" | 129 | + :prop="'examCount' + (item.grade || item.classId)" |
| 141 | label="测练数" | 130 | label="测练数" |
| 142 | align="center" | 131 | align="center" |
| 143 | - ><template slot-scope="scoped">{{ | ||
| 144 | - scoped.row["examCount" + item.grade || item.classId] || "--" | ||
| 145 | - }}</template></el-table-column | ||
| 146 | - > | 132 | + ><template slot-scope="scoped">{{scoped.row['examCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column> |
| 147 | </template> | 133 | </template> |
| 148 | </el-table-column> | 134 | </el-table-column> |
| 149 | </el-table> | 135 | </el-table> |
| @@ -368,8 +354,6 @@ export default { | @@ -368,8 +354,6 @@ export default { | ||
| 368 | this.tableData = data.map((item) => { | 354 | this.tableData = data.map((item) => { |
| 369 | let params = {}; | 355 | let params = {}; |
| 370 | dataIdsList.map((ids, index) => { | 356 | dataIdsList.map((ids, index) => { |
| 371 | - params["examCount" + index] = "--"; | ||
| 372 | - params["periodCount" + index] = "--"; | ||
| 373 | item.dataList.map((items) => { | 357 | item.dataList.map((items) => { |
| 374 | if (this.role == "ROLE_JITUAN") { | 358 | if (this.role == "ROLE_JITUAN") { |
| 375 | if (this.type == 1) { | 359 | if (this.type == 1) { |
src/views/login/index.vue
| @@ -95,14 +95,14 @@ export default { | @@ -95,14 +95,14 @@ export default { | ||
| 95 | loginForm: { | 95 | loginForm: { |
| 96 | // username: "15911715665", | 96 | // username: "15911715665", |
| 97 | // password: "715665", | 97 | // password: "715665", |
| 98 | - // username: "18314340313", | ||
| 99 | - // password: "Pw340313#", | 98 | + username: "18314340313", |
| 99 | + password: "Pw340313#", | ||
| 100 | // username: "18687826606", | 100 | // username: "18687826606", |
| 101 | // password: "Pw826606#", | 101 | // password: "Pw826606#", |
| 102 | // username: "18893712576", | 102 | // username: "18893712576", |
| 103 | // password: "712576", | 103 | // password: "712576", |
| 104 | - username: "13247726488", | ||
| 105 | - password: "726488", | 104 | + // username: "13247726488", |
| 105 | + // password: "726488", | ||
| 106 | }, | 106 | }, |
| 107 | loginRules: { | 107 | loginRules: { |
| 108 | username: [ | 108 | username: [ |