Merge branch 'develop3.0-tmd' into develop3.0

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseKnowledgeDetail.vue

@@ -218,7 +218,9 @@
         computed: {
             // 获取最新散点图数据
             getKnowledgeData() {
-                return this.echartsId === 'knowDetailBar' ? this.$store.state.totalAnalysis.analysisJson.pointKey : this.$store.state.totalAnalysis.analysisJson.levelKey
+				let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                return this.echartsId === 'knowDetailBar' ? this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].pointKey : 
+				this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].levelKey
             }
         },
         watch: {

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseKnowledgeRadar.vue

@@ -138,7 +138,8 @@
         computed: {
             // 获取最新散点图数据
             getKnowledgeData() {
-                return this.$store.state.totalAnalysis.analysisJson.pointKey
+                let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                return this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].pointKey
             }
         },
         watch: {

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseLevelPie.vue

@@ -62,7 +62,8 @@
         computed: {
             // 获取最新知识点占比饼图数据
             getPieData() {
-                let levelJson = this.$store.state.totalAnalysis.analysisJson.levelKey
+				let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                let levelJson = this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].levelKey
                 let transArr = ["知识", "理解", "应用", "分析", "综合", "评鉴"]
                 levelJson.pointList = levelJson.pointList.map((i,index) => transArr[index])
                 for(let key in levelJson.classpercent){

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseLevelRadar.vue

@@ -138,7 +138,17 @@
         computed: {
             // 获取最新散点图数据
             getKnowledgeData() {
-                return this.$store.state.totalAnalysis.analysisJson.levelKey
+                let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                let levelJson = this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].levelKey
+                let transArr = ["知识", "理解", "应用", "分析", "综合", "评鉴"]
+                levelJson.pointList = levelJson.pointList.map((i,index) => transArr[index])
+                for(let key in levelJson.classpercent){
+                	if(key !== 'className'){
+                		let newKey = transArr[+key - 1]
+                		levelJson.classpercent[newKey] = levelJson.classpercent[key]
+                	}
+                }
+                return levelJson
             }
         },
         watch: {

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseMyTable.vue

@@ -336,6 +336,8 @@
             // 是否进线
             renderEntry(h, params) {
                 const row = params.row
+				const ipoint = this.$store.state.totalAnalysis.analysisJson.ipoint
+				const touchScore = this.$store.state.totalAnalysis.analysisJson.touchScore
                 return h('span', [
                     h('span', {
                         domProps: {
@@ -343,9 +345,9 @@
                         },
                         style: {
                             cursor: 'pointer',
-                            background: row.score > 200 ? '#209a31' : row.score > 180 ? '#00767d' : 'transparent'
+                            background: row.score > (ipoint + touchScore) ? '#209a31' : row.score > ipoint ? '#00767d' : 'transparent'
                         }
-                    }, row.score > 200 ? '进' : row.score > 180 ? '踩' : ''),
+                    }, row.score > (ipoint + touchScore) ? '进' : row.score > ipoint ? '踩' : ''),
                     h('span', {
                         domProps: {
                             className: 'table-rank-value'

TEAMModelOS/ClientApp/src/components/student-analysis/total/BasePie.vue

@@ -69,7 +69,8 @@
         computed: {
             // 获取最新知识点占比饼图数据
             getPieData() {
-                return this.$store.state.totalAnalysis.analysisJson.pointKey
+                let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                return this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].pointKey
             }
         },
         watch: {

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue

@@ -77,9 +77,9 @@
                         filterMultiple: false,
                         filterRemote(value, row) {
                             if (value === 1) {
-                                this.entryTableData = this.entryTableData.filter(item => item.score > 180)
+                                this.entryTableData = this.entryTableData.filter(item => item.score > this.getAnalysisJson.ipoint)
                             } else if (value === 2) {
-                                this.entryTableData = this.entryTableData.filter(item => item.score > 180 && item.score < 200)
+                                this.entryTableData = this.entryTableData.filter(item => item.score > this.getAnalysisJson.ipoint && item.score < this.getAnalysisJson.ipoint + this.getAnalysisJson.touchScore)
                             }
                         }
                     }

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/KnowledgeAnalysis/KnowledgeAnalysis.vue

@@ -132,7 +132,8 @@
         computed: {
             // 获取最新散点图数据
             getKnowledgeData() {
-                return this.$store.state.totalAnalysis.analysisJson.pointKey
+				let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                return this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].pointKey
             },
 			
 			getAnalysisJson() {
@@ -140,7 +141,8 @@
 			},
 			
 			hasKnowledge(){
-				return this.$store.state.totalAnalysis.analysisJson.pointKey.classpercent
+				let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+				return this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].pointKey.classpercent
 			}
         }
     }

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/KnowledgeAnalysis/ScoreDetails.vue

@@ -193,7 +193,8 @@
         computed: {
             // 获取最新散点图数据
             getKnowledgeData() {
-                return this.$store.state.totalAnalysis.analysisJson.pointKey
+                let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                return this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].pointKey
             }
         },
         watch: {

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/LevelAnalysis/LevelAnalysis.vue

@@ -116,7 +116,8 @@
         computed: {
             // 获取最新散点图数据
             getLevelData() {
-				let levelJson = this.$store.state.totalAnalysis.analysisJson.levelKey
+				let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+				let levelJson = this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].levelKey
 				let transArr = ["知识", "理解", "应用", "分析", "综合", "评鉴"]
 				levelJson.pointList = levelJson.pointList.map((i,index) => transArr[index])
 				for(let key in levelJson.classpercent){
@@ -125,7 +126,7 @@
 						levelJson.classpercent[newKey] = levelJson.classpercent[key]
 					}
 				}
-                return levelJson
+				return levelJson
             },
 			getAnalysisJson() {
 			    return this.$store.state.totalAnalysis.analysisJson

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/LevelAnalysis/ScoreDetails.vue

@@ -190,7 +190,8 @@
         computed: {
             // 获取最新散点图数据
             getLevelData() {
-                let levelJson = this.$store.state.totalAnalysis.analysisJson.levelKey
+                let curSubjectIndex = this.$store.state.totalAnalysis.analysisJson.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+                let levelJson = this.$store.state.totalAnalysis.analysisJson.pointLevelKey[curSubjectIndex].levelKey
                 let transArr = ["知识", "理解", "应用", "分析", "综合", "评鉴"]
                 levelJson.pointList = levelJson.pointList.map((i,index) => transArr[index])
                 for(let key in levelJson.classpercent){
@@ -199,23 +200,8 @@
                 		levelJson.classpercent[newKey] = levelJson.classpercent[key]
                 	}
                 }
-				
-				levelJson.wrong.datas.forEach((i,index) => {
-					i[0] = transArr[index]
-				})
                 return levelJson
             }
-        },
-        watch: {
-            getLevelData: {
-                deep: true,
-                handler(val) {
-                    if (val) {
-                        this.doRender(val,this.currentPoint)
-                    }
-                }
-
-            }
         }
     }
 </script>

TEAMModelOS/ClientApp/vue.config.js

@@ -1,4 +1,4 @@
-const path = require('path')
+const path = require('path')
 const Timestamp = new Date().getTime();
 function resolve(dir) {
     return path.join(__dirname, './', dir)
@@ -55,13 +55,5 @@ module.exports = {
     },
     configureWebpack: config => {
         config.entry.app = ["babel-polyfill", "./src/main.js"];
-    },
-    configureWebpack: {
-        output: { // 输出重构  打包编译后的 文件名称  【模块名称.版本号.js】
-            filename: `js/[name].${Timestamp}.js`,
-            chunkFilename: `js/[name].${Timestamp}.js`
-            // chunkFilename: `js/[id].vw.js`
-        },
     }
-
 }