Accueil Explorer Aide
Connexion
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc il y a 1 jour
Parent
f50587215a cf8aa16163
commit
dc37bddc96
9 fichiers modifiés avec 36 ajouts et 28 suppressions
Vue unifiée Afficher les stats Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.34aa80ffbcbe53897d04638265c6186b.css
  3. 0 0
      dist/static/css/app.34aa80ffbcbe53897d04638265c6186b.css.map
  4. 0 0
      dist/static/js/app.0bd1179d480eb33823e8.js
  5. 0 0
      dist/static/js/app.0bd1179d480eb33823e8.js.map
  6. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  7. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  8. 5 4
      src/components/pages/studentManageNew/component/addstu.vue
  9. 30 23
      src/components/pages/studentManageNew/component/table.vue

+ 1 - 1
dist/index.html
Voir le fichier 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.e4317c67b3f9dd71100948386e6b3461.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.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.02e113c67bf3db436bdc.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.34aa80ffbcbe53897d04638265c6186b.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.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.0bd1179d480eb33823e8.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.34aa80ffbcbe53897d04638265c6186b.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.34aa80ffbcbe53897d04638265c6186b.css.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.0bd1179d480eb33823e8.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.0bd1179d480eb33823e8.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


+ 5 - 4
src/components/pages/studentManageNew/component/addstu.vue
Voir le fichier 

@@ -465,6 +465,7 @@ export default {
 
               v[_this.lang.StudentName] !== "" 
               v[_this.lang.StudentName] !== "" 
             ) {
 
             ) {
 
               obj.name = v[_this.lang.StudentName];
 
               obj.name = v[_this.lang.StudentName];
 
+              const accountVal = String(v[_this.lang.ssStuAccHd] || '').trim();
 
               if (
 
               if (
 
                 _this.org != "" &&
 
                 _this.org != "" &&
 
                 _this.org != "null" &&
 
                 _this.org != "null" &&
 
@@ -472,8 +473,8 @@ export default {
 
                 _this.org &&
 
                 _this.org &&
 
                 _this.schoolChar
 
                 _this.schoolChar
 
               ) {
 
               ) {
 
-                if (Number(v[_this.lang.ssStuAccHd])) {
 
-                  obj.account = v[_this.lang.ssStuAccHd] + '@' + _this.schoolChar + '.' + _this.userSuffix;
 
+                if (accountVal) {
 
+                  obj.account = accountVal + '@' + _this.schoolChar + '.' + _this.userSuffix;
 
                 } else {
 
                 } else {
 
                   obj.account = '';
 
                   obj.account = '';
 
                 }
 
                 }
 
@@ -481,8 +482,8 @@ export default {
 
                 obj.mail =
 
                 obj.mail =
 
                   uuidv4() + "@" + _this.schoolChar + "." + _this.userSuffix;
 
                   uuidv4() + "@" + _this.schoolChar + "." + _this.userSuffix;
 
               } else {
 
               } else {
 
-                if (Number(v[_this.lang.ssStuAccHd])) {
 
-                  obj.account = v[_this.lang.ssStuAccHd] + + _this.userSuffix;
 
+                if (accountVal) {
 
+                  obj.account = accountVal + '@' + _this.userSuffix;
 
                 } else {
 
                 } else {
 
                   obj.account = '';
 
                   obj.account = '';
 
                 }
 
                 }

+ 30 - 23
src/components/pages/studentManageNew/component/table.vue
Voir le fichier 

@@ -196,7 +196,7 @@
 
       >
 
       >
 
         <el-table-column
 
         <el-table-column
 
           type="selection"
 
           type="selection"
 
-          v-if="boxType == 0 || (boxType == 1 && interestType == 1)"
 
+          v-if="boxType == 0 || (boxType == 1 && interestType == 1) || boxType == 2"
 
           width="55px"
 
           width="55px"
 
         >
 
         >
 
         </el-table-column>
 
         </el-table-column>
 
@@ -322,26 +322,11 @@
 
           </template>
 
           </template>
 
         </el-table-column>
 
         </el-table-column>
 
       </el-table>
 
       </el-table>
 
-      <div
 
-        class="page_box"
 
-        v-if="boxType == 2 || (boxType == 1 && interestType == 0)"
 
-      >
 
-        <el-pagination
 
-          background
 
-          @size-change="handleSizeChange"
 
-          @current-change="handlePageChange"
 
-          :current-page.sync="page"
 
-          :page-sizes="[10, 15, 20, 25]"
 
-          :page-size="pageSize"
 
-          layout="sizes, prev, pager, next"
 
-          :total="total"
 
-        >
 
-        </el-pagination>
 
-      </div>
 
+
 
       <div
 
       <div
 
         class="page_box"
 
         class="page_box"
 
         v-if="
 
         v-if="
 
-          (boxType == 0 || (boxType == 1 && interestType == 1)) &&
 
+          (boxType == 0 || (boxType == 1 && interestType == 1) || boxType == 2) &&
 
             selectedData.length
 
             selectedData.length
 
         "
 
         "
 
       >
 
       >
 
@@ -357,7 +342,7 @@
 
               @click="cancelAllSelection"
 
               @click="cancelAllSelection"
 
               v-if="
 
               v-if="
 
                 selectedData.length != 0 &&
 
                 selectedData.length != 0 &&
 
-                  selectedData.length == tableData.length
 
+                (selectedData.length == tableData.length || selectedData.length == allTableData.length)
 
               "
 
               "
 
             >
 
             >
 
               {{ lang.ssCancelSelAll }}
 
               {{ lang.ssCancelSelAll }}
 
@@ -370,7 +355,7 @@
 
           <div
 
           <div
 
             @click="deleteSelectionStudent"
 
             @click="deleteSelectionStudent"
 
             class="action_btn"
 
             class="action_btn"
 
-            v-if="boxType == 0"
 
+            v-if="boxType == 0 || boxType == 2"
 
             style="background: #ff4d4f; color: #fff"
 
             style="background: #ff4d4f; color: #fff"
 
           >
 
           >
 
             {{ lang.Delete }}
 
             {{ lang.Delete }}
 
@@ -386,6 +371,22 @@
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
+      <div
 
+        class="page_box"
 
+        v-if="boxType == 2 || (boxType == 1 && interestType == 0)"
 
+      >
 
+        <el-pagination
 
+          background
 
+          @size-change="handleSizeChange"
 
+          @current-change="handlePageChange"
 
+          :current-page.sync="page"
 
+          :page-sizes="[10, 15, 20, 25]"
 
+          :page-size="pageSize"
 
+          layout="sizes, prev, pager, next"
 
+          :total="total"
 
+        >
 
+        </el-pagination>
 
+      </div>
 
     </div>
 
     </div>
 
 
 
     <!-- 添加兴趣班弹框 -->
 
     <!-- 添加兴趣班弹框 -->
 
@@ -899,9 +900,15 @@ export default {
 
     },
 
     },
 
     // 全选
 
     // 全选
 
     allSel() {
 
     allSel() {
 
-      this.tableData.forEach(row => {
 
-        this.$refs.tableData.toggleRowSelection(row, true);
 
-      });
 
+      if(this.boxType == 2) {
 
+        this.allTableData.forEach(row => {
 
+          this.$refs.tableData.toggleRowSelection(row, true);
 
+        });
 
+      } else {
 
+        this.tableData.forEach(row => {
 
+          this.$refs.tableData.toggleRowSelection(row, true);
 
+        });
 
+      }
 
     },
 
     },
 
     // 导出学生
 
     // 导出学生
 
     exportStudent() {
 
     exportStudent() {

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff