Browse Source

删除无用文件

psycho 6 năm trước cách đây
mục cha
commit
163f187cf2
47 tập tin đã thay đổi với 7 bổ sung6406 xóa
  1. BIN
      TEAMModelOS.SmartClass/ClientApp/assets/bak_cloud.jpg
  2. BIN
      TEAMModelOS.SmartClass/ClientApp/assets/bak_cloud_1.jpg
  3. BIN
      TEAMModelOS.SmartClass/ClientApp/assets/banner.jpg
  4. 0 1
      TEAMModelOS.SmartClass/ClientApp/assets/greenpin.svg
  5. BIN
      TEAMModelOS.SmartClass/ClientApp/assets/logo.png
  6. 0 1
      TEAMModelOS.SmartClass/ClientApp/assets/mark.svg
  7. 0 1
      TEAMModelOS.SmartClass/ClientApp/assets/pin.svg
  8. 0 1
      TEAMModelOS.SmartClass/ClientApp/assets/redpin.svg
  9. BIN
      TEAMModelOS.SmartClass/ClientApp/assets/tmd_logo.png
  10. 0 206
      TEAMModelOS.SmartClass/ClientApp/components/graph/accountLine.vue
  11. 0 158
      TEAMModelOS.SmartClass/ClientApp/components/graph/bubble.vue
  12. 0 161
      TEAMModelOS.SmartClass/ClientApp/components/graph/classBar.vue
  13. 0 126
      TEAMModelOS.SmartClass/ClientApp/components/graph/classResourceBar.vue
  14. 0 161
      TEAMModelOS.SmartClass/ClientApp/components/graph/classline.vue
  15. 0 138
      TEAMModelOS.SmartClass/ClientApp/components/graph/classtypePie.vue
  16. 0 142
      TEAMModelOS.SmartClass/ClientApp/components/graph/courseBar.vue
  17. 0 176
      TEAMModelOS.SmartClass/ClientApp/components/graph/finishPercentPie.vue
  18. 0 167
      TEAMModelOS.SmartClass/ClientApp/components/graph/interactiveBarLine.vue
  19. 0 192
      TEAMModelOS.SmartClass/ClientApp/components/graph/interactiveLine.vue
  20. 0 89
      TEAMModelOS.SmartClass/ClientApp/components/graph/legendPie.vue
  21. 0 124
      TEAMModelOS.SmartClass/ClientApp/components/graph/nestingPie.vue
  22. 0 173
      TEAMModelOS.SmartClass/ClientApp/components/graph/ringPie.vue
  23. 0 137
      TEAMModelOS.SmartClass/ClientApp/components/graph/teachScienceBar.vue
  24. 0 221
      TEAMModelOS.SmartClass/ClientApp/components/graph/technologyBar.vue
  25. 0 242
      TEAMModelOS.SmartClass/ClientApp/components/graph/totalLine.vue
  26. 0 187
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAannulus.vue
  27. 0 354
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAbargraph.vue
  28. 0 243
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAbarline.vue
  29. 0 57
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAbasics.vue
  30. 0 242
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAchooseattention.vue
  31. 0 129
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAchooseexam.vue
  32. 0 392
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAlinechart.vue
  33. 0 520
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SApercent.vue
  34. 0 144
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAradargraph.vue
  35. 0 592
      TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAsubjectsmanifestation.vue
  36. 0 58
      TEAMModelOS.SmartClass/ClientApp/components/syllabus/SelectModule.vue
  37. 0 276
      TEAMModelOS.SmartClass/ClientApp/components/syllabus/SelectSchool.vue
  38. 0 592
      TEAMModelOS.SmartClass/ClientApp/components/syllabus/Tree.vue
  39. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header.png
  40. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon.png
  41. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon1.png
  42. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon2.png
  43. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon3.png
  44. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon4.png
  45. BIN
      TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/touxiang.png
  46. 6 2
      TEAMModelOS.SmartClass/ClientApp/router/routes.js
  47. 1 1
      TEAMModelOS.SmartClass/Views/Shared/_Layout.cshtml

BIN
TEAMModelOS.SmartClass/ClientApp/assets/bak_cloud.jpg


BIN
TEAMModelOS.SmartClass/ClientApp/assets/bak_cloud_1.jpg


BIN
TEAMModelOS.SmartClass/ClientApp/assets/banner.jpg


+ 0 - 1
TEAMModelOS.SmartClass/ClientApp/assets/greenpin.svg

@@ -1 +0,0 @@
-<svg id="圖層_1" data-name="圖層 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58.3 60"><defs><style>.cls-1{fill:#1CD0A1;}</style></defs><title>pin</title><polygon class="cls-1" points="55.3 0 29.1 38.6 3 0 55.3 0"/><polygon class="cls-1" points="29.1 48.9 7.5 16.9 0 16.9 29.1 60 58.3 16.9 50.8 16.9 29.1 48.9"/></svg>

BIN
TEAMModelOS.SmartClass/ClientApp/assets/logo.png


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 1
TEAMModelOS.SmartClass/ClientApp/assets/mark.svg


+ 0 - 1
TEAMModelOS.SmartClass/ClientApp/assets/pin.svg

@@ -1 +0,0 @@
-<svg id="圖層_1" data-name="圖層 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58.3 60"><defs><style>.cls-1{fill:#fafafa;}</style></defs><title>pin</title><polygon class="cls-1" points="55.3 0 29.1 38.6 3 0 55.3 0"/><polygon class="cls-1" points="29.1 48.9 7.5 16.9 0 16.9 29.1 60 58.3 16.9 50.8 16.9 29.1 48.9"/></svg>

+ 0 - 1
TEAMModelOS.SmartClass/ClientApp/assets/redpin.svg

@@ -1 +0,0 @@
-<svg id="圖層_1" data-name="圖層 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58.3 60"><defs><style>.cls-1{fill:#FF6B6A;}</style></defs><title>pin</title><polygon class="cls-1" points="55.3 0 29.1 38.6 3 0 55.3 0"/><polygon class="cls-1" points="29.1 48.9 7.5 16.9 0 16.9 29.1 60 58.3 16.9 50.8 16.9 29.1 48.9"/></svg>

BIN
TEAMModelOS.SmartClass/ClientApp/assets/tmd_logo.png


+ 0 - 206
TEAMModelOS.SmartClass/ClientApp/components/graph/accountLine.vue

@@ -1,206 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            let arrlabel = ["3/15", "3/16", "3/17", "3/18", "3/19", "3/20", "3/21", "3/22", "3/23", "3/24", "TODAY"];
-            let arrTotal1 = ["22", "17", "0", "26", "22", "24", "18", "30", "15", "10", "30"];
-            let arrTotal2 = ["26", "20", "2", "18", "27", "22", "26", "33", "9", "0", "40"];
-            myChart.setOption({
-                backgroundColor: 'rgba(17, 17, 17, 0.14)',
-                tooltip: {
-                    trigger: 'axis',
-                    borderRadius: 0,
-                    // backgroundColor:'#7AD1A8',
-                    // formatter: function(pm) {
-                    //     var param = pm[0];
-                    //     var pht = '<span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:rgba(166,154,228);"></span>';
-                    //     console.log(param.marker);
-                    //     var prm = "星期" + "日一二三四五六 ".charAt(new Date(param.name).getDay());
-                    //     return param.name + ":&nbsp;&nbsp;" + prm + "<br>" +
-                    //         pht + param.seriesName + ":&nbsp;&nbsp;" + param.value + "&nbsp;&nbsp;|&nbsp;&nbsp;80.33ttt%";
-                    // },
-                    //   axisPointer: { // 坐标轴指示器,坐标轴触发有效
-                    //         type: 'none' // 默认为直线,可选为:'line' | 'shadow'
-                    //     },
-                },
-                grid: {
-                    left: '0',
-                    right: '0',
-                    bottom: '0',
-                    top: '0',
-                    containLabel: true,
-                },
-                xAxis: [{
-                    axisTick: {
-                        show: false,
-                    },
-                    type: 'category',
-                    axisLabel: {
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 11,
-                            color: '#94998a'
-                        },
-                        interval:0,
-                        formatter:function(val){
-                            let firstOne = arrlabel[0];
-                            let labellength = arrlabel.length
-                            let lastOne = arrlabel[labellength-1];
-                            if(firstOne != val && lastOne != val){
-                                return val
-                            }
-                        }
-                    },
-                    boundaryGap: false,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                    data: arrlabel
-                }],
-                yAxis: [{
-                    position: 'right',
-                    type: 'value',
-                    // name: '单 位(%)',
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    },
-                    axisLabel: {
-                        margin: 10,
-                        inside: true,
-                        textStyle: {
-                            fontSize: 14,
-                            color:'transparent'
-                        }
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    }
-                }],
-                series: [{
-                    // name: '实名率',
-                    type: 'line',
-                    // symbol: 'circle',
-                    //symbolSize: 5,
-                    // showSymbol: false,
-                    // markPoint: { // markLine 也是同理
-                    //   data: [{
-                    //     coord: [0,1,2,3,4], // 其中 5 表示 xAxis.data[5],即 '33' 这个元素。
-                    //     // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
-                    //     // 注意,使用这种方式时,xAxis.data 不能写成 [number, number, ...]
-                    //     // 而只能写成 [string, string, ...]
-                    //   }]
-                    // },
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#1CD0A1',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal1
-                },
-                {
-                    type: 'line',
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(72, 219, 252, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(72, 219, 252, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#48DBFC',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal2
-                }
-                ]
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 158
TEAMModelOS.SmartClass/ClientApp/components/graph/bubble.vue

@@ -1,158 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {
-            mychat: '',
-            total: 0,
-            heightlightIndex: 0,
-        }
-    },
-    props:{
-        id:{
-            type: String
-        },
-        // pieData:{
-        //     type: Array,
-        //     default: function(){
-        //         return [
-        //             {value:335, name:'新增檔案'},
-        //             {value:310, name:'書面問答'},
-        //             {value:234, name:'匯入.pptx'},
-        //             {value:135, name:'PowerClick'},
-        //             {value:1548, name:'開啟.hte'},
-        //             {value:123, name:'其他'},
-        //         ]
-        //     },
-        // },
-        title:{
-            type: String
-        },
-        ylabel:{
-            type: Array,
-            default: function(){
-                return ['一年級', '二年級', '三年級','四年級','五年級'];
-            }
-        },
-        bubleData:{
-            type: Array,
-            default: function(){
-                // [x, y, total]
-                return [
-                [0,0,10], [1,0, 30], [4,0, 20], [5,0, 10],
-                [1,1,30], [2,1, 30],
-                [3,2,30], [4,2, 10],
-                [2,3,30]];
-            }
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    created(){
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            var bubblecolor = ['#FF6B6A', '#FF9FF4', '#48DBFC', '#1CD0A1', '#FDC958', '#FFAD76'];
-            var hours = ['0-50', '51-60', '61-70', '71-80', '81-80', '90~'];
-            // data = data.map(function (item) {
-            //     return [item[1], item[0], item[2]];
-            // });
-            // console.log(data)
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({  
-              title:{
-                show: _this.title ? true : false,
-                text: _this.title ? _this.title : '',
-                left: 'center',
-                textStyle:{
-                  color: '#fafafa',
-                  fontWeight: 100,
-                }
-              },
-                tooltip: {
-                    position: 'top',
-                    formatter: function (params) {
-                        return _this.ylabel[params.value[1]] + '裡,'+ hours[params.value[0]] + '區間的一共有'+params.value[2] + '人';
-                    }
-                },
-                grid: {
-                    left: '2%',
-                    bottom: 0,
-                    right: '16px',
-                    containLabel: true,      
-                },
-                xAxis: {
-                    type: 'category',
-                    data: hours,
-                    boundaryGap: false,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                },
-                yAxis: {
-                    type: 'category',
-                    data: _this.ylabel,
-                    boundaryGap: true,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                },
-                series: [{
-                    // name: '论文数量',
-                    type: 'scatter',
-                    symbolSize: function (val) {
-                        let tmp = val[2]*0.03;
-                        if(tmp == 0){
-                            return 0
-                        } else if(tmp<1){
-                            return 10
-                        } else {
-                            return tmp;
-                        }                        
-                    },
-                    data: _this.bubleData,
-                    animationDelay: function (idx) {
-                        return idx * 5;
-                    },
-                    itemStyle:{
-                        normal:{
-                            color: function(params) {
-                                var num=bubblecolor.length;
-                                return bubblecolor[params.dataIndex%num]
-                            },
-                        }
-                    }
-                }]
-            });
-        },
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 161
TEAMModelOS.SmartClass/ClientApp/components/graph/classBar.vue

@@ -1,161 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-      return {
-        myChart: '',
-      }
-    },
-    props:{
-      id:{
-        type: String
-      },
-      todayData:{
-        type: Object,
-        default: function(){
-          return {'一年級': 9, '二年級': 11, '三年級': 16, '四年級':6, '五年級':13, '六年級':22}
-        }
-      },
-      lastWeekData:{
-        type: Object,
-        default: function(){
-          return {'一年級': 5, '二年級': 7, '三年級': 12, '四年級':1, '五年級':2, '六年級':24}
-        }
-      },
-      callBack: {
-        type: String
-      }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 取得Y軸Label
-            let yLabel = Object.keys(this.todayData);
-            let todayDataArray = [];
-            let lastWeekDataArray = [];
-
-            // 今日資料
-            yLabel.map(function(key) {
-              todayDataArray.push(_this.todayData[key]);
-            });
-            // 上週資料
-            yLabel.map(function(key) {
-              lastWeekDataArray.push(_this.lastWeekData[key]);
-            });
-
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({
-              backgroundColor: '#343a4073',
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'shadow'
-                },
-                // formatter: function(params){
-                //   // 故意開啟 但不設定使ToolTip 沒有彈跳的作用 但有Hover 功能
-                // }
-              },
-              grid: {
-                left: '5%',
-                right: '0',
-                bottom: '0',
-                top:'0',
-                containLabel: true
-              },
-              xAxis: {
-                type: 'value',
-                boundaryGap: false,
-                axisLabel: {
-                    inside: true,
-                    textStyle: {
-                        color:'transparent'
-                    }
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                }
-              },
-              yAxis: {
-                type: 'category',
-                axisLabel: {
-                  textStyle: {
-                    fontSize: 12,
-                    color: '#94998a'
-                  }
-                },
-                splitLine: {
-                  lineStyle: {
-                    color: 'rgba(185, 193, 173, 0.63)',
-                  },
-                  show: true
-                },
-                axisLine: {
-                  lineStyle: {
-                    color: 'rgba(185, 193, 173, 0.63)',
-                    width: 1,
-                  }
-                },
-                data: yLabel,
-              },
-              series: [
-                {
-                  name: 'today',
-                  type: 'bar',
-                  data: todayDataArray,
-                  barWidth: 15, //柱子宽度
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                },
-                {
-                  name: 'lastWeek',
-                  type: 'bar',
-                  data: lastWeekDataArray,
-                  barWidth: 15, //柱子宽度
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(228, 233, 220, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(228, 233, 220, 0.5)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                }
-              ]
-            })
-            //highlight觸發項
-            this.myChart.on('highlight', function (params) {
-              _this.$emit('highLightInfo', {'id': yLabel[params.batch[0].dataIndex], 'today': todayDataArray[params.batch[0].dataIndex], 'lastWeek': lastWeekDataArray[params.batch[1].dataIndex]});            
-            });            
-            this.myChart.on('downplay', function (params) {            
-              _this.$emit('downplay', yLabel[params.batch[0].dataIndex])
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 126
TEAMModelOS.SmartClass/ClientApp/components/graph/classResourceBar.vue

@@ -1,126 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-      return {
-        myChart: '',
-      }
-    },
-    props:{
-      id:{
-        type: String
-      },
-      todayData:{
-        type: Object,
-        default: function(){
-          return {'一年級': 9, '二年級': 11, '三年級': 16, '四年級':6, '五年級':13, '六年級':22}
-        }
-      },
-      callBack: {
-        type: String
-      }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 取得Y軸Label
-            let yLabel = Object.keys(this.todayData);
-            let todayDataArray = [];
-
-            // 今日資料
-            yLabel.map(function(key) {
-              todayDataArray.push(_this.todayData[key]);
-            });
-
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({
-              backgroundColor: '#343a4073',
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'shadow'
-                },
-                // formatter: function(params){
-                //   // 故意開啟 但不設定使ToolTip 沒有彈跳的作用 但有Hover 功能
-                // }
-              },
-              grid: {
-                left: '5%',
-                right: '0',
-                bottom: '0',
-                top:'0',
-                containLabel: true
-              },
-              xAxis: {
-                type: 'value',
-                boundaryGap: false,
-                axisLabel: {
-                    inside: true,
-                    textStyle: {
-                        color:'transparent'
-                    }
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                }
-              },
-              yAxis: {
-                type: 'category',
-                axisLabel: {
-                  textStyle: {
-                    fontSize: 12,
-                    color: '#94998a'
-                  }
-                },
-                splitLine: {
-                  lineStyle: {
-                    color: 'rgba(185, 193, 173, 0.63)',
-                  },
-                  show: true
-                },
-                axisLine: {
-                  lineStyle: {
-                    color: 'rgba(185, 193, 173, 0.63)',
-                    width: 1,
-                  }
-                },
-                data: yLabel,
-              },
-              series: [
-                {
-                  name: 'today',
-                  type: 'bar',
-                  data: todayDataArray,
-                  barWidth: 15, //柱子宽度
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(228, 233, 220, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(228, 233, 220, 0.5)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                },
-              ]
-            })
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 161
TEAMModelOS.SmartClass/ClientApp/components/graph/classline.vue

@@ -1,161 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            let arrlabel = ["","00:00", "01:00", "02:00", "03:00", "04:00", "05:00", "06:00", "07:00", "08:00", "09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00", "24:00", ""];
-            let arrTotal = ["0","0", "0", "0", "0", "0", "10", "20", "30", "25", "35", "40", "60", "10", "0", "20", "30", "60", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
-            myChart.setOption({
-                backgroundColor: 'rgba(17, 17, 17, 0.14)',
-                tooltip: {
-                    trigger: 'axis',
-                    borderRadius: 0,
-                    // backgroundColor:'#7AD1A8',
-                    // formatter: function(pm) {
-                    //     var param = pm[0];
-                    //     var pht = '<span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:rgba(166,154,228);"></span>';
-                    //     console.log(param.marker);
-                    //     var prm = "星期" + "日一二三四五六 ".charAt(new Date(param.name).getDay());
-                    //     return param.name + ":&nbsp;&nbsp;" + prm + "<br>" +
-                    //         pht + param.seriesName + ":&nbsp;&nbsp;" + param.value + "&nbsp;&nbsp;|&nbsp;&nbsp;80.33ttt%";
-                    // },
-                    //   axisPointer: { // 坐标轴指示器,坐标轴触发有效
-                    //         type: 'none' // 默认为直线,可选为:'line' | 'shadow'
-                    //     },
-                },
-                grid: {
-                    left: '0',
-                    right: '0',
-                    bottom: '5%',
-                    top: '0',
-                    containLabel: true,
-                },
-                xAxis: [{
-                    axisTick: {
-                        show: false,
-                    },
-                    type: 'category',
-                    axisLabel: {
-                        // show: false,
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 12,
-                            color: '#94998a'
-                        }
-                    },
-                    boundaryGap: false,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                    data: arrlabel
-                }],
-                yAxis: [{
-                    position: 'right',
-                    type: 'value',
-                    // name: '单 位(%)',
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    },
-                    axisLabel: {
-                        margin: 10,
-                        inside: true,
-                        textStyle: {
-                            fontSize: 14,
-                            color:'transparent'
-                        }
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    }
-                }],
-                series: [{
-                    // name: '实名率',
-                    type: 'line',
-                    // symbol: 'circle',
-                    //symbolSize: 5,
-                    // showSymbol: false,
-                    // markPoint: { // markLine 也是同理
-                    //   data: [{
-                    //     coord: [0,1,2,3,4], // 其中 5 表示 xAxis.data[5],即 '33' 这个元素。
-                    //     // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
-                    //     // 注意,使用这种方式时,xAxis.data 不能写成 [number, number, ...]
-                    //     // 而只能写成 [string, string, ...]
-                    //   }]
-                    // },
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#1CD0A1',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal
-                }]
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 138
TEAMModelOS.SmartClass/ClientApp/components/graph/classtypePie.vue

@@ -1,138 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            let rich = {
-                b: {
-                    color: "#94998a",
-                    fontSize: 10,
-                    align: 'left',
-                    padding: [3, 0],
-                },
-                c: {
-                    color: "#FAFAFA",
-                    fontSize: 10,
-                    fontWeight: 100,
-                },
-                d: {
-                    color: "#FAFAFA",
-                    fontSize: 15,
-                    fontWeight: 100,
-                }
-            }
-            let color = ['#FF6B6A', '#48DBFC', '#1CD0A1', '#FDC958'];
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            myChart.setOption({
-                tooltip: {
-                    formatter: function(p){
-
-                    }
-                },
-    series: [
-        {
-            // name:'访问来源',
-            type:'pie',
-            selectedMode: 'single',
-            radius: [0, '46%'],
-            center: ['50%', '50%'],
-            itemStyle:{
-                color: function(p){
-                    return color[p.data.type]
-                }
-            },
-            label: {
-                normal: {
-                    position: 'inner',
-                    formatter: function(p){
-                        let percent = Math.round(p.percent)
-                        return '{title|' + p.name + '}\n{num|' + percent +'%}';
-                    },
-                    rich: { 
-                        title:{
-                            color: "#fafafa",
-                            fontSize: 10,
-                        },
-                        num:{
-                            color: "#fafafa",
-                            fontSize: 10,
-                        }
-                    }
-                }
-            },
-            labelLine: {
-                normal: {
-                    show: false
-                }
-            },
-            data:[
-                {value:300, name:'语文类别', type: 0},
-                {value:500, name:'数理类别', type: 1},
-                {value:270, name:'文史类别', type: 2},
-                {value:250, name:'艺能类别', type: 3}
-            ]
-        },
-        {
-            color: ['#FF6B6A', '#48DBFC', '#1CD0A1', '#FDC958'],
-            name:'访问来源',
-            type:'pie',
-            radius: ['55%', '69%'],
-            center: ['50%', '50%'],
-            itemStyle : {
-                color:function(p){
-                    return color[p.data.type]
-    	        },
-            },
-            label: {
-                normal: {
-                    formatter: function(p){
-                        let percent = Math.round(p.percent).toFixed(1)
-                        return '{b|' + p.name + '}\n{d|' + percent +'% }{c|('+ p.value +')}';
-                    },
-                    rich: rich
-                },
-                emphasis: {
-                    show: true,
-                    textStyle: {
-                    }
-                }
-            },
-            data:[
-                {value:200, name:'国语文', type: 0},
-                {value:100, name:'英语文', type: 0},
-                {value:100, name:'数学', type: 1},
-                {value:140, name:'生物', type: 1},
-                {value:70, name:'化学', type: 1},
-                {value:190, name:'物理', type: 1},
-                {value:190, name:'历史', type: 2},
-                {value:80, name:'地理', type: 2},
-                {value:125, name:'体育', type: 3},
-                {value:125, name:'舞蹈', type: 3}
-            ]
-        }
-    ]
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 142
TEAMModelOS.SmartClass/ClientApp/components/graph/courseBar.vue

@@ -1,142 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-      return {
-        myChart: '',
-      }
-    },
-    props:{
-      id:{
-        type: String
-      },
-      data:{
-        type: Object,
-        default: function(){
-          return {'模擬測驗': 0, '成績登錄': 5, '線上測驗': 16, 'HiTeach': 150, '合併活動':6, '班級競賽':23, '網路閱卷':21}
-        }
-      },
-      callBack: {
-        type: String
-      }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 取得x軸Label
-            let xLabel = Object.keys(this.data);
-            let courseDataArray = [];
-            let max;
-            // 資料統整
-            xLabel.map(function(key) {
-              courseDataArray.push(_this.data[key]);
-            });
-            
-            max = Math.max(...courseDataArray) + 20;
-
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({
-              backgroundColor: '#343a4073',
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'shadow'
-                },
-                formatter: function(params){
-                  // 故意開啟 但不設定使ToolTip 沒有彈跳的作用 但有Hover 功能
-                }
-              },
-              grid: {
-                left: '0',
-                right: '2%',
-                bottom: '1px',
-                top:'0',
-                containLabel: true
-              },
-              xAxis: {
-                type: 'category',
-                boundaryGap: false,
-                data: xLabel,
-                boundaryGap: ['20%', '20%'],
-                axisLabel: {
-                    inside: true,
-                    textStyle: {
-                        color:'transparent'
-                    }
-                },
-                axisLine: {
-                  show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }                  
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                }
-              },
-              yAxis: {
-                type: 'value',
-                max: max,
-                minInterval: 1,
-                axisLabel: {
-                  inside: true,
-                  textStyle: {
-                      color:'transparent'
-                  }
-                },
-                axisLine: {
-                  show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }                  
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                },
-              },
-              series: [
-                {
-                  // name: 'today',
-                  type: 'bar',
-                  data: courseDataArray,
-                  barWidth: 10, //柱子宽度
-                  barGap: 1, //柱子之间间距
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(228, 233, 220, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(228, 233, 220, 0.5)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                }
-              ]
-            })
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 176
TEAMModelOS.SmartClass/ClientApp/components/graph/finishPercentPie.vue

@@ -1,176 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {
-            mychat: '',
-            realPercent: 100,
-            pieFinishPercent: 75,
-        }
-    },
-    props:{
-        id:{
-            type: String
-        },
-        pieData:{
-            type: Object,
-            default: function(){
-                return {total:175, value: 128}      
-            },
-        },
-    },
-    mounted(){
-        this.drawLine();
-    },
-    created(){
-        this.realPercent = Math.round((this.pieData.value / this.pieData.total)* 100);
-        this.pieFinishPercent = (this.realPercent / 100.00) * 75
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({                
-                title: {
-                    "text": '课堂总数 : ' + _this.pieData.total + '\n' + '完成数量 : ' + _this.pieData.value,
-                    "x": '50%',
-                    "y": '75%',
-                    "textAlign": "center",
-                    "textStyle": {
-                        "fontWeight": 'lighter',
-                        "fontSize": 11,
-                        "color": "#A9B2B8",
-                    },
-                },
-                series: [{
-                  "name": ' ',
-                  "type": 'pie',
-                  "radius": ['50%', '68.1%'],
-                  "avoidLabelOverlap": false,
-                  "startAngle": 225,
-                  "color": ["#fff", "transparent"],
-                  "hoverAnimation": false,
-                  "legendHoverLink": false,
-                  "label": {
-                      "normal": {
-                          "show": false,
-                          "position": 'center'
-                      },
-                      "emphasis": {
-                          "show": true,
-                          "textStyle": {
-                              "fontSize": '30',
-                              "fontWeight": 'bold'
-                          }
-                      }
-                  },
-                  "labelLine": {
-                      "normal": {
-                          "show": false
-                      }
-                  },
-                  "data": [{
-                      "value": 75,
-                      "name": '',
-                      "itemStyle": {
-                        normal: {
-                                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(228, 233, 220, 0.14)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(228, 233, 220, 0.14)" // 100% 处的颜色
-                            }], false),
-                            label: {
-                                show: false
-                            },
-                            labelLine: {
-                                show: false
-                            }
-                        },
-                      }
-                  }, {
-                      "value": 25,
-                      "name": '',
-                      "itemStyle": {
-                          "normal": {
-                              color: 'rgba(0,0,0,0)'
-                          }
-                      }
-                  }]
-              }, {
-                  "name": '',
-                  "type": 'pie',
-                  "radius": ['50%', '68.1%'],
-                  "avoidLabelOverlap": false,
-                  "startAngle": 225,
-                  "color": ["#fff", "transparent"],
-                  "hoverAnimation": false,
-                  "legendHoverLink": false,
-                  "z": 10,
-                  "label": {
-                      "normal": {
-                          "show": false,
-                          "position": 'center'
-                      },
-                  },
-                  "labelLine": {
-                      "normal": {
-                          "show": false
-                      }
-                  },
-                  "data": [{
-                      "name": _this.realPercent.toString(), //完成数实际值
-                      "value": _this.pieFinishPercent, // PIE完成数
-                      "label": {
-                          "normal": {
-                              "show": true,
-                              "formatter": '{b} %',
-                              "textStyle": {
-                                  "fontSize": 20,
-                                  "fontWeight": "100",
-                                  "color": "#ffffff",
-                              },
-                              "position": "center"
-                          }
-                      },
-                      "itemStyle": {
-                        normal: {
-                        color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(228, 233, 220, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(228, 233, 220, 0.5)" // 100% 处的颜色
-                      }], false),
-                            label: {
-                                show: false
-                            },
-                            labelLine: {
-                                show: false
-                            }
-                        },
-                      }
-                  }, {
-                      "name": '',
-                      "value": (100 - _this.pieFinishPercent), // PIE未完成数 100% 是75
-                      "itemStyle": {
-                          "normal": {
-                              color: 'rgba(0,0,0,0)'
-                          }
-                      }
-                  }]
-              }]
-            });
-        },
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 167
TEAMModelOS.SmartClass/ClientApp/components/graph/interactiveBarLine.vue

