Skip to content

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

merge...

上级 f7aa8844 370b3e71
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 81 行删除
package-lock.json
浏览文件 @ f7aa877a
差异被折叠。
package.json
浏览文件 @ f7aa877a
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.2", "vue-i18n": "^8.22.2",
"vue-loader": "^15.9.5", "vue-loader": "^15.9.5",
"vue-meta-info": "^0.1.7", "vue-meta": "^2.4.0",
"vue-router": "^3.4.9", "vue-router": "^3.4.9",
"vue-template-compiler": "^2.6.12", "vue-template-compiler": "^2.6.12",
"vuex": "^3.6.0" "vuex": "^3.6.0"
......
src/app.vue
浏览文件 @ f7aa877a
...@@ -3,3 +3,13 @@ ...@@ -3,3 +3,13 @@
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
<script>
export default {
metaInfo() {
return {
title: this.$t('title')
}
}
}
</script>
src/assets/languages/en.json
浏览文件 @ f7aa877a
{ {
"title": "紫荆教育学习系统",
"action": { "action": {
"courseAction": { "courseAction": {
"all": "All", "all": "All",
......
src/assets/languages/zh-CN.json
浏览文件 @ f7aa877a
{ {
"title": "紫荆教育学习系统",
"action": { "action": {
"courseAction": { "courseAction": {
"all": "全部", "all": "全部",
......
src/components/beforeEnter/Before.js
浏览文件 @ f7aa877a
...@@ -9,11 +9,13 @@ export default class Before { ...@@ -9,11 +9,13 @@ export default class Before {
this.isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA)) this.isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA))
this.isIe = window.ActiveXObject || 'ActiveXObject' in window this.isIe = window.ActiveXObject || 'ActiveXObject' in window
this.isChrome = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime) this.isChrome = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime)
this.chromeVersion = 0 // this.chromeVersion = 0
if (this.isChrome) { // if (this.isChrome) {
this.chromeVersion = parseFloat(UA.match(/Chrome\/([\d.]+)/)[1]) // const temp = UA.match(/Chrome\/([\d.]+)/)
} // this.chromeVersion = temp ? parseFloat(temp[1]) : 0
this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70)) // }
// this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70))
this.notSupport = !this.isMobile && this.isIe
// https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser // https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
} }
......
src/index.html
浏览文件 @ f7aa877a
...@@ -5,84 +5,25 @@ ...@@ -5,84 +5,25 @@
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
<meta content="origin" name="referrer" /> <meta content="origin" name="referrer" />
<title>紫荆教育MBA学习系统</title> <title></title>
<meta <meta
name="viewport" name="viewport"
id="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no"
/> />
<!-- 直接引入aliyun播放插件 CSS --> <!-- 直接引入aliyun播放插件 CSS -->
<link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.1/skins/default/aliplayer-min.css" /> <link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.3/skins/default/aliplayer-min.css" />
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<!-- es5 兼容 新方法 -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"></script> -->
<!-- 三方插件引入 -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/videoJs/videoJs.js"></script> -->
<!-- common --> <!-- common -->
<script <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"></script>
type="text/javascript" <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.js"></script>
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js" <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"></script>
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/md5.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.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 <script charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.9.3/aliplayer-min.js"></script>
type="text/javascript"
charset="utf-8"
src="https://g.alicdn.com/de/prismplayer/2.9.1/aliplayer-min.js"
></script>
<script
type="text/javascript"
charset="utf-8"
src="https://player.alicdn.com/aliplayer/presentation/js/aliplayercomponents.min.js"
></script>
<!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 --> <!-- 解决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/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>
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/notify/notification.js"></script> -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/errorCollection/collection.js"></script> -->
<!--[if lt IE 9]>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
<![endif]-->
<!-- Matomo -->
<script type="text/javascript">
var _paq = (window._paq = window._paq || [])
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['setCookieDomain', '*.e-learning.ezijing.com'])
_paq.push(['trackPageView'])
_paq.push(['enableLinkTracking'])
;(function() {
var u = 'https://matomo.ezijing.com/'
_paq.push(['setTrackerUrl', u + 'matomo.php'])
_paq.push(['setSiteId', '3'])
var d = document,
g = d.createElement('script'),
s = d.getElementsByTagName('script')[0]
g.type = 'text/javascript'
g.async = true
g.src = u + 'matomo.js'
s.parentNode.insertBefore(g, s)
})()
</script>
<!-- End Matomo Code -->
</body> </body>
</html> </html>
src/main.js
浏览文件 @ f7aa877a
...@@ -9,6 +9,9 @@ import Element from 'element-ui' ...@@ -9,6 +9,9 @@ import Element from 'element-ui'
import Modules from '@/modules' import Modules from '@/modules'
import createBefore from './components/beforeEnter' import createBefore from './components/beforeEnter'
import _ from 'lodash' import _ from 'lodash'
import VueMeta from 'vue-meta'
Vue.use(VueMeta)
Vue.prototype.$_ = _ Vue.prototype.$_ = _
......
src/modules/offices/src/reportPaper/edit.vue
浏览文件 @ f7aa877a
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1"> <el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1">
{{ payText }} {{ payText }}
</el-form-item> </el-form-item>
<el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1"> <el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1 && ruleForm.payment !== '3'">
{{ payStatusText }} {{ payStatusText }}
</el-form-item> </el-form-item>
<el-form-item label="审批状态" style="margin: 0"> <el-form-item label="审批状态" style="margin: 0">
......
src/modules/offices/src/reportPaper/list.vue
浏览文件 @ f7aa877a
...@@ -35,6 +35,15 @@ export default { ...@@ -35,6 +35,15 @@ export default {
this.$router.push({ name: 'pareportView', params: { id: row.id }, query: { id: row.affair_id } }) this.$router.push({ name: 'pareportView', params: { id: row.id }, query: { id: row.affair_id } })
} }
}, },
{
label: '支付',
isShow(row) {
return row.pay === 0
},
onClick: row => {
this.$router.push({ name: 'pareportEdit', params: { id: row.id }, query: { id: row.affair_id } })
}
},
{ {
label: '编辑', label: '编辑',
isShow(row) { isShow(row) {
......
src/pages/exception/browser.vue
浏览文件 @ f7aa877a
...@@ -28,11 +28,21 @@ ...@@ -28,11 +28,21 @@
</ul> </ul>
</div> </div>
</div> </div>
<p style="font-size: 12px">{{ UA }}</p>
</div> </div>
</template> </template>
<script> <script>
export default {} export default {
data() {
const UA = window.navigator.userAgent
const isIe = window.ActiveXObject || 'ActiveXObject' in window
return { UA, isIe }
},
beforeMount() {
!this.isIe && this.$router.replace('/')
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/pages/grade/credit.vue
浏览文件 @ f7aa877a
...@@ -86,12 +86,12 @@ export default { ...@@ -86,12 +86,12 @@ export default {
tableHead: [ tableHead: [
{ prop: 'index', label: this.$t('pages.grade.credit.serialNumber'), width: '60px' }, { prop: 'index', label: this.$t('pages.grade.credit.serialNumber'), width: '60px' },
{ prop: 'semester_name', label: this.$t('pages.grade.credit.semester') }, { prop: 'semester_name', label: this.$t('pages.grade.credit.semester') },
{ prop: 'class_name', label: this.$t('pages.grade.credit.class') }, { prop: 'class_name', label: this.$t('pages.grade.credit.class'), width: '200px' },
{ prop: 'course_name', label: this.$t('pages.grade.credit.course') }, { prop: 'course_name', label: this.$t('pages.grade.credit.course') },
{ prop: 'course_credit', label: this.$t('pages.grade.credit.courseCredits') }, { prop: 'course_credit', label: this.$t('pages.grade.credit.courseCredits'), width: '100px' },
{ prop: 'passed', label: this.$t('pages.grade.credit.status') }, { prop: 'passed', label: this.$t('pages.grade.credit.status'), width: '100px' },
{ prop: 'credit', label: this.$t('pages.grade.credit.credit') }, { prop: 'credit', label: this.$t('pages.grade.credit.credit'), width: '100px' },
{ prop: 'score', label: this.$t('pages.grade.credit.grade') }, { prop: 'score', label: this.$t('pages.grade.credit.grade'), width: '100px' },
// { prop: '', label: this.$t('pages.grade.credit')'', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数 // { prop: '', label: this.$t('pages.grade.credit')'', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
{ {
prop: 'operate-x', prop: 'operate-x',
......
src/pages/mobile/list.vue
浏览文件 @ f7aa877a
<template> <template>
<div class="pages"> <div class="pages">
<div class="head"> <div class="head">
<img class="logo" src="../../assets/images/logo-header.png" /> <img class="logo" src="https://zws-imgs-pub.ezijing.com/pc/base/logo.svg" />
<div class="language" style="overflow: hidden"> <div class="language" style="overflow: hidden">
<language-switch style="float: right" /> <language-switch style="float: right" />
</div> </div>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论