huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

修复bug

Browse Source
dev
yujialong 3 years ago
parent 910fb70e3e
commit 66dd0e5fcc
9 changed files with 35 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/components/quill/index.vue
  2. 3
      src/utils/api.js
  3. 4
      src/views/course/AddCurriculum.vue
  4. 2
      src/views/course/assetConfig.vue
  5. 2
      src/views/course/courseconfig.vue
  6. 3
      src/views/serve/AddConfigure.vue
  7. 8
      src/views/serve/Configure.vue
  8. 10
      src/views/serve/projectAdd.vue
  9. 26
      src/views/user/User.vue

11
src/components/quill/index.vue
Unescape View File

@ -2,7 +2,13 @@
<div class="quill" ref="quill" :class="classes">
<div ref="editor" :style="styles" v-loading="loading"></div>
<el-upload :action="this.api.fileupload" :before-upload="beforeUpload" :on-success="editorUploadSuccess" style="display: none">
<el-upload
:headers="headers"
:action="this.api.fileupload"
:before-upload="beforeUpload"
:on-success="editorUploadSuccess"
style="display: none"
>
<el-button class="editorUpload" size="small" type="primary">点击上传</el-button>
</el-upload>
</div>
@ -50,6 +56,9 @@
},
data () {
return {
headers: {
token: sessionStorage.getItem('token')
},
Quill: null,
currentValue: '',
options: {

3
src/utils/api.js
Unescape View File

@ -124,7 +124,8 @@ export default {
fileDeletion: `${uploadURL}/oss/manage/fileDeletion`, // 删除OSS文件
fileupload: `${uploadURL}/oss/manage/fileupload`, // 文件上传
getPlayAuth: `${uploadURL}/oss/manage/getPlayAuth`, // 获取播放凭证
removeMoreVideo: `${uploadURL}/oss/manage/removeMoreVideo`, // 批量删除视频文件
removeVideo: `${uploadURL}/oss/manage/removeVideo`, // 删除视频文件
queryProvince: `${host}/nakadai/nakadai/province/queryProvince`, //查询省份
queryCity: `${host}/nakadai/nakadai/city/queryCity`, //查询城市

4
src/views/course/AddCurriculum.vue
Unescape View File

@ -314,8 +314,8 @@ export default {
ProfessionalList: [],
systemBelongKeys: {
0: "外部产品",
1: "内部系统"
1: "外部产品",
0: "内部系统"
},
systemTypeKeys: {
0: "编程类",

2
src/views/course/assetConfig.vue
Unescape View File

@ -477,7 +477,7 @@ export default {
preview(row) {
if (this.transferType(row.fileType) == "视频") {
this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
this.playAuth = res.playAuth;
this.playAuth = res.data.playAuth;
if (this.player) {
this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
} else {

2
src/views/course/courseconfig.vue
Unescape View File

@ -460,7 +460,7 @@ export default {
preview(row) {
if (this.transferType(row.fileType) == "视频") {
this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
this.playAuth = res.playAuth;
this.playAuth = res.data.playAuth;
if (this.player) {
this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
} else {

3
src/views/serve/AddConfigure.vue
Unescape View File

@ -197,7 +197,6 @@
storeName: '1个月',
total: '2019.01.02 11:00',
payamount: '2019.01.02 11:00',
payamount: '700d12h1min',
swtich: true,
Intranet: '',
extranet: ''
@ -214,7 +213,7 @@
},
{
name: '内部系统',
value: 2
value: 0
}],
systemTypeList: [{
name: '工具',

8
src/views/serve/Configure.vue
Unescape View File

@ -113,16 +113,16 @@ export default {
systemBelongList: [
{
label: "外部产品",
value: 0
value: 1
},
{
label: "内部系统",
value: 1
value: 0
}
],
systemBelongKeys: {
0: '外部产品',
1: '内部系统'
1: '外部产品',
0: '内部系统'
},
systemTypeList: [
{

10
src/views/serve/projectAdd.vue
Unescape View File

@ -123,13 +123,13 @@
{{ scope.row.sort }}
</template>
</el-table-column>
<el-table-column prop="name" label="判分指标" align="center"></el-table-column>
<el-table-column prop="name" label="判分指标" align="center" ></el-table-column>
<el-table-column prop="name" label="判分点名称" align="center"></el-table-column>
<el-table-column label="实验要求" align="center">
<el-table-column label="实验要求" align="center" width="600">
<template slot-scope="scope">
<quill :border="true" :readonly="true" elseRead="true"
v-model="scope.row.experimentalRequirements" :minHeight="150"
:height="150" />
v-model="scope.row.experimentalRequirements" :minHeight="100"
:height="100" />
</template>
</el-table-column>
<el-table-column label="操作" width="140" align="center">
@ -140,7 +140,7 @@
</el-button>
</template>
</el-table-column>
<el-table-column prop="score" label="分数" align="center">
<el-table-column prop="score" label="分数" align="center" width="120">
<template slot-scope="scope">
<!--type="number"-->
<el-input :disabled="isDetail" v-model.trim="scope.row.score"

26
src/views/user/User.vue
Unescape View File

@ -65,7 +65,7 @@
</el-col>
<el-col :span="6">
<el-form-item>
<el-input placeholder="请输入用户姓名/学校名称" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
<el-input placeholder="支持账号,手机号,姓名,学校查询" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
@ -88,22 +88,14 @@
</div>
<el-table :data="userData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="userId">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
<el-table-column type="index" width="100" label="序号" align="center">
</el-table-column>
<el-table-column prop="account" label="用户账号" align="center">
</el-table-column>
<el-table-column prop="userName" label="姓名" align="center">
</el-table-column>
<el-table-column prop="schoolName" label="学校" align="center">
</el-table-column>
<el-table-column prop="platformName" label="来源" align="center">
</el-table-column>
<el-table-column prop="phone" label="手机号" align="center">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center">
</el-table-column>
<el-table-column prop="logInNumber" label="登录次数" align="center">
</el-table-column>
<el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
<el-table-column prop="account" label="用户账号" align="center"></el-table-column>
<el-table-column prop="userName" label="姓名" align="center"></el-table-column>
<el-table-column prop="schoolName" label="学校" align="center"></el-table-column>
<el-table-column prop="platformName" label="来源" align="center"></el-table-column>
<el-table-column prop="phone" label="手机号" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column>
<el-table-column label="操作" width="300" align="center">
<template slot-scope="scope">
<el-button type="text" @click="show(scope.row)">查看</el-button>

Write Preview
Loading…
Cancel
Save