Skip to content

L
learn-online-pc
提交 9e516cfd authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

merge

上级 26f8116b f33ec5e9
显示空白字符变更
内嵌 并排
正在显示 包含 1367 行增加 和 418 行删除
client/.config.dev.js
浏览文件 @ 9e516cfd
module.exports = { module.exports = {
demain: 'dev.ezijing.com', domain: 'dev.ezijing.com',
url: 'https://collage-learning2.ezijing.com/api', url: 'https://collage-learning2.ezijing.com/api',
apiBaseURL: '/', apiBaseURL: '/',
others: { others: {
url: '/app/learn/course' url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/ecollage/login/index'
}, },
webpack: { webpack: {
externals: { externals: {
......
client/.config.pro.js
浏览文件 @ 9e516cfd
...@@ -3,7 +3,8 @@ module.exports = { ...@@ -3,7 +3,8 @@ module.exports = {
DesDir: '../client-dist', DesDir: '../client-dist',
apiBaseURL: '/', apiBaseURL: '/',
others: { others: {
url: '/app/learn/course' url: '/app/learn/course',
loginUrl: 'https://login.ezijing.com/ecollage/login/index'
}, },
webpack: { webpack: {
externals: { externals: {
......
client/.config.test.js
浏览文件 @ 9e516cfd
...@@ -3,7 +3,8 @@ module.exports = { ...@@ -3,7 +3,8 @@ module.exports = {
DesDir: '../client-dist', DesDir: '../client-dist',
apiBaseURL: '/', apiBaseURL: '/',
others: { others: {
url: '/app/learn/course' url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/ecollage/login/index'
}, },
isUploadStatic: false, isUploadStatic: false,
webpack: { webpack: {
......
client/build/.key 0 → 100755
浏览文件 @ 9e516cfd
<html>
<head><title>404 Not Found</title></head>
<body bgcolor="white">
<center><h1>404 Not Found</h1></center>
<hr><center>nginx/1.12.0</center>
</body>
</html>
client/build/.pem 0 → 100755
浏览文件 @ 9e516cfd
<html>
<head><title>404 Not Found</title></head>
<body bgcolor="white">
<center><h1>404 Not Found</h1></center>
<hr><center>nginx/1.12.0</center>
</body>
</html>
client/build/checkNodeVersion.js 0 → 100644
浏览文件 @ 9e516cfd
var semver = require('semver')
var requiredVersion = require('../package.json').engines.node
function checkNodeVersion (wanted, id) {
if (!semver.satisfies(process.version, wanted)) {
console.log('\x1b[91m%s\x1B[0m',
'You are using Node ' + process.version + ', but this version of ' + id +
' requires Node ' + wanted + '.\nPlease upgrade your Node version.'
)
process.exit(1)
}
}
checkNodeVersion(requiredVersion, '`node uploadAliyunCDN.js`')
client/build/config.js
浏览文件 @ 9e516cfd
const isDev = process.env.NODE_ENV const isDev = process.env.NODE_ENV
const RegStrs = require('./regExpStr.js')
let config = { let config = {
isDev: isDev, isDev: isDev,
...@@ -12,6 +13,8 @@ let config = { ...@@ -12,6 +13,8 @@ let config = {
isHttps: true, isHttps: true,
isEnableToIphoneDebugger: false,
CDN_BASE: 'https://zws-imgs-pub.ezijing.com/', CDN_BASE: 'https://zws-imgs-pub.ezijing.com/',
CDN_DIR: 'static/build/learn-ecollage/', CDN_DIR: 'static/build/learn-ecollage/',
isUploadStatic: false, isUploadStatic: false,
...@@ -19,10 +22,12 @@ let config = { ...@@ -19,10 +22,12 @@ let config = {
webpack: {} webpack: {}
} }
config.RegStrs = RegStrs
let vueClientConfig = {} let vueClientConfig = {}
config.domain = 'dev.ezijing.com' config.domain = ''
if (config.isDev === 'development') { if (config.isDev === 'development') {
config.url = 'http://dev.ezijing.com:12002' config.url = 'http://' + config.domain + ':12002'
try { try {
vueClientConfig = require('../.config.dev.js') vueClientConfig = require('../.config.dev.js')
} catch (error) { } catch (error) {
......
client/build/dev.ezijing.com.key 0 → 100755
浏览文件 @ 9e516cfd
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAgddAmdjWL+4JUXvmiR/lr9cbdoctEGLwdLpnIrRlL/oVKubZ
TrASed5pA2kHKUbbV9i64iNIzn668ziytivudRiuGL4wBTPdtlpkSty9ij0ZHZXe
23oWQ73fV3FNROp3ekLmIYHqo2ep5hhfq1A4Sey7IM1Z0A9OF6MV7Tgqm+8a6Fy4
eNbgx99f0n7nquGjYZ3RcnU0j6xzfQhOqOYmhk4flQqSx6Mb6sSmWM7V4/h/554L
QyJNV3ngNfT3ZFmAmhIZt7n+o3svzIqwghiZSj0K9jyE7zbSZjVUBEQztFUcfYgP
ZQfZFFsdgIkFSvR3cXIpIiN8oPf8xK6naApOXwIDAQABAoIBAHKlKKJvZvgdO1ca
ir1rT7jKu7IVu4GritvWtzhahrotHEGsYhZru3SmIJ1lQHB+4zAW6zS/qQrDtbkK
yCm4cq4sI5UvYWFGoa7g84tyi12jgyiva37ptv0Li0g/f9WpHePzbBYMC61K3CaS
QO8YPwtvHu/gwjvHN9IBK1wxatYRriAfR6CF2+pfZXhlq3nprc0z9YypExLg2Swa
ML1uQGLObDHAFKheVFYOgWOncMbG5eXNV9mdfzoUuc+mkENDtynQUTzI2ZM4OZFr
uMjto7y4RLFu463Rg0ijg2MXL4FbygzclaePNL7YBS6wed0Z8cE26FvbG5vM//Qc
qYK+WBECgYEA0FdJ7tPzgBvn4VsvBBdA8gmmFmmD/TJxehrxAwn/x0QkcZa6ngxJ
ScgcicJ2OSM049zId35KA4OV7aGUC6QKdG6JbL00Wqg9xWbsHiiB9XzV1iDghTug
35cDWhRN8SnMgBhQ85l5ps8NJuLS/fqLBK0/yeE54mkWKqvD4JS39KcCgYEAn4rl
Uc4PQ/xkgCKCTOCIYmzvDUuZcS0pA0MU/uJ/aQIwaJFanIehczs6Wg/Gb0YhKx0h
cMDuvZYY2XjbCic8eDNE7ED0hUHBAa8VAQZwS22ds/qNoooCO5UcHPRevenb/dIk
oKQTrI+4e5izQtuV3YLJMeH5Ba9bUP45iaZDt4kCgYEAnBGnmrc/46oD7HdoIwJg
bm/38TYd3+CXzUa9YO9uohFT05t8NMUzaYf0iOYZtfe/uSo9KfZ672L1P0wZIRdD
lbDwVXru6zK5A1V0b6scn49iiMOcLXJbsuLnaeVn9c7AGP0eNz2zOdhFG+oy8Htt
BJXcARktSYQ7TL/bPjNqEmUCgYB54o8XVCltcyEEk1igitkm+LoYmiz7vdibWWBs
6XUVMErzWDi1ZRj/A7ysmWisEhO88GBf18WMqWMKob4Vn6we2GxLYcRtGbLuKmgN
hHG97lyQ51XVW0IhauUzaa4HwOYEn8rDvxYYuyPhqOMqrL9tn0E+DrlEkpdc5Rvo
AVGyoQKBgGYvAeoKrdkfLUUnvRBIju9/bg5H6t1MY8lYi4WEnL+aPn056LV43LU9
+gF7+S7f8Er6WiJCCb7laYeDyC5adqnF/fI//4iNsarid86blirXfJMSfTG+GkZM
OEBHd/sX0IbRUt6MCxiG3Znmdpny3/MG4CegPMtdohQktQEAS2yJ
-----END RSA PRIVATE KEY-----
client/build/dev.ezijing.com.pem 0 → 100755
浏览文件 @ 9e516cfd
-----BEGIN CERTIFICATE-----
MIIFiDCCBHCgAwIBAgIQAepAKb4wAxmrtof7BwPQSDANBgkqhkiG9w0BAQsFADBu
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
RFYgVExTIENBIC0gRzEwHhcNMTkxMTA4MDAwMDAwWhcNMjAxMTA3MTIwMDAwWjAa
MRgwFgYDVQQDEw9kZXYuZXppamluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQCB10CZ2NYv7glRe+aJH+Wv1xt2hy0QYvB0umcitGUv+hUq5tlO
sBJ53mkDaQcpRttX2LriI0jOfrrzOLK2K+51GK4YvjAFM922WmRK3L2KPRkdld7b
ehZDvd9XcU1E6nd6QuYhgeqjZ6nmGF+rUDhJ7LsgzVnQD04XoxXtOCqb7xroXLh4
1uDH31/Sfueq4aNhndFydTSPrHN9CE6o5iaGTh+VCpLHoxvqxKZYztXj+H/nngtD
Ik1XeeA19PdkWYCaEhm3uf6jey/MirCCGJlKPQr2PITvNtJmNVQERDO0VRx9iA9l
B9kUWx2AiQVK9HdxcikiI3yg9/zErqdoCk5fAgMBAAGjggJ0MIICcDAfBgNVHSME
GDAWgBRVdE+yck/1YLpQ0dfmUVyaAYca1zAdBgNVHQ4EFgQU28ndXe6qIDlhPWX5
+gzJoRhaQQowGgYDVR0RBBMwEYIPZGV2LmV6aWppbmcuY29tMA4GA1UdDwEB/wQE
AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTAYDVR0gBEUwQzA3
BglghkgBhv1sAQIwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQu
Y29tL0NQUzAIBgZngQwBAgEwgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYY
aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEoGCCsGAQUFBzAChj5odHRwOi8vY2Fj
ZXJ0cy5kaWdpY2VydC5jb20vRW5jcnlwdGlvbkV2ZXJ5d2hlcmVEVlRMU0NBLUcx
LmNydDAJBgNVHRMEAjAAMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYApLkJkLQY
WBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFuSnTaJgAABAMARzBFAiEAtYCW
PLYE6pylBOsB1MmETgxGpYrG64Osn/XXyJlh+/UCIEnttMCBvNif4hpJfAQibP/Q
bJ9w0VYC59hi8Tmcf/mfAHcAXqdz+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFx
RVgAAAFuSnTZSQAABAMASDBGAiEAsMgDWdSJ5d2jiXoNyxJ5FY7+3PET59vgvxi9
Eev9MwECIQC3sfR8sRWxJg82xH7lIA9sN87p7fLmr+KyhnuAK+2bcjANBgkqhkiG
9w0BAQsFAAOCAQEAOXMhz5dapVgYoLe23i+rEbBeO648c3cAO11qubqE0b5ie2bY
4DuatptwiLA47xfSVbFF0Y44cPL1b0zHe+Ki9TpcFP+TQ/+cPD2bPrqovI2uh8Qi
1RU7baLoYO9t7NxaPXh9RtRLUufJHas7HcWtLw/nPvVi+SuhgiiPytWdVM64dIPz
+nP9YY6wZhp4S/vNw5T7LARaw28xrEPzgCzWoXBUDyLB1slU3A2Uu+vl4lilcVeF
B/hl/75PWIdlxeRsD2V4TGCg796eL1BTVYEh7+mjvvaft+1/jwofKtGxg34YZHfl
6M22MuuP1pLviPZEE4ZlPXvltUV/Qq47LvZkTg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc
oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo
lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj
pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h
yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n
wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M
pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf
BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw
HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B
SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW
M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV
4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ
sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy
rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
-----END CERTIFICATE-----
client/build/getSSL.js 0 → 100644
浏览文件 @ 9e516cfd
const fs = require('fs')
const path = require('path')
const request = require('request')
const _conf = require('./config')
fs.writeFileSync(path.join(__dirname, _conf.domain + '.key'), '', { encoding: 'utf8', mode: 0o755 })
fs.writeFileSync(path.join(__dirname, _conf.domain + '.pem'), '', { encoding: 'utf8', mode: 0o755 })
request('https://ssl.godzyx.com/' + _conf.domain + '/' + _conf.domain + '.key?get=allow').pipe(fs.createWriteStream(path.join(__dirname, _conf.domain + '.key')))
request('https://ssl.godzyx.com/' + _conf.domain + '/' + _conf.domain + '.pem?get=allow').pipe(fs.createWriteStream(path.join(__dirname, _conf.domain + '.pem')))
client/build/regExpStr.js 0 → 100644
浏览文件 @ 9e516cfd
/* 由于正则表达式，不能进行跟 gulpfile 中 去注释 在一起 */
module.exports = {
regExp_static: /('|"|`)[\.|\/]*?static\/(.*?\.(png|jpe?g|gif|svg|ico)(\?.*)?)\1/g
}
client/build/stringReplaceLoader.js 0 → 100644
浏览文件 @ 9e516cfd
const _conf = require('./config')
module.exports = function (source) {
if (_conf.isDev !== 'development') {
return source
.replace(_conf.RegStrs.regExp_static, '$1' + _conf.CDN_BASE + _conf.CDN_DIR + 'static/$2$1')
} else {
return source
}
}
client/build/uploadAliyunCDN.js
浏览文件 @ 9e516cfd
/**
* 本文件执行，需要 node -v >= v8.11.3
* 原因：其中使用很多es6新特性，需要高版本才能直接识别并运行
* 放服务器上 上传慢，而且经常报错（没找到原因），最后改为打包完成后自动上传不在服务器上deploy时再上传了
*/
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
// 这个包本身也是用es6语法写的，低版本node编译解析不了
const OSS = require('ali-oss') const OSS = require('ali-oss')
const conf = require('./config') const conf = require('./config')
...@@ -18,23 +13,22 @@ const client = new OSS({ ...@@ -18,23 +13,22 @@ const client = new OSS({
bucket: 'zws-imgs-pub' bucket: 'zws-imgs-pub'
}) })
/* 定位到对应 public目录下 */ const headers = {
'x-oss-traffic-limit': 8 * 1024 * 100 * 100
}
const DIR_PATH = path.join(__dirname, '../' + conf.DesDir) const DIR_PATH = path.join(__dirname, '../' + conf.DesDir)
/* 上传对应目录 */
const PREFIX_PATH = conf.CDN_DIR const PREFIX_PATH = conf.CDN_DIR
/* 是否上传static目录 */
const isUploadStatic = conf.isUploadStatic const isUploadStatic = conf.isUploadStatic
let fileCount = 1 let fileCount = 1
/**
* 调用接口，单个文件上传
* @param {string} dirPath 传入对应需要遍历的路径
* @param {function} callback 加入一个回调方法，执行文件上传
*/
async function uploadFile (prefixPath, dirFileName) { async function uploadFile (prefixPath, dirFileName) {
try { try {
const upFilePath = prefixPath.replace(new RegExp(DIR_PATH, 'gi'), '') + path.basename(dirFileName) const upFilePath = prefixPath.replace(new RegExp(DIR_PATH, 'gi'), '') + path.basename(dirFileName)
let result = await client.put(prefixPath + path.basename(dirFileName), dirFileName) const result = await client.put(prefixPath + path.basename(dirFileName), dirFileName, {
headers,
timeout: 600000
})
if (result.res.status === 200) { if (result.res.status === 200) {
console.log('第' + fileCount++ + '个文件，已上传：' + conf.CDN_BASE + upFilePath) console.log('第' + fileCount++ + '个文件，已上传：' + conf.CDN_BASE + upFilePath)
return { status: 200 } return { status: 200 }
...@@ -45,24 +39,14 @@ async function uploadFile (prefixPath, dirFileName) { ...@@ -45,24 +39,14 @@ async function uploadFile (prefixPath, dirFileName) {
} }
} }
/**
* 循环遍历文件，准备上传文件
* 原生js 遍历方法
* @param {string} dirPath 传入对应需要遍历的路径
* @param {function} callback 加入一个回调方法，执行文件上传
*/
function uploadfiles (dirPath, callback) { function uploadfiles (dirPath, callback) {
/* 根据文件路径读取文件 */
const files = fs.readdirSync(dirPath) const files = fs.readdirSync(dirPath)
files.forEach(function (filename, i) { files.forEach(function (filename, i) {
const filedir = path.join(dirPath, filename) const filedir = path.join(dirPath, filename)
const info = fs.statSync(filedir) const info = fs.statSync(filedir)
if (info.isDirectory()) { if (info.isDirectory()) {
/* 确定是否上传 */
if (!(isUploadStatic ? true : filename !== 'static')) { return } if (!(isUploadStatic ? true : filename !== 'static')) { return }
/* 得到对应目录结构 */
const morePath = filedir.replace(new RegExp(DIR_PATH, 'gi'), '') + '/' const morePath = filedir.replace(new RegExp(DIR_PATH, 'gi'), '') + '/'
/* 递归，如果是文件夹，就继续遍历该文件夹下面的文件 */
uploadfiles(filedir, function (filedir) { uploadfiles(filedir, function (filedir) {
uploadFile(path.join(PREFIX_PATH, morePath), filedir) uploadFile(path.join(PREFIX_PATH, morePath), filedir)
}) })
...@@ -77,5 +61,4 @@ function uploadfiles (dirPath, callback) { ...@@ -77,5 +61,4 @@ function uploadfiles (dirPath, callback) {
return true return true
} }
/* 批量上传文件 */
uploadfiles(DIR_PATH, null) uploadfiles(DIR_PATH, null)
client/build/webpack.base.conf.js
浏览文件 @ 9e516cfd
...@@ -7,6 +7,7 @@ const _conf = require('./config') ...@@ -7,6 +7,7 @@ const _conf = require('./config')
const $GLOBAL = { const $GLOBAL = {
isDev: _conf.isDev, isDev: _conf.isDev,
ResDir: _conf.ResDir, ResDir: _conf.ResDir,
'isEnableToIphoneDebugger': _conf.isEnableToIphoneDebugger,
templatePath: path.resolve(__dirname, '../' + _conf.HtmlPath), templatePath: path.resolve(__dirname, '../' + _conf.HtmlPath),
icoPath: _conf.IcoPath, icoPath: _conf.IcoPath,
...@@ -21,9 +22,12 @@ const $GLOBAL = { ...@@ -21,9 +22,12 @@ const $GLOBAL = {
EntryStaticPath: path.resolve(__dirname, '../' + 'static'), EntryStaticPath: path.resolve(__dirname, '../' + 'static'),
OutputStaticPath: path.resolve(__dirname, '../' + _conf.DesDir + '/static'), OutputStaticPath: path.resolve(__dirname, '../' + _conf.DesDir + '/static'),
RegStrs: _conf.RegStrs,
webConf: { webConf: {
'isDev': _conf.isDev, 'isDev': _conf.isDev,
'serverPort': process.env.SERVER_PORT || 8000, 'serverPort': process.env.SERVER_PORT || 8000,
'isEnableToIphoneDebugger': _conf.isEnableToIphoneDebugger,
'domain': _conf.domain, 'domain': _conf.domain,
'url': _conf.url, 'url': _conf.url,
'isHttps': _conf.isHttps, 'isHttps': _conf.isHttps,
...@@ -50,7 +54,8 @@ $GLOBAL.BaseConfig = { ...@@ -50,7 +54,8 @@ $GLOBAL.BaseConfig = {
'@api': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/api'), '@api': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/api'),
'@action': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/action'), '@action': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/action'),
'@tool': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/tool') '@tool': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/tool')
} },
extensions: ['.js', '.json', '.jsx', '.vue']
}, },
module: { module: {
rules: [ rules: [
...@@ -60,6 +65,12 @@ $GLOBAL.BaseConfig = { ...@@ -60,6 +65,12 @@ $GLOBAL.BaseConfig = {
exclude: /node_modules/, exclude: /node_modules/,
enforce: 'pre' enforce: 'pre'
}, },
{
test: /\.(vue|js|jsx)|((sa|sc|c)ss)$/,
loader: './build/stringReplaceLoader.js',
exclude: /node_modules/,
enforce: 'pre'
},
{ {
test: /\.vue$/, test: /\.vue$/,
loader: 'vue-loader' loader: 'vue-loader'
...@@ -69,10 +80,32 @@ $GLOBAL.BaseConfig = { ...@@ -69,10 +80,32 @@ $GLOBAL.BaseConfig = {
exclude: /(node_modules)|(dist)/, exclude: /(node_modules)|(dist)/,
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
presets: ['env', 'stage-2'], presets: [[
'@babel/preset-env',
{
"targets": {
"browsers": [
"last 2 versions",
"ie >= 11"
],
},
corejs: '3.6.5',
useBuiltIns: 'usage'
}
]],
plugins: [ plugins: [
'transform-vue-jsx', '@babel/plugin-syntax-jsx',
'syntax-dynamic-import' '@babel/plugin-proposal-class-properties',
'@babel/plugin-syntax-dynamic-import',
[
'@babel/plugin-transform-runtime',
{
corejs: 3,
helpers: true,
regenerator: true,
useESModules: false
}
]
] ]
} }
}, },
......
client/build/webpack.client.conf.js
浏览文件 @ 9e516cfd
...@@ -9,7 +9,9 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin') ...@@ -9,7 +9,9 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin')
const AutoPrefixer = require('autoprefixer') const AutoPrefixer = require('autoprefixer')
const MiniCssExtractPlugin = require('mini-css-extract-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin')
const HtmlReplaceWebpackPlugin = require('html-replace-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const VconsoleWebpackPlugin = require('vconsole-webpack-plugin')
const $GLOBAL = require('./webpack.base.conf') const $GLOBAL = require('./webpack.base.conf')
...@@ -26,9 +28,10 @@ if ($GLOBAL.isDev === 'development') { ...@@ -26,9 +28,10 @@ if ($GLOBAL.isDev === 'development') {
port: $GLOBAL.webConf.serverPort, port: $GLOBAL.webConf.serverPort,
disableHostCheck: false, disableHostCheck: false,
host: $GLOBAL.webConf.domain || 'localhost', host: $GLOBAL.webConf.domain || 'localhost',
http2: false,
https: $GLOBAL.webConf.isHttps && { https: $GLOBAL.webConf.isHttps && {
key: fs.readFileSync(path.join(__dirname, '../static/cert/dev.ezijing.com.key')), key: fs.readFileSync(path.join(__dirname, $GLOBAL.webConf.domain + '.key')),
cert: fs.readFileSync(path.join(__dirname, '../static/cert/dev.ezijing.com.pem')) cert: fs.readFileSync(path.join(__dirname, $GLOBAL.webConf.domain + '.pem'))
}, },
overlay: { overlay: {
errors: true errors: true
...@@ -77,7 +80,7 @@ if ($GLOBAL.isDev === 'development') { ...@@ -77,7 +80,7 @@ if ($GLOBAL.isDev === 'development') {
} }
}, },
{ {
loader: 'sass-loader', // 不再使用本身默认 node-sass，部分mac安装有问题。 loader: 'sass-loader',
options: { options: {
implementation: require('dart-sass') implementation: require('dart-sass')
} }
...@@ -92,6 +95,10 @@ if ($GLOBAL.isDev === 'development') { ...@@ -92,6 +95,10 @@ if ($GLOBAL.isDev === 'development') {
template: $GLOBAL.templatePath, template: $GLOBAL.templatePath,
inject: true, inject: true,
favicon: $GLOBAL.icoPath favicon: $GLOBAL.icoPath
}),
new VconsoleWebpackPlugin({
filter: [],
enable: $GLOBAL.isEnableToIphoneDebugger
}) })
] ]
}) })
...@@ -100,7 +107,7 @@ if ($GLOBAL.isDev === 'development') { ...@@ -100,7 +107,7 @@ if ($GLOBAL.isDev === 'development') {
mode: 'production', mode: 'production',
entry: { entry: {
app: $GLOBAL.EntryPath, app: $GLOBAL.EntryPath,
vendor: ['vue', 'vue-router'] vendor: ['vue', 'vue-router', 'vue-i18n']
}, },
module: { module: {
rules: [{ rules: [{
...@@ -128,7 +135,7 @@ if ($GLOBAL.isDev === 'development') { ...@@ -128,7 +135,7 @@ if ($GLOBAL.isDev === 'development') {
} }
}, },
{ {
loader: 'sass-loader', // 不再使用本身默认 node-sass，部分mac安装有问题。 loader: 'sass-loader',
options: { options: {
implementation: require('dart-sass') implementation: require('dart-sass')
} }
...@@ -152,6 +159,12 @@ if ($GLOBAL.isDev === 'development') { ...@@ -152,6 +159,12 @@ if ($GLOBAL.isDev === 'development') {
collapseWhitespace: true collapseWhitespace: true
} }
}), }),
new HtmlReplaceWebpackPlugin([
{
pattern: $GLOBAL.RegStrs.regExp_static,
replacement: '$1' + $GLOBAL.webConf.CDN_PATH + 'static/$2$1'
}
]),
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {
from: $GLOBAL.EntryStaticPath, from: $GLOBAL.EntryStaticPath,
...@@ -161,7 +174,11 @@ if ($GLOBAL.isDev === 'development') { ...@@ -161,7 +174,11 @@ if ($GLOBAL.isDev === 'development') {
return content return content
} }
} }
]) ]),
new VconsoleWebpackPlugin({
filter: [],
enable: $GLOBAL.isEnableToIphoneDebugger
})
], ],
optimization: { optimization: {
runtimeChunk: { runtimeChunk: {
...@@ -170,27 +187,19 @@ if ($GLOBAL.isDev === 'development') { ...@@ -170,27 +187,19 @@ if ($GLOBAL.isDev === 'development') {
splitChunks: { splitChunks: {
chunks: 'async', chunks: 'async',
minSize: 30000, minSize: 30000,
maxSize: 400000, // 大于400kb 会再进行拆分，可以进行优化时，添加 maxSize: 400000,
minChunks: 1, minChunks: 1,
maxAsyncRequests: 5, // 按需加载块时并行请求的最大数量 maxAsyncRequests: 5,
maxInitialRequests: 3, // 初始页面加载时并行请求的最大数量 maxInitialRequests: 3,
name: false, name: false,
cacheGroups: { cacheGroups: {
vendor: { // 将所有node_modules中模块 js打包到一起，并拆分 vendor: {
name: 'vendor', name: 'vendor',
chunks: 'initial', chunks: 'initial',
priority: -10, priority: -10,
reuseExistingChunk: false, reuseExistingChunk: false,
test: /node_modules\/(.*)\.js/ test: /node_modules\/(.*)\.js/
}, },
// styles: { // 将所有node_modules中模块 css、scss打包到一起，并拆分，暂时没用，还在研究
// name: 'styles',
// test: /node_modules\/\.(sa|sc|c)ss$/,
// chunks: 'all',
// minChunks: 1,
// reuseExistingChunk: true,
// enforce: true
// }
} }
} }
} }
......
client/package-lock.json
浏览文件 @ 9e516cfd
This source diff could not be displayed because it is too large. You can view the blob instead.
client/package.json
浏览文件 @ 9e516cfd
{ {
"name": "@god/vue-client", "name": "@god/vue-client",
"version": "3.0.5", "version": "3.0.14",
"description": "ecollage - 学习系统", "description": "适应于公司全系统的纯客户端开发模型",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"lint": "eslint --ext .js --ext .jsx --ext .vue src/", "lint": "eslint --ext .js --ext .jsx --ext .vue src/",
"lint:fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/", "lint:fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/",
"dev": "cross-env NODE_ENV=development SERVER_PORT=3001 webpack-dev-server --inline --progress --config build/webpack.client.conf.js", "dev": "npm run check:node && cross-env NODE_ENV=development node build/getSSL.js && cross-env NODE_ENV=development SERVER_PORT=3001 webpack-dev-server --inline --progress --config build/webpack.client.conf.js",
"build:test": "cross-env NODE_ENV=test webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=test n use 8.11.3 ./build/uploadAliyunCDN.js", "build:test": "npm run check:node && cross-env NODE_ENV=test webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=test node ./build/uploadAliyunCDN.js",
"build:pro": "cross-env NODE_ENV=production webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=production n use 8.11.3 ./build/uploadAliyunCDN.js" "build:pro": "npm run check:node && cross-env NODE_ENV=production webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=production node ./build/uploadAliyunCDN.js",
"check:node": "node build/checkNodeVersion.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
...@@ -24,43 +25,51 @@ ...@@ -24,43 +25,51 @@
"node_modules/", "node_modules/",
"assets/font-icons/" "assets/font-icons/"
], ],
"engines": {
"node": ">=8.9"
},
"devDependencies": { "devDependencies": {
"acorn": "^7.1.1", "acorn": "^7.1.1",
"ali-oss": "^6.5.1", "ali-oss": "^6.11.2",
"autoprefixer": "^9.7.5", "autoprefixer": "^9.8.6",
"babel-core": "^6.26.3",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-helper-vue-jsx-merge-props": "^2.0.3", "babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-loader": "^7.1.5", "babel-loader": "^8.1.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0", "clean-webpack-plugin": "^1.0.1",
"babel-plugin-syntax-jsx": "^6.18.0", "copy-webpack-plugin": "^5.1.2",
"babel-plugin-transform-vue-jsx": "^3.7.0", "css-loader": "^4.3.0",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-2": "^6.24.1",
"clean-webpack-plugin": "^1.0.0",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"dart-sass": "^1.25.0", "dart-sass": "^1.25.0",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"eslint-config-standard": "^14.1.1", "eslint-config-standard": "^14.1.1",
"eslint-loader": "^3.0.4", "eslint-loader": "^3.0.4",
"eslint-plugin-html": "^6.0.0", "eslint-plugin-html": "^6.1.0",
"eslint-plugin-import": "^2.20.2", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1", "eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"file-loader": "^6.0.0", "file-loader": "^6.1.1",
"html-webpack-plugin": "^4.0.4", "html-webpack-plugin": "^4.5.0",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^0.9.0",
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
"sass-loader": "^7.3.1", "sass-loader": "^10.0.3",
"style-loader": "^1.1.3", "style-loader": "^2.0.0",
"url-loader": "^4.0.0", "url-loader": "^4.1.1",
"webpack": "^4.42.1", "webpack": "^4.44.2",
"webpack-cli": "^3.3.11", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.10.3", "webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2",
"html-replace-webpack-plugin": "^2.5.6",
"request": "^2.88.2",
"semver": "^1.1.4",
"vconsole-webpack-plugin": "^1.5.2",
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-jsx": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.11.5",
"@babel/runtime-corejs3": "^7.11.2"
}, },
"dependencies": { "dependencies": {
"axios": "^0.19.2", "axios": "^0.19.2",
...@@ -68,15 +77,14 @@ ...@@ -68,15 +77,14 @@
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"promise.prototype.finally": "^3.1.2",
"qs": "^6.9.4", "qs": "^6.9.4",
"regenerator": "^0.14.4",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-i18n": "^8.16.0", "vue-i18n": "^8.16.0",
"vue-loader": "^15.9.1", "vue-loader": "^15.9.1",
"vue-meta-info": "^0.1.7", "vue-meta-info": "^0.1.7",
"vue-router": "^3.1.6", "vue-router": "^3.1.6",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.11",
"vuex": "^3.1.3" "vuex": "^3.1.3",
"core-js": "^3.6.5"
} }
} }
client/src/action/AffairsAction.js
浏览文件 @ 9e516cfd
...@@ -16,4 +16,6 @@ export default class AffairsAction extends BaseACTION { ...@@ -16,4 +16,6 @@ export default class AffairsAction extends BaseACTION {
updateAffairs (rid, obj) { return Affairs.updateAffairs(rid, obj).then(res => res) } updateAffairs (rid, obj) { return Affairs.updateAffairs(rid, obj).then(res => res) }
/* 重修图片上传 */ /* 重修图片上传 */
uploadFile (obj) { return Affairs.uploadFile(obj).then(res => res) } uploadFile (obj) { return Affairs.uploadFile(obj).then(res => res) }
/* 获取成绩 */
obtainReport (obj) { return Affairs.obtainReport(obj).then(res => res) }
} }
client/src/action/CourseAction.js
浏览文件 @ 9e516cfd
...@@ -136,15 +136,19 @@ export default class CourseAction extends BaseACTION { ...@@ -136,15 +136,19 @@ export default class CourseAction extends BaseACTION {
_homework.semester_id = data.semester_id _homework.semester_id = data.semester_id
} }
if (__.live && __.live.id) { if (__.live && __.live.id) {
__.live.live_status = parseInt(__.live.live_status)
let str = '' let str = ''
switch (__.live.live_status) { switch (__.live.live_status) {
case 0: str = '直播未开始'; break case 1: str = '直播未开始'; break
case 1: str = '正在直播'; break case 2: str = '正在直播'; break
case 2: str = '直播结束'; break case 3: str = '直播结束'; break
case 4: str = '即将开始'; break
case 5: str = '直播未开始'; break
case 11: str = '直播结束'; break
default: str = '直播未开始' default: str = '直播未开始'
} }
// 5分钟内显示“即将开始”，5~1小时内“N分钟后开始”，1~24小时内“N小时后开始”，1天以上“N天后开始”天就显示年月日 // 5分钟内显示“即将开始”，5~1小时内“N分钟后开始”，1~24小时内“N小时后开始”，1天以上“N天后开始”天就显示年月日
if (__.live.live_status === 0 && __.live.start_time) { if (__.live.live_status === 1 && __.live.start_time) {
const time = (new Date(__.live.start_time).getTime() - new Date().getTime()) / 1000 const time = (new Date(__.live.start_time).getTime() - new Date().getTime()) / 1000
if (time <= 5 * 60) { if (time <= 5 * 60) {
str = '即将开始' str = '即将开始'
...@@ -156,7 +160,7 @@ export default class CourseAction extends BaseACTION { ...@@ -156,7 +160,7 @@ export default class CourseAction extends BaseACTION {
str = parseInt(time / (24 * 60 * 60)) + '天后开始' str = parseInt(time / (24 * 60 * 60)) + '天后开始'
} }
} }
if (__.live.live_status === 2 && __.live.enable_record && __.live.record_url) { if (__.live.live_status === 3 && __.live.enable_record && __.live.record_url) {
str = '观看回放' str = '观看回放'
} }
__.live.statusStr = str __.live.statusStr = str
......
client/src/action/PlayerAction.js
浏览文件 @ 9e516cfd
...@@ -88,6 +88,7 @@ export default class PlayerAction extends BaseACTION { ...@@ -88,6 +88,7 @@ export default class PlayerAction extends BaseACTION {
} }
} }
if (__.live && __.live.id) { if (__.live && __.live.id) {
__.live.live_status = parseInt(__.live.live_status)
let str = '' let str = ''
switch (__.live.live_status) { switch (__.live.live_status) {
case 0: str = '直播未开始'; break case 0: str = '直播未开始'; break
......
client/src/api/affairs_api.js
浏览文件 @ 9e516cfd
...@@ -29,4 +29,6 @@ export default class AffairsAPI extends BaseAPI { ...@@ -29,4 +29,6 @@ export default class AffairsAPI extends BaseAPI {
updateAffairs = (rid, obj = {}) => this.post(`/api/lms/v2/lobby/processes/${rid}`, obj, { headers: { 'Content-Type': 'multipart/form-data' } }) updateAffairs = (rid, obj = {}) => this.post(`/api/lms/v2/lobby/processes/${rid}`, obj, { headers: { 'Content-Type': 'multipart/form-data' } })
/* 重修图片提交 */ /* 重修图片提交 */
uploadFile = (obj = {}) => this.post('/api/lms/v2/lobby/tools/upload', obj, { headers: { 'Content-Type': 'multipart/form-data' } }) uploadFile = (obj = {}) => this.post('/api/lms/v2/lobby/tools/upload', obj, { headers: { 'Content-Type': 'multipart/form-data' } })
/* 获取成绩单 */
obtainReport = (type) => this.get(`/api/lms/v2/lobby/havereport?type=${type}`, {})
} }
client/src/api/base_api.js
浏览文件 @ 9e516cfd
...@@ -32,32 +32,18 @@ export default class API { ...@@ -32,32 +32,18 @@ export default class API {
/* 重新封装 请求时的执行函数 */ /* 重新封装 请求时的执行函数 */
_request(_config = {}) { _request(_config = {}) {
/* 具体执行请求成功后业务逻辑前，先执行该方法 */ /* 具体执行请求成功后业务逻辑前，先执行该方法 */
const beforeSuccess = _config.beforeSuccess const beforeSuccess = _config.beforeSuccess ? _config.beforeSuccess : this._reqSuccess
? _config.beforeSuccess
: this._reqSuccess
/* 具体执行请求失败后业务逻辑前，先执行该方法 */ /* 具体执行请求失败后业务逻辑前，先执行该方法 */
const beforeFail = _config.beforeFail ? _config.beforeFail : this._reqFail const beforeFail = _config.beforeFail ? _config.beforeFail : this._reqFail
const headers = { const headers = {
tenant: 'collage', tenant: 'collage',
version: window.G.VERSION version: window.G.VERSION,
'Content-Type': 'application/x-www-form-urlencoded'
} }
_config.headers = _.assignIn(_config.headers, headers) _config.headers = _.assignIn(headers, _config.headers)
/* 判别 传输方式 */ /* 判别 传输方式 */
if ( if (_config.headers['Content-Type'] === 'application/x-www-form-urlencoded') {
_config.headers['Content-Type'] === 'application/x-www-form-urlencoded' _config.data = qs.stringify(_config.data)
) {
let str = ''
const _obj = _config.data || _config.params
// for (const key in _obj) {
// str += key + '=' + _obj[key] + '&'
// }
// str = str.substr(0, str.length - 1)
str = qs.stringify(_obj)
if (_config.data) {
_config.data = str
} else {
_config.params = str
}
} }
if (_config.headers['Content-Type'] === 'multipart/form-data') { if (_config.headers['Content-Type'] === 'multipart/form-data') {
let fr = new FormData() // eslint-disable-line let fr = new FormData() // eslint-disable-line
...@@ -68,10 +54,7 @@ export default class API { ...@@ -68,10 +54,7 @@ export default class API {
_config.data = fr _config.data = fr
} }
/* 创建并根据参数发起请求 */ /* 创建并根据参数发起请求 */
return this._axios(_config).then( return this._axios(_config).then(beforeSuccess.bind(this), beforeFail.bind(this))
beforeSuccess.bind(this),
beforeFail.bind(this)
)
} }
setConfirm(titleStr, btnStr, msgStr) { setConfirm(titleStr, btnStr, msgStr) {
...@@ -90,11 +73,10 @@ export default class API { ...@@ -90,11 +73,10 @@ export default class API {
if (/\/login\/index/gi.test(href)) { if (/\/login\/index/gi.test(href)) {
_vIn.$router.go(0) _vIn.$router.go(0)
} else { } else {
_vIn.$router.push({ // _vIn.$router.push({
path: // path: '/login/index?rd=' + encodeURIComponent(href.replace(/.*?\/\/.*?\//gi, '/'))
'/login/index?rd=' + // })
encodeURIComponent(href.replace(/.*?\/\/.*?\//gi, '/')) window.location.href = `${webConf.others.loginUrl}'?rd=${encodeURIComponent(window.location.href)}`
})
} }
} }
...@@ -155,16 +137,12 @@ export default class API { ...@@ -155,16 +137,12 @@ export default class API {
/* 重新实现 get请求 */ /* 重新实现 get请求 */
get(url, data, config) { get(url, data, config) {
return this._request( return this._request(_.assignIn({ url, method: 'GET', params: data }, config))
_.assignIn({ url, method: 'GET', params: data }, config)
)
} }
/* 重新实现 post请求 */ /* 重新实现 post请求 */
post(url, data, config) { post(url, data, config) {
return this._request( return this._request(_.assignIn({ url, method: 'POST', data: data }, config))
_.assignIn({ url, method: 'POST', data: data }, config)
)
} }
/* 重新实现 put请求 */ /* 重新实现 put请求 */
...@@ -174,8 +152,6 @@ export default class API { ...@@ -174,8 +152,6 @@ export default class API {
/* 重新实现 delete请求 */ /* 重新实现 delete请求 */
delete(url, data, config) { delete(url, data, config) {
return this._request( return this._request(_.assignIn({ url, method: 'DELETE', params: data }, config))
_.assignIn({ url, method: 'DELETE', params: data }, config)
)
} }
} }
client/src/components/beforeEnter/Before.js
浏览文件 @ 9e516cfd
...@@ -5,13 +5,7 @@ export default class Before { ...@@ -5,13 +5,7 @@ export default class Before {
const UA = navigator.userAgent const UA = navigator.userAgent
this.opt = opt || {} this.opt = opt || {}
// 免登录列表 // 免登录列表
this.whiteList = [ this.whiteList = ['login-normal', 'login-code', 'login-forget', 'studentHelp', 'teacherHelp']
'login-normal',
'login-code',
'login-forget',
'studentHelp',
'teacherHelp'
]
this.isMobile = /android|iphone|ipad|ipod/i.test(UA) this.isMobile = /android|iphone|ipad|ipod/i.test(UA)
} }
...@@ -24,10 +18,11 @@ export default class Before { ...@@ -24,10 +18,11 @@ export default class Before {
// 检测登录状态 // 检测登录状态
const isLogin = await this.isLogin() const isLogin = await this.isLogin()
if (!isLogin) { if (!isLogin) {
next({ // next({
path: '/login/index', // path: '/login/index',
query: { rd: encodeURIComponent(to.fullPath) } // query: { rd: encodeURIComponent(to.fullPath) }
}) // })
window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
return return
} }
// 移动端 // 移动端
...@@ -42,7 +37,7 @@ export default class Before { ...@@ -42,7 +37,7 @@ export default class Before {
isLogin() { isLogin() {
if (window.G.UserInfo) return true if (window.G.UserInfo) return true
return cAction.Other.getInfo() return cAction.Other.getInfo()
.then((res) => { .then(res => {
if (res.id) { if (res.id) {
window.G.UserInfo = res window.G.UserInfo = res
return true return true
......
client/src/components/comTable/tap.vue
浏览文件 @ 9e516cfd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<li class="tabs-hd">{{item.name}}</li> <li class="tabs-hd">{{item.name}}</li>
<template v-for="(item1, index1) in item.arrItem"> <template v-for="(item1, index1) in item.arrItem">
<li v-bind:key="index1"> <li v-bind:key="index1">
<div :class="['tab', (item.selectIndex == index1 ? 'on' : '')]" @click="selFindSelect" :data-index='index1' :data-i="index" :data-key='item.key' :data-val='item1.val'>{{item1.name}}</div> <div :class="['tab', (item.selectIndex == index1 ? 'on' : '')]" @click="selFindSelect($event, item1)" :data-index='index1' :data-i="index" :data-key='item.key' :data-val='item1.val'>{{item1.name}}</div>
</li> </li>
</template> </template>
</ul> </ul>
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
} }
}, },
methods: { methods: {
selFindSelect (e) { selFindSelect (e, item) {
const _data = e.currentTarget.dataset const _data = e.currentTarget.dataset
const index = _data.index const index = _data.index
const json = this.tapParam const json = this.tapParam
...@@ -48,7 +48,8 @@ export default { ...@@ -48,7 +48,8 @@ export default {
// json[i].isShow = false // json[i].isShow = false
const param = { const param = {
index: index, index: index,
id: _data.val id: _data.val,
name: item.name
} }
this.$emit('tapParam', param) this.$emit('tapParam', param)
} }
......
client/src/components/editor.vue
浏览文件 @ 9e516cfd
...@@ -35,7 +35,8 @@ export default { ...@@ -35,7 +35,8 @@ export default {
const config = { const config = {
height: 400, height: 400,
uiColor: '#eeeeee', uiColor: '#eeeeee',
filebrowserImageUploadUrl: '/api/ckeditor/img/upload', filebrowserImageUploadUrl: '/api/ck/form/ckeditor-upload',
fileTools_requestHeaders: { tenant: 'sofia' },
// resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true, // resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true,
toolbar: [ toolbar: [
// { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] }, // { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] },
......
client/src/components/learnSysLayout/sidebar.vue
浏览文件 @ 9e516cfd
...@@ -126,7 +126,8 @@ export default { ...@@ -126,7 +126,8 @@ export default {
cAction.Other.outLogin() cAction.Other.outLogin()
.then(str => { .then(str => {
window.G.UserInfo = {} window.G.UserInfo = {}
this.$router.push({ path: '/login/index' }) // this.$router.push({ path: '/login/index' })
window.location.href = webConf.others.loginUrl
}) })
.catch(e => { .catch(e => {
this.$message.error(e.message) this.$message.error(e.message)
......
client/src/components/upload.vue
浏览文件 @ 9e516cfd
<template> <template>
<div class="upload"> <el-upload
<el-upload action :show-file-list="false" :http-request="httpRequest" v-bind="$attrs"> class="avatar-uploader"
<slot></slot> action
<el-button type="text" size="small" icon="el-icon-upload">点击上传</el-button> :accept="accept"
<template v-slot:tip> :show-file-list="showFileList"
<div class="el-upload__tips"> :http-request="httpRequest"
<slot name="tip"></slot> v-bind="$attrs"
</div> >
</template> <slot>
<img v-if="value" :src="value" class="avatar" />
<i v-else class="el-icon-plus uploader-icon"></i>
</slot>
</el-upload> </el-upload>
<div class="file-list" v-if="value">
<div class="file-list-item">
<a :href="value" target="_blank">
<i class="el-icon-document"></i>
{{ fileName }}
</a>
<a :href="value" :download="fileName" target="_blank">
<el-tooltip effect="dark" content="下载">
<i class="el-icon-download"></i>
</el-tooltip>
</a>
</div>
</div>
</div>
</template> </template>
<script> <script>
...@@ -31,7 +20,9 @@ import cAction from '@action' ...@@ -31,7 +20,9 @@ import cAction from '@action'
export default { export default {
name: 'VUpload', name: 'VUpload',
props: { props: {
value: { type: String } value: { type: String },
accept: { type: String, default: 'image/*' },
showFileList: { type: Boolean, default: false }
}, },
data() { data() {
return {} return {}
...@@ -52,30 +43,34 @@ export default { ...@@ -52,30 +43,34 @@ export default {
.catch(error => { .catch(error => {
console.log(error) console.log(error)
}) })
},
handleRemove() {
this.$emit('input', '')
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.file-list-item { .avatar-uploader .el-upload {
display: flex; border: 1px dashed #d9d9d9;
margin-bottom: 10px; border-radius: 6px;
padding: 0 10px; cursor: pointer;
justify-content: space-between; position: relative;
line-height: 30px; overflow: hidden;
background-color: #fff; }
border-radius: 4px; .avatar-uploader .el-upload:hover {
border-color: #b80037;
a { }
text-decoration: none; .uploader-icon {
color: #333; font-size: 28px;
&:hover { color: #8c939d;
color: #b49441; width: 220px;
} height: 220px;
} line-height: 220px;
text-align: center;
}
.avatar {
width: 220px;
height: 220px;
display: block;
object-fit: contain;
} }
</style> </style>
client/src/index.html
浏览文件 @ 9e516cfd
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"></script> <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"></script>
<!-- 直接引入aliyun播放插件 JS --> <!-- 直接引入aliyun播放插件 JS -->
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.8.8/aliplayer-min.js"></script> <script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.8.8/aliplayer-min.js"></script>
<!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 --> <script type="text/javascript" charset="utf-8" src="https://player.alicdn.com/aliplayer/presentation/js/aliplayercomponents.min.js"></script> <!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 -->
<script src="//view.csslcloud.net/js/_fix_.js"></script> <script src="//view.csslcloud.net/js/_fix_.js"></script>
<script src="//view.csslcloud.net/js/jquery-1.9.0.min.js" type="text/javascript"></script> <script src="//view.csslcloud.net/js/jquery-1.9.0.min.js" type="text/javascript"></script>
<script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script> <script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script>
......
client/src/main.js
浏览文件 @ 9e516cfd
...@@ -14,10 +14,8 @@ import modules from './modules' ...@@ -14,10 +14,8 @@ import modules from './modules'
import createBefore from './components/beforeEnter' import createBefore from './components/beforeEnter'
import store from './store' import store from './store'
/* 兼容处理 start */ import _ from 'lodash'
/* 处理低版本浏览器支持axios finally问题 */ Vue.prototype.$_ = _
require('promise.prototype.finally').shim()
/* 兼容处理 end */
Vue.use(VueRouter) Vue.use(VueRouter)
Vue.use(UploadForm) Vue.use(UploadForm)
...@@ -35,6 +33,7 @@ Vue.use(modules, { i18n }) ...@@ -35,6 +33,7 @@ Vue.use(modules, { i18n })
window.G = Vue.prototype.$GLOBAL = { window.G = Vue.prototype.$GLOBAL = {
VERSION: 'PC-1.0.0' VERSION: 'PC-1.0.0'
} }
// window.Promise = Promise
/** /**
* 定义全局变量 - 用作全局事件发布订阅 * 定义全局变量 - 用作全局事件发布订阅
* 使用 vue自带事件 $emit 和 $on 进行发布订阅 * 使用 vue自带事件 $emit 和 $on 进行发布订阅
...@@ -52,5 +51,5 @@ window.G.$instance_vue = new Vue({ ...@@ -52,5 +51,5 @@ window.G.$instance_vue = new Vue({
router, router,
i18n, i18n,
store, store,
render: (h) => h(App) render: h => h(App)
}).$mount('#app') }).$mount('#app')
client/src/modules/discuss/src/discuss.vue
浏览文件 @ 9e516cfd
...@@ -66,12 +66,12 @@ export default { ...@@ -66,12 +66,12 @@ export default {
}, },
methods: { methods: {
loadAjax () { loadAjax () {
const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' }) // const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
api[this.params.request](this.params) api[this.params.request](this.params)
.then(json => { .then(json => {
this.discussList = json this.discussList = json
}) })
.catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() }) .catch(e => { this.$message.error(e.message) }).finally(() => { /* loading.close() */ })
}, },
/** /**
* 跳转到对应 问题详情页 * 跳转到对应 问题详情页
......
client/src/modules/viewer/components/aside/chapter.vue
浏览文件 @ 9e516cfd
<template> <template>
<ul class="chapter-list"> <ul class="chapter-list">
<li class="chapter-item" v-for="item in chapters" :key="item.id"> <li class="chapter-item" v-for="item in chapters" :key="item.id">
<h4>{{item.name}}</h4> <h4>{{ item.name }}</h4>
<ul class="chapter-item-list"> <ul class="chapter-item-list">
<li <li
v-for="subItem in item.children" v-for="subItem in item.children"
:key="subItem.id" :key="subItem.id"
@click="onClick(subItem)" @click="onClick(subItem)"
:class="{'is-active': subItem.id === (active ? active.id : '')}" :class="{ 'is-active': subItem.id === (active ? active.id : '') }"
> >
<span class="chapter-item-list__name">{{subItem.name | showName(subItem)}}</span> <span class="chapter-item-list__name">{{ subItem.name | showName(subItem) }}</span>
<i class="el-icon" :class="genIconClass(subItem.type)"></i> <i class="el-icon" :class="genIconClass(subItem.type)"></i>
</li> </li>
</ul> </ul>
...@@ -60,6 +60,11 @@ export default { ...@@ -60,6 +60,11 @@ export default {
if (data.type === 1) { if (data.type === 1) {
return return
} }
// zoom直播
if (data.type === 8) {
window.open(data.live.record_url || data.live.join_url)
return
}
// 课程大作业 // 课程大作业
if (data.id === 'course_work' && !this.data.survey) { if (data.id === 'course_work' && !this.data.survey) {
this.$message('请先填写教学评估，然后完成大作业。') this.$message('请先填写教学评估，然后完成大作业。')
...@@ -71,10 +76,7 @@ export default { ...@@ -71,10 +76,7 @@ export default {
this.$router.push({ name: 'survey', params: { sid, cid } }) this.$router.push({ name: 'survey', params: { sid, cid } })
return return
} }
this.$router.push({ this.$router.push({ name: 'viewerCourseChapter', params: { id: data.id } })
name: 'viewerCourseChapter',
params: { id: data.id }
})
} }
} }
} }
......
client/src/modules/viewer/components/aside/index.vue
浏览文件 @ 9e516cfd
<template> <template>
<div class="course-viewer-aside"> <aside class="course-viewer-aside">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="章节" name="0"> <el-tab-pane label="章节" name="0">
<div class="tab-pane"> <div class="tab-pane">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </aside>
</template> </template>
<script> <script>
......
client/src/modules/viewer/components/common/editor.vue
浏览文件 @ 9e516cfd
...@@ -35,7 +35,8 @@ export default { ...@@ -35,7 +35,8 @@ export default {
const config = { const config = {
height: 400, height: 400,
uiColor: '#eeeeee', uiColor: '#eeeeee',
filebrowserImageUploadUrl: '/api/ckeditor/img/upload', filebrowserImageUploadUrl: '/api/ck/form/ckeditor-upload',
fileTools_requestHeaders: { tenant: 'sofia' },
// resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true, // resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true,
toolbar: [ toolbar: [
// { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] }, // { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] },
......
client/src/modules/viewer/components/layout.vue
浏览文件 @ 9e516cfd
<template> <template>
<component <component :is="currentCompoent" :chapter="chapter" v-bind="$attrs" v-on="$listeners" v-if="chapter" :key="pid" />
:is="currentCompoent"
:chapter="chapter"
v-bind="$attrs"
v-on="$listeners"
v-if="chapter"
:key="pid"
/>
</template> </template>
<script> <script>
...@@ -46,7 +39,8 @@ export default { ...@@ -46,7 +39,8 @@ export default {
2: 'ChapterPlayer', // 视频 2: 'ChapterPlayer', // 视频
3: 'ChapterWork', // 作业 3: 'ChapterWork', // 作业
4: 'ChapterRead', // 资料 4: 'ChapterRead', // 资料
5: 'ChapterLive', // 直播 5: 'ChapterLive', // CC直播
8: 'ChapterLive', // CC直播
9: 'ChapterExam', // 考试 9: 'ChapterExam', // 考试
99: 'CourseWork', // 课程大作业 99: 'CourseWork', // 课程大作业
100: 'CourseRead', // 课程资料 100: 'CourseRead', // 课程资料
......
client/src/modules/viewer/components/live/chapterLive.vue
浏览文件 @ 9e516cfd
<template> <template>
<div style="width:100%;height:100%;"> <div style="width: 100%; height: 100%">
<div class="course-viewer-content" v-if="isLiveEnd && !hasRecord">
<div class="empty">直播已结束</div>
</div>
<iframe <iframe
:src="iframeUrl" :src="iframeUrl"
frameborder="0" frameborder="0"
width="100%" width="100%"
height="100%" height="100%"
allow="autoplay;geolocation;microphone;camera;midi;encrypted-media;" allow="autoplay;geolocation;microphone;camera;midi;encrypted-media;"
v-else
></iframe> ></iframe>
</div> </div>
</template> </template>
...@@ -37,22 +41,52 @@ export default { ...@@ -37,22 +41,52 @@ export default {
nickName() { nickName() {
return this.user.personal_name || '匿名' return this.user.personal_name || '匿名'
}, },
iframeUrl() { live() {
const live = this.chapter.live const live = this.chapter.live || {}
if ( live.live_status = parseInt(live.live_status)
live.live_status === 2 && return live
live.enable_record === 1 && },
live.record_url // 是否直播结束
) { isLiveEnd() {
return this.live.live_status === 2
},
// 是否有回放
hasRecord() {
// enable_record 0:不启用回放 1:开启回放 // enable_record 0:不启用回放 1:开启回放
return this.live.enable_record === 1 && this.live.record_url
},
iframeUrl() {
if (this.live.type === 5) {
return this.ccUrl
}
if (this.live.type === 8) {
return this.zoomUrl
}
},
// cc直播
ccUrl() {
const live = this.live
if (this.isLiveEnd && this.hasRecord) {
// 查看回放 // 查看回放
return live.record_url return live.record_url
} else { } else {
// 直播 // 直播
live.viewer_name = live.viewer_name || this.nickName live.user_name = live.user_name || this.nickName
return `https://view.csslcloud.net/api/view/index?roomid=${live.room_id}&userid=${live.user_id}&autoLogin=true&viewername=${live.viewer_name}&viewertoken=${live.viewer_token}` return `https://view.csslcloud.net/api/view/index?roomid=${live.room_id}&userid=${live.account_id}&autoLogin=true&viewername=${live.user_name}&viewertoken=${live.play_pass}`
} }
},
// zoom直播
zoomUrl() {
return this.live.record_url || this.live.join_url
} }
} }
} }
</script> </script>
<style scoped>
.empty {
padding: 100px;
font-size: 30px;
text-align: center;
}
</style>
client/src/modules/viewer/components/player/chapterPlayer.vue
浏览文件 @ 9e516cfd
...@@ -48,6 +48,8 @@ export default { ...@@ -48,6 +48,8 @@ export default {
props: { props: {
// 当前章节 // 当前章节
chapter: { type: Object }, chapter: { type: Object },
// 是否是PPT播放跳转
isSeek: { type: Boolean, default: false },
// PPT当前选中的索引 // PPT当前选中的索引
pptIndex: { type: Number, default: 0 } pptIndex: { type: Number, default: 0 }
}, },
...@@ -64,19 +66,18 @@ export default { ...@@ -64,19 +66,18 @@ export default {
throttleWait: 5, // 秒 throttleWait: 5, // 秒
progress: { progress: {
cpt: 0, // 当前播放时间 cpt: 0, // 当前播放时间
mpt: 0, // 视频时长 mpt: 0, // 当前播放最大时间
progress: 0, // 进度 progress: 0, // 进度
pt: 0 // 累计播放时间 pt: 0 // 累计观看时间
}, },
player: null, player: null,
watchedTimePoint: [], // 视频观看的时间点 watchedTime: 0,
timer: null, watchedTimePoint: [] // 视频观看的时间点
isPlaying: false
} }
}, },
watch: { watch: {
pptIndex(index) { pptIndex(index) {
this.updateVideoCurrentTime(index) this.isSeek && this.updateVideoCurrentTime(index)
} }
}, },
computed: { computed: {
...@@ -146,35 +147,30 @@ export default { ...@@ -146,35 +147,30 @@ export default {
if (this.progress.cpt) { if (this.progress.cpt) {
this.player.seek(this.progress.cpt) this.player.seek(this.progress.cpt)
} }
// 更新视频观看总时长
this.updateWatchTime()
}, },
// 当前播放时间更新 // 当前播放时间更新
onTimeupdate(time) { onTimeupdate(time) {
this.isPlaying = true time = Math.floor(time)
const ppts = this.chatperResources.ppts || [] const ppts = this.chatperResources.ppts || []
let index = this.chatperResources.ppts.findIndex( let index = this.chatperResources.ppts.findIndex(item => item.ppt_point > time)
item => item.ppt_point > time
)
index = index !== -1 ? index - 1 : ppts.length - 1 index = index !== -1 ? index - 1 : ppts.length - 1
this.$emit('change-ppt', index) this.$emit('change-ppt', index)
const durations = this.player.getDuration() const durations = this.player.getDuration()
// 更新视频时间 // 更新当前播放时间
this.progress.cpt = parseInt(time) this.progress.cpt = time
// 更新视频时长 // 观看的最大点
this.progress.mpt = parseInt(durations) this.progress.mpt = Math.max(time, this.progress.mpt)
const hasTimePoint = this.watchedTimePoint.includes(this.progress.cpt) const hasTimePoint = this.watchedTimePoint.includes(this.progress.cpt)
if (!hasTimePoint) { if (!hasTimePoint) {
this.watchedTimePoint.push(this.progress.cpt) this.watchedTimePoint.push(this.progress.cpt)
} }
// 更新视频观看总时长
this.updateWatchTime(time)
// 更新视频进度，10秒更新一次 // 更新视频进度，10秒更新一次
if (this.throttled) { if (this.throttled) {
this.throttled(time, durations) this.throttled(time, durations)
} else { } else {
this.throttled = throttle( this.throttled = throttle(this.updateChapterVideoProgress, this.throttleWait * 1000, { leading: false })
this.updateChapterVideoProgress,
this.throttleWait * 1000
)
} }
}, },
// 更新视频当前播放时间 // 更新视频当前播放时间
...@@ -226,7 +222,6 @@ export default { ...@@ -226,7 +222,6 @@ export default {
}, },
// 更新章节视频进度 // 更新章节视频进度
updateChapterVideoProgress(time, durations) { updateChapterVideoProgress(time, durations) {
// this.progress.pt += this.throttleWait
// 登录用户信息 // 登录用户信息
const user = window.G.UserInfo const user = window.G.UserInfo
const params = { const params = {
...@@ -247,24 +242,18 @@ export default { ...@@ -247,24 +242,18 @@ export default {
this.watchedTimePoint = [] this.watchedTimePoint = []
}, },
// 更新观看总时长 // 更新观看总时长
updateWatchTime() { updateWatchTime(time) {
this.timer && clearInterval(this.timer) if (time === this.watchedTime) {
return
}
this.watchedTime = time
// 增加跳过片头时间 // 增加跳过片头时间
if (this.isSkip && !this.progress.pt) { if (this.isSkip && !this.progress.pt) {
this.progress.pt = this.skipTime + this.throttleWait this.progress.pt = this.skipTime + 20
} }
// 默认增加时间 // 默认增加时间
this.progress.pt = this.progress.pt || this.throttleWait this.progress.pt = this.progress.pt || 20
this.timer = setInterval(() => { this.progress.pt++
// safair 浏览器下有bug
// const status = this.player.getStatus()
if (this.isPlaying) {
// 播放倍速
const speed = this.player._originalPlaybackRate || 1
this.progress.pt = this.progress.pt + 1 * speed
}
this.isPlaying = false
}, 1000)
} }
}, },
beforeMount() { beforeMount() {
...@@ -272,9 +261,6 @@ export default { ...@@ -272,9 +261,6 @@ export default {
this.getChapterVideo() this.getChapterVideo()
// 获取视频进度 // 获取视频进度
this.getChapterVideoProgress() this.getChapterVideoProgress()
},
destroyed() {
this.timer && clearInterval(this.timer)
} }
} }
</script> </script>
......
client/src/modules/viewer/components/player/videoPlayer.vue
浏览文件 @ 9e516cfd
...@@ -5,7 +5,11 @@ ...@@ -5,7 +5,11 @@
<script> <script>
export default { export default {
name: 'VideoPlayer', name: 'VideoPlayer',
props: { isSkip: Boolean, video: Object }, props: {
isSkip: Boolean,
video: Object,
autoplay: { type: Boolean, default: false }
},
data() { data() {
return { player: null } return { player: null }
}, },
...@@ -28,12 +32,11 @@ export default { ...@@ -28,12 +32,11 @@ export default {
source: JSON.stringify({ FD, LD, SD }), source: JSON.stringify({ FD, LD, SD }),
width: '100%', width: '100%',
height: '100%', height: '100%',
autoplay: false, autoplay: this.autoplay,
isLive: false, isLive: false,
preload: true,
useH5Prism: true,
controlBarVisibility: 'always', controlBarVisibility: 'always',
defaultDefinition: 'SD', definition: 'FD,LD,SD',
defaultDefinition: 'LD',
useHlsPluginForSafari: true useHlsPluginForSafari: true
}, },
function(player) { function(player) {
......
client/src/modules/viewer/components/work/chapterExam.vue
浏览文件 @ 9e516cfd
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</template> </template>
<div class="exam-buttons"> <div class="exam-buttons">
<el-tooltip effect="dark" content="提交之后就不能修改了哦" placement="right"> <el-tooltip effect="dark" content="提交之后就不能修改了哦" placement="right">
<el-button type="primary" @click="onSubmit">{{submitText}}</el-button> <el-button type="primary" :loading="submitLoading" @click="onSubmit">{{submitText}}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
</el-form> </el-form>
...@@ -78,7 +78,8 @@ export default { ...@@ -78,7 +78,8 @@ export default {
messageInstance: null, messageInstance: null,
exam: {}, exam: {},
isStartExam: false, // 是否开始考试 isStartExam: false, // 是否开始考试
autoSubmitTimer: null // 自动提交定时器 autoSubmitTimer: null, // 自动提交定时器
submitLoading: false
} }
}, },
watch: { watch: {
...@@ -265,6 +266,7 @@ export default { ...@@ -265,6 +266,7 @@ export default {
}, },
// 请求提交接口 // 请求提交接口
handleSubmitRequest(params) { handleSubmitRequest(params) {
this.submitLoading = true
params.paper_type = 0 params.paper_type = 0
api api
.submitCourseExam(this.sid, this.cid, this.pid, params) .submitCourseExam(this.sid, this.cid, this.pid, params)
...@@ -284,6 +286,9 @@ export default { ...@@ -284,6 +286,9 @@ export default {
.catch(error => { .catch(error => {
this.$message.error(error.message) this.$message.error(error.message)
}) })
.finally(() => {
this.submitLoading = false
})
} }
}, },
beforeMount() { beforeMount() {
......
client/src/modules/viewer/components/work/chapterTest.vue
浏览文件 @ 9e516cfd
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
></exam-item> ></exam-item>
<div class="exam-buttons"> <div class="exam-buttons">
<el-tooltip effect="dark" content="提交之后就不能修改了哦" placement="right"> <el-tooltip effect="dark" content="提交之后就不能修改了哦" placement="right">
<el-button type="primary" @click="onSubmit">{{submitText}}</el-button> <el-button type="primary" :loading="submitLoading" @click="onSubmit">{{submitText}}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
</el-form> </el-form>
...@@ -52,7 +52,8 @@ export default { ...@@ -52,7 +52,8 @@ export default {
detail: null, detail: null,
questions: [], // 问题列表 questions: [], // 问题列表
startTime: new Date().getTime(), // 进入时间 startTime: new Date().getTime(), // 进入时间
messageInstance: null messageInstance: null,
submitLoading: false
} }
}, },
watch: { watch: {
...@@ -247,6 +248,7 @@ export default { ...@@ -247,6 +248,7 @@ export default {
}, },
// 请求提交接口 // 请求提交接口
handleSubmitRequest(params) { handleSubmitRequest(params) {
this.submitLoading = true
api api
.sbumitChapterHomework(params) .sbumitChapterHomework(params)
.then(response => { .then(response => {
...@@ -259,6 +261,9 @@ export default { ...@@ -259,6 +261,9 @@ export default {
.catch(error => { .catch(error => {
this.$message.error(error.message) this.$message.error(error.message)
}) })
.finally(() => {
this.submitLoading = false
})
} }
}, },
beforeMount() { beforeMount() {
......
client/src/modules/viewer/components/work/chapterWork.vue
浏览文件 @ 9e516cfd
...@@ -69,8 +69,9 @@ ...@@ -69,8 +69,9 @@
<el-tooltip content="在获老师批改之前，可以多次提交，将以最后一次提交为准" placement="right"> <el-tooltip content="在获老师批改之前，可以多次提交，将以最后一次提交为准" placement="right">
<el-button <el-button
type="primary" type="primary"
@click="onSubmit"
:disabled="disabled || !isWorkTime" :disabled="disabled || !isWorkTime"
:loading="submitLoading"
@click="onSubmit"
>{{ submitText }}</el-button> >{{ submitText }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -115,7 +116,8 @@ export default { ...@@ -115,7 +116,8 @@ export default {
startTime: new Date().getTime(), // 进入时间 startTime: new Date().getTime(), // 进入时间
messageInstance: null, messageInstance: null,
deadline: '', // 截止时间 deadline: '', // 截止时间
disabled: false disabled: false,
submitLoading: false
} }
}, },
watch: { watch: {
...@@ -295,6 +297,7 @@ export default { ...@@ -295,6 +297,7 @@ export default {
}, },
// 请求提交接口 // 请求提交接口
handleSubmitRequest(params) { handleSubmitRequest(params) {
this.submitLoading = true
api api
.sbumitChapterHomework(params) .sbumitChapterHomework(params)
.then(response => { .then(response => {
...@@ -308,6 +311,9 @@ export default { ...@@ -308,6 +311,9 @@ export default {
.catch(error => { .catch(error => {
this.$message.error(error.message) this.$message.error(error.message)
}) })
.finally(() => {
this.submitLoading = false
})
}, },
// 重新编辑 // 重新编辑
onReEdit() { onReEdit() {
......
client/src/modules/viewer/components/work/courseExam.vue
浏览文件 @ 9e516cfd
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</template> </template>
<div class="exam-buttons"> <div class="exam-buttons">
<el-tooltip effect="dark" content="提交之后就不能修改了哦" placement="right"> <el-tooltip effect="dark" content="提交之后就不能修改了哦" placement="right">
<el-button type="primary" @click="onSubmit">{{submitText}}</el-button> <el-button type="primary" :loading="submitLoading" @click="onSubmit">{{submitText}}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
</el-form> </el-form>
...@@ -83,7 +83,8 @@ export default { ...@@ -83,7 +83,8 @@ export default {
exam: {}, exam: {},
isStartExam: false, // 是否开始考试 isStartExam: false, // 是否开始考试
autoSubmitTimer: null, // 自动提交定时器 autoSubmitTimer: null, // 自动提交定时器
checkStatusTimer: null // 考试状态定时器 checkStatusTimer: null, // 考试状态定时器
submitLoading: false
} }
}, },
computed: { computed: {
...@@ -287,6 +288,7 @@ export default { ...@@ -287,6 +288,7 @@ export default {
}, },
// 请求提交接口 // 请求提交接口
handleSubmitRequest(params) { handleSubmitRequest(params) {
this.submitLoading = true
api api
.submitCourseExam(this.sid, this.cid, this.pid, params) .submitCourseExam(this.sid, this.cid, this.pid, params)
.then(response => { .then(response => {
...@@ -305,6 +307,9 @@ export default { ...@@ -305,6 +307,9 @@ export default {
.catch(error => { .catch(error => {
this.$message.error(error.message) this.$message.error(error.message)
}) })
.finally(() => {
this.submitLoading = false
})
} }
}, },
beforeMount() { beforeMount() {
......
client/src/modules/viewer/components/work/courseWork.vue
浏览文件 @ 9e516cfd
...@@ -62,7 +62,12 @@ ...@@ -62,7 +62,12 @@
</div> </div>
<div class="buttons"> <div class="buttons">
<el-tooltip content="在获老师批改之前，可以多次提交，将以最后一次提交为准" placement="right"> <el-tooltip content="在获老师批改之前，可以多次提交，将以最后一次提交为准" placement="right">
<el-button type="primary" @click="onSubmit" :disabled="isRevised">{{submitText}}</el-button> <el-button
type="primary"
:disabled="isRevised"
:loading="submitLoading"
@click="onSubmit"
>{{submitText}}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
...@@ -117,7 +122,8 @@ export default { ...@@ -117,7 +122,8 @@ export default {
}, },
detail: null, detail: null,
loading: false, loading: false,
messageInstance: null messageInstance: null,
submitLoading: false
} }
}, },
computed: { computed: {
...@@ -179,6 +185,7 @@ export default { ...@@ -179,6 +185,7 @@ export default {
}, },
// 请求提交接口 // 请求提交接口
handleSubmitRequest(params) { handleSubmitRequest(params) {
this.submitLoading = true
api api
.updateCourseWork(this.sid, this.cid, params) .updateCourseWork(this.sid, this.cid, params)
.then(response => { .then(response => {
...@@ -192,6 +199,9 @@ export default { ...@@ -192,6 +199,9 @@ export default {
.catch(error => { .catch(error => {
this.$message.error(error.message) this.$message.error(error.message)
}) })
.finally(() => {
this.submitLoading = false
})
} }
}, },
beforeMount() { beforeMount() {
......
client/src/modules/viewer/index.vue
浏览文件 @ 9e516cfd
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
</el-tooltip> </el-tooltip>
</router-link> </router-link>
</template> </template>
<div class="course-menu" @click="menuVisible = !menuVisible">
<i class="el-icon-s-unfold" v-if="menuVisible"></i>
<i class="el-icon-s-fold" v-else></i>
</div>
</div> </div>
<!-- 主体区域 --> <!-- 主体区域 -->
<div class="course-viewer-main-bd"> <div class="course-viewer-main-bd">
...@@ -27,9 +31,10 @@ ...@@ -27,9 +31,10 @@
:data="detail" :data="detail"
:chapter="activeChapter" :chapter="activeChapter"
:pptIndex="pptIndex" :pptIndex="pptIndex"
:isSeek="isSeek"
:key="pid" :key="pid"
@pptupdate="handlePPTupdate" @pptupdate="handlePPTupdate"
@change-ppt="handleChangePPT" @change-ppt="handleChangePPT(...arguments, false)"
/> />
</div> </div>
</div> </div>
...@@ -40,9 +45,9 @@ ...@@ -40,9 +45,9 @@
:active="activeChapter" :active="activeChapter"
:ppts="ppts" :ppts="ppts"
:pptIndex="pptIndex" :pptIndex="pptIndex"
@change-ppt="handleChangePPT" @change-ppt="handleChangePPT(...arguments, true)"
v-if="detail.chapters" v-if="detail.chapters"
v-show="!isLive && !isCourseExam" v-show="menuVisible"
></v-aside> ></v-aside>
</div> </div>
</template> </template>
...@@ -60,13 +65,25 @@ export default { ...@@ -60,13 +65,25 @@ export default {
return { return {
detail: {}, detail: {},
ppts: [], ppts: [],
pptIndex: 0 pptIndex: 0,
isSeek: false,
menuVisible: true
} }
}, },
watch: { watch: {
activeChapter() { activeChapter() {
this.ppts = [] this.ppts = []
this.pptIndex = 0 this.pptIndex = 0
},
isLive(value) {
if (value) {
this.menuVisible = false
}
},
isCourseExam(value) {
if (value) {
this.menuVisible = false
}
} }
}, },
computed: { computed: {
...@@ -115,7 +132,7 @@ export default { ...@@ -115,7 +132,7 @@ export default {
}, },
// 直播 // 直播
isLive() { isLive() {
return this.activeChapter ? this.activeChapter.type === 5 : false return this.activeChapter ? [5, 8].includes(this.activeChapter.type) : false
}, },
// 课程考试 // 课程考试
isCourseExam() { isCourseExam() {
...@@ -149,8 +166,9 @@ export default { ...@@ -149,8 +166,9 @@ export default {
this.ppts = list this.ppts = list
}, },
// 右侧菜单选中的PPT修改 // 右侧菜单选中的PPT修改
handleChangePPT(index) { handleChangePPT(index, isSeek) {
this.pptIndex = index this.pptIndex = index
this.isSeek = isSeek
} }
}, },
beforeMount() { beforeMount() {
...@@ -186,7 +204,7 @@ export default { ...@@ -186,7 +204,7 @@ export default {
.course-viewer-main-hd__title { .course-viewer-main-hd__title {
flex: 1; flex: 1;
font-size: 1.5em; font-size: 1.5em;
text-align: center; // text-align: center;
color: #a0a0a0; color: #a0a0a0;
} }
.course-viewer-main-bd { .course-viewer-main-bd {
...@@ -238,4 +256,17 @@ export default { ...@@ -238,4 +256,17 @@ export default {
font-size: 18px; font-size: 18px;
// border-bottom: 3px solid #707070; // border-bottom: 3px solid #707070;
} }
.course-menu {
width: 24px;
height: 24px;
padding: 12px;
margin-right: 10px;
color: #fff;
text-align: center;
border-radius: 50%;
cursor: pointer;
&:hover {
background-color: rgba(255, 255, 255, 0.08);
}
}
</style> </style>
client/src/pages/affairsHall/api.js 0 → 100644
浏览文件 @ 9e516cfd
import BaseAPI from '@/api/base_api'
const httpRequest = new BaseAPI(webConf)
// 获取事务类型列表
export function getAffairType() {
return httpRequest.get('/api/lms/v2/lobby/affairs')
}
// 获取事务列表
export function getAffairList() {
return httpRequest.get('/api/lms/v2/lobby/processes')
}
// 获取事务详情
export function getAffair(id) {
return httpRequest.get(`/api/lms/v2/lobby/processes/${id}`)
}
// 创建事务
export function createAffair(data) {
return httpRequest.post('/api/lms/v2/lobby/processes', data)
}
// 更新事务
export function updateAffair(id, data) {
return httpRequest.post(`/api/lms/v2/lobby/processes/${id}`, data)
}
// 删除事务
export function deleteAffair(id) {
return httpRequest({
url: `/api/lms/v2/lobby/processes/${id}`,
method: 'delete'
})
}
// 上传文件
export function upload(data) {
return httpRequest({
url: '/api/lms/v2/lobby/tools/upload',
method: 'post',
headers: { 'Content-Type': 'multipart/form-data' },
data
})
}
// 获取学期
export function getSemesters(params) {
return httpRequest.get('/api/lms/v2/lobby/semesters')
}
// 获取课程
export function getCourses(sid) {
return httpRequest.get(`/api/lms/v2/lobby/semesters/${sid}/courses`)
}
// 获取成绩单
export function getReport() {
return httpRequest.get('/api/lms/v2/lobby/havereport')
}
// 获取学生
export function getStudent() {
return httpRequest.get('/api/lms/v2/lobby/student')
}
client/src/pages/affairsHall/components/hall-form.vue 0 → 100644
浏览文件 @ 9e516cfd
<template>
<div class="hall-form">
<el-radio
v-model="schoolReport"
@change="changeReport"
label="elreport"
border
size="small"
>电子成绩单</el-radio>
<el-radio
v-model="schoolReport"
@change="changeReport"
label="pareport"
border
size="small"
>纸质成绩单</el-radio>
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
:disabled="Number(ruleForm.submit) === 1"
label-width="100px"
size="small"
label-position="top"
class="hall-form-body"
>
<!-- <el-form-item label="姓名" prop="personal_name">
<el-input v-model.trim="ruleForm.personal_name"></el-input>
</el-form-item>
<el-form-item label="班级" prop="class_name">
<el-input v-model.trim="ruleForm.class_name"></el-input>
</el-form-item>-->
<el-form-item label="Sofia ID" prop="sofia_id" key="sofia_id">
<el-input v-model.trim="ruleForm.sofia_id"></el-input>
</el-form-item>
<el-form-item label="电话" prop="telephone" key="telephone" v-if="schoolReport === 'pareport'">
<el-input v-model.trim="ruleForm.telephone"></el-input>
</el-form-item>
<el-form-item :label="schoolReport === 'elreport' ? '邮箱':'邮寄地址'" prop="email">
<el-input v-model.trim="ruleForm.email"></el-input>
</el-form-item>
<el-form-item label="需打印的份数" prop="number" key="number" v-if="schoolReport === 'pareport'">
<el-input v-model.trim="ruleForm.number"></el-input>
</el-form-item>
<el-form-item class="ts-width">
<span class="red" v-if="schoolReport === 'elreport'">
毕业生可申请成绩单。
<br />请仔细核查您填写的信息后提交，提交后不可修改。电子成绩单将发送至您填写的邮箱。
</span>
<span class="red" v-else>
毕业生可申请成绩单。
<br />请仔细核查您填写的信息后提交，提交后不可修改。纸质成绩单将按您填写的地址邮寄给您。
</span>
</el-form-item>
<el-form-item class="ts-width">
<el-button
type="primary"
@click="submitForm('ruleForm')"
>{{Number(ruleForm.submit) === 1 ? '已提交' : '提交'}}</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
export default {
name: 'hall-form',
props: {
formData: {
type: Object
}
},
watch: {
formData: {
immediate: true,
handler(value) {
this.ruleForm = Object.assign({}, value)
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
}
}
},
data() {
var checkPhone = (rule, value, callback) => {
var reg = /^1[345789]\d{9}$/
if (!reg.test(value)) {
callback(new Error('请输入11位手机号！'))
} else {
callback()
}
}
var blurText = async (rule, value, callback) => {
var boolean = new RegExp('^[1-9][0-9]*$').test(value)
if (!boolean) {
callback(new Error('请输入正整数！'))
} else {
callback()
}
}
var checkEmail = async (rule, value, callback) => {
if (!value) {
if (this.schoolReport === 'pareport') {
callback(new Error('请输入邮寄地址！'))
} else {
callback(new Error('请输入邮箱！'))
}
} else {
callback()
}
}
var checksofiaId = (rule, value, callback) => {
var boolean = new RegExp('^[1-9][0-9]*$').test(value)
if (!value) {
callback(new Error('请输入Sofia ID！'))
} else if (!boolean) {
callback(new Error('请输入正整数！'))
} else {
callback()
}
}
return {
ruleForm: {
sofia_id: '',
telephone: '',
email: '',
number: null,
submit: 0
},
rules: {
// personal_name: [
// { required: true, message: '请输入姓名', trigger: 'blur' }
// ],
// class_name: [
// { required: true, message: '请输入班级', trigger: 'blur' }
// ],
sofia_id: [{ required: true, validator: checksofiaId, trigger: 'blur' }],
telephone: [{ required: true, validator: checkPhone, trigger: 'blur' }],
email: [{ required: true, validator: checkEmail, trigger: 'blur' }],
number: [{ required: true, validator: blurText, trigger: 'blur' }]
},
schoolReport: 'elreport'
}
},
methods: {
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
this.$emit('submit', this.ruleForm, this.schoolReport)
} else {
return false
}
})
},
changeReport() {
this.$emit('submitType', this.schoolReport)
}
},
mounted() {
this.changeReport()
}
}
</script>
<style lang="scss" scoped>
.hall-form {
width: 100%;
.hall-form-body {
padding: 15px 10px 20px 10px;
.red {
color: red;
}
}
}
.hall-form .red:before {
content: '*';
color: #f56c6c;
margin-right: 4px;
}
::v-deep .el-form-item__label {
padding: 0 0 5px 0;
}
::v-deep .el-form-item {
margin-bottom: 12px;
}
::v-deep .el-input {
width: 25%;
}
::v-deep .el-button {
width: 25%;
margin-top: 20px;
}
</style>
client/src/pages/affairsHall/components/pay.vue 0 → 100644
浏览文件 @ 9e516cfd
<template>
<div class="pay">
<template v-for="(item, index) in datalist">
<div class="pay-box" :key="index">
<i class="el-icon-error" @click="handleRemove(index)" v-if="index && canEditable(item)"></i>
<pay-item :data="item" :index="index" :disabled="!canEditable(item)"></pay-item>
</div>
</template>
<el-button
icon="el-icon-plus"
@click="handleAdd"
style="margin-bottom:20px"
size="medium"
v-if="!disabled"
>新增缴费凭证</el-button>
</div>
</template>
<script>
import PayItem from './payItem'
export default {
props: {
datalist: { type: Array, default: () => [] },
disabled: { type: Boolean, default: false }
},
components: { PayItem },
methods: {
canEditable(data) {
if (this.disabled) {
return false
}
return !['1', '2'].includes(data.status)
},
// 添加
handleAdd() {
this.datalist.push({ pay_date: '', type: '', money: '', url: '' })
},
// 删除
handleRemove(index) {
this.datalist.splice(index, 1)
}
},
beforeMount() {
// 默认创建一条
!this.datalist.length && this.handleAdd()
}
}
</script>
<style lang="scss" scoped>
.pay-box {
position: relative;
border: 1px solid #b80037;
padding: 20px;
.el-icon-error {
position: absolute;
right: -14px;
top: -14px;
font-size: 28px;
color: #b80037;
cursor: pointer;
}
}
.pay-box {
margin-bottom: 20px;
}
</style>
client/src/pages/affairsHall/components/payItem.vue 0 → 100644
浏览文件 @ 9e516cfd
<template>
<div class="pay-item">
<el-form-item
label="支付时间"
:prop="'payment_instrument.' + index + '.pay_date'"
:rules="{ required: true, message: '请选择日期' }"
>
<el-date-picker
v-model="data.pay_date"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
:disabled="disabled"
></el-date-picker>
</el-form-item>
<el-form-item
label="支付方式"
:prop="'payment_instrument.' + index + '.type'"
:rules="{ required: true, message: '请选择支付方式' }"
>
<el-popover placement="top-start" trigger="hover">
<p>银行账户名称：清控紫荆（北京）教育科技股份有限公司</p>
<p>银行帐号：694485289</p>
<p>开户行：中国民生银行股份有限公司北京魏公村支行</p>
<el-radio slot="reference" label="1" v-model="data.type" :disabled="disabled">银行卡转账</el-radio>
</el-popover>
<el-popover placement="top-start" trigger="hover">
<p>支付宝户名：清控紫荆（北京）教育科技股份有限公司</p>
<el-radio
slot="reference"
label="2"
v-model="data.type"
:disabled="disabled"
style="margin-left:40px;"
>支付宝转账</el-radio>
</el-popover>
</el-form-item>
<el-form-item
label="支付金额"
:prop="'payment_instrument.' + index + '.money'"
:rules="{ required: true, message: '请输入支付金额' }"
>
<el-input v-model="data.money" placeholder="输入支付金额" :disabled="disabled" style="width:220px">
<template slot="append">¥</template>
</el-input>
</el-form-item>
<el-form-item
label="上传缴费凭证"
:prop="'payment_instrument.' + index + '.url'"
:rules="{ required: true, message: '请上传缴费凭证' }"
>
<app-upload v-model="data.url" :disabled="disabled"></app-upload>
</el-form-item>
<el-form-item label="审核状态" v-if="statusText">
<el-tag>{{statusText}}</el-tag>
</el-form-item>
</div>
</template>
<script>
import AppUpload from '@/components/upload'
export default {
props: {
data: { type: Object, required: true },
index: { type: Number },
disabled: { type: Boolean, default: false }
},
components: { AppUpload },
computed: {
statusText() {
const status = {
'-1': '待审核',
0: '未通过',
1: '通过'
}
return status[this.data.status] || ''
}
}
}
</script>
client/src/pages/affairsHall/hall.vue
浏览文件 @ 9e516cfd
...@@ -5,23 +5,28 @@ ...@@ -5,23 +5,28 @@
</div> </div>
<Tap :tapParam="tapParam" @tapParam="tapIndexs"></Tap> <Tap :tapParam="tapParam" @tapParam="tapIndexs"></Tap>
<div class="con-box"> <div class="con-box">
<el-button <el-button type="primary" v-if="tapIndex == 0" @click="golearningAdd('/app/affairs-hall/learning-add/-1')"
type="primary" >申请新的活动</el-button
v-if="tapIndex==0" >
@click="golearningAdd('/app/affairs-hall/learning-add/-1')" <el-button type="primary" v-if="tapIndex == 1" @click="golearningAdd('/app/affairs-hall/share-add/-1')"
>申请新的活动</el-button> >申请新乐分享</el-button
<el-button >
type="primary" <el-button type="primary" v-if="tapIndex == 2" @click="golearningAdd('/app/affairs-hall/again-add/-1')"
v-if="tapIndex==1" >申请重修</el-button
@click="golearningAdd('/app/affairs-hall/share-add/-1')" >
>申请新乐分享</el-button> <div style="width: 100%; height: 0.2rem"></div>
<el-button <table-list
type="primary" :key="affairId"
v-if="tapIndex==2" v-bind="tableOption"
@click="golearningAdd('/app/affairs-hall/again-add/-1')" v-if="affairId && resultName !== '成绩单'"
>申请重修</el-button> ref="tableList"
<div style="width: 100%; height: 0.2rem;"></div> ></table-list>
<table-list :key="affairId" v-bind="tableOption" v-if="affairId" ref="tableList"></table-list> <hall-form
v-if="resultName === '成绩单'"
:formData="formData"
@submit="submit"
@submitType="obtainReport"
></hall-form>
</div> </div>
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%"> <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
<span>确定删除？</span> <span>确定删除？</span>
...@@ -37,6 +42,7 @@ ...@@ -37,6 +42,7 @@
import Tap from '../../components/comTable/tap.vue' import Tap from '../../components/comTable/tap.vue'
import mPage from '../../components/comTable/mPage.vue' import mPage from '../../components/comTable/mPage.vue'
import TableList from '../../components/comTable/tableList.vue' import TableList from '../../components/comTable/tableList.vue'
import HallForm from './components/hall-form.vue'
import cAction from '@action' import cAction from '@action'
const status = { const status = {
'-1': '待审核', '-1': '待审核',
...@@ -49,6 +55,7 @@ const status = { ...@@ -49,6 +55,7 @@ const status = {
export default { export default {
components: { components: {
Tap, Tap,
HallForm,
mPage, mPage,
TableList TableList
}, },
...@@ -223,6 +230,8 @@ export default { ...@@ -223,6 +230,8 @@ export default {
} }
}, },
affairList: [], affairList: [],
formData: {},
resultName: '',
affairId: null affairId: null
} }
}, },
...@@ -237,6 +246,32 @@ export default { ...@@ -237,6 +246,32 @@ export default {
} }
}, },
methods: { methods: {
submit(row, type) {
const params = Object.assign(
{
type: type,
affair_id: this.affairList.find(k => k.form_name === type).id
},
row
)
cAction.Affairs.submitLearning(params)
.then(() => {
this.$message({ type: 'success', message: '已提交成功！' })
this.obtainReport(type)
})
.catch(e => {
this.$message.error(e.message)
})
},
obtainReport(type = 'elreport') {
cAction.Affairs.obtainReport(type)
.then(data => {
this.formData = data
})
.catch(e => {
this.$message.error(e.message)
})
},
confirmDeletion(row) { confirmDeletion(row) {
/* 删除 */ /* 删除 */
const loading = this.$loading({ const loading = this.$loading({
...@@ -262,6 +297,7 @@ export default { ...@@ -262,6 +297,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
}, },
tapIndexs(data) { tapIndexs(data) {
this.resultName = data.name
this.tapIndex = data.index this.tapIndex = data.index
this.affairId = data.id this.affairId = data.id
}, },
...@@ -269,9 +305,14 @@ export default { ...@@ -269,9 +305,14 @@ export default {
getTapData() { getTapData() {
cAction.Affairs.getAffairsType() cAction.Affairs.getAffairsType()
.then(data => { .then(data => {
this.tapParam[0].arrItem = data.map(item => { this.tapParam[0].arrItem = data
return { val: item.id, name: item.affair_name } .map(item => {
if (item.form_name === 'elreport') {
item.affair_name = '成绩单'
}
return { val: item.id, name: item.affair_name, form_name: item.form_name }
}) })
.filter(k => k.form_name !== 'pareport')
const [first] = data const [first] = data
const datas = data[this.$route.query.index] || first const datas = data[this.$route.query.index] || first
this.affairId = datas.id this.affairId = datas.id
......
client/src/pages/affairsHall/retake/edit.vue 0 → 100644
浏览文件 @ 9e516cfd
<template>
<div>
<div class="con-title">重修申请</div>
<div class="con-box">
<el-button type="text">
<router-link :to="{ path: '/app/affairs-hall/hall', query: { index: 2 } }">返回列表</router-link>
</el-button>
<el-row type="flex" justify="center">
<el-col :lg="12">
<el-form
ref="form"
:model="ruleForm"
:rules="rules"
:disabled="isView"
label-width="110px"
>
<el-form-item label="姓名" prop="personal_name" required>
<el-input
v-model="ruleForm.personal_name"
readonly
:disabled="disabledInfo"
placeholder="请输入您的姓名"
/>
</el-form-item>
<el-form-item label="班级" prop="class_name" required>
<el-input
v-model="ruleForm.class_name"
readonly
:disabled="disabledInfo"
placeholder="请输入您的班级"
/>
</el-form-item>
<el-form-item label="Sofia ID" prop="sofia_id" required>
<el-input
v-model="ruleForm.sofia_id"
readonly
:disabled="disabledInfo"
placeholder="请输入您的Sofia ID"
/>
</el-form-item>
<el-form-item label="重修学期" prop="semester_name">
<el-select
v-model="ruleForm.semester_name"
placeholder="请选择"
@change="onSemesterChange"
:disabled="disabledInfo"
>
<el-option v-for="item in semesterList" :key="item.id" :value="item.semester_name"></el-option>
</el-select>
</el-form-item>
<el-form-item label="重修课程" prop="course_id">
<el-checkbox-group v-model="ruleForm.course_id">
<el-checkbox
v-for="item in courseList"
:label="item.id"
:key="item.id"
:disabled="disabledInfo"
>{{item.course_name}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<div style="padding-left:110px" v-if="hasPay">
<div class="score" v-if="detail.form">{{detail.form.score_sum_str}}</div>
<pay :datalist="ruleForm.payment_instrument" :disabled="disabledPay || isView"></pay>
</div>
<template v-if="isView && detail.status !== -1">
<el-form-item label="审核时间">
<el-input :value="detail.approve_time1" readonly />
</el-form-item>
<el-form-item label="备注" prop="content">
<el-input
type="textarea"
:autosize="{ minRows: 5 }"
:value="detail.remark"
readonly
/>
</el-form-item>
</template>
<el-form-item>
<el-button type="primary" @click="onSubmit" v-if="!isView">保存并提交</el-button>
<el-button type="info" @click="onAbort" v-if="hasAbort">撤回申请</el-button>
</el-form-item>
</el-form>
</el-col>
</el-row>
</div>
</div>
</template>
<script>
import * as api from '../api'
import Pay from '../components/pay'
export default {
props: {
isAdd: { type: Boolean, default: false },
isEdit: { type: Boolean, default: false },
isView: { type: Boolean, default: false }
},
components: { Pay },
data() {
return {
detail: {},
ruleForm: {
personal_name: '',
class_name: '',
sofia_id: '123',
semester_name: '',
course_id: [],
payment_instrument: []
},
rules: {
personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
semester_name: [{ required: true, message: '请输入您的挂科学期', trigger: 'blur' }],
course_name: [{ required: true, message: '请选择您的重修课程名称', trigger: 'blur' }],
course_id: [{ required: true, message: '请选择您的重修课程名称', trigger: 'blur' }]
},
semesterList: [], // 学期列表
courseList: [] // 课程列表
}
},
watch: {
semesterId(value) {
value && this.getCourses()
}
},
computed: {
pid() {
return this.$route.params.id
},
// 事务ID
affairId() {
return this.$route.query.id
},
// 学期ID
semesterId() {
const found = this.semesterList.find(item => item.semester_name === this.ruleForm.semester_name)
return found ? found.id : ''
},
// 撤回
hasAbort() {
return this.isEdit && this.detail.status === -1
},
// 支付凭证
hasPay() {
return !this.isAdd && this.detail.file_put !== 0
},
// 禁用信息部分
disabledInfo() {
return this.isView || (this.isEdit && this.detail.status !== -1)
},
// 禁用支付凭证模块
disabledPay() {
return this.isView || (this.isEdit && this.detail.file_put === 2)
}
},
methods: {
init() {
// 获取学期
this.getSemesters()
if (this.isEdit || this.isView) {
this.getDetail()
} else {
// 获取学生信息
this.getStudent()
}
},
// 获取学生信息
getStudent() {
api.getStudent().then(response => {
const data = this.$_.pick(response, ['personal_name', 'class_name', 'sofia_id'])
Object.assign(this.ruleForm, data)
})
},
// 获取学期
getSemesters() {
api.getSemesters().then(response => {
this.semesterList = response.data
const [first] = this.semesterList
// 设置默认值
if (first && !this.isEdit) {
this.ruleForm.semester_name = first.semester_name
}
})
},
onSemesterChange() {
this.ruleForm.course_id = []
},
// 获取课程
getCourses() {
api.getCourses(this.semesterId).then(response => {
this.courseList = response.data
})
},
// 获取详情
getDetail() {
api.getAffair(this.pid).then(response => {
const form = response.form
if (form.course_name_arr) {
form.course_id = form.course_name_arr.map(item => item.course_id)
}
// 设置表单数据
const ruleForm = this.$_.pick(response.form, [
'personal_name',
'class_name',
'sofia_id',
'semester_name',
'course_id',
'payment_instrument'
])
Object.assign(this.ruleForm, ruleForm)
// 设置接口返回的数据
this.detail = response
})
},
// 添加
addRequest(data) {
api.createAffair(data).then(response => {
this.$message.success(response.message)
this.$router.push({ path: '/app/affairs-hall/hall', query: { index: 2 } })
})
},
// 修改
updateRequest(data) {
api.updateAffair(this.pid, data).then(response => {
this.$message.success(response.message)
this.$router.push({ path: '/app/affairs-hall/hall', query: { index: 2 } })
})
},
// 提交
onSubmit() {
this.$refs.form
.validate()
.then(response => {
const data = Object.assign({ affair_id: this.affairId }, this.ruleForm)
data.course_id = this.ruleForm.course_id.join(',')
data.payment_instrument = JSON.stringify(this.ruleForm.payment_instrument)
this.isEdit ? this.updateRequest(data) : this.addRequest(data)
})
.catch(() => {
this.$message.error('请完善表单信息')
})
},
// 撤回
onAbort() {
this.$confirm('你确定要撤回重修申请吗？撤回后，需要重新提交申请并由教务审批。', {
confirmButtonText: '确定',
cancelButtonText: '取消'
})
.then(() => {})
.catch(() => {})
}
},
mounted() {
this.init()
}
}
</script>
<style lang="scss" scoped>
::v-deep .el-form--label-top .el-form-item__label {
line-height: 1;
}
.score {
margin-bottom: 20px;
color: #b80037;
}
</style>
client/src/pages/affairsHall/retake/list.vue 0 → 100644
浏览文件 @ 9e516cfd
<template>
</template>
<script>
export default {
}
</script>
client/src/pages/feedback/feedbackCreate.vue
浏览文件 @ 9e516cfd
...@@ -144,7 +144,8 @@ export default { ...@@ -144,7 +144,8 @@ export default {
!this.ckeditor && (this.ckeditor = CKEDITOR.replace('editor', { !this.ckeditor && (this.ckeditor = CKEDITOR.replace('editor', {
height: 300, height: 300,
uiColor: '#eeeeee', uiColor: '#eeeeee',
filebrowserImageUploadUrl: '/api/ckeditor/img/upload', filebrowserImageUploadUrl: '/api/ck/form/ckeditor-upload',
fileTools_requestHeaders: { tenant: 'sofia' },
// resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true, // resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true,
toolbar: [ toolbar: [
// { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] }, // { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] },
......
client/src/pages/learn/course.vue
浏览文件 @ 9e516cfd
...@@ -107,13 +107,10 @@ export default { ...@@ -107,13 +107,10 @@ export default {
clearInterval(this.timeInterval) clearInterval(this.timeInterval)
this.timeInterval = null this.timeInterval = null
} }
this.timeInterval = setInterval(() => { // 获取最新直播
cAction.Player.getNewLiveMsg().then(json => { this.getLatestLive()
if (json.status === 200) { // 定时获取最新直播
this.newLiveMsg = json.data this.timeInterval = setInterval(this.getLatestLive, 10000)
}
}).catch(e => { this.$message.error(e.message) }).finally(() => { })
}, 3000)
const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' }) const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
cAction.Course.getLearnFind().then(data => { cAction.Course.getLearnFind().then(data => {
...@@ -193,8 +190,20 @@ export default { ...@@ -193,8 +190,20 @@ export default {
}, },
/* 直接进直播 */ /* 直接进直播 */
goLive () { goLive () {
if (this.newLiveMsg.live.type === 8) {
window.open(this.newLiveMsg.live.record_url || this.newLiveMsg.live.join_url)
} else {
this.$router.push({ name: 'viewerCourseChapter', params: { sid: this.newLiveMsg.semester_id, cid: this.newLiveMsg.course_id, id: this.newLiveMsg.chapter_id } }) this.$router.push({ name: 'viewerCourseChapter', params: { sid: this.newLiveMsg.semester_id, cid: this.newLiveMsg.course_id, id: this.newLiveMsg.chapter_id } })
} }
},
// 获取最新直播
getLatestLive() {
cAction.Player.getNewLiveMsg().then(json => {
if (json.status === 200) {
this.newLiveMsg = json.data
}
}).catch(e => { this.$message.error(e.message) })
}
} }
} }
</script> </script>
......
client/src/pages/learn/courseDetail.vue
浏览文件 @ 9e516cfd
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<div v-bind:key="index1" :class='["body", (item1.id === tabs[1].chapterList.currentChapterId && "on")]'> <div v-bind:key="index1" :class='["body", (item1.id === tabs[1].chapterList.currentChapterId && "on")]'>
<div class='name' :data-vid='item1.vid' :data-cid='item1.cid' :data-sid='item1.sid' :data-hasVA='item1.time' :data-type="item1.video_provider" :data-name='item1.name' :data-index='index' :data-count='index1' @click='jumpToOtherVA(item1)'> <div class='name' :data-vid='item1.vid' :data-cid='item1.cid' :data-sid='item1.sid' :data-hasVA='item1.time' :data-type="item1.video_provider" :data-name='item1.name' :data-index='index' :data-count='index1' @click='jumpToOtherVA(item1)'>
{{item1.name}} {{item1.name}}
<template v-if='item1.type === 5'> <template v-if='[5,8].includes(item1.type)'>
<div class='time'>{{ item1.live.start_time }} {{ item1.live.statusStr }}</div> <div class='time'>{{ item1.live.start_time }} {{ item1.live.statusStr }}</div>
</template> </template>
<template v-else> <template v-else>
...@@ -238,31 +238,7 @@ export default { ...@@ -238,31 +238,7 @@ export default {
isShow: false, isShow: false,
chapterList: { chapterList: {
currentChapterId: '11', // 当前章节id currentChapterId: '11', // 当前章节id
course: [{ course: []
title: '第一章：测试章节',
isUp: true,
chapters: [
// { id: '11', time: '28:18', name: '1.1 现值（PV）和终值（FV）' },
{ id: '12', time: '19:09', name: '1.2 测试课程' }
]
}, {
title: '第二章：证券估值',
isUp: true,
chapters: [
// { id: '21', time: '27:49', name: '2.1 债券和股票的现金流贴现估值方法' },
// { id: '22', time: '16:04', name: '2.2 债券评级及债券协议' },
// { id: '23', time: '', name: '公司金融第二周测验' },
// { id: '24', time: '', name: '公司金融第二周作业' }
]
}, {
title: '课程大作业',
isUp: true,
chapters: []
}, {
title: '课程资料',
isUp: true,
chapters: []
}]
} }
}, { }, {
title: '课程讨论', title: '课程讨论',
...@@ -393,9 +369,7 @@ export default { ...@@ -393,9 +369,7 @@ export default {
window.addEventListener('resize', this.resizeRoot.bind(this), false) window.addEventListener('resize', this.resizeRoot.bind(this), false)
/* 实时刷新数据 */ /* 实时刷新数据 */
if (this.timeHeart) { clearInterval(this.timeHeart); this.timeHeart = null } if (this.timeHeart) { clearInterval(this.timeHeart); this.timeHeart = null }
this.timeHeart = setInterval(() => { // this.timeHeart = setInterval(this.updatePages(), 3000)
this.updatePages()
}, 3000)
this.arrFn = this.initBindKeyfn() this.arrFn = this.initBindKeyfn()
}, },
destroyed () { destroyed () {
...@@ -426,7 +400,8 @@ export default { ...@@ -426,7 +400,8 @@ export default {
!this.ckeditor && (this.ckeditor = CKEDITOR.replace('editor', { !this.ckeditor && (this.ckeditor = CKEDITOR.replace('editor', {
height: 300, height: 300,
uiColor: '#eeeeee', uiColor: '#eeeeee',
filebrowserImageUploadUrl: '/api/ckeditor/img/upload', filebrowserImageUploadUrl: '/api/ck/form/ckeditor-upload',
fileTools_requestHeaders: { tenant: 'sofia' },
// resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true, // resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true,
toolbar: [ toolbar: [
// { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] }, // { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] },
...@@ -534,11 +509,11 @@ export default { ...@@ -534,11 +509,11 @@ export default {
if (type === 1) { if (type === 1) {
return return
} }
// 直播 // cc直播
if (type === 5) { if (type === 5) {
const live = data.live const live = data.live
const status = live.live_status const status = live.live_status
if (status === 0 || (status === 2 && !live.record_url)) { if (status === 2 && !live.enable_record) {
this.$message.error(live.statusStr) this.$message.error(live.statusStr)
return return
} }
...@@ -556,6 +531,11 @@ export default { ...@@ -556,6 +531,11 @@ export default {
return return
} }
} }
// zoom直播
if (type === 8) {
window.open(data.live.record_url || data.live.join_url)
return
}
this.$router.push({ name: 'viewerCourseChapter', params: { sid, cid, id: data.id } }) this.$router.push({ name: 'viewerCourseChapter', params: { sid, cid, id: data.id } })
}, },
/** /**
......
client/src/pages/mobileLive/list.vue
浏览文件 @ 9e516cfd
...@@ -4,36 +4,29 @@ ...@@ -4,36 +4,29 @@
<img class="logo" src="../../assets/images/logo-header.png" /> <img class="logo" src="../../assets/images/logo-header.png" />
<div class="user"> <div class="user">
<div class="nickname">{{ nickName }}</div> <div class="nickname">{{ nickName }}</div>
<div class="logout" @click="logout">{{$t('components.learnSysLayout.sideBar.outLogin')}}</div> <div class="logout" @click="logout">{{ $t('components.learnSysLayout.sideBar.outLogin') }}</div>
</div> </div>
</div> </div>
<div class="hint" v-if="latest" @click="onClick(latest.live)"> <div class="hint" v-if="latest" @click="onClick(latest.live)">
<div class="left"> <div class="left">
<div class="left-1">{{$t('live.liveReminder')}}：</div> <div class="left-1">{{ $t('live.liveReminder') }}：</div>
<div <div class="left-2">
class="left-2" 《{{ latest.course_name }}》{{ $t('live.startTime', { time: latest.live.start_time }) }}
>《{{latest.course_name}}》{{$t('live.startTime', { time: latest.live.start_time })}}</div>
</div> </div>
<div class="right">{{$t('live.goLive')}}</div>
</div> </div>
<div class="tips">{{$t('live.replayTips')}}</div> <div class="right">{{ $t('live.goLive') }}</div>
</div>
<div class="tips">{{ $t('live.replayTips') }}</div>
<div class="live-list"> <div class="live-list">
<template v-for="item in dataList"> <template v-for="item in dataList">
<div <div class="live-item" :key="subitem.id" v-for="subitem in item.live" @click="onClick(subitem)">
class="live-item" <h4 class="live-item-name">{{ item.course_name }}</h4>
:key="subitem.id"
v-for="subitem in item.live"
@click="onClick(subitem)"
>
<h4 class="live-item-name">{{item.course_name}}</h4>
<div class="live-item-main"> <div class="live-item-main">
<img class="live-item-pic" :src="item.curriculum.curriculum_picture" /> <img class="live-item-pic" :src="item.curriculum.curriculum_picture" />
<div class="live-item-content"> <div class="live-item-content">
<div class="live-item-content__title">{{subitem.chapter_name}}</div> <div class="live-item-content__title">{{ subitem.topic }}</div>
<div class="live-item-content__time">{{subitem.start_time}}</div> <div class="live-item-content__time">{{ subitem.start_time }}</div>
<div <div class="live-item-content__status">{{ calcTimeText(subitem.start_time, subitem.live_status) }}</div>
class="live-item-content__status"
>{{calcTimeText(subitem.start_time, subitem.live_status)}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -67,7 +60,8 @@ export default { ...@@ -67,7 +60,8 @@ export default {
cAction.Other.outLogin() cAction.Other.outLogin()
.then(str => { .then(str => {
window.G.UserInfo = {} window.G.UserInfo = {}
this.$router.push({ path: '/login/index' }) // this.$router.push({ path: '/login/index' })
window.location.href = webConf.others.loginUrl
}) })
.catch(e => { .catch(e => {
this.$message.error(e.message) this.$message.error(e.message)
...@@ -113,7 +107,7 @@ export default { ...@@ -113,7 +107,7 @@ export default {
}) })
}, },
dealRender: () => { dealRender: () => {
;(function(win, doc) { ;(function (win, doc) {
const wWidth = const wWidth =
win.screen.width > 0 win.screen.width > 0
? win.innerWidth >= win.screen.width || win.innerWidth === 0 ? win.innerWidth >= win.screen.width || win.innerWidth === 0
...@@ -126,21 +120,21 @@ export default { ...@@ -126,21 +120,21 @@ export default {
})(window, document) })(window, document)
}, },
onClick(data) { onClick(data) {
const { data.live_status = parseInt(data.live_status)
live_status: liveStatus, const { live_status: liveStatus, type: liveType = 5, start_time: liveTime } = data
live_type: liveType = 'live',
start_time: liveTime
} = data
let message = this.calcTimeText(liveTime, liveStatus) let message = this.calcTimeText(liveTime, liveStatus)
if (liveStatus === 2 && !data.enable_record) { if (liveStatus === 2 && !data.enable_record) {
message = this.$t('live.noPlayback') message = this.$t('live.noPlayback')
this.message && this.message.close()
this.message = this.$message({ type: 'warning', offset: 0, message })
return
} }
if (liveType === 'cloud') { if (liveType === 'cloud') {
// 打开云课堂 // 打开云课堂
this.openCloudClass(data, message) this.openCloudClass(data, message)
return return
} }
if (liveType === 'live') { if (liveType === 5) {
// 打开云直播 // 打开云直播
this.openCloudLive(data, message) this.openCloudLive(data, message)
return return
...@@ -150,27 +144,16 @@ export default { ...@@ -150,27 +144,16 @@ export default {
this.openMeeting(data, message) this.openMeeting(data, message)
return return
} }
// 其他直播类型直接打开 this.openNewWindow(data.record_url || data.join_url)
if (liveStatus === 1) {
// 进行中
this.openNewWindow(data.join_url)
} else if (liveStatus === 2) {
// 查看回放
this.openNewWindow(data.record_url)
} else {
this.message && this.message.close()
this.message = this.$message({ type: 'warning', offset: 0, message })
}
}, },
// 打开云课堂 // 打开云课堂
openCloudClass(data, message) { openCloudClass(data, message) {
// https://doc.bokecc.com/class/developer/api/login.html // https://doc.bokecc.com/class/developer/api/login.html
const liveStatus = data.live_status const liveStatus = data.live_status
data.viewer_name = data.user_name = data.user_name || window.G.UserInfo.student_info.personal_name
data.viewer_name || window.G.UserInfo.student_info.personal_name
if (liveStatus === 1) { if (liveStatus === 1) {
// 进行中 // 进行中
const url = `http://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.username}&viewertoken=${data.password}` const url = `http://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.account_id}&autoLogin=true&viewername=${data.username}&viewertoken=${data.password}`
this.openNewWindow(url) this.openNewWindow(url)
} else if (liveStatus === 2) { } else if (liveStatus === 2) {
// 查看回放 // 查看回放
...@@ -188,19 +171,16 @@ export default { ...@@ -188,19 +171,16 @@ export default {
openCloudLive(data, message) { openCloudLive(data, message) {
// https://doc.bokecc.com/live/Appendix_1.html // https://doc.bokecc.com/live/Appendix_1.html
const liveStatus = data.live_status const liveStatus = data.live_status
data.viewer_name = data.viewer_name || this.nickName data.user_name = data.user_name || this.nickName
if (liveStatus === 1) { if (liveStatus === 2 && data.enable_record === 1) {
// 进行中
const url = `https://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}`
this.openNewWindow(url)
} else if (liveStatus === 2 && data.enable_record === 1) {
// enable_record 0:不启用回放 1:开启回放 // enable_record 0:不启用回放 1:开启回放
// 查看回放 // 查看回放
// const url = `https://view.csslcloud.net/api/view/callback?recordid=${data.record_id}&roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}` // const url = `https://view.csslcloud.net/api/view/callback?recordid=${data.record_id}&roomid=${data.room_id}&userid=${data.account_id}&autoLogin=true&viewername=${data.user_name}&viewertoken=${data.play_pass}`
this.openNewWindow(data.record_url) this.openNewWindow(data.record_url)
} else { } else {
this.message && this.message.close() // 查看直播
this.message = this.$message({ type: 'warning', offset: 0, message }) const url = `https://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.account_id}&autoLogin=true&viewername=${data.user_name}&viewertoken=${data.play_pass}`
this.openNewWindow(url)
} }
}, },
// 打开腾讯会议 // 打开腾讯会议
...@@ -219,16 +199,18 @@ export default { ...@@ -219,16 +199,18 @@ export default {
// 计算日期 // 计算日期
calcTimeText(liveTime, liveStatus) { calcTimeText(liveTime, liveStatus) {
const map = { const map = {
0: this.$t('live.notStarted'), 1: this.$t('live.notStarted'),
1: this.$t('live.liveStreaming'), 2: this.$t('live.liveStreaming'),
2: this.$t('live.liveEnd') 3: this.$t('live.liveEnd'),
4: this.$t('live.start'),
5: this.$t('live.notStarted'),
11: this.$t('live.liveEnd')
} }
let result = map[liveStatus] || liveTime let result = map[liveStatus] || liveTime
if (liveStatus === 0 && liveTime) { if (liveStatus === 1 && liveTime) {
liveTime = liveTime.replace(/-/g, '/') liveTime = liveTime.replace(/-/g, '/')
const time = const time = (new Date(liveTime).getTime() - new Date().getTime()) / 1000 || 0
(new Date(liveTime).getTime() - new Date().getTime()) / 1000 || 0
if (time <= 5 * 60) { if (time <= 5 * 60) {
result = this.$t('live.start') result = this.$t('live.start')
} else if (time <= 1 * 60 * 60) { } else if (time <= 1 * 60 * 60) {
......
client/src/pages/player/courseWork/courseWork.vue
浏览文件 @ 9e516cfd
...@@ -194,7 +194,8 @@ export default { ...@@ -194,7 +194,8 @@ export default {
!this.ckeditor && (this.ckeditor = CKEDITOR.replace('editor-courseWork', { !this.ckeditor && (this.ckeditor = CKEDITOR.replace('editor-courseWork', {
height: 600, height: 600,
uiColor: '#eeeeee', uiColor: '#eeeeee',
filebrowserImageUploadUrl: '/api/ckeditor/img/upload', filebrowserImageUploadUrl: '/api/ck/form/ckeditor-upload',
fileTools_requestHeaders: { tenant: 'sofia' },
// resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true, // resize_enabled: typeof this.props.resizable === 'boolean' ? this.props.resizable : true,
toolbar: [ toolbar: [
// { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] }, // { name: 'document', items: ['Source', '-', 'Save', 'NewPage', 'Preview'] },
......
client/src/router/routes.js
浏览文件 @ 9e516cfd
...@@ -6,19 +6,19 @@ export default [ ...@@ -6,19 +6,19 @@ export default [
path: '/login/index', path: '/login/index',
name: 'login-normal', name: 'login-normal',
component: () => import('@/pages/login/index.vue'), component: () => import('@/pages/login/index.vue'),
props: (route) => ({ query: route.query, params: route.params }) props: route => ({ query: route.query, params: route.params })
}, },
{ {
path: '/login/code', path: '/login/code',
name: 'login-code', name: 'login-code',
component: () => import('@/pages/login/code.vue'), component: () => import('@/pages/login/code.vue'),
props: (route) => ({ query: route.query, params: route.params }) props: route => ({ query: route.query, params: route.params })
}, },
{ {
path: '/login/forget', path: '/login/forget',
name: 'login-forget', name: 'login-forget',
component: () => import('@/pages/login/forget.vue'), component: () => import('@/pages/login/forget.vue'),
props: (route) => ({ query: route.query, params: route.params }) props: route => ({ query: route.query, params: route.params })
}, },
/* App 内登录页面未找到时 - 指向 */ /* App 内登录页面未找到时 - 指向 */
{ path: '/login/*', redirect: '/login/index' }, { path: '/login/*', redirect: '/login/index' },
...@@ -173,6 +173,24 @@ export default [ ...@@ -173,6 +173,24 @@ export default [
path: 'view-report/:rid', path: 'view-report/:rid',
component: () => import('../pages/affairsHall/viewReport.vue'), component: () => import('../pages/affairsHall/viewReport.vue'),
props: true props: true
},
{
name: 'ehallRetakeAdd',
path: 'retake/add',
component: () => import(/* webpackChunkName: "ehall" */ '../pages/affairsHall/retake/edit.vue'),
props: { isAdd: true }
},
{
name: 'ehallRetakeEdit',
path: 'retake/edit/:id',
component: () => import(/* webpackChunkName: "ehall" */ '../pages/affairsHall/retake/edit.vue'),
props: { isEdit: true }
},
{
name: 'ehallRetakeView',
path: 'retake/view/:id',
component: () => import(/* webpackChunkName: "ehall" */ '../pages/affairsHall/retake/edit.vue'),
props: { isView: true }
} }
] ]
} }
......
client/src/store/index.js
浏览文件 @ 9e516cfd
import Vue from 'vue' import Vue from 'vue'
import Vuex from 'vuex' import Vuex from 'vuex'
Vue.use(Vuex) Vue.use(Vuex)
const state = {
export default new Vuex.Store({
state: {
myMsg: 0 myMsg: 0
} },
const getters = { getters: {
myMsg (state) { myMsg(state) {
return state.myMsg return state.myMsg
} }
} },
const mutations = { mutations: {
myMsg(state, sum) { myMsg(state, sum) {
state.myMsg = sum state.myMsg = sum
} }
} },
const store = new Vuex.Store({ actions: {}
state,
getters,
mutations
}) })
export default store
project.config.js 0 → 100644
浏览文件 @ 9e516cfd
export default {
title: '紫荆教育MBA学习系统',
tenant: 'sofia'
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论