@@ -1,167 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            let arrlabel = ["0-50", "51-60", "61-70", "71-80", "81-90", "90+"];
-            let arrTotal1 = [3042,884,1060,1430,1246,70];
-            let arrTotal2 = [4175,909,1125,933,566,24];
-            let arrTotal3 = [2042,784,1260,1130,746,70];
-            myChart.setOption({
-                backgroundColor: 'rgba(17, 17, 17, 0.14)',
-                tooltip: {
-                    trigger: 'axis',
-                    borderRadius: 0,
-                },
-                grid: {
-                    left: '0',
-                    right: '0',
-                    bottom: '5%',
-                    top: '10',
-                    containLabel: true,
-                },
-                xAxis: [{
-                    type: 'category',
-                    position: "bottom",
-                    axisLabel: {
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 11,
-                            color: '#fafafa'
-                        },
-                        interval:0,
-                        // formatter:function(val){
-                        //     let firstOne = arrlabel[0];
-                        //     let labellength = arrlabel.length
-                        //     let lastOne = arrlabel[labellength-1];
-                        //     if(firstOne != val && lastOne != val){
-                        //         return val
-                        //     }
-                        // }
-                    },
-                    boundaryGap: true,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                    axisTick: {
-                        show: false,
-                    },
-                    data: arrlabel
-                }],
-                yAxis: [{
-                    type: 'value',
-                    // name: '单 位(%)',
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    },
-                    axisLabel: {
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 11,
-                            color:'#fafafa'
-                        }
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    }
-                }],
-                series: [{
-                    type: 'line',
-                    zlevel: 10,
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    itemStyle: {
-                        normal: {
-                            color: '#48DBFC',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal3
-                },
-                {
-                  name: '科技互动',
-                  type: 'bar',
-                  barWidth: 10,
-                  data: arrTotal1,
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                },
-                {
-                  name: '教法应用',
-                  type: 'bar',
-                  barWidth: 10,
-                  data: arrTotal2,
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                },
-                ]
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 192
TEAMModelOS.SmartClass/ClientApp/components/graph/interactiveLine.vue

@@ -1,192 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            let arrlabel = ["2017-11","2017-12","2018-01","2018-02","2018-03","2018-04","2018-05","2018-06","2018-07","2018-08","2018-09","2018-10","2018-11","2018-12","2019-01","2019-02","2019-03","2019-04"];
-            let arrTotal1 = [29,245,94,0,310,301,481,207,1,27,713,1053,1312,1064,365,441,720,369];
-            let arrTotal2 = ["26", "20", "2", "18", "27", "22", "26", "33", "9", "0", "40"];
-            myChart.setOption({
-                // backgroundColor: 'rgba(17, 17, 17, 0.14)',
-                tooltip: {
-                    trigger: 'axis',
-                    borderRadius: 0,
-                },
-                grid: {
-                    left: '0',
-                    right: '0',
-                    bottom: '5%',
-                    top: '5%',
-                    containLabel: true,
-                },
-                xAxis: [{
-                    axisTick: {
-                        show: false,
-                    },
-                    type: 'category',
-                    axisLabel: {
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 11,
-                            color: '#fafafa'
-                        },
-                        // interval:0,
-                        // formatter:function(val){
-                        //     let firstOne = arrlabel[0];
-                        //     let labellength = arrlabel.length
-                        //     let lastOne = arrlabel[labellength-1];
-                        //     if(firstOne != val && lastOne != val){
-                        //         return val
-                        //     }
-                        // }
-                    },
-                    boundaryGap: false,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                    data: arrlabel
-                }],
-                yAxis: [{
-                    type: 'value',
-                    // name: '单 位(%)',
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    },
-                    axisLabel: {
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 11,
-                            color:'#fafafa'
-                        }
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    }
-                }],
-                series: [{
-                    // name: '实名率',
-                    type: 'line',
-                    // symbol: 'circle',
-                    //symbolSize: 5,
-                    // showSymbol: false,
-                    // markPoint: { // markLine 也是同理
-                    //   data: [{
-                    //     coord: [0,1,2,3,4], // 其中 5 表示 xAxis.data[5],即 '33' 这个元素。
-                    //     // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
-                    //     // 注意,使用这种方式时,xAxis.data 不能写成 [number, number, ...]
-                    //     // 而只能写成 [string, string, ...]
-                    //   }]
-                    // },
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#1CD0A1',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal1
-                },
-                // {
-                //     type: 'line',
-                //     lineStyle: {
-                //         normal: {
-                //             width: 2
-                //         }
-                //     },
-                //     areaStyle: {
-                //         normal: {
-                //             // 渐变色
-                //             color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                //                 offset: 0,
-                //                 color: "rgba(72, 219, 252, 1)" // 0% 处的颜色
-                //             },{
-                //                 offset: 1,
-                //                 color: "rgba(72, 219, 252, 0.5)" // 100% 处的颜色
-                //             }], false)
-                //         },
-                //     },
-                //     itemStyle: {
-                //         normal: {
-                //             areaStyle: {
-                //                 type: 'default'
-                //             },
-                //             color: '#48DBFC',
-                //         },
-                //         emphasis: {
-                //             // color: 'rgb(0,196,132)',
-                //             borderColor: 'rgba(0,196,132,0.2)',
-                //             extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                //             // borderWidth: 10
-                //         }
-                //     },
-                //     data: arrTotal2
-                // }
-                ]
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 89
TEAMModelOS.SmartClass/ClientApp/components/graph/legendPie.vue

@@ -1,89 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            myChart.setOption({
-                tooltip: {
-                    trigger: 'item',
-                    formatter: "{a} <br/>{b}: {c} ({d}%)"
-                },
-                series: [
-                    {
-                        name:'访问来源',
-                        type:'pie',
-                        radius: ['50%', '70%'],
-                        avoidLabelOverlap: false,
-                        label: {
-                            normal: {
-                                show: false,
-                                position: 'center',
-                                formatter: '{text|{b}}\n{value|{d}%}',
-                                rich: {
-                                    text: {
-                                        color: "#fefefe",
-                                        // fontSize: 14,
-                                        align: 'center',
-                                        verticalAlign: 'middle',
-                                        padding: 5
-                                    },
-                                    value: {
-                                        color: "#fefefe",
-                                        // fontSize: 24,
-                                        align: 'center',
-                                        verticalAlign: 'middle',
-                                    },
-                                }
-                            },
-                            emphasis: {
-                                show: true,
-                                textStyle: {
-                                    fontSize: 46,
-                                }
-                            }
-                        },
-                        labelLine: {
-                            normal: {
-                                show: false
-                            }
-                        },
-                        data:[
-                            {value:335, name:'直接访问'},
-                            {value:310, name:'邮件营销'},
-                            {value:234, name:'联盟广告'},
-                            {value:135, name:'视频广告'},
-                            {value:1548, name:'搜索引擎'}
-                        ]
-                    }
-                ]
-            });
-            myChart.dispatchAction({
-                type: 'highlight',
-                // seriesIndex: 1,
-                dataIndex: 2
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 124
TEAMModelOS.SmartClass/ClientApp/components/graph/nestingPie.vue

@@ -1,124 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;padding: 20px;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            myChart.setOption({
-                tooltip: {
-                    trigger: 'item',
-                    formatter: "{a} <br/>{b}: {c} ({d}%)"
-                },
-                // legend: {
-                //     orient: 'vertical',
-                //     x: 'left',
-                //     data:['直达','营销广告','搜索引擎','邮件营销','联盟广告','视频广告','百度','谷歌','必应','其他']
-                // },
-                series: [
-                    {
-                        name:'访问来源',
-                        type:'pie',
-                        selectedMode: 'single',
-                        radius: [0, '30%'],
-
-                        label: {
-                            normal: {
-                                position: 'inner'
-                            }
-                        },
-                        labelLine: {
-                            normal: {
-                                show: false
-                            }
-                        },
-                        data:[
-                            {value:335, name:'直达', selected:true},
-                            {value:679, name:'营销广告'},
-                            {value:1548, name:'搜索引擎'}
-                        ]
-                    },
-                    {
-                        name:'访问来源',
-                        type:'pie',
-                        radius: ['40%', '55%'],
-                        label: {
-                            normal: {
-                                formatter: '{a|{a}}{abg|}\n{hr|}\n  {b|{b}:}{c}  {per|{d}%}  ',
-                                backgroundColor: '#eee',
-                                borderColor: '#aaa',
-                                borderWidth: 1,
-                                borderRadius: 4,
-                                // shadowBlur:3,
-                                // shadowOffsetX: 2,
-                                // shadowOffsetY: 2,
-                                // shadowColor: '#999',
-                                // padding: [0, 7],
-                                rich: {
-                                    a: {
-                                        color: '#999',
-                                        lineHeight: 22,
-                                        align: 'center'
-                                    },
-                                    // abg: {
-                                    //     backgroundColor: '#333',
-                                    //     width: '100%',
-                                    //     align: 'right',
-                                    //     height: 22,
-                                    //     borderRadius: [4, 4, 0, 0]
-                                    // },
-                                    hr: {
-                                        borderColor: '#aaa',
-                                        width: '100%',
-                                        borderWidth: 0.5,
-                                        height: 0
-                                    },
-                                    b: {
-                                        fontSize: 16,
-                                        lineHeight: 33
-                                    },
-                                    per: {
-                                        color: '#eee',
-                                        backgroundColor: '#334455',
-                                        padding: [2, 4],
-                                        borderRadius: 2
-                                    }
-                                }
-                            }
-                        },
-                        data:[
-                            {value:335, name:'直达'},
-                            {value:310, name:'邮件营销'},
-                            {value:234, name:'联盟广告'},
-                            {value:135, name:'视频广告'},
-                            {value:1048, name:'百度'},
-                            {value:251, name:'谷歌'},
-                            {value:147, name:'必应'},
-                            {value:102, name:'其他'}
-                        ]
-                    }
-                ]         
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 173
TEAMModelOS.SmartClass/ClientApp/components/graph/ringPie.vue

@@ -1,173 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {
-            mychat: '',
-            total: 0,
-            heightlightIndex: 0,
-        }
-    },
-    props:{
-        id:{
-            type: String
-        },
-        pieData:{
-            type: Array,
-            default: function(){
-                return [
-                    {value:335, name:'新增檔案'},
-                    {value:310, name:'書面問答'},
-                    {value:234, name:'匯入.pptx'},
-                    {value:135, name:'PowerClick'},
-                    {value:1548, name:'開啟.hte'},
-                    {value:123, name:'其他'},
-                ]
-            },
-        },
-        defaultActive: {
-            type: Boolean,
-            default: function(){
-                return false;
-            }
-        },
-        singleColor:{
-            type: Boolean,
-            default: function(){
-                return false;
-            }
-        },
-        title: {
-            type: String
-        },
-        tooltip:{
-            type: Boolean,
-            default: function(){
-                return false;
-            }
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    created(){
-        this.pieData.forEach(item => {
-            this.total += item.value
-        });
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({                
-                title:{
-                    show: _this.title ? true : false,
-                    text: _this.title ? _this.title : '',
-                    left: 'center',
-                    top: 'middle',
-                    textStyle:{
-                        color: '#fafafa',
-                        fontWeight: 100
-                    }                    
-                },
-                color: _this.singleColor ? 'rgba(228, 233, 220, 0.9)' : ['#FF6B6A', '#FF9FF4', '#48DBFC', '#1CD0A1', '#FDC958', '#FFAD76'],
-                tooltip: {
-                    show: _this.tooltip,
-                    trigger: 'item',
-                    // formatter: function(p){                        
-                    //     // 故意不填可用來觸發HighLight
-                    // }
-                },
-                series: [
-                    {
-                        type:'pie',
-                        hoverOffset: 5,
-                        radius: _this.singleColor ? ['30%', '70%'] : ['50%', '70%'],
-                        avoidLabelOverlap: false,
-                        label: {
-                            normal: {
-                                show: false,
-                            },
-                            emphasis: {
-                                show: false,
-                            }
-                        },
-                        labelLine: {
-                            normal: {
-                                show: false
-                            }
-                        },
-                        data: _this.pieData,
-                        itemStyle: _this.singleColor ? {
-                            emphasis: {
-                                color: '#1CD0A1',
-                            }
-                        } : ''
-                    }
-                ]
-            });
-            // mouseover觸發項
-            this.myChart.on('mouseover', function (params) {
-                if(_this.pieData[_this.heightlightIndex].name != params.name){
-                    _this.myChart.dispatchAction({
-                        type: 'downplay',
-                        dataIndex: _this.heightlightIndex,
-                    });
-                }
-                _this.$emit('highLightInfo', params);
-            });
-            if(this.defaultActive){
-                // 預設先給第一筆初始值
-                let now = this.pieData[0].value;
-                let params = {'value': this.pieData[0].value, 'name': this.pieData[0].name,'percent': Number((now/this.total)*100).toFixed(2)}
-                this.$emit('extraInfo', params);            
-                this.$emit('highLightInfo', params);  
-                // 預設第一個
-                this.myChart.dispatchAction({
-                    type: 'highlight',
-                    dataIndex: _this.heightlightIndex,
-                });
-            }
-        },
-        // 供外部呼叫用
-        heightlight: function(dName){    
-            let _this = this;
-            if(this.pieData[this.heightlightIndex].name != dName){
-                this.myChart.dispatchAction({
-                    type: 'downplay',
-                    dataIndex: _this.heightlightIndex,
-                });
-            }
-
-            this.myChart.dispatchAction({
-                type: 'highlight',
-                name: dName
-            });
-            let now = 0;
-            this.pieData.forEach(item => {
-                if(item.name == dName){
-                    now = item.value
-                }
-            });
-            let params = {'percent': Number((now/this.total)*100).toFixed(2)}
-
-
-            this.$emit('extraInfo', params);
-        },
-        downplay: function(dname){
-            this.myChart.dispatchAction({
-                type: 'downplay',
-                name: dname
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 137
TEAMModelOS.SmartClass/ClientApp/components/graph/teachScienceBar.vue

@@ -1,137 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-      return {
-        myChart: '',
-      }
-    },
-    props:{
-      id:{
-        type: String
-      },
-      data:{
-        type: Object,
-        default: function(){
-          return {'挑人': 9, '计时器': 11, '计分板': 16, 'I R S':14, '即问即答':9, '二次作答':5, '翻牌':3, '统计图':10, 
-                  '抢权':11, '飞讯处理':3, '推送':6, 'L I V E':13, '微影片':7, '播放影片':10, '作品观摩':7, '作品点评':6}
-        }
-      },
-      callBack: {
-        type: String
-      }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 取得Y軸Label
-            let yLabel = Object.keys(this.data);
-            let todayDataArray = [];
-
-            // 今日資料
-            yLabel.map(function(key) {
-              todayDataArray.push(_this.data[key]);
-            });            
-
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({
-              backgroundColor: '#343a4073',
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'shadow'
-                },
-                formatter: function(params){
-                  // 故意開啟 但不設定使ToolTip 沒有彈跳的作用 但有Hover 功能
-                }
-              },
-              grid: {
-                left: '5%',
-                right: '0',
-                bottom: '0',
-                top:'0',
-                containLabel: true
-              },
-              xAxis: {
-                type: 'value',
-                boundaryGap: false,
-                axisLabel: {
-                    inside: true,
-                    textStyle: {
-                        color:'transparent'
-                    }
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                }
-              },
-              yAxis: {
-                type: 'category',
-                axisLabel: {
-                    textStyle: {
-                      fontSize: '13px',
-                      color:'#94998a'
-                    }
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                },
-                data: yLabel,
-              },
-              series: [
-                {
-                  // name: 'today',
-                  type: 'bar',
-                  data: todayDataArray,
-                  barWidth: 7, //柱子宽度
-                  barGap: 1, //柱子之间间距
-                  itemStyle: {
-                    normal: {  //渐变色
-                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: "rgba(228, 233, 220, 1)" // 0% 处的颜色
-                      },{
-                        offset: 1,
-                        color: "rgba(228, 233, 220, 0)" // 100% 处的颜色
-                      }], false)
-                    }
-                  }
-                }
-              ]
-            })
-            // //highlight觸發項
-            // this.myChart.on('highlight', function (params) {
-            //   _this.$emit('highLightInfo', {'id': yLabel[params.batch[0].dataIndex], 'today': todayDataArray[params.batch[0].dataIndex], 'lastWeek': lastWeekDataArray[params.batch[1].dataIndex]});            
-            // });            
-            // this.myChart.on('downplay', function (params) {            
-            //   _this.$emit('downplay', yLabel[params.batch[0].dataIndex])
-            // });
-            // //預設顯示第一個
-            // this.myChart.dispatchAction({
-            //     type: 'showTip',
-            //     seriesIndex: 1,
-            //     dataIndex: 0,
-            // });
-            // // 預設先給值
-            // this.$emit('highLightInfo', {'id': yLabel[0], 'today': todayDataArray[0], 'lastWeek': lastWeekDataArray[0]});
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 221
TEAMModelOS.SmartClass/ClientApp/components/graph/technologyBar.vue

@@ -1,221 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-      return {
-        myChart: '',
-      }
-    },
-    props:{
-      id:{
-        type: String
-      },
-      data:{
-        type: Object,
-        default: function(){
-          return {'计分板': 100, '挑人': 30, '计时器': 28, '抢权': 25, '统计图':24, '即问即答':23, '作品比较':21, '推送':8, '翻牌':6, '二次作答':2}
-        }
-      },
-      callBack: {
-        type: String
-      }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let barcolor = ['#FF6B6A', '#FF9FF4', '#48DBFC', '#1CD0A1', '#FDC958', '#FFAD76'];
-            let _this = this
-            // 取得x轴Label
-            let xLabel = Object.keys(this.data);
-            let courseDataArray = [];
-            let max;
-            // 资料统整
-            xLabel.map(function(key) {
-              courseDataArray.push(_this.data[key]);
-            });
-            
-            max = Math.max(...courseDataArray) + 20;
-
-            // 基于准备好的dom,初始化echarts实例
-            this.myChart = this.$echarts.init(document.getElementById(this.id));
-            this.myChart.setOption({
-              title:{
-                text:'常用科技分布图',
-                left: 'center',
-                textStyle:{
-                  color: '#fafafa',
-                  fontWeight: 100,
-                }
-              },
-              legend: {
-                top: 20,
-                textStyle: {
-                    color: '#fff',
-                },
-                data: ['总量', '英文', '语文', '英语', '数学', '科学', '综合']
-              },
-              backgroundColor: '#343a4073',
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'shadow'
-                },              
-              },
-              grid: {
-                left: '0',
-                right: '0',
-                bottom: '1px',
-                top:'0',
-                containLabel: true
-              },
-              xAxis: {
-                type: 'category',
-                boundaryGap: true,
-                data: xLabel,
-                axisLabel: {
-                    // inside: true,
-                    textStyle: {
-                        color:'#fafafa'
-                    }
-                },
-                axisLine: {
-                  show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }                  
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                }
-              },
-              yAxis: {
-                type: 'value',
-                max: max,
-                minInterval: 1,
-                axisLabel: {
-                  inside: true,
-                  textStyle: {
-                      color:'transparent'
-                  }
-                },
-                axisLine: {
-                  show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }                  
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                      width: 1,
-                      color: 'rgba(185, 193, 173, 0.63)'
-                    }
-                },
-              },
-              series: [
-                {
-                  name:'总量',
-                  type: 'bar',
-                  data: courseDataArray,
-                  barWidth: 10, //柱子宽度
-                  // barGap: 1, //柱子之间间距
-                  itemStyle: {
-                    normal: { 
-                      color: function(params) {
-                        var num=barcolor.length;
-                        return barcolor[params.seriesIndex%num]
-                      },
-                    }
-                  }
-                },
-                {
-                  name:'语文',
-                  type:'bar',
-                  barWidth: 10, //柱子宽度
-                  data:[30, 15, 14, 13, 12, 11, 10, 9, 3, 2, 2],
-                  itemStyle: {
-                    normal: { 
-                      color: function(params) {
-                        var num=barcolor.length;
-                        return barcolor[params.seriesIndex%num]
-                      },
-                    }
-                  }
-                },
-                {
-                  name:'英语',
-                  type:'bar',
-                  barWidth: 10, //柱子宽度
-                  data:[30, 7, 14, 7, 6, 11, 10, 9, 3, 2, 2],
-                  itemStyle: {
-                    normal: { 
-                      color: function(params) {
-                        var num=barcolor.length;
-                        return barcolor[params.seriesIndex%num]
-                      },
-                    }
-                  }
-                },
-                {
-                  name:'数学',
-                  type:'bar',
-                  barWidth: 10, //柱子宽度
-                  data:[30, 7, 0, 5, 4, 2, 6, 5, 3, 2, 2],
-                  itemStyle: {
-                    normal: { 
-                      color: function(params) {
-                        var num=barcolor.length;
-                        return barcolor[params.seriesIndex%num]
-                      },
-                    }
-                  }
-                },
-               {
-                  name:'科学',
-                  type:'bar',
-                  barWidth: 10, //柱子宽度
-                  data:[10, 1, 0, 0, 2, 3, 5, 5, 3, 2, 2],
-                  itemStyle: {
-                    normal: { 
-                      color: function(params) {
-                        var num=barcolor.length;
-                        return barcolor[params.seriesIndex%num]
-                      },
-                    }
-                  }
-                },
-               {
-                  name:'综合',
-                  type:'bar',
-                  barWidth: 10, //柱子宽度
-                  data:[0, 0, 0, 0, 1, 0, 3, 1, 3, 2, 2],
-                  itemStyle: {
-                    normal: { 
-                      color: function(params) {
-                        var num=barcolor.length;
-                        return barcolor[params.seriesIndex%num]
-                      },
-                    }
-                  }
-                },
-              ]
-            })
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 242
TEAMModelOS.SmartClass/ClientApp/components/graph/totalLine.vue

