صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
CocoRoboLabs
/
pbl-teacher-table
3
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

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

zengyicheng 2 سال پیش
والد
266077c89e 26660bd87b
کامیت
4d2dc9cf14
16فایلهای تغییر یافته به همراه64 افزوده شده و 27 حذف شده
نمای یکپارچه نمایش آمار تفاوت ها
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.6c9227bbe345ea5c2d2d500b63c4f273.css
  3. 0 0
      dist/static/css/app.6c9227bbe345ea5c2d2d500b63c4f273.css.map
  4. 0 0
      dist/static/css/app.fcf27be1e0cb30222afb0f161e4bef6f.css.map
  5. 0 0
      dist/static/js/app.5aa774ef848a8a73ba43.js
  6. 0 0
      dist/static/js/app.b6346b38edd420493e0c.js
  7. 0 0
      dist/static/js/app.b6346b38edd420493e0c.js.map
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 5 3
      src/components/pages/addCourse.vue
  10. 11 5
      src/components/pages/course.vue
  11. 12 4
      src/components/pages/evaluation.vue
  12. 5 1
      src/components/pages/inviteLogin/inviteLogin.vue
  13. 14 6
      src/components/pages/scourse.vue
  14. 3 2
      src/components/pages/student/addCourse.vue
  15. 2 1
      src/components/pages/works.vue
  16. 11 4
      src/components/tools/seeBoard.vue

+ 1 - 1
dist/index.html
مشاهده فایل 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.fcf27be1e0cb30222afb0f161e4bef6f.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.d2a60cf4f8d4649786e6.js></script><script type=text/javascript src=./static/js/app.5aa774ef848a8a73ba43.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.6c9227bbe345ea5c2d2d500b63c4f273.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.d2a60cf4f8d4649786e6.js></script><script type=text/javascript src=./static/js/app.b6346b38edd420493e0c.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) {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.6c9227bbe345ea5c2d2d500b63c4f273.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.6c9227bbe345ea5c2d2d500b63c4f273.css.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.fcf27be1e0cb30222afb0f161e4bef6f.css.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.5aa774ef848a8a73ba43.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.b6346b38edd420493e0c.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.b6346b38edd420493e0c.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 5 - 3
src/components/pages/addCourse.vue
مشاهده فایل 

@@ -95,7 +95,7 @@
 
                     '&oid=' +
 
                     '&oid=' +
 
                     oid +
 
                     oid +
 
                     '&org=' +
 
                     '&org=' +
 
-                    org,
 
+                    org + '&role=' + role,
 
                 }">课程管理</el-breadcrumb-item>
 
                 }">课程管理</el-breadcrumb-item>
 
                 <el-breadcrumb-item>
 
                 <el-breadcrumb-item>
 
                   <span style="color: rgb(15, 126, 255)">添加课程</span>
 
                   <span style="color: rgb(15, 126, 255)">添加课程</span>
 
@@ -2007,7 +2007,7 @@
 
           </div>
 
           </div>
 
           <div class="info_btnBox">
 
           <div class="info_btnBox">
 
             <button class="info_btn" v-if="steps == 1" @click="
 
             <button class="info_btn" v-if="steps == 1" @click="
 
-              goTo('/course?userid=' + userid + '&oid=' + oid + '&org=' + org)
 
+              goTo('/course?userid=' + userid + '&oid=' + oid + '&org=' + org + '&role=' + role)
 
             ">
 
             ">
 
               返回课程
 
               返回课程
 
             </button>
 
             </button>
 
