lsc 1 year ago
parent
commit
ff18b94f01

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.33f564a7527b2c5b2b008bcff132a2cf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.5d0a2836b148a2e65bb9.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.afa04404a4aff5f80be06a6aede0bae1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.a291cb457914b1317e4c.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.33f564a7527b2c5b2b008bcff132a2cf.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.afa04404a4aff5f80be06a6aede0bae1.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.afa04404a4aff5f80be06a6aede0bae1.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.5d0a2836b148a2e65bb9.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a291cb457914b1317e4c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a291cb457914b1317e4c.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 1 - 1
src/components/pages/addCourse.vue

@@ -3291,7 +3291,7 @@
         <el-button type="primary" @click="addInvite">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="添加预设时间" :visible.sync="dialogVisiblePreTime" :append-to-body="true" width="30%"
+    <el-dialog title="添加预设时间" :visible.sync="dialogVisiblePreTime" :append-to-body="true" width="450px"
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div style="margin-bottom: 20px;color: #999;">提示:点击“+”或“-”修改倒计时时长。</div>

+ 10 - 1
src/components/pages/dataBoard/school/loginCount/index.vue

@@ -51,11 +51,20 @@ export default {
                         name: '老师',
                         type: 'line',
                         // data: [120, 50, 101, 130, 110, 120]
-                        data: []
+                        areaStyle: {},
+                        data: [],
+                        itemStyle: {
+                            normal: {
+                                color: function (params) {
+                                    return "#106bff";
+                                    },
+                                }, 
+                        },
                     },
                     {
                         name: '学生',
                         type: 'line',
+                        areaStyle: {},
                         // data: [220, 182, 191, 234, 290, 330]
                         data: []
                     },

+ 1 - 1
src/components/pages/dataBoard/school/loginTime/index.vue

@@ -50,7 +50,7 @@ export default {
                     ],
                     splitArea: {
                         show: true
-                    }
+                    },
                 },
                 visualMap: {
                     min: 0,

+ 2 - 2
src/components/pages/dataBoard/student/index.vue

@@ -419,7 +419,7 @@ export default {
 
 .center > .top {
   width: 100%;
-  height: calc(100% / 5 * 3 - 10px);
+  height: calc(100% / 6 * 4 - 10px);
   background: #fff;
   border-radius: 5px;
   margin: 0 0 20px 0;
@@ -427,7 +427,7 @@ export default {
 
 .center > .bottom {
   width: 100%;
-  height: calc(100% / 5 * 2 - 10px);
+  height: calc(100% / 6 * 2 - 10px);
   background: #fff;
   border-radius: 5px;
 }

+ 1 - 0
src/components/pages/dataBoard/student/loginCount/index.vue

@@ -44,6 +44,7 @@ export default {
                     {
                         name: '学生',
                         type: 'line',
+                        areaStyle:{},
                         // data: [220, 182, 191, 234, 290, 330]
                         data: []
                     },

+ 8 - 1
src/components/pages/dataBoard/student/loginTime/index.vue

@@ -35,7 +35,14 @@ export default {
                 series: [
                     {
                         type: 'bar',
-                        data: [180, 50, 70, 90, 100, 130]
+                        data: [180, 50, 70, 90, 100, 130],
+                        itemStyle: {
+                            normal: {
+                                    color: function (params) {
+                                    return "#106bff";
+                                    },
+                                },
+                        },
                     }
                 ]
             },

+ 1 - 1
src/components/pages/dataBoard/student/studentInfo/index.vue

@@ -46,7 +46,7 @@ export default {
                             [55, 99, 55, 99]
                         ],
                         itemStyle: {
-                            color: "#0DDE70",
+                            color: '#17C469',
                             borderColor: null
                         }
                     }

+ 1 - 1
src/components/pages/easy/addCourse.vue

@@ -4206,7 +4206,7 @@
         <el-button type="primary" @click="addInvite">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="添加预设时间" :visible.sync="dialogVisiblePreTime" :append-to-body="true" width="30%"
+    <el-dialog title="添加预设时间" :visible.sync="dialogVisiblePreTime" :append-to-body="true" width="450px"
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div style="margin-bottom: 20px;color: #999;">提示:点击“+”或“-”修改倒计时时长。</div>

+ 1 - 1
src/components/pages/task/addCourse.vue

@@ -6736,7 +6736,7 @@
       title="添加预设时间"
       :visible.sync="dialogVisiblePreTime"
       :append-to-body="true"
-      width="30%"
+      width="450px"
       :before-close="handleClose"
       class="dialog_diy"
     >

+ 28 - 14
src/components/tools/time.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <div class="setters">
+    <div class="setters" :style="{width:cwidth}">
       <div class="minutes-set">
         <button
           data-setter="minutes-plus"
@@ -83,6 +83,7 @@ export default {
       isStarted: false,
       displayString: "",
       isWhole:false,
+      cwidth: '162px'
     };
   },
   methods: {
@@ -196,6 +197,11 @@ export default {
     // this.update(this.wholeTime, this.wholeTime);
     // this.displayTimeLeft(this.wholeTime);
     this.getValue();
+    this.$nextTick(()=>{
+      setTimeout(() => {
+        this.cwidth = document.querySelector(".controlls") ? (document.querySelector(".controlls").offsetWidth + 'px') : 'fit-content'
+      }, 600);
+    })
   },
   beforeDestroy() {
     clearInterval(this.intervalTimer);
@@ -230,31 +236,39 @@ button[data-setter]:hover {
 }
 .setters {
   position: absolute;
-  /* left: 85px;
-  top: 75px; */
-  left: 78px;
-  top: 75px;
+  left: 50%;
+    top: 75px;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: space-between;
 }
 .minutes-set {
-  float: left;
+  /* float: left; */
   /* margin-right: 28px; */
-  margin-right: 20px;
+  /* margin-right: 20px; */
 }
 .seconds-set {
-  float: right;
+  /* float: right; */
 }
 .controlls {
   position: absolute;
-  left: 70px;
   top: 105px;
-  text-align: center;
-  width: 170px;
+    text-align: center;
+    min-width: fit-content;
+    width: fit-content;
+    left: 50%;
+    transform: translateX(-50%);
 }
 .display-remain-time {
   font-family: "Roboto";
-  font-weight: 100;
-  font-size: 65px;
-  color: #409eff;
+    font-weight: 100;
+    font-size: 66px;
+    color: #409eff;
+    display: flex;
+    flex-wrap: nowrap;
+    min-width: fit-content;
+    justify-content: center;
+    white-space: nowrap;
 }
 #pause {
   outline: none;

Some files were not shown because too many files changed in this diff