提交代码

src/pages/Home.vue

@@ -1,22 +1,22 @@
 <template>
   <el-row class="height100">
-    <el-col :span="24" class="height100">
-      <div class="height100 conterLayout">
+    <el-col :span="24" class="">
+      <div class="conterLayout">
         <div class="main_header">
-         <MenuComponent></MenuComponent>
-          <div class="main_header_user">
-            <el-dropdown @command="handleCommand">
-              <div class="el-dropdown-link" style="position: relative;cursor: pointer;">
-                <span style="margin-right:30px; font-size: .14rem;"> {{name}} </span>
-                <i class="el-icon-caret-right"></i>
-               <span class="out">退出</span>
-              </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="modifyPwd">修改密码</el-dropdown-item>
-                <el-dropdown-item command="logDown" divided>退出登录</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
+          <MenuComponent></MenuComponent>
+          <!--<div class="main_header_user">-->
+          <!--<el-dropdown @command="handleCommand">-->
+          <!--<div class="el-dropdown-link" style="position: relative;cursor: pointer;">-->
+          <!--<span style="margin-right:30px; font-size: .14rem;"> {{getUser.name}} </span>-->
+          <!--&lt;!&ndash;<i class="el-icon-caret-right"></i>&ndash;&gt;-->
+          <!--<span class="out">退出</span>-->
+          <!--</div>-->
+          <!--<el-dropdown-menu slot="dropdown">-->
+          <!--<el-dropdown-item command="modifyPwd">修改密码</el-dropdown-item>-->
+          <!--<el-dropdown-item command="logDown" divided>退出登录</el-dropdown-item>-->
+          <!--</el-dropdown-menu>-->
+          <!--</el-dropdown>-->
+          <!--</div>-->
         </div>
         <div class="main_conter">
           <router-view></router-view>
@@ -26,262 +26,262 @@
   </el-row>
 </template>
 <script type="es6">
-import NavMenuComponent from "@/components/NavMenuComponent";
-import MenuComponent from "@/components/MenuComponent";
-import UserInfoView from "@/components/UserInfoView";
-import { mapGetters, mapActions } from "vuex";
-export default {
-  components: { NavMenuComponent, UserInfoView, MenuComponent },
-  name: "home", 
-  data() {
-    return {
-      userImgPath: "",
-      filters: {
-        activitySerachListen: 0,
-        timeFrame: []
+  import NavMenuComponent from "@/components/NavMenuComponent";
+  import MenuComponent from "@/components/MenuComponent";
+  import UserInfoView from "@/components/UserInfoView";
+  import { mapGetters, mapActions } from "vuex";
+  export default {
+    components: { NavMenuComponent, UserInfoView, MenuComponent },
+    name: "home",
+    data() {
+      return {
+        userImgPath: "",
+        filters: {
+          activitySerachListen: 0,
+          timeFrame: []
+        },
+        filterstwo: {
+          activityMonitoringListen: 0,
+          timeType: "0",
+          timeFrame: []
+        },
+        name: "在线人员管理CRM",
+        userName: "超级管理员",
+        // 菜单相关
+        router: true,
+        navHeight: 0,
+        navsData: [],
+        breadcrumb: "",
+        // 修改密码
+        modifyPwdFormRules: {
+          oldPassword: [
+            { required: true, message: "密码不能为空", trigger: "blur" },
+            { min: 5, message: "密码长度不能小于6", trigger: "blur" },
+            { max: 18, message: "密码长度不能大于18", trigger: "blur" }
+          ],
+          newPassword: [
+            { required: true, message: "新密码不能为空", trigger: "blur" },
+            { min: 5, message: "新密码长度不能小于6", trigger: "blur" },
+            { max: 18, message: "新密码长度不能大于18", trigger: "blur" }
+          ],
+          newPassword2: {
+            validator: (rule, value, callback) => {
+              if (value === "") {
+                callback(new Error("请再次输入密码"));
+              } else if (value !== this.modifyPwdForm.newPassword) {
+                callback(new Error("两次输入密码不一致!"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur"
+          }
+        },
+        modifyPwdForm: { oldPassword: "", newPassword: "" },
+        userModifyPwdVisible: false,
+        modifyPwdFormLoading: false,
+
+      };
+    },
+    watch: {
+    },
+    computed: {
+      ...mapGetters(["getUser", "getAtivityTimeFrameData"])
+    },
+    // async beforeCreate() {
+    //   let {
+    //     success,
+    //     permissionsMap
+    //   } = await this.$dao.sysDao.findPagePermissions();
+    //   if (success) this.setPagePermissions(permissionsMap);
+    //   // 判断用户是否登录
+    //   if (sessionStorage.user === undefined) {
+    //     this.$router.push("/");
+    //     return this.$message("请先登录!");
+    //   }
+    //   let menuList = this.$dao.sysDao.getMenuList();
+    //   if (menuList.length < 1) {
+    //     this.$router.push("/");
+    //   }
+    //   this.navsData = menuList;
+    //   this.twoMenu = this.$util.twoMenu(menuList);
+    // },
+    methods: {
+      ...mapActions([
+      ]),
+      ...mapGetters([""]),
+      // 修改密码框显示
+      userModifyPwdShow() {
+        const self = this;
+        self.userAddFormLoading = false;
+        self.userModifyPwdVisible = true;
+        self.modifyPwdForm = { oldPassword: "", newPassword: "" };
       },
-      filterstwo: {
-        activityMonitoringListen: 0,
-        timeType: "0",
-        timeFrame: []
+      // 修改密码提交
+      userModifyPwdSubmit() {
+        const self = this;
+        self.$refs.modifyPwdForm.validate(async valid => {
+          if (!valid) return false;
+          self.userAddFormLoading = true;
+          let data = {
+            oldPassword: self.modifyPwdForm.oldPassword,
+            newPassword: self.modifyPwdForm.newPassword
+          };
+          let { success } = await self.$dao.sysDao.userModifyPwd(data);
+          if (success) {
+            self.userModifyPwdVisible = false;
+            self.$util.messageMethod("success", "修改密码成功!");
+          }
+          self.userAddFormLoading = false;
+        });
       },
-      name: "在线人员管理CRM",
-      userName: "超级管理员",
-      // 菜单相关
-      router: true,
-      navHeight: 0,
-      navsData: [],
-      breadcrumb: "",
-      // 修改密码
-      modifyPwdFormRules: {
-        oldPassword: [
-          { required: true, message: "密码不能为空", trigger: "blur" },
-          { min: 5, message: "密码长度不能小于6", trigger: "blur" },
-          { max: 18, message: "密码长度不能大于18", trigger: "blur" }
-        ],
-        newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 5, message: "新密码长度不能小于6", trigger: "blur" },
-          { max: 18, message: "新密码长度不能大于18", trigger: "blur" }
-        ],
-        newPassword2: {
-          validator: (rule, value, callback) => {
-            if (value === "") {
-              callback(new Error("请再次输入密码"));
-            } else if (value !== this.modifyPwdForm.newPassword) {
-              callback(new Error("两次输入密码不一致!"));
-            } else {
-              callback();
-            }
-          },
-          trigger: "blur"
+      //  账号管理、退出登录
+      handleCommand(command) {
+        const self = this;
+        if (command === `logDown`) {
+          this.$confirm("您确定退出吗?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              this.$dao.logout();
+              this.$router.replace("/");
+              this.$util.messageMethod("success", "退出成功!");
+              // location.reload()
+            })
+            .catch(() => {
+              // console.log(err)
+              self.$message("已取消操作!");
+            });
+        } else if (command === `modifyPwd`) {
+          // self.$router.replace('/accountManagement')
+          self.userModifyPwdShow();
+        } else if (command === `accountManagement`) {
+          self.$router.replace("/accountManagement");
         }
       },
-      modifyPwdForm: { oldPassword: "", newPassword: "" },
-      userModifyPwdVisible: false,
-      modifyPwdFormLoading: false,
-    
-    };
-  },
-  watch: {
-  },
-  computed: {
-    ...mapGetters(["getUser", "getAtivityTimeFrameData"])
-  },
-  // async beforeCreate() {
-  //   let {
-  //     success,
-  //     permissionsMap
-  //   } = await this.$dao.sysDao.findPagePermissions();
-  //   if (success) this.setPagePermissions(permissionsMap);
-  //   // 判断用户是否登录
-  //   if (sessionStorage.user === undefined) {
-  //     this.$router.push("/");
-  //     return this.$message("请先登录!");
-  //   }
-  //   let menuList = this.$dao.sysDao.getMenuList();
-  //   if (menuList.length < 1) {
-  //     this.$router.push("/");
-  //   }
-  //   this.navsData = menuList;
-  //   this.twoMenu = this.$util.twoMenu(menuList);
-  // },
-  methods: {
-    ...mapActions([
-    ]),
-    ...mapGetters([""]),
-    // 修改密码框显示
-    userModifyPwdShow() {
-      const self = this;
-      self.userAddFormLoading = false;
-      self.userModifyPwdVisible = true;
-      self.modifyPwdForm = { oldPassword: "", newPassword: "" };
-    },
-    // 修改密码提交
-    userModifyPwdSubmit() {
-      const self = this;
-      self.$refs.modifyPwdForm.validate(async valid => {
-        if (!valid) return false;
-        self.userAddFormLoading = true;
-        let data = {
-          oldPassword: self.modifyPwdForm.oldPassword,
-          newPassword: self.modifyPwdForm.newPassword
-        };
-        let { success } = await self.$dao.sysDao.userModifyPwd(data);
-        if (success) {
-          self.userModifyPwdVisible = false;
-          self.$util.messageMethod("success", "修改密码成功!");
-        }
-        self.userAddFormLoading = false;
-      });
+      //  路由切换
+      // routerDataPath() {
+      //   const path = this.$route.path;
+      //   if (this.dashboard.indexOf(path) !== -1) this.activeName = path;
+      //   if (path !== "/accountManagement") {
+      //     return path;
+      //   } else {
+      //     return "";
+      //   }
+      // }
     },
-    //  账号管理、退出登录
-    handleCommand(command) {
-      const self = this;
-      if (command === `logDown`) {
-        this.$confirm("您确定退出吗?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.$dao.logout();
-            this.$router.replace("/");
-            this.$util.messageMethod("success", "退出成功!");
-            // location.reload()
-          })
-          .catch(() => {
-            // console.log(err)
-            self.$message("已取消操作!");
-          });
-      } else if (command === `modifyPwd`) {
-        // self.$router.replace('/accountManagement')
-        self.userModifyPwdShow();
-      } else if (command === `accountManagement`) {
-        self.$router.replace("/accountManagement");
-      }
-    },
-    //  路由切换
-    // routerDataPath() {
-    //   const path = this.$route.path;
-    //   if (this.dashboard.indexOf(path) !== -1) this.activeName = path;
-    //   if (path !== "/accountManagement") {
-    //     return path;
-    //   } else {
-    //     return "";
-    //   }
-    // }
-  },
-  mounted() {
-    // this.userImgPath = this.getUser.imagePath;
-    this.breadcrumb = this.$route.name;
-    // this.$nextTick(() => {
-    //   this.navHeight =
-    //     document.body.clientHeight - this.$refs.logoUser.offsetHeight;
-    // });
-  }
-};
+    mounted() {
+      // this.userImgPath = this.getUser.imagePath;
+      this.breadcrumb = this.$route.name;
+      // this.$nextTick(() => {
+      //   this.navHeight =
+      //     document.body.clientHeight - this.$refs.logoUser.offsetHeight;
+      // });
+    }
+  };
 </script>
 
 <style scoped>
-.out{
-  margin-left:10px;
-  color:#333333;
-}
-.navlink{
-  float:left;
-  margin-right:24px;
-  color:#999999 ;
-  font-size: 9px;
-}
-.menu {
-  /* overflow-y: auto; */
-  position: relative;
-  z-index: 1;
-  background-color: #00253f;
-  box-shadow: 3px 0px 7px #cfcfcf;
-}
-.logoUser {
-  position: relative;
-  width: 100%;
-  color: #fff;
-  border-bottom: 1px solid #001625;
-}
-.logoImg {
-  padding: 0.2rem;
-}
-.logoImg > img {
-  display: inline-block;
-  width: 1.8rem;
-  height: 0.38rem;
-}
-.logoImg > h2 {
-  font-size: 0.14rem;
-  color: #82b5d7;
-}
-.userImg {
-  display: inline-block;
-  height: 0.9rem;
-  width: 0.9rem;
-  border: 2px solid #00c1de;
-}
-.userImg,
-.userImg > img {
-  border-radius: 50%;
-}
-.userTitle > p {
-  margin: 0.1rem 0;
-  font-size: 0.16rem;
-  color: #6e828a;
-}
-.userAdmin {
-  display: inline-block;
-  margin-bottom: 0.35rem;
-  padding: 0 0.14rem;
-  height: 0.25rem;
-  background-color: #37bf5b;
-  border-radius: 0.1rem;
-}
-.userAdmin > span {
-  font-size: 0.12rem;
-  color: #def0e3;
-  line-height: 0.2rem;
-}
-.conterLayout {
-  padding: 5px;
-  background-color: #eef1f6;
-  overflow-y: auto;
-}
-.main_header {
-  display: flex;
-  position: relative;
-  height: 50px;
-  line-height: 50px;
-  background-color: #fff;
-  box-shadow: 0px 0px 20px #eaeaea;
-}
-.main_header .el-breadcrumb {
-  line-height: 50px;
-}
-.el-breadcrumb .el-breadcrumb__item {
-  padding-top: 13px;
-  line-height: 26px;
-  font-size: 18px;
-}
-.main_header_user {
-  position: absolute;
-  right: 30px;
-}
-.main_header_user .el-dropdown {
-  color: #333333;
-}
-.main_header_user .el-icon-caret-right {
-  transform: rotate(43deg);
-  position: absolute;
-  right: 30px;
-  bottom: 16px;
-}
-.ativityTimeFrame .el-radio {
-  margin-left: 15px;
-}
+  .out{
+    margin-left:10px;
+    color:#333333;
+  }
+  .navlink{
+    float:left;
+    margin-right:24px;
+    color:#999999 ;
+    font-size: 9px;
+  }
+  .menu {
+    /* overflow-y: auto; */
+    position: relative;
+    z-index: 1;
+    background-color: #00253f;
+    box-shadow: 3px 0px 7px #cfcfcf;
+  }
+  .logoUser {
+    position: relative;
+    width: 100%;
+    color: #fff;
+    border-bottom: 1px solid #001625;
+  }
+  .logoImg {
+    padding: 0.2rem;
+  }
+  .logoImg > img {
+    display: inline-block;
+    width: 1.8rem;
+    height: 0.38rem;
+  }
+  .logoImg > h2 {
+    font-size: 0.14rem;
+    color: #82b5d7;
+  }
+  .userImg {
+    display: inline-block;
+    height: 0.9rem;
+    width: 0.9rem;
+    border: 2px solid #00c1de;
+  }
+  .userImg,
+  .userImg > img {
+    border-radius: 50%;
+  }
+  .userTitle > p {
+    margin: 0.1rem 0;
+    font-size: 0.16rem;
+    color: #6e828a;
+  }
+  .userAdmin {
+    display: inline-block;
+    margin-bottom: 0.35rem;
+    padding: 0 0.14rem;
+    height: 0.25rem;
+    background-color: #37bf5b;
+    border-radius: 0.1rem;
+  }
+  .userAdmin > span {
+    font-size: 0.12rem;
+    color: #def0e3;
+    line-height: 0.2rem;
+  }
+  .conterLayout {
+    background-color: #eef1f6;
+    width: 100%;
+    height: 100%;
+  }
+  .main_header {
+    display: flex;
+    position: relative;
+    height: 110px;
+    line-height: 110px;
+    background-color: #fff;
+    box-shadow: 0px 0px 20px #eaeaea;
+  }
+  .main_header .el-breadcrumb {
+    line-height: 50px;
+  }
+  .el-breadcrumb .el-breadcrumb__item {
+    padding-top: 13px;
+    line-height: 26px;
+    font-size: 18px;
+  }
+  .main_header_user {
+    position: absolute;
+    right: 30px;
+  }
+  .main_header_user .el-dropdown {
+    color: #333333;
+  }
+  .main_header_user .el-icon-caret-right {
+    transform: rotate(43deg);
+    position: absolute;
+    right: 30px;
+    bottom: 16px;
+  }
+  .ativityTimeFrame .el-radio {
+    margin-left: 15px;
+  }
 </style>

src/pages/home/SchoolManager.vue

@@ -1,259 +1,602 @@
 <!-- 活动解析 -->
 <template>
-  <div style="text-align: left">
-    <!-- 筛选 -->
-    <div class="all_select">
-      <h2 class="all_title" style="display: none">
-        <div class="all_dot"></div>
-        <p style="font-size: 16px">查询条件</p>
-      </h2>
+  <div>
 
-      <el-form :inline="true" size="small" :model="filters" class="form_style" ref="filterForm">
-       <el-form-item label="活动名称：">
-          <el-input @blur="filters.actvNm=filters.actvNm.trim()"
-            v-model="filters.actvNm" @keyup.enter.native="keyCodeMethod($event)">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="活动类型：">
-          <el-cascader
-            clearable
-            :props="{value:'typeId',label:'typeName',children:'children'}"
-            change-on-select
-            :options="actvTypeList"
-            v-model="filtersActvType"
-            @change="actvTypeChange">
-          </el-cascader>
-        </el-form-item>        
-       <el-form-item label="创建人：">
-          <el-select v-model="filters.actvCrtUserId"  @keyup.enter.native="keyCodeMethod($event)" filterable clearable placeholder="请选择">
-             <el-option
-              v-for="(item, index) in userNameList"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>  
-        <el-form-item  label="创建时间：">
-          <el-date-picker
-            v-model="createDateSlot"
-            @change="changeDateSlot"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="timestamp"
-            >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" style="width:80px" @click="itemListReshow">查询</el-button>
-          <el-button type="primary" style="width:80px" @click="clearSearch">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <!--&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>-->
 
     <!-- table 表格 -->
-    <div class="all_table">
+    <el-row :gutter="20" class="main-header" >
+      <el-col class="aside" :span="4" :offset="1" style="padding: 0 !important;">
+        <div class="table-aside" v-for='(v, k) in ItemList' :key='k' :class="{active:k == checkindex}" @click="selectTitle(k)">{{v.text}}</div>
+      </el-col>
+      <!--数据监控-->
+      <el-col :span="18" class="main" v-if="checkindex == 0">
+        <el-row :gutter="20" class="main-header">
+          <el-col :span="3"><div class="main-header-item" @click="isShow(1)">在线：6人</div></el-col>
+          <el-col :span="3"><div class="main-header-item" @click="isShow(2)">离线：26人</div></el-col>
+          <el-col :span="4"><div class="main-header-item"><span>离线：26人</span><a href="" class="main-header-link" >去分配</a></div></el-col>
+          <el-col :span="10" :offset="4">
+            <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-select>
+              <el-select v-model="select" slot="prepend" placeholder="选科目" minlength="20">
+                <el-option label="数学" value="1"></el-option>
+              </el-select>
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </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>
 
-      <h2 class="all_title">
-        <div class="all_dot"></div>
-        <p style="font-size: 16px">活动解析列表</p>
-      </h2>
-      
-      <!-- table -->
-      <el-table 
-        :data="ItemList"
-        highlight-current-row
-        v-loading="listLoading"
-        @sort-change="sortChange"
-        :default-sort="{prop: filters.orderField, order: filters.orderAD}"
-        size="mini"
-        border 
-        stripe
-        row-key="nodId"
-        :expand-row-keys="expandRowKeys"
-        @expand-change="expandChange"
-        class="table_item"
-        ref="showTable"
+        </el-table>
+      </el-col>
+      <!--当天-->
+      <el-col :span="18" class="main" v-if="checkindex == 1">
+        <el-row :gutter="20" class="main-header">
+          <el-col :span="5"><div class="main-header-item" @click="isShow(1)">今日报错总次数:：6人</div></el-col>
+          <el-col :span="10" :offset="5">
+            <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-select>
+              <el-select v-model="select" slot="prepend" placeholder="选科目" minlength="20">
+                <el-option label="数学" value="1"></el-option>
+              </el-select>
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-col>
+          <el-col :span="4">
+            <i class="el-icon-d-arrow-left"></i>
+            <span class="today-time">2019-02-04</span>
+            <i class="el-icon-d-arrow-right"></i>
+          </el-col>
+        </el-row>
+        <el-table
+          :data="dataList"
+          highlight-current-row
+          size="mini"
+          stripe
         >
-          <el-table-column 
-            prop="actvNm"
-            label="活动名称"
-            sortable
+          <el-table-column
+            label="头像"
             header-align="center"
-            show-overflow-tooltip
-            align="left"
-            ></el-table-column>
-          <el-table-column 
-            prop="actvTypeName"
-            label="活动类型"
+          >
+            <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"
-            show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                  <span>{{scope.row.actvTypeName | toActvTypeName(scope.row.actvSmallTypeName) }}</span>
-              </template>
-            </el-table-column>
-          <el-table-column 
-            prop="actvOrg"
-            label="活动机构"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="number"
+            label="被报错"
             header-align="center"
-            >
-              <template slot-scope="scope">
-                  {{ actvOrgTypesMap[scope.row.actvOrg] }}
-              </template>
-            </el-table-column> 
-          <el-table-column 
-            prop="nodeName"
-            label="节点名称"
-            sortable
+          ></el-table-column>
+          <el-table-column
+            prop="time"
+            label="科目"
+            header-align="center">
+          </el-table-column>
+          <el-table-column
+            prop="allTime"
+            label="批改总份数"
             header-align="center"
-            show-overflow-tooltip
-            align="left"
-            ></el-table-column>
-          <el-table-column 
-            prop="actvCrtUserName" 
-            label="创建人"
-            width="120" 
-            sortable 
+          >
+          </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-column
+            prop="status"
+            label="出勤"
+            header-align="center"></el-table-column>
+
+        </el-table>
+      </el-col>
+      <!--当月-->
+      <el-col :span="18" class="main" v-if="checkindex == 2">
+        <el-row :gutter="20" class="main-header">
+          <el-col :span="5"><div class="main-header-item" @click="isShow(1)">当月报错总次数：6人</div></el-col>
+          <el-col :span="10" :offset="5">
+            <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-select>
+              <el-select v-model="select" slot="prepend" placeholder="选科目" minlength="20">
+                <el-option label="数学" value="1"></el-option>
+              </el-select>
+              <el-button slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-col>
+          <el-col :span="4">
+            <i class="el-icon-d-arrow-left"></i>
+            <span class="today-time">2019-02-04</span>
+            <i class="el-icon-d-arrow-right"></i>
+          </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="createDate"
-            label="创建时间"
-            width="170" 
-            sortable 
+          <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-column
+            prop="status"
+            label="满意度"
+            header-align="center"></el-table-column>
+          <el-table-column
+            prop="status"
+            label="平均批改时间"
+            header-align="center"></el-table-column>
+          <el-table-column
+            prop="status"
+            label="出勤率"
             header-align="center"></el-table-column>
-      </el-table>
 
+        </el-table>
+      </el-col>
       <!-- 分页显示 -->
-      <el-pagination
-        background
-        class="all_pagination"
-        @size-change="handleSizeChange"
-        @current-change="pageChange"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="10"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="filters.count">
-      </el-pagination>
+      <!--<el-pagination-->
+      <!--background-->
+      <!--class="all_pagination"-->
+      <!--@size-change="handleSizeChange"-->
+      <!--@current-change="pageChange"-->
+      <!--:page-sizes="[10, 20, 30, 40]"-->
+      <!--:page-size="10"-->
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
+      <!--:total="filters.count">-->
+      <!--</el-pagination>-->
+    </el-row>
+
+    <!--可分配老师-->
+    <div class='showModel' @click="allShowModel(1)" v-if="hiddenModel"></div>
+    <div class='model' v-if="hiddenModel">
+      <div class='model-text'>
+        <div class="model-text-head">
+          <div>可分配老师</div>
+          <div>二年级数学</div>
+        </div>
+        <div class="model-items">
+          <div class="model-items-left">
+            <div class="model-items-left-top">
+              <div>
+                <img src="../../assets/img/user.jpg" alt="" class="model-items-left-top-img">
+                <div style="display: inline-block">
+                  <div style="font-size: 24px">李大柱</div>
+                  <div class="model-items-left-top-number">等待学生：0</div>
+                </div>
+              </div>
+              <div> <el-button type="success">分配</el-button></div>
+            </div>
+          </div>
+          <div class="model-items-left">
+            <div class="model-items-left-top">
+              <div>
+                <img src="../../assets/img/user.jpg" alt="" class="model-items-left-top-img">
+                <div style="display: inline-block">
+                  <div style="font-size: 24px">李大柱</div>
+                  <div class="model-items-left-top-number">等待学生：0</div>
+                </div>
+              </div>
+              <div> <el-button type="success">分配</el-button></div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+    <!--所有未批改作业-->
+    <div class='showModel' @click="allShowModel(2)" v-if="isPigai"></div>
+    <div class='model' v-if="isPigai">
+      <div class='model-text'>
+        <div class="model-text-head">
+          <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>
 </template>
 <script>
-import { mapGetters, mapActions } from "vuex";
-export default {
-  components: { },
-  name: "actvResolveLabel",
-  props: {},
-  data() {
-    return {
-      listLoading: false,
-      ItemList: [],
-      actvTypeList: [],
-      userNameList: [],
-      createDateSlot: [],
-      actvOrgTypesMap: {},
-      expandRowKeys: [],
-      filtersActvType: [],
-      filters: {
-        actvNm: "",
-        actvCrtUserId: "",
-        actvType: "",
-        actvSmallType: "",
-        // 排序
-        pageNo: 1,
-        pageSize: 10,
-        count: 0,
-        orderField: "",
-        orderAD: ""
-      }
-    };
-  },
-  watch: {},
-  computed: {
-    ...mapGetters(["getUser"])
-  },
-  methods: {
-    ...mapActions(["setUser"]),
-    //  输入框按键方法
-    keyCodeMethod(e) {
-      if (e.keyCode === 13) return this.itemListReshow();
-    },
-    expandChange(row, expandRows) {
-      for (let item of expandRows) {
-        if (row === item) {
-          this.expandRowKeys = [row.nodId];
+  import { mapGetters, mapActions } from "vuex";
+  export default {
+    components: { },
+    name: "actvResolveLabel",
+    props: {},
+    data() {
+      return {
+        checkindex: 0,
+        hiddenModel:false,
+        isPigai:false,
+        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: "",
+          // 排序
+          pageNo: 1,
+          pageSize: 10,
+          count: 0,
+          orderField: "",
+          orderAD: ""
         }
-      }
-    },
-    // 分页
-    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;
-      }
-    },
-    actvTypeChange(typeList) {
-      switch (typeList.length) {
-        case 1:
-          this.filters.actvType = typeList[0];
-          this.filters.actvSmallType = null;
-          break;
-        case 2:
-          this.filters.actvType = null;
-          this.filters.actvSmallType = typeList[1];
-          break;
-        default:
-          this.filters.actvType = null;
-          this.filters.actvSmallType = null;
-          break;
-      }
+      };
     },
-    handleSizeChange(val) {
-      this.filters.pageSize = val;
-      this.itemListReshow();
+    watch: {},
+    computed: {
+      ...mapGetters(["getUser"])
     },
-    // 排序
-    sortChange(sort) {
-      this.filters.orderField = sort.prop;
-      this.filters.orderAD = sort.order != null ? sort.order : "";
-      this.itemListReshow();
-    },
-    clearSearch() {
-      this.filters.actvNm = null;
-      this.filters.actvCrtUserId = null;
-      this.filters.actvType = null;
-      this.filters.actvSmallType = null;
-      this.filtersActvType = [];
-      this.createDateSlot = null;
+    methods: {
+      ...mapActions(["setUser"]),
+      selectTitle(k) {
+        console.log(k);
+        this.checkindex = k;
+      },
+      isShow(str){
+        let _this = this;
+        console.log(str)
+        if (str == 1){
+          _this.hiddenModel = true;
+        } else if (str == 2){
+          _this.isPigai = true;
+        }
+
+      },
+      //关闭弹框
+      allShowModel(str) {
+        let _this = this;
+        if (str == 1){
+          _this.hiddenModel = false;
+        } else if (str == 2){
+          _this.isPigai = false;
+        }
+      },
+      //  输入框按键方法
+      keyCodeMethod(e) {
+        if (e.keyCode === 13) return this.itemListReshow();
+      },
+      expandChange(row, expandRows) {
+        for (let item of expandRows) {
+          if (row === item) {
+            this.expandRowKeys = [row.nodId];
+          }
+        }
+      },
+      // 分页
+      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;
+        }
+      },
+      actvTypeChange(typeList) {
+        switch (typeList.length) {
+          case 1:
+            this.filters.actvType = typeList[0];
+            this.filters.actvSmallType = null;
+            break;
+          case 2:
+            this.filters.actvType = null;
+            this.filters.actvSmallType = typeList[1];
+            break;
+          default:
+            this.filters.actvType = null;
+            this.filters.actvSmallType = null;
+            break;
+        }
+      },
+      handleSizeChange(val) {
+        this.filters.pageSize = val;
+        this.itemListReshow();
+      },
+      // 排序
+      sortChange(sort) {
+        this.filters.orderField = sort.prop;
+        this.filters.orderAD = sort.order != null ? sort.order : "";
+        this.itemListReshow();
+      },
+      clearSearch() {
+        this.filters.actvNm = null;
+        this.filters.actvCrtUserId = null;
+        this.filters.actvType = null;
+        this.filters.actvSmallType = null;
+        this.filtersActvType = [];
+        this.createDateSlot = null;
+      },
+      // 获取创建人列表
+      // async getUserNameList() {
+      //   let {
+      //     userNameList = []
+      //   } = await this.$dao.actv.marketActDao.getUserNameList();
+      //   this.userNameList = userNameList || [];
+      //   let { list = [] } = await this.$dao.bsnsActvTypeAllList();
+      //   this.actvTypeList = list || [];
+      // }
     },
-    // 获取创建人列表
-    // async getUserNameList() {
-    //   let {
-    //     userNameList = []
-    //   } = await this.$dao.actv.marketActDao.getUserNameList();
-    //   this.userNameList = userNameList || [];
-    //   let { list = [] } = await this.$dao.bsnsActvTypeAllList();
-    //   this.actvTypeList = list || [];
-    // }
-  },
-  mounted() {
-    // this.getsetDictByType2();
-    // this.getUserNameList();
-    // this.itemListReshow();
-  }
-};
+    mounted() {
+      // this.getsetDictByType2();
+      // this.getUserNameList();
+      // this.itemListReshow();
+    }
+  };
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
+  .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-header{
+    color: #393939;
+
+    text-align: center;
+    line-height: 80px;
+    border-bottom: 1px solid #E5E5E5;
+  }
+  .main-header-item{
+    font-size: 20px;
+  }
+  .main-header-link{
+    color: #52CC60;
+    font-size: 18px;
+    margin-left: 10px;
+  }
+  .el-select{
+    width: 100px;
+    margin: 0 5px;
+  }
+  .input-with-select .el-input-group__prepend {
+    background-color: #fff;
+  }
+  .active{
+    background-color: #52CC60;
+    color: #fff;
+  }
+  .el-input__inner{
+    height: 32px;
+  }
+  .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;
+  }
 </style>