@@ -3036,6 +3036,7 @@ export default {
 
       userid: this.$route.query.userid,
 
       userid: this.$route.query.userid,
 
       oid: this.$route.query.oid,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
       org: this.$route.query.org,
 
+      role: this.$route.query.role,
 
       cid: this.$route.query.cid != undefined ? this.$route.query.cid : "",
 
       cid: this.$route.query.cid != undefined ? this.$route.query.cid : "",
 
       dialogVisibleTable: false,
 
       dialogVisibleTable: false,
 
       dialogVisibleWord: false,
 
       dialogVisibleWord: false,
 
@@ -3426,7 +3427,8 @@ export default {
 
           "&oid=" +
 
           "&oid=" +
 
           this.oid +
 
           this.oid +
 
           "&org=" +
 
           "&org=" +
 
-          this.org
 
+          this.org + 
+          + '&role=' + this.role
 
         );
 
         );
 
       } else {
 
       } else {
 
         if (this.cidType == 0) {
 
         if (this.cidType == 0) {

+ 11 - 5
src/components/pages/course.vue
مشاهده فایل 

@@ -6,7 +6,7 @@
 
         <span
 
         <span
 
           class="subClick"
 
           class="subClick"
 
           @click="
 
           @click="
 
-            goTo('/works?userid=' + userid + '&oid=' + oid + '&org=' + org)
 
+            goTo('/works?userid=' + userid + '&oid=' + oid + '&org=' + org+ '&role=' + role)
 
           "
 
           "
 
           >评价管理</span
 
           >评价管理</span
 
         >
 
         >
 
@@ -151,7 +151,7 @@
 
             </div>
 
             </div>
 
             <div class="three_bottom">
 
             <div class="three_bottom">
 
               <div @click="jump(item.courseId)">评课</div>
 
               <div @click="jump(item.courseId)">评课</div>
 
-              <div v-if="groupA == '0'" @click="goToCourse(item.courseId)">
 
+              <div v-if="(item.userid == userid || item.course_teacher.indexOf(userid) != -1)" @click="goToCourse(item.courseId)">
 
                 修改
 
                 修改
 
               </div>
 
               </div>
 
               <div
 
               <div
 
@@ -165,7 +165,9 @@
 
                       '&oid=' +
 
                       '&oid=' +
 
                       oid +
 
                       oid +
 
                       '&org=' +
 
                       '&org=' +
 
-                      org
 
+                      org +
 
+                      '&role=' +
 
+                      role 
                   )
 
                   )
 
                 "
 
                 "
 
               >
 
               >
 
@@ -376,7 +378,9 @@ export default {
 
             "&oid=" +
 
             "&oid=" +
 
             this.oid +
 
             this.oid +
 
             "&org=" +
 
             "&org=" +
 
-            this.org
 
+            this.org + 
+            "&role=" +
 
+            this.role
 
         );
 
         );
 
       } else {
 
       } else {
 
         this.$router.push(
 
         this.$router.push(
 
@@ -385,7 +389,9 @@ export default {
 
             "&oid=" +
 
             "&oid=" +
 
             this.oid +
 
             this.oid +
 
             "&org=" +
 
             "&org=" +
 
-            this.org
 
+            this.org + 
+            "&role=" +
 
+            this.role
 
         );
 
         );
 
       }
 
       }
 
       // this.$router.push(path);
 
       // this.$router.push(path);

+ 12 - 4
src/components/pages/evaluation.vue
مشاهده فایل 

@@ -91,6 +91,10 @@
 
               @change="setMindData"
 
               @change="setMindData"
 
             ></el-input>
 
             ></el-input>
 
           </div>
 
           </div>
 
+          <el-button @click="addEJson" type="text" v-if="!update"
 
+          >保存</el-button
 
+        >
 
+        <el-button @click="updateEJson" type="text" v-else>保存</el-button>
 
         </div>
 
         </div>
 
         <div class="e_add_content">
 
         <div class="e_add_content">
 
           <div class="e_add_list">
 
           <div class="e_add_list">
 