@@ -1,242 +0,0 @@
-<template>
-    <div :id="id" style="height: 100%;width:100%;"></div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {}
-    },
-    props:{
-        id:{
-            type: String
-        }
-    },
-    mounted(){
-        this.drawLine();
-    },
-    methods:{
-        drawLine(){
-            let _this = this
-            // 基于准备好的dom,初始化echarts实例
-            let myChart = this.$echarts.init(document.getElementById(this.id));
-            let arrlabel = ["3/15", "3/16", "3/17", "3/18", "3/19", "3/20", "3/21", "3/22", "3/23", "3/24", "TODAY"];
-            let arrTotal1 = ["22", "17", "0", "26", "22", "24", "18", "30", "15", "10", "30"];
-            let arrTotal2 = ["26", "20", "2", "18", "27", "22", "26", "33", "9", "0", "40"];
-            let arrTotal3 = ["40", "26", "8", "1", "34", "8", "54", "16", "16", "25", "20"];
-            myChart.setOption({
-                backgroundColor: 'rgba(17, 17, 17, 0.14)',
-                tooltip: {
-                    trigger: 'axis',
-                    borderRadius: 0,
-                    // backgroundColor:'#7AD1A8',
-                    // formatter: function(pm) {
-                    //     var param = pm[0];
-                    //     var pht = '<span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:rgba(166,154,228);"></span>';
-                    //     console.log(param.marker);
-                    //     var prm = "星期" + "日一二三四五六 ".charAt(new Date(param.name).getDay());
-                    //     return param.name + ":&nbsp;&nbsp;" + prm + "<br>" +
-                    //         pht + param.seriesName + ":&nbsp;&nbsp;" + param.value + "&nbsp;&nbsp;|&nbsp;&nbsp;80.33ttt%";
-                    // },
-                    //   axisPointer: { // 坐标轴指示器,坐标轴触发有效
-                    //         type: 'none' // 默认为直线,可选为:'line' | 'shadow'
-                    //     },
-                },
-                grid: {
-                    left: '0',
-                    right: '0',
-                    bottom: '5%',
-                    top: '0',
-                    containLabel: true,
-                },
-                xAxis: [{
-                    axisTick: {
-                        show: false,
-                    },
-                    type: 'category',
-                    axisLabel: {
-                        margin: 10,
-                        textStyle: {
-                            fontSize: 11,
-                            color: '#94998a'
-                        },
-                        interval:0,
-                        formatter:function(val){
-                            let firstOne = arrlabel[0];
-                            let labellength = arrlabel.length
-                            let lastOne = arrlabel[labellength-1];
-                            if(firstOne != val && lastOne != val){
-                                return val
-                            }
-                        }
-                    },
-                    boundaryGap: false,
-                    splitLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        },
-                        show: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                            width: 1,
-                        }
-                    },
-                    data: arrlabel
-                }],
-                yAxis: [{
-                    position: 'right',
-                    type: 'value',
-                    // name: '单 位(%)',
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    },
-                    axisLabel: {
-                        margin: 10,
-                        inside: true,
-                        textStyle: {
-                            fontSize: 14,
-                            color:'transparent'
-                        }
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: 'rgba(185, 193, 173, 0.63)',
-                        }
-                    }
-                }],
-                series: [{
-                    // name: '实名率',
-                    type: 'line',
-                    // symbol: 'circle',
-                    //symbolSize: 5,
-                    // showSymbol: false,
-                    // markPoint: { // markLine 也是同理
-                    //   data: [{
-                    //     coord: [0,1,2,3,4], // 其中 5 表示 xAxis.data[5],即 '33' 这个元素。
-                    //     // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
-                    //     // 注意,使用这种方式时,xAxis.data 不能写成 [number, number, ...]
-                    //     // 而只能写成 [string, string, ...]
-                    //   }]
-                    // },
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(28, 208, 161, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(28, 208, 161, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#1CD0A1',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal1
-                },
-                {
-                    type: 'line',
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(255, 107, 106, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(255, 107, 106, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#FF6B6A',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal2
-                },
-                {
-                    type: 'line',
-                    lineStyle: {
-                        normal: {
-                            width: 2
-                        }
-                    },
-                    areaStyle: {
-                        normal: {
-                            // 渐变色
-                            color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: "rgba(72, 219, 252, 1)" // 0% 处的颜色
-                            },{
-                                offset: 1,
-                                color: "rgba(72, 219, 252, 0.5)" // 100% 处的颜色
-                            }], false)
-                        },
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaStyle: {
-                                type: 'default'
-                            },
-                            color: '#48DBFC',
-                        },
-                        emphasis: {
-                            // color: 'rgb(0,196,132)',
-                            borderColor: 'rgba(0,196,132,0.2)',
-                            extraCssText: 'box-shadow: 8px 8px 8px rgba(0, 0, 0, 1);',
-                            // borderWidth: 10
-                        }
-                    },
-                    data: arrTotal3
-                }
-                ]
-            });
-        }
-    }
-}
-
-</script>
-
-<style>
-</style>

+ 0 - 187
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAannulus.vue

@@ -1,187 +0,0 @@
-<template>
-  <div class="annulus_box">
-    <div class="annulus_title"><p>及格率比较</p></div>
-    <div id="pie_duo" style="width:99%; height:450px;"></div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-      
-      }
-    },
-    created() {
-      this.init();
-    },
-    computed: {
-      annulus() {
-        return this.$store.state.annulus
-      },
-    },
-    methods: {
-      drawLine(obj) {
-        let title = '';
-        let num = '';
-        console.log(title,456789)
-        var dataStyle = {
-          normal: {
-            label: { show: false },
-            labelLine: { show: false },
-            // shadowBlur: 40,
-            shadowColor: 'rgba(40, 40, 40, 0.5)',
-          }
-        };
-        let myChart_lei = this.$echarts.init(document.getElementById('pie_duo'));
-        myChart_lei.setOption({
-           title:{
-             text:title   ,
-             subtext: this.num,
-             x:'center',
-             y:'35%',
-             itemGap: 0,
-             textStyle: {
-               fontSize: 28,
-               fontWeight: 'bolder',
-               color: '#000080'
-             },
-             //subtextStyle: {
-             //  fontSize: 19,
-             //  fontWeight: 'bolder',
-             //  color: '#333'
-             //},
-          
-           },
-          backgroundColor: '#fff',
-          color: obj.primarycolor,
-          tooltip: {
-            show: true,
-            position: ['33%', '41%'],
-            fontSize:'30',
-            formatter: function (value) {
-              var res = '<div style="text-align:center;width:120px;"><p style="font-size:16px;">' + value.name + '</p></div>' + '<br/>' +
-                '<div style="text-align:center;width:120px;"><p style="color:#00FFFF;font-size:20px;">' + value.value + '%' + '</p></div>'
-              return res;
-            },
-          },
-          legend: {
-            show: false,
-            itemGap: 12,
-            top: '0%',
-            right: '4%',
-            data: obj.title
-          },
-          toolbox: {
-            show: false,
-            feature: {
-              mark: { show: true },
-              dataView: { show: true, readOnly: false },
-              restore: { show: true },
-              saveAsImage: { show: true }
-            }
-          },
-          series: [
-            {
-              name: obj.areadata.dataname,
-              type: 'pie',
-              clockWise: true,
-              radius: ['75%', '90%'],
-              itemStyle: dataStyle,
-              hoverAnimation: false,
-              data: [
-                {
-                  value: obj.areadata.occupydata,
-                  name: '本区及格率'
-                },
-                {
-                  value: obj.areadata.remaindata,
-                  name: '本区未及格率',
-                  itemStyle: {
-                    normal: {
-                      color: '#BFEFFF',
-                    }
-                  }
-                },
-              ]
-            },
-            {
-              name: obj.schooldata.dataname,
-              type: 'pie',
-              clockWise: true,
-              hoverAnimation: false,
-              radius: ['60%', '75%'],
-              itemStyle: dataStyle,
-              data: [
-                {
-                  value: obj.schooldata.occupydata,
-                  name: '本校及格率'
-                },
-                {
-                  value: obj.schooldata.remaindata,
-                  name: '本校未及格率',
-                  itemStyle: {
-                    normal: {
-                      color: '#B2DFEE',
-                    }
-                  }
-                }
-              ]
-            },
-            {
-              name: obj.teachingdata.dataname,
-              type: 'pie',
-              clockWise: true,
-              hoverAnimation: false,
-              radius: ['45%', '60%'],
-              itemStyle: dataStyle,
-              data: [
-                {
-                  value: obj.teachingdata.occupydata,
-                  name: '任教班及格率'
-                },
-                {
-                  value: obj.teachingdata.remaindata,
-                  name: '任教班未及格率',
-                  itemStyle: {
-                    normal: {
-                      color: '#F2F2F2',
-                    }
-                  }
-                }
-              ]
-            },
-          ]
-        })
-      },
-
-      init() {
-        this.$api.FindTeachAnnulus({})
-          .then((response) => {
-            //console.log(response.result.data, 777777)
-            this.$store.state.annulus = response.result.data
-          })
-      },
-    },
-    watch: {
-      // 		监听指令
-      annulus(a) {
-          this.drawLine(a)
-      },
-    }
-  }
-</script>
-<style scoped>
-  .annulus_box {
-    width:100%;
-    height:450px;
-  }
-  .annulus_title {
-    width:100%;
-    font-size:18px;
-    font-weight:bold;
-    color:#333;
-    padding-left:3%;
-    padding-top:1%;
-    
-  }
-</style>

