Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

zengyicheng 2 years ago
parent
commit
a7e40399da

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.22544e65192b2635a607b0fd96e13326.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2f67952e7fcc55561412.js></script><script type=text/javascript src=./static/js/app.679a6626ae5248e28995.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.91b02d51c694c0ac601f77057eeb842b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2f67952e7fcc55561412.js></script><script type=text/javascript src=./static/js/app.7d1b695aab55962fc7d3.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


+ 20 - 0
src/components/index.vue

@@ -282,6 +282,26 @@ export default {
             }
           }
         }
+      } else if (typeName == "学院") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
       } else if (typeName == "学科") {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {

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