Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

lsc 1 year ago
parent
f829eb394c 2d286b5d09
commit
a671b4f058
10 changed files with 8 additions and 9 deletions
Split View Show Diff Stats
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.81fc81e9069b9bb75f00cb4eb37bc39f.css
  3. 0 0
      dist/static/css/app.81fc81e9069b9bb75f00cb4eb37bc39f.css.map
  4. 1 0
      dist/static/css/app.b62bf32bc150164441ce5ef03f653abd.css
  5. 0 0
      dist/static/js/app.f2cb31186dac94b8ef64.js.map
  6. 0 0
      dist/static/js/app.fd151ce48514b21ab03e.js
  7. 1 0
      dist/static/js/app.fd151ce48514b21ab03e.js.map
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 0 4
      src/components/pages/synergyCourse/addCourse.vue
  10. 1 5
      src/components/pages/synergyCourse/course.vue

+ 4 - 0
dist/index.html
View File 

@@ -25,7 +25,11 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.b62bf32bc150164441ce5ef03f653abd.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.f2cb31186dac94b8ef64.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.81fc81e9069b9bb75f00cb4eb37bc39f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4ae2783fdfe7ab52e4d5.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.fd151ce48514b21ab03e.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> 2d286b5d099874b68bb999919c1c5eb5d7ae66de
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.81fc81e9069b9bb75f00cb4eb37bc39f.css


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


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


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


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


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


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


+ 0 - 4
src/components/pages/synergyCourse/addCourse.vue
View File 

@@ -1799,11 +1799,7 @@
 
           @current-change="handleCurrentChange"></el-pagination>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
-<<<<<<< HEAD
 
         <el-button @click="dialogVisibleMember = false;">取 消</el-button>
 
-=======
 
-        <el-button @click="dialogVisibleMember = false">取 消</el-button>
 
->>>>>>> 8c46a58ae3ab9d21e5cba63afb0429906a3f0988
 
         <el-button type="primary" @click="isAddPPTeacher">确定</el-button>
 
       </span>
 
     </el-dialog>

+ 1 - 5
src/components/pages/synergyCourse/course.vue
View File 

@@ -31,11 +31,7 @@
 
               <div class="search">
 
                 <img src="../../../assets/icon/search.png" alt="" />
 
               </div>
 
-<<<<<<< HEAD
 
               <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @change="getCourse()" @input="getCourse()" />
 
-=======
 
-              <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @input="getCourse()" />
 
->>>>>>> 8c46a58ae3ab9d21e5cba63afb0429906a3f0988
 
             </div>
 
             <el-button type="primary" class="bgColor" style="margin-left: 10px;" @click="reset">重置</el-button>
 
           </div>
 
@@ -517,7 +513,7 @@ export default {
 
       }
 
     },
 
     open(cid, uid) {
 
-      if (uid == this.userid) {
 
+      if (uid == this.userid || top.US.userInfo.type==1) {
 
         window.parent.postMessage(
 
           {
 
             tools: "opencCscl",

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