@@ -424,6 +428,7 @@ export default {
 
     },
 
     },
 
     handleCurrentChange(val) {
 
     handleCurrentChange(val) {
 
       this.page = val;
 
       this.page = val;
 
+      this.getData();
 
     },
 
     },
 
     handleClose(done) {
 
     handleClose(done) {
 
       done();
 
       done();
 
@@ -574,7 +579,7 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .post(this.$store.state.api + "addEvaluation", params)
 
         .post(this.$store.state.api + "addEvaluation", params)
 
         .then((res) => {
 
         .then((res) => {
 
-          this.$message.success("添加成功");
 
+          this.$message.success("保存成功");
 
           this.init();
 
           this.init();
 
           this.dialogVisible = false;
 
           this.dialogVisible = false;
 
           this.getData();
 
           this.getData();
 
@@ -744,6 +749,9 @@ export default {
 
 .dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
 
 .dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
 
   color: #fff;
 
   color: #fff;
 
 }
 
 }
 
+.dialog_diy >>> .el-dialog__body{
 
+  padding:15px 20px 0;
 
+}
 
 .dialog_diy >>> .el-dialog__body,
 
 .dialog_diy >>> .el-dialog__body,
 
 .dialog_diy >>> .el-dialog__footer {
 
 .dialog_diy >>> .el-dialog__footer {
 
   background: #e6eaf0;
 
   background: #e6eaf0;
 
@@ -891,14 +899,14 @@ export default {
 
   display: flex;
 
   display: flex;
 
   width: 100%;
 
   width: 100%;
 
   overflow: auto;
 
   overflow: auto;
 
-  height: 550px;
 
+  height: 530px;
 
 }
 
 }
 
 .e_add_list {
 
 .e_add_list {
 
   background: #fff;
 
   background: #fff;
 
   height: 500px;
 
   height: 500px;
 
   width: 210px;
 
   width: 210px;
 
   position: relative;
 
   position: relative;
 
-  margin: 15px 5px 0 0;
 
+  margin: 15px 10px 0 0;
 
   flex-shrink: 0;
 
   flex-shrink: 0;
 
   display: flex;
 
   display: flex;
 
   flex-direction: column;
 
   flex-direction: column;
 
@@ -941,7 +949,7 @@ export default {
 
   justify-content: center;
 
   justify-content: center;
 
   position: relative;
 
   position: relative;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
-  padding: 15px 40px;
 
+  padding: 15px 62px 15px 30px;
 
   text-align: center;
 
   text-align: center;
 
 }
 
 }
 
 .e_add_list_child span {
 
 .e_add_list_child span {

+ 5 - 1
src/components/pages/inviteLogin/inviteLogin.vue
مشاهده فایل 

@@ -44,7 +44,8 @@ export default {
 
             loading: false,
 
             loading: false,
 
             res: {},
 
             res: {},
 
             classJuri: [],
 
             classJuri: [],
 
-            code: this.$route.query.code
 
+            code: this.$route.query.code,
 
+            courseId:""
 
         }
 
         }
 
     },
 
     },
 
     methods: {
 
     methods: {
 
@@ -68,6 +69,7 @@ export default {
 
                     this.loading = false;
 
                     this.loading = false;
 
                     if (res.data.length && res.data[0].length) {
 
                     if (res.data.length && res.data[0].length) {
 
                         this.res = res.data[0][0]
 
                         this.res = res.data[0][0]
 
+                        this.courseId = res.data[0][0].courseId
 
                         this.getClass(res.data[0][0].classid)
 
                         this.getClass(res.data[0][0].classid)
 
                     } else {
 
                     } else {
 
                         this.$message.error("不存在此随机码")
 
                         this.$message.error("不存在此随机码")
 
@@ -92,6 +94,7 @@ export default {
 
                 });
 
                 });
 
         },
 
         },
 
         login(userid,username) {
 
         login(userid,username) {
 
+            let courseid = this.courseId
 
             this.$confirm(`确定登录${username}的账号吗?`, "提示", {
 
             this.$confirm(`确定登录${username}的账号吗?`, "提示", {
 
                 confirmButtonText: "确定",
 
                 confirmButtonText: "确定",
 
                 cancelButtonText: "取消",
 
                 cancelButtonText: "取消",
 
@@ -102,6 +105,7 @@ export default {
 
                         {
 
                         {
 
                             tools: "inviteLogin",
 
                             tools: "inviteLogin",
 
                             userid: userid,
 
                             userid: userid,
 
+                            courseId: courseid
 
                         },
 
                         },
 
                         "*"
 
                         "*"
 
                     );
 
                     );

+ 14 - 6
src/components/pages/scourse.vue
مشاهده فایل 

@@ -21,7 +21,7 @@
 
               <el-option value="3" label="全部项目"></el-option>
 
               <el-option value="3" label="全部项目"></el-option>
 
               <el-option value="0" label="我的项目"></el-option>
 
               <el-option value="0" label="我的项目"></el-option>
 
               <el-option value="1" label="协同项目"></el-option>
 
               <el-option value="1" label="协同项目"></el-option>
 
-              <el-option value="2" label="他人项目"></el-option>
 
+              <el-option value="2" label="他人项目" v-if="oid != '1c3b9def-8fbe-11ed-b13d-005056b86db5'"></el-option>
 
             </el-select>
 
             </el-select>
 
             <el-select v-model="groupA" @change="search" v-else>
 
             <el-select v-model="groupA" @change="search" v-else>
 
               <el-option value="4" label="全部项目"></el-option>
 
               <el-option value="4" label="全部项目"></el-option>
 
@@ -77,7 +77,7 @@
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
             <div class="three_bottom">
 
             <div class="three_bottom">
 
-              <div @click="goToCourse2(item.courseId)" v-if="groupA != '2'">编辑</div>
 
+              <div @click="goToCourse2(item.courseId)" v-if="(item.userid == userid || item.course_teacher.indexOf(userid) != -1)">编辑</div>
 
               <div @click="get(item.courseId)">预览</div>
 
               <div @click="get(item.courseId)">预览</div>
 
               <!-- 项目进展 -->
 
               <!-- 项目进展 -->
 
               <div @click="getA(item.courseId)">进展</div>
 
               <div @click="getA(item.courseId)">进展</div>
 
@@ -138,7 +138,9 @@
 
                 '&oid=' +
 
                 '&oid=' +
 
                 oid +
 
                 oid +
 
                 '&org=' +
 
                 '&org=' +
 
-                org
 
+                org+
 
+                '&role=' +
 
+                role 
               )
 
               )
 
             ">
 
             ">
 
               编辑
 
               编辑
 
@@ -246,7 +248,9 @@ export default {
 
           "&oid=" +
 
           "&oid=" +
 
           this.oid +
 
           this.oid +
 
           "&org=" +
 
           "&org=" +
 
-          this.org
 
+          this.org +
 
+          "&role=" +
 
+          this.role 
         );
 
         );
 
       } else {
 
       } else {
 
         this.$router.push(
 
         this.$router.push(
 
@@ -255,7 +259,9 @@ export default {
 
           "&oid=" +
 
           "&oid=" +
 
           this.oid +
 
           this.oid +
 
           "&org=" +
 
           "&org=" +
 
-          this.org
 
+          this.org +
 
+          "&role=" +
 
+          this.role 
         );
 
         );
 
       }
 
       }
 
       // this.$router.push(path);
 
       // this.$router.push(path);
 
@@ -270,7 +276,9 @@ export default {
 
           this.oid +
 
           this.oid +
 
           "&org=" +
 
           "&org=" +
 
           this.org +
 
           this.org +
 
-          "&type=2"
 
+          "&type=2"+
 
+          "&role=" +
 
+          this.role 
         );
 
         );
 
     },
 
     },
 
     tableRowClassName({ row, rowIndex }) {
 
     tableRowClassName({ row, rowIndex }) {

+ 3 - 2
src/components/pages/student/addCourse.vue
مشاهده فایل 

@@ -1983,7 +1983,7 @@
 
               v-if="steps == 1"
 
               v-if="steps == 1"
 
               @click="
 
               @click="
 
                 goTo(
 
                 goTo(
 
-                  fpath + '?userid=' + userid + '&oid=' + oid + '&org=' + org
 
+                  fpath + '?userid=' + userid + '&oid=' + oid + '&org=' + org + '&role=' + role 
                 )
 
                 )
 
               "
 
               "
 
             >
 
             >
 
@@ -4020,6 +4020,7 @@ export default {
 
       userid: this.$route.query.userid,
 
       userid: this.$route.query.userid,
 
       oid: this.$route.query.oid,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
       org: this.$route.query.org,
 
+      role: this.$route.query.role,
 
       type: this.$route.query.type,
 
       type: this.$route.query.type,
 
       cid: this.$route.query.cid != undefined ? this.$route.query.cid : "",
 
       cid: this.$route.query.cid != undefined ? this.$route.query.cid : "",
 
       orgArray: ["150e3120-9195-11ed-b13d-005056b86db5"],
 
       orgArray: ["150e3120-9195-11ed-b13d-005056b86db5"],
 
@@ -4522,7 +4523,7 @@ export default {
 
             "&oid=" +
 
             "&oid=" +
 
             this.oid +
 
             this.oid +
 
             "&org=" +
 
             "&org=" +
 
-            this.org
 
+            this.org + '&role=' + role 
         );
 
         );
 
       } else {
 
       } else {
 
         if (this.cidttt == 0) {
 
         if (this.cidttt == 0) {

+ 2 - 1
src/components/pages/works.vue
مشاهده فایل 

@@ -43,7 +43,7 @@
 
           <span
 
           <span
 
             v-else
 
             v-else
 
             @click="
 
             @click="
 
-              goTo('/course?userid=' + userid + '&oid=' + oid + '&org=' + org)
 
+              goTo('/course?userid=' + userid + '&oid=' + oid + '&org=' + org + '&role=' + role)
 
             "
 
             "
 
             >课程管理</span
 
             >课程管理</span
 
           >
 
           >
 
@@ -384,6 +384,7 @@ export default {
 
       cn: "",
 
       cn: "",
 
       userid: this.$route.query.userid,
 
       userid: this.$route.query.userid,
 
       org: this.$route.query.org,
 
       org: this.$route.query.org,
 
+      role: this.$route.query.role,
 
       oid: this.$route.query.oid,
 
       oid: this.$route.query.oid,
 
       type: this.$route.query.type,
 
       type: this.$route.query.type,
 
       dialogVisible: false,
 
       dialogVisible: false,

+ 11 - 4
src/components/tools/seeBoard.vue
مشاهده فایل 

@@ -178,6 +178,7 @@ export default {
 
 .bbt_c1 {
 
 .bbt_c1 {
 
   display: flex;
 
   display: flex;
 
   width: 100%;
 
   width: 100%;
 
+  height: 100%;
 
 }
 
 }
 
 .bbt_c1_div {
 
 .bbt_c1_div {
 
   display: flex;
 
   display: flex;
 
@@ -186,12 +187,14 @@ export default {
 
   border-bottom: 2px solid #000;
 
   border-bottom: 2px solid #000;
 
   max-width: 110px;
 
   max-width: 110px;
 
   width: 110px;
 
   width: 110px;
 
-  min-height: 50px;
 
+  /* min-height: 50px; */
 
+  /* height: 100%; */
 
   font-size: 16px;
 
   font-size: 16px;
 
   background: rgb(171, 179, 214);
 
   background: rgb(171, 179, 214);
 
   color: #000;
 
   color: #000;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   padding: 5px 10px;
 
   padding: 5px 10px;
 
+  word-break: break-all;
 
 }
 
 }
 
 .bbt_c2 {
 
 .bbt_c2 {
 
   display: flex;
 
   display: flex;
 
@@ -208,11 +211,13 @@ export default {
 
   max-width: 110px;
 
   max-width: 110px;
 
   width: 110px;
 
   width: 110px;
 
   border-bottom: 2px solid #000;
 
   border-bottom: 2px solid #000;
 
-  min-height: 50px;
 
+  /* min-height: 50px; */
 
+  /* height: 100%; */
 
   background: rgb(189, 194, 226);
 
   background: rgb(189, 194, 226);
 
   color: #000;
 
   color: #000;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   padding: 5px 10px;
 
   padding: 5px 10px;
 
+  word-break: break-all;
 
 }
 
 }
 
 .bbt_c3 {
 
 .bbt_c3 {
 
   display: flex;
 
   display: flex;
 
@@ -225,14 +230,16 @@ export default {
 
   display: flex;
 
   display: flex;
 
   align-items: center;
 
   align-items: center;
 
   justify-content: center;
 
   justify-content: center;
 
-  min-height: 50px;
 
-  width: 100%;
 
+  /* min-height: 50px; */
 
   height: 100%;
 
   height: 100%;
 
+  width: 100%;
 
+  /* height: 100%; */
 
   background: rgb(214, 216, 234);
 
   background: rgb(214, 216, 234);
 
   color: #000;
 
   color: #000;
 
   border-bottom: 2px solid #000;
 
   border-bottom: 2px solid #000;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   padding: 5px 10px;
 
   padding: 5px 10px;
 
+  word-break: break-all;
 
 }
 
 }
 
 .bl {
 
 .bl {
 
   border-left: 2px solid #000;
 
   border-left: 2px solid #000;

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است