Browse Source

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

zengyicheng 2 years ago
parent
commit
bb771acb1d

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.e756965ccacc05fe2b5b0589fc0d9b21.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.37b02eea291a1eb9d935.js></script><script type=text/javascript src=./static/js/app.01012e3e9a1fcc473b9e.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.8bd3cecf0bd5f4030bc71ead4d0debff.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.93aef57e5c1409a1705e.js></script><script type=text/javascript src=./static/js/app.739abcd281687074399b.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


BIN
dist/static/img/isNoMessage.daf5b17.png


BIN
dist/static/img/noticeBg.fbf2d4e.png


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.739abcd281687074399b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.93aef57e5c1409a1705e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.93aef57e5c1409a1705e.js.map


+ 3 - 1
src/components/pages/scourse.vue

@@ -2,7 +2,7 @@
   <div class="pb_content" style="height: auto">
     <div class="pb_head top">
       <div>
-        <span>学生项目</span>
+        <span>{{orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" : "学生项目"}}</span>
         <!-- <span class="subClick" @click="
           goTo('/works?userid=' + userid + '&oid=' + oid + '&org=' + org)
         ">评价管理</span> -->
@@ -204,6 +204,8 @@ export default {
       oid: this.$route.query.oid,
       org: this.$route.query.org,
       role: this.$route.query.role,
+      orgArray:["150e3120-9195-11ed-b13d-005056b86db5"],
+      oidArray:[],
       Juri: "",
       groupList: [],
       JuriList: [],

+ 3 - 1
src/components/pages/student/addCourse.vue

@@ -102,7 +102,7 @@
                     oid +
                     '&org=' +
                     org,
-                }">学生项目</el-breadcrumb-item>
+                }">{{orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" : "学生项目"}}</el-breadcrumb-item>
                 <el-breadcrumb-item>
                   <span style="color: rgb(15, 126, 255)">添加项目</span>
                 </el-breadcrumb-item>
@@ -1584,6 +1584,8 @@ export default {
       oid: this.$route.query.oid,
       org: this.$route.query.org,
       cid: this.$route.query.cid != undefined ? this.$route.query.cid : "",
+      orgArray:["150e3120-9195-11ed-b13d-005056b86db5"],
+      oidArray:[],
       dialogVisibleTable: false,
       tableJson: { text: "" },
       cover: [], //项目封面

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

@@ -2,7 +2,7 @@
   <div class="pb_content" style="height: auto">
     <div class="pb_head top">
       <div>
-        <span>学生项目</span>
+        <span>{{orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" : "学生项目"}}</span>
         <!-- <span class="subClick" @click="
           goTo('/works?userid=' + userid + '&oid=' + oid + '&org=' + org)
         ">评价管理</span> -->
@@ -204,6 +204,8 @@ export default {
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
       org: this.$route.query.org,
+      orgArray:["150e3120-9195-11ed-b13d-005056b86db5"],
+      oidArray:[],
       Juri: "",
       groupList: [],
       JuriList: [],

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