Merge remote-tracking branch 'origin/init' into init

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/LineEcharts.vue

@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <!-- echart表格 -->
+        <div id="lineChart" :style="echartStyle"></div>
+    </div>
+</template>
+
+<script>
+    import * as echarts from 'echarts';
+    export default {
+        props: {
+            // 样式
+            echartStyle: {
+                type: Object,
+                default(){
+                    return {}
+                }
+            },
+            //类型（line-折线，area-基础面积，bar-柱形图）
+            isType: {
+                type: String,
+                default(){
+                    return "line"
+                }
+            },
+            xAxisData: {
+                type: Array,
+                default(){
+                    return []
+                }
+            },
+            yAxisData: {
+                type: Array,
+                default(){
+                    return []
+                }
+            },
+
+        },
+        data(){
+            return {
+                //
+            }
+        },
+
+        methods: {
+            drawLine(id) {
+                this.charts = echarts.init(document.getElementById(id));
+                this.charts.setOption({
+                    xAxis: {
+                        type: "category",
+                        boundaryGap: false,
+                        data: this.xAxisData,
+                    },
+                    yAxis: {
+                        type: "value",
+                    },
+                    series: [
+                        {
+                            data: this.yAxisData,
+                            type: this.isType==='area'?'line': this.isType,
+                            areaStyle: this.isType!=='area'?null:
+                                {
+                                    color:"#B9DDFF"
+                                },
+                            itemStyle : {
+                                normal : {
+                                    lineStyle:{
+                                        color:'#1890FF'
+                                    },
+                                }
+                            },
+                        },
+                    ],
+                    tooltip : {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            label: {
+                                backgroundColor: '#6a7985'
+                            }
+                        }
+                    }
+                });
+            },
+        },
+        mounted() {
+            this.$nextTick(function() {
+                this.drawLine('lineChart')
+            })
+        },
+    };
+</script>
+
+<style scoped>
+    #lineChart{
+        width: 100%;
+    }
+</style>

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/PieEcharts.vue

@@ -39,6 +39,11 @@
                 type: String,
                 default: ''
             },
+            // 判断饼状环形(true-环，false-饼)
+            isRing: {
+                type: Boolean,
+                default: false
+            },
             // 扇形区域数据
             opinionData: {
                 type: Array,
@@ -53,6 +58,7 @@
             }
         },
         mounted(){
+            console.log('this.opinion',this.opinion)
             this.$nextTick(function() {
                 this.drawPie('myChart')
             })
@@ -85,8 +91,8 @@
                         {
                             name:this.seriesName, // 提示框标题
                             type: 'pie',
-                            radius : '65%',
-                            center: ['50%', '50%'],
+                            radius :this.isRing?['40%','65%']: '50%',
+                            center: ['50%', '40%'],
                             selectedMode: 'single',
                             data:this.opinionData, // 扇形区域数据
                             itemStyle: {

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/interfaceConfig.js

@@ -0,0 +1,44 @@
+const InterfaceConfig = {
+    // 听评课统计
+    /*
+     *听评课统计—获取课程分布统计
+     * id 必填 number 机构ID
+     * start_time 必填 string 开始时间
+     * end_time 必填 string 结束时间
+     * stageId 必填 number 学段
+     * dateQueryType 必填 number 周期（本学期-3）
+     * */
+    "getCourseProgress":{url:"/evaluateCourse/statistics/getCourseProgress",method:"get",isTestLogin:false},
+    /*
+     *听评课统计—获取课程分布统计
+     * id 必填 number 机构ID
+     * start_time 必填 string 开始时间
+     * end_time 必填 string 结束时间
+     * stageId 必填 number 学段
+     * dateQueryType 必填 number 周期（本学期-3）
+     * */
+    "getCourseTrend":{url:"/evaluateCourse/statistics/getCourseTrend",method:"get",isTestLogin:false},
+    /*
+     *听评课—获取学段
+     * bureau_id 必填 number 机构ID
+     * */
+    "getEvaluateStage":{url:"/evaluateCourse/getEvaluateStage",method:"get",isTestLogin:false},
+    /*
+     *听评课-根据学段获取课程
+     * bureau_id 必填 number 机构ID
+     * stage_id 必填 number 学段id
+     * */
+    "getEvaluateCourseByStage":{url:"/evaluateCourse/getEvaluateCourseByStage",method:"get",isTestLogin:false},
+    /*
+     *听评课-任课教师列表
+     * bureau_id 必填 number 机构ID
+     * stage_id 必填 number 学段id
+     * course_id 必填 number 课程id
+     * course_id 必填 number 课程id
+     * page_number 必填 number 第几页
+     * page_size 必填 number 每页条数
+     * */
+    "getEvaluateTeacherPageList":{url:"/evaluateCourse/getEvaluateTeacherPageList",method:"get",isTestLogin:false},
+};
+
+export default InterfaceConfig