+ 0 - 354
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAbargraph.vue

@@ -1,354 +0,0 @@
-<template>
-  <div class="bargraph">
-    <!--<div class="bargraph_title"><p>各校成绩排名</p></div>-->
-    <div id="myChart" :style="{width: '100%', height: '460px'}"></div>
-  </div>
-</template>
-<script>
-    export default {
-        name: "bargraph",
-        data(){
-          return{
-            now_url: this.$route.path,
-          }
-    },
-    created() {
-      this.init();
-            },
-        computed:{
-
-        zhuxhuang () {
-          return this.$store.state.zhuxhuang
-          },
-        
-       },
-      methods:{
-        drawLine(obj) {
-          let _this = this;
-          this.$store.state.zhuxhuang.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart'));
-          myChart.setOption({
-            title: {
-              text: obj.titlename,
-              left: "left",
-              top:"0%",
-              y: "10",
-              textStyle:{
-                fontSize:16
-              }
-            },
-            tooltip : {
-              trigger: 'axis',
-              axisPointer : {            // 坐标轴指示器,坐标轴触发有效
-                type : 'shadow'        // 默认为直线,可选为:'line' | 'shadow'
-              },
-              formatter: function (value) {
-                let arr = '';
-                for (var i = 0; i < value.length / 2; i++) {
-                  //console.log(value[i].seriesName,666666)
-                  var datalist = value[i].seriesName + ' : ' + value[i].data+'<br>';
-                  arr += datalist;
-                };
-                let one_average = obj.one_average.name + ' : ' + obj.one_average.data + '<br/>';
-                let two_average = obj.two_average.name + ' : ' + obj.two_average.data;
-                arr+=(one_average);
-                arr+=(two_average);
-                return arr;
-                }
-            },
-            legend: {
-              data:obj.titledata,
-              top:"5%"
-            },
-            grid: {
-              left: '2%',
-              right: '4%',
-              bottom: '3.5%',
-              containLabel: true,
-              x:100,
-              y2:100,
-            },
-            xAxis : [
-              {
-                type : 'category',
-                data : obj.object_name,
-                axisLabel: {
-                  interval: 0,    //强制文字产生间隔
-                  rotate: 45,     //文字逆时针旋转50°
-                  textStyle: {    //文字样式
-                    color: "#333",
-                    fontSize: 12,
-                    fontFamily: 'Microsoft YaHei',
-                  }
-                },
-
-              }
-            ],
-            dataZoom: {
-              show: true,
-              realtime: true,
-              backgroundColor: "rgba(0,0,0,0)",
-              handleSize: 15,
-              backgroundColor: '#fff',
-              showDataShadow: false,
-              handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-              fillerColor: new this.$echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-                //给颜色设置渐变色 前面4个参数,给第一个设置1,第四个设置0 ,就是水平渐变
-                //给第一个设置0,第四个设置1,就是垂直渐变
-                offset: 0,
-                color: '#1eb5e5'
-              }, {
-                  offset: 1,
-                  color: '#5ccbb1'
-                }]),
-              handleColor: '#ddd',//h滑动图标的颜色
-              handleStyle: {
-                borderColor: "#cacaca",
-                borderWidth: "1",
-                shadowBlur: 0,
-                background: "#ddd",
-                shadowColor: "#ddd",
-              },
-              backgroundColor: '#eee',//两边未选中的滑动条区域的颜色
-              y: 420,
-              height: 8,
-              start: 0,
-              end: 45,
-            },
-            yAxis : [
-              {
-                type : 'value',
-              }
-            ],
-            series : [
-              {
-                name:obj.one_data.name,
-                type:'bar',
-                stack: '本校',
-                data:obj.one_data.data,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#ffb5f6'
-                  }
-                },
-              },
-              {
-                name: obj.two_data.name,
-                type:'bar',
-                stack: '本校',
-                data: obj.two_data.data,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#fdd57e'
-                  }
-                },
-              },
-              {
-                name: obj.three_data.name,
-                type:'bar',
-                stack: '本校',
-                data:obj.three_data.data,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#ff8d8c'
-                  }
-                },
-              },
-              {
-                name:obj.four_data.name,
-                type:'bar',
-                stack: '本校',
-                data: obj.four_data.data,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#73e2fd'
-                  }
-                },
-              },
-              {
-                name: obj.five_data.name,
-                type:'bar',
-                stack: '本校',
-                data:obj.five_data.data,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#50dab6'
-                  }
-                },
-              },
-              {
-                name: obj.six_data.name,
-                type:'bar',
-                stack: '本校',
-                data: obj.six_data.data,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#6489da'
-                  }
-                },
-              },
-              {
-                name: obj.quyudata.anotherone_data.name,
-                type: 'bar',
-                stack: '区域',
-                data: obj.quyudata.anotherone_data.datalist,
-                barWidth : 20,
-                itemStyle:{
-                  normal:{
-                    color:'#c4cbd1'
-                  }
-                },
-              },
-              {
-                name: obj.quyudata.anothertwo_data.name,
-                type: 'bar',
-                stack: '区域',
-                data: obj.quyudata.anothertwo_data.datalist,
-                barWidth: 20,
-                itemStyle: {
-                  normal: {
-                    color: '#c4cbd1'
-                  }
-                },
-              },
-              {
-                name: obj.quyudata.anotherthree_data.name,
-                type: 'bar',
-                stack: '区域',
-                data: obj.quyudata.anotherthree_data.datalist,
-                barWidth: 20,
-                itemStyle: {
-                  normal: {
-                    color: '#c4cbd1'
-                  }
-                },
-              },
-              {
-                name: obj.quyudata.anotherfour_data.name,
-                type: 'bar',
-                stack: '区域',
-                data: obj.quyudata.anotherfour_data.datalist,
-                barWidth: 20,
-                itemStyle: {
-                  normal: {
-                    color: '#c4cbd1'
-                  }
-                },
-              },
-              {
-                name: obj.quyudata.anotherfive_data.name,
-                type: 'bar',
-                stack: '区域',
-                data: obj.quyudata.anotherfive_data.datalist,
-                barWidth: 20,
-                itemStyle: {
-                  normal: {
-                    color: '#c4cbd1'
-                  }
-                },
-              },
-              {
-                name: obj.quyudata.anothersix_data.name,
-                type: 'bar',
-                stack: '区域',
-                data: obj.quyudata.anothersix_data.datalist,
-                barWidth: 20,
-                itemStyle: {
-                  normal: {
-                    color: '#c4cbd1'
-                  }
-                },
-              },
-            ]
-          }),
-            myChart.on('click', function (param) {
-            let schoolname = param.name;
-            if (schoolname == '成都七中') {
-              _this.cdqz();
-            } else if (schoolname == '成都四中') {
-              _this.cdsz();
-            } else if (schoolname == '成都九中') {
-              _this.cdjz();
-            } else if (schoolname == '成都树德中学') {
-              _this.cdsd();
-            } else if (schoolname == '师大一中') {
-              _this.sdyz();
-            } else if (schoolname == '西川中学') {
-              _this.xczx();
-            } else if (schoolname == '成都市石室中学') {
-              _this.sszx();
-            }
-            })
-        },
-        //七中
-        cdqz() {
-          this.$api.Findcdqz({})
-            .then((response) => {
-              this.$store.state.leida= response.result.data;
-            })
-        },
-        //四中
-        cdsz() {
-          this.$api.Findcdsz({})
-            .then((response) => {
-              this.$store.state.leida = response.result.data;
-            })
-        },
-        //九中
-        cdjz() {
-          this.$api.Findcdjz({})
-            .then((response) => {
-              this.$store.state.leida = response.result.data;
-            })
-        },
-        //树德
-        cdsd() {
-          this.$api.Findcdsd({})
-            .then((response) => {
-              this.$store.state.leida = response.result.data;
-            })
-        },
-        //师大一中
-        sdyz() {
-          this.$api.Findsdyz({})
-            .then((response) => {
-              this.$store.state.leida = response.result.data;
-            })
-        },
-        //西川中学
-        xczx() {
-          this.$api.Findxczx({})
-            .then((response) => {
-              this.$store.state.leida = response.result.data;
-            })
-        },
-        //石室中学
-        sszx() {
-          this.$api.Findsszx({})
-            .then((response) => {
-              this.$store.state.leida = response.result.data;
-            })
-        },
-        init() {
-            this.$api.FindBargraph({})
-              .then((response) => {
-                this.$store.state.zhuxhuang = response.result.data;
-              })
-        },
-      },
-      watch:{
-// 		监听指令
-        zhuxhuang(a){
-          if (a) {
-            this.drawLine(a)
-          }
-        },
-      }
-    }
-</script>

+ 0 - 243
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAbarline.vue

@@ -1,243 +0,0 @@
-<template>
-  <div class="barline_box">
-    <div id="barline" style="width:100%; height:450px;"></div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-        now_url: this.$route.path,
-      }
-    },
-    created() {
-      this.init();
-    },
-    computed: {
-      barline() {
-        return this.$store.state.barline
-      }
-    },
-    methods: {
-      drawLine(obj) {
-        let myChart = this.$echarts.init(document.getElementById('barline'));
-        let _this = this;
-        myChart.setOption({
-          title: {
-            text: obj.titlename,
-            top: "0%",
-          },
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {            // 坐标轴指示器,坐标轴触发有效
-              type: 'shadow'        // 默认为直线,可选为:'line' | 'shadow'
-            }
-          },
-          legend: {
-            data: obj.titledata,
-            x: 'center',
-            top: "3%"
-          },
-          grid: {
-            left: '1.5%',
-            right: '4%',
-            bottom: '4.5%',
-            containLabel: true,
-            x: 100,
-            y2: 200,
-          },
-          toolbox: {
-            show: true,
-            orient: 'horizontal',
-            y:"2%",
-            feature: {
-              mark: { show: true },
-              dataView: { show: true, readOnly: false },
-              magicType: { show: true, type: ['bar', 'line',] },
-              restore: { show: false },
-              saveAsImage: { show: true }
-            }
-          },
-          calculable: true,
-          xAxis: [
-            {
-              type: 'category',
-              boundaryGap: true,
-              data: obj.object_name,
-              axisLabel: {
-                interval: 0,    //强制文字产生间隔
-                rotate: 50,     //文字逆时针旋转50°
-                textStyle: {    //文字样式
-                  color: "#333",
-                  fontSize: 11,
-                  fontFamily: 'Microsoft YaHei',
-                }
-              },
-            }
-          ],
-          dataZoom: {
-            show: true,
-            realtime: true,
-            backgroundColor: "rgba(0,0,0,0)",
-            handleSize: 15,
-            backgroundColor: '#fff',
-            showDataShadow: false,
-            handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-            fillerColor: new this.$echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-              //给颜色设置渐变色 前面4个参数,给第一个设置1,第四个设置0 ,就是水平渐变
-              //给第一个设置0,第四个设置1,就是垂直渐变
-              offset: 0,
-              color: '#1eb5e5'
-            }, {
-              offset: 1,
-              color: '#5ccbb1'
-            }]),
-            handleColor: '#ddd',//h滑动图标的颜色
-            handleStyle: {
-              borderColor: "#cacaca",
-              borderWidth: "1",
-              shadowBlur: 0,
-              background: "#ddd",
-              shadowColor: "#ddd",
-            },
-            backgroundColor: '#eee',//两边未选中的滑动条区域的颜色
-            y: 420,
-            height: 8,
-            start: 0,
-            end: 45,
-          },
-          yAxis: [
-            {
-              type: 'value'
-            }
-          ],
-          series: [
-            {
-              name: obj.one_data.name,
-              type: 'bar',
-              barWidth: 10,
-              smooth: true,
-              itemStyle: { normal: { areaStyle: { type: 'default' } } },
-              data: obj.one_data.data,
-              itemStyle: {
-                normal: {
-                  color: '#4EDAB5'
-                }
-              },
-              markPoint: {
-                data: [
-                  { type: 'max', name: '最大值' },
-                  { type: 'min', name: '最小值' }
-                ]
-              },
-              markLine: {
-                itemStyle: {
-                  normal: { lineStyle: { type: 'solid' }, label: { show: true, position: 'middle' } }
-                },
-                large: true,   
-                effect: {
-                  show: false,
-                  loop: true,
-                  period: 0,
-                  scaleSize: 2,
-                  color: null,
-                  shadowColor: null,
-                  shadowBlur: null
-                },
-                data: [
-                  {
-                    name: '区级平均分',
-                    type: 'average',
-                    // 单独配置每条线的样式
-                    yAxis: 86,
-                    lineStyle: {
-                      color: 'blue',
-                    },
-                    label: {
-                      formatter: '区级平均分'
-                    }
-                  },
-                  {
-                    name: '校级平均分',
-                    yAxis: 89,
-                    // 单独配置每条线的样式
-                    lineStyle: {
-                      color: 'red'
-                    },
-                    label: {
-                      formatter:'校级平均分'
-                    }
-                  },
-                  {
-                    name: '任教班级平均分',
-                    yAxis: 80,
-                    // 单独配置每条线的样式
-                    lineStyle: {
-                      color: 'green'
-                    },
-                    label: {
-                      formatter: '任教班级平均分'
-                    }
-                  },
-                ]
-              }
-            },
-            {
-              name: obj.last_data.name,
-              type: 'bar',
-              smooth: true,
-              barWidth: 10,
-              itemStyle: { normal: { areaStyle: { type: 'default' } } },
-              data: obj.last_data.data,
-              itemStyle: {
-                normal: {
-                  color: '#7AB6FE'
-                }
-              },
-            }
-          ]
-        })
-        myChart.on('click', function (param) {
-          console.log(param, 123456789);
-          console.log(param.seriesName);
-          console.log(param.name);
-          _this.barclick();
-        })
-      },
-
-      init() {
-        this.$api.FindTeachbargraph({})
-          .then((response) => {
-           // console.log(response.result.data, '老师测试页面');
-            this.$store.state.barline = response.result.data;
-                })
-      },
-      //点击班级 联动PR值
-      barclick() {
-        this.$api.FindClickPR({})
-          .then((response) => {
-           //console.log(response.result.data,77777)
-            this.$store.state.accuracyPR = response.result.data;
-          })
-      }
-
-    },
-    watch: {
-      // 		监听指令
-      barline(a) {
-        if (a) {
-          this.drawLine(a)
-        }
-      },
-    }
-              }
-</script>
-<style scoped>
-  .barline_box {
-    width:100%;
-    height:450px;
-  }
-  #myChart {
-    padding: 4% 2% 0% 2% !important;
-  }
-</style>

+ 0 - 57
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAbasics.vue

@@ -1,57 +0,0 @@
-<template>
-    <div class="basics_box">
-      <div class="basics">
-        <li class="basicslist" v-for="(item,index) in basicsdata"  v-if="index ==0">
-          <p class="basicslist_title">{{item.title}}</p>
-          <p class="basicslist_num">{{item.num}}<Icon type="ios-arrow-round-up"  style="color:#1acb9f;font-weight: bold;
-    font-size: 40px;margin-top:10px;" v-if="icon_show"/></p>
-          <p class="basicslist_total">{{item.total}}</p>
-          <p class="basicslist_area">{{item.areadata}}</p>
-        </li>
-        <li v-else class="basicslist">
-          <p class="basicslist_title">{{item.title}}</p>
-          <p class="basicslist_num">{{item.num}}</p>
-          <p class="basicslist_total">{{item.total}}</p>
-          <p class="basicslist_area" >{{item.areadata}}</p>
-        </li>
-      </div>
-    </div>
-</template>
-<script>
-    export default {
-        name: "basics",
-        data(){
-          return{
-           // basicsdata:[],
-            now_url: this.$route.path,
-            icon_show: false
-          }
-    },
-    created() {
-      this.init();
-    },
-    computed: {
-      basicsdata() {
-        return this.$store.state.basicsdata
-                  }
-                },
-    methods:{
-      init() {
-        if (this.now_url == '/saindex') {
-          this.$api.FindBasics({})
-            .then((response) => {
-              //console.log(response.result.data, 11111);
-              this.icon_show = true;
-              this.$store.state.basicsdata = response.result.data;
-              //console.log(this.xueduan,333333)
-            })
-        } else if (this.now_url == '/teach') {
-          this.$api.FindTeachBasics({})
-            .then((response) => {
-              this.$store.state.basicsdata = response.result.data;
-            })
-            }
-         },
-      }
-    }
-</script>

+ 0 - 242
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAchooseattention.vue

