Merge branch '07/06musicArchives' of http://git.dayaedu.com/yonge/dy-admin-manager into 07/06musicArchives

src/views/resetTeaming/components/archicesComponents/modals/studentMaster.vue

@@ -4,8 +4,6 @@
       ref="searchForm"
       :inline="true"
       class="searchForm"
-      @submit="search"
-      @reset="onReSet"
       :model="searchForm"
     >
       <el-form-item prop="search">
@@ -59,8 +57,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button native-type="submit" type="danger">搜索</el-button>
-        <el-button type="primary" native-type="reset">重置</el-button>
+        <el-button  type="danger" @click="search">搜索</el-button>
+        <el-button type="primary" @click="onReSet">重置</el-button>
         <!-- <el-button
           type="primary"
           v-permission="'export/musicGroupStudent'"
@@ -170,6 +168,7 @@ export default {
       this.getList()
     },
     onReSet() {
+      this.$refs.searchForm.resetFields()
       this.search()
     },
     getGrade(id){

src/views/resetTeaming/components/archicesComponents/modals/surveyMask.vue

@@ -119,7 +119,6 @@ export default {
     return {};
   },
   mounted() {
-    console.log(this.form.id);
   },
   methods: {
     submitSurvey() {

src/views/resetTeaming/components/archicesComponents/teamInfo.vue

@@ -209,8 +209,11 @@ export default {
     },
     gotoLink(url){
       var p = window.location.protocol;
-      window.open(`${p}//${url}`,"_blank")
-
+      if(url.indexOf('http')!= -1){
+         window.open(`${p}//${url}`,"_blank")
+      }else{
+         window.open(url,"_blank")
+      }
     }
   },
 };