Add:紫藤小学艺术看板学生得分数据导入

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

@@ -56,6 +56,8 @@ export default {
         dataZoom: [{
           show: true,
           height: 10,
+          start: data.length > 10 ? 40 : 0,
+          end: data.length > 10 ? 60 : 100,
           xAxisIndex: [0],
           bottom: 10,
           handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
@@ -205,22 +207,6 @@ export default {
               }
             },
             data: data.map(i => i.average)
-          },
-          {
-            type: 'bar',
-            stack: 'bar',
-            z: 2,
-            zlevel: 2,
-            barGap: '-250%',
-            barWidth: '50%',
-            data: data.map(i => 50),
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  return params.dataIndex === that.activeIndex ? 'rgba(140,120,250,0.4)' : 'rgba(0,0,0,0)';
-                },
-              }
-            },
           }]
       };
       myChart.clear()

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

@@ -52,7 +52,12 @@ export default {
       if (val.length === 1) {
         this.$store.commit('setRandomArtData', this.isYdzt ? 'grade' : 'all')
       } else if (val.length === 2) {
-        this.$store.commit('setRandomArtData', this.isYdzt ? 'single' : 'grade')
+        // this.$store.commit('setRandomArtData', this.isYdzt ? 'single' : 'grade')
+        if (!this.isYdzt) {
+          this.$store.commit('setRandomArtData', 'grade')
+        } else {
+          this.$store.commit('setYdztStuData', val)
+        }
       } else {
         if (!this.isYdzt) {
           this.$store.commit('setRandomArtData', 'single')

TEAMModelOS/ClientApp/src/store/module/dashboard.js

@@ -278,7 +278,25 @@ export default {
 					i.val = $tools.randomNum(10, 90)
 				})
 			}
-
+		},
+		setYdztStuData(state, val) {
+			state.classType = 'single'
+			console.log(val)
+			let className = val[val.length - 1].slice(-1)
+			let ydztStu = require('../../static/mock/ydztStu.json')
+			console.error(ydztStu[state.subject].filter(k => k.className === className))
+			state.artDashboard.classData = ydztStu[state.subject].filter(k => k.className === className).map(i => {
+				return {
+					className: i.name,
+					total: 0,
+					join: 0,
+					hScore: i.score,
+					average: state.subject === 'music' ? 97.42 : 96.52,
+					goodRate: 0,
+					normalRate: 0,
+					standard: 0
+				}
+			})
 		},
 		setRandomArtData(state, type) {
 			let artData = {}
@@ -297,10 +315,6 @@ export default {
 			if (type === 'all') {
 				state.classType = 'all'
 				state.artDashboard.knowledges = artData[key].knowledges
-				// state.artDashboard.knowledges.forEach(i => {
-				// 	i.val = $tools.randomNum(10, 90)
-				// })
-
 				state.artDashboard.classData = [
 					{
 						className: school == '成都市青羊实验中学' ? '八年级' : '五年级',
@@ -328,32 +342,10 @@ export default {
 			} else if (type === 'grade') {
 				state.artDashboard.classData = JSON.parse(JSON.stringify(state.subject === 'music' ? artData.music : artData.draw)).classData
 				state.artDashboard.knowledges = artData[key].knowledges
-				// state.artDashboard.knowledges.forEach(i => {
-				// 	i.val = $tools.randomNum(10, 90)
-				// })
 				state.classType = 'grade'
 			} else {
 				state.artDashboard.knowledges = artData[key].knowledges
-				// state.artDashboard.knowledges.forEach(i => {
-				// 	i.val = $tools.randomNum(10, 90)
-				// })
 				state.classType = 'single'
-				// state.artDashboard.staticData.total = $tools.randomNum(30, 50)
-				// state.artDashboard.staticData.join = state.artDashboard.staticData.total - $tools.randomNum(0, 2)
-				// state.artDashboard.staticData.hScore = $tools.randomNum(40, 50)
-				// state.artDashboard.staticData.lScore = $tools.randomNum(20, 30)
-				// state.artDashboard.staticData.average = $tools.randomNum(30, 45)
-				// state.artDashboard.staticData.goodRate = $tools.randomNum(70, 90)
-				// state.artDashboard.staticData.normalRate = $tools.randomNum(90, 100)
-				// state.artDashboard.paperArr.forEach(i => {
-				// 	i[3] = $tools.randomNum(10, 20)
-				// })
-
-				// state.artDashboard.awardData[0].country = $tools.randomNum(0, 10)
-				// state.artDashboard.awardData[0].province = $tools.randomNum(0, 10)
-				// state.artDashboard.awardData[0].city = $tools.randomNum(0, 10)
-				// state.artDashboard.awardData[0].area = $tools.randomNum(0, 10)
-				// state.artDashboard.awardData[0].school = $tools.randomNum(0, 10)
 				state.artDashboard.classData = state.stuArr.map(i => {
 					return {
 						className: i.name,