@@ -1,242 +0,0 @@
-<template>
-  <Row class="attention_box">
-    <Col span="24">
-      <Sider ref="side1" v-model="isCollapsed">
-        <Menu active-name="1-1" theme="dark" width="100%">
-          <MenuItem name="1-1">
-            <Icon type="ios-home-outline"/>
-            <span>{{$t('saindex.index')}}</span>
-          </MenuItem>
-          <MenuItem name="1-2">
-            <Icon type="ios-clipboard-outline"/>
-            <span>{{$t('saindex.grade')}}</span>
-          </MenuItem>
-          <MenuItem name="1-3">
-            <Icon type="md-checkmark-circle-outline"/>
-            <span>{{$t('saindex.droppoint')}}</span>
-          </MenuItem>
-          <MenuItem name="1-4">
-            <Icon type="ios-create-outline"/>
-            <span>{{$t('saindex.examination')}}</span>
-          </MenuItem>
-          <MenuItem name="1-5">
-            <Icon type="ios-medal-outline"/>
-            <span>{{$t('saindex.knowledge')}}</span>
-          </MenuItem>
-        </Menu>
-      </Sider>
-    </Col>
-    <Col span="24" class="choose">
-    <div class="select">
-      <p class="choose_box_tilte" v-if="this.now_url == '/saindex'">{{$t('sasidebar.class')}}</p>
-      <Cascader :data="selectgrade" v-model="grade"  placeholder="请选择年级" @on-change="listchange" v-if="this.now_url != '/teach'"></Cascader>
-      <p class="choose_box_tilte">{{$t('sasidebar.term')}}</p>
-      <Cascader :data="selectterm" v-model="semester" placeholder="请选择年级" @on-change="listterm"></Cascader>
-      <p class="choose_box_tilte" v-if="this.now_url == '/teach'">{{$t('sasidebar.compare')}}</p>
-      <Select v-model="model1" style="width:200px"  placeholder="请选择比较的数据"  v-if="this.now_url == '/teach'"  @on-change="datacompare">
-        <Option v-for="item in selectcontrast" :value="item.value" :key="item.value">{{ item.label }}</Option>
-      </Select>
-    </div>
-    </Col>
-  </Row>
-</template>
-<script>
-  export default {
-    name: "ChooseAttention",
-    data() {
-      return {
-        isCollapsed: false,
-        value1: [],
-        grade: [],
-        semester: [],
-        cityList: [],
-        model1:[],
-        now_url:this.$route.path,
-      }
-    },
-    created() {
-      this.init();
-      this.inits();
-      this.contrast();
-    },
-    computed: {
-      //  	命令发布监听
-      selectgrade() {
-        return this.$store.state.selectgrade
-      },
-      selectterm(){
-        return this.$store.state.selectterm
-      },
-      selectcontrast() {
-        return this.$store.state.selectcontrast
-      },
-    },
-    methods: {
-      //获取关注年级数据
-      init(){
-          this.$api.FindGrade({})
-            .then((response) => {
-              //console.log(response.result.data, 11111);
-              this.$store.state.selectgrade = response.result.data;
-              //console.log(this.$store.state.selectgrade, 888855)
-            })
-      },
-      //获取关注学年期
-      inits() {
-        if (this.now_url == '/saindex') {
-          this.$api.FindTerm({})
-            .then((response) => {
-              //console.log(response.result.data,11111);
-              this.$store.state.selectterm = response.result.data
-            })
-        } else if (this.now_url == '/teach') {
-          this.$api.FindTeachTerm({})
-            .then((response) => {
-              this.$store.state.selectterm = response.result.data;
-            })
-        } else if (this.now_url == '/total') {
-          this.$api.FindTeachTerm({})
-            .then((response) => {
-              this.$store.state.selectterm = response.result.data;
-            })
-        } 
-      },
-      //获取数据比较
-   contrast(){
-    this.$api.FindTeachContrast({})
-      .then((response) => {
-        this.$store.state.selectcontrast=response.result.data
-              })
-          },
-      //获取关注年级值
-      listchange(value, selectedData) {
-        let xueduan = value[0];
-        let nianjinum = value[1];
-        if (xueduan == 'gaozhong' && nianjinum != 1) {
-          this.$store.state.wenli_show = true;
-        } else {
-          this.$store.state.wenli_show = false;
-        }
-        //console.log(value,33333);
-        this.$api.FindSelectGrade({})
-          .then((response) => {
-            //console.log(response.result.data, 789789789);
-            //获取新的年级选择
-            this.$store.state.selectgrade = response.result.data.selectgrade
-            //获取新的学年期
-            this.$store.state.selectterm = response.result.data.term
-            //获取新的考试次数情况
-            this.$store.state.selectexam = response.result.data.exam[0].data;
-            //获取新的基础信息
-            this.$store.state.basicsdata = response.result.data.base;
-            //获取新的各校成绩排名
-            this.$store.state.zhuxhuang = response.result.data.barecharts;
-            //获取新的各项科目表现
-            this.$store.state.leida = response.result.data.leida;
-            //获取新的科目表现对比
-            this.$store.state.pie = response.result.data.pie
-            //获取新的考试类型
-            this.$store.state.examtype = response.result.data.examtype;
-            //获取新的各校历次总分统计图
-            this.$store.state.linechart = response.result.data.linechart;
-                  })
-      },
-      //获取关注学年期
-      listterm(value, selectedData) {
-        if (this.now_url == '/saindex') {
-          this.$api.FindSelectTerm({})
-            .then((response) => {
-              //console.log(response.result.data);
-              //获取新的关注年级
-              this.$store.state.selectgrade = response.result.data.selectgrade
-              //获取新的学年期
-              this.$store.state.selectterm = response.result.data.term
-              //获取新的考试次数情况
-              this.$store.state.selectexam = response.result.data.exam[0].data;
-              //获取新的基础信息
-              this.$store.state.basicsdata = response.result.data.base;
-              //获取新的各校成绩排名
-              this.$store.state.zhuxhuang = response.result.data.barecharts;
-              //获取新的各项科目表现
-              this.$store.state.leida = response.result.data.leida;
-              //获取新的科目表现对比
-              this.$store.state.pie = response.result.data.pie
-              //获取新的考试类型
-              this.$store.state.examtype = response.result.data.examtype;
-              //获取新的各校历次总分统计图
-              this.$store.state.linechart = response.result.data.linechart;
-            })
-        } else if (this.now_url =='/teach') {
-          this.$api.FindDynamicTerm({})
-            .then((response) => {
-              //console.log(response.result.data,33333)
-              //获取新的学年期
-              this.$store.state.selectterm = response.result.data.term;
-              //获取新的数据对比
-              this.$store.state.selectcontrast = response.result.data.selectcontrast;
-              //获取新的考试次数情况
-              this.$store.state.selectexam = response.result.data.exam[0].data;
-              //获取新的基础信息
-              this.$store.state.basicsdata = response.result.data.base;
-              //获取各班平均分数排名
-              this.$store.state.barline = response.result.data.barecharts;
-              //获取及格率比较
-              this.$store.state.annulus = response.result.data.annulus;
-              //获取PR百分等级
-              this.$store.state.accuracyPR = response.result.data.accuracyPR;
-              //获取历次总分统计图
-              this.$store.state.linechart = response.result.data.linechart;
-            })
-        }
-       
-      },
-      //动态数据比较
-      datacompare(value, selectedData) {
-        this.$api.FindDatacompare({})
-          .then((response) => {
-            //获取新的学年期
-            this.$store.state.selectterm = response.result.data.term;
-            //获取新的数据对比
-            this.$store.state.selectcontrast = response.result.data.selectcontrast;
-            //获取新的考试次数情况
-            this.$store.state.selectexam = response.result.data.exam[0].data;
-            //获取新的基础信息
-            this.$store.state.basicsdata = response.result.data.base;
-            //获取各班平均分数排名
-            this.$store.state.barline = response.result.data.barecharts;
-            //获取及格率比较
-            this.$store.state.annulus = response.result.data.annulus;
-            //获取PR百分等级
-            this.$store.state.accuracyPR = response.result.data.accuracyPR;
-            //获取历次总分统计图
-            this.$store.state.linechart = response.result.data.linechart;
-          })
-      }
-    },
-  }
-</script>
-<style scoped>
-  .ivu-select-selection {
-    background-color: #cfd4da !important;
-  }
-
-  .ivu-input {
-    font-size: 14px !important;
-    background-color: #cfd4da;
-    color: #4d5760 !important;
-    border: 1px solid #cfd4da;
-  }
-
-  .ivu-input-wrapper {
-    color: #000 !important;
-  }
-
-  .ivu-input:hover {
-    border: 1px solid #fff;
-  }
-  .ivu-select {
-    width: 100% !important;
-  }
-</style>
-<style scoped>
-</style>

+ 0 - 129
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAchooseexam.vue

@@ -1,129 +0,0 @@
-<template>
-   <Row class="exam_box">
-     <Col span="24">
-       <li v-for="(item,index) in selectexam" class="list_box" @click="select_box(index)">
-         <p class="box_title">{{item.title}}-{{item.type}}</p>
-         <p class="box_time">{{item.time}}</p>
-         <p class="box_type">诊断类型:{{item.typename}}</p>
-         <p class="box_num">测试人数:{{item.num}}人</p>
-       </li>
-       <infinite-loading  @infinite="onInfinite" ref="infiniteLoading"></infinite-loading>
-     </Col>
-   </Row>
-</template>
-<script>
-  import InfiniteLoading from 'vue-infinite-loading';
-  export default {
-    components: {
-      InfiniteLoading,
-    },
-    data() {
-      return {
-        list: [],
-        now_url: this.$route.path,
-        ops: {
-          vuescroll: {},
-          scrollPanel: {},
-          rail: {
-            keepShow: true
-          },
-          bar: {
-            hoverStyle: true,
-            onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
-            background: 'red',
-          }
-        },
-      };
-    },
-    created() {
-      this.init();
-    },
-    computed: {
-      selectexam() {
-        return this.$store.state.selectexam
-            },
-            },
-    methods: {
-      onInfinite() {
-        //setTimeout(() => {
-        //  const temp = [];
-        //  // let suiji=Math.ceil(Math.random()*10);
-        //  for (let i = this.list.length + 1; i <= this.list.length + 3; i++) {
-        //    temp.push(i);
-        //  }
-        //  this.list = this.list.concat(temp);
-        //  this.$refs.infiniteLoading.$emit('$InfiniteLoading:loaded');
-        //}, 300);
-      },
-
-      //点击考试获取详情
-      select_box(value) {
-        if (this.now_url == '/saindex') {
-          this.$api.FindSelectExam({})
-            .then((response) => {
-              //console.log(response.result.data);
-              this.$store.state.selectgrade = response.result.data.selectgrade
-              //获取新的学年期
-              this.$store.state.selectterm = response.result.data.term
-              //获取新的考试次数情况
-              this.$store.state.selectexam = response.result.data.exam[0].data;
-              //获取新的基础信息
-              this.$store.state.basicsdata = response.result.data.base;
-              //获取新的各校成绩排名
-              this.$store.state.zhuxhuang = response.result.data.barecharts;
-              //获取新的各项科目表现
-              this.$store.state.leida = response.result.data.leida;
-              //获取新的科目表现对比
-              this.$store.state.pie = response.result.data.pie
-              //获取新的考试类型
-              this.$store.state.examtype = response.result.data.examtype;
-              //获取新的各校历次总分统计图
-              this.$store.state.linechart = response.result.data.linechart;
-            })
-        } else if (this.now_url == '/teach') {
-          this.$api.FindClickExam({})
-            .then((response) => {
-              //获取新的学年期
-              this.$store.state.selectterm = response.result.data.term;
-              //获取新的数据对比
-              this.$store.state.selectcontrast = response.result.data.selectcontrast;
-              //获取新的考试次数情况
-              this.$store.state.selectexam = response.result.data.exam[0].data;
-              //获取新的基础信息
-              this.$store.state.basicsdata = response.result.data.base;
-              //获取各班平均分数排名
-              this.$store.state.barline = response.result.data.barecharts;
-              //获取及格率比较
-              this.$store.state.annulus = response.result.data.annulus;
-              //获取PR百分等级
-              this.$store.state.accuracyPR = response.result.data.accuracyPR;
-              //获取历次总分统计图
-              this.$store.state.linechart = response.result.data.linechart;
-            })
-        }
-      
-      },
-      init() {
-        if (this.now_url == '/saindex') {
-          this.$api.FindExam({})
-            .then((response) => {
-              //console.log(response.result.data,11111);
-              this.$store.state.selectexam = response.result.data[0].data;
-              //console.log(this.list,333333)
-            })
-        } else if (this.now_url == '/teach') {
-          this.$api.FindTeachExam({})
-            .then((response) => {
-              console.log(response.result.data, 45678999990000)
-              this.$store.state.selectexam = response.result.data[0].data;
-            })
-        } else if (this.now_url == '/total') {
-          this.$api.FindExam({})
-            .then((response) => {
-              this.$store.state.selectexam = response.result.data[0].data;
-            })
-        }
-      }
-    },
-  };
-</script>

+ 0 - 392
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAlinechart.vue

@@ -1,392 +0,0 @@
-<template>
-  <Row class="linechart_box">
-    <Col span="24" class="select_box">
-      <div class="type_box">
-        <Select v-model="model1" style="width:180px;height:40px;" @on-change="ExamType">
-          <Option v-for="item in linechart" :value="item.value" :key="item.value" >{{ item.label }}</Option>
-        </Select>
-      </div>
-      <div class="artsscience" v-if="this.now_url =='/saindex'">
-        <li class="wenke" @click="arts_btn"   v-if="wenli_show">显示文科</li>
-        <li class="like" @click="science_btn"  v-if="wenli_show">显示理科</li>
-      </div>
-    </Col>
-    <Col span="24">
-      <div id="myChart_line" :style="{width: '100%', height: '300px'}"></div>
-    </Col>
-  </Row>
-</template>
-<script>
-  export default {
-    name: "linechart",
-    data() {
-      return {
-        cityList: [],
-        model1: 'liankao',
-        now_url: this.$route.path,
-      }
-    },
-    created() {
-      this.init();
-      this.type_init();
-          },
-    computed: {
-      //  	命令发布监听
-      //mode() {
-      //  return this.$store.state.linechart.mode
-      //},
-      linechart_standard() {
-        return this.$store.state.linechart
-          },
-      linechart() {
-        return this.$store.state.examtype
-      },
-      wenli_show() {
-        return this.$store.state.wenli_show
-      }
-    },
-    methods: {
-      drawLine(obj) {
-        //this.$store.state.linechart.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('myChart_line'));
-        myChart.setOption({
-          title: {
-            text: '各校历次总分统计图',
-          },
-          legend: {
-            data: obj.obj_name,
-            top: '10%',
-          },
-          tooltip: {
-            trigger: 'axis',
-            //backgroundColor: 'rgba(0,0,0,0.7)',//背景颜色(此时为默认色)
-            borderRadius: 8,//边框圆角
-            padding: 10,    // [5, 10, 15, 20] 内边距
-            //echarts点击事件
-            // formatter: function (params,ticket,callback) {
-            //   console.log(params)
-            // },
-          },
-          grid: {
-            left: '2%',
-            right: '3%',
-            bottom: '3%',
-            containLabel: true
-          },
-          toolbox: {
-            show: true, //是否显示
-            orient: 'horizontal', //水平显示(vertical为垂直显示)
-            right: '3%', //距离右边多远
-            feature: {
-              magicType: {//动态类型切换
-                type: ['bar', 'line']
-              },
-              saveAsImage: {
-                show: true
-              }
-            },
-          },
-          xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            data: obj.obj_data,
-            min: 'dataMin',
-            max: 'dataMax',
-            splitLine: {
-              show: true
-            }
-          },
-          yAxis: {
-            type: 'value',
-            min: 'dataMin',
-            max: 'dataMax',
-            splitLine: {
-              show: true
-            }
-          },
-          series: [
-            {
-              name: obj.obj_series[0].name,
-              type: 'line',
-              data: obj.obj_series[0].data,
-              itemStyle: {
-                normal: {
-                  color: '#FF3030',
-                  lineStyle: {
-                    color: '#FF3030',
-                    width: 2,
-                  }
-                }
-              },
-              areaStyle: {
-                color: {
-                  type: 'linear',
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [{
-                    offset: 0, color:obj.start_color // 0% 处的颜色
-                  }, {
-                    offset: 1, color: obj.end_color // 100% 处的颜色
-                  }],
-                }
-              },
-            },
-            {
-              name: obj.obj_series[1].name,
-              type: 'line',
-              data: obj.obj_series[1].data,
-              itemStyle: {
-                normal: {
-                  color: "#00F5FF",
-                  lineStyle: {
-                    color: '#00F5FF',
-                    width: 2,
-                  }
-                }
-              },
-              areaStyle: {
-                color: {
-                  type: 'linear',
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [{
-                    offset: 0, color: 'rgba(245,245,245,1)' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: 'rgba(245,245,245,.5)' // 100% 处的颜色
-                  }],
-                }
-              },
-            },
-            {
-              name: obj.obj_series[2].name,
-              type: 'line',
-              data: obj.obj_series[2].data,
-              itemStyle: {
-                normal: {
-                  color: "#4169E1",
-                  lineStyle: {
-                    color: '#4169E1',
-                    width: 2,
-                  }
-                }
-              },
-              areaStyle: {
-                color: {
-                  type: 'linear',
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [{
-                    offset: 0, color: 'rgba(245,245,245,1)' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: 'rgba(245,245,245,.5)' // 100% 处的颜色
-                  }],
-                }
-              },
-            },
-            {
-              name: obj.obj_series[3].name,
-              type: 'line',
-              data: obj.obj_series[3].data,
-              itemStyle: {
-                normal: {
-                  color: "#912CEE",
-                  lineStyle: {
-                    color: '#912CEE',
-                    width: 2,
-                  }
-                }
-              },
-              areaStyle: {
-                color: {
-                  type: 'linear',
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [{
-                    offset: 0, color: 'rgba(245,245,245,1)' // 0% 处的颜色
-                  },  {
-                    offset: 1, color: 'rgba(245,245,245,.5)' // 100% 处的颜色
-                  }],
-                }
-              },
-            },
-            {
-              name: obj.obj_series[4].name,
-              type: 'line',
-              data: obj.obj_series[4].data,
-              itemStyle: {
-                normal: {
-                  color: "#FF8247",
-                  lineStyle: {
-                    color: '#FF8247',
-                    width: 2,
-                  }
-                }
-              },
-              areaStyle: {
-                color: {
-                  type: 'linear',
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [{
-                    offset: 0, color: 'rgba(245,245,245,1)' // 0% 处的颜色
-                  },  {
-                    offset: 1, color: 'rgba(245,245,245,.5)' // 100% 处的颜色
-                  }],
-                }
-              },
-            },
-            {
-              name: obj.obj_series[5].name,
-              type: 'line',
-              data: obj.obj_series[5].data,
-              itemStyle: {
-                normal: {
-                  color: "#6AD4B9",
-                  lineStyle: {
-                    color: '#6AD4B9',
-                    width: 2,
-                  }
-                }
-              },
-              areaStyle: {
-                color: {
-                  type: 'linear',
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [{
-                    offset: 0, color: 'rgba(245,245,245,1)' // 0% 处的颜色
-                  },  {
-                    offset: 1, color: 'rgba(245,245,245,.5)' // 100% 处的颜色
-                  }],
-
-                }
-              },
-            }
-          ]
-        })
-        myChart.on("click", function (e) {
-          console.log(e);
-          console.log(e.seriesName)
-          console.log(e.name)
-        })
-      },
-      init() {
-        if (this.now_url == '/saindex') {
-          this.$api.FindLinechart({})
-            .then((response) => {
-              //console.log(response.result.data,11111)
-              this.$store.state.linechart = response.result.data;
-            })
-        } else if (this.now_url =='/teach') {
-          this.$api.FindTeachHistory({})
-            .then((response) => {
-              //console.log(response.result.data, 8877822228888)
-              this.$store.state.linechart = response.result.data;
-            })
-        }
-       
-      },
-      type_init() {
-        this.$api.FindExamtype({})
-          .then((response) => {
-            //console.log(response.result.data, 111)
-            //this.cityList = response.result.data;
-            this.$store.state.examtype = response.result.data;
-          })
-      },
-      //考试类型
-      ExamType(value) {
-        this.$api.FindSelectExamType({})
-          .then((response) => {
-            //console.log(response.result.data, 8889)
-            this.$store.state.selectgrade = response.result.data.selectgrade
-            //获取新的学年期
-            this.$store.state.selectterm = response.result.data.term
-            //获取新的考试次数情况
-            this.$store.state.selectexam = response.result.data.exam[0].data;
-            //获取新的基础信息
-            this.$store.state.basicsdata = response.result.data.base;
-            //获取新的各校成绩排名
-            this.$store.state.zhuxhuang = response.result.data.barecharts;
-            //获取新的各项科目表现
-            this.$store.state.leida = response.result.data.leida;
-            //获取新的科目表现对比
-            this.$store.state.pie = response.result.data.pie
-            //获取新的考试类型
-            this.$store.state.examtype = response.result.data.examtype;
-            //获取新的各校历次总分统计图
-            this.$store.state.linechart = response.result.data.linechart;
-          })
-      },
-      //显示文科 
-      arts_btn() {
-        this.$api.FindSelectArts({})
-          .then((response) => {
-           // console.log(response.result.data, 5555555);
-            this.$store.state.selectgrade = response.result.data.selectgrade
-            //获取新的学年期
-            this.$store.state.selectterm = response.result.data.term
-            //获取新的考试次数情况
-            this.$store.state.selectexam = response.result.data.exam[0].data;
-            //获取新的基础信息
-            this.$store.state.basicsdata = response.result.data.base;
-            //获取新的各校成绩排名
-            this.$store.state.zhuxhuang = response.result.data.barecharts;
-            //获取新的各项科目表现
-            this.$store.state.leida = response.result.data.leida;
-            //获取新的科目表现对比
-            this.$store.state.pie = response.result.data.pie
-            //获取新的考试类型
-            this.$store.state.examtype = response.result.data.examtype;
-            //获取新的各校历次总分统计图
-            this.$store.state.linechart = response.result.data.linechart;
-                })
-      },
-      //显示理科
-      science_btn() {
-        this.$api.FindSelectScience({})
-          .then((response) => {
-            //console.log(response.result.data,77899)
-            this.$store.state.selectgrade = response.result.data.selectgrade
-            //获取新的学年期
-            this.$store.state.selectterm = response.result.data.term
-            //获取新的考试次数情况
-            this.$store.state.selectexam = response.result.data.exam[0].data;
-            //获取新的基础信息
-            this.$store.state.basicsdata = response.result.data.base;
-            //获取新的各校成绩排名
-            this.$store.state.zhuxhuang = response.result.data.barecharts;
-            //获取新的各项科目表现
-            this.$store.state.leida = response.result.data.leida;
-            //获取新的科目表现对比
-            this.$store.state.pie = response.result.data.pie
-            //获取新的考试类型
-            this.$store.state.examtype = response.result.data.examtype;
-            //获取新的各校历次总分统计图
-            this.$store.state.linechart = response.result.data.linechart;
-          })
-
-      }
-    },
-    watch: {
-// 		监听指令
-      linechart_standard(a) {
-        if (a){
-          this.drawLine(a);
-        }
-      },
-    }
-  }
-</script>

