lsc 1 tahun lalu
induk
melakukan
7aedd6a7ae

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.90873fd7dc4b5105faa1720e44c544b1.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.e8199ffe2d6bacd0a588.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.f52bf5753c3a98390e06c8465b34c311.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.db7bd40f6a6974b97747.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.90873fd7dc4b5105faa1720e44c544b1.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.90873fd7dc4b5105faa1720e44c544b1.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.f52bf5753c3a98390e06c8465b34c311.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.f52bf5753c3a98390e06c8465b34c311.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.db7bd40f6a6974b97747.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.db7bd40f6a6974b97747.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.e8199ffe2d6bacd0a588.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 60 - 0
src/App.vue

@@ -418,4 +418,64 @@ html::-webkit-scrollbar-thumb {
 .showtip{
   z-index: 999999999 !important;
 }
+.el-message-box{
+  padding-bottom: 20px;
+}
+.el-message-box__header{
+  font-weight: 700;
+}
+.el-message-box__content{
+  padding: 10px 15px 25px;
+}
+.el-icon-warning:before{
+  content: '';
+  width: 20px;
+  height: 20px;
+  display: block;
+  background-image: url("./assets/icon/new/tips.png");
+  background-size: 100% 100%;
+}
+.el-message-box__status+.el-message-box__message{
+  padding-left: 30px;
+}
+.el-message-box__btns{
+  text-align: center;
+}
+
+.el-message-box__btns > .el-button--small{
+  border: 1px solid #CAD1DC;
+  background: #E7EBF1;
+  color: #060E17;
+}
+
+.el-message-box__btns > .el-button--small:hover{
+  background: #CAD1DC;
+  color: #060E17;
+}
+
+.el-message-box__btns > .el-button--primary{
+  border: 1px solid #EE3E3E;
+  background: #EE3E3E;
+  color: #fff;
+}
+
+.el-message-box__btns > .el-button--primary:hover{
+  border: 1px solid #cd3434;
+  background: #cd3434;
+  color: #fff;
+}
+
+.el-checkbox:hover .el-checkbox__label{
+  color:#409EFF;
+}
+.el-checkbox .el-checkbox__label{
+  color: #0E1E33;
+}
+.el-checkbox:hover .el-checkbox__inner{
+  border-color: #409EFF;
+}
+.el-checkbox .el-checkbox, .el-checkbox .el-checkbox__input{
+  display: flex;
+  align-items: center;
+}
 </style>

TEMPAT SAMPAH
src/assets/icon/new/tips.png


+ 114 - 35
src/components/pages/addCourse.vue

@@ -602,7 +602,7 @@
                               justify-content: flex-start;
                               align-items: center;
                             ">
-                              <div class="lineTitle">任务概述</div>
+                              <div class="lineTitle">任务{{itemTaskIndex+1}}概述</div>
                             </div> 
                             <div :id="'task' + itemTaskIndex" class="chapter_contentbox" style="
                           flex-direction: row;
@@ -2510,42 +2510,31 @@
         <el-button type="primary" @click="isAddPP">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="添加班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="400px" height="80%"
-      :before-close="handleClose" class="addNewPP">
-      <div class="people" style="height: 300px">
-        <div class="people_top">
-          <div class="people_top_right">
-            <div class="people_search">
-              <el-select v-model="gradeId" placeholder="请选择年级" class="student_input" clearable @change="getClass()">
-                <el-option label="全部" value=""></el-option>
-                <el-option v-for="(item, index) in gradeList" :key="index" :label="item.name"
-                  :value="item.id"></el-option>
-              </el-select>
-              <el-input placeholder="搜索班级名称" v-model="classSearch" @input="getClass()"></el-input>
-              <!-- @click="getClass()" 
-                @keyup.enter.native="getClass()"
-               -->
-              <div class="search_img">
-                <img src="../../assets/icon/search.png" alt />
-              </div>
-            </div>
+    <el-dialog title="选择授课班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="600px" height="80%"
+      :before-close="handleClose" class="addNewPP2">
+      <div class="check_classBox">
+        <div class="check_class_right">
+          <div class="check_class" :class="{activeX:gradeId == ''}" @click="gradeId = '',getClass()">
+            全部
           </div>
-          <div class="people_nav">选择班级</div>
-        </div>
-        <el-checkbox-group v-model="checkboxList2" class="people_name people_name2" @change="InviteChange"
-          v-if="grade2.length">
-          <div v-for="item in grade2" :key="item.id" class="p_box">
-            <el-checkbox :label="item.id">
+          <el-tooltip placement="top" :content="item.name" v-for="(item, index) in gradeList" :key="index">
+            <div class="check_class"   :class="{activeX:gradeId == item.id}" @click="gradeId = item.id,getClass()">
               {{ item.name }}
-            </el-checkbox>
-            <!-- <div class="inviteCode" :class="{ noneInvite: !isInvite(item.id) }" v-if="isInvite(item.id)">
-              邀请码:{{ getInviteCodeC(item.id) }}</div> -->
-            <!-- <div class="inviteCode" :class="{ noneInvite: !isInvite(item.id) }" v-if="checkboxList2.indexOf(item.id) != -1"
-              @click="OpenInviteD(item.id)">随机码设置</div>
-            <img src="../../assets/icon/rightInvite.png" class="inviteImg" v-if="isInvite(item.id)" /> -->
-          </div>
-        </el-checkbox-group>
-        <div v-if="!grade2.length" style="padding:20px 10px">暂无数据</div>
+            </div>
+          </el-tooltip>
+        </div>
+        <div class="check_class_left">
+          <div class="check_class_left_title">选择班级</div>
+          <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange"
+            v-if="grade2.length">
+            <div v-for="item in grade2" :key="item.id" class="class_item">
+              <el-checkbox :label="item.id">
+                {{ item.name }}
+              </el-checkbox>
+            </div>
+          </el-checkbox-group>
+          <div v-if="!grade2.length">暂无数据</div>
+        </div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisibleClass = false">取 消</el-button>
@@ -9240,6 +9229,10 @@ export default {
   color: #0E1E33;
 }
 
+.cru_select:hover{
+  color: #3681FC !important;
+}
+
 .cru_selected {
   color: #3681FC !important;
   font-weight: bold;
@@ -10359,6 +10352,15 @@ ol {
   margin-top: 5vh !important;
 }
 
+.addNewPP2>>>.el-dialog__body {
+  padding: 5px 0;
+}
+
+.addNewPP2>>>.el-dialog {
+  margin-top: 5vh !important;
+}
+
+
 .isHeight {
   height: 680px;
 }
@@ -12336,4 +12338,81 @@ ol {
   right: 12px;
   top: 50%;
   transform: translateY(-50%);
+}
+
+.check_classBox{
+  height: 400px;
+    display: flex;
+    border-top: 1.5px solid #E7EBF1;
+    border-bottom: 1.5px solid #E7EBF1;
+}
+.check_class_right{
+  width: 130px;
+    border-right: 1px solid #E7EBF1;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    height: 100%;
+    overflow: auto;
+    padding: 15px 0;
+    box-sizing: border-box;
+}
+.check_class{
+  width: 85%;
+    border-radius: 5px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    padding: 0 10px;
+    box-sizing: border-box;
+    cursor:pointer;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.check_class.activeX{
+  background: #E0EAFB;
+  color:#3681FC;
+  font-weight:700;
+}
+.check_class + .check_class{
+  margin-top: 15px;
+}
+.check_class_left{
+  background: #FAFAFA;
+    width: calc(100% - 130px);
+    padding: 15px;
+    box-sizing: border-box;
+}
+.check_class_left_title{
+  font-size: 16px;
+    font-weight: 700;
+    margin-bottom: 10px;
+}
+.check_class_item{
+  display: flex;
+    flex-wrap: wrap;
+    height: calc(100% - 45px);
+    overflow: auto;
+    justify-content: flex-start;
+    align-items: flex-start;
+    align-content: flex-start;
+}
+
+.class_item{
+  margin: 0 15px 15px 0;
+
+}
+.class_item:hover >>> .el-checkbox__label{
+  color:#409EFF;
+}
+.class_item >>> .el-checkbox__label{
+  color: #0E1E33;
+}
+.class_item:hover >>> .el-checkbox__inner{
+  border-color: #409EFF;
+}
+.class_item >>> .el-checkbox, .class_item >>> .el-checkbox__input{
+  display: flex;
+  align-items: center;
 }</style>

+ 122 - 11
src/components/pages/easy/addCourse.vue

@@ -458,7 +458,7 @@
                               justify-content: flex-start;
                               align-items: center;
                             ">
-                            <div class="lineTitle">任务概述</div>
+                            <div class="lineTitle">任务{{itemTaskIndex+1}}概述</div>
                           </div>
                           <div :id="'task' + itemTaskIndex" class="chapter_contentbox" style="
                               flex-direction: row;
@@ -3437,7 +3437,7 @@
         <el-button type="primary" @click="isAddPP">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="添加班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="400px" height="80%"
+    <!-- <el-dialog title="添加班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="400px" height="80%"
       :before-close="handleClose" class="addNewPP">
       <div class="people" style="height: 300px">
         <div class="people_top">
@@ -3449,9 +3449,6 @@
                   :value="item.id"></el-option>
               </el-select>
               <el-input placeholder="搜索班级名称" v-model="classSearch" @input="getClass()"></el-input>
-              <!-- @click="getClass()" 
-                @keyup.enter.native="getClass()"
-               -->
               <div class="search_img">
                 <img src="../../../assets/icon/search.png" alt />
               </div>
@@ -3465,11 +3462,6 @@
             <el-checkbox :label="item.id">
               {{ item.name }}
             </el-checkbox>
-            <!-- <div class="inviteCode" :class="{ noneInvite: !isInvite(item.id) }" v-if="isInvite(item.id)">
-              邀请码:{{ getInviteCodeC(item.id) }}</div> -->
-            <!-- <div class="inviteCode" :class="{ noneInvite: !isInvite(item.id) }" v-if="checkboxList2.indexOf(item.id) != -1"
-              @click="OpenInviteD(item.id)">随机码设置</div>
-            <img src="../../assets/icon/rightInvite.png" class="inviteImg" v-if="isInvite(item.id)" /> -->
           </div>
         </el-checkbox-group>
         <div v-if="!grade2.length" style="padding:20px 10px">暂无数据</div>
@@ -3478,6 +3470,37 @@
         <el-button @click="dialogVisibleClass = false">取 消</el-button>
         <el-button type="primary" @click="isAddClass">确定</el-button>
       </span>
+    </el-dialog> -->
+    <el-dialog title="选择授课班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="600px" height="80%"
+      :before-close="handleClose" class="addNewPP2">
+      <div class="check_classBox">
+        <div class="check_class_right">
+          <div class="check_class" :class="{activeX:gradeId == ''}" @click="gradeId = '',getClass()">
+            全部
+          </div>
+          <el-tooltip placement="top" :content="item.name" v-for="(item, index) in gradeList" :key="index">
+            <div class="check_class"   :class="{activeX:gradeId == item.id}" @click="gradeId = item.id,getClass()">
+              {{ item.name }}
+            </div>
+          </el-tooltip>
+        </div>
+        <div class="check_class_left">
+          <div class="check_class_left_title">选择班级</div>
+          <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange"
+            v-if="grade2.length">
+            <div v-for="item in grade2" :key="item.id" class="class_item">
+              <el-checkbox :label="item.id">
+                {{ item.name }}
+              </el-checkbox>
+            </div>
+          </el-checkbox-group>
+          <div v-if="!grade2.length">暂无数据</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleClass = false">取 消</el-button>
+        <el-button type="primary" @click="isAddClass">确定</el-button>
+      </span>
     </el-dialog>
     <el-dialog title="添加协同成员" :visible.sync="dialogVisibleMember" :append-to-body="true" width="25%" height="80%"
       :before-close="handleClose" class="addNewPP customWidth">
@@ -10977,6 +11000,16 @@ ol {
 .addNewPP>>>.el-dialog__body {
   padding: 5px 20px;
 }
+.addNewPP>>>.el-dialog {
+  margin-top: 5vh !important;
+}
+.addNewPP2>>>.el-dialog__body {
+  padding: 5px 0;
+}
+.addNewPP2>>>.el-dialog {
+  margin-top: 5vh !important;
+}
+
 
 .isHeight {
   height: 680px;
@@ -12905,4 +12938,82 @@ ol {
   right: 12px;
   top: 50%;
   transform: translateY(-50%);
-}</style>
+}
+.check_classBox{
+  height: 400px;
+    display: flex;
+    border-top: 1.5px solid #E7EBF1;
+    border-bottom: 1.5px solid #E7EBF1;
+}
+.check_class_right{
+  width: 130px;
+    border-right: 1px solid #E7EBF1;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    height: 100%;
+    overflow: auto;
+    padding: 15px 0;
+    box-sizing: border-box;
+}
+.check_class{
+  width: 85%;
+    border-radius: 5px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    padding: 0 10px;
+    box-sizing: border-box;
+    cursor:pointer;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.check_class.activeX{
+  background: #E0EAFB;
+  color:#3681FC;
+  font-weight:700;
+}
+.check_class + .check_class{
+  margin-top: 15px;
+}
+.check_class_left{
+  background: #FAFAFA;
+    width: calc(100% - 130px);
+    padding: 15px;
+    box-sizing: border-box;
+}
+.check_class_left_title{
+  font-size: 16px;
+    font-weight: 700;
+    margin-bottom: 10px;
+}
+.check_class_item{
+  display: flex;
+    flex-wrap: wrap;
+    height: calc(100% - 45px);
+    overflow: auto;
+    justify-content: flex-start;
+    align-items: flex-start;
+    align-content: flex-start;
+}
+
+.class_item{
+  margin: 0 15px 15px 0;
+
+}
+.class_item:hover >>> .el-checkbox__label{
+  color:#409EFF;
+}
+.class_item >>> .el-checkbox__label{
+  color: #0E1E33;
+}
+.class_item:hover >>> .el-checkbox__inner{
+  border-color: #409EFF;
+}
+.class_item >>> .el-checkbox, .class_item >>> .el-checkbox__input{
+  display: flex;
+  align-items: center;
+}
+
+</style>

+ 109 - 34
src/components/pages/task/addCourse.vue

@@ -256,7 +256,7 @@
                               justify-content: flex-start;
                               align-items: center;
                             ">
-                              <div class="lineTitle">任务概述</div>
+                              <div class="lineTitle">任务{{itemTaskIndex+1}}概述</div>
                             </div> 
                           <div
                             :id="'task' + itemTaskIndex"
@@ -5438,40 +5438,31 @@
         <el-button type="primary" @click="isAddPP">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="添加班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="400px" height="80%"
-      :before-close="handleClose" class="addNewPP">
-      <div class="people" style="height: 300px">
-        <div class="people_top">
-          <div class="people_top_right">
-            <div class="people_search">
-              <el-select v-model="gradeId" placeholder="请选择年级" class="student_input" clearable @change="getClass()">
-                <el-option label="全部" value=""></el-option>
-                <el-option v-for="(item, index) in gradeList" :key="index" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-              <el-input placeholder="搜索班级名称" v-model="classSearch" @input="getClass()"></el-input>
-              <!-- @click="getClass()" 
-                @keyup.enter.native="getClass()"
-               -->
-              <div class="search_img">
-                <img src="../../../assets/icon/search.png" alt />
-              </div>
-            </div>
+    <el-dialog title="选择授课班级" :visible.sync="dialogVisibleClass" :append-to-body="true" width="600px" height="80%"
+      :before-close="handleClose" class="addNewPP2">
+      <div class="check_classBox">
+        <div class="check_class_right">
+          <div class="check_class" :class="{activeX:gradeId == ''}" @click="gradeId = '',getClass()">
+            全部
           </div>
-          <div class="people_nav">选择班级</div>
-        </div>
-        <el-checkbox-group v-model="checkboxList2" class="people_name people_name2" @change="InviteChange" v-if="grade2.length" >
-          <div v-for="item in grade2" :key="item.id" class="p_box">
-            <el-checkbox :label="item.id">
+          <el-tooltip placement="top" :content="item.name" v-for="(item, index) in gradeList" :key="index">
+            <div class="check_class"   :class="{activeX:gradeId == item.id}" @click="gradeId = item.id,getClass()">
               {{ item.name }}
-            </el-checkbox>
-            <!-- <div class="inviteCode" :class="{ noneInvite: !isInvite(item.id) }" v-if="isInvite(item.id)">
-              邀请码:{{ getInviteCodeC(item.id) }}</div> -->
-            <!-- <div class="inviteCode" :class="{ noneInvite: !isInvite(item.id) }" v-if="checkboxList2.indexOf(item.id) != -1"
-              @click="OpenInviteD(item.id)">随机码设置</div>
-            <img src="../../assets/icon/rightInvite.png" class="inviteImg" v-if="isInvite(item.id)" /> -->
-          </div>
-        </el-checkbox-group>
-        <div v-if="!grade2.length" style="padding:20px 10px">暂无数据</div>
+            </div>
+          </el-tooltip>
+        </div>
+        <div class="check_class_left">
+          <div class="check_class_left_title">选择班级</div>
+          <el-checkbox-group v-model="checkboxList2" class="check_class_item" @change="InviteChange"
+            v-if="grade2.length">
+            <div v-for="item in grade2" :key="item.id" class="class_item">
+              <el-checkbox :label="item.id">
+                {{ item.name }}
+              </el-checkbox>
+            </div>
+          </el-checkbox-group>
+          <div v-if="!grade2.length">暂无数据</div>
+        </div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisibleClass = false">取 消</el-button>
@@ -13436,7 +13427,15 @@ ol {
 .addNewPP >>> .el-dialog__body {
   padding: 5px 20px;
 }
-
+.addNewPP>>>.el-dialog {
+  margin-top: 5vh !important;
+}
+.addNewPP2>>>.el-dialog__body {
+  padding: 5px 0;
+}
+.addNewPP2>>>.el-dialog {
+  margin-top: 5vh !important;
+}
 .isHeight {
   height: 680px;
 }
@@ -15345,4 +15344,80 @@ ol {
   top: 50%;
   transform: translateY(-50%);
 }
+.check_classBox{
+  height: 400px;
+    display: flex;
+    border-top: 1.5px solid #E7EBF1;
+    border-bottom: 1.5px solid #E7EBF1;
+}
+.check_class_right{
+  width: 130px;
+    border-right: 1px solid #E7EBF1;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    height: 100%;
+    overflow: auto;
+    padding: 15px 0;
+    box-sizing: border-box;
+}
+.check_class{
+  width: 85%;
+    border-radius: 5px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    padding: 0 10px;
+    box-sizing: border-box;
+    cursor:pointer;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.check_class.activeX{
+  background: #E0EAFB;
+  color:#3681FC;
+  font-weight:700;
+}
+.check_class + .check_class{
+  margin-top: 15px;
+}
+.check_class_left{
+  background: #FAFAFA;
+    width: calc(100% - 130px);
+    padding: 15px;
+    box-sizing: border-box;
+}
+.check_class_left_title{
+  font-size: 16px;
+    font-weight: 700;
+    margin-bottom: 10px;
+}
+.check_class_item{
+  display: flex;
+    flex-wrap: wrap;
+    height: calc(100% - 45px);
+    overflow: auto;
+    justify-content: flex-start;
+    align-items: flex-start;
+    align-content: flex-start;
+}
+
+.class_item{
+  margin: 0 15px 15px 0;
+
+}
+.class_item:hover >>> .el-checkbox__label{
+  color:#409EFF;
+}
+.class_item >>> .el-checkbox__label{
+  color: #0E1E33;
+}
+.class_item:hover >>> .el-checkbox__inner{
+  border-color: #409EFF;
+}
+.class_item >>> .el-checkbox, .class_item >>> .el-checkbox__input{
+  display: flex;
+  align-items: center;
+}
 </style>

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini