解决冲突

src/components/MenuComponent.vue

@@ -1,6 +1,6 @@
 <template>
   <el-col :span="24" class="">
-      <el-col :span="2" :offset="1">
+      <el-col :span="2" :offset="2">
        <img class="logoImg" src="../assets/img/log.png"/>
       </el-col>
       <el-col :span="2" v-show="roles.indexOf(item.id) >= 0"  v-for="(item, index) of menuData" :key="item.id"

src/pages/home/SchoolManager.vue

@@ -1,17 +1,6 @@
 <!-- 活动解析 -->
 <template>
   <div>
-<<<<<<< HEAD
-=======
-    <!--&lt;!&ndash; 筛选 &ndash;&gt;-->
-    <!--<div class="all_select">-->
-    <!--<h2 class="all_title" style="display: none">-->
-    <!--<div class="all_dot"></div>-->
-    <!--<p style="font-size: 16px">查询条件</p>-->
-    <!--</h2>-->
-    <!--</div>-->
-
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
     <!-- table 表格 -->
     <el-row :gutter="20" class="main-items">
       <el-col class="aside" :span="4" :offset="1" style="padding: 0 !important;">
@@ -19,27 +8,18 @@
           class="table-aside"
           v-for="(v, k) in ItemList"
           :key="k"
-          :class="{active:k == checkindex}"
+          :class="{active:k == modelindex}"
           @click="selectTitle(k)"
         >{{v.text}}</div>
       </el-col>
       <!--数据监控-->
-      <el-col :span="18" class="main" v-if="checkindex == 0">
+      <el-col :span="18" class="main" v-if="modelindex == 0">
         <el-row :gutter="20" class="main-header">
-<<<<<<< HEAD
-          <el-col :span="3"><div class="main-header-item" >在线：6人</div></el-col>
-          <el-col :span="3"><div class="main-header-item" >离线：26人</div></el-col>
-          <el-col :span="5"><div class="main-header-item"><span>分配未批改作业：4份</span><span class="main-header-link" @click="isShow(1)">去分配</span></div></el-col>
-          <el-col :span="10" :offset="3">
-            <el-input placeholder="请输入内容" v-model="input3" class="input-with-select">
-              <el-select v-model="select" slot="prepend" placeholder="选年级" minlength="20">
-                <el-option label="一年级" value="1"></el-option>
-=======
           <el-col :span="2">
-            <div class="main-header-item" @click="isShow(1)">在线：{{monitorTeacherList.onlineCount}}人</div>
+            <div class="main-header-item">在线：{{monitorTeacherList.onlineCount}}人</div>
           </el-col>
           <el-col :span="2">
-            <div class="main-header-item" @click="isShow(2)">离线：{{monitorTeacherList.offlineCount}}人</div>
+            <div class="main-header-item">离线：{{monitorTeacherList.offlineCount}}人</div>
           </el-col>
           <el-col :span="4">
             <div class="main-header-item">
@@ -62,7 +42,6 @@
                   :label="item.label"
                   :value="item.label"
                 ></el-option>
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
               </el-select>
               <el-select
                 v-model="filters.gradesValue"
@@ -85,7 +64,6 @@
               <el-date-picker v-model="filters.MaxtimeValue"  value-format="yyyy-MM-dd HH:mm:ss"  type="date" placeholder="选择日期"></el-date-picker>
             </div>
         </el-row>
-<<<<<<< HEAD
 
         <el-row :gutter="20" class="main-header">
           <el-col :span="24">
@@ -131,24 +109,10 @@
             </div>
           </el-col>
         </el-row>
