Skip to content

L
learn-online-pc
提交 6a1b2b4f authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

Merge branch 'master' of https://gitlab.ezijing.com/zhangyanxin/learn-mbaOnline

上级 88df8abe 5b8c13e3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 12 行增加 和 12 行删除
client/src/api/report_api.js
浏览文件 @ 6a1b2b4f
......@@ -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/comTable/mTable.vue
浏览文件 @ 6a1b2b4f
......@@ -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/pages/learn/reportActiveList.vue
浏览文件 @ 6a1b2b4f
......@@ -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)
})
}
......
client/src/pages/learn/reportSubmit.vue
浏览文件 @ 6a1b2b4f
......@@ -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() })
......
server/client-dist/index.html
浏览文件 @ 6a1b2b4f
......@@ -2,4 +2,4 @@
<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.2de5c9cf.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.709c33f7.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app~07e2a4e5.44c4dd18.js"></script></body></html>
\ No newline at end of file
<![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.112e3b32.js"></script><script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app~07e2a4e5.44c4dd18.js"></script></body></html>
\ No newline at end of file
server/client-dist/resources/18.0881ba7f32ac.css → server/client-dist/resources/18.c18f36d03c9d.css
浏览文件 @ 6a1b2b4f
.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-0e3b1cea]{width:100%}.el-upload__tip[data-v-0e3b1cea]{line-height:1.5}
.el-date-editor.el-input[data-v-3fc1cf3a]{width:100%}.el-upload__tip[data-v-3fc1cf3a]{line-height:1.5}
server/client-dist/resources/42.49380bfe67e0.css deleted 100644 → 0
浏览文件 @ 88df8abe
.el-date-editor.el-input[data-v-facb498e]{width:100%}.el-upload__tip[data-v-facb498e]{line-height:1.5}
server/client-dist/resources/42.d1d92a214869.css 0 → 100644
浏览文件 @ 6a1b2b4f
.el-date-editor.el-input[data-v-74d4ddc6]{width:100%}.el-upload__tip[data-v-74d4ddc6]{line-height:1.5}
server/client-dist/resources/manifest.2de5c9cf.js → server/client-dist/resources/manifest.60b6af21.js
浏览文件 @ 6a1b2b4f
!function(e){function t(t){for(var a,n,o=t[0],c=t[1],u=t[2],b=0,l=[];b<o.length;b++)n=o[b],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(i&&i(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:"0881ba7f32ac",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:"49380bfe67e0",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=(i=d[c]).getAttribute("data-href")||i.getAttribute("href");if("stylesheet"===i.rel&&(u===a||u===f))return t()}var b=document.getElementsByTagName("style");for(c=0;c<b.length;c++){var i;if((u=(i=b[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:"e532ba67",14:"9da72aa7",15:"a832fbd1",16:"e791c8e2",17:"e3154558",18:"4eb720bd",19:"944f999e",20:"4d8525f5",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:"c642f623",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(b);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 b=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 b=0;b<c.length;b++)t(c[b]);var i=u;r()}([]);
\ No newline at end of file
!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
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论