Browse Source

提交最新代码

TheLittlePrince 6 years ago
parent
commit
04f8cad2ec

+ 2 - 0
index.html

@@ -4,6 +4,8 @@
 <head>
   <meta charset="utf-8">
   <title>私塾家作业批改后台</title>
+  <link rel=icon href=/favicon.ico>
+  <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
   <!-- <meta name="viewport" content="width=1920, target-densityDpi=device-dpi, user-scalable=no"> -->
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />  -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

+ 1 - 0
src/App.vue

@@ -33,6 +33,7 @@ export default {
       let rem = wW * whdef // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值
       let html = document.getElementsByTagName('html')[0]
       html.style.fontSize = rem + 'px'
+      console.log(html.style.fontSize)
     }
   },
   mounted() {

BIN
src/assets/iconfont/favicon.ico


+ 88 - 160
src/pages/Login.vue

@@ -1,5 +1,5 @@
-<template>
-<div class="bodyImg">
+
+<!-- <div class="bodyImg">
 <div class="container">
     <div class="log-paper">
       <img src="../assets/img/Land_sbg.png">
@@ -9,11 +9,28 @@
       <div class="log-text">欢迎登陆私塾家在线人员管理后台</div>
       <div @click="WxLoginCtl" class="log-qrcode">
         <div id="login_container"></div>
-        <!-- <img class="log-qrcode-image" src="../assets/img/ssj_qrcode.png"> -->
       </div>
     </div>
   </div>
-</div>
+</div> -->
+<template>
+  <div class="login" style=" min-width: 650px!important;">
+    <div class="login-paper">
+      <img src="../assets/img/Land_bg.png">
+    </div>
+    <div class="login-content">
+      <div class="img">
+        <img src="../assets/img/Land_sbg.png">
+      </div>
+      <div class="section">
+        <img class="section-icon" src="../assets/img/log.png">
+        <div class="log-text section-text">欢迎登陆私塾家在线人员管理后台</div>
+        <div @click="WxLoginCtl" class="log-qrcode">
+          <div class="section-qrcode" id="login_container"></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -47,7 +64,7 @@ export default {
         let WxCode = unionid;
         this.WxCode = WxCode;
         localStorage.setItem("unionid", this.WxCode);
-            console.log("获取unionid" + this.WxCode);
+        console.log("获取unionid" + this.WxCode);
         this.$store.dispatch("UnionidLogin", {
           unionid: this.WxCode
         });
@@ -63,10 +80,10 @@ export default {
           code: this.WxCode
         });
         // 清除重定向url中参数ocde,
-      window.history.replaceState({}, "", `${location.pathname}`);
-      console.log(location.pathname)
+        window.history.replaceState({}, "", `${location.pathname}`);
+        console.log(location.pathname);
       }
-      return
+      return;
     }
   },
   mounted() {
@@ -85,157 +102,68 @@ export default {
   }
 };
 </script>
