提交最新代码

.postcssrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+    "plugins": {
+      "postcss-import": {},
+      "postcss-url": {},
+      // to edit target browsers: use "browserslist" field in package.json
+      "autoprefixer": {},
+      "postcss-pxtorem": { // 此处为添加部分
+        rootValue: 32, // 对应16px 适配移动端750px宽度
+        unitPrecision: 5,
+        propList: ['*'],
+        selectorBlackList: [],
+        replace: true,
+        mediaQuery: false,
+        minPixelValue: 0
+      }
+    }
+  }

package.json

@@ -18,10 +18,11 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^3.8.5",
     "element-ui": "^2.2.2",
-    "js-cookie": "^2.2.0",
     "file-loader": "^1.1.11",
     "html2canvas": "^1.0.0-rc.0",
+    "js-cookie": "^2.2.0",
     "popper.js": "^1.14.7",
+    "postcss-pxtorem": "^4.0.1",
     "qs": "^6.5.1",
     "v-viewer": "^1.4.0",
     "vue": "^2.5.2",

postcss.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+    parser: 'sugarss',
+    plugins: {
+      'postcss-import': {},
+      'postcss-cssnext': {},
+      'cssnano': {}
+    }
+  }

src/App.vue

@@ -27,7 +27,7 @@ export default {
     },
   methods: {
     initWindow() {
-      let whdef = 100 / 1920 // 表示1920的设计图,使用100PX的默认值
+      let whdef = 30 / 1920 // 表示1920的设计图,使用100PX的默认值
       // let wH = window.innerHeight // 当前窗口的高度
       let wW = window.innerWidth // 当前窗口的宽度
       let rem = wW * whdef // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值

src/pages/home/SchoolManager.vue

@@ -15,19 +15,19 @@
       <!--数据监控-->
       <el-col :span="17" class="main" v-if="modelindex == 0">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="2" :offset="1">
+          <el-col :span="3" :offset="1">
             <div class="main-header-item">在线：{{monitorTeacherList.onlineCount}}人</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div class="main-header-item">离线：{{monitorTeacherList.offlineCount}}人</div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="7">
             <div class="main-header-item">
               <span>分配未批改作业：{{monitorTeacherList.unCorrectCount}}份</span>
               <span @click="allocation()" class="main-header-link">去分配</span>
             </div>
           </el-col>
-          <el-col :span="8" :offset="4">
+          <el-col :span="8" :offset="1">
             <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
               <el-select
                 v-model="filters.OptionsValue"
@@ -236,7 +236,7 @@
               <span style="color:red;">{{DayTeacherList.wrongCount}}次</span>
             </div>
           </el-col>
-          <el-col :span="4" :offset="10">
+          <el-col :span="6" :offset="5">
             <!-- <input type="text" placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-new">
             <el-button @click="InfoWatchDay"  type="primary"  icon="el-icon-search"></el-button>-->
             <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
@@ -308,18 +308,18 @@
       <!--当月-->
       <el-col :span="18" class="main" v-if="modelindex == 2">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="5">
+          <el-col :span="6">
             <div class="main-header-item">
               当月报错总次数:
               <span style="color:red;">{{MothTeacherList.totalWrongCount}}次</span>
             </div>
           </el-col>
-          <el-col :span="4" :offset="10">
+          <el-col :span="6" :offset="5">
             <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
               <el-button @click="InfoWatchMoth" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" >
             <div class="block">
               <el-date-picker
                 @change="InfoWatchMoth"
@@ -332,7 +332,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="20" class="main-header">
-          <el-col :span="3" :offset="1">
+          <el-col :span="4" :offset="1">
             <div class="main-header-item">月出勤率：{{MothTeacherList.totalAttendanceRate}}</div>
           </el-col>
           <!-- <el-col :span="4">
@@ -341,7 +341,7 @@
           <el-col :span="4">
             <div class="main-header-item">批改总张数：{{MothTeacherList.totalHomeworkPicCount }}</div>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <div class="main-header-item">批改平均时间：{{MothTeacherList.totalAvgTime}}</div>
           </el-col>
           <el-col :span="4">
@@ -612,7 +612,7 @@
           <div class="model-items-other model-active">
             可批改时间:
             <div class="buttonAppoval"  v-show="arrPeriod.length >= 0">
-              <el-button type="info" round v-for="(v, k) of arrPeriod" :key="k">{{v}}</el-button>
+              <el-button type="info" size="mini" round v-for="(v, k) of arrPeriod" :key="k">{{v}}</el-button>
             </div>
           </div>
           <div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
@@ -1353,7 +1353,7 @@ el-table {
   color: #fff;
 }
 .el-input__inner {
-  height: 32px;
+  /* height: 32px; */
 }
 
 .table-img {
@@ -1445,7 +1445,7 @@ el-table {
   /* height: 30px; */
 }
 .width40 {
-  width: 60px;
+  width: 100px;
 }
 .tr-sw180 {
   width: 230px;
@@ -1458,7 +1458,7 @@ el-table {
   width: 280px;
 }
 .tr-w120 {
-  width: 160px;
+  width: 200px;
   text-align: left;
   display: inline-block;
   /*height: 80px;*/
@@ -1563,6 +1563,8 @@ el-table {
 .buttonAppoval {
   display: inline-block;
 }
+.el-button.is-round{
+}
 .model-items-left-top {
   display: flex;
   justify-content: space-between;

src/pages/super/SchoolManager.vue

@@ -15,19 +15,19 @@
       <!--数据监控-->
       <el-col :span="17" class="main" v-if="modelindex == 0">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="2" :offset="1">
+          <el-col :span="3" :offset="1">
             <div class="main-header-item">在线：{{monitorTeacherList.onlineCount}}人</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div class="main-header-item">离线：{{monitorTeacherList.offlineCount}}人</div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="7">
             <div class="main-header-item">
               <span>分配未批改作业：{{monitorTeacherList.unCorrectCount}}份</span>
               <span @click="allocation()" class="main-header-link">去分配</span>
             </div>
           </el-col>
-          <el-col :span="8" :offset="4">
+          <el-col :span="8" :offset="1">
             <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
               <el-select
                 v-model="filters.OptionsValue"
@@ -343,7 +343,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="20" class="main-header">
-          <el-col :span="3" :offset="1">
+          <el-col :span="4" :offset="1">
             <div class="main-header-item">月出勤率：{{MothTeacherList.totalAttendanceRate}}</div>
           </el-col>
           <!-- <el-col :span="4">
@@ -352,7 +352,7 @@
           <el-col :span="4">
             <div class="main-header-item">批改总张数：{{MothTeacherList.totalHomeworkPicCount}}</div>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <div class="main-header-item">批改平均时间：{{MothTeacherList.totalAvgTime}}</div>
           </el-col>
           <el-col :span="4">
@@ -1718,7 +1718,7 @@ ul {
   text-align: center;
 }
 .width40 {
-  width: 60px;
+  width: 100px;
 }
 .tr-secondsA {
   text-align: center;
@@ -1727,7 +1727,7 @@ ul {
   width: 280px;
 }
 .tr-w120 {
-  width: 160px;
+  width: 200px;
   text-align: left;
 }
 .tr-second-check {