Merge branch 'develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop

.gitignore

@@ -251,3 +251,4 @@ _Pvt_Extensions
 .fake/
 
 .vscode/
+/.idea

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

TEAMModelOS/ClientApp/components/SAbargraph.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bargraph">
     <!--<div class="bargraph_title"><p>各校成绩排名</p></div>-->
-    <div id="myChart" :style="{width: '100%', height: '450px'}"></div>
+    <div id="myChart" :style="{width: '100%', height: '460px'}"></div>
   </div>
 </template>
 <script>
@@ -16,17 +16,14 @@
       this.init();
             },
         computed:{
-        //  	命令发布监听
-        //mode () {
-        //  return this.$store.state.zhuxhuang.mode
-        //},
+
         zhuxhuang () {
           return this.$store.state.zhuxhuang
-        },
+          },
+        
        },
       methods:{
         drawLine(obj) {
-          console.log(obj, '这是调用教师页面方法');
           let _this = this;
           this.$store.state.zhuxhuang.mode = false;
           let myChart = this.$echarts.init(document.getElementById('myChart'));
@@ -40,24 +37,24 @@
                 fontSize:16
               }
             },
-
             tooltip : {
               trigger: 'axis',
               axisPointer : {            // 坐标轴指示器，坐标轴触发有效
                 type : 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
               },
               formatter: function (value) {
-               //console.log(value[0])
-                return value[0].name + '<br/>' +
-                  value[0].seriesName + ' : ' + value[0].data + '<br/>' +
-                  value[1].seriesName + ' : ' + value[1].data + '<br/>' +
-                  value[2].seriesName + ' : ' + value[2].data + '<br/>' +
-                  value[3].seriesName + ' : ' + value[3].data + '<br/>' +
-                  value[4].seriesName + ' : ' + value[4].data + '<br/>' +
-                  value[5].seriesName + ' : ' + value[5].data + '<br/>' +
-                  obj.one_average.name + ' : ' + obj.one_average.data + '<br/>' +
-                  obj.two_average.name + ' : ' + obj.two_average.data 
-              }
+                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,
@@ -66,10 +63,10 @@
             grid: {
               left: '2%',
               right: '4%',
-              bottom: '0.5%',
+              bottom: '3.5%',
               containLabel: true,
               x:100,
-              y2:200,
+              y2:100,
             },
             xAxis : [
               {
@@ -77,10 +74,10 @@
                 data : obj.object_name,
                 axisLabel: {
                   interval: 0,    //强制文字产生间隔
-                  rotate: 50,     //文字逆时针旋转50°
+                  rotate: 45,     //文字逆时针旋转50°
                   textStyle: {    //文字样式
                     color: "#333",
-                    fontSize: 11,
+                    fontSize: 12,
                     fontFamily: 'Microsoft YaHei',
                   }
                 },
@@ -90,25 +87,39 @@
             dataZoom: {
               show: true,
               realtime: true,
-              y: 410,
-              height: 20,
+              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: 30,
+              end: 45,
             },
             yAxis : [
               {
-
                 type : 'value',
               }
             ],
-            dataZoom: {
-              show: true,
-              realtime: true,
-              y: 410,
-              height: 15,
-              start: 0,
-              end: 50
-            },
             series : [
               {
                 name:obj.one_data.name,
@@ -183,10 +194,10 @@
                 },
               },
               {
-                name: obj.anotherone_data.name,
+                name: obj.quyudata.anotherone_data.name,
                 type: 'bar',
                 stack: '区域',
-                data: obj.anotherone_data.data,
+                data: obj.quyudata.anotherone_data.datalist,
                 barWidth : 20,
                 itemStyle:{
                   normal:{
@@ -195,10 +206,10 @@
                 },
               },
               {
-                name: obj.anothertwo_data.name,
+                name: obj.quyudata.anothertwo_data.name,
                 type: 'bar',
                 stack: '区域',
-                data: obj.anothertwo_data.data,
+                data: obj.quyudata.anothertwo_data.datalist,
                 barWidth: 20,
                 itemStyle: {
                   normal: {
@@ -207,10 +218,10 @@
                 },
               },
               {
-                name: obj.anotherthree_data.name,
+                name: obj.quyudata.anotherthree_data.name,
                 type: 'bar',
                 stack: '区域',
-                data: obj.anotherthree_data.data,
+                data: obj.quyudata.anotherthree_data.datalist,
                 barWidth: 20,
                 itemStyle: {
                   normal: {
@@ -219,10 +230,10 @@
                 },
               },
               {
-                name: obj.anotherfour_data.name,
+                name: obj.quyudata.anotherfour_data.name,
                 type: 'bar',
                 stack: '区域',
-                data: obj.anotherfour_data.data,
+                data: obj.quyudata.anotherfour_data.datalist,
                 barWidth: 20,
                 itemStyle: {
                   normal: {
@@ -231,10 +242,10 @@
                 },
               },
               {
-                name: obj.anotherfive_data.name,
+                name: obj.quyudata.anotherfive_data.name,
                 type: 'bar',
                 stack: '区域',
-                data: obj.anotherfive_data.data,
+                data: obj.quyudata.anotherfive_data.datalist,
                 barWidth: 20,
                 itemStyle: {
                   normal: {
@@ -243,10 +254,10 @@
                 },
               },
               {
-                name: obj.anothersix_data.name,
+                name: obj.quyudata.anothersix_data.name,
                 type: 'bar',
                 stack: '区域',
-                data: obj.anothersix_data.data,
+                data: obj.quyudata.anothersix_data.datalist,
                 barWidth: 20,
                 itemStyle: {
                   normal: {
@@ -327,7 +338,6 @@
         init() {
             this.$api.FindBargraph({})
               .then((response) => {
-                //console.log(response.result, 111112);
                 this.$store.state.zhuxhuang = response.result.data;
               })
         },

TEAMModelOS/ClientApp/components/SAbarline.vue

@@ -41,7 +41,7 @@
           grid: {
             left: '1.5%',
             right: '4%',
-            bottom: '0.5%',
+            bottom: '4.5%',
             containLabel: true,
             x: 100,
             y2: 200,
@@ -78,10 +78,33 @@
           dataZoom: {
             show: true,
             realtime: true,
-            y: 430,
-            height: 15,
+            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: 60
+            end: 45,
           },
           yAxis: [
             {

TEAMModelOS/ClientApp/components/SAbasics.vue

@@ -3,7 +3,8 @@
       <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="md-arrow-dropup"  style="color:red" v-if="icon_show"/></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>

TEAMModelOS/ClientApp/components/SAchooseattention.vue

@@ -5,34 +5,34 @@
         <Menu active-name="1-1" theme="dark" width="100%">
           <MenuItem name="1-1">
             <Icon type="ios-home-outline"/>
-            <span>首页</span>
+            <span>{{$t('saindex.index')}}</span>
           </MenuItem>
           <MenuItem name="1-2">
             <Icon type="ios-clipboard-outline"/>
-            <span>成绩分析</span>
+            <span>{{$t('saindex.grade')}}</span>
           </MenuItem>
           <MenuItem name="1-3">
             <Icon type="md-checkmark-circle-outline"/>
-            <span>落点分析</span>
+            <span>{{$t('saindex.droppoint')}}</span>
           </MenuItem>
           <MenuItem name="1-4">
             <Icon type="ios-create-outline"/>
-            <span>试题分析</span>
+            <span>{{$t('saindex.examination')}}</span>
           </MenuItem>
           <MenuItem name="1-5">
             <Icon type="ios-medal-outline"/>
-            <span>知识点掌握</span>
+            <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'">选择关注年级</p>
-      <Cascader :data="selectgrade" v-model="grade" placeholder="请选择年级" @on-change="listchange" v-if="this.now_url == '/saindex'"></Cascader>
-      <p class="choose_box_tilte">选择关注学年期</p>
+      <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 == '/saindex'"></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'">数据比较</p>
+      <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>

TEAMModelOS/ClientApp/components/SAlinechart.vue

@@ -12,7 +12,7 @@
       </div>
     </Col>
     <Col span="24">
-      <div id="myChart_line" :style="{width: '100%', height: '260px'}"></div>
+      <div id="myChart_line" :style="{width: '100%', height: '280px'}"></div>
     </Col>
   </Row>
 </template>
@@ -81,10 +81,20 @@
           xAxis: {
             type: 'category',
             boundaryGap: false,
-            data: obj.obj_data
+            data: obj.obj_data,
+            min: 'dataMin',
+            max: 'dataMax',
+            splitLine: {
+              show: true
+            }
           },
           yAxis: {
-            type: 'value'
+            type: 'value',
+            min: 'dataMin',
+            max: 'dataMax',
+            splitLine: {
+              show: true
+            }
           },
           series: [
             {
@@ -114,7 +124,6 @@
                   }, {
                     offset: 1, color: obj.end_color // 100% 处的颜色
                   }],
-                  global: false // 缺省为 false
                 }
               },
             },
@@ -131,6 +140,22 @@
                   }
                 }
               },
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgb(245,245,245,.5)' // 0% 处的颜色
+                  }, {
+                    offset: 0.5, color: 'rgb(245,245,245,.3)' // 100% 处的颜色
+                  }, {
+                    offset: 1, color: 'rgb(245,245,245,.1)' // 100% 处的颜色
+                  }],
+                }
+              },
             },
             {
               name: obj.obj_series[2].name,
@@ -145,6 +170,22 @@
                   }
                 }
               },
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgb(245,245,245,.5)' // 0% 处的颜色
+                  }, {
+                    offset: 0.5, color: 'rgb(245,245,245,.3)' // 100% 处的颜色
+                  }, {
+                    offset: 1, color: 'rgb(245,245,245,.1)' // 100% 处的颜色
+                  }],
+                }
+              },
             },
             {
               name: obj.obj_series[3].name,
@@ -159,6 +200,22 @@
                   }
                 }
               },
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgb(245,245,245,.5)' // 0% 处的颜色
+                  }, {
+                    offset: 0.5, color: 'rgb(245,245,245,.3)' // 100% 处的颜色
+                  }, {
+                    offset: 1, color: 'rgb(245,245,245,.1)' // 100% 处的颜色
+                  }],
+                }
+              },
             },
             {
               name: obj.obj_series[4].name,
@@ -173,6 +230,22 @@
                   }
                 }
               },
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgb(245,245,245,.5)' // 0% 处的颜色
+                  }, {
+                    offset: 0.5, color: 'rgb(245,245,245,.3)' // 100% 处的颜色
+                  }, {
+                    offset: 1, color: 'rgb(245,245,245,.1)' // 100% 处的颜色
+                  }],
+                }
+              },
             },
             {
               name: obj.obj_series[5].name,
@@ -187,6 +260,23 @@
                   }
                 }
               },
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgb(245,245,245,.5)' // 0% 处的颜色
+                  }, {
+                    offset: 0.5, color: 'rgb(245,245,245,.3)' // 100% 处的颜色
+                  }, {
+                    offset: 1, color: 'rgb(245,245,245,.1)' // 100% 处的颜色
+                  }],
+
+                }
+              },
             }
           ]
         })

TEAMModelOS/ClientApp/components/SAsubjectsmanifestation.vue

@@ -4,79 +4,79 @@
       <li class="subjects_listbox">
         <div class="top">
           <p class="num">{{list_data[0].score}}</p>
-          <p class="title">{{list_data[0].title}}</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"><Icon :type="list_data[0].icon_type" :class="list_data[0].icon_color" />{{list_data[0].belowscore}}</p>
-          <p class="title">{{list_data[0].below_title}}</p>
+          <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="title">{{list_data[1].title}}</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"><Icon :type="list_data[1].icon_type"  :class="list_data[1].icon_color" />{{list_data[1].belowscore}}</p>
-        <p class="title">{{list_data[1].below_title}}</p>
+        <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="title">{{list_data[2].title}}</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"><Icon :type="list_data[2].icon_type" :class="list_data[2].icon_color" />{{list_data[2].belowscore}}</p>
-        <p class="title">{{list_data[2].below_title}}</p>
+        <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="title">{{list_data[3].title}}</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"><Icon :type="list_data[3].icon_type" :class="list_data[3].icon_color" />{{list_data[3].belowscore}}</p>
-        <p class="title">{{list_data[3].below_title}}</p>
+        <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="title">{{list_data[4].title}}</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"><Icon :type="list_data[4].icon_type" :class="list_data[4].icon_color" />{{list_data[4].belowscore}}</p>
-        <p class="title">{{list_data[4].below_title}}</p>
+        <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="title">{{list_data[5].title}}</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"><Icon :type="list_data[5].icon_type" :class="list_data[5].icon_color" />{{list_data[5].belowscore}}</p>
-        <p class="title">{{list_data[5].below_title}}</p>
+        <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>
@@ -92,7 +92,7 @@
     },
     created() {
       this.init();
-     
+
     },
     mounted() {
       this.init();
@@ -106,7 +106,7 @@
 
       methods:{
           //图形一
-        
+
         One(obj) {
           //this.$store.state.pie.mode = false;
           let myChart = this.$echarts.init(document.getElementById('myChart_one'));
@@ -120,7 +120,7 @@
             color: obj.color,
             series: [{
               type: 'pie',
-              radius: ['80%', '100%'],
+              radius: ['80%', '97%'],
               hoverAnimation: false,
               label: {
                 normal: {
@@ -170,10 +170,10 @@
                 },
                 itemStyle: {
                   normal: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   },
                   emphasis: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   }
                 },
                 hoverAnimation: false
@@ -194,7 +194,7 @@
             color: obj.color,
             series: [{
               type: 'pie',
-              radius: ['80%', '100%'],
+              radius: ['80%', '97%'],
               hoverAnimation:false,
               label: {
                 normal: {
@@ -244,10 +244,10 @@
                 },
                 itemStyle: {
                   normal: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   },
                   emphasis: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   }
                 },
                 hoverAnimation: false
@@ -268,7 +268,7 @@
             color: obj.color,
             series: [{
               type: 'pie',
-              radius: ['80%', '100%'],
+              radius: ['80%', '97%'],
               hoverAnimation:false,
               label: {
                 normal: {
@@ -318,10 +318,10 @@
                 },
                 itemStyle: {
                   normal: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   },
                   emphasis: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   }
                 },
                 hoverAnimation: false
@@ -342,7 +342,7 @@
             color: obj.color,
             series: [{
               type: 'pie',
-              radius: ['80%', '100%'],
+              radius: ['80%', '97%'],
               hoverAnimation:false,
               label: {
                 normal: {
@@ -392,10 +392,10 @@
                 },
                 itemStyle: {
                   normal: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   },
                   emphasis: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   }
                 },
                 hoverAnimation: false
@@ -416,7 +416,7 @@
             color:obj.color,
             series: [{
               type: 'pie',
-              radius: ['80%', '100%'],
+              radius: ['80%', '97%'],
               hoverAnimation:false,
               label: {
                 normal: {
@@ -466,10 +466,10 @@
                 },
                 itemStyle: {
                   normal: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   },
                   emphasis: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   }
                 },
                 hoverAnimation: false
@@ -490,7 +490,7 @@
             color: obj.color,
             series: [{
               type: 'pie',
-              radius: ['80%', '100%'],
+              radius: ['80%', '97%'],
               hoverAnimation:false,
               label: {
                 normal: {
@@ -540,10 +540,10 @@
                 },
                 itemStyle: {
                   normal: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   },
                   emphasis: {
-                    color: '#cdd4da'
+                    color: '#ddd'
                   }
                 },
                 hoverAnimation: false
@@ -591,6 +591,7 @@
 </script>
 
 <style scoped>
+.ivu-icon{font-weight: bold;}
 .subjects_box{
   width:100%;
   padding: 2.5% 1% 5% 1%;
@@ -602,14 +603,12 @@
   color:#333;
 }
 .subjects_listbox{
-  width:15%;
+  width:13.5%;
   height:100%;
   /*border:1px solid red;*/
   text-align: center;
-  margin-top: 10%;
   float: left;
-  margin-left: 1%;
-  margin-bottom: 15%;
+  margin:10% 1.5% 15%;
 }
  .top{
    width:100%;
@@ -622,14 +621,14 @@
   .num{
     font-size: 1.5rem;
   }
-  .top .title{
+  .datatitle{
     font-size: 0.9rem;
     color:#333;
   }
   .icon_top {
-    color:green;
+    color:#1acb9f;
   }
   .icon_down {
-    color: red;
+    color: #f1494a;
   }
 </style>

TEAMModelOS/ClientApp/css/site.css

@@ -133,4 +133,4 @@
     overflow:hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-}
+}

TEAMModelOS/ClientApp/locale/lang/en-US.js

@@ -16,5 +16,20 @@ export default {
     authSchool: "Authorized School",
     currentRole: "Current Role",
     loginSuc:"Login Success"
+  },
+  //StudentAnalysis
+  saindex: {
+    index: "home",
+    grade: "Grade Analysis",
+    droppoint: "Droppoint Analysis",
+    examination: "Analysis of test paper",
+    knowledge:"Knowledge",
+  },
+  sasidebar: {
+    class: "Choose focus grade",
+    classmsg:"Please select grade",
+    term: "Choose to focus on the school year",
+    term: "Please select your academic year",
+    compare: "Choose data comparison"
   }
 }

TEAMModelOS/ClientApp/locale/lang/zh-CN.js

@@ -16,5 +16,20 @@ export default {
     authSchool: "授权学校",
     currentRole: "当前身份",
     loginSuc:"登录成功"
+  },
+  //学情分析内容
+  saindex: {
+    index: "首页",
+    grade: "成绩分析",
+    droppoint: "落点分析",
+    examination: "试题分析",
+    knowledge:"知识点掌握",
+  },
+  sasidebar: {
+    class: "选择关注年级",
+    classmsg: "请选择年级",
+    term: "选择关注学年期",
+    term: "请选择学年期",
+    compare:"选择数据对比"
   }
 }

TEAMModelOS/ClientApp/locale/lang/zh-TW.js

@@ -16,5 +16,20 @@ export default {
     authSchool:"授權學校",
     currentRole: "當前身份",
     loginSuc:"登陸成功"
+  },
+  //學情分析
+  saindex: {
+    index: "首頁",
+    grade: "成績分析",
+    droppoint: "落點分析",
+    examination:"試題分析",
+    knowledge:"知識點掌握",
+  },
+  sasidebar: {
+    class: "選擇關注年級",
+    classmsg: "請選擇年級",
+    term: "選擇關注學年期",
+    term: "請選擇學年期",
+    compare:"選擇數據對比"
   }
 }

TEAMModelOS/ClientApp/view/SAindex.vue

@@ -152,7 +152,6 @@
     font-family: "微软雅黑";
   }
 </style>
-
 <style scoped>
 .index{
   width:100%;
@@ -176,10 +175,8 @@
     margin-right: 2%;
     margin-bottom: 3%;
     background-color: #fdfdfd;
-    box-shadow: -2px 0 5px #a5acb2, /*左边阴影*/
-                2px 0 5px #a5acb2, /*右边阴影*/
-                0 -2px 5px #a5acb2, /*顶部阴影*/
-                0 4px 5px #a5acb2; /*底边阴影*/
+    box-shadow:0 4px 15px rgba(0,0,0,0.5);
+
   }
   .left_echarts{
     width:32%;

TEAMModelOS/JsonFile/Changearts.json

@@ -1,4 +1,4 @@
-{
+{
   "grade": "3",
   "value": "gaozhong",
   "label": "高中",
@@ -204,30 +204,32 @@
       "name": "政治",
       "data": [ "78", "60", "62", "78", "74", "76", "79" ]
     },
-  "anotherone_data": {
-    "name": "语文",
-    "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-  },
-  "anothertwo_data": {
-    "name": "数学",
-    "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-  },
-  "anotherthree_data": {
-    "name": "英语",
-    "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-  },
+  "quyudata":{
+    "anotherone_data": {
+      "name": "语文",
+      "datalist": [ "98", "98", "98", "98", "98", "98", "98" ]
+    },
+    "anothertwo_data": {
+      "name": "数学",
+      "datalist": [ "115", "115", "115", "115", "115", "115", "115" ]
+    },
+    "anotherthree_data": {
+      "name": "英语",
+      "datalist": [ "92", "92", "92", "92", "92", "92", "92" ]
+    },
     "anotherfour_data": {
       "name": "地理",
-      "data": [ "76", "76", "76", "76", "76", "76", "76" ]
+      "datalist": [ "69", "69", "69", "69", "69", "69", "69" ]
     },
     "anotherfive_data": {
       "name": "历史",
-      "data": [ "78", "78", "78", "78", "78", "78", "78" ]
+      "datalist": [ "75", "75", "75", "75", "75", "75", "75" ]
     },
     "anothersix_data": {
       "name": "政治",
-      "data": [ "69", "69", "69", "69", "69", "69", "69" ]
+      "datalist": [ "78", "78", "78", "78", "78", "78", "78" ]
     }
+  }
   },
   "leida": {
     "titledata": [ "年级数据", "区级数据" ],

TEAMModelOS/JsonFile/Changeexam.json

@@ -195,31 +195,32 @@
     "name": "生物",
     "data": [ "78", "60", "62", "78", "74", "76", "79" ]
   },
-  "anotherone_data": {
-    "name": "语文",
-    "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-  },
-  "anothertwo_data": {
-    "name": "数学",
-    "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-  },
-  "anotherthree_data": {
-    "name": "英语",
-    "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-  },
-  "anotherfour_data": {
-    "name": "物理",
-    "data": [ "76", "76", "76", "76", "76", "76", "76" ]
-  },
-  "anotherfive_data": {
-    "name": "化学",
-    "data": [ "78", "78", "78", "78", "78", "78", "78" ]
-  },
-  "anothersix_data": {
-    "name": "生物",
-    "data": [ "69", "69", "69", "69", "69", "69", "69" ]
+   "quyudata":{
+    "anotherone_data": {
+      "name": "语文",
+      "datalist": [ "103", "103", "103", "103", "103", "103", "103" ]
+    },
+    "anothertwo_data": {
+      "name": "数学",
+      "datalist": [ "90", "90", "90", "90", "90", "90", "90" ]
+    },
+    "anotherthree_data": {
+      "name": "英语",
+      "datalist": [ "110", "110", "110", "110", "110", "110", "110" ]
+    },
+    "anotherfour_data": {
+      "name": "物理",
+      "datalist": [ "70", "70", "70", "70", "70", "70", "70" ]
+    },
+    "anotherfive_data": {
+      "name": "化学",
+      "datalist": [ "72", "72", "72", "72", "72", "72", "72" ]
+    },
+    "anothersix_data": {
+      "name": "生物",
+      "datalist": [ "78", "78", "78", "78", "78", "78", "78" ]
+    }
   }
-
   },
   "leida": {
     "titledata": [ "年级数据", "区级数据" ],

TEAMModelOS/JsonFile/Changeexamtype.json

@@ -167,30 +167,32 @@
     "name": "生物",
     "data": [ "78", "60", "62", "78", "74", "76", "79" ]
   },
-  "anotherone_data": {
-    "name": "语文",
-    "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-  },
-  "anothertwo_data": {
-    "name": "数学",
-    "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-  },
-  "anotherthree_data": {
-    "name": "英语",
-    "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-  },
-  "anotherfour_data": {
-    "name": "物理",
-    "data": [ "76", "76", "76", "76", "76", "76", "76" ]
-  },
-  "anotherfive_data": {
-    "name": "化学",
-    "data": [ "78", "78", "78", "78", "78", "78", "78" ]
-  },
-  "anothersix_data": {
-    "name": "生物",
-    "data": [ "69", "69", "69", "69", "69", "69", "69" ]
-  }
+    "quyudata": {
+      "anotherone_data": {
+        "name": "语文",
+        "datalist": [ "105", "105", "105", "105", "105", "105", "105" ]
+      },
+      "anothertwo_data": {
+        "name": "数学",
+        "datalist": [ "93", "93", "93", "93", "93", "93", "93" ]
+      },
+      "anotherthree_data": {
+        "name": "英语",
+        "datalist": [ "101", "101", "101", "101", "101", "101", "101" ]
+      },
+      "anotherfour_data": {
+        "name": "物理",
+        "datalist": [ "75", "75", "75", "75", "75", "75", "75" ]
+      },
+      "anotherfive_data": {
+        "name": "化学",
+        "datalist": [ "70", "70", "70", "70", "70", "70", "70" ]
+      },
+      "anothersix_data": {
+        "name": "生物",
+        "datalist": [ "81", "81", "81", "81", "81", "81", "81" ]
+      }
+    }
 
   },
   "leida": {

TEAMModelOS/JsonFile/Changegrade.json

@@ -181,31 +181,32 @@
     "name": "生物",
     "data": [ "78", "60", "62", "78", "74", "76", "79" ]
   },
-  "anotherone_data": {
-    "name": "语文",
-    "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-  },
-  "anothertwo_data": {
-    "name": "数学",
-    "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-  },
-  "anotherthree_data": {
-    "name": "英语",
-    "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-  },
-  "anotherfour_data": {
-    "name": "物理",
-    "data": [ "76", "76", "76", "76", "76", "76", "76" ]
-  },
-  "anotherfive_data": {
-    "name": "化学",
-    "data": [ "78", "78", "78", "78", "78", "78", "78" ]
-  },
-  "anothersix_data": {
-    "name": "生物",
-    "data": [ "69", "69", "69", "69", "69", "69", "69" ]
-  }
-
+   "quyudata": {
+      "anotherone_data": {
+        "name": "语文",
+        "datalist": [ "100", "100", "100", "100", "100", "100", "100" ]
+      },
+      "anothertwo_data": {
+        "name": "数学",
+        "datalist": [ "98", "98", "98", "98", "98", "98", "98" ]
+      },
+      "anotherthree_data": {
+        "name": "英语",
+        "datalist": [ "95", "95", "95", "95", "95", "95", "95" ]
+      },
+      "anotherfour_data": {
+        "name": "物理",
+        "datalist": [ "78", "78", "78", "78", "78", "78", "78" ]
+      },
+      "anotherfive_data": {
+        "name": "化学",
+        "datalist": [ "62", "62", "62", "62", "62", "62", "62" ]
+      },
+      "anothersix_data": {
+        "name": "生物",
+        "datalist": [ "70", "70", "70", "70", "70", "70", "70" ]
+      }
+    }
   },
   "leida": {
     "titledata": [ "年级数据", "区级数据" ],

TEAMModelOS/JsonFile/Changescience.json

@@ -219,29 +219,31 @@
       "name": "生物",
       "data": [ "78", "60", "62", "78", "74", "76", "79" ]
     },
-  "anotherone_data": {
-    "name": "语文",
-    "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-  },
-  "anothertwo_data": {
-    "name": "数学",
-    "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-  },
-  "anotherthree_data": {
-    "name": "英语",
-    "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-  },
-    "anotherfour_data": {
-      "name": "物理",
-      "data": [ "76", "76", "76", "76", "76", "76", "76" ]
-    },
-    "anotherfive_data": {
-      "name": "化学",
-      "data": [ "78", "78", "78", "78", "78", "78", "78" ]
-    },
-    "anothersix_data": {
-      "name": "生物",
-      "data": [ "69", "69", "69", "69", "69", "69", "69" ]
+    "quyudata": {
+      "anotherone_data": {
+        "name": "语文",
+        "datalist": [ "96", "96", "96", "96", "96", "96", "96" ]
+      },
+      "anothertwo_data": {
+        "name": "数学",
+        "datalist": [ "89", "89", "89", "89", "89", "89", "89" ]
+      },
+      "anotherthree_data": {
+        "name": "英语",
+        "datalist": [ "92", "92", "92", "92", "92", "92", "92" ]
+      },
+      "anotherfour_data": {
+        "name": "物理",
+        "datalist": [ "78", "78", "78", "78", "78", "78", "78" ]
+      },
+      "anotherfive_data": {
+        "name": "化学",
+        "datalist": [ "68", "68", "68", "68", "68", "68", "68" ]
+      },
+      "anothersix_data": {
+        "name": "生物",
+        "datalist": [ "70", "70", "70", "70", "70", "70", "70" ]
+      }
     }
   },
   "leida": {

TEAMModelOS/JsonFile/Changeterm.json

@@ -196,29 +196,31 @@
       "name": "生物",
       "data": [ "68", "60", "62", "78", "74", "76", "79" ]
     },
-    "anotherone_data": {
-      "name": "语文",
-      "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-    },
-    "anothertwo_data": {
-      "name": "数学",
-      "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-    },
-    "anotherthree_data": {
-      "name": "英语",
-      "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-    },
-    "anotherfour_data": {
-      "name": "物理",
-      "data": [ "76", "76", "76", "76", "76", "76", "76" ]
-    },
-    "anotherfive_data": {
-      "name": "化学",
-      "data": [ "78", "78", "78", "78", "78", "78", "78" ]
-    },
-    "anothersix_data": {
-      "name": "生物",
-      "data": [ "69", "69", "69", "69", "69", "69", "69" ]
+     "quyudata": {
+      "anotherone_data": {
+        "name": "语文",
+        "datalist": [ "106", "106", "106", "106", "106", "106", "106" ]
+      },
+      "anothertwo_data": {
+        "name": "数学",
+        "datalist": [ "99", "99", "99", "99", "99", "99", "99" ]
+      },
+      "anotherthree_data": {
+        "name": "英语",
+        "datalist": [ "90", "90", "90", "90", "90", "90", "90" ]
+      },
+      "anotherfour_data": {
+        "name": "物理",
+        "datalist": [ "72", "72", "72", "72", "72", "72", "72" ]
+      },
+      "anotherfive_data": {
+        "name": "化学",
+        "datalist": [ "68", "68", "68", "68", "68", "68", "68" ]
+      },
+      "anothersix_data": {
+        "name": "生物",
+        "datalist": [ "78", "78", "78", "78", "78", "78", "78" ]
+      }
     }
   },
   "leida": {

TEAMModelOS/JsonFile/EcharsL.json

@@ -1,9 +1,9 @@
 {
   "mode": false,
-  "titledata": [ "校级数据", "区级数据" ],
-  "title_one": "校级数据",
+  "titledata": [ "成都七中", "区级数据" ],
+  "title_one": "成都七中",
   "title_two": "区级数据",
-  "dataname": [ "校级 VS 区域" ],
+  "dataname": [ "成都七中 VS 区域" ],
   "data1": [ "109", "95", "101", "82", "78", "66" ],
   "data2": [ "120", "108", "108", "88", "69", "79" ],
   "indicator": [

TEAMModelOS/JsonFile/EcharsY.json

@@ -8,13 +8,13 @@
     "occupy": "80",
     "surplus": "20",
     "below_title": "全区平均",
-    "icon_type": "md-arrow-dropup",
+    "icon_type": "ios-arrow-round-up",
     "icon_color": "icon_top",
     "color": "#1cd0a1",
     "state": 1
   },
   {
-   
+
     "id": "2",
     "title": "全校平均",
     "score": "54.5",
@@ -23,13 +23,13 @@
     "surplus": "45",
     "below_title": "全区平均",
     "belowscore": "68.5",
-    "icon_type": "md-arrow-dropdown",
+    "icon_type": "ios-arrow-round-down",
     "icon_color": "icon_down",
     "color": "#ff6b6b",
     "state": 0
   },
   {
-   
+
     "id": "3",
     "title": "全校平均",
     "score": "72.9",
@@ -38,7 +38,7 @@
     "surplus": "30",
     "below_title": "全区平均",
     "belowscore": "69.5",
-    "icon_type": "md-arrow-dropup",
+    "icon_type": "ios-arrow-round-up",
     "icon_color": "icon_top",
     "color": "#1cd0a1",
     "state": 1
@@ -53,7 +53,7 @@
     "surplus": "40",
     "below_title": "全区平均",
     "belowscore": "70",
-    "icon_type": "md-arrow-dropdown",
+    "icon_type": "ios-arrow-round-down",
     "icon_color": "icon_down",
     "color": "#FDD889",
     "state": 0
@@ -68,13 +68,13 @@
     "surplus": "22",
     "below_title": "全区平均",
     "belowscore": "73",
-    "icon_type": "md-arrow-dropdown",
+    "icon_type": "ios-arrow-round-down",
     "icon_color": "icon_down",
     "color": "#FDD889",
     "state": 1
   },
   {
-   
+
     "id": "6",
     "title": "全校平均",
     "score": "85.8",
@@ -83,7 +83,7 @@
     "surplus": "15",
     "below_title": "全区平均",
     "belowscore": "78",
-    "icon_type": "md-arrow-dropup",
+    "icon_type": "ios-arrow-round-up",
     "icon_color": "icon_top",
     "color": "#1cd0a1",
     "state": 0

TEAMModelOS/JsonFile/EcharsZ.json

@@ -8,7 +8,8 @@
     "data": [ "470" ]
   },
   "two_average": {
-    "name":"区域总平均分","data": [ "528" ]
+    "name": "区域总平均分",
+    "data": [ "528" ]
   },
   "one_data": {
     "name": "语文",
@@ -34,28 +35,30 @@
     "name": "生物",
     "data": [ "78", "60", "62", "78", "74", "76", "79" ]
   },
-  "anotherone_data": {
-    "name": "语文",
-    "data": [ "108", "108", "108", "108", "108", "108", "108" ]
-  },
-  "anothertwo_data": {
-    "name": "数学",
-    "data": [ "95", "95", "95", "95", "95", "95", "95" ]
-  },
-  "anotherthree_data": {
-    "name": "英语",
-    "data": [ "98", "98", "98", "98", "98", "98", "98" ]
-  },
-  "anotherfour_data": {
-    "name": "物理",
-    "data": [ "76", "76", "76", "76", "76", "76", "76" ]
-  },
-  "anotherfive_data": {
-    "name": "化学",
-    "data": [ "78", "78", "78", "78", "78", "78", "78" ]
-  },
-  "anothersix_data": {
-    "name": "生物",
-    "data": [ "69", "69", "69", "69", "69", "69", "69" ]
+  "quyudata":{
+    "anotherone_data": {
+      "name": "语文",
+      "datalist": [ "108", "108", "108", "108", "108", "108", "108" ]
+    },
+    "anothertwo_data": {
+      "name": "数学",
+      "datalist": [ "95", "95", "95", "95", "95", "95", "95" ]
+    },
+    "anotherthree_data": {
+      "name": "英语",
+      "datalist": [ "98", "98", "98", "98", "98", "98", "98" ]
+    },
+    "anotherfour_data": {
+      "name": "物理",
+      "datalist": [ "76", "76", "76", "76", "76", "76", "76" ]
+    },
+    "anotherfive_data": {
+      "name": "化学",
+      "datalist": [ "78", "78", "78", "78", "78", "78", "78" ]
+    },
+    "anothersix_data": {
+      "name": "生物",
+      "datalist": [ "69", "69", "69", "69", "69", "69", "69" ]
+    }
   }
 }

TEAMModelOS/JsonFile/EcharsZx.json

@@ -28,8 +28,8 @@
       "data": [ "540", "635", "548", "515", "540" ]
     }
   ],
-  "start_color": "rgba(255,48,48,0.6)",
-  "middle_color": "rgba(238,44,44,0.2)",
-  "end_color": "rgba(255,0,0,0.1)"
+  "start_color": "rgba(255,48,48,0.7)",
+  "middle_color": "rgba(238,44,44,0.5)",
+  "end_color": "rgba(255,0,0,0.2)"
 }
 

TEAMModelOS/JsonFile/TeachChangeterm.json

@@ -1,4 +1,4 @@
-{
+{
   "grade": "1",
   "value": "gaozhong",
   "label": "高中",

TEAMModelOS/JsonFile/TeachEcharsZx.json

@@ -29,6 +29,6 @@
     }
   ],
   "start_color": "rgba(0,206,209,0.6)",
-  "middle_color": "rgba(72,209,204,0.3)",
+  "middle_color": "rgba(72,209,204,0.4)",
   "end_color": "rgba(64,224,208,0.1)"
 }

TEAMModelOS/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"]TEAMModelOS</title>
+    <title>@ViewData["Title"]TEAM Model OS</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" />
@@ -15,7 +15,6 @@
 
 <body>
     @RenderBody()
-
     <script src="~/dist/vendor.js" asp-append-version="true"></script>
     @RenderSection("scripts", required: false)
 </body>

TEAMModelOS/webpack.config.js

@@ -13,7 +13,6 @@ module.exports = () => {
   const extractCSS = new MiniCssExtractPlugin({
     filename: 'style.css'
   })
-
   return [{
     mode: (isDevBuild ? 'development' :'production'  ),
     stats: { modules: false },
@@ -27,7 +26,7 @@ module.exports = () => {
         'utils': path.resolve(__dirname, './ClientApp/utils'),
         'api': path.resolve(__dirname, './ClientApp/store/api'),
         '@': path.resolve(__dirname, './ClientApp'),
-      } : {
+      }: {
         'components': path.resolve(__dirname, './ClientApp/components'),
         'views': path.resolve(__dirname, './ClientApp/views'),
         'utils': path.resolve(__dirname, './ClientApp/utils'),