Przeglądaj źródła

Merge branch 'beta'

SanHQin 1 miesiąc temu
rodzic
commit
6e993b4f89

+ 1 - 1
dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.53833548fdfde666520e3ce52c2e8948.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.dfc8a8e3392292c7b8e5.js></script><script type=text/javascript src=./static/js/app.f0ccc966bae74500013d.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.478115cae215a85f5bd68c1754a55d95.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.dfc8a8e3392292c7b8e5.js></script><script type=text/javascript src=./static/js/app.aaf7279ba766012be1b2.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Plik diff jest za duży
+ 0 - 0
dist/static/css/app.478115cae215a85f5bd68c1754a55d95.css


Plik diff jest za duży
+ 0 - 0
dist/static/css/app.478115cae215a85f5bd68c1754a55d95.css.map


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.aaf7279ba766012be1b2.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.aaf7279ba766012be1b2.js.map


Plik diff jest za duży
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


Plik diff jest za duży
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


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

@@ -231,7 +231,7 @@
 								</div>
     					</el-tooltip>
 							<el-tooltip effect="dark" v-show="orgArray.includes(org) || oidArray.includes(oid)" :content="lang.AiEdit" placement="top">
-    					  <div class="t_b_Item" @click="aiCourse(item.courseId)">
+    					  <div v-if="lang.lang == 'cn'" class="t_b_Item" @click="aiCourse(item.courseId)">
 									<img src="../../assets/icon/course/aiEdit.svg">
 								</div>
     					</el-tooltip>

+ 59 - 59
src/components/pages/studentManageNew/index.vue

@@ -6,7 +6,7 @@
         <span style="color: #86909c; font-size: 12px">{{ lang.GradeManagement }}</span>
       </div>
       <div style="display: flex; gap: 10px;">
-        <div v-if="orglist.includes(org) || this.role == 1" class="Clabtn" @click="openaddClass(1)">
+        <div v-if="this.role == 1" class="Clabtn" @click="openaddClass(1)">
           <img src="../../../assets/stuImg/jia.svg" alt="" />
           <span>{{ lang.ssGradeType }}</span>
         </div>
@@ -19,59 +19,57 @@
         <img src="../../../assets/stuImg/eidl.svg" style="width: 20px;" alt="" />
         <span>{{ lang.ssEditGrade }}</span>
       </div> -->
-      <el-menu
-        :default-active="activeId"
-        class="el-menu-vertical-demo"
-        v-loading="editGradeLoading"
-      >
-        <el-submenu v-for="item in tableData" :index="item.id" :key="item.id">
-          <template slot="title">
-            <div class="grade_submenu_title" @mouseenter="mouseEnter(item.id)" @mouseleave="mouseLeave()" >
-              <div class="tabcla_box">{{ item.name }}</div>
-              <img
-                class="grade-submenu-arrow"
-                src="../../../assets/stuImg/zankai.svg"
-                alt=""
-              />
-              <div v-if="role == 1">
-                <el-popover
-                    placement="bottom-end"
-                    width="80"
-                    trigger="hover"
-                    popper-class="student-manage-action-popover"
-                    >
-                    <div class="action_box"   
-                    @mouseenter="mouseEnter2(item.id)"
-                    @mouseleave="mouseLeave2()">
-                      <template>
-                        <div @click="editGrade(item)">编辑</div>
-                        <div @click="deleteGradeItem(item.id)">删除</div>
-                      </template>
-                    </div>
-                      <div
-                        slot="reference"
-                        class="grade_submenu_arrow_box"
+      <div @mouseleave="mouseLeave()">
+        <el-menu
+          :default-active="activeId"
+          class="el-menu-vertical-demo"
+          v-loading="editGradeLoading"
+        >
+          <el-submenu v-for="item in tableData" :index="item.id" :key="item.id">
+            <template slot="title">
+              <div class="grade_submenu_title" @mouseenter="mouseEnter(item.id)">
+                <div class="tabcla_box">{{ item.name }}</div>
+                <img
+                  class="grade-submenu-arrow"
+                  src="../../../assets/stuImg/zankai.svg"
+                  alt=""
+                />
+                <div v-if="role == 1 && (mouseEnterId == item.id || mouseEnterId2 == item.id)">
+                  <el-popover
+                      placement="bottom-end"
+                      width="80"
+                      :visible-arrow="false"
+                      trigger="hover"
+                      popper-class="student-manage-action-popover"
                       >
-                        <img v-if="role == 1 && (mouseEnterId == item.id || mouseEnterId2 == item.id)" src="../../../assets/stuImg/act.svg" alt="">
+                      <div 
+                        class="action_box" @mouseenter="mouseEnter2(item.id)">
+                          <div @click="editGrade(item)">编辑</div>
+                          <div @click="deleteGradeItem(item.id)">删除</div>
                       </div>
-                </el-popover>
-              </div>
-                
-              </div>
-          </template>
-          <el-menu-item-group
-            v-for="k in item.children"
-            :key="k.id"
-            :title="k.name"
-          >
-            <el-menu-item :index="k.id" style="font-weight: normal;" @click="handleClick(k.id, 0,k)">
-              <div class="tabcla_box">{{ k.name }}</div>
-              <span>{{ lang.ssStuCount.replace(/\*/g, k.pnum) }}</span>
-            </el-menu-item>
-          </el-menu-item-group>
-        </el-submenu>
-      </el-menu>
-
+                        <div
+                          slot="reference"
+                          class="grade_submenu_arrow_box"
+                        >
+                          <img src="../../../assets/stuImg/act.svg" alt="">
+                        </div>
+                  </el-popover>
+                </div>
+                </div>
+            </template>
+            <el-menu-item-group
+              v-for="k in item.children"
+              :key="k.id"
+              :title="k.name"
+            >
+              <el-menu-item :index="k.id" style="font-weight: normal;" @click="handleClick(k.id, 0,k)">
+                <div class="tabcla_box">{{ k.name }}</div>
+                <span>{{ lang.ssStuCount.replace(/\*/g, k.pnum) }}</span>
+              </el-menu-item>
+            </el-menu-item-group>
+          </el-submenu>
+        </el-menu>
+      </div>
       <div class="line"></div>
       <div class="centerCss">
         <img src="../../../assets/stuImg/inf.svg" alt="" />
@@ -292,18 +290,21 @@ export default {
   },
   methods: {
     mouseEnter(id){
-      // console.log('mouseEnter', id);
       this.mouseEnterId = id;
+      this.mouseEnterId2 = id;
     },
     mouseLeave(){
         this.mouseEnterId = '';
+        setTimeout(() => {
+          if (this.mouseEnterId == '') {
+            this.mouseEnterId2 = '';
+          }
+        }, 500);
     },
     mouseEnter2(id){
+      this.mouseEnterId = id;
       this.mouseEnterId2 = id;
     },
-    mouseLeave2(){
-      this.mouseEnterId2 = '';
-    },
 
     // 编辑年级
     editGrade(val){
@@ -598,6 +599,8 @@ export default {
   width: 80px !important;
   min-width: 60px !important;
   padding: 0 !important;
+  margin-top: -3px !important;
+  border: none !important;
 }
 
 .grade_submenu_arrow_box{
@@ -626,9 +629,6 @@ export default {
   min-width: 60px !important;
   padding: 0 !important;
 }
-.student-manage-action-popover .el-popper{
-  margin-top: 0 !important;
-}
 </style>
 <style scoped>
 .box {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików