浏览代码

Merge branch '03/03GRADE' into test

mo 3 年之前
父节点
当前提交
0dcf3cc492
共有 2 个文件被更改,包括 10 次插入8 次删除
  1. 8 5
      src/components/copy-text/index.vue
  2. 2 3
      src/views/stuRecodeManager/index.vue

+ 8 - 5
src/components/copy-text/index.vue

@@ -64,13 +64,15 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .copyWrap {
-  display: flex;
+  display: inline-flex;
   align-items: center;
-  width: 100%;
-  margin: 0 auto;
-  justify-content: center;
+  flex-wrap: nowrap;
+  width: calc(100% - 15px);
+  // margin: 0 auto;
+  // justify-content: center;
+
   .copy {
     overflow: hidden;
     text-overflow: ellipsis;
@@ -80,6 +82,7 @@ export default {
   .el-icon-document-copy {
     cursor: pointer;
     margin-left: 2px;
+    display: inline-block;
   }
 }
 </style>

+ 2 - 3
src/views/stuRecodeManager/index.vue

@@ -156,8 +156,7 @@
               <div>
                 {{ scope.row.username }}
                 <p style="color: #f56c6c">
-                  (<copy-text>{{ scope.row.userId }}</copy-text
-                  >)
+                  (<copy-text>{{ scope.row.userId }}</copy-text>)
                 </p>
               </div>
             </template>
@@ -370,7 +369,7 @@ import { getTimes } from "@/utils";
 import qs from "qs";
 import { permission } from "@/utils/directivePage";
 import { findStudentAttendance } from "@/api/buildTeam";
-import { Export } from "@/utils/downLoadFile"; 
+import { Export } from "@/utils/downLoadFile";
 import cleanDeep from "clean-deep";
 // import { queryTeacherAttendances } from "@/api/recodeManager";
 import { courseType, courseListType, stuAttendance } from "@/utils/searchArray";