-
-<style scoped>
-body {
-  background-image: url(../assets/img/Land_bg.png);
-  background-size: 100% auto;
-}
-.bodyImg{
-   background-image: url(../assets/img/Land_bg.png);
-  background-size: 100% auto;
-  height: 1000px!important;
-}
-.container {
-    max-height: 70%;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  -moz-transform: translate(-50%, -50%);
-  -ms-transform: translate(-50%, -50%);
-  -o-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  max-width: 70%;
-  background: #ffffff;
-  -webkit-box-shadow: 0 0 20px 0 rgba(50, 103, 0, 0.2);
-  -webkit-border-radius: 4px;
-  box-shadow: 0 0 20px 0 rgba(50, 103, 0, 0.2);
-  border-radius: 4px;
-  padding: 5%;
-}
-.log-paper {
-  width: 45%;
-  margin-right: 5%;
-  float: left;
-}
-.log-paper img {
-  width: 90%;
-}
-.log-container {
-  width: 50%;
-  margin-left: 5%;
-  float: right;
-  text-align: center;
-}
-.log-icon {
-  width: 40%;
-}
-.log-text {
-  font-size: 1.8em;
-  color: #52cc60;
-  margin: 0.5rem auto;
-}
-.log-qrcode {
-  width: 70%;
-  background: #ffffff;
-  -webkit-box-shadow: 0 2px 10px 0 rgba(157, 166, 195, 0.3);
-  box-shadow: 0 2px 10px 0 rgba(157, 166, 195, 0.3);
-  padding: 10%;
-  margin: 5% 10%;
-}
-.log-qrcode-image {
-  width: 100%;
-}
-*,
-::after,
-::before {
-  box-sizing: content-box;
-}
-.log-qrcode-text {
-  margin-top: 1.5rem;
-  font-size: 1em;
-  color: #808080;
-}
-@media (min-width: 0px) and (max-width: 767px) {
-  .container {
-    width: 750px;
-  }
-  .log-paper {
-    width: 0%;
-  }
-  .log-container {
-    width: 100%;
+<style lang="stylus" scoped>
+@import '../style/index.styl';
+.login-content{
+  display: flex;
+    -webkit-box-pack: justify;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+}
+.login
+    position fixed
+    top 0
+    left 0
+    width 100%
+    height 100%
+    min-width 650px
+    &-paper
+        position absolute
+        top 0
+        left 0
+        width 100%
+        height 100%
+        img 
+            width 100%
+            height 100%
+            object-fit cover
+    &-content
+        position absolute
+        top 10%
+        left 15%
+        width 70%
+        height 80%
+        background $color-bg-white
+        border-radius 4px
+        box-shadow()
+        flex-row-between()
+        .img
+            margin 10% 0% 10% 10%
+            flex 6
+            img 
+                width 100%
+                height 100%
+                object-fit cover
+        .section
+            margin 10%
+            flex 4
+            text-align center
+            &-icon
+                width 50%
+                object-fit cover
+            &-text
+                color $color-text-green
+                font-size $font-size-l
+                margin 5%
+            &-qrcode
+                box-shadow()
+                padding 10px
+@media (min-width: 0px) and (max-width: 960px) {
+  .img {
+      display none
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .container {
-    width: 750px;
-  }
-  .log-paper {
-    width: 45%;
-    margin-top: 5%;
-  }
-  .log-container {
-    width: 40%;
-  }
-}
-@media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-  .log-paper {
-    width: 45%;
-  }
-  .log-container {
-    width: 40%;
-  }
-}
-@media (min-width: 1200px) {
-  .container {
-    width: 1170px;
-  }
-}
-
-body {
-  background: #f6f7fb;
-  -webkit-font-smoothing: subpixel-antialiased;
-}
-.color-green {
-  color: #52cc60 !important;
-}
-.color-purple {
-  color: #612d00 !important;
-}
-.fontweight {
-  font-weight: bold;
-}
-.text-indent {
-  text-indent: 2.6rem;
-}
-.nodata {
-  text-align: center;
-  padding: 250px 20px !important;
-}
-.nodata p {
-  padding-top: 50px;
-  font-size: 18px;
-  color: #65b800;
-}
-
-/* 适应1366 */
-/* @media screen and (max-width: 1366px) {
-  .isShow1 {
-    display: none;
-  }
-  .isShow2 {
-    display: block;
-  }
-  .isShow3 {
-    display: none;
-  }
-  .isShow4 {
-    display: block;
-  }
-} */
-</style>
+</style>

+ 3 - 7
src/pages/home/SchoolManager.vue

@@ -263,8 +263,7 @@
                 <div>姓名</div>
                 <div>被报错</div>
                 <div>科目</div>
-                <div>批改总份数</div>
-                <div>批改总张数</div>
+                <div>批改有效总张数</div>
                 <div style="width:240px;">平均批改时间</div>
                 <div>出勤</div>
               </div>
@@ -278,7 +277,6 @@
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
                   <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
                   <div class="tr-active">{{v.subject}}</div>
-                  <div>{{v.homeworkCount}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div style="width:240px;">{{v.avgTime}}</div>
                   <div>{{v.attendance}}</div>
@@ -359,8 +357,7 @@
                 <div>姓名</div>
                 <div>被报错</div>
                 <div>科目</div>
-                <div>批改总份数</div>
-                <div>批改总张数</div>
+                <div>批改有效总张数</div>
                 <div>正确率</div>
                 <div>满意度</div>
                 <div style="width:240px;">平均批改时间</div>
@@ -376,7 +373,6 @@
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
                   <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
                   <div class="tr-active">{{v.subject}}</div>
-                  <div>{{v.homeworkCount}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
                   <div>{{v.satisfactionDegree}}</div>
@@ -546,7 +542,7 @@
                 >
                 <div style="display: inline-block;text-align: left;">
                   <div style="font-size: 24px;margin-left: 10px">{{v.name}}</div>
-                  <div class="model-items-left-top-number">等待张数:{{v.teacherCount}}</div>
+                  <div class="model-items-left-top-number">等待张数:{{v.waitCount}}</div>
                 </div>
               </div>
               <div>

+ 102 - 0
src/pages/style/common.styl

@@ -0,0 +1,102 @@
+@import './index.styl'
+	
+/*----------------reset css -------------------*/
+*,
+*:after,
+*:before {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	margin: 0;
+	padding: 0;
+}
+ul,
+ol,
+li {
+	list-style: none;
+}
+i,
+strong,
+em,
+b,
+u {
+	font-weight: normal;
+	font-style: normal;
+}
+input[type="text"],
+textarea {
+	appearance: none;
+}
+a {
+	text-decoration: none;
+	color: $color-link;
+	-webkit-tap-highlight-color: transparent;
+	-webkit-touch-callout: none;
+	user-select: none;
+	color: inherit;
+}
+img {
+	width: 100%;
+}
+img[lazy='loading'] {
+	display: block;
+	width: 100%;
+	height 100%;
+	margin: auto;
+	object-fit: cover;
+}
+input:focus{
+	outline: none;
+}
+::-webkit-scrollbar {
+ 	width: 8px;
+	height 8px;
+}
+::-webkit-scrollbar-track {
+	background-color: rgba(255,255,255,0);
+	-webkit-border-radius: 2em;
+	border-radius:2em;
+	-webkit-transition: all .3s;
+	transition: all .3s;
+}
+:hover::-webkit-scrollbar-track {
+	background-color: rgba(255,255,255,.4);
+}
+::-webkit-scrollbar-thumb {
+	background-color: rgba(0,0,0,0);
+	-webkit-border-radius: 2em;
+	border-radius:2em;
+	-webkit-transition: all .3s;
+	transition: all .3s;
+}
+:hover::-webkit-scrollbar-thumb {
+	background-color: rgba(0,0,0,.1);
+}
+html,
+body,
+#app {
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+	-webkit-touch-callout: none;
+	background: $color-bg;
+	font-size: 14px;
+	color:#666;
+	font-family: 'MicrosoftYaHei', '微软雅黑';
+	-ms-overflow-style: -ms-autohiding-scrollbar;
+}
+
+/*--------------------- 公共过渡动画样式 --------------------------*/
+.slide-fade-enter-active {
+	-webkit-transition: all .3s ease;
+    transition: all .3s ease;
+}
+.slide-fade-leave-active {
+	-webkit-transition: all .3s ease;
+    transition: all .3s ease;
+	// -webkit-transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
+    // transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
+}
+.slide-fade-enter, .slide-fade-leave-to {
+	-webkit-transform: translateY(10px);
+	transform: translateY(10px);
+	opacity: 0;
+}

+ 3 - 0
src/pages/style/index.styl

@@ -0,0 +1,3 @@
+// 引入常用的基础文件
+@import './variable'
+@import 'mixin'

+ 67 - 0
src/pages/style/mixin.styl

@@ -0,0 +1,67 @@
+flex-row()
+    display flex
+    justify-content flex-start
+    align-items flex-start
+flex-row-end()
+    display flex
+    justify-content flex-end
+    align-items flex-start
+flex-row-center()
+    display flex
+    justify-content center
+    align-items center
+flex-row-between()
+    display flex
+    justify-content space-between
+    align-items center
+flex-row-around()
+    display flex
+    justify-content space-around
+    align-items center
+flex-row-wrap()
+    display flex
+    flex-wrap wrap
+    justify-content flex-start
+    align-items flex-start
+flex-row-wrap-center()
+    display flex
+    flex-wrap wrap
+    justify-content center
+    align-items center
+flex-row-wrap-between()
+    display flex
+    flex-wrap wrap
+    justify-content space-between
+    align-items center
+flex-row-wrap-around()
+    display flex
+    flex-wrap wrap
+    justify-content space-around
+    align-items center
+flex-col()
+    display flex
+    flex-direction column
+    justify-content flex-start
+    align-items flex-start
+flex-col-end()
+    display flex
+    flex-direction column
+    justify-content flex-end
+    align-items flex-start
+flex-col-center()
+    display flex
+    flex-direction column
+    justify-content center
+    align-items center
+flex-col-between()
+    display flex
+    flex-direction column
+    justify-content space-between
+    align-items center
+flex-col-around()
+    display flex
+    flex-direction column
+    justify-content space-around
+    align-items center
+box-shadow()
+    box-shadow 0px 3px 6px 0px rgba(230, 230, 230, .7)

+ 63 - 0
src/pages/style/variable.styl

@@ -0,0 +1,63 @@
+
+// 根据ui提供的规范定义
+$color-text-black = #000 // 文本颜色
+$color-text = #333
+$color-text-gray = #666
+$color-text-grayer = #999
+$color-text-blue = #1890ff
+$color-text-gray-blue = #7E7E7E
+$color-text-green = #52CC60
+$color-text-green-white = #65B800
+$color-text-yellow = #f2dc3f
+$color-text-white = #ffffff
+$color-text-grey = #cccccc
+$color-text-red = #F04844
+
+$color-as-1 = #f2dc3f; // 辅助色
+$color-as-2 = #FE6196;
+$color-as-3 = #d81e06;
+$color-as-4 = #d63235;
+$color-as-5 = #237ac0
+
+$color-link = #333; // 链接颜色
+
+$color-base-dark = #333; // 基本色
+$color-base-grayer = #666;
+$color-base-gray = #999;
+$color-base-white = #ddd;
+$color-base-bar = #1890ff
+
+$color-bg = #F1F3FA //背景颜色
+$color-bg-black = #9EA7B4
+$color-bg-white = #fff
+$color-bg-gray = #f2f2f2
+$color-bg-gray-white = #F8F8FB
+$color-bg-blue-white = #F7FBFC
+$color-bg-grayer = #e4e4e4 //更灰些
+$color-bg-light-blue = #DADCE5
+$color-bg-main-grayer = #f6f7f9
+$color-bg-gray-white = #FAFAFA
+$color-bg-theme = #232774
+$color-bg-green = #52CC60
+$color-bg-yellow = #f2dc3f
+$color-bg-red = #F04844
+
+$color-bd-black = #9EA7B4
+$color-bd = #ddd //边框颜色
+$color-bd-gray = #eee
+$color-bd-green = #52CC60
+$color-bd-red = #F04844
+$color-bd-white = #FFFFFF
+
+//字体定义规范
+$font-size-s = 10px
+$font-size-sm = 12px
+$font-size-m = 14px
+$font-size-l = 16px
+$font-size-xl = 18px
+$font-size-xxl = 20px
+$font-size-xxxl = 22px
+
+// 宽度
+$width-max = 1940px
+$width-min = 1040px

+ 1 - 1
src/pages/super/SchoolManager.vue

@@ -451,7 +451,7 @@
                 >
                 <div style="display: inline-block">
                   <div style="font-size: 24px">{{v.name}}</div>
-                  <div class="model-items-left-top-number">等待学生:{{v.waitCount}}</div>
+                  <div class="model-items-left-top-number">等待张数:{{v.waitCount}}</div>
                 </div>
               </div>
               <div>

BIN
static/favicon.ico