Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/views/businessManager/shopManager/shopCategory.vue

@@ -214,7 +214,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/categroyManager/generalSettings/errorManager.vue

@@ -154,7 +154,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/categroyManager/specialSetup/bannerManager.vue

@@ -75,7 +75,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -218,7 +218,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -232,7 +232,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/categroyManager/specialSetup/tryClass.vue

@@ -75,7 +75,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/categroyManager/specialSetup/typesManager.vue

@@ -212,7 +212,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-group__append, .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -180,7 +180,7 @@ export default {
   }
 }
 </script>
-<style lang="scss" scope>
+<style lang="scss" scoped>
 .teacherInfo {
   .infoWrap {
     margin-top: 20px;

src/views/teacherManager/teacherList.vue

@@ -42,8 +42,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.isProbationPeriod" placeholder="人事状态">
-            <el-option label="试用" value="1"></el-option>
-            <el-option label="正式" value="0"></el-option>
+            <el-option label="试用" value="0"></el-option>
+            <el-option label="正式" value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -66,8 +66,11 @@
               {{ scope.row.lockFlag == 1 ? '冻结' : '正常' }}
             </template>
           </el-table-column>
-          <el-table-column align='center' prop="splitSubjectName"
+          <el-table-column align='center'
                            label="专业技能">
+            <template slot-scope="scope">
+              <span style="max-height: 68px;display: block;" :title="scope.row.splitSubjectName">{{ scope.row.splitSubjectName }}</span>
+            </template>
           </el-table-column>
           <el-table-column align='center' prop="phone"
                            label="联系电话">

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -642,7 +642,7 @@ export default {
 
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .course-container {
   padding: 47px 58px;
   background-color: #fff;