Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -404,7 +404,7 @@ U.MD.D.I.wankeAdminDeskIcon = [
     { "Name": "學生評價", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     { "Name": "PBL項目", "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": "CaseDesignS", "style": { "cssText": "background-image:url(/img/icon/CaseDesignS.png)" } },
+    { "Name": "項目進展", "Url": "CaseDesignS", "style": { "cssText": "background-image:url(/img/icon/CaseDesignS.png)" } },
     { "Name": "班級管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     { "Name": "我的資料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "通知公告", "Url": "notice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
@@ -6464,15 +6464,15 @@ U.MD.D.I.setContents = function (cid, s, task, t, uid, type, text, loading, span
     xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
     // 設置請求頭，表示請求體的編碼格式
     xmlhttp.send("uid=" + uid + "&cid=" + cid + "&s=" + s + "&task=" + task + "&t=" + t + "&text=" + text + "&type=" + type);
-    // 设置请求体，使用url-encoded格式的数据
+    // 設置請求體，使用url-encoded格式的數據
 }
 
 
 U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
-    var _taskbar, //_taskbar 作为任务栏显示的元素，包含图标和名字
-        _formdiv, //创建任务栏时同时弹出的窗体元素。
-        _userinfo = US.userInfo, //登录用户信息
-        _userid = US.userInfo.userid //登录用户id
+    var _taskbar, //_taskbar 作為任務欄顯示的元素，包含圖標和名字
+        _formdiv, //創建任務欄時同時彈出的窗體元素。
+        _userinfo = US.userInfo, //登錄用戶信息
+        _userid = US.userInfo.userid //登錄用戶id
     let _iframe;
     let _cid = cid,
         _stage = stage,
@@ -6490,7 +6490,7 @@ U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
             "cursor": "pointer",
             "borderRadius": "4px",
         },
-        "innerHTML": "提交作业"
+        "innerHTML": "提交作業"
     })
     let aTool = ''
     let _loading = document.createElement('div')
@@ -6502,7 +6502,7 @@ U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
     _limg.style = "width: 26px;margin-right: 10px;"
     _lchild.appendChild(_limg)
     let _lspan = document.createElement('span')
-    _lspan.innerHTML = "上传中..."
+    _lspan.innerHTML = "上傳中..."
     _lchild.appendChild(_lspan)
     _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
@@ -6545,7 +6545,7 @@ U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
                 "style": {
                     "height": "36px"
                 }
-            }).form; //创建窗体
+            }).form; //創建窗體
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -6587,7 +6587,7 @@ U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
                 _div.style = "width:100%;height:100%;background:#0000008f;position:fixed;top:0;left:0;z-index:99999999999999;display: flex;justify-content: center;align-items: center;"
                 let _inner = document.createElement('div')
                 _inner.style = "color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;"
-                _inner.innerHTML = "上传成功"
+                _inner.innerHTML = "上傳成功"
                 _div.appendChild(_inner)
                 _iframe.contentWindow.window.document.body.appendChild(_div)
                 _div.onclick = () => {
@@ -6602,10 +6602,10 @@ U.MD.D.I.openApplicationUpload = function (str, cid, stage, task, tool) {
 }
 
 U.MD.D.I.openApplicationTeacherUpload = function (str, cid, stage, task, tool, student) {
-    var _taskbar, //_taskbar 作为任务栏显示的元素，包含图标和名字
-        _formdiv, //创建任务栏时同时弹出的窗体元素。
-        _userid = student.userid, //登录用户id
-        _username = student.student //用户名字
+    var _taskbar, //_taskbar 作為任務欄顯示的元素，包含圖標和名字
+        _formdiv, //創建任務欄時同時彈出的窗體元素。
+        _userid = student.userid, //登錄用戶id
+        _username = student.student //用戶名字
     let _iframe;
     let _cid = cid,
         _stage = stage,
@@ -6623,7 +6623,7 @@ U.MD.D.I.openApplicationTeacherUpload = function (str, cid, stage, task, tool, s
             "cursor": "pointer",
             "borderRadius": "4px",
         },
-        "innerHTML": "提交作业"
+        "innerHTML": "提交作業"
     })
     let aTool = ''
     let _loading = document.createElement('div')
@@ -6635,7 +6635,7 @@ U.MD.D.I.openApplicationTeacherUpload = function (str, cid, stage, task, tool, s
     _limg.style = "width: 26px;margin-right: 10px;"
     _lchild.appendChild(_limg)
     let _lspan = document.createElement('span')
-    _lspan.innerHTML = "上传中..."
+    _lspan.innerHTML = "上傳中..."
     _lchild.appendChild(_lspan)
     _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
@@ -6678,7 +6678,7 @@ U.MD.D.I.openApplicationTeacherUpload = function (str, cid, stage, task, tool, s
                 "style": {
                     "height": "36px"
                 }
-            }).form; //创建窗体
+            }).form; //創建窗體
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -6720,7 +6720,7 @@ U.MD.D.I.openApplicationTeacherUpload = function (str, cid, stage, task, tool, s
                 _div.style = "width:100%;height:100%;background:#0000008f;position:fixed;top:0;left:0;z-index:99999999999999;display: flex;justify-content: center;align-items: center;"
                 let _inner = document.createElement('div')
                 _inner.style = "color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;"
-                _inner.innerHTML = "上传成功"
+                _inner.innerHTML = "上傳成功"
                 _div.appendChild(_inner)
                 _iframe.contentWindow.window.document.body.appendChild(_div)
                 _div.onclick = () => {