+ 0 - 520
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SApercent.vue

@@ -1,520 +0,0 @@
-<template>
-  <div class="percent_box">
-    <div class="title_box"><p>PR(百分等级)</p></div>
-    <!--正确率-->
-    <div class="percent_list">
-      <div class="piedata_box" v-for="(item,index) in accuracydatas">
-        <div class="pie_box">
-          <div :id="item.idname" :style="{width: '100%', height: '200px'}"></div>
-        </div>
-        <div class="pie_title">
-          <p class="title_name">高分组答对率</p>
-          <p class="title_num">{{item.high_accuracy}}%</p>
-          <p class="title_name title_two">低分组答对率</p>
-          <p class="title_num">{{item.low_accuracy}}%</p>
-        </div>
-      </div>
-    </div>
-    <!--RP百分比-->
-    <div class="percent_list">
-      <div class="piedata_box" v-for="(items,index) in prdata">
-        <div class="pie_box">
-          <div :id="items.idname" :style="{width: '100%', height: '200px'}"></div>
-        </div>
-        <div class="pie_marked">
-          <Icon :type="items.icon_type"  :class="items.icon_color"  size="48"/>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-        accuracydatas: [],
-        prdata:[],
-      }
-    },
-    created() {
-      this.init();
-    },
-    mounted() {
-      this.init();
-    },
-    computed: {
-      accuracyPRdata() {
-        return this.$store.state.accuracyPR
-      },
-    },
-    methods: {
-      //本班准确率
-      //答对率
-      accuracy_one(obj) {
-        //this.$store.state.pie.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('pie_one'));
-        myChart.setOption({
-          title: {
-            text: obj.titlenum + '%',
-            subtext: obj.echartstitle,
-            x: 'center',
-            y: '35%',
-            textStyle: {
-              fontWeight: 'normal',
-              color: '#0580f2',
-              fontSize: '22'
-            },
-            subtextStyle: {
-               fontSize: 11,
-               fontWeight: 'bolder',
-               color: '#333'
-             },
-          },
-          color: ['rgba(176, 212, 251, 1)'],
-          legend: {
-            show: false,
-            itemGap: 12,
-            data: ['01', '02']
-          },
-
-          series: [{
-            name: obj.data_name,
-            type: 'pie',
-            clockWise: true,
-            radius: ['70%', '100%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            },
-            hoverAnimation: false,
-            data: [{
-              value: obj.occupy,
-              name: '01',
-              itemStyle: {
-                normal: {
-                  color: { // 完成的圆环的颜色
-                    colorStops: [{
-                      offset: 0,
-                      color: '#00cefc' // 0% 处的颜色
-                    }, {
-                      offset: 1,
-                      color: '#367bec' // 100% 处的颜色
-                    }]
-                  },
-                  label: {
-                    show: false
-                  },
-                  labelLine: {
-                    show: false
-                  }
-                }
-              }
-            }, {
-              name: '02',
-                value: obj.residue
-            }]
-          }]
-        })
-      },
-      accuracy_two(obj) {
-        //this.$store.state.pie.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('pie_two'));
-        myChart.setOption({
-          title: {
-            text: obj.titlenum +'%',
-            subtext: obj.echartstitle,
-            x: 'center',
-            y: '35%',
-            textStyle: {
-              fontWeight: 'normal',
-              color: '#0580f2',
-              fontSize: '22'
-            },
-            subtextStyle: {
-              fontSize: 11,
-              fontWeight: 'bolder',
-              color: '#333'
-            },
-          },
-          color: ['rgba(176, 212, 251, 1)'],
-          legend: {
-            show: false,
-            itemGap: 12,
-            data: ['01', '02']
-          },
-
-          series: [{
-            name: obj.data_name,
-            type: 'pie',
-            clockWise: true,
-            radius: ['70%', '100%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            },
-            hoverAnimation: false,
-            data: [{
-              value: obj.occupy,
-              name: '01',
-              itemStyle: {
-                normal: {
-                  color: { // 完成的圆环的颜色
-                    colorStops: [{
-                      offset: 0,
-                      color: '#00cefc' // 0% 处的颜色
-                    }, {
-                      offset: 1,
-                      color: '#367bec' // 100% 处的颜色
-                    }]
-                  },
-                  label: {
-                    show: false
-                  },
-                  labelLine: {
-                    show: false
-                  }
-                }
-              }
-            }, {
-              name: '02',
-              value: obj.residue
-            }]
-          }]
-        })
-      },
-      accuracy_three(obj) {
-        //this.$store.state.pie.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('pie_three'));
-        myChart.setOption({
-          title: {
-            text: obj.titlenum + '%',
-            subtext: obj.echartstitle,
-            x: 'center',
-            y: '35%',
-            textStyle: {
-              fontWeight: 'normal',
-              color: '#0580f2',
-              fontSize: '22'
-            },
-            subtextStyle: {
-              fontSize: 11,
-              fontWeight: 'bolder',
-              color: '#333'
-            },
-          },
-          color: ['rgba(176, 212, 251, 1)'],
-          legend: {
-            show: false,
-            itemGap: 12,
-            data: ['01', '02']
-          },
-
-          series: [{
-            name: obj.data_name,
-            type: 'pie',
-            clockWise: true,
-            radius: ['70%', '100%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            },
-            hoverAnimation: false,
-            data: [{
-              value: obj.occupy,
-              name: '01',
-              itemStyle: {
-                normal: {
-                  color: { // 完成的圆环的颜色
-                    colorStops: [{
-                      offset: 0,
-                      color: '#00cefc' // 0% 处的颜色
-                    }, {
-                      offset: 1,
-                      color: '#367bec' // 100% 处的颜色
-                    }]
-                  },
-                  label: {
-                    show: false
-                  },
-                  labelLine: {
-                    show: false
-                  }
-                }
-              }
-            }, {
-              name: '02',
-              value: obj.residue
-            }]
-          }]
-        })
-      },
-      //PR值
-      pr_one(obj) {
-        //this.$store.state.pie.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('pr_one'));
-        myChart.setOption({
-          title: {
-            text: obj.titlenum ,
-            subtext: obj.echartstitle,
-            x: 'center',
-            y: '35%',
-            textStyle: {
-              fontWeight: 'normal',
-              color: '#0580f2',
-              fontSize: '22'
-            },
-            subtextStyle: {
-              fontSize: 11,
-              fontWeight: 'bolder',
-              color: '#333'
-            },
-          },
-          color: ['rgba(176, 212, 251, 1)'],
-          legend: {
-            show: false,
-            itemGap: 12,
-            data: ['01', '02']
-          },
-
-          series: [{
-            name: obj.data_name,
-            type: 'pie',
-            clockWise: true,
-            radius: ['70%', '100%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            },
-            hoverAnimation: false,
-            data: [{
-              value: obj.occupy,
-              name: '01',
-              itemStyle: {
-                normal: {
-                  color: { // 完成的圆环的颜色
-                    colorStops: [{
-                      offset: 0,
-                      color: '#66CCCC' // 0% 处的颜色
-                    }, {
-                      offset: 1,
-                        color: '#00FFFF' // 100% 处的颜色
-                    }]
-                  },
-                  label: {
-                    show: false
-                  },
-                  labelLine: {
-                    show: false
-                  }
-                }
-              }
-            }, {
-              name: '02',
-              value: obj.residue
-            }]
-          }]
-        })
-      },
-      pr_two(obj) {
-        //this.$store.state.pie.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('pr_two'));
-        myChart.setOption({
-          title: {
-            text: obj.titlenum ,
-            subtext: obj.echartstitle,
-            x: 'center',
-            y: '35%',
-            textStyle: {
-              fontWeight: 'normal',
-              color: '#0580f2',
-              fontSize: '22'
-            },
-            subtextStyle: {
-              fontSize: 11,
-              fontWeight: 'bolder',
-              color: '#333'
-            },
-          },
-          color: ['rgba(176, 212, 251, 1)'],
-          legend: {
-            show: false,
-            itemGap: 12,
-            data: ['01', '02']
-          },
-
-          series: [{
-            name: obj.data_name,
-            type: 'pie',
-            clockWise: true,
-            radius: ['70%', '100%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            },
-            hoverAnimation: false,
-            data: [{
-              value: obj.occupy,
-              name: '01',
-              itemStyle: {
-                normal: {
-                  color: { // 完成的圆环的颜色
-                    colorStops: [{
-                      offset: 0,
-                      color: '#66CCCC' // 0% 处的颜色
-                    }, {
-                      offset: 1,
-                      color: '#00FFFF' // 100% 处的颜色
-                    }]
-                  },
-                  label: {
-                    show: false
-                  },
-                  labelLine: {
-                    show: false
-                  }
-                }
-              }
-            }, {
-              name: '02',
-              value: obj.residue
-            }]
-          }]
-        })
-      },
-      pr_three(obj) {
-        //this.$store.state.pie.mode = false;
-        let myChart = this.$echarts.init(document.getElementById('pr_three'));
-        myChart.setOption({
-          title: {
-            text: obj.titlenum,
-            subtext: obj.echartstitle,
-            x: 'center',
-            y: '35%',
-            textStyle: {
-              fontWeight: 'normal',
-              color: '#0580f2',
-              fontSize: '22'
-            },
-            subtextStyle: {
-              fontSize: 11,
-              fontWeight: 'bolder',
-              color: '#333'
-            },
-          },
-          color: ['rgba(176, 212, 251, 1)'],
-          legend: {
-            show: false,
-            itemGap: 12,
-            data: ['01', '02']
-          },
-
-          series: [{
-            name: obj.data_name,
-            type: 'pie',
-            clockWise: true,
-            radius: ['70%', '100%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            },
-            hoverAnimation: false,
-            data: [{
-              value: obj.occupy,
-              name: '01',
-              itemStyle: {
-                normal: {
-                  color: { // 完成的圆环的颜色
-                    colorStops: [{
-                      offset: 0,
-                      color: '#66CCCC' // 0% 处的颜色
-                    }, {
-                      offset: 1,
-                      color: '#00FFFF' // 100% 处的颜色
-                    }]
-                  },
-                  label: {
-                    show: false
-                  },
-                  labelLine: {
-                    show: false
-                  }
-                }
-              }
-            }, {
-              name: '02',
-              value: obj.residue
-            }]
-          }]
-        })
-      },
-      init() {
-        let _this = this;
-        this.$api.FindTeachPR({})
-          .then((response) => {
-            //console.log(response.result.data,88899999)
-            _this.$store.state.accuracyPR = response.result.data;
-          })
-      }
-    },
-    watch: {
-      // 		监听指令
-      accuracyPRdata(value) {
-        if (value) {
-          console.log(value, 6666);
-          this.accuracydatas = value.accuracydata;
-          this.prdata = value.percentdata;
-          let pie_one = value.accuracydata[0];
-          let pie_two = value.accuracydata[1];
-          let pie_three = value.accuracydata[2];
-          let pr_one = value.percentdata[0];
-          let pr_two = value.percentdata[1];
-          let pr_three = value.percentdata[2];
-          this.accuracy_one(pie_one);
-          this.accuracy_two(pie_two);
-          this.accuracy_three(pie_three);
-          this.pr_one(pr_one);
-          this.pr_two(pr_two);
-          this.pr_three(pr_three);
-        }
-      },
-    }
-
-  }
-</script>
-

+ 0 - 144
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAradargraph.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="radargraph_box">
-    <!--<div class="bargraph_title"><p>各项科目表现</p></div>-->
-    <div id="myChart_lei" :style="{width: '100%', height: '450px'}"></div>
-  </div>
-</template>
-
-<script>
-    export default {
-        name: "radargraph",
-        data(){
-          return{
-
-          }
-    },
-    created() {
-      this.init();
-        },
-      computed:{
-        //  	命令发布监听
-        //mode () {
-        //  return this.$store.state.leida.mode
-        //},
-        leida () {
-          return this.$store.state.leida
-        },
-      },
-      methods:{
-        drawLine(obj) {
-          this.$store.state.leida.mode = false;
-          let myChart_lei = this.$echarts.init(document.getElementById('myChart_lei'));
-          myChart_lei.setOption({
-            title: {
-              text: '各项科目表现'
-            },
-            tooltip: {},
-            legend: {
-              top: 25,
-              itemWidth: 16,
-              itemHeight: 16,
-              data: obj.titledata,
-              textStyle: {
-                color: '#000'
-              }
-            },
-            radar: {
-              radius: '60%',
-              splitNumber: 8,
-              axisLine: {
-                lineStyle: {
-                  color: '#000',
-                  opacity: .2
-                }
-              },
-              splitLine: {
-                lineStyle: {
-                  color: '#fff',
-                  opacity: .2
-                }
-              },
-              splitArea: {
-                areaStyle: {
-                  color: 'rgba(127,95,132,.2)',
-                  opacity: 1,
-                  shadowBlur: 45,
-                  shadowColor: 'rgba(0,0,0,.5)',
-                  shadowOffsetX: 0,
-                  shadowOffsetY: 15,
-                }
-              },
-              indicator: obj.indicator
-            },
-            series: [{
-              name: obj.dataname,
-              type: 'radar',
-              symbolSize: 0,
-              areaStyle: {
-                normal: {
-                  shadowBlur: 13,
-                  shadowColor: 'rgba(0,0,0,.2)',
-                  shadowOffsetX: 0,
-                  shadowOffsetY: 10,
-                  opacity: 1
-                }
-              },
-              data: [{
-                value: obj.data1,
-                name: obj.title_one,
-                itemStyle: {
-                  color: 'rgba(239,75,76,.5)',
-                  lineStyle: {
-                    color: 'rgba(239,75,76,.5)',
-                  },
-                      }
-              }, {
-                value:obj.data2,
-                name: obj.title_two,
-                itemStyle: {
-                  color: 'rgba(177,234,219,.8)',
-                  lineStyle: {
-                    color: 'rgba(177,234,219,.8)',
-                  },
-                }
-              }]
-            }],
-            color: ['#ef4b4c', '#b1eadb'],
-            backgroundColor: {
-              type: 'radial',
-              x: 0.4,
-              y: 0.4,
-              r: 0.35,
-              colorStops: [{
-                offset: 0,
-                color: '#D4CED5' // 0% 处的颜色
-              }, {
-                offset: .4,
-                color: '#f5f5f5' // 100% 处的颜色
-              }, {
-                offset: 1,
-                color: '#fff' // 100% 处的颜色
-              }],
-            }
-          });
-        },
-        init() {
-          this.$api.FindRadargraph({})
-              .then((response) => {
-                //console.log(response.result,456);
-               this.$store.state.leida=response.result.data
-                //this.drawLine(response.result.data)
-                //console.log(this.$store.state.zhuzhuang,33333344)
-              })
-          }
-      },
-      watch:{
-// 		监听指令
-        leida(a){
-          if(a){
-            this.drawLine(a)
-          }
-        },
-      }
-    }
-</script>

+ 0 - 592
TEAMModelOS.SmartClass/ClientApp/components/student-analysis/SAsubjectsmanifestation.vue

@@ -1,592 +0,0 @@
-<template>
-  <div class="subjects_box">
-    <div class="subjects_title"><p>科目表现对比</p></div>
-      <li class="subjects_listbox">
-        <div class="top">
-          <p class="num">{{list_data[0].score}}</p>
-          <p class="datatitle">{{list_data[0].title}}</p>
-        </div>
-        <div class="center">
-          <div id="myChart_one" :style="{width: '100%', height: '150px'}"></div>
-        </div>
-        <div class="bottom">
-          <p class="num">{{list_data[0].belowscore}}<Icon :type="list_data[0].icon_type" :class="list_data[0].icon_color" /></p>
-          <p class="datatitle">{{list_data[0].below_title}}</p>
-        </div>
-      </li>
-    <li class="subjects_listbox">
-      <div class="top">
-        <p class="num">{{list_data[1].score}}</p>
-        <p class="datatitle">{{list_data[1].title}}</p>
-      </div>
-      <div class="center">
-        <div id="myChart_two" :style="{width: '100%', height: '150px'}"></div>
-      </div>
-      <div class="bottom">
-        <p class="num">{{list_data[1].belowscore}}<Icon :type="list_data[1].icon_type"  :class="list_data[1].icon_color" /></p>
-        <p class="datatitle">{{list_data[1].below_title}}</p>
-      </div>
-    </li>
-    <li class="subjects_listbox">
-      <div class="top">
-        <p class="num">{{list_data[2].score}}</p>
-        <p class="datatitle">{{list_data[2].title}}</p>
-      </div>
-      <div class="center">
-        <div id="myChart_three" :style="{width: '100%', height: '150px'}"></div>
-      </div>
-      <div class="bottom">
-        <p class="num">{{list_data[2].belowscore}}<Icon :type="list_data[2].icon_type" :class="list_data[2].icon_color" /></p>
-        <p class="datatitle">{{list_data[2].below_title}}</p>
-      </div>
-    </li>
-    <li class="subjects_listbox">
-      <div class="top">
-        <p class="num">{{list_data[3].score}}</p>
-        <p class="datatitle">{{list_data[3].title}}</p>
-      </div>
-      <div class="center">
-        <div id="myChart_four" :style="{width: '100%', height: '150px'}"></div>
-      </div>
-      <div class="bottom">
-        <p class="num">{{list_data[3].belowscore}}<Icon :type="list_data[3].icon_type" :class="list_data[3].icon_color" /></p>
-        <p class="datatitle">{{list_data[3].below_title}}</p>
-      </div>
-    </li>
-    <li class="subjects_listbox">
-      <div class="top">
-        <p class="num">{{list_data[4].score}}</p>
-        <p class="datatitle">{{list_data[4].title}}</p>
-      </div>
-      <div class="center">
-        <div id="myChart_five" :style="{width: '100%', height: '150px'}"></div>
-      </div>
-      <div class="bottom">
-        <p class="num">{{list_data[4].belowscore}}<Icon :type="list_data[4].icon_type" :class="list_data[4].icon_color" /></p>
-        <p class="datatitle">{{list_data[4].below_title}}</p>
-      </div>
-    </li>
-    <li class="subjects_listbox">
-      <div class="top">
-        <p class="num">{{list_data[5].score}}</p>
-        <p class="datatitle">{{list_data[5].title}}</p>
-      </div>
-      <div class="center">
-        <div id="myChart_six" :style="{width: '100%', height: '150px'}"></div>
-      </div>
-      <div class="bottom">
-        <p class="num">{{list_data[5].belowscore}}<Icon :type="list_data[5].icon_type" :class="list_data[5].icon_color" /></p>
-        <p class="datatitle">{{list_data[5].below_title}}</p>
-      </div>
-    </li>
-  </div>
-</template>
-
-<script>
-    export default {
-        name: "SubjectsManifestation",
-        data(){
-          return{
-            list_data: [],
-          }
-    },
-    created() {
-      this.init();
-
-    },
-    mounted() {
-      this.init();
-    },
-      computed:{
-        //  	命令发布监听
-        inquiredata() {
-          return this.$store.state.pie
-        },
-    },
-
-      methods:{
-          //图形一
-
-        One(obj) {
-          //this.$store.state.pie.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart_one'));
-          myChart.setOption({
-            grid: {
-              left: 0,
-              top: 0,
-              right: 0,
-              bottom: 0
-            },
-            color: obj.color,
-            series: [{
-              type: 'pie',
-              radius: ['80%', '97%'],
-              hoverAnimation: false,
-              label: {
-                normal: {
-                  position: 'center'
-                }
-              },
-              data: [{
-                value: obj.occupy,
-                name: '占有率',
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        lineHeight: 10
-                      }
-                    },
-                    formatter: '{d}%',
-                    textStyle: {
-                      fontSize: 18,
-                      fontWeight: 'bold',
-                      color: '#555',
-                      height: 25,
-                      top: 1,
-                    }
-                  }
-                }
-              }, {
-                  value: obj.surplus,
-                name: '不足',
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        lineHeight: 5
-                      }
-                    },
-                    formatter: '\n' + obj.subject,
-                    textStyle: {
-                      color: '#555',
-                      fontSize: 15,
-                      height: 15,
-                    }
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                itemStyle: {
-                  normal: {
-                    color: '#ddd'
-                  },
-                  emphasis: {
-                    color: '#ddd'
-                  }
-                },
-                hoverAnimation: false
-              }]
-            }]
-          })
-        },
-          Two(obj){
-          //this.$store.state.pie.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart_two'));
-          myChart.setOption({
-            grid:{
-              left:0,
-              top:0,
-              right:0,
-              bottom:0
-            },
-            color: obj.color,
-            series: [{
-              type: 'pie',
-              radius: ['80%', '97%'],
-              hoverAnimation:false,
-              label: {
-                normal: {
-                  position: 'center'
-                }
-              },
-              data: [{
-                value: obj.occupy,
-                name: '占有率',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 10
-                      }
-                    },
-                    formatter: '{d}%',
-                    textStyle: {
-                      fontSize: 18,
-                      fontWeight:'bold',
-                      color:'#555',
-                      height:25,
-                      top:1,
-                    }
-                  }
-                }
-              }, {
-                  value: obj.surplus,
-                name: '不足',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 5
-                      }
-                    },
-                    formatter: '\n' + obj.subject,
-                    textStyle: {
-                      color: '#555',
-                      fontSize: 15,
-                      height:15,
-                    }
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                itemStyle: {
-                  normal: {
-                    color: '#ddd'
-                  },
-                  emphasis: {
-                    color: '#ddd'
-                  }
-                },
-                hoverAnimation: false
-              }]
-            }]
-          })
-        },
-          Three(obj){
-          //this.$store.state.pie.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart_three'));
-          myChart.setOption({
-            grid:{
-              left:0,
-              top:0,
-              right:0,
-              bottom:0
-            },
-            color: obj.color,
-            series: [{
-              type: 'pie',
-              radius: ['80%', '97%'],
-              hoverAnimation:false,
-              label: {
-                normal: {
-                  position: 'center'
-                }
-              },
-              data: [{
-                value: obj.occupy,
-                name: '占有率',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 10
-                      }
-                    },
-                    formatter: '{d}%',
-                    textStyle: {
-                      fontSize: 18,
-                      fontWeight:'bold',
-                      color:'#555',
-                      height:25,
-                      top:1,
-                    }
-                  }
-                }
-              }, {
-                  value: obj.surplus,
-                name: '不足',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight:5
-                      }
-                    },
-                    formatter: '\n' + obj.subject,
-                    textStyle: {
-                      color: '#555',
-                      fontSize: 15,
-                      height:15,
-                    }
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                itemStyle: {
-                  normal: {
-                    color: '#ddd'
-                  },
-                  emphasis: {
-                    color: '#ddd'
-                  }
-                },
-                hoverAnimation: false
-              }]
-            }]
-          })
-        },
-          Four(obj){
-          //this.$store.state.pie.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart_four'));
-          myChart.setOption({
-            grid:{
-              left:0,
-              top:0,
-              right:0,
-              bottom:0
-            },
-            color: obj.color,
-            series: [{
-              type: 'pie',
-              radius: ['80%', '97%'],
-              hoverAnimation:false,
-              label: {
-                normal: {
-                  position: 'center'
-                }
-              },
-              data: [{
-                value: obj.occupy,
-                name: '占有率',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 10
-                      }
-                    },
-                    formatter: '{d}%',
-                    textStyle: {
-                      fontSize: 18,
-                      fontWeight:'bold',
-                      color:'#555',
-                      height:25,
-                      top:1,
-                    }
-                  }
-                }
-              }, {
-                  value: obj.surplus,
-                name: '不足',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight:5
-                      }
-                    },
-                    formatter: '\n' + obj.subject,
-                    textStyle: {
-                      color: '#555',
-                      fontSize: 15,
-                      height:15,
-                    }
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                itemStyle: {
-                  normal: {
-                    color: '#ddd'
-                  },
-                  emphasis: {
-                    color: '#ddd'
-                  }
-                },
-                hoverAnimation: false
-              }]
-            }]
-          })
-        },
-          Five(obj){
-          //this.$store.state.pie.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart_five'));
-          myChart.setOption({
-            grid:{
-              left:0,
-              top:0,
-              right:0,
-              bottom:0
-            },
-            color:obj.color,
-            series: [{
-              type: 'pie',
-              radius: ['80%', '97%'],
-              hoverAnimation:false,
-              label: {
-                normal: {
-                  position: 'center'
-                }
-              },
-              data: [{
-                value: obj.occupy,
-                name: '占有率',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 10
-                      }
-                    },
-                    formatter: '{d}%',
-                    textStyle: {
-                      fontSize: 18,
-                      fontWeight:'bold',
-                      color:'#555',
-                      height:25,
-                      top:1,
-                    }
-                  }
-                }
-              }, {
-                  value: obj.surplus,
-                name: '不足',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 5
-                      }
-                    },
-                    formatter: '\n'+obj.subject ,
-                    textStyle: {
-                      color: '#555',
-                      fontSize: 15,
-                      height:15
-                    }
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                itemStyle: {
-                  normal: {
-                    color: '#ddd'
-                  },
-                  emphasis: {
-                    color: '#ddd'
-                  }
-                },
-                hoverAnimation: false
-              }]
-            }]
-          })
-        },
-          Six(obj){
-          //this.$store.state.pie.mode = false;
-          let myChart = this.$echarts.init(document.getElementById('myChart_six'));
-          myChart.setOption({
-            grid:{
-              left:0,
-              top:0,
-              right:0,
-              bottom:0
-            },
-            color: obj.color,
-            series: [{
-              type: 'pie',
-              radius: ['80%', '97%'],
-              hoverAnimation:false,
-              label: {
-                normal: {
-                  position: 'center'
-                }
-              },
-              data: [{
-                value: obj.occupy,
-                name: '占有率',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 10
-                      }
-                    },
-                    formatter: '{d}%',
-                    textStyle: {
-                      fontSize: 18,
-                      fontWeight:'bold',
-                      color:'#555',
-                      height:25,
-                      top:1,
-                    }
-                  }
-                }
-              }, {
-                  value: obj.surplus,
-                name: '不足',
-                label: {
-                  normal: {
-                    rich:{
-                      a:{
-                        lineHeight: 5
-                      }
-                    },
-                    formatter: '\n' + obj.subject,
-                    textStyle: {
-                      color: '#555',
-                      fontSize: 15,
-                      height:15,
-                    }
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                itemStyle: {
-                  normal: {
-                    color: '#ddd'
-                  },
-                  emphasis: {
-                    color: '#ddd'
-                  }
-                },
-                hoverAnimation: false
-              }]
-            }]
-          })
-        },
-        init() {
-          let _this = this;
-          this.$api.FindSubjectsManifestation({})
-            .then((response) => {
-              //console.log(response.result.data, 8888888);
-              //this.One(response.result.data);
-              _this.$store.state.pie = response.result.data;
-              //_this.Two(response.result.data[1]);
-              //_this.Three(response.result.data[2]);
-              //_this.Four(response.result.data[3]);
-              //_this.Five(response.result.data[4]);
-              //_this.Six(response.result.data[5]);
-
-            })
-        }
-          },
-      watch:{
-// 		监听指令
-        inquiredata(value){
-          if(value){
-            this.list_data = value;
-            let dataone= value[0];
-            let datatwo = value[1];
-            let datathree = value[2];
-            let datafour = value[3];
-            let datafive = value[4];
-            let datasix = value[5];
-            this.One(dataone);
-            this.Two(datatwo);
-            this.Three(datathree);
-            this.Four(datafour);
-            this.Five(datafive);
-            this.Six(datasix);
-          }
-        },
-      }
-    }
-</script>
-

