Merge branch 'master' into enterprise-wmp

client/src/action/CourseAction.js

@@ -52,7 +52,8 @@ export default class CourseAction extends BaseACTION {
           arrTab: [str1, cur.semester_name],
           status: _cur.is_enabled ? _vIn.$t('action.courseAction.publish') : _vIn.$t('action.courseAction.noPublish'),
           time: cur.begin_date.split(' ')[0] + _vIn.$t('action.courseAction.to') + cur.end_date.split(' ')[0],
-          myStatus: '',
+          myStatus: cur.selected !== 0 ? (cur.score ? (_vIn.$t('action.courseAction.totalScore') + cur.score) : _vIn.$t('action.courseAction.alreadyChange'))
+            : _vIn.$t('action.courseAction.noChange'),
           progress: cur.video_progress,
           course_type: cur.course_type
         })

client/src/api/base_api.js

@@ -150,7 +150,8 @@ export default class API {
           _vIn.$router.go(0)
         })
       }
-      err = new Error(res.response.data.message === 'Login Required' ? '登录过期' : res.response.data.message || JSON.stringify(res.response.data))
+      err = new Error(res.response.data.message || JSON.stringify(res.response.data))
+      err.code = res.response.data.code
     } else {
       err = new Error('msg:' + res.message + 'stack:' + res.stack)
       err.code = 500

client/src/api/player_api.js

@@ -45,7 +45,7 @@ export default class PlayerAPI extends BaseAPI {
    * 提交考试信息
    * @param {[object]} param
    */
-  submitExamDetail = (param) => this.post('/v2/education/homeworks', param)
+  submitExamDetail = (param) => this.post('/v2/education/homeworks', param, { headers: { 'Content-Type': 'application/json' } })
   /**
    * 获取试题信息 - 课程后考试
    * @param {[string]} eid

client/src/api/report_api.js

@@ -28,7 +28,7 @@ export default class ReportAPI extends BaseAPI {
    * 修改活动申请
    * 参数同上
    */
-  updateReportActive = (rid, obj = {}) => this.post(`/v2/education/symposium/${rid}`, obj)
+  updateReportActive = (rid, obj = {}) => this.post(`/v2/education/symposium/${rid}`, obj, { headers: { 'Content-Type': 'application/json' } })
   /**
    * 删除活动申请
    * 参数同上

client/src/components/beforeEnter/Before.js

@@ -29,7 +29,9 @@ export default class Before {
       window.G.UserInfo = res
       return true
     }).catch(res => {
-      Message({ type: 'error', message: res.message })
+      if (res.code !== 80201) {
+        Message({ type: 'error', message: res.message })
+      }
       return false
     })
   }

client/src/components/comTable/mTable.vue

@@ -38,7 +38,7 @@
             </el-popover>
           </template>
           <template v-if="(head.prop === 'file_url')">
-            <a :href="scope.row[head.prop] || 'javascript:void(0)'" style="text-decoration: none; color: #2b9dff;">下载</a>
+            <a :href="scope.row[head.prop] || 'javascript:void(0)'" download target="_blank" style="text-decoration: none; color: #2b9dff;">下载</a>
           </template>
           <template v-else-if="(head.prop === 'operate')">
             <el-dropdown :hide-on-click="false" @command="dropdownItemClick(scope.row.index, arguments)">
@@ -61,12 +61,12 @@
                   <el-button v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
                 </template>
                 <template v-else-if="_index === 2">
-                  <el-button v-show="scope.row['approve_status'] === '未审核' && scope.row['isPage'] !== undefined" v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
+                  <el-button v-show="scope.row['approve_status'] === '未审核'" v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
                 </template>
                 <template v-else-if="_index === 3">
-                  <el-button v-show="scope.row['approve_status'] === '未审核' && scope.row['isPage'] !== undefined" v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
+                  <el-button v-show="scope.row['approve_status'] === '未审核'" v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
                 </template>
-                <!-- v-show="scope.row['approve_status'] !== '未审核' && scope.row['isPage'] !== undefined" -->
+                <!-- v-show="scope.row['approve_status'] !== '未审核'" -->
               </template>
               <template v-else-if="scope.row['passed'] !== undefined">
                 <!-- 积分 - 重修列表 -->

client/src/components/comTable/tableList.vue

@@ -98,7 +98,7 @@ export default {
       page: {
         total: 0,
         currentPage: 1,
-        size: 20
+        size: 10
       }
     }
   },

client/src/modules/discuss/api/index.js

+import BaseAPI from '@/api/base_api'
+const httpRequest = new BaseAPI(webConf)
+
+/**
+ * 获取课程详情
+ * @param {string} courseId 课程ID
+ * @param {string} semesterId 学期ID
+ */
+export function getCourse(courseId, semesterId) {
+  return httpRequest.get(`/v2/education/courses/${courseId}/${semesterId}`)
+}
+
+/**
+ * 获取章节资源详情
+ * @param {string} vid 资源ID
+ */
+export function getChapterVideo(vid) {
+  return httpRequest.post(
+    '/v2/education/video-streaming',
+    { vid },
+    { headers: { 'Content-Type': 'application/json' } }
+  )
+}
+
+/**
+ * 获取章节资源详情
+ * @param {string} vid 章节的资源ID
+ */
+export function getChapterVideoAliyun(vid) {
+  return httpRequest.post(
+    '/v2/education/aliyun-video-streaming',
+    { vid },
+    { headers: { 'Content-Type': 'application/json' } }
+  )
+}
+
+/**
+ * 获取课程讨论列表
+ */
+export const getDiscussList = (path, dataJson) => {
+  return httpRequest.get(
+    `/v2/qa/questions${path}`,
+    dataJson
+  )
+}
+
+export const request = (obj) => {
+  return httpRequest.get(
+    obj.path,
+    obj.dataJson
+  )
+}

client/src/modules/discuss/assets/languages/en.json

+{
+  "DiscussModule": {
+    "DiscussList": {
+      "answers": "Answers",
+      "votes": "Votes",
+      "noData": "No discussion"
+    }
+  }
+}
\ No newline at end of file

client/src/modules/discuss/assets/languages/index.js

+import Cookies from 'js-cookie'
+import VueI18n from 'vue-i18n'
+import language from './language'
+import zhCNLocale from 'element-ui/lib/locale/lang/zh-CN'
+import enLocale from 'element-ui/lib/locale/lang/en'
+
+export default () => {
+  let _locale = 'zh-CN'
+  /* 国际化初始化 */
+  const _defaultLocale = 'zh-CN'
+  const _lang = Cookies.get('lang') || window.navigator.language || window.navigator.userLanguage || ''
+  if (_lang) {
+    if (language[_lang]) {
+      _locale = _lang
+    } else {
+      let flag = true
+      /* 做一下 兼容性处理 */
+      for (const k in language) {
+        const reg = new RegExp(k, 'gi')
+        if (reg.test(_lang)) {
+          _locale = k
+          flag = false
+          break
+        }
+      }
+      if (flag) {
+        /* 当前语言版本 - 不再我们的语言库中，那么默认 en */
+        _locale = _defaultLocale
+        Cookies.set('lang', _defaultLocale, { expires: 30, domain: '.ezijing.com' })
+      }
+    }
+  }
+  return new VueI18n({
+    locale: _locale, // 定义默认语言为中文
+    messages: {
+      'zh-CN': Object.assign(require('./zh-CN.json'), zhCNLocale),
+      en: Object.assign(require('./en.json'), enLocale)
+    }
+  })
+}

client/src/modules/discuss/assets/languages/language.js

+/* 定义语言模型 - key 值定义 跟 languages i18n 中 保持一致 */
+const language = {
+  'zh-CN': { show: '语言', arr: [{ 'zh-CN': '中文' }, { en: 'English' }] },
+  en: { show: 'Language', arr: [{ 'zh-CN': '中文' }, { en: 'English' }] }
+}
+
+export default language

client/src/modules/discuss/assets/languages/zh-CN.json

+{
+  "DiscussModule": {
+    "DiscussList": {
+      "answers": "回答",
+      "votes": "投票",
+      "noData": "暂无相关评论"
+    }
+  }
+}

client/src/modules/discuss/index.js

+import './index.scss'
+import Discuss from './src/discuss.vue'
+
+const components = [
+  Discuss
+]
+
+const install = function (Vue, opts = {}) {
+  /* 存在国际化 */
+  if (opts.i18n) {
+    const msgs = opts.i18n.messages
+    for (const k in msgs) {
+      opts.i18n.setLocaleMessage(k, Object.assign(msgs[k], require('./assets/languages/' + k + '.json')))
+    }
+  }
+
+  components.forEach(component => {
+    Vue.component(component.name, component)
+  })
+}
+
+/* istanbul ignore if */
+if (typeof window !== 'undefined' && window.Vue) {
+  install(window.Vue)
+}
+
+export default {
+  install,
+  Discuss
+}

client/src/modules/discuss/index.scss

+
+/* Extra small devices (portrait phones, less than 576px) */
+@media (max-width: 575px) {}
+
+/* Small devices (landscape phones, 576px and up) */
+@media (min-width: 576px) and (max-width: 767px) {}
+
+/* Medium devices (tablets, 768px and up) */
+@media (min-width: 768px) and (max-width: 991px) {}
+
+/* Large devices (desktops, 992px and up) */
+@media (min-width: 992px) and (max-width: 1199px) {}
+
+/* Extra large devices (large desktops, 1200px and up) */
+@media (min-width: 1200px) {}

client/src/modules/discuss/src/discuss.vue

@@ -17,7 +17,11 @@
         <div class='title'>{{item.title}}</div>
         <div :class='["text"]' v-html="item.contents"></div>
         <!-- <div :class='["text"]' v-html="item.contents"></div><div class='["ellipsis no", (item.isShow ? "on" : "")]'>....</div> -->
+<<<<<<< HEAD
         <div class='result'>{{item.answer_count}} {{ $t('pages.learn.discussion.answers') }}<div style='display: inline-block; width: 20px;'></div>{{item.tag_total_count}} {{ $t('pages.learn.discussion.votes') }}</div>
+=======
+        <div class='result'>{{item.answer_count}} {{ $t('DiscussModule.DiscussList.answers') }}<div style='display: inline-block; width: 20px;'></div>{{item.tag_total_count}} {{ $t('DiscussModule.DiscussList.votes') }}</div>
+>>>>>>> master
         <!-- <div class='course-name'>{{item.courseName}}</div> -->
       </div>
     </template>

client/src/modules/index.js

@@ -2,9 +2,11 @@
 /* 模块基于 element-ui，一定在 element-ui后加载 */
 
 import LoginModule from './login-module'
+import Discuss from './discuss'
 
 const components = [
-  LoginModule
+  LoginModule,
+  Discuss
 ]
 
 const install = function (Vue, opts = {}) {
@@ -20,5 +22,6 @@ if (typeof window !== 'undefined' && window.Vue) {
 
 export default {
   install,
-  LoginModule
+  LoginModule,
+  Discuss
 }

client/src/modules/login-module/action/LoginAction.js

@@ -22,7 +22,7 @@ export default class LoginAction extends BaseACTION {
    * 调用验证码登录
    */
   codeLogin (obj) {
-    return Login.userLogin(obj).then(res => {
+    return Login.codeLogin(obj).then(res => {
       if (res && res.url === undefined) {
         res.url = webConf.others.url || ''
       }

client/src/modules/login-module/src/CodeLogin.vue

@@ -95,6 +95,8 @@ export default {
               clearInterval(this.timeInterval)
             }
           }, 1000)
+        }).catch(error => {
+          this.$message.error(error.message)
         })
       }
     },
@@ -139,6 +141,8 @@ export default {
                 }
               })
             }
+          }).catch(error => {
+            this.$message.error(error.message)
           })
         } else {
           this.$message.error(this.$t('LoginModule.Others.formCheckStr'))

client/src/pages/affairsHall/againAdd.vue

@@ -38,10 +38,10 @@
                 <img width="100%" :src="dialogImageUrl" alt="">
               </el-dialog>
             </el-form-item>
-            <el-form-item v-if="this.isFormProhibit" label="审核时间" prop="sharing_theme">
+            <el-form-item v-if="isFormProhibit && approve_time !==null" label="审核时间" prop="sharing_theme">
               <el-input v-model="approve_time" placeholder="" type="text" />
             </el-form-item>
-            <el-form-item v-if="this.isFormProhibit" label="备注" prop="content">
+            <el-form-item v-if="isFormProhibit && remark !==null" label="备注" prop="content">
               <el-input v-model="remark" maxlength="50" placeholder="" type="textarea" :autosize="{ minRows: 5 }" />
             </el-form-item>
             <el-form-item>

client/src/pages/affairsHall/learningAdd.vue

@@ -27,9 +27,12 @@
             <el-form-item label="学术活动内容" prop="content">
               <el-input v-model="setApply.content" maxlength="50" placeholder="请输入活动内容" type="textarea" :autosize="{ minRows: 5 }" />
             </el-form-item>
-            <el-form-item v-if="this.isFormProhibit" label="审核时间" prop="sharing_theme">
+            <el-form-item v-if="isFormProhibit && approve_time !==null" label="审核时间" prop="content">
               <el-input v-model="approve_time" placeholder="" type="text" />
             </el-form-item>
+            <el-form-item v-if="isFormProhibit && remark !==null" label="备注" prop="content">
+              <el-input v-model="remark" maxlength="50" placeholder="" type="textarea" :autosize="{ minRows: 5 }" />
+            </el-form-item>
             <!-- <el-form-item label="附 件" prop="file">
               <el-upload
                 ref="upFile"
@@ -83,6 +86,7 @@ export default {
         content: '',
         affair_id: ''
       },
+      remark: '',
       approve_time: '',
       applyRules: {
         personal_name: [
@@ -134,6 +138,7 @@ export default {
           this.setApply.address = data.form.symposium_address
           this.setApply.content = data.form.symposium_contents
           this.approve_time = data.approve_time1
+          this.remark = data.remark1
         }
       }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
     }

client/src/pages/affairsHall/shareAdd.vue

@@ -24,10 +24,10 @@
             <el-form-item label="分享主题" prop="sharing_theme">
               <el-input v-model="setApply.sharing_theme" placeholder="请输入分享主题" type="text" />
             </el-form-item>
-            <el-form-item v-if="this.isFormProhibit" label="审核时间" prop="sharing_theme">
+            <el-form-item v-if="isFormProhibit && approve_time !==null" label="审核时间" prop="sharing_theme">
               <el-input v-model="approve_time" placeholder="" type="text" />
             </el-form-item>
-            <el-form-item v-if="this.isFormProhibit" label="备注" prop="content">
+            <el-form-item v-if="isFormProhibit && remark !==null" label="备注" prop="content">
               <el-input v-model="remark" maxlength="50" placeholder="" type="textarea" :autosize="{ minRows: 5 }" />
             </el-form-item>
             <!-- <el-form-item label="附 件" prop="file">

client/src/pages/affairsHall/viewReport.vue

@@ -33,7 +33,7 @@ export default {
         { prop: 'report_name', label: '报告名称', minWidth: '150', fix: false },
         { prop: 'report_description', label: '报告摘要', minWidth: '120', fix: false },
         { prop: 'submit_time', label: '提交时间', minWidth: '120', fix: false },
-        { prop: 'approve_status', label: '审核状态', minWidth: '120', fix: false },
+        // { prop: 'approve_status', label: '审核状态', minWidth: '120', fix: false },
         { prop: 'file_url', label: '附件下载', minWidth: '120', fix: false },
         // { prop: '', label: '', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
         { prop: 'operate-x', label: '操作', width: '140px', fix: false, commandArr: "[ { command: 'reportlist-', name: '' }, { command: 'reportlist-edit', name: '编辑' }, { command: 'reportlist-delete', name: '删除' } ]" }
@@ -59,7 +59,7 @@ export default {
     }
   },
   mounted () {
-    this.VueEvent.$on('command-tablelist-x', (_obj) => {
+    this.VueEvent.$off('command-tablelist-x').$on('command-tablelist-x', (_obj) => {
       if (_obj.command.command === 'reportlist-edit') {
         const reid = _obj.tableData[_obj.index - 1].id
         this.$router.push({ path: `/app/learn/report-submit/${this.rid}/${reid}` })

client/src/pages/grade/credit.vue

@@ -104,7 +104,7 @@ export default {
     }
   },
   mounted () {
-    this.VueEvent.$on('command-tablelist-x', (data) => {
+    this.VueEvent.$off('command-tablelist-x').$on('command-tablelist-x', (data) => {
       if (data.command.command === 're-start') {
         const _data = data.tableData[data.index - 1]
         window.localStorage.setItem('rebuild', JSON.stringify(_data))

client/src/pages/learn/courseDetail.vue

@@ -91,12 +91,12 @@
                     <div class='title'>{{item.title}}</div>
                     <div :class='["text"]' v-html="item.text"></div><div :class='["ellipsis", (item.isShow ? "on" : "")]'>....</div>
                     <div class='result'>{{item.askCnt}} 回答<div style='display: inline-block; width: 20px;'></div>{{item.TouCnt}} 投票</div>
-                    <!-- <div class='course-name'>{{item.courseName}}</div> -->
                   </div>
                 </template>
                 <template v-if='!discussList.length && !domLength'>
                   <div class='no-data'>暂无相关讨论</div>
                 </template>
+                <!-- <discuss :params="params"></discuss> -->
               </div>
             </template>
             <template v-else>
@@ -808,6 +808,14 @@ export default {
                 message: '问题发布成功'
               })
               this.isPublicShow = false
+              // this.params = {
+              //   path: `/v2/qa/questions/course/${this.sid}/${this.cid}`,
+              //   page: {
+              //     limit: 10,
+              //     offset: 0
+              //   },
+              //   v: (new Date()).valueOf()
+              // }
               cAction.Discuss.getCourseDiscussList(this.cid, this.sid, this.param).then(json2 => {
                 this.discussList = json2
               }).catch(e => { this.$message.error(e.message) }).finally(() => { })
@@ -838,6 +846,14 @@ export default {
 
       this.param.offset = 0
       const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
+      // this.params = {
+      //   path: `/v2/qa/questions/course/${this.sid}/${this.cid}`,
+      //   dataJson: {
+      //     limit: 10,
+      //     offset: 0,
+      //     sort: this.sort[index].isShow ? str : ''
+      //   }
+      // }
       cAction.Discuss.getCourseDiscussList(this.cid, this.sid, this.param).then(json => {
         this.discussList = json
       }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })

client/src/pages/learn/discussion.vue

@@ -8,7 +8,9 @@
       </template>
     </div>
     <div class="discuss-scroll">
-      <template v-for='(item, index) in discussList'>
+      <discuss :params="params">
+      </discuss>
+      <!-- <template v-for='(item, index) in discussList'>
         <div v-bind:key='index' class='item-list' @click='goDiscussDetail' :data-id='item.id' :data-sid='item.sid' :data-cid='item.cid' :data-index='index'>
           <div class='user'>
             <template v-if="item.user.url">
@@ -25,32 +27,40 @@
           <div class='title'>{{item.title}}</div>
           <div :class='["text"]' v-html="item.text"></div><div :class='["ellipsis", (item.isShow ? "on" : "")]'>....</div>
           <div class='result'>{{item.askCnt}} {{ $t('pages.learn.discussion.answers') }}<div style='display: inline-block; width: 20px;'></div>{{item.TouCnt}} {{ $t('pages.learn.discussion.votes') }}</div>
-          <!-- <div class='course-name'>{{item.courseName}}</div> -->
         </div>
-      </template>
-      <template v-if='!discussList.length'>
+      </template> -->
+      <!-- <template v-if='!discussList.length'>
         <div class='no-data'>暂无相关讨论</div>
-      </template>
+      </template> -->
     </div>
   </div>
 </div>
 </template>
 
 <script>
-import cAction from '@action'
+// import cAction from '@action'
 
 export default {
   components: { },
   data () {
     return {
+      // tabs: [{
+      //   title: this.$t('pages.learn.discussion.tap1'),
+      //   isShow: true,
+      //   path: '/my'
+      // }, {
+      //   title: this.$t('pages.learn.discussion.tap2'),
+      //   isShow: false,
+      //   path: '/involved'
+      // }],
       tabs: [{
         title: this.$t('pages.learn.discussion.tap1'),
         isShow: true,
-        path: '/my'
+        path: '/v2/qa/questions/my'
       }, {
         title: this.$t('pages.learn.discussion.tap2'),
         isShow: false,
-        path: '/involved'
+        path: '/v2/qa/questions/involved'
       }],
       discussList: [
         // {
@@ -70,6 +80,13 @@ export default {
       param: {
         limit: 10, // 默认每页显示10条
         offset: 0 // 偏移量（未考虑传输时，产生新问题情况）
+      },
+      params: {
+        path: '/v2/qa/questions/my',
+        dataJson: {
+          limit: 10,
+          offset: 0
+        }
       }
     }
   },
@@ -106,10 +123,11 @@ export default {
           pathUrl = this.tabs[i].path
         }
       }
-      const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
-      cAction.Discuss.getDiscussList(pathUrl, this.param).then(json => {
-        this.discussList = json
-      }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
+      this.params.path = pathUrl
+      // const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
+      // cAction.Discuss.getDiscussList(pathUrl, this.param).then(json => {
+      //   this.discussList = json
+      // }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
     },
     /**
      * 切换 - tab

client/src/pages/learn/reportActiveList.vue

@@ -48,7 +48,7 @@ export default {
           data.forEach((elem, i) => {
             elem.approve_status = elem.approve_status === 1 ? this.$t('pages.learn.reportActiveList.passed') : (elem.approve_status === 0 ? this.$t('pages.learn.reportActiveList.failed') : this.$t('pages.learn.reportActiveList.unreviewed')) // 0 未通过；1 通过；2 未审核
             elem.index = i + 1 + (_this.params.curPage - 1) * _this.params.pageSize
-            elem.reportscount = Number(elem.reportscount || '0')
+            // elem.reportscount = Number(elem.reportscount || '0')
             _this.tableData.push(elem)
           })
         }
@@ -56,7 +56,7 @@ export default {
     }
   },
   mounted () {
-    this.VueEvent.$on('command-tablelist-x', (_obj) => {
+    this.VueEvent.$off('command-tablelist-x').$on('command-tablelist-x', (_obj) => {
       if (_obj.command.command === 'activelist-show') {
         const rid = _obj.tableData[_obj.index - 1].id
         this.$router.push({ path: `/app/learn/report-list-all/${rid}` })

client/src/pages/learn/reportListAll.vue

@@ -59,7 +59,7 @@ export default {
     }
   },
   mounted () {
-    this.VueEvent.$on('command-tablelist-x', (_obj) => {
+    this.VueEvent.$off('command-tablelist-x').$on('command-tablelist-x', (_obj) => {
       if (_obj.command.command === 'reportlist-edit') {
         const reid = _obj.tableData[_obj.index - 1].id
         this.$router.push({ path: `/app/learn/report-submit/${this.rid}/${reid}` })

client/src/pages/learn/reportSubmit.vue

@@ -107,7 +107,7 @@ export default {
     },
     uploadFile () {
       const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
-      cAction.chapterAction.uploadFile(this.file).then(data => {
+      cAction.Other.uploadFile(this.file).then(data => {
         this.successFileUrl = data.url
         this.filesArr.pop()
       }).catch(e => { this.filesArr.pop(); this.$message.error(e.message) }).finally(() => { loading.close() })

client/src/pages/mobileLive/list.vue

@@ -69,16 +69,14 @@ export default {
   methods: {
     /* 退出登录 - 跳转方法 */
     logout() {
-      this.$router.push({ path: '/login/index' })
-      // cAction.Other
-      //   .outLogin()
-      //   .then(str => {
-      //     window.G.UserInfo = {}
-      //     this.$router.push({ path: '/login/index' })
-      //   })
-      //   .catch(e => {
-      //     this.$message.error(e.message)
-      //   })
+      cAction.Others.outLogin()
+        .then(str => {
+          window.G.UserInfo = {}
+          this.$router.push({ path: '/login/index' })
+        })
+        .catch(e => {
+          this.$message.error(e.message)
+        })
     },
     getNewLiveMsg() {
       // 获取最新直播提醒
@@ -163,6 +161,8 @@ export default {
     openCloudClass(data, message) {
       // https://doc.bokecc.com/class/developer/api/login.html
       const liveStatus = data.live_status
+      data.viewer_name =
+        data.viewer_name || window.G.UserInfo.student_info.personal_name
       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}`

client/src/pages/other/message.vue

@@ -18,6 +18,13 @@
         </template>
       </el-collapse>
       <div style="height: 0.3rem;"></div>
+      <el-pagination
+        :current-page.sync="page.currentPage"
+        :page-size="page.limit"
+        layout="total, prev, pager, next, jumper"
+        :total="page.total"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -30,7 +37,13 @@ export default {
   data () {
     return {
       activeNames: ['1'],
-      msgList: []
+      msgList: [],
+      page: {
+        offset: 0,
+        total: 0,
+        currentPage: 1,
+        limit: 10
+      }
     }
   },
   mounted () {
@@ -52,6 +65,10 @@ export default {
         this.msgList = json.list
         this.$store.commit('myMsg', json.countNum)
       }).catch(e => { this.$message.error(e.message) }).finally(() => { })
+    },
+    handleCurrentChange() {
+      this.page.offset = (this.page.currentPage - 1) * this.page.limit
+      this.getData()
     }
   }
 }

client/src/pages/player/index.vue

@@ -32,6 +32,7 @@
         @handlePlayTime="handlePlayTime"
         @updateProgress="updateProgress"
         @changeSideBar="changeSideBar"
+        :key="id"
       ></router-view>
     </div>
   </div>

server/client-dist/index.html

+<<<<<<< HEAD
 <!DOCTYPE html><html lang="zh-cn"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta content="origin" name="referrer"><title>在线学习系统</title><meta name="viewport" id="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,shrink-to-fit=no"><link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.8.8/skins/default/aliplayer-min.css"><link rel="shortcut icon" href="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/favicon.ico"><link href="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app~e2e93592.069905d75bcf.css" rel="stylesheet"><link href="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app~c96cac8d.c95cb2b947b2.css" rel="stylesheet"></head><body><div id="app"></div><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><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"></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><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://player.alicdn.com/aliplayer/presentation/js/aliplayercomponents.min.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><!--[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]--><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/manifest.f7c9a4a0.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~d0ae3f07.19fffc49.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~7274e1de.cf73926a.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~b5906859.38872705.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~db300d2f.ca4ebec4.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~6ed3fd28.5ddf1b03.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~1f20a385.b427ba73.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~77bf5e45.1872b0e8.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~fdc6512a.6c8f23a2.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app~e2e93592.b648f4fd.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app~c96cac8d.d1463537.js"></script></body></html>
+  <![endif]--><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/manifest.f7c9a4a0.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~d0ae3f07.19fffc49.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~7274e1de.cf73926a.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~b5906859.38872705.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~db300d2f.ca4ebec4.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~6ed3fd28.5ddf1b03.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~1f20a385.b427ba73.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~77bf5e45.1872b0e8.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/vendor~fdc6512a.6c8f23a2.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app~e2e93592.b648f4fd.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-enterprise/resources/app~c96cac8d.d1463537.js"></script></body></html>
\ No newline at end of file
+=======
+<!DOCTYPE html><html lang="zh-cn"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta content="origin" name="referrer"><title>紫荆教育MBA学习系统</title><meta name="viewport" id="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,shrink-to-fit=no"><link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.8.8/skins/default/aliplayer-min.css"><link rel="shortcut icon" href="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/favicon.ico"><link href="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app~e2e93592.9241dcb659fc.css" rel="stylesheet"><link href="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app~07e2a4e5.a18a1bdfbc89.css" rel="stylesheet"></head><body><div id="app"></div><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><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"></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><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://player.alicdn.com/aliplayer/presentation/js/aliplayercomponents.min.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><!--[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]--><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/manifest.60b6af21.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~d0ae3f07.610ac89a.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~7274e1de.cf73926a.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~b5906859.38872705.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~db300d2f.ca4ebec4.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~6ed3fd28.5ddf1b03.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~1f20a385.b427ba73.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~77bf5e45.1872b0e8.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor~fdc6512a.6c8f23a2.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app~e2e93592.f8fcce6e.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app~07e2a4e5.44c4dd18.js"></script></body></html>
+>>>>>>> master

server/client-dist/resources/18.c18f36d03c9d.css

+.table-box{overflow:hidden}.table-box .el-table__body td{height:60px}.table-box .img-inline{width:100%;max-height:40px;overflow:hidden}.table-box .img-inline img{display:block;width:100%}.table-box .el-dropdown{cursor:pointer}.table-box .el-dropdown:hover{color:#f2730b}.table-box .router-link-class{text-decoration:none;color:#f2730b}.table-box .router-link-class:hover{color:#f2730b;text-decoration:underline}.table-box .pagination-right{float:right;margin:15px 10px 0 0}.img-show{max-width:400px;max-height:300px;overflow:hidden}.img-show img{display:block;width:100%;height:auto}
+.bg-box[data-v-6e5af2f9]{background:#fff;overflow:hidden}
+.el-date-editor.el-input[data-v-3fc1cf3a]{width:100%}.el-upload__tip[data-v-3fc1cf3a]{line-height:1.5}

server/client-dist/resources/19.c09a9305.js

+(window.webpackJsonp=window.webpackJsonp||[]).push([[19],{268:function(t,e,n){"use strict";n.r(e);var a=n(539),r=n(369);for(var i in r)"default"!==i&&function(t){n.d(e,t,(function(){return r[t]}))}(i);n(488);var o=n(7),s=Object(o.a)(r.default,a.a,a.b,!1,null,"12c98927",null);e.default=s.exports},303:function(t,e,n){"use strict";n.r(e);var a=n(304),r=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e.default=r.a},304:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a=i(n(313)),r=i(n(113));function i(t){return t&&t.__esModule?t:{default:t}}e.default={name:"mPage",components:{mTable:a.default},props:{tableConfig:{type:Object,require:!0},tableHead:{type:Array,require:!0},tableData:{type:Array,require:!0},params:{type:Object,require:!0},objFn:{type:Object,require:!0}},data:function(){return{isWatch:!0}},methods:{getList:function(){for(var t=this,e=this.$loading({lock:!0,text:"数据加载中，请稍后。。。",background:"rgba(0, 0, 0, 0.7)"}),n=this.objFn.paramsFn(this);this.tableData.length;)this.tableData.pop();r.default[this.objFn.actionClass][this.objFn.nameAPI](n).then((function(e){t.objFn.callback(t,e)})).catch((function(e){t.$message.error(e.message)})).finally((function(){e.close()}))}},beforeMount:function(){this.getList()},watch:{"params.total":{handler:function(){this.isWatch=!1},immediate:!0},params:{handler:function(){this.isWatch?this.getList():this.isWatch=!0},deep:!0},"objFn.paramsFn":{handler:function(){console.log(11111),this.getList()}}}}},305:function(t,e,n){"use strict";n.r(e);var a=n(306),r=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e.default=r.a},306:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default={props:{tableConfig:{type:Object,require:!0},tableHead:{type:Array,require:!0},tableData:{type:Array,require:!0},pagination:{type:Object,require:!0}},methods:{handleSizeChange:function(){},handleCurrentChange:function(){},dropdownItemClick:function(t,e){this.VueEvent.$emit("command-tablelist",{index:t,command:e[0],tableData:this.tableData})},itemClick:function(t,e){this.VueEvent.$emit("command-tablelist-x",{index:t,command:e,tableData:this.tableData})},headerCellStyle:function(t){t.row,t.column;var e=t.rowIndex;t.columnIndex;if(0===e)return"background-color: #f5f7fa; color: #272f3f; text-align: center; font-weight: 400;"},selectionChange:function(t){this.tableConfig.selection.sels=t},formatDate:function(t,e){if(!t)return"无";var n=new Date(parseInt(t));/(y+)/gi.test(e)&&(e=e.replace(RegExp.$1,(n.getFullYear()+"").substr(4-RegExp.$1.length)));var a={"M+":n.getMonth()+1,"[d|D]+":n.getDate(),"h+":n.getHours(),"m+":n.getMinutes(),"s+":n.getSeconds()};for(var r in a)if(new RegExp("("+r+")").test(e)){var i=a[r]+"";e=e.replace(RegExp.$1,1===RegExp.$1.length?i:("00"+i).substr(i.length))}return e}}}},307:function(t,e,n){},308:function(t,e,n){},312:function(t,e,n){"use strict";n.r(e);var a=n(316),r=n(303);for(var i in r)"default"!==i&&function(t){n.d(e,t,(function(){return r[t]}))}(i);n(315);var o=n(7),s=Object(o.a)(r.default,a.a,a.b,!1,null,"6e5af2f9",null);e.default=s.exports},313:function(t,e,n){"use strict";n.r(e);var a=n(317),r=n(305);for(var i in r)"default"!==i&&function(t){n.d(e,t,(function(){return r[t]}))}(i);n(314);var o=n(7),s=Object(o.a)(r.default,a.a,a.b,!1,null,null,null);e.default=s.exports},314:function(t,e,n){"use strict";var a=n(307);n.n(a).a},315:function(t,e,n){"use strict";var a=n(308);n.n(a).a},316:function(t,e,n){"use strict";n.d(e,"a",(function(){return a})),n.d(e,"b",(function(){return r}));var a=function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"bg-box"},[this._t("self-select-btn"),this._v(" "),e("m-table",{attrs:{tableConfig:this.tableConfig,tableHead:this.tableHead,tableData:this.tableData,pagination:this.params}})],2)},r=[]},317:function(t,e,n){"use strict";n.d(e,"a",(function(){return a})),n.d(e,"b",(function(){return r}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"table-box"},[n("el-table",{staticStyle:{width:"100%"},attrs:{data:t.tableData,border:t.tableConfig.border||!0,size:t.tableConfig.size||"small","header-cell-style":t.headerCellStyle},on:{"selection-change":t.selectionChange}},[t.tableConfig.selection.has?[n("el-table-column",{attrs:{type:"selection",fixed:t.tableConfig.selection.fix,width:t.tableConfig.selection.width,"min-width":t.tableConfig.selection.minWidth,align:t.tableConfig.selection.align||"center"}})]:t._e(),t._v(" "),t._l(t.tableHead,(function(e,a){return[n("el-table-column",{key:a,attrs:{"show-overflow-tooltip":!1,fixed:e.fix,label:e.label,width:e.width,"min-width":e.minWidth,align:e.align||"center"},scopedSlots:t._u([{key:"default",fn:function(a){return["img_url"===e.prop?[n("el-popover",{attrs:{trigger:"hover"}},[n("div",{staticClass:"img-show"},[n("img",{attrs:{src:a.row[e.prop],alt:"放大图片"}})]),t._v(" "),n("div",{staticClass:"img-inline",attrs:{slot:"reference"},slot:"reference"},[n("img",{attrs:{src:a.row[e.prop],alt:"图片"}})])])]:t._e(),t._v(" "),"file_url"===e.prop?[n("a",{staticStyle:{"text-decoration":"none",color:"#2b9dff"},attrs:{href:a.row[e.prop]||"javascript:void(0)"}},[t._v("下载")])]:"operate"===e.prop?[n("el-dropdown",{attrs:{"hide-on-click":!1},on:{command:function(e){return t.dropdownItemClick(a.row.index,arguments)}}},[n("span",{staticClass:"el-dropdown-link"},[t._v("...")]),t._v(" "),n("el-dropdown-menu",{attrs:{slot:"dropdown"},slot:"dropdown"},[t._l(e.commandArr,(function(e,a){return[n("el-dropdown-item",{key:a,attrs:{command:e.command}},[t._v(t._s(e.name))])]}))],2)],1)]:"operate-x"===e.prop?[t._l(e.commandArr,(function(e,r){return[void 0!==a.row.approve_status?[0===r&&"通过"===a.row.approve_status&&"0"!==a.row.reportscount||1===r&&"通过"===a.row.approve_status&&"0"===a.row.reportscount?[n("el-button",{key:r,attrs:{type:"text"},on:{click:function(n){return t.itemClick(a.row.index,e)}}},[t._v(t._s(e.name))])]:2===r||3===r?[n("el-button",{directives:[{name:"show",rawName:"v-show",value:"未审核"===a.row.approve_status,expression:"scope.row['approve_status'] === '未审核'"}],key:r,attrs:{type:"text"},on:{click:function(n){return t.itemClick(a.row.index,e)}}},[t._v(t._s(e.name))])]:t._e()]:void 0!==a.row.passed?[0===r&&"未通过"===a.row.passed&&0===a.row.is_retake?[n("el-button",{key:r,staticStyle:{padding:"0","font-weight":"500"},attrs:{type:"text"},on:{click:function(n){return t.itemClick(a.row.index,e)}}},[t._v(t._s(e.name))])]:t._e(),t._v(" "),1===r&&"未通过"===a.row.passed&&1===a.row.is_retake?[n("el-button",{key:r,staticStyle:{padding:"0",color:"#66c6bd","font-weight":"500"},attrs:{type:"text"},on:{click:function(n){return t.itemClick(a.row.index,e)}}},[t._v(t._s(e.name))])]:t._e()]:t._e()]}))]:e.goObj?[n("router-link",{staticClass:"router-link-class",attrs:{to:{name:e.goObj.routerName,params:{obj:a.row,otherObj:e.goObj.params||""}}}},[t._v(t._s(a.row[e.prop]))])]:[t._v(t._s(a.row[e.prop]))]]}}],null,!0)})]}))],2),t._v(" "),t.pagination.total/t.pagination.pageSize>1?n("div",{staticClass:"pagination-right"},[n("el-pagination",{attrs:{"current-page":t.pagination.curPage,"page-size":t.pagination.pageSize,layout:"prev, pager, next, jumper",total:t.pagination.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange,"update:currentPage":function(e){return t.$set(t.pagination,"curPage",e)},"update:current-page":function(e){return t.$set(t.pagination,"curPage",e)}}})],1):t._e()],1)},r=[]},369:function(t,e,n){"use strict";n.r(e);var a=n(370),r=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e.default=r.a},370:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a,r=n(312),i=(a=r)&&a.__esModule?a:{default:a};e.default={components:{mPage:i.default},data:function(){return{tableConfig:{border:"",size:"",selection:{has:!1,sels:[],width:"50px",fix:"left",align:""}},tableHead:[{prop:"index",label:"序号",minWidth:"80",fix:!1},{prop:"sno",label:"学号",minWidth:"120",fix:!1},{prop:"sname",label:"姓名",minWidth:"110",fix:!1},{prop:"report_name",label:"学术报告主题",minWidth:"170",fix:!1},{prop:"review_status",label:"审核状态",minWidth:"100",fix:!1},{prop:"review_time",label:"审核时间",minWidth:"150",fix:!1},{prop:"review_comment",label:"老师评语",minWidth:"150",fix:!1},{prop:"file_url",label:"附件",minWidth:"80",fix:!1}],tableData:[],params:{keywords:"",curPage:1,pageSize:100,total:""},objFn:{paramsFn:function(t){return{}},nameAPI:"getReportList",actionClass:"Report",nameExcel:"getExportExcel3_4_14",callback:function(t,e){t.params.total=100,e.forEach((function(e,n){e.review_status="已通过",e.sno=e.student.sno,e.sname=e.student.personal_name;var a=JSON.parse(e.file_url||"[]");e.file_url=a[0]&&a[0].url||"",e.index=n+1+(t.params.curPage-1)*t.params.pageSize,t.tableData.push(e)}))}}}},mounted:function(){},methods:{goActiveList:function(){this.$router.push({path:"/app/learn/report-active-list"})}}}},371:function(t,e,n){},488:function(t,e,n){"use strict";var a=n(371);n.n(a).a},539:function(t,e,n){"use strict";n.d(e,"a",(function(){return a})),n.d(e,"b",(function(){return r}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("div",{staticClass:"con-title"},[t._v("学术报告列表")]),t._v(" "),n("div",{staticClass:"con-box"},[n("el-button",{attrs:{type:"primary"},on:{click:t.goActiveList}},[t._v("已申请的活动")]),t._v(" "),n("div",{staticStyle:{width:"100%",height:"0.2rem"}}),t._v(" "),n("m-page",{attrs:{tableHead:t.tableHead,tableData:t.tableData,params:t.params,objFn:t.objFn,tableConfig:t.tableConfig}})],1)])},r=[]}}]);
\ No newline at end of file

server/client-dist/resources/42.37889e3e.js

+(window.webpackJsonp=window.webpackJsonp||[]).push([[42],{272:function(t,e,i){"use strict";i.r(e);var r=i(543),s=i(381);for(var a in s)"default"!==a&&function(t){i.d(e,t,(function(){return s[t]}))}(a);i(492);var l=i(7),n=Object(l.a)(s.default,r.a,r.b,!1,null,"74d4ddc6",null);e.default=n.exports},381:function(t,e,i){"use strict";i.r(e);var r=i(382),s=i.n(r);for(var a in r)"default"!==a&&function(t){i.d(e,t,(function(){return r[t]}))}(a);e.default=s.a},382:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r,s=i(113),a=(r=s)&&r.__esModule?r:{default:r};e.default={props:{rid:{type:String,required:!1},reid:{type:String,required:!1}},components:{},data:function(){return{labelWidth:"110px",setSubmit:{name:"",title:""},submitRules:{name:[{required:!0,message:this.$t("pages.learn.reportSubmit.themeTips"),trigger:"blur"}],title:[]},successFileUrl:"",filesArr:[],file:{id:"WU_FILE_0",name:"",type:"",lastModifiedDate:"",size:"",file:""}}},mounted:function(){var t=this;if("-1"!==this.reid){var e=this.$loading({lock:!0,text:"",spinner:"",background:"rgba(255, 255, 255, 0.9)"});a.default.Report.getSubmitReport(this.rid,this.reid).then((function(e){e.report_name&&(t.setSubmit.name=e.report_name,t.setSubmit.title=e.report_description,t.successFileUrl=e.file_url)})).catch((function(e){t.$message.error(e.message)})).finally((function(){e.close()}))}window.addEventListener("resize",(function(){var e=document.documentElement.clientWidth;t.labelWidth=e<790?"auto":"110px"}))},methods:{handleChange:function(t,e){this.file.name=t.raw.name,this.file.type=t.raw.type,this.file.lastModifiedDate=t.raw.lastModifiedDate,this.file.size=t.raw.size,this.file.file=t.raw},uploadFile:function(){var t=this,e=this.$loading({lock:!0,text:"",spinner:"",background:"rgba(255, 255, 255, 0.9)"});a.default.Other.uploadFile(this.file).then((function(e){t.successFileUrl=e.url,t.filesArr.pop()})).catch((function(e){t.filesArr.pop(),t.$message.error(e.message)})).finally((function(){e.close()}))},gobackActiveList:function(){this.$router.push({path:"/app/learn/report-active-list"})},onSubmitFrom:function(){var t=this;this.$refs.setSubmitForm.validate((function(e){if(!e)return t.$message.error(t.$t("pages.learn.reportSubmit.formCheckTips")),!1;var i=t.$loading({lock:!0,text:"",spinner:"",background:"rgba(255, 255, 255, 0.9)"});("-1"!==t.reid?a.default.Report.updateSubmitReport(t.rid,t.reid,{report_name:t.setSubmit.name,report_description:t.setSubmit.title,file_url:JSON.stringify([{name:t.file.name,url:t.successFileUrl}])}):a.default.Report.submitReport(t.rid,{report_name:t.setSubmit.name,report_description:t.setSubmit.title,file_url:JSON.stringify([{name:t.file.name,url:t.successFileUrl}])})).then((function(e){e.flag&&(t.$message({type:"success",message:t.$t("pages.learn.reportSubmit.submitSuccess")}),setTimeout((function(){t.$router.push({path:"/app/learn/report-list-all/"+t.rid})}),500))})).catch((function(e){t.filesArr.pop(),t.$message.error(e.message)})).finally((function(){i.close()}))}))}}}},383:function(t,e,i){},492:function(t,e,i){"use strict";var r=i(383);i.n(r).a},543:function(t,e,i){"use strict";i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return s}));var r=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",[i("div",{staticClass:"con-title"},[t._v(t._s(t.$t("pages.learn.reportSubmit.title")))]),t._v(" "),i("div",{staticClass:"con-box"},[i("el-button",{attrs:{type:"text"},on:{click:t.gobackActiveList}},[t._v(t._s(t.$t("pages.learn.reportSubmit.backText")))]),t._v(" "),i("el-row",{attrs:{type:"flex",justify:"center"}},[i("el-col",{attrs:{xs:24,sm:24,md:16,lg:12,xl:8}},[i("el-form",{ref:"setSubmitForm",attrs:{"label-width":t.labelWidth,model:t.setSubmit,rules:t.submitRules}},[i("el-form-item",{attrs:{label:t.$t("pages.learn.reportSubmit.theme"),prop:"name"}},[i("el-input",{attrs:{placeholder:t.$t("pages.learn.reportSubmit.themeHint"),type:"text"},model:{value:t.setSubmit.name,callback:function(e){t.$set(t.setSubmit,"name",e)},expression:"setSubmit.name"}})],1),t._v(" "),i("el-form-item",{attrs:{label:t.$t("pages.learn.reportSubmit.abstract"),prop:"title"}},[i("el-input",{attrs:{placeholder:t.$t("pages.learn.reportSubmit.abstractHint"),type:"text"},model:{value:t.setSubmit.title,callback:function(e){t.$set(t.setSubmit,"title",e)},expression:"setSubmit.title"}})],1),t._v(" "),i("el-form-item",{attrs:{label:t.$t("pages.learn.reportSubmit.abstract"),prop:"file"}},[i("el-upload",{ref:"upFile",staticClass:"upload-demo",attrs:{action:"",multiple:!1,limit:1,"show-file-list":!1,"on-change":t.handleChange,"http-request":t.uploadFile,"file-list":t.filesArr}},[i("el-button",{attrs:{size:"small",type:"primary"}},[t._v(t._s(t.$t("pages.learn.reportSubmit.uploadButtonText")))]),t._v(" "),i("div",{staticClass:"el-upload__tip",attrs:{slot:"tip"},slot:"tip"},[t._v(t._s(t.$t("pages.learn.reportSubmit.uploadTips"))),i("a",{attrs:{href:"http://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/static/build/learn-mba/%E3%80%8AMBA%E5%AD%A6%E7%94%9F%E5%AD%A6%E6%9C%AF%E6%B4%BB%E5%8A%A8%E8%AE%B0%E5%BD%95%E6%8A%A5%E5%91%8A%E3%80%8B%E6%A8%A1%E6%9D%BFXXX%E5%AD%A6%E7%94%9F.docx"}},[t._v(t._s(t.$t("pages.learn.reportSubmit.downloadTemplateText")))])]),t._v(" "),t.successFileUrl?[t._v("\n                "+t._s(t.successFileUrl.replace(/.*\/([^\/]*\.[^.]+)$/gi,"$1"))+"\n              ")]:t._e()],2),t._v(" "),t.successFileUrl?[i("a",{attrs:{href:t.successFileUrl}},[t._v(t._s(t.$t("pages.learn.reportSubmit.downloadButtonText")))])]:t._e()],2),t._v(" "),i("el-form-item",[i("el-button",{attrs:{type:"primary"},on:{click:t.onSubmitFrom}},[t._v(t._s(t.$t("pages.learn.reportSubmit.submitButtonText")))])],1)],1)],1)],1)],1)])},s=[]}}]);
\ No newline at end of file

server/client-dist/resources/42.d1d92a214869.css

+.el-date-editor.el-input[data-v-74d4ddc6]{width:100%}.el-upload__tip[data-v-74d4ddc6]{line-height:1.5}

server/client-dist/resources/app~e2e93592.069905d75bcf.css

@@ -122,6 +122,12 @@
 
 
 
+<<<<<<< HEAD:server/client-dist/resources/app~e2e93592.069905d75bcf.css
 .login-btn[data-v-4daad1ce]{margin-top:0;width:100%}
 .login-btn[data-v-c7ffdeda]{margin-top:0;width:100%}
 .content-s[data-v-5bf88e5a]{position:absolute;left:50%;top:55%;padding:40px 0;width:80%;max-width:1200px;-webkit-box-shadow:0px 3px 10px rgba(0,0,0,.3);-moz-box-shadow:0px 3px 10px rgba(0,0,0,.3);box-shadow:0px 3px 10px rgba(0,0,0,.3);-webkit-transform:translateX(-50%);-moz-transform:translateX(-50%);-ms-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%);background:#fff}.step1[data-v-5bf88e5a]{font-size:16px;width:90%;margin:20px auto 0 auto}.step2[data-v-5bf88e5a]{font-size:16px;width:71%;margin:20px auto 0 auto}.step2 .txt-title[data-v-5bf88e5a]{margin-bottom:.3rem;color:#999;text-align:center}.step2 .operate[data-v-5bf88e5a]{margin-top:.2rem}.step3[data-v-5bf88e5a]{font-size:16px;width:80%;margin:20px auto 0 auto}
+=======
+.login-btn[data-v-0f312107]{margin-top:0;width:100%}
+.login-btn[data-v-73d7800f]{margin-top:0;width:100%}
+.content-s[data-v-a4b08ae4]{position:absolute;left:50%;top:55%;padding:40px 0;width:80%;max-width:1200px;-webkit-box-shadow:0px 3px 10px rgba(0,0,0,.3);-moz-box-shadow:0px 3px 10px rgba(0,0,0,.3);box-shadow:0px 3px 10px rgba(0,0,0,.3);-webkit-transform:translateX(-50%);-moz-transform:translateX(-50%);-ms-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%);background:#fff}.step1[data-v-a4b08ae4]{font-size:16px;width:90%;margin:20px auto 0 auto}.step2[data-v-a4b08ae4]{font-size:16px;width:71%;margin:20px auto 0 auto}.step2 .txt-title[data-v-a4b08ae4]{margin-bottom:.3rem;color:#999;text-align:center}.step2 .operate[data-v-a4b08ae4]{margin-top:.2rem}.step3[data-v-a4b08ae4]{font-size:16px;width:80%;margin:20px auto 0 auto}
+>>>>>>> master:server/client-dist/resources/app~e2e93592.9241dcb659fc.css

server/client-dist/resources/manifest.60b6af21.js

+!function(e){function t(t){for(var a,n,o=t[0],c=t[1],u=t[2],i=0,l=[];i<o.length;i++)n=o[i],Object.prototype.hasOwnProperty.call(f,n)&&f[n]&&l.push(f[n][0]),f[n]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(b&&b(t);l.length;)l.shift()();return d.push.apply(d,u||[]),r()}function r(){for(var e,t=0;t<d.length;t++){for(var r=d[t],a=!0,n=1;n<r.length;n++){var c=r[n];0!==f[c]&&(a=!1)}a&&(d.splice(t--,1),e=o(o.s=r[0]))}return e}var a={},n={4:0},f={4:0},d=[];function o(t){if(a[t])return a[t].exports;var r=a[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var t=[];n[e]?t.push(n[e]):0!==n[e]&&{1:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1,26:1,27:1,28:1,29:1,30:1,31:1,32:1,33:1,34:1,35:1,36:1,37:1,38:1,39:1,40:1,41:1,42:1,43:1,44:1,45:1,46:1}[e]&&t.push(n[e]=new Promise((function(t,r){for(var a="resources/"+({}[e]||e)+"."+{0:"31d6cfe0d16a",1:"562ccaedfd58",13:"1429684a2b9d",14:"05dc7aa96f7c",15:"e301f90ba6e9",16:"768f5df4bce8",17:"2f07539f4343",18:"c18f36d03c9d",19:"fcad209037b7",20:"b27ff84006e8",21:"a03ff33413c1",22:"d7724b8916fc",23:"742656798b5f",24:"2db395d1e078",25:"d920dc559daf",26:"d4ee2543d8b8",27:"784852c7cdfb",28:"9440a193ab19",29:"af224ea2f077",30:"f9188a25fe38",31:"a8920aa0e3a2",32:"ce39809afd93",33:"c27ed65838ed",34:"ac5e590b04b5",35:"2104ba29bb2f",36:"87547da24512",37:"894454f85173",38:"a2f96538bfaf",39:"6f562ed448b1",40:"e102a73d4117",41:"fb13d53ec602",42:"d1d92a214869",43:"96b9c64465cf",44:"9bee250e9dd0",45:"bb106073cbbe",46:"55e3b84f359d",47:"31d6cfe0d16a",48:"31d6cfe0d16a",49:"31d6cfe0d16a",50:"31d6cfe0d16a",51:"31d6cfe0d16a",52:"31d6cfe0d16a",53:"31d6cfe0d16a",54:"31d6cfe0d16a"}[e]+".css",f=o.p+a,d=document.getElementsByTagName("link"),c=0;c<d.length;c++){var u=(b=d[c]).getAttribute("data-href")||b.getAttribute("href");if("stylesheet"===b.rel&&(u===a||u===f))return t()}var i=document.getElementsByTagName("style");for(c=0;c<i.length;c++){var b;if((u=(b=i[c]).getAttribute("data-href"))===a||u===f)return t()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=t,l.onerror=function(t){var a=t&&t.target&&t.target.src||f,d=new Error("Loading CSS chunk "+e+" failed.\n("+a+")");d.code="CSS_CHUNK_LOAD_FAILED",d.request=a,delete n[e],l.parentNode.removeChild(l),r(d)},l.href=f,document.getElementsByTagName("head")[0].appendChild(l)})).then((function(){n[e]=0})));var r=f[e];if(0!==r)if(r)t.push(r[2]);else{var a=new Promise((function(t,a){r=f[e]=[t,a]}));t.push(r[2]=a);var d,c=document.createElement("script");c.charset="utf-8",c.timeout=120,o.nc&&c.setAttribute("nonce",o.nc),c.src=function(e){return o.p+"resources/"+({}[e]||e)+"."+{0:"f06dda92",1:"44078140",13:"6fb87954",14:"9da72aa7",15:"a832fbd1",16:"7e17fffc",17:"d9135867",18:"1a22737b",19:"c09a9305",20:"d91beff4",21:"ab385994",22:"7ece3182",23:"b084f4cc",24:"20a762f7",25:"db9b3fcd",26:"5b1f35d1",27:"217b9a9e",28:"26cc45c1",29:"51bb3ed0",30:"ceb1bafd",31:"6e000cf9",32:"2b5aa160",33:"2de94a11",34:"18aebb57",35:"447662f6",36:"a381738d",37:"81d59940",38:"54f0b26e",39:"93a175c5",40:"f84a1a6d",41:"4a5a1304",42:"37889e3e",43:"0089960a",44:"50950980",45:"dffd3bcf",46:"6ebdad65",47:"21854934",48:"958a4baa",49:"b0be8994",50:"80dfbcf5",51:"ddeddabe",52:"5795d292",53:"79060923",54:"bf2fd91f"}[e]+".js"}(e);var u=new Error;d=function(t){c.onerror=c.onload=null,clearTimeout(i);var r=f[e];if(0!==r){if(r){var a=t&&("load"===t.type?"missing":t.type),n=t&&t.target&&t.target.src;u.message="Loading chunk "+e+" failed.\n("+a+": "+n+")",u.name="ChunkLoadError",u.type=a,u.request=n,r[1](u)}f[e]=void 0}};var i=setTimeout((function(){d({type:"timeout",target:c})}),12e4);c.onerror=c.onload=d,document.head.appendChild(c)}return Promise.all(t)},o.m=e,o.c=a,o.d=function(e,t,r){o.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(o.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)o.d(r,a,function(t){return e[t]}.bind(null,a));return r},o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,"a",t),t},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.p="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/",o.oe=function(e){throw console.error(e),e};var c=window.webpackJsonp=window.webpackJsonp||[],u=c.push.bind(c);c.push=t,c=c.slice();for(var i=0;i<c.length;i++)t(c[i]);var b=u;r()}([]);
\ No newline at end of file