Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -590,8 +590,8 @@ U.MD.D.I.hkteacherDeskIcon = [
     { "Name": "學生評價", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     { "Name": "項目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "項目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
-    { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
-    { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
+    // { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
+    // { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
     { "Name": "班級管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     // { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "學習分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
@@ -3730,7 +3730,7 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_Jie' + cid + stage + task + tool+_userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -4117,7 +4117,7 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
                 "'" +
                 ", " +
                 "'" +
-                str + '_loadLi' +
+                (str + '_loadLi_Jie' + cid + stage + task + tool+_userid) +
                 "'" +
                 ", " +
                 "'" +
@@ -4188,7 +4188,7 @@ U.MD.D.I.openApplicationJieE = function (str, cid, stage, task, tool) {
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_JieE' + cid + stage + task + tool+_userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -4575,7 +4575,7 @@ U.MD.D.I.openApplicationJieE = function (str, cid, stage, task, tool) {
                 "'" +
                 ", " +
                 "'" +
-                str + '_loadLi' +
+                (str + '_loadLi_JieE' + cid + stage + task + tool+_userid) +
                 "'" +
                 ", " +
                 "'" +
@@ -4646,7 +4646,7 @@ U.MD.D.I.openApplicationJieTeacher = function (str, cid, stage, task, tool, stud
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi' + _userid
+    _box.id = str + '_loadLi_JieTeacher' + cid + stage + task + tool+_userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -5033,7 +5033,7 @@ U.MD.D.I.openApplicationJieTeacher = function (str, cid, stage, task, tool, stud
                 "'" +
                 ", " +
                 "'" +
-                str + '_loadLi' + _userid +
+                (str + '_loadLi_JieTeacher' + cid + stage + task + tool+_userid) +
                 "'" +
                 ", " +
                 "'" +
@@ -5098,7 +5098,7 @@ U.MD.D.I.openApplicationJieTeacherE = function (str, cid, stage, task, tool, stu
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi' + _userid
+    _box.id = str + '_loadLi_JieTeacherE'  + cid + stage + task + tool + _userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -5485,7 +5485,7 @@ U.MD.D.I.openApplicationJieTeacherE = function (str, cid, stage, task, tool, stu
                 "'" +
                 ", " +
                 "'" +
-                str + '_loadLi' + _userid +
+                (str + '_loadLi_JieTeacherE' + cid + stage + task + tool+_userid) +
                 "'" +
                 ", " +
                 "'" +
@@ -5602,7 +5602,7 @@ U.MD.D.I.openApplicationJieS = function (str, cid, stage, task, tool) {
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_JieS' + cid + stage + task + tool+_userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -5835,7 +5835,7 @@ U.MD.D.I.openApplicationJieS = function (str, cid, stage, task, tool) {
                 "'" +
                 ", " +
                 "'" +
-                str + '_loadLi' +
+                (str + '_loadLi_JieS' + cid + stage + task + tool+_userid) +
                 "'" +
                 ", " +
                 "'" +
@@ -5907,7 +5907,7 @@ U.MD.D.I.openApplicationJieStudio = function (str, cid, stage, task, tool) {
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_JieStudio' + cid + stage + task + tool+_userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -6140,7 +6140,7 @@ U.MD.D.I.openApplicationJieStudio = function (str, cid, stage, task, tool) {
                 "'" +
                 ", " +
                 "'" +
-                str + '_loadLi' +
+                (str + '_loadLi_JieStudio' + cid + stage + task + tool+_userid) +
                 "'" +
                 ", " +
                 "'" +
@@ -6212,7 +6212,7 @@ U.MD.D.I.openApplicationYu = function (str, cid, stage, task, tool) {
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_Yu' + cid + stage + task + tool+_userid
     switch (str) {
         case "whiteboard":
             aTool = 1;
@@ -6396,7 +6396,7 @@ U.MD.D.I.openApplicationYu = function (str, cid, stage, task, tool) {
             }
             _loading.style.display = 'flex'
 
-            U.MD.D.I.setContents(cid, stage, task, tool, _userid, type, text, _loading, _lspan)
+            U.MD.D.I.setContents(_cid, _stage, _task, _tool, _userid, type, text, _loading, _lspan)
         }
     }
 
@@ -6548,7 +6548,7 @@ U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_Upload' + cid + stage + task + tool+_userid
     switch (str) {
         case "CocoPi":
             aTool = 57;
@@ -6684,7 +6684,7 @@ U.MD.D.I.openApplicationTeacherUpload = function (str, cid, stage, task, tool, s
         },
     })
     _box.appendChild(_loading)
-    _box.id = str + '_loadLi'
+    _box.id = str + '_loadLi_TeacherUpload' + cid + stage + task + tool+_userid
     switch (str) {
         case "CocoPi":
             aTool = 57;