From 277915e378bfb9f6cec8e67af7e09b10335cb373 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Sat, 7 Jan 2023 21:33:13 +0800
Subject: [PATCH] 使用分析数据问题

---
 src/views/analysis/index.vue | 34 +++++++++-------------------------
 src/views/login/index.vue    |  8 ++++----
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index d734f8c..e994ae0 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -107,43 +107,29 @@
           >
             <template v-if="role == 'ROLE_JITUAN'">
               <el-table-column
-                :prop="'periodCount' + type == 1 ? item.schoolId : item.grade"
+                :prop="'periodCount' + (type == 1 ? item.schoolId : item.grade)"
                 label="课时数"
                 align="center"
-                ><template slot-scope="scoped">{{
-                  scoped.row[
-                    "periodCount" + type == 1 ? item.schoolId : item.grade
-                  ] || "--"
-                }}</template></el-table-column
               >
+              <template slot-scope="scoped">{{scoped.row['periodCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template>
+              </el-table-column>
               <el-table-column
-                :prop="'examCount' + type == 1 ? item.schoolId : item.grade"
+                :prop="'examCount' + (type == 1 ? item.schoolId : item.grade)"
                 label="测练数"
                 align="center"
-                ><template slot-scope="scoped">{{
-                  scoped.row[
-                    "examCount" + type == 1 ? item.schoolId : item.grade
-                  ] || "--"
-                }}</template></el-table-column
-              >
+              ><template slot-scope="scoped">{{scoped.row['examCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template></el-table-column>
             </template>
             <template v-else>
               <el-table-column
-                :prop="'periodCount' + item.grade || item.classId"
+                :prop="'periodCount' + (item.grade || item.classId)"
                 label="课时数"
                 align="center"
-                ><template slot-scope="scoped">{{
-                  scoped.row["periodCount" + item.grade || item.classId] || "--"
-                }}</template></el-table-column
-              >
+              ><template slot-scope="scoped">{{scoped.row['periodCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
               <el-table-column
-                :prop="'examCount' + item.grade || item.classId"
+                :prop="'examCount' + (item.grade || item.classId)"
                 label="测练数"
                 align="center"
-                ><template slot-scope="scoped">{{
-                  scoped.row["examCount" + item.grade || item.classId] || "--"
-                }}</template></el-table-column
-              >
+              ><template slot-scope="scoped">{{scoped.row['examCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
             </template>
           </el-table-column>
         </el-table>
@@ -368,8 +354,6 @@ export default {
         this.tableData = data.map((item) => {
           let params = {};
           dataIdsList.map((ids, index) => {
-            params["examCount" + index] = "--";
-            params["periodCount" + index] = "--";
             item.dataList.map((items) => {
               if (this.role == "ROLE_JITUAN") {
                 if (this.type == 1) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e93f95e..c723022 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,14 +95,14 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        // username: "18314340313",
-        // password: "Pw340313#",
+        username: "18314340313",
+        password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
         // password: "712576",
-        username: "13247726488",
-        password: "726488",
+        // username: "13247726488",
+        // password: "726488",
       },
       loginRules: {
         username: [
--
libgit2 0.21.4