1

src/frame/layout.vue

@@ -2,9 +2,9 @@
     <div class="layout-wrap">
         <header class="header-container fix">
             <div class="fl align-middle icon-box">
-                 <div title="常用应用" :class="['icon-btn', isPanel ? 'active' : '']" @click="showPanel">
+                <div title="常用应用" :class="['icon-btn', isPanel ? 'active' : '']" @click="showPanel">
-                    <i class="iconfont icon-apps"></i>
+                    <i class="iconfont icon-apps"></i>
-                </div>
+                </div>
             </div>
             <div class="delimiter fl align-middle"></div>
             <h4 class="fl align-middle">{{ appName }}</h4>
@@ -16,8 +16,9 @@
                 </a>
                 <div class="delimiter fl align-middle"></div>
                 <a href=" " @click="logout" class="logout fl align-middle" title="退出登陆">
-                    <i class="iconfont icon-logout"></i>
+                    <!-- <i class="iconfont icon-logout"></i> -->
-                </a>
+                    <Icon type="md-power" color="#fff" size="18" />
+                 </a>
             </div>
         </header>
 
@@ -243,9 +244,8 @@ export default {
         },
 
         logout() {
-            // http://sso.yunhaixingtong.com/cas/logout
             let url = window.location.href;
-            url = "/logout?service=" + url;
+            url = "/cas/logout?service=" + url;
             top.location.href = this.ssoHost + url;
         },
         flaten(tree, pid = 0) {

src/views/teacherManage.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="outer-wrap" style="height:calc(100% - 50px);">
+    <div class="outer-wrap" style="height:calc(100% - 52px);">
       <!-- 顶部标签切换 -->
       <Tabs v-model="activeTab" type="line">
         <TabPane label="教师信息管理" :name="1"></TabPane>

src/views/teacherManage/teacherinfo.vue

@@ -306,8 +306,8 @@
       <Form ref="statusForm" :model="statusFormData" label-width="120">
         <FormItem label="选择设置状态">
           <RadioGroup v-model="statusFormData.status">
-            <Radio label="1">正常</Radio>
+            <Radio label="0">正常</Radio>
-            <Radio label="0">禁用</Radio>
+            <Radio label="1">禁用</Radio>
           </RadioGroup>
         </FormItem>
       </Form>
@@ -471,7 +471,7 @@ export default {
 
       moveGroupTargetName: '',
       moveTeacherName: '',
-      statusFormData: { status: '1' }
+      statusFormData: { status: '0' }
     }
   },
   mixins: [self_viewport],
@@ -575,7 +575,7 @@ export default {
           tel:this.addTeacherFormData.phone,
           gender:this.addTeacherFormData.gender,
           teaId:0,
-          status:1
+          status:0
         }
         const url = APIConfig.BschClassSystem.teachersave;
         this.$api.post(url, JSON.stringify(newItem), resp => {
@@ -781,7 +781,7 @@ export default {
 
     openSetStatusModal() {
       if (!this.selectedRows.length) return this.$Message.warning('请先勾选教师')
-      this.statusFormData.status = '1'
+      this.statusFormData.status = '0'
       this.setStatusModal = true
     },
     submitSetStatus() {
@@ -861,7 +861,7 @@ export default {
 <style scoped>
 /* 全局布局逐级修复高度 + min-height:0 解决flex塌陷 */
 .outer-wrap {
-  border: 1px solid #e5e7eb;
+  /* border: 1px solid #e5e7eb; */
   border-radius: 4px;
   padding: 16px;
   width: 100%;

src/views/teacherManage/teachseeting.vue

@@ -133,7 +133,7 @@ export default {
         fileName:'',
         listData:{},
         datapre:{},
-        actionUrl:APIConfig.BschClassSystem.teacherImport,
+        actionUrl:APIConfig.BschClassSystem.importTeach,
         columns:[
             {
                 title: '行号',