Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelOS/ClientApp/src/components/learnactivity/ClassList.less

@@ -0,0 +1,81 @@
+@main-bgColor: rgb(40,40,40); //主背景颜色
+@borderColor: #424242;
+@primary-textColor: #fff; //文本主颜色
+@second-textColor: #a5a5a5; //文本副级颜色
+@primary-fontSize: 14px;
+@second-fontSize: 16px;
+
+.activity-info-container {
+    width: 100%;
+    height: 100%;
+
+    .activity-target-list {
+        width: 100%;
+        height: 100%;
+    }
+
+    .activity-detail-info {
+        width: 100%;
+        height: 100%;
+        padding-left: 10px;
+    }
+
+    .table-show {
+        width: 100%;
+        height: 300px;
+    }
+}
+
+.activity-status {
+    font-size: 10px;
+    background: #19be6b;
+    float: right;
+    padding: 0 5px;
+    color: #fff;
+    display: inline-block;
+    margin-left: 20px;
+    border-radius: 5px;
+}
+
+.tools-box {
+    float: right;
+    color: white;
+}
+
+.action-btn-icon {
+    margin-right: 15px;
+    cursor: pointer;
+    color: white;
+    font-size: 16px;
+}
+
+.activity-target-list {
+    .activity-target-header {
+        width: 100%;
+        height: 45px;
+        line-height: 45px;
+        color: @second-textColor;
+        border-bottom: 1px solid @borderColor;
+    }
+
+    .activity-target-item {
+        width: 100%;
+        padding: 15px 10px 15px 0px;
+        border-bottom: 1px solid @borderColor;
+        cursor: pointer;
+
+        .target-name {
+            color: @primary-textColor;
+            font-size: 18px;
+        }
+
+        .info-label {
+            color: @second-textColor;
+        }
+
+        .info-value {
+            color: @primary-textColor;
+            margin-left: 5px;
+        }
+    }
+}

TEAMModelOS/ClientApp/src/components/learnactivity/ClassList.vue

@@ -35,12 +35,15 @@
             <div slot="right" class="activity-detail-info">
                 <div class="learn-progress-main dark-iview-table">
                     <vuescroll>
-                        <p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:15px;">测验成绩分析188</p>
-                       <!--<Grade></Grade>-->
+                        <p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:15px;">测验成绩分析</p>
+                        <div class="table-show">
+                            <div class="table" style="margin:auto;">
+                                <Grade></Grade>
+                            </div>
+                        </div>
                         <p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:50px;margin-bottom:30px;">
                             学生试题分析概览
                         </p>
-
                     </vuescroll>
                 </div>
                
@@ -51,11 +54,11 @@
     </div>
 </template>
 <script>