+ 0 - 58
TEAMModelOS.SmartClass/ClientApp/components/syllabus/SelectModule.vue

@@ -1,58 +0,0 @@
-<template>
-  <div class="center">
-    <div class="main-btn centerCol" v-for="item in moduleList" @click="handleRouter(item.link)">
-      <Icon type="ios-podium" size="80" />
-      <h4 class="color1">{{item.name}}</h4>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "selectModule",
-    props:["moduleList"],
-    methods: {
-      handleRouter(path) {
-        this.$router.replace(path)
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .main-btn {
-    height: 210px;
-    width: 210px;
-    cursor: pointer;
-    font-size: 16px;
-    font-weight: 200;
-    background-color: rgba(179,179,179,.15);
-    border: 0;
-    margin: 0 10px;
-    color: #ccc;
-  }
-
-  .main-btn:hover {
-    background: rgba(179,179,179,.42);
-    color: #fff !important;
-  }
-
-  .center {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .centerCol {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .color1 {
-    margin-top: 20px;
-    font-weight: 200;
-  }
-</style>

+ 0 - 276
TEAMModelOS.SmartClass/ClientApp/components/syllabus/SelectSchool.vue

@@ -1,276 +0,0 @@
-<template>
-  <div style="width:50%">
-    <div class="selection-component row">
-      <label class="selection-label">{{$t('formConfigP.school')+':'}}</label>
-      <Row style="width:90%;">
-
-        <Col :xs="18" :sm="6" :md="5" :lg="4">
-        <Select v-model="schoolInfo.country.countryId" class="my-select" :placeholder="$t('formConfigP.country')" @on-change="getSelctValue('country',$event)" :disabled="$i18n.locale.indexOf('en') != -1">
-          <Option v-for="item in countryData" :value="item.countryId" :key="item.sysAddID">{{ item.countryName }}</Option>
-        </Select>
-        </Col>
-        <Col :xs="18" :sm="6" :md="5" :lg="4">
-        <Select v-model="schoolInfo.province.provinceId" v-show="schoolInfo.country.countryId != 'TW'" class="my-select" :placeholder="$t('formConfigP.province')" :disabled="checkCountry == 2 || $i18n.locale.indexOf('en') != -1" clearable ref="province" @on-change="getSelctValue('province',$event)">
-          <Option v-for="item in provinceData" :value="item.provinceId" :key="item.sysAddID">{{ item.provinceName }}</Option>
-        </Select>
-        </Col>
-        <Col :xs="18" :sm="6" :md="5" :lg="4">
-        <Select v-model="schoolInfo.city.cityId" class="my-select" :placeholder="$t('formConfigP.city')" :disabled="checkCountry == 2 || $i18n.locale.indexOf('en') != -1" clearable ref="city" @on-change="getSelctValue('city',$event)">
-          <Option v-for="item in cityData" :value="item.cityId" :key="item.sysAddID">{{ item.cityName }}</Option>
-        </Select>
-        </Col>
-        <Col :xs="18" :sm="6" :md="5" :lg="12">
-        <Select v-model="schoolInfo.school.name" class="my-select" :placeholder="$t('formConfigP.school')" :disabled="checkCountry == 2 || $i18n.locale.indexOf('en') != -1" clearable ref="school" @on-change="getSelctValue('school',$event)" filterable :loading="loading" not-found-text="">
-          <Option v-for="item in schoolData" :value="item.name" :key="item.sysAddID">{{ item.name }}</Option>
-        </Select>
-        </Col>
-      </Row>
-    </div>
-    <div class="selection-component ">
-      <label class="selection-label"></label>
-      <Row style="width:90%; margin-top:20px;" v-if="checkCountry == 2 || $i18n.locale.indexOf('en') != -1">
-        <Col :xs="24" :sm="6" :md="5" :lg="6">
-        <Input v-model="schoolInfoInput.country" class="my-select" placeholder="country" style="width: 95%;" />
-        </Col>
-        <Col :xs="24" :sm="6" :md="5" :lg="6">
-
-        <Input v-model="schoolInfoInput.city" class="my-select" placeholder="city" style="width: 95%" />
-        </Col>
-        <Col :xs="24" :sm="6" :md="5" :lg="12">
-        <Input v-model="schoolInfoInput.school" class="my-select" placeholder="school" style="width: 90%;" @on-change="getInputValue" />
-        </Col>
-      </Row>
-    </div>
-
-
-  </div>
-</template>
-
-<script>
-  export default {
-    props: {
-
-    },
-    data() {
-      return {
-        model: "",
-        zhCnData: [],
-        zhTwData: [],
-        enUsData: [],
-        schoolData: [],
-        schoolInfoInput: {
-          country: '',
-          province: '',
-          city: '',
-          school: '',
-        },
-        schoolInfo: {
-          country: {},
-          province: {},
-          city: {},
-          school: {},
-        },
-        loading: false
-      };
-    },
-    methods: {
-      getValue() {
-        this.$emit("get-value", [
-          this.model,
-          this.selections.field
-        ]);
-      },
-      getCountryInfo(data) {
-        let result = [];
-        let currentCountry = '';
-        for (let i = 0; i < data.length; i++) {
-          if (currentCountry != data[i].countryName && data[i].countryName != null && data[i].provinceName == null && data[i].cityName == null) {
-            currentCountry = data[i].countryName;
-            result.push(data[i]);
-          }
-
-        }
-        return result;
-      },
-      getProvinceInfo(data, country) {
-        let result = [];
-        let currentProvince = '';
-        for (let i = 0; i < data.length; i++) {
-          if (currentProvince != data[i].provinceName && data[i].provinceName != null && data[i].countryId == country.countryId) {
-            currentProvince = data[i].provinceName;
-            result.push(data[i]);
-          } 
-        }
-        return result;
-      },
-      getCityInfo(data, province) {
-        let result = [];
-        let currentCity = '';
-        if (province != undefined) {
-          for (let i = 0; i < data.length; i++) {
-            if (currentCity != data[i].cityName && data[i].cityName != null && data[i].provinceId == province.provinceId) {
-              currentCity = data[i].cityName;
-              result.push(data[i]);
-            }
-          }
-        }
-
-        return result;
-      },
-      getSchoolInfo(CountryId, ProvinceId, CityId) {
-        let params = {
-          CountryId: CountryId,
-          ProvinceId: ProvinceId,
-          CityId: CityId
-        }
-        this.loading = true;
-
-        //发送请求获取学校列表
-        this.$api.getSchoolList(params).then(
-          (res) => {
-            if (res.error == null) {
-              if (res.result.data.length == 0 || !res.result.data) {
-                alert("暂未收录此地区学校,请手动输入!");
-              } else {
-                this.schoolData = res.result.data;
-                //this.schoolInfo.school = res.result.data[0];
-              }
-
-            } else {
-              alert("服务器错误!");
-            }
-            this.loading = false;
-          },
-          (err) => {
-            this.loading = false;
-          }
-        )
-      },
-      getSelctValue(flag, value) {
-        if (flag == 'country') {
-          this.$refs.school.clearSingleSelect();
-          this.$refs.city.clearSingleSelect();
-          this.$refs.province.clearSingleSelect();
-          this.schoolInfo.province = {};
-          this.schoolInfo.city = {};
-          this.schoolInfo.school = {};
-        } else if (flag == 'province') {
-          this.$refs.school.clearSingleSelect();
-          this.$refs.city.clearSingleSelect();
-          this.schoolInfo.city = {};
-          this.schoolInfo.school = {};
-        } else if (flag == 'city') {
-          this.$refs.school.clearSingleSelect();
-          this.schoolInfo.school = {};
-          this.getSchoolInfo(this.schoolInfo.country.countryId, this.schoolInfo.province.provinceId, this.schoolInfo.city.cityId);
-        } else if (flag == 'school') {
-          this.schoolInfo['checkCountry'] = this.checkCountry;
-          this.$emit("school-info", this.schoolInfo);
-          console.log(this.schoolInfo);
-        }
-      },
-      getInputValue() {
-        this.schoolInfoInput['checkCountry'] = this.checkCountry;
-        this.$emit("school-info", this.schoolInfoInput);
-        console.log(this.schoolInfo);
-      }
-    },
-    computed: {
-      countryData() {
-        let countryInfo = [];
-        if (this.$i18n.locale == 'zh-CN') {
-          countryInfo = this.getCountryInfo(this.zhCnData);
-        } else if (this.$i18n.locale == 'zh-TW') {
-          countryInfo = this.getCountryInfo(this.zhTwData);
-        } else if (this.$i18n.locale.indexOf('en') != -1) {
-          countryInfo = this.getCountryInfo(this.enUsData);
-        }
-        return countryInfo;
-
-      },
-      provinceData() {
-        let provinceInfo = [];
-        if (this.$i18n.locale == 'zh-CN') {
-          provinceInfo = this.getProvinceInfo(this.zhCnData, this.schoolInfo.country);
-        } else if (this.$i18n.locale == 'zh-TW') {
-          provinceInfo = this.getProvinceInfo(this.zhTwData, this.schoolInfo.country);
-        } else if (this.$i18n.locale.indexOf('en') != -1) {
-          provinceInfo = this.getProvinceInfo(this.enUsData, this.schoolInfo.country);
-        }
-        return provinceInfo;
-      },
-      cityData() {
-        let cityInfo = [];
-        if (this.$i18n.locale == 'zh-CN') {
-          cityInfo = this.getCityInfo(this.zhCnData, this.schoolInfo.province);
-        } else if (this.$i18n.locale == 'zh-TW') {
-          cityInfo = this.getCityInfo(this.zhTwData, this.schoolInfo.province);
-        } else if (this.$i18n.locale.indexOf('en') != -1) {
-          cityInfo = this.getCityInfo(this.enUsData, this.schoolInfo.province);
-        }
-        return cityInfo;
-      },
-      checkCountry() {
-        if (this.schoolInfo.country.countryId == undefined) {
-          return 0;
-        }
-        if (this.schoolInfo.country.countryId == 'CN' || this.schoolInfo.country.countryId == 'TW') {
-          return 1;
-        } else {
-          return 2;
-        }
-      }
-    },
-    mounted() {
-      let area = require("@/static/area.json");
-      for (let i = 0; i < area.length; i++) {
-        if (area[i].lang == 'en-us') {
-          this.enUsData.push(area[i]);
-        } else if (area[i].lang == 'zh-tw') {
-          this.zhTwData.push(area[i]);
-        } else if (area[i].lang == 'zh-cn') {
-          this.zhCnData.push(area[i]);
-        }
-      };
-
-    }
-  };
-</script>
-
-<style scoped>
-  .selection-component {
-    width: 100%;
-    position: relative;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-  }
-
-  .ivu-select-selection {
-    width: 150px !important;
-  }
-
-  .selection-label {
-    width: 120px;
-    font-size: 15px;
-    color: #67B6E5;
-  }
-
-  .my-select {
-    width: 90%;
-  }
-
-    .my-select > > > .ivu-select-selection {
-      border: 1px solid #67B6E5;
-    }
-
-    .my-select > > > .ivu-select-selected-value {
-      color: #67B6E5;
-      font-size: 15px;
-    }
-
-    .my-select > > > .ivu-select-input {
-      color: #67B6E5;
-      font-size: 13px;
-    }
-</style>

+ 0 - 592
TEAMModelOS.SmartClass/ClientApp/components/syllabus/Tree.vue

@@ -1,592 +0,0 @@
-<template>
-  <div class="tree-main">
-
-    <Tree :data="treeData" :render="renderContent" ref="tree"></Tree>
-    <Modal v-model="modalFlag" title="添加新节点" ok-text="确认" cancel-text="取消" @on-ok="handleAddNode">
-      <Row class="modelRow">
-        <span>
-          当前章节:
-          <span style="margin-left:10px;">{{currentNode.title}}</span>
-        </span>
-      </Row>
-      <Row class="modelRow">
-        <span>章节类型:</span>
-        <RadioGroup v-model="nodeType" type="button">
-          <Radio label="章节"></Radio>
-          <Radio label="课件"></Radio>
-        </RadioGroup>
-      </Row>
-      <Row class="modelRow">
-        <span>章节名称:</span>
-        <Input v-model="inputValue" placeholder="输入新节点名称" style="width: 100%" />
-      </Row>
-    </Modal>
-    <Modal v-model="editFlag" title="修改节点" ok-text="确认" cancel-text="取消" @on-ok="handleUpdateNode">
-      <Row class="modelRow">
-        <span>
-          当前名称:
-          <span style="margin-left:10px;">{{currentNode.title}}</span>
-        </span>
-      </Row>
-      <Row class="modelRow">
-        <span>章节类型:</span>
-        <RadioGroup v-model="nodeType" type="button">
-          <Radio label="章节"></Radio>
-          <Radio label="课件"></Radio>
-        </RadioGroup>
-      </Row>
-      <Row class="modelRow">
-        <span>章节名称:</span>
-        <Input v-model="editValue" placeholder="输入节点新名称" style="width: 100%" />
-      </Row>
-    </Modal>
-  </div>
-</template>
-<script>
-  export default {
-    props:["treeDatas","volumeCode"],
-    data() {
-      return {
-        bookSelect: "语文人教课标版四年级上册",
-        periodList: [],
-        subjectList: [],
-        versionList: [],
-        gradeList: [],
-        slideGradeList: [],
-        treeData: [],
-        inputValue: "",
-        editValue: "",
-        modalFlag: false,
-        editFlag: false,
-        addBookFlag: false,
-        nodeType: "章节",
-        currentNode: "",
-        currentLiNode: "",
-        buttonProps: {
-          type: "default",
-          size: "small"
-        },
-        periodSelect: "",
-        subjectSelect: "",
-        versionSelect: "",
-        gradeSelect: "",
-        periodName: "",
-        subjectName: "",
-        versionName: "",
-        gradeName: "",
-      };
-    },
-    created() {
-      this.treeData = this.treeDatas;
-    },
-    methods: {
-      renderContent(h, { root, node, data }) {
-        let that = this;
-        return h(
-          "span",
-          {
-            style: {
-              display: "inline-block",
-              width: "95%",
-              textAlign: "left",
-              paddingLeft: "2%",
-              cursor: "pointer",
-              position: "relative",
-              boxSizing: "border-box"
-            },
-            domProps: {
-              className: "singleClass"
-            },
-            on: {
-              click: () => {
-                this.titleClick(root, node, data, event);
-              },
-              mouseover: e => {
-                e.stopPropagation();
-                this.handleLiOver(event);
-              },
-              mouseleave: e => {
-                e.stopPropagation();
-                this.handleLiLeave(node, event);
-              }
-            }
-          },
-          [
-            h("span", [
-              h("Icon", {
-                props: {
-                  type:
-                    data.children && data.children.length > 0
-                      ? "md-albums"
-                      : "ios-paper-outline"
-                },
-                style: {
-                  marginRight: "5px",
-                  display: "none"
-                }
-              }),
-              h("span", data.title)
-            ]),
-            h(
-              "span",
-              {
-                style: {
-                  float: "right",
-                  top: "6px",
-                  display: "none"
-                },
-                on: {
-                  mouseleave: e => {
-                    e.stopPropagation();
-                    //this.hideTools(event);
-                  },
-                },
-                domProps: {
-                  className: "tools"
-                }
-              },
-              [
-                h(
-                  "Icon",
-                  {
-                    props: {
-                      type: "md-add",
-                      title: "添加"
-                    },
-                    on: {
-                      click: e => {
-                        e.stopPropagation();
-                        this.appendClick(data);
-                      }
-                    }
-                  },
-                ),
-                h(
-                  "Icon",
-                  {
-                    props: {
-                      type: "md-remove"
-                    },
-                    on: {
-                      click: e => {
-                        e.stopPropagation();
-                        this.remove(root, node, data);
-                      }
-                    }
-                  },
-                ),
-                h(
-                  "Icon",
-                  {
-                    props: {
-                      type: "md-arrow-round-up"
-                    },
-                    on: {
-                      click: e => {
-                        e.stopPropagation();
-                        this.moveUp(root, node, data);
-                      }
-                    }
-                  },
-                ),
-                h(
-                  "Icon",
-                  {
-                    props: {
-                      type: "md-arrow-round-down"
-                    },
-                    on: {
-                      click: e => {
-                        e.stopPropagation();
-                        this.moveDown(root, node, data);
-                      }
-                    }
-                  },
-                ),
-                h(
-                  "Icon",
-                  {
-                    props: {
-                      type: "md-create"
-                    },
-                    on: {
-                      click: e => {
-                        e.stopPropagation();
-                        this.editClick(node, data);
-                      }
-                    }
-                  },
-                )
-              ]
-            )
-          ]
-        );
-      },
-      // 添加节点
-      append(data, value) {
-        const children = data.children || [];
-        let newChild = {
-          title: value,
-          order: children.length,
-          pid: data.rowKey,
-          children: [],
-          expand: true,
-          type: data.type,
-          volumeCode: this.volumeCode,
-          remark: "备注",
-        }
-        children.push(newChild);
-        this.$set(data, "children", children);
-        this.$api.SaveOrUpdateSingleNode(newChild).then(res => {
-          this.$Message.success("添加成功");
-          this.$api.FindSyllabusByVolumeCode({ VolumeCode: this.volumeCode, Status: 1 }).then(res => {
-              this.treeData = res.result.data;
-            })
-          })
-      },
-      // 删除节点
-      remove(root, node, data) {
-        const parentKey = root.find(el => el === node).parent;
-        const parent = root.find(el => el.nodeKey === parentKey).node;
-        const index = parent.children.indexOf(data);
-        parent.children.splice(index, 1);
-        data.status = 0;
-        this.$api.SaveOrUpdateSingleNode(data).then(res => {
-          this.$Message.success("删除成功");
-        })
-      },
-      // 点击编辑
-      editClick(node, data) {
-        this.currentNode = data;
-        this.editFlag = true;
-        this.editValue = "";
-      },
-      //添加节点 弹出输入框
-      appendClick(data) {
-        this.currentNode = data;
-        this.modalFlag = true;
-        this.inputValue = "";
-      },
-      // 确认添加节点
-      handleAddNode() {
-        if (this.inputValue != "") {
-          this.append(this.currentNode, this.inputValue);
-        } else {
-          this.modalFlag = false;
-        }
-      },
-      // 修改节点
-      handleUpdateNode() {
-        if (this.editValue != "") {
-          this.$api.SaveOrUpdateSingleNode(this.currentNode).then(res => {
-              this.$Message.success("修改成功");
-              this.currentNode.title = this.editValue;
-            })
-        } else {
-          this.editFlag = false;
-        }
-      },
-      // 标题点击收缩展开
-      titleClick(root, node, data, event) {
-        data.expand = !data.expand;
-      },
-
-      // 根目录点击事件
-      rootClick(data) {
-        data.expand = !data.expand;
-      },
-      // 上移章节操作
-      moveUp(root, node, data) {
-        const parentKey = root.find(el => el === node).parent;
-        const parent = root.find(el => el.nodeKey === parentKey).node;
-        const index = parent.children.indexOf(data);
-        const nodeIndex = root.indexOf(node);
-        let currentTitle = data.title;
-        let currentExpand = data.expand;
-        let currentChildren = data.children || [];
-        let preChildren = (parent.children[index - 1]) ? (parent.children[index - 1]).children : [];
-        if (index != 0) {
-          data.title = parent.children[index - 1].title;
-          parent.children[index - 1].title = currentTitle;
-          parent.children[index - 1].expand = currentExpand;
-          data.children = preChildren;
-          data.expand = parent.children[index - 1].expand;
-          parent.children[index - 1].children = currentChildren;
-        }
-      },
-      // 下移章节操作
-      moveDown(root, node, data) {
-        const parentKey = root.find(el => el === node).parent;
-        const parent = root.find(el => el.nodeKey === parentKey).node;
-        const index = parent.children.indexOf(data);
-        let currentTitle = data.title;
-        let currentChildren = data.children || [];
-        let nextChildren = (parent.children[index + 1]) ? (parent.children[index + 1]).children : [];
-        if (index != parent.children.length - 1) {
-          data.title = parent.children[index + 1].title;
-          data.children = nextChildren;
-          parent.children[index + 1].title = currentTitle;
-          parent.children[index + 1].children = currentChildren;
-        }
-      },
-      // 更多操作
-      handleTools(root, node, data, event) {
-        let toolsDom = event.currentTarget.nextElementSibling;
-        const parentKey = root.find(el => el === node).parent;
-        const parent = root.find(el => el.nodeKey === parentKey).node;
-        const index = parent.children.indexOf(data);
-        let list = document.getElementsByClassName("tools");
-        let cFlag = toolsDom.style.display;
-        for (let i = 0; i < list.length; i++) {
-          list[i].style.display = "none";
-        }
-        // 判断TOOL显示与隐藏
-        if (cFlag == "none") {
-          toolsDom.style.display = "inline-flex";
-          toolsDom.classList.add("animated");
-          toolsDom.classList.add("slideInDown");
-        } else {
-          toolsDom.style.display = "none";
-        }
-      },
-      // 鼠标从工具条移开的时候隐藏
-      hideTools(event) {
-        event.currentTarget.style.display = "none";
-      },
-      handleLiOver(event) {
-        event.currentTarget.lastElementChild.style.display = "block";
-        event.currentTarget.style.backgroundColor = "rgba(255, 255, 255, 0.68)";
-        event.currentTarget.style.border = "1px solid #000";
-      },
-      handleLiLeave(node, event) {
-        event.currentTarget.lastElementChild.style.display = "none";
-        if (this.currentLiNode.nodeKey != node.nodeKey) {
-          event.currentTarget.style.backgroundColor = "transparent";
-          event.currentTarget.style.border = "0";
-        }
-      },
-      // 添加教材
-      handleAddBook() {
-        this.$api.FindPeriods({}).then(res => {
-          this.periodList = res.result.data;
-          this.periodSelect = this.periodList[0].rowKey;
-          this.periodName = this.periodList[0].name;
-          let Pcode = {
-            value: this.periodList[0].rowKey,
-            label: this.periodList[0].name
-          }
-          this.periodChange(Pcode);
-        })
-        this.addBookFlag = true;
-      },
-
-      // 学段选择变化
-      periodChange(val) {
-        this.$api.FindSubjects({ Pcode: val.value }).then(res => {
-          if (res.result.data.length > 0) {
-            this.subjectList = res.result.data;
-            this.subjectSelect = this.subjectList[0].rowKey;
-            this.periodName = val.label;
-            let Pcode = {
-              value: this.subjectList[0].rowKey,
-              label: this.subjectList[0].name
-            }
-            this.subjectChange(Pcode);
-          }
-        })
-      },
-      // 学科选择变化
-      subjectChange(val) {
-        this.$api.FindEditions({ Pscode: val.value }).then(res => {
-          if (res.result.data.length > 0) {
-            this.versionList = res.result.data;
-            this.versionSelect = this.versionList[0].rowKey;
-            this.subjectName = val.label;
-            let Pcode = {
-              value: this.versionList[0].rowKey,
-              label: this.versionList[0].name
-            }
-            this.versionChange(Pcode);
-          }
-        })
-      },
-      // 版本选择变化
-      versionChange(val) {
-        this.$api.FindTerms({ Psecode: val.value }).then(res => {
-          this.gradeList = res.result.data;
-          this.gradeSelect = this.gradeList.length > 0 ? this.gradeList[0].rowKey : "无";
-          this.versionName = val.label;
-          let Pcode = {
-            value: this.gradeList.length > 0 ? this.gradeList[0].rowKey : "",
-            label: this.gradeList.length > 0 ? this.gradeList[0].name : ""
-          }
-          if (this.gradeList.length > 0) {
-            this.gradeChange(Pcode);
-          }
-        })
-      },
-      //册别选择变化
-      gradeChange(val) {
-        this.gradeName = val.label ? val.label : "";
-      },
-      // 确认添加教材返回教材名称
-      handleAddConfirm() {
-        let periodRowKeys = [];
-        let perioArr = this.periodList;
-        for (let item of perioArr) {
-          periodRowKeys.push(item.rowKey);
-        }
-        let bookName = this.periodName + this.subjectName + this.versionName + this.gradeName;
-        this.treeData[0].title = bookName;
-      }
-    },
-  };
-</script>
-<style scoped>
-  .tree-main {
-    margin-left: 5%;
-    width: 90%;
-  }
-
-    .tree-main /deep/ .ivu-icon-ios-paper-outline {
-    font-size: 16px;
-  }
-
-    .tree-main /deep/ .ivu-select {
-    width: 80% !important;
-  }
-
-  .slideSelect .ivu-select-selection {
-    height: 40px;
-    background: #d8d8d870;
-    border: 1px solid #808080;
-  }
-
-  .slideSelect, .slideSelect .ivu-icon {
-    color: rgba(255,255,255,.8);
-  }
-
-    .tree-main /deep/ .ivu-select-single .ivu-select-selection .ivu-select-selected-value {
-    height: 40px;
-    line-height: 40px;
-    font-size: 14px;
-  }
-  /* .ivu-tree ul li {
-    margin: 18px 0;
-  } */
-  .tree-main /deep/ .ivu-tree ul {
-    font-size: 14px;
-  }
-
-  .tree-main /deep/ .ivu-tree ul li {
-    margin:8px 0;
-  }
-
-  .ivu-tree .ivu-tree-arrow {
-    width: 2%;
-  }
-
-  .ivu-input-wrapper {
-    width: 80% !important;
-  }
-
-  .modelRow {
-    margin: 20px;
-    font-size: 14px;
-  }
-
-  .tree-main /deep/ .tools {
-    position: absolute;
-    right: 60px;
-    bottom:5px;
-    display: inline-flex;
-    z-index: 999;
-  }
-
-  .tree-main /deep/ .tools .ivu-icon {
-    margin-right: 15px;
-    font-size: 16px;
-    font-weight: 200;
-    color: #808080;
-  }
-
-  .btn_more {
-    background: #fff;
-    border: 1px solid rgb(248,248,248);
-  }
-
-  .animated {
-    animation-duration: 0.5s;
-  }
-
-  @-webkit-keyframes slideInDown {
-    from {
-      -webkit-transform: translate3d(0,-10%, 0);
-      transform: translate3d(0, -10%, 0) !important;
-      visibility: visible;
-    }
-
-    to {
-      -webkit-transform: translate3d(0, 0%, 0);
-      transform: translate3d(0, 0%, 0);
-    }
-  }
-
-  @keyframes slideInDown {
-    from {
-      -webkit-transform: translate3d(0, -10%, 0);
-      transform: translate3d(0, -10%, 0) !important;
-      visibility: visible;
-    }
-
-    to {
-      -webkit-transform: translate3d(0, 0%, 0);
-      transform: translate3d(0, 0%, 0);
-    }
-  }
-
-  .slideInDown {
-    -webkit-animation-name: slideInDown;
-    animation-name: slideInDown;
-  }
-
-  .tree-main /deep/ .singleClass {
-    display: inline-flex !important;
-    flex-direction: row;
-    align-items: center;
-    height: 40px;
-  }
-
-  .btn-addClass {
-    width: 16%;
-    padding: 10px 6px !important;
-  }
-
-  .ivu-tabs-nav-scroll {
-    display: flex;
-    justify-content: center;
-  }
-
-  .addBookArea .ivu-select {
-    width: 80% !important;
-    margin-left: 30px;
-  }
-
-  .addBookArea .ivu-select-single .ivu-select-selection {
-    height: 32px;
-  }
-
-  .addBookArea .ivu-row {
-    margin: 30px 20px;
-  }
-
-  .addBookArea .ivu-select-selected-value {
-    height: 32px !important;
-    line-height: 32px !important;
-    font-size: 12px !important;
-  }
-
-  .ivu-tabs {
-    overflow: unset;
-  }
-</style>

BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header.png


BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon.png


BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon1.png


BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon2.png


BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon3.png


BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/header_icon4.png


BIN
TEAMModelOS.SmartClass/ClientApp/icons/student-analysis/touxiang.png


+ 6 - 2
TEAMModelOS.SmartClass/ClientApp/router/routes.js

@@ -1,9 +1,13 @@
 
 export const routes = [
+  {
+    path: '/',
+    redirect: '/index'
+  },
   {
     name:'index',
     path: '',
-    component: resolve => require(['@/view/app'], resolve), //路由懒加载
+    component: resolve => require(['@/view/App'], resolve), //路由懒加载
     children: [
       {
         name: 'index',
@@ -13,7 +17,7 @@ export const routes = [
       {
         name: 'notice',
         path: '/notice',
-        component: resolve => require(['@/view/smart-class/notice'], resolve), //路由懒加载
+        component: resolve => require(['@/view/smart-class/Notice'], resolve), //路由懒加载
       }
     ]
   }

+ 1 - 1
TEAMModelOS.SmartClass/Views/Shared/_Layout.cshtml

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"]TEAM Model OS</title>
+    <title>@ViewData["Title"]智慧课堂管理平台</title>
     <link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />
     <link rel="icon" type="image/x-icon" class="js-site-favicon" href="https://account.habookaclass.biz/dist/6854ccd21afb6b1f994e1556c2360dd8.ico">
     @*<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />