Merge branch 'dev_m' into develop

src/views/report/Operational.vue

@@ -68,7 +68,7 @@
     <div class="echartsTwo">
       <div class="title">
         <div class="left">学习情况</div>
-        <div class="right" @click="exportTwoData">
+        <div v-if="1 == towParmasn.type || 2 == towParmasn.type || 3 == towParmasn.type"  class="right" @click="exportTwoData">
           <img src="../../assets/images/coursewareManage/export1.png" alt="" />
           <span>导出学习情况</span>
         </div>
@@ -107,7 +107,6 @@
                   value: 6,
                 },
               ]"
-              allowClear
             ></a-select>
           </div>
           <div class="leftItem">