-    //import Grade from '@/components/learnactivity/GradeTable.vue'
+    import Grade from '@/components/learnactivity/GradeTable.vue'
     export default {
-        //components: {
-        //   Grade
-        //},
+        components: {
+           Grade
+        },
         data() {
             return {
                 showAnswer: false,
@@ -157,7 +160,5 @@
     }
 </script>
 <style lang="less" scoped>
-    @import "../selflearn/ActivityInfo.less";
+    @import "../learnactivity/ClassList.less";
 </style>
-<style>
-</style>

TEAMModelOS/ClientApp/src/components/learnactivity/GradeTable.vue

@@ -1,65 +1,32 @@
 <template>
-    <div id="grade"></div>
+        <div id="grade"></div>
 </template>
-
 <script>
-      export default {
+    export default {
         data() {
             return {
                 dataIndex: 1,
                 progressHistogram: undefined,
-                option:{
-                    backgroundColor: "#344b58",
-                    "title": {
-                        "text": "本年商场顾客男女人数统计",
-                        "subtext": "BY Wang Dingding",
-                        x: "4%",
-
-                        textStyle: {
-                            color: '#fff',
-                            fontSize: '22'
-                        },
-                        subtextStyle: {
-                            color: '#90979c',
-                            fontSize: '16',
-
-                        },
-                    },
-                    "tooltip": {
-                        "trigger": "axis",
-                        "axisPointer": {
-                            "type": "shadow",
-                            textStyle: {
-                                color: "#fff"
-                            }
-
-                        },
-                    },
-                    "grid": {
-                        "borderWidth": 0,
-                        "top": 110,
-                        "bottom": 95,
-                        textStyle: {
-                            color: "#fff"
-                        }
-                    },
-                    "legend": {
-                        x: '4%',
-                        top: '8%',
-                        textStyle: {
-                            color: '#90979c',
-                        },
-                        "data": ['女', '男', '平均']
-                    },
-
-
-                    "calculable": true,
-                    "xAxis": [{
+                dataInfo: []
+            }
+        },
+        methods:{
+            getData() {
+                let data = this.$Mock.data.studentList
+                console.log(data)
+                for (var i = 1; i < 15; i++) {
+                    this.dataInfo.push(i);
+                }
+            },
+            getMap() {
+                let myChart = this.$echarts.init(document.getElementById('grade'));
+                let option = {
+                    color: ["#42beda"],
+                    tooltip: {},
+                    xAxis: {
                         "type": "category",
                         "axisLine": {
-                            lineStyle: {
-                                color: '#90979c'
-                            }
+
                         },
                         "splitLine": {
                             "show": false
@@ -74,108 +41,64 @@
                             "interval": 0,
 
                         },
-                        "data": xData,
-                    }],
-                    "yAxis": [{
-                        "type": "value",
-                        "splitLine": {
-                            "show": false
+                        axisLabel: {
+                            color: 'white'
                         },
-                        "axisLine": {
+                        data: ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
+                    },
+                    yAxis: {
+                        splitLine: {
                             lineStyle: {
-                                color: '#90979c'
+                                color: ['#505050']
                             }
                         },
-                        "axisTick": {
-                            "show": false
-                        },
-                        "axisLabel": {
-                            "interval": 0,
-
-                        },
-                        "splitArea": {
-                            "show": false
+                        axisLabel: {
+                            color: 'white'
                         },
-
-                    }],
+                    },
                     "dataZoom": [{
                         "show": true,
-                        "height": 30,
+                        "height": 10,
                         "xAxisIndex": [
                             0
                         ],
-                        bottom: 30,
+                        bottom: 10,
                         "start": 10,
                         "end": 80,
-                        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',
                         handleSize: '110%',
                         handleStyle: {
                             color: "#d3dee5",
 
                         },
-                        textStyle: {
-                            color: "#fff"
-                        },
                         borderColor: "#90979c"
-
-
-                    }, {
+                    },
+                        {
                         "type": "inside",
                         "show": true,
                         "height": 15,
                         "start": 1,
                         "end": 35
                     }],
-                    "series": [{
-                        "name": "初一 一班",
-                        "type": "bar",
-                        "stack": "总量",
-                        "barMaxWidth": 35,
-                        "barGap": "10%",
-                        "itemStyle": {
-                            "normal": {
-                                "color": "rgba(255,144,128,1)",
-                                "label": {
-                                    "show": true,
-                                    "textStyle": {
-                                        "color": "#fff"
-                                    },
-                                    "position": "inside",
-                                    formatter: function (p) {
-                                        return p.value > 0 ? (p.value) : '';
-                                    }
-                                }
-                            }
-                        },
-                        "data": [
-                            85,
-                            97,
-                            55,
-                            61,
-                            71,
-                            33,
-                            54,
-                            85,
-                            58,
-                            72,
-                            84,
-                            40
-                        ],
-                    }
-                    ]
-                }
+                    series: [{
+                        name: '销量',
+                        type: 'bar',
+                        data: [5, 20, 36, 10, 10, 20]
+                    }]
+                };
+                myChart.setOption(option);
             }
+
         },
         mounted() {
-            this.grade = this.$echarts.init(document.getElementById('grade'))
-            this.grade.setOption(this.option)
+            this.getData()
+            this.getMap()
         }
     }
 </script>
-<style>
+<style scoped>
     #grade{
-        width:100%;
-        height:100%;
+        width:650px;
+        height:300px;
+        margin:auto;
     }
-
 </style>

TEAMModelOS/ClientApp/src/mock/index.js

@@ -70,7 +70,15 @@ export default {
       'changesVal|1-30': 1,
       'changesVal2|1-30': 1,
       'changesVal3|1-30': 1
-    }],
+      }],
+      'studentList|1-3': [{
+          'name|+1': ['一班', '二班', '三班', '四班'],
+          'classId|+1': 1400111001,
+          'studentScore|45-55': [{
+              'name': '@cname',
+              'score|30-100': 100
+          }]
+      }],
     'subjectList|10': [{
       'id|+1': 1,
       'className|1-10': 1,