-=======
-        <el-table :data="dataList" highlight-current-row size="mini" stripe>
-          <el-table-column label="头像" header-align="center">
-            <template scope="scope">
-              <img :src="scope.row.img" alt class="table-img">
-            </template>
-          </el-table-column>
-          <el-table-column prop="names" label="姓名" header-align="center"></el-table-column>
-          <el-table-column prop="number" label="等待学生数" header-align="center"></el-table-column>
-          <el-table-column prop="time" label="作业最长等待时长" header-align="center"></el-table-column>
-          <el-table-column prop="allTime" label="累计批改时间" header-align="center"></el-table-column>
-          <el-table-column prop="rate" label="响应速度" header-align="center"></el-table-column>
-          <el-table-column prop="status" label="状态" header-align="center"></el-table-column>
-        </el-table>
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
+
       </el-col>
       <!--当天-->
-      <el-col :span="18" class="main" v-if="checkindex == 1">
+      <el-col :span="18" class="main" v-if="modelindex == 1">
         <el-row :gutter="20" class="main-header">
           <el-col :span="5">
             <div class="main-header-item" @click="isShow(1)">今日报错总次数:：6人</div>
@@ -208,7 +172,7 @@
         </el-table>
       </el-col>
       <!--当月-->
-      <el-col :span="18" class="main" v-if="checkindex == 2">
+      <el-col :span="18" class="main" v-if="modelindex == 2">
         <el-row :gutter="20" class="main-header">
           <el-col :span="5">
             <div class="main-header-item" @click="isShow(1)">当月报错总次数：6人</div>
@@ -347,7 +311,6 @@
   </div>
 </template>
 <script>
