Merge branch 'master' into develop

TEAMModelOS/ClientApp/src/components/dashboard/art/BaseAwardPie.vue

@@ -87,7 +87,7 @@ export default {
       { value: area, name: '区级赛事' },
       { value: school, name: '校级赛事' },
     ]
-    this.doRender(renderData)
+    // this.doRender(renderData)
   },
   watch: {
     '$store.state.dashboard.artDashboard': {
@@ -95,17 +95,17 @@ export default {
       immediate: true,
       handler(n, o) {
         if (n) {
-          // this.$nextTick(() => {
-          //   let { country, province, city, area, school } = n.awardData[0]
-          //   let renderData = [
-          //     { value: country, name: '国家级赛事' },
-          //     { value: province, name: '省级赛事' },
-          //     { value: city, name: '市级赛事' },
-          //     { value: area, name: '区级赛事' },
-          //     { value: school, name: '校级赛事' },
-          //   ]
-          //   this.doRender(renderData)
-          // })
+          this.$nextTick(() => {
+            let { country, province, city, area, school } = n.awardData[0]
+            let renderData = [
+              { value: country, name: '国家级赛事' },
+              { value: province, name: '省级赛事' },
+              { value: city, name: '市级赛事' },
+              { value: area, name: '区级赛事' },
+              { value: school, name: '校级赛事' },
+            ]
+            this.doRender(renderData)
+          })
         }
       }
     }

TEAMModelOS/ClientApp/src/components/dashboard/art/BaseClassLineBar.vue

@@ -242,6 +242,7 @@ export default {
       handler(n, o) {
         if (n) {
           this.$nextTick(() => {
+            console.log('*********',n.classData)
             this.doRender(n.classData)
           })
         }

TEAMModelOS/ClientApp/src/components/dashboard/art/BaseLessonLineBar.vue

@@ -169,7 +169,7 @@ export default {
     } else {
       this.legendData = ['本班', '本校']
     }
-    this.doRender(this.$store.state.dashboard.artDashboard.lessonData)
+    // this.doRender(this.$store.state.dashboard.artDashboard.lessonData)
   },
   watch: {
     '$store.state.dashboard.artDashboard': {
@@ -177,14 +177,14 @@ export default {
       immediate: true,
       handler(n, o) {
         if (n) {
-          // this.$nextTick(() => {
-          //   if(this.$store.state.dashboard.classType === 'all'){
-          //     this.legendData = ['本校', '本区']
-          //   }else{
-          //     this.legendData = ['本班', '本校']
-          //   }
-          //   this.doRender(n.lessonData)
-          // })
+          this.$nextTick(() => {
+            if(this.$store.state.dashboard.classType === 'all'){
+              this.legendData = ['本校', '本区']
+            }else{
+              this.legendData = ['本班', '本校']
+            }
+            this.doRender(n.lessonData)
+          })
         }
       }
     }

TEAMModelOS/ClientApp/src/components/dashboard/art/BasePointLineBar.vue

@@ -129,6 +129,7 @@ export default {
     this.$EventBus.$off('onLevel1Click')
     this.$EventBus.$on('onLevel1Click', val => {
       let allPoints = this.$store.state.dashboard.artDashboard.knowledges
+      console.log('***',allPoints)
       this.doRender(val[2] ? allPoints : allPoints.filter(i => i.level1 === val[0]))
     })
   }

TEAMModelOS/ClientApp/src/components/dashboard/art/RightTop.vue

@@ -25,6 +25,12 @@ import BaseClassLineBar from '@/components/dashboard/art/BaseClassLineBar.vue'
 import BaseStuLineBar from '@/components/dashboard/art/BaseStuLineBar.vue'
 import LeftCenter from '@/components/dashboard/art/LeftCenter.vue'
 export default {
+  props:{
+    school:{
+      type:String,
+      default:''
+    }
+  },
   components: {
     BaseClassLineBar,
     BaseStuLineBar,
@@ -33,42 +39,164 @@ export default {
   },
   data() {
     return {
-      cascaderVal: ['all'],
-      classData: [{
-        value: 'all',
-        label: '全校',
-        children: [
-          {
-            value: 'grade5',
-            label: '五年级',
-            children: [
-              {
-                value: 'class1',
-                label: '1班',
-              },
-              {
-                value: 'class2',
-                label: '2班',
-              },
-              {
-                value: 'class3',
-                label: '3班',
-              },
-              {
-                value: 'class4',
-                label: '4班',
-              },
-              {
-                value: 'class5',
-                label: '5班',
-              },
-              {
-                value: 'class6',
-                label: '6班',
-              }
-            ]
-          },
-          {
+      cascaderVal: ['all']
+    }
+  },
+  created() {
+    this.$store.commit('setRandomArtData', 'all')
+  },
+  methods: {
+    onSelect(val) {
+      console.log(val);
+      if (val.length === 1) {
+        this.$store.commit('setRandomArtData', 'all')
+      } else if (val.length === 2) {
+        this.$store.commit('setRandomArtData', 'grade')
+      } else {
+        this.$store.commit('setRandomArtData', 'single')
+      }
+    }
+  },
+  computed: {
+    classType() {
+      console.log(this.$store.state.dashboard.classType);
+      return this.$store.state.dashboard.classType
+    },
+    classData(){
+      if(this.school == '成都市青羊实验中学'){
+        return [{
+          value: 'all',
+          label: '全校',
+          children: [
+            {
+              value: 'grade5',
+              label: '八年级',
+              children: [
+                {
+                  value: 'class1',
+                  label: '1班',
+                },
+                {
+                  value: 'class2',
+                  label: '2班',
+                },
+                {
+                  value: 'class3',
+                  label: '3班',
+                },
+                {
+                  value: 'class4',
+                  label: '4班',
+                },
+                {
+                  value: 'class5',
+                  label: '5班',
+                },
+                {
+                  value: 'class6',
+                  label: '6班',
+                },
+                {
+                  value: 'class1',
+                  label: '7班',
+                },
+                {
+                  value: 'class2',
+                  label: '8班',
+                },
+                {
+                  value: 'class3',
+                  label: '9班',
+                },
+                {
+                  value: 'class4',
+                  label: '10班',
+                },
+                {
+                  value: 'class5',
+                  label: '11班',
+                },
+                {
+                  value: 'class6',
+                  label: '12班',
+                },
+                {
+                  value: 'class6',
+                  label: '13班',
+                }
+              ]
+            },
+            // {
+            //   value: 'grade6',
+            //   label: '六年级',
+            //   children: [
+            //     {
+            //       value: 'class1',
+            //       label: '1班',
+            //     },
+            //     {
+            //       value: 'class2',
+            //       label: '2班',
+            //     },
+            //     {
+            //       value: 'class3',
+            //       label: '3班',
+            //     },
+            //     {
+            //       value: 'class4',
+            //       label: '4班',
+            //     },
+            //     {
+            //       value: 'class5',
+            //       label: '5班',
+            //     },
+            //     {
+            //       value: 'class6',
+            //       label: '6班',
+            //     }
+            //   ]
+            // }
+          ],
+        }]
+      }else{
+        let data = [{
+          value: 'all',
+          label: '全校',
+          children: [
+            {
+              value: 'grade5',
+              label: '五年级',
+              children: [
+                {
+                  value: 'class1',
+                  label: '1班',
+                },
+                {
+                  value: 'class2',
+                  label: '2班',
+                },
+                {
+                  value: 'class3',
+                  label: '3班',
+                },
+                {
+                  value: 'class4',
+                  label: '4班',
+                },
+                {
+                  value: 'class5',
+                  label: '5班',
+                },
+                {
+                  value: 'class6',
+                  label: '6班',
+                }
+              ]
+            }
+          ]
+        }]
+        if(!this.school){
+          data[0].children.push({
             value: 'grade6',
             label: '六年级',
             children: [
@@ -97,32 +225,12 @@ export default {
                 label: '6班',
               }
             ]
-          }
-        ],
-      }]
-    }
-  },
-  created() {
-    this.$store.commit('setRandomArtData', 'all')
-  },
-  methods: {
-    onSelect(val) {
-      console.log(val);
-      if (val.length === 1) {
-        this.$store.commit('setRandomArtData', 'all')
-      } else if (val.length === 2) {
-        this.$store.commit('setRandomArtData', 'grade')
-      } else {
-        this.$store.commit('setRandomArtData', 'single')
+          })
+        }
+        return data
       }
     }
   },
-  computed: {
-    classType() {
-      console.log(this.$store.state.dashboard.classType);
-      return this.$store.state.dashboard.classType
-    }
-  },
 }
 </script>
 

TEAMModelOS/ClientApp/src/static/mock/cdsqysyzx.json

@@ -0,0 +1,680 @@
+{
+    "music": {
+        "paperArr": [
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷一</span>",
+                "50",
+                "16",
+                "173",
+                "14",
+                "2",
+                "0.78"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷二</span>",
+                "50",
+                "16",
+                "183",
+                "16",
+                "0",
+                "0.82"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷三</span>",
+                "50",
+                "16",
+                "179",
+                "14",
+                "2",
+                "0.83"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷四</span>",
+                "50",
+                "16",
+                "49",
+                "15",
+                "1",
+                "0.72"
+            ]
+        ],
+        "papers": [
+            {
+                "name": "艺术素养测评试卷一",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 173,
+                "validCount": 14,
+                "invalidCount": 2,
+                "difficulty": 0.78
+            },
+            {
+                "name": "艺术素养测评试卷二",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 183,
+                "validCount": 16,
+                "invalidCount": 0,
+                "difficulty": 0.82
+            },
+            {
+                "name": "艺术素养测评试卷三",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 179,
+                "validCount": 14,
+                "invalidCount": 2,
+                "difficulty": 0.83
+            },
+            {
+                "name": "艺术素养测评试卷四",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 49,
+                "validCount": 15,
+                "invalidCount": 1,
+                "difficulty": 0.72
+            }
+        ],
+        "staticData": {
+            "total": 589,
+            "join": 584,
+            "hScore": 49.38,
+            "lScore": 16.08,
+            "average": 40.13,
+            "goodRate": "19.52",
+            "normalRate": "95.21",
+            "standard": 5.29
+        },
+        "knowledges": [
+            {
+                "name": "器乐体裁",
+                "level1": "审美感知",
+                "level2": "音乐体裁与形式",
+                "val": 77.88
+            },
+            {
+                "name": "民歌体裁",
+                "level1": "审美感知",
+                "level2": "音乐体裁与形式",
+                "val": 67.58
+            },
+            {
+                "name": "情绪",
+                "level1": "审美感知",
+                "level2": "音乐情绪与情感",
+                "val": 99.75
+            },
+            {
+                "name": "调式",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 97.21
+            },
+            {
+                "name": "音色",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 85.66
+            },
+            {
+                "name": "节拍",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 79.75
+            },
+            {
+                "name": "曲式",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 28.69
+            },
+            {
+                "name": "中国音乐名曲",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 95.30
+            },
+            {
+                "name": "外国音乐名曲",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 92.40
+            },
+            {
+                "name": "音乐与影视",
+                "level1": "文化理解",
+                "level2": "音乐与姊妹艺术",
+                "val": 97.27
+            },
+            {
+                "name": "中国民族文化",
+                "level1": "文化理解",
+                "level2": "音乐与民族、地域文化",
+                "val": 78.35
+            },
+            {
+                "name": "外国民族文化",
+                "level1": "文化理解",
+                "level2": "音乐与民族、地域文化",
+                "val": 75.57
+            },
+            {
+                "name": "音乐记号",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 79.83
+            },
+            {
+                "name": "视谱跟唱模唱",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 70.19
+            },
+            {
+                "name": "演唱形式",
+                "level1": "艺术表现",
+                "level2": "演唱",
+                "val": 64.73
+            },
+            {
+                "name": "演奏形式",
+                "level1": "艺术表现",
+                "level2": "演奏",
+                "val": 94.01
+            },
+            {
+                "name": "创作手法",
+                "level1": "艺术表现",
+                "level2": "音乐创意表达",
+                "val": 67.67
+            }
+        ],
+        "classData": [
+            {
+                "className": "1班",
+                "total": "44",
+                "join": "41",
+                "hScore": "46.95",
+                "average": "38.91",
+                "goodRate": "9.76",
+                "normalRate": "90.24",
+                "standard": "6"
+            },
+            {
+                "className": "2班",
+                "total": "43",
+                "join": "43",
+                "hScore": "45.95",
+                "average": "37.76",
+                "goodRate": "4.65",
+                "normalRate": "90.7",
+                "standard": "5.42"
+            },
+            {
+                "className": "3班",
+                "total": "43",
+                "join": "43",
+                "hScore": "47.29",
+                "average": "39.65",
+                "goodRate": "11.63",
+                "normalRate": "100",
+                "standard": "1"
+            },
+            {
+                "className": "4班",
+                "total": "48",
+                "join": "48",
+                "hScore": "48.43",
+                "average": "41.22",
+                "goodRate": "22.92",
+                "normalRate": "100",
+                "standard": "4.12"
+            },
+            {
+                "className": "5班",
+                "total": "44",
+                "join": "44",
+                "hScore": "49.38",
+                "average": "41.41",
+                "goodRate": "22.73",
+                "normalRate": "97.73",
+                "standard": "4.59"
+            },
+            {
+                "className": "6班",
+                "total": "44",
+                "join": "43",
+                "hScore": "47.61",
+                "average": "40.57",
+                "goodRate": "16.28",
+                "normalRate": "97.67",
+                "standard": "4.33"
+            },
+            {
+                "className": "7班",
+                "total": "44",
+                "join": "44",
+                "hScore": "47.88",
+                "average": "38.55",
+                "goodRate": "15.91",
+                "normalRate": "93.18",
+                "standard": "5.68"
+            },
+            {
+                "className": "8班",
+                "total": "45",
+                "join": "45",
+                "hScore": "48.18",
+                "average": "40.99",
+                "goodRate": "44.44",
+                "normalRate": "86.67",
+                "standard": "6.71"
+            },
+            {
+                "className": "9班",
+                "total": "49",
+                "join": "48",
+                "hScore": "47.68",
+                "average": "40.65",
+                "goodRate": "16.67",
+                "normalRate": "100",
+                "standard": "4.07"
+            },
+            {
+                "className": "10班",
+                "total": "44",
+                "join": "44",
+                "hScore": "48.09",
+                "average": "42.82",
+                "goodRate": "36.36",
+                "normalRate": "100",
+                "standard": "4.4"
+            },
+            {
+                "className": "11班",
+                "total": "44",
+                "join": "44",
+                "hScore": "46.66",
+                "average": "39.81",
+                "goodRate": "11.36",
+                "normalRate": "95.45",
+                "standard": "4.32"
+            },
+            {
+                "className": "12班",
+                "total": "48",
+                "join": "48",
+                "hScore": "49.33",
+                "average": "43.1",
+                "goodRate": "39.58",
+                "normalRate": "97.92",
+                "standard": "4.12"
+            },
+            {
+                "className": "13班",
+                "total": "49",
+                "join": "49",
+                "hScore": "44.04",
+                "average": "36.12",
+                "goodRate": "0",
+                "normalRate": "87.76",
+                "standard": "5.5"
+            }
+        ],
+        "lessonData": [
+            {
+                "key": "经常",
+                "schoolRate": 3.35,
+                "areaRate": 0.24
+            },
+            {
+                "key": "偶尔",
+                "schoolRate": 13.76,
+                "areaRate": 1.01
+            },
+            {
+                "key": "很少",
+                "schoolRate": 25.04,
+                "areaRate": 3.95
+            },
+            {
+                "key": "从来没有",
+                "schoolRate": 57.85,
+                "areaRate": 94.79
+            }
+        ],
+        "awardData": [
+            {
+                "key": "school",
+                "country": 45,
+                "province": 76,
+                "city": 39,
+                "area": 89,
+                "school": 632
+            },
+            {
+                "key": "areaAverage",
+                "country": 49,
+                "province": 55,
+                "city": 31,
+                "area": 33,
+                "school": 71
+            },
+            {
+                "key": "areaTotal",
+                "country": 1754,
+                "province": 1971,
+                "city": 1098,
+                "area": 1162,
+                "school": 2564
+            }
+        ]
+    },
+    "draw": {
+        "paperArr": [
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷一</span>",
+                "40",
+                "16",
+                "173",
+                "13",
+                "3",
+                "0.93"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷二</span>",
+                "40",
+                "16",
+                "183",
+                "12",
+                "4",
+                "0.95"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷三</span>",
+                "40",
+                "16",
+                "179",
+                "15",
+                "1",
+                "0.85"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷四</span>",
+                "40",
+                "16",
+                "49",
+                "13",
+                "3",
+                "0.91"
+            ]
+        ],
+        "papers": [
+            {
+                "name": "艺术素养测评试卷一",
+                "score": 40,
+                "itemCount": 16,
+                "useCount": 173,
+                "validCount": 13,
+                "invalidCount": 3,
+                "difficulty": 0.93
+            },
+            {
+                "name": "艺术素养测评试卷二",
+                "score": 40,
+                "itemCount": 16,
+                "useCount": 183,
+                "validCount": 12,
+                "invalidCount": 4,
+                "difficulty": 0.95
+            },
+            {
+                "name": "艺术素养测评试卷三",
+                "score": 40,
+                "itemCount": 16,
+                "useCount": 179,
+                "validCount": 15,
+                "invalidCount": 1,
+                "difficulty": 0.85
+            },
+            {
+                "name": "艺术素养测评试卷四",
+                "score": 40,
+                "itemCount": 16,
+                "useCount": 49,
+                "validCount": 13,
+                "invalidCount": 3,
+                "difficulty": 0.91
+            }
+        ],
+        "staticData": {
+            "total": 589,
+            "join": 584,
+            "hScore": 40,
+            "lScore": 23,
+            "average": 36.38,
+            "goodRate": "74.32",
+            "normalRate": "99.66",
+            "standard": 3.58
+        },
+        "knowledges": [
+            {
+                "name": "创意表达",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 100
+            },
+            {
+                "name": "设计应用",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 84.3
+            },
+            {
+                "name": "造型表现",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 92.71
+            },
+            {
+                "name": "图像识读",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 93.42
+            },
+            {
+                "name": "图像类别",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 96.53
+            },
+            {
+                "name": "图像要素",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 87.19
+            }
+        ],
+        "classData": [
+            {
+                "className": "1班",
+                "total": "44",
+                "join": "41",
+                "hScore": "40",
+                "average": "37.12",
+                "goodRate": "82.93",
+                "normalRate": "100",
+                "standard": "2.86"
+            },
+            {
+                "className": "2班",
+                "total": "43",
+                "join": "43",
+                "hScore": "40",
+                "average": "37.16",
+                "goodRate": "79.07",
+                "normalRate": "100",
+                "standard": "2.74"
+            },
+            {
+                "className": "3班",
+                "total": "43",
+                "join": "43",
+                "hScore": "40",
+                "average": "38.05",
+                "goodRate": "95.35",
+                "normalRate": "100",
+                "standard": "2.13"
+            },
+            {
+                "className": "4班",
+                "total": "48",
+                "join": "48",
+                "hScore": "40",
+                "average": "38.41",
+                "goodRate": "93.75",
+                "normalRate": "100",
+                "standard": "1.96"
+            },
+            {
+                "className": "5班",
+                "total": "44",
+                "join": "44",
+                "hScore": "40",
+                "average": "33.7",
+                "goodRate": "43.18",
+                "normalRate": "100",
+                "standard": "3.46"
+            },
+            {
+                "className": "6班",
+                "total": "44",
+                "join": "43",
+                "hScore": "40",
+                "average": "33.37",
+                "goodRate": "48.84",
+                "normalRate": "95.35",
+                "standard": "5.08"
+            },
+            {
+                "className": "7班",
+                "total": "44",
+                "join": "44",
+                "hScore": "40",
+                "average": "37.18",
+                "goodRate": "84.09",
+                "normalRate": "100",
+                "standard": "3.08"
+            },
+            {
+                "className": "8班",
+                "total": "45",
+                "join": "45",
+                "hScore": "40",
+                "average": "36.93",
+                "goodRate": "77.78",
+                "normalRate": "100",
+                "standard": "2.78"
+            },
+            {
+                "className": "9班",
+                "total": "49",
+                "join": "48",
+                "hScore": "40",
+                "average": "37.63",
+                "goodRate": "91.67",
+                "normalRate": "100",
+                "standard": "3.26"
+            },
+            {
+                "className": "10班",
+                "total": "44",
+                "join": "44",
+                "hScore": "40",
+                "average": "38.59",
+                "goodRate": "88.64",
+                "normalRate": "100",
+                "standard": "2.65"
+            },
+            {
+                "className": "11班",
+                "total": "44",
+                "join": "44",
+                "hScore": "40",
+                "average": "32.8",
+                "goodRate": "34.09",
+                "normalRate": "100",
+                "standard": "3.93"
+            },
+            {
+                "className": "12班",
+                "total": "48",
+                "join": "48",
+                "hScore": "40",
+                "average": "36.48",
+                "goodRate": "72.92",
+                "normalRate": "100",
+                "standard": "2.33"
+            },
+            {
+                "className": "13班",
+                "total": "49",
+                "join": "49",
+                "hScore": "40",
+                "average": "36.29",
+                "goodRate": "71.43",
+                "normalRate": "100",
+                "standard": "3.1"
+            }
+        ],
+        "lessonData": [
+            {
+                "key": "经常",
+                "schoolRate": 7.05,
+                "areaRate": 0.33
+            },
+            {
+                "key": "偶尔",
+                "schoolRate": 18.69,
+                "areaRate": 1.26
+            },
+            {
+                "key": "很少",
+                "schoolRate": 27.16,
+                "areaRate": 3.77
+            },
+            {
+                "key": "从来没有",
+                "schoolRate": 47.09,
+                "areaRate": 94.64
+            }
+        ],
+        "awardData": [
+            {
+                "key": "school",
+                "country": 82,
+                "province": 68,
+                "city": 28,
+                "area": 25,
+                "school": 683
+            },
+            {
+                "key": "areaAverage",
+                "country": 52,
+                "province": 37,
+                "city": 20,
+                "area": 15,
+                "school": 93
+            },
+            {
+                "key": "areaTotal",
+                "country": 1854,
+                "province": 1314,
+                "city": 715,
+                "area": 524,
+                "school": 3331
+            }
+        ]
+    }
+}

TEAMModelOS/ClientApp/src/static/mock/cdssyxxArt.json

@@ -0,0 +1,462 @@
+{
+    "music": {
+        "paperArr": [
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷一</span>",
+                "50",
+                "16",
+                "206",
+                "10",
+                "6",
+                "0.93"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷二</span>",
+                "50",
+                "16",
+                "103",
+                "10",
+                "6",
+                "0.96"
+            ]
+        ],
+        "papers": [
+            {
+                "name": "艺术素养测评试卷一",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 206,
+                "validCount": 10,
+                "invalidCount": 6,
+                "difficulty": 0.93
+            },
+            {
+                "name": "艺术素养测评试卷二",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 103,
+                "validCount": 10,
+                "invalidCount": 6,
+                "difficulty": 0.96
+            }
+        ],
+        "staticData": {
+            "total": 310,
+            "join": 309,
+            "hScore": 49.95,
+            "lScore": 29.16,
+            "average": 47.19,
+            "goodRate": "82.52",
+            "normalRate": "99.68",
+            "standard": 3.34
+        },
+        "knowledges": [
+            {
+                "name": "戏曲",
+                "level1": "审美感知",
+                "level2": "音乐体裁与形式",
+                "val": 98.71
+            },
+            {
+                "name": "民歌体裁",
+                "level1": "审美感知",
+                "level2": "音乐体裁与形式",
+                "val": 98.06
+            },
+            {
+                "name": "情绪",
+                "level1": "审美感知",
+                "level2": "音乐情绪与情感",
+                "val": 99.19
+            },
+            {
+                "name": "速度",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 98.71
+            },
+            {
+                "name": "节拍",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 95.61
+            },
+            {
+                "name": "音色",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 91.91
+            },
+            {
+                "name": "中国音乐名家",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 100.00
+            },
+            {
+                "name": "中国音乐名曲",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 100.00
+            },
+            {
+                "name": "外国音乐名曲",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 91.75
+            },
+            {
+                "name": "外国音乐名家",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 98.06
+            },
+            {
+                "name": "中国民族文化",
+                "level1": "文化理解",
+                "level2": "音乐与民族、地域文化",
+                "val": 98.71
+            },
+            {
+                "name": "音符",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 92.72
+            },
+            {
+                "name": "音乐记号",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 86.02
+            },
+            {
+                "name": "视谱跟唱模唱",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 94.71
+            },
+            {
+                "name": "演唱形式",
+                "level1": "艺术表现",
+                "level2": "演唱",
+                "val": 92.23
+            },
+            {
+                "name": "演奏形式",
+                "level1": "艺术表现",
+                "level2": "演奏",
+                "val": 92.23
+            }
+        ],
+        "classData": [
+            {
+                "className": "1班",
+                "total": 52,
+                "join": 51,
+                "hScore": 49.84,
+                "average": 48.00,
+                "goodRate": 90.20,
+                "normalRate": 100.00,
+                "standard": 2.36
+            },
+            {
+                "className": "2班",
+                "total": 52,
+                "join": 52,
+                "hScore": 49.83,
+                "average": 47.34,
+                "goodRate": 82.69,
+                "normalRate": 100,
+                "standard": 2.93
+            },
+            {
+                "className": "3班",
+                "total": 51,
+                "join": 51,
+                "hScore": 49.89,
+                "average": 47.42,
+                "goodRate": 88.24,
+                "normalRate": 98.04,
+                "standard": 3.42
+            },
+            {
+                "className": "4班",
+                "total": 52,
+                "join": 52,
+                "hScore": 49.73,
+                "average": 46.93,
+                "goodRate": 78.85,
+                "normalRate": 100,
+                "standard": 3.39
+            },
+            {
+                "className": "5班",
+                "total": 50,
+                "join": 50,
+                "hScore": 49.95,
+                "average": 47.42,
+                "goodRate": 82,
+                "normalRate": 100,
+                "standard": 2.59
+            },
+            {
+                "className": "6班",
+                "total": 53,
+                "join": 53,
+                "hScore": 49.80,
+                "average": 46.05,
+                "goodRate": 73.58,
+                "normalRate": 100,
+                "standard": 4.51
+            }
+        ],
+        "lessonData": [
+            {
+                "key": "经常",
+                "schoolRate": 0,
+                "areaRate": 0.24
+            },
+            {
+                "key": "偶尔",
+                "schoolRate": 0.33,
+                "areaRate": 1.01
+            },
+            {
+                "key": "很少",
+                "schoolRate": 4.28,
+                "areaRate": 3.95
+            },
+            {
+                "key": "从来没有",
+                "schoolRate": 95.39,
+                "areaRate": 94.79
+            }
+        ],
+        "awardData": [
+            {
+                "key": "school",
+                "country": 211,
+                "province": 177,
+                "city": 85,
+                "area": 42,
+                "school": 316
+            },
+            {
+                "key": "areaAverage",
+                "country": 49,
+                "province": 55,
+                "city": 31,
+                "area": 33,
+                "school": 71
+            },
+            {
+                "key": "areaTotal",
+                "country": 1754,
+                "province": 1971,
+                "city": 1098,
+                "area": 1162,
+                "school": 2564
+            }
+        ]
+    },
+    "draw": {
+        "paperArr": [
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷一</span>",
+                "40",
+                "16",
+                "206",
+                "5",
+                "11",
+                "0.99"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷二</span>",
+                "40",
+                "16",
+                "103",
+                "5",
+                "11",
+                "0.98"
+            ]
+        ],
+        "papers": [
+            {
+                "name": "艺术素养测评试卷一",
+                "score": 40,
+                "itemCount": 16,
+                "useCount": 206,
+                "validCount": 5,
+                "invalidCount": 11,
+                "difficulty": 0.99
+            },
+            {
+                "name": "艺术素养测评试卷二",
+                "score": 40,
+                "itemCount": 16,
+                "useCount": 103,
+                "validCount": 5,
+                "invalidCount": 11,
+                "difficulty": 0.98
+            }
+        ],
+        "staticData": {
+            "total": 310,
+            "join": 309,
+            "hScore": 40,
+            "lScore": 30,
+            "average": 39.43,
+            "goodRate": "97.41",
+            "normalRate": "100",
+            "standard": 1.43
+        },
+        "knowledges": [
+            {
+                "name": "民族文化",
+                "level1": "文化理解",
+                "level2": "美术与自然、地域",
+                "val": 98.83
+            },
+            {
+                "name": "设计应用",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 99.68
+            },
+            {
+                "name": "造型表现",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 99.39
+            },
+            {
+                "name": "图像识读",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 99.03
+            },
+            {
+                "name": "图像类别",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 97.15
+            },
+            {
+                "name": "图像要素",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 96.12
+            }
+        ],
+        "classData": [
+            {
+                "className": "1班",
+                "total": 52,
+                "join": 51,
+                "hScore": 40,
+                "average": 38.86,
+                "goodRate": 94.12,
+                "normalRate": 100,
+                "standard": 2.14
+            },
+            {
+                "className": "2班",
+                "total": 52,
+                "join": 52,
+                "hScore": 40,
+                "average": 39.35,
+                "goodRate": 100,
+                "normalRate": 100,
+                "standard": 1.16
+            },
+            {
+                "className": "3班",
+                "total": 51,
+                "join": 51,
+                "hScore": 40,
+                "average": 39.22,
+                "goodRate": 92.16,
+                "normalRate": 100,
+                "standard": 1.77
+            },
+            {
+                "className": "4班",
+                "total": 52,
+                "join": 52,
+                "hScore": 40,
+                "average": 39.73,
+                "goodRate": 100,
+                "normalRate": 100,
+                "standard": 0.88
+            },
+            {
+                "className": "5班",
+                "total": 50,
+                "join": 50,
+                "hScore": 40,
+                "average": 39.80,
+                "goodRate": 98,
+                "normalRate": 100,
+                "standard": 0.92
+            },
+            {
+                "className": "6班",
+                "total": 53,
+                "join": 53,
+                "hScore": 40,
+                "average": 39.62,
+                "goodRate": 100,
+                "normalRate": 100,
+                "standard": 1.03
+            }
+        ],
+        "lessonData": [
+            {
+                "key": "经常",
+                "schoolRate": 0,
+                "areaRate": 0.33
+            },
+            {
+                "key": "偶尔",
+                "schoolRate": 3.95,
+                "areaRate": 1.26
+            },
+            {
+                "key": "很少",
+                "schoolRate": 6.58,
+                "areaRate": 3.77
+            },
+            {
+                "key": "从来没有",
+                "schoolRate": 89.47,
+                "areaRate": 94.64
+            }
+        ],
+        "awardData": [
+            {
+                "key": "school",
+                "country": 159,
+                "province": 116,
+                "city": 58,
+                "area": 37,
+                "school": 525
+            },
+            {
+                "key": "areaAverage",
+                "country": 52,
+                "province": 37,
+                "city": 20,
+                "area": 15,
+                "school": 93
+            },
+            {
+                "key": "areaTotal",
+                "country": 1854,
+                "province": 1314,
+                "city": 715,
+                "area": 524,
+                "school": 3331
+            }
+        ]
+    }
+}

TEAMModelOS/ClientApp/src/static/mock/defaultSchoolArt.json

@@ -0,0 +1,498 @@
+{
+    "music": {
+        "paperArr": [
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷一</span>",
+                "50",
+                "16",
+                "86",
+                "13",
+                "3",
+                "0.84"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷二</span>",
+                "50",
+                "16",
+                "86",
+                "15",
+                "1",
+                "0.83"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷三</span>",
+                "50",
+                "16",
+                "88",
+                "13",
+                "3",
+                "0.88"
+            ]
+        ],
+        "papers": [
+            {
+                "name": "艺术素养测评试卷一",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 86,
+                "validCount": 13,
+                "invalidCount": 3,
+                "difficulty": 0.84
+            },
+            {
+                "name": "艺术素养测评试卷二",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 86,
+                "validCount": 15,
+                "invalidCount": 1,
+                "difficulty": 0.83
+            },
+            {
+                "name": "艺术素养测评试卷三",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 86,
+                "validCount": 13,
+                "invalidCount": 3,
+                "difficulty": 0.88
+            }
+        ],
+        "staticData": {
+            "total": 263,
+            "join": 260,
+            "hScore": 49.76,
+            "lScore": 28.42,
+            "average": 42.58,
+            "goodRate": "34.23",
+            "normalRate": "98.85",
+            "standard": 4.31
+        },
+        "knowledges": [
+            {
+                "name": "戏曲",
+                "level1": "审美感知",
+                "level2": "音乐体裁与形式",
+                "val": 96.51
+            },
+            {
+                "name": "民歌体裁",
+                "level1": "审美感知",
+                "level2": "音乐体裁与形式",
+                "val": 82.18
+            },
+            {
+                "name": "情绪",
+                "level1": "审美感知",
+                "level2": "音乐情绪与情感",
+                "val": 94.52
+            },
+            {
+                "name": "速度",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 95
+            },
+            {
+                "name": "节拍",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 91.98
+            },
+            {
+                "name": "音色",
+                "level1": "审美感知",
+                "level2": "音乐表现要素及音乐音响材料",
+                "val": 88.05
+            },
+            {
+                "name": "中国音乐名家",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 93.02
+            },
+            {
+                "name": "中国音乐名曲",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 86.21
+            },
+            {
+                "name": "外国音乐名曲",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 83.72
+            },
+            {
+                "name": "外国音乐名家",
+                "level1": "审美感知",
+                "level2": "音乐风格与流派",
+                "val": 71.59
+            },
+            {
+                "name": "中国民族文化",
+                "level1": "文化理解",
+                "level2": "音乐与民族、地域文化",
+                "val": 87.21
+            },
+            {
+                "name": "音符",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 86.82
+            },
+            {
+                "name": "音乐记号",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 85.82
+            },
+            {
+                "name": "视谱跟唱模唱",
+                "level1": "艺术表现",
+                "level2": "乐谱识读与运用",
+                "val": 81.92
+            },
+            {
+                "name": "演唱形式",
+                "level1": "艺术表现",
+                "level2": "演唱",
+                "val": 69.37
+            },
+            {
+                "name": "演奏形式",
+                "level1": "艺术表现",
+                "level2": "演奏",
+                "val": 4.65
+            }
+        ],
+        "classData": [
+            {
+                "className": "1班",
+                "total": 44,
+                "join": 44,
+                "hScore": 49.76,
+                "average": 43.13,
+                "goodRate": 34.09,
+                "normalRate": 97.73,
+                "standard": 3.95
+            },
+            {
+                "className": "2班",
+                "total": 43,
+                "join": 43,
+                "hScore": 49.5,
+                "average": 41.58,
+                "goodRate": 25.58,
+                "normalRate": 100,
+                "standard": 4.79
+            },
+            {
+                "className": "3班",
+                "total": 44,
+                "join": 43,
+                "hScore": 48.44,
+                "average": 41.48,
+                "goodRate": 27.91,
+                "normalRate": 95.35,
+                "standard": 4.6
+            },
+            {
+                "className": "4班",
+                "total": 44,
+                "join": 42,
+                "hScore": 49.68,
+                "average": 43.58,
+                "goodRate": 47.62,
+                "normalRate": 100,
+                "standard": 4.26
+            },
+            {
+                "className": "5班",
+                "total": 44,
+                "join": 44,
+                "hScore": 49.5,
+                "average": 42.87,
+                "goodRate": 34.09,
+                "normalRate": 100,
+                "standard": 3.44
+            },
+            {
+                "className": "6班",
+                "total": 44,
+                "join": 44,
+                "hScore": 49.62,
+                "average": 42.87,
+                "goodRate": 36.36,
+                "normalRate": 100,
+                "standard": 4.25
+            }
+        ],
+        "lessonData": [
+            {
+                "key": "经常",
+                "schoolRate": 0,
+                "areaRate": 0.24
+            },
+            {
+                "key": "偶尔",
+                "schoolRate": 0,
+                "areaRate": 1.01
+            },
+            {
+                "key": "很少",
+                "schoolRate": 1.53,
+                "areaRate": 3.95
+            },
+            {
+                "key": "从来没有",
+                "schoolRate": 98.47,
+                "areaRate": 98.48
+            }
+        ],
+        "awardData": [
+            {
+                "key": "school",
+                "country": 18,
+                "province": 21,
+                "city": 9,
+                "area": 7,
+                "school": 28
+            },
+            {
+                "key": "areaAverage",
+                "country": 49,
+                "province": 55,
+                "city": 31,
+                "area": 33,
+                "school": 71
+            },
+            {
+                "key": "areaTotal",
+                "country": 1754,
+                "province": 1971,
+                "city": 1098,
+                "area": 1162,
+                "school": 2564
+            }
+        ]
+    },
+    "draw": {
+        "paperArr": [
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷一</span>",
+                "40",
+                "16",
+                "86",
+                "13",
+                "3",
+                "0.94"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷二</span>",
+                "40",
+                "16",
+                "86",
+                "15",
+                "1",
+                "0.92"
+            ],
+            [
+                "<span style=\"color:#32c5e9;font-weight: bold;\">艺术素养测评试卷三</span>",
+                "40",
+                "16",
+                "88",
+                "13",
+                "1",
+                "0.88"
+            ]
+        ],
+        "papers": [
+            {
+                "name": "艺术素养测评试卷一",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 86,
+                "validCount": 13,
+                "invalidCount": 3,
+                "difficulty": 0.84
+            },
+            {
+                "name": "艺术素养测评试卷二",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 86,
+                "validCount": 15,
+                "invalidCount": 1,
+                "difficulty": 0.83
+            },
+            {
+                "name": "艺术素养测评试卷三",
+                "score": 50,
+                "itemCount": 16,
+                "useCount": 86,
+                "validCount": 13,
+                "invalidCount": 3,
+                "difficulty": 0.88
+            }
+        ],
+        "staticData": {
+            "total": 263,
+            "join": 260,
+            "hScore": 40,
+            "lScore": 18,
+            "average": 36.54,
+            "goodRate": "72.69",
+            "normalRate": "98.08",
+            "standard": 3.87
+        },
+        "knowledges": [
+            {
+                "name": "民族文化",
+                "level1": "文化理解",
+                "level2": "美术与自然、地域",
+                "val": 97.29
+            },
+            {
+                "name": "设计应用",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 99.08
+            },
+            {
+                "name": "造型表现",
+                "level1": "美术表现",
+                "level2": "创作实践",
+                "val": 89.85
+            },
+            {
+                "name": "图像识读",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 91.5
+            },
+            {
+                "name": "图像类别",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 91.15
+            },
+            {
+                "name": "图像要素",
+                "level1": "美术表现",
+                "level2": "视觉形象感知",
+                "val": 89.21
+            }
+        ],
+        "classData": [
+            {
+                "className": "1班",
+                "total": 44,
+                "join": 44,
+                "hScore": 40,
+                "average": 36.18,
+                "goodRate": 70.45,
+                "normalRate": 95.45,
+                "standard": 4.41
+            },
+            {
+                "className": "2班",
+                "total": 43,
+                "join": 43,
+                "hScore": 40,
+                "average": 36.14,
+                "goodRate": 72.09,
+                "normalRate": 100,
+                "standard": 3.51
+            },
+            {
+                "className": "3班",
+                "total": 44,
+                "join": 43,
+                "hScore": 40,
+                "average": 35.81,
+                "goodRate": 67.44,
+                "normalRate": 95.35,
+                "standard": 4.68
+            },
+            {
+                "className": "4班",
+                "total": 44,
+                "join": 42,
+                "hScore": 40,
+                "average": 37.48,
+                "goodRate": 76.19,
+                "normalRate": 100,
+                "standard": 2.86
+            },
+            {
+                "className": "5班",
+                "total": 44,
+                "join": 44,
+                "hScore": 40,
+                "average": 36.73,
+                "goodRate": 70.45,
+                "normalRate": 100,
+                "standard": 3.14
+            },
+            {
+                "className": "6班",
+                "total": 44,
+                "join": 44,
+                "hScore": 40,
+                "average": 36.91,
+                "goodRate": 79.55,
+                "normalRate": 97.73,
+                "standard": 4.03
+            }
+        ],
+        "lessonData": [
+            {
+                "key": "经常",
+                "schoolRate": 0,
+                "areaRate": 0.33
+            },
+            {
+                "key": "偶尔",
+                "schoolRate": 1.26,
+                "areaRate": 0.38
+            },
+            {
+                "key": "很少",
+                "schoolRate": 0,
+                "areaRate": 3.77
+            },
+            {
+                "key": "从来没有",
+                "schoolRate": 99.62,
+                "areaRate": 94.64
+            }
+        ],
+        "awardData": [
+            {
+                "key": "school",
+                "country": 17,
+                "province": 16,
+                "city": 8,
+                "area": 8,
+                "school": 37
+            },
+            {
+                "key": "areaAverage",
+                "country": 52,
+                "province": 37,
+                "city": 20,
+                "area": 15,
+                "school": 93
+            },
+            {
+                "key": "areaTotal",
+                "country": 1854,
+                "province": 1314,
+                "city": 715,
+                "area": 524,
+                "school": 3331
+            }
+        ]
+    }
+}

TEAMModelOS/ClientApp/src/view/art/SchoolArt.vue

@@ -4,17 +4,6 @@
             <dv-loading v-if="loading">{{ $t('researchCenter.dashboard.loading') }}</dv-loading>
             <div v-else class="host-body">
                 <div class="tools">
-                    <!-- <span style="display:flex;">
-            <Select v-model="activeGradeIndex" class-name="dashboard-select" @on-change="onChangeGrade(activeGradeIndex)">
-              <Option v-for="(item,index) in grades" :value="index">{{ item }}</Option>
-            </Select>
-          </span>
-          <span style="display:flex;">
-            <Select v-model="activeClassIndex" class-name="dashboard-select" @on-change="onChangeClass(activeClassIndex)">
-              <Option :value="-1">所有班级</Option>
-              <Option v-for="(item,index) in classes" :value="index">{{ item }}</Option>
-            </Select>
-          </span> -->
                     <span class="time-text">{{ dateYear }} <span style="display: inline-block; margin: 0 5px;color: #0fa2fe;">{{ dateDay }}</span> </span>
                     <span class="icon iconfont icon-tuichuquanping" style="font-size: 22px;" :title="$t('researchCenter.dashboard.quit')" @click="goBack"></span>
                 </div>
@@ -23,12 +12,6 @@
                     <span class="school-info-name">{{ schoolInfo.schoolName }}</span>
                     <span class="school-info-period">{{ schoolInfo.periodName }}</span>
                     <span class="school-info-semester">{{ schoolInfo.curSemester }}</span>
-                    <!-- <span>
-            <Select v-model="activeMenu" class-name="dashboard-select" @on-change="onChangeSubject(activeMenu)">
-              <Option value="paint">美术</Option>
-              <Option value="music">音乐</Option>
-            </Select>
-          </span> -->
                     <span :class="['dashboard-menu',activeMenu === 'music' ? 'dashboard-menu-active' : '']" @click="onChangeSubject('music')">音乐</span>
                     <span :class="['dashboard-menu',activeMenu === 'paint' ? 'dashboard-menu-active' : '']" @click="onChangeSubject('paint')">美术</span>
                 </div>
@@ -54,14 +37,9 @@
                         </div>
                         <div class="left-box-center">
                             <dv-border-box-12>
-                                <RightTop />
+                                <RightTop :school="schoolInfo.schoolName" />
                             </dv-border-box-12>
                         </div>
-                        <!-- <div class="left-box-bottom">
-              <dv-border-box-12>
-                <LeftCenter />
-              </dv-border-box-12>
-            </div> -->
                     </div>
 
                     <div class="right-box">
@@ -116,8 +94,6 @@ export default {
             dateDay: null,
             dateYear: null,
             dateWeek: null,
-            classes: ['1班', '2班', '3班', '4班', '5班', '6班'],
-            grades: ['五年级', '六年级']
         }
     },
     components: {
@@ -134,7 +110,6 @@ export default {
     mounted() {
         this.$tools.fullScreen(document.getElementById('artIndex'))
         this.timeFn()
-        // this.cancelLoading()
     },
     beforeDestroy() {
         clearInterval(this.timing)
@@ -143,11 +118,12 @@ export default {
         this.defImg = require('@/assets/image/def-school-img.png')
         this.curPeriod = this.$store.state.user.curPeriod
         this.$store.state.dashboard.classType = 'all'
-        // this.getDashboardData()
-        this.onChangeSubject('music')
-        this.cancelLoading()
         let routerData = this.$route.params
         this.schoolInfo.schoolName = routerData && routerData.schoolInfo ? routerData.schoolInfo.name : ''
+        sessionStorage.setItem('artSchool', this.schoolInfo.schoolName)
+        this.onChangeSubject('music')
+        this.cancelLoading()
+        console.log(routerData)
     },
     methods: {
         onChangeClass(classIndex) {
@@ -156,11 +132,10 @@ export default {
         onChangeGrade(gradeIndex) {
             this.activeClassIndex = -1
             this.onChangeClass(-1)
-            // this.$store.commit('setRandomArtData', { index: classIndex, subject: this.activeMenu })
         },
         onChangeSubject(subject) {
             this.activeMenu = subject
-            this.$store.commit('setArtDashboardData', subject)
+            this.$store.commit('setArtDashboardData', { subject, school: this.schoolInfo.schoolName })
             this.$store.commit('setRandomArtData', 'all')
         },
         getDashboardData() {
@@ -177,7 +152,6 @@ export default {
         },
         goBack() {
             this.$tools.exitFullscreen()
-            // this.$router.push('/home/Dashboard')
             this.$router.go(-1)
         },
         timeFn() {
@@ -192,18 +166,6 @@ export default {
             }, 1000)
         },
     },
-    // computed: {
-    //     schoolInfo() {
-    //         let store_user = this.$store.state.user
-    //         let semesterRange = this.$tools.getSemesterTimeRange()
-    //         return {
-    //             schoolName: store_user.schoolProfile.school_base.name,
-    //             schoolLogo: store_user.schoolProfile.school_base.picture,
-    //             periodName: store_user.curPeriod.name,
-    //             curSemester: semesterRange.name
-    //         }
-    //     }
-    // }
 }
 </script>
 <style lang="less" scope>

TEAMModelOS/ClientApp/src/view/dashboard/Art.vue

@@ -150,7 +150,7 @@ export default {
     },
     onChangeSubject(subject) {
       this.activeMenu = subject
-      this.$store.commit('setArtDashboardData', subject)
+      this.$store.commit('setArtDashboardData', {subject})
       this.$store.commit('setRandomArtData', 'all')
     },
     getDashboardData() {

TEAMModelOS/ClientApp/src/view/dashboard/Student.vue

@@ -255,7 +255,7 @@ export default {
     },
     onChangeSubject(subject) {
       this.activeMenu = subject
-      this.$store.commit('setArtDashboardData', subject)
+      this.$store.commit('setArtDashboardData', {subject})
       this.$store.commit('setRandomArtData', 'all')
     },
     getDashboardData() {

TEAMModelOS/ClientApp/src/view/dashboard/StudentAll.vue

@@ -329,7 +329,7 @@ export default {
     },
     onChangeSubject(subject) {
       this.activeMenu = subject
-      this.$store.commit('setArtDashboardData', subject)
+      this.$store.commit('setArtDashboardData', {subject})
       this.$store.commit('setRandomArtData', 'all')
     },
     getDashboardData() {

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -310,7 +310,7 @@ namespace TEAMModelOS.Controllers
                             }
                             catch (Exception ex)
                             {
-                                await _dingDing.SendBotMsg($"IES5，{_option.Location}，Teacher/init/set-teacher-info:SetTeacherSubject()\n{ex.Message}\n{ex.StackTrace}{request.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
+                                await _dingDing.SendBotMsg($"IES5，{_option.Location}，Teacher/init/set-teacher-info:SetTeacherSubject()\n{ex.Message}\n{ex.StackTrace}{request.ToJsonString()}\n{school}", GroupNames.醍摩豆服務運維群組);
                             }
                         }
                         return BadRequest(new { status = -1, msg = "参数异常！" });