-<<<<<<< HEAD
   import { mapGetters, mapActions } from "vuex";
   export default {
     components: { },
@@ -355,7 +318,7 @@
     props: {},
     data() {
       return {
-        checkindex: 0,
+        modelindex: 0,
         hiddenModel:false,
         isPigai:false,
         isDown:false,
@@ -390,135 +353,6 @@
             status:'22'
           }
         ],
-        filters: {
-          actvNm: "",
-          actvCrtUserId: "",
-          actvType: "",
-          actvSmallType: "",
-          // 排序
-          pageNo: 1,
-          pageSize: 10,
-          count: 0,
-          orderField: "",
-          orderAD: ""
-=======
-import { mapGetters, mapActions } from "vuex";
-export default {
-  components: {},
-  name: "actvResolveLabel",
-  props: {},
-  data() {
-    return {
-      checkindex: 0,
-      hiddenModel: false,
-      isPigai: false,
-      options: [
-        {
-          value: "0",
-          label: "一年级"
-        },
-        {
-          value: "1",
-          label: "二年级"
-        },
-        {
-          value: "2",
-          label: "三年级"
-        },
-        {
-          value: "3",
-          label: "四年级"
-        },
-        {
-          value: "4",
-          label: "五年级"
-        },
-        {
-          value: "5",
-          label: "六年级"
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
-        }
-      ],
-      grades: [
-        {
-          value: "0",
-          label: "语文"
-        },
-        {
-          value: "1",
-          label: "数学"
-        },
-        {
-          value: "2",
-          label: "英语"
-        }
-      ],
-      ItemList: [
-        {
-          text: "数据监控"
-        },
-        {
-          text: "当天"
-        },
-        {
-          text: "当月"
-        }
-      ],
-      dataList: [
-        {
-          img: "../../assets/img/user.jpg",
-          names: "阿三",
-          number: "3",
-          time: "14:22",
-          allTime: "14:22",
-          rate: "222",
-          status: "22"
-        },
-        {
-          img: "../../assets/img/user.jpg",
-          names: "阿三",
-          number: "3",
-          time: "14:22",
-          allTime: "14:22",
-          rate: "222",
-          status: "22"
-        }
-      ],
-      filters: { //超级管理员数据监控
-        actvNm: "",
-        actvCrtUserId: "",
-        actvType: "",
-        actvSmallType: "",
-        // 排序
-        MaxtimeValue:"",
-        OptionsValue: "",
-        gradesValue: "",
-        inputValue: "",
-        pageNo: 1,
-        pageSize: 10,
-        count: 0,
-        orderField: "",
-        orderAD: ""
-      },
-<<<<<<< HEAD
-      // 点击下拉
-      dropDown(){
-        this.isDown = !this.isDown;
-      },
-      // 分页
-      pageChange(val) {
-        this.filters.pageNo = val;
-        this.itemListReshow();
-      },
-      changeDateSlot(dateSlot) {
-        if (dateSlot) {
-          this.filters.startDate = dateSlot[0];
-          this.filters.endDate = dateSlot[1];
-        } else {
-          this.filters.startDate = null;
-          this.filters.endDate = null;
-        }
-=======
        filters1: { //超级管理员的当天数据
         actvNm: "",
         actvCrtUserId: "",
@@ -534,7 +368,6 @@ export default {
         count: 0,
         orderField: "",
         orderAD: ""
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
       },
        filters2: { //超级管理员的当月数据
         actvNm: "",
@@ -560,6 +393,25 @@ export default {
   },
   methods: {
     ...mapActions(["setUser"]),
+
+    // 点击下拉
+    dropDown(){
+      this.isDown = !this.isDown;
+    },
+    // // 分页
+    // pageChange(val) {
+    //   this.filters.pageNo = val;
+    //   this.itemListReshow();
+    // },
+    // changeDateSlot(dateSlot) {
+    //   if (dateSlot) {
+    //     this.filters.startDate = dateSlot[0];
+    //     this.filters.endDate = dateSlot[1];
+    //   } else {
+    //     this.filters.startDate = null;
+    //     this.filters.endDate = null;
+    //   }
+    // },
     // 获取校区管理员监控数据
     async InfoWatch() {
       let filter = {
@@ -601,7 +453,7 @@ export default {
     },
     selectTitle(k) {
       console.log(k);
-      this.checkindex = k;
+      this.modelindex = k;
       if (k === 0){
         this.InfoWatch()
       }
@@ -709,7 +561,6 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
-<<<<<<< HEAD
   .aside{
     background-color: #fff;
     margin-top: 16px;
@@ -879,128 +730,5 @@ export default {
     font-size: 18px;
     margin: 0 20px;
   }
-=======
-.aside {
-  background-color: #fff;
-  margin-top: 16px;
-  padding: 0;
-}
-.main {
-  background-color: #fff;
-  margin: 16px;
-  padding: 0 !important;
-}
-.table-aside {
-  color: #666666;
-  font-size: 18px;
-  text-align: center;
-  line-height: 60px;
-}
-el-table {
-  color: #999999;
-  font-size: 18px;
-}
-.main-items {
-  color: #393939;
-  text-align: center;
-  line-height: 80px;
-}
-.main-header-item {
-  font-size: 16px;
-}
-.main-header-link {
-  color: #52cc60;
-  font-size: 18px;
-  margin-left: 10px;
-}
-.el-select {
-  width: 100px;
-  margin: 0 5px;
-}
-.el-input__inner {
-  width: 80px;
-  border-radius: 10px;
-  height: 32px;
-}
-.input-with-select .el-input-group__prepend {
-  background-color: #fff;
-}
-.active {
-  background-color: #52cc60;
-  color: #fff;
-}
-.cell {
-  font-size: 18px !important;
-}
-.table-img {
-  width: 36px;
-  height: 36px;
-  border-radius: 6px;
-}
-.showModel {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: #000000;
-  opacity: 0.2;
-  overflow: hidden;
-  z-index: 1000;
-  color: #fff;
-}
-.model {
-  z-index: 1001;
-  width: 854px;
-  height: auto;
-  position: relative;
-  /*right: auto;*/
-  margin: auto;
-  background: #fff;
-  border-radius: 30px;
-  text-align: center;
-}
-.model-text {
-  background: rgba(255, 255, 255, 1);
-  border-radius: 10px;
-}
-.model-text-head {
-  padding: 40px 50px;
-  display: flex;
-  color: #393939;
-  font-size: 24px;
-  justify-content: space-between;
-}
-.model-items-left {
-  width: 45%;
-  color: #393939;
-  font-size: 24px;
-}
-.model-items-left-top {
-  display: flex;
-  justify-content: space-between;
-}
-.model-items {
-  padding: 0 50px 10px 50px;
-  display: flex;
-  justify-content: space-between;
-}
-.model-items-left-top-img {
-  width: 68px;
-  height: 68px;
-  border-radius: 8px;
-  position: relative;
-  bottom: 25px;
-}
-.model-items-left-top-number {
-  color: #7e7e7e;
-  font-size: 18px;
-  margin-left: 10px;
-}
-.today-time {
-  color: #7e7e7e;
-  font-size: 18px;
-  margin: 0 20px;
-}
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
+
 </style>

src/pages/home/TeacherApporval.vue

@@ -64,7 +64,7 @@
           <el-table-column prop="status" label="" header-align="center" width="250">
             <template scope="scope">
               <el-button type="success" plain @click="isShow(1)">小组详情</el-button>
-              <el-button type="success" @click="isShow(2)">管理员详情</el-button>
+              <el-button type="success" >管理员详情</el-button>
             </template>
           </el-table-column>
 
@@ -89,8 +89,28 @@
       <div class='model-text'>
           <div class="model-manager">
             <div>校区管理员</div>
-            <div><img src="../../assets/img/del@2x.png" alt=""></div>
+            <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(1)"></div>
           </div>
+        <div class="model-items">
+          <div class="model-items-first">
+            <div>
+              <img src="../../assets/img/user.jpg" alt="" class="model-items-first-img">
+              <div class="model-items-first-left">
+                <div>程歌（在线）</div>
+                <div class="model-items-first-left-down">南方科技大学</div>
+              </div>
+            </div>
+            <div>
+              <el-button type="danger" plain round @click="isShow(2)"><i class="el-icon-bottom"></i><span>降级</span></el-button>
+            </div>
+          </div>
+          <div class="model-items-other model-active">批改科目 : 语文、英语</div>
+          <div class="model-items-other">批改年级 : 1～2年级、3～4年级</div>
+          <div class="model-items-other model-active">可批改时间：<el-button type="info" round>周一</el-button></div>
+          <div class="model-items-other">手机号 : 18832340987</div>
+          <div class="model-items-other model-active-last">上次登录时间 : 2019.05.14 18:02</div>
+        </div>
+
       </div>
     </div>
     <!--所有未批改作业-->
@@ -98,26 +118,12 @@
     <div class='model' v-if="isPigai">
       <div class='model-text'>
         <div class="model-text-head">
-          <div>所有未批改作业</div>
+          <div>是否要将程歌老师降级为普通批改老师？</div>
+        </div>
+        <div>
+          <div class="model-btn-items">是</div>
+          <div>是</div>
         </div>
-        <el-table
-          :data="tableData"
-          style="width: 100%">
-          <el-table-column
-            prop="date"
-            label="日期"
-            width="180">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="姓名"
-            width="180">
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="地址">
-          </el-table-column>
-        </el-table>
       </div>
     </div>
   </div>
@@ -192,8 +198,10 @@
         console.log(str)
         if (str == 1){
           _this.hiddenModel = true;
+          _this.isPigai = false;
         } else if (str == 2){
           _this.isPigai = true;
+          _this.hiddenModel = false;
         }
 
       },
@@ -365,10 +373,49 @@
     border-radius:30px;
     text-align: center;
   }
+
+  .model-items-first{
+    padding: 0 34px;
+    display: flex;
+    justify-content: space-between;
+  }
+  .model-items-first-img{
+    width: 68px;
+    height: 68px;
+    border-radius: 8px;
+    position: relative;
+    bottom: 20px;
+  }
+  .model-items-first-left{
+    display: inline-block;
+    color: #393939;
+    font-size: 24px;
+    margin-left: 14px;
+    text-align: left;
+  }
+  .model-items-first-left-down{
+    color: #7E7E7E;
+    font-size: 18px;
+  }
   .model-text{
     background:rgba(255,255,255,1);
     border-radius:10px;
   }
+  .model-items-other{
+    height: 60px;
+    line-height: 60px;
+    color: #393939;
+    font-size: 20px;
+    text-align: left;
+    padding: 0 34px;
+  }
+  .model-active{
+    background-color: #F6F7FB;
+  }
+  .model-active-last{
+    border-radius:0 0 30px 30px;
+    background-color: #F6F7FB;
+  }
   .model-text-head{
     padding: 40px 50px;
     display: flex;
@@ -379,8 +426,29 @@
   .model-manager{
     display: flex;
     justify-content: space-between;
-    margin: 33px;
+    margin: 30px;
     color: #393939;
     font-size: 24px;
   }
+  .model-btn{
+    display: flex;
+    justify-content: space-around;
+  }
+  .model-btn-items{
+    width:154px;
+    height:50px;
+    line-height: 50px;
+    text-align: center;
+    font-size: 18px;
+    border-radius:4px;
+  }
+  .main-gay{
+    background:rgba(246,247,251,1);
+    color: #7E7E7E;
+  }
+  .model-grdeen{
+    background-color: #52CC60;
+    color: #fff;
+  }
+
 </style>

src/permission.js

@@ -2,15 +2,8 @@
 // import store from './store'
 // import { Message } from 'element-ui'
 // import { getToken } from '@/utils/auth' // 验权
-<<<<<<< HEAD
-//
-// const whiteList = ['/login', '/aikmt/redirect_uri'] // 不重定向白名单
-//
-=======
 
 // const whiteList = ['/login', '/aikmt/redirect_uri'] // 不重定向白名单
-
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
 // router.beforeEach((to, from, next) => {
 //   if (getToken()) { // 判断是否有token
 //     // debugger
@@ -50,8 +43,3 @@
 //     }
 //   }
 // })
-<<<<<<< HEAD
-//
-=======
-
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988

src/router/index.js

@@ -29,7 +29,6 @@ export const constantRouterMap =
       name: "微信认证重定向页",
       component: Redirect_uri
     },
-<<<<<<< HEAD
      // {
      //   path: "/super",
      //   component: Super,
@@ -97,47 +96,7 @@ export const constantRouterMap =
        name: "错误页面",
        component: Error
      }
-=======
-    {
-      path: "/home",
-      component: Home,
-      children: [
-        {
-          path: "",
-          redirect: "SchoolManager"
-        },
-        {
-          path: "SchoolManager",
-          name: "SchoolManager",
-          component: SchoolManager,
-          meta: { title: '校区管理员', roles: ['2'] }
-        },
-        {
-          path: "TeacherApporval",
-          name: "TeacherApporval",
-          component: TeacherApporval,
-          meta: { title: '教师审核', roles: ['2'] }
-  
-        },
-         {
-          path: "TeacherPay",
-          name: "TeacherPay",
-          component: TeacherPay,
-          meta: { title: '教师薪酬管理', roles: ['2'] }
-        },
-        {
-          path: "*",
-          name: "找不到页面",
-          component: Error404
-        }
-      ]
-    },
-    {
-      path: "*",
-      name: "错误页面",
-      component: Error
-    }
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
+
   ]
 export default new Router({
   routes: constantRouterMap
@@ -165,21 +124,12 @@ export const asyncRouterMap = [
   //       name: "TeacherApporval",
   //       component: TeacherApporval,
   //       meta: { title: '教师审核', roles: ['2'] }
-<<<<<<< HEAD
-  //
-=======
-
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
   //     },
   //      {
   //       path: "TeacherPay",
   //       name: "TeacherPay",
   //       component: TeacherPay,
-<<<<<<< HEAD
-  //       meta: { title: '教师薪酬管理', roles: ['1'] }
-=======
   //       meta: { title: '教师薪酬管理', roles: ['2'] }
->>>>>>> 06e7345471578d2840ef1d5d498827ac07097988
   //     },
   //     {
   //       path: "*",