Skip to content

P
pica.cloud.web-education-admin
提交 d1ce4b6f 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-saas-phase3-0612' into dev-yLive-saas-all-0623 

* dev-saas-phase3-0612:
  环境变量等
  修改菜单等
  删除 优化等

# Conflicts:
#	src/utils/fetch.js
#	src/views/layout/slidebar.vue
上级 744c54eb 0a8e7a13
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1975 行增加 和 11694 行删除
src/components/education/custom-resource/edit-course-dialog copy 11.vue
浏览文件 @ d1ce4b6f
......@@ -126,7 +126,7 @@
action="#"
accept="image/*"
:show-file-list="false"
:before-upload="beforeUpload1"
:before-upload="beforeUploadForCourse"
:disabled="disabled"
>
<div class="bg-img-wrapper">
......@@ -192,7 +192,7 @@
action="#"
accept="image/*"
:show-file-list="false"
:before-upload="beforeUpload2"
:before-upload="beforeUploadForLecture"
:disabled="disabled"
>
<div class="bg-img-wrapper">
......@@ -272,7 +272,7 @@
<DialogComponet :dialogObj="dialogObj" @hide="hideCancleTips" @confirm="dialogObj.visible=false"></DialogComponet>
<PreviewVideo :dialogVisible="isPreviewVideo" :videoUrl="videoUrl" @close="isPreviewVideo=false"></PreviewVideo>
<el-dialog
<!-- <el-dialog
title="拒绝原因"
:visible="showCropper"
width="1000px"
......@@ -283,7 +283,7 @@
:originImg="slide2.oriUrl"
:previewImg="slide2.preUrl"
/>
</el-dialog>
</el-dialog> -->
<!-- <button @click="previewVideoAction">test video</button> -->
</div>
</template>
......@@ -310,10 +310,10 @@ export default {
}
};
return {
slide2: {
oriUrl: 'https://avatars1.githubusercontent.com/u/23690568?s=460&v=4', // 原图
preUrl: 'https://avatars1.githubusercontent.com/u/23690568?s=460&v=4' // 裁剪后的预览图片，初始化为原图
},
// slide2: {
// oriUrl: 'https://avatars1.githubusercontent.com/u/23690568?s=460&v=4', // 原图
// preUrl: 'https://avatars1.githubusercontent.com/u/23690568?s=460&v=4' // 裁剪后的预览图片，初始化为原图
// },
showCropper: false,
cropOption: {
offset_x: 10,
......@@ -506,12 +506,12 @@ export default {
methods: {
...mapActions(['setKind']),
getCropImg (argument) {
this.showCropper = false;
console.log(argument[0], '#####', argument[1]);
this.slide2.preUrl = argument[0]
this.cropData = argument[1]
},
// getCropImg (argument) {
// this.showCropper = false;
// console.log(argument[0], '#####', argument[1]);
// this.slide2.preUrl = argument[0]
// this.cropData = argument[1]
// },
// 创建课程页面的初始信息
initOrgCourseInfo() {
......@@ -642,6 +642,13 @@ export default {
// maxStorageSpace: 5368709120,
// usedStorageSpace: 1021842989
// }
this.$message({
showClose: true,
message: '您上传的文件大小已超限制，无法继续上传。如有疑问可拨打云鹊医电话咨询400-920-7788',
type: 'error',
duration: 10000
});
return;
console.log(file);
const isMP4 = file.type === "video/mp4";
const isGt = file.size > this.orgCourseInfo.limitModel.maxLimitOneVideoSize;
......@@ -652,7 +659,14 @@ export default {
return;
}
if(usedGtMaxStore) {
this.$message.error("个人存储空间已不够上传此视频");
this.$message.error("您上传的文件大小已超限制，无法继续上传。如有疑问可拨打云鹊医电话咨询400-920-7788");
this.$message({
showClose: true,
message: '恭喜你，这是一条成功消息',
type: 'error',
duration: 10000
});
return;
}
// 直接上传
......@@ -703,149 +717,6 @@ export default {
});
},
//上传列表图片
beforeUploadListPic(file) {
let fileLimit = {
width: 230,
height: 172,
size: 0.5,
sizeText: "500K",
key: "attachmentUrl",
more: "attachmentMore1",
show: "uploadImgMessage"
};
vm.beforeAvatarUpload2(file, fileLimit);
// vm.beforeAvatarUpload(file, fileLimit);
},
//上传图片校验
beforeAvatarUpload2(file, fileLimit) {
console.log();
const isJPG = file.type === "image/jpeg";
const isPNG = file.type === "image/png";
const isLt2M = file.size / 1024 / 1024 < fileLimit.size;
console.log("isJPG", isJPG, "isPNG", isPNG, "isLt2M", isLt2M);
// if (!isJPG && !isPNG) {
// vm.$message.error("图片不符合规范，请根据规范上传图片");
// return;
// }
// if (!isLt2M) {
// vm.$message.error("图片不符合规范，请根据规范上传图片 ");
// return;
// }
let _img = new FileReader();
_img.readAsDataURL(file);
console.log('readAsDataURL', _img, file);
_img.onload = function(theFile) {
let image = new Image();
image.src = theFile.target.result;
vm.slide2.oriUrl = theFile.target.result;
vm.showCropper = true;
console.log('readAsDataURL222', _img.width, file, theFile);
image.onload = function() {
console.log('image.onload', image);
let _vm = this;
if (
false
// true ||
// _vm.width != fileLimit.width ||
// _vm.height != fileLimit.height
) {
vm.$message.error("图片不符合规范，请根据规范上传图片");
} else {
// openLoading(vm);
// doUpload(
// vm,
// file,
// getFilePath(file, null),
// "preview4",
// "progress1",
// 1
// ).then(function(path) {
// closeLoading(vm);
// console.log(path);
// if (fileLimit.show == "uploadImgMessage") {
// vm.uploadImgMessage = false;
// }
// // else if (fileLimit.show == "uploadImgMessage2") {
// // vm.uploadImgMessage2 = false;
// // }
// vm.formData[fileLimit.key] = path.fullPath;
// vm.formData[fileLimit.more] = {
// attachmentName: path.name,
// attachmentExt: path.ext,
// attachmentSize: path.size
// };
// vm.$message.success("上传成功");
// });
}
};
};
return isJPG && isLt2M;
},
//上传图片校验
beforeAvatarUpload(file, fileLimit) {
console.log();
const isJPG = file.type === "image/jpeg";
const isPNG = file.type === "image/png";
const isLt2M = file.size / 1024 / 1024 < fileLimit.size;
console.log("isJPG", isJPG, "isPNG", isPNG, "isLt2M", isLt2M);
// if (!isJPG && !isPNG) {
// vm.$message.error("图片不符合规范，请根据规范上传图片");
// return;
// }
// if (!isLt2M) {
// vm.$message.error("图片不符合规范，请根据规范上传图片 ");
// return;
// }
let _img = new FileReader();
_img.readAsDataURL(file);
_img.onload = function(theFile) {
let image = new Image();
image.src = theFile.target.result;
image.onload = function() {
let _vm = this;
if (
false
// true ||
// _vm.width != fileLimit.width ||
// _vm.height != fileLimit.height
) {
vm.$message.error("图片不符合规范，请根据规范上传图片");
} else {
openLoading(vm);
doUpload(
vm,
file,
getFilePath(file, null),
"preview4",
"progress1",
1
).then(function(path) {
closeLoading(vm);
console.log(path);
if (fileLimit.show == "uploadImgMessage") {
vm.uploadImgMessage = false;
}
// else if (fileLimit.show == "uploadImgMessage2") {
// vm.uploadImgMessage2 = false;
// }
vm.formData[fileLimit.key] = path.fullPath;
vm.formData[fileLimit.more] = {
attachmentName: path.name,
attachmentExt: path.ext,
attachmentSize: path.size
};
vm.$message.success("上传成功");
});
}
};
};
return isJPG && isLt2M;
},
// 展开/收起 更多信息
toggleOtherContent() {
this.isShowOtherContent = !this.isShowOtherContent;
......@@ -913,8 +784,7 @@ export default {
},
// 上传课程封面图片
beforeUpload1(file) {
// const isLt50kb = file.size / 1024 < 50;
beforeUploadForCourse(file) {
const isJPG = file.type === 'image/jpeg'
if(!isJPG) {
this.$message.error('只支持jpeg格式')
......@@ -937,7 +807,7 @@ export default {
},
// 上传讲师图片
beforeUpload2(file) {
beforeUploadForLecture(file) {
// const isLt50kb = file.size / 1024 < 50;
const isJPG = file.type === 'image/jpeg'
if(!isJPG) {
......@@ -966,6 +836,7 @@ export default {
//上传 指定文件名
ossUpload(self, file, getFilePathForOSS(file), null, null, null).
then(function(path) {
console.log(path);
let list = [{}];
// list[0].name = file.name;
// list[0].url = localStorage.getItem("resource_url") + path;
......
src/components/education/custom-resource/reject-reason-dialog copy.vue 已删除 100644 → 0
浏览文件 @ 744c54eb
<template>
<!-- 拒绝原因 暂时不做 -->
<el-dialog
title="拒绝原因"
@close="hideAddEditForm"
:visible.sync="addEditVisible"
:close-on-click-modal="false"
width="600px"
center>
<el-form ref="addEditForm" :rules="rules" :model="addEditForm" label-width="120px">
<el-form-item label="拒绝原因：">
<el-radio-group v-model="addEditForm.doctorId">
<div style="padding-top: 12px;">
<el-radio label="含有政治类、医疗健康、社会事件类不实信息" value="1"></el-radio>
</div>
<div style="padding-top: 16px;">
<el-radio label="含有欺诈，色情，诱导、违法犯罪非法字符" value="2"></el-radio>
</div>
<div style="padding-top: 16px;">
<el-radio label="其他" value="3"></el-radio>
</div>
</el-radio-group>
<el-input type="textarea" v-model="addEditForm.desc" maxlength="25" style="width: 310px;margin-top: 10px;"></el-input>
<span class="word-num">{{(addEditForm.desc).replace(/\s+/g,"").length}}/25</span>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="hideAddEditForm">取 消</el-button>
<el-button type="primary" @click="submitForm('addEditForm')">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
data() {
return {
};
},
props: {
dialogVisible: {
type: Boolean,
default: false
}
},
computed: {
},
mounted() {
},
methods: {
save() {
this.dialogVisible = false;
}
}
};
</script>
<style scoped lang="scss">
</style>
src/utils/env-config.js
浏览文件 @ d1ce4b6f
......@@ -37,7 +37,11 @@ export const envConfig = {
excelUrl: 'https://dev-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
cmsUrl: ' https://dev-cms.yunqueyi.com/',
// resource_url: "https://test-file.yunqueyi.com",
ossImgUrl: 'https://test-file.yunqueyi.com/',
stsUrl: "https://dev-api.yunqueyi.com/middle/oss/token/", //sts服务器
bucketName: "pica-test-huabei2",
endpoint: "oss-cn-beijing.aliyuncs.com",
},
dev: {
baseUrl: 'https://dev-sc.yunqueyi.com/',
......@@ -57,6 +61,9 @@ export const envConfig = {
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
cmsUrl: ' https://dev-cms.yunqueyi.com/',
ossImgUrl: 'https://test-file.yunqueyi.com/',
stsUrl: "https://dev-api.yunqueyi.com/middle/oss/token/", //sts服务器
bucketName: "pica-test-huabei2",
endpoint: "oss-cn-beijing.aliyuncs.com",
},
test: {
baseUrl: 'https://test1-sc.yunqueyi.com/',
......@@ -76,6 +83,9 @@ export const envConfig = {
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
cmsUrl: ' https://test1-cms.yunqueyi.com/',
ossImgUrl: 'https://test-file.yunqueyi.com/',
stsUrl: "https://test1-api.yunqueyi.com/middle/oss/token/", //sts服务器
bucketName: "pica-test-huabei2",
endpoint: "oss-cn-beijing.aliyuncs.com",
},
test2: {
baseUrl: 'https://test2-work.yunqueyi.com/sc/',
......@@ -94,6 +104,9 @@ export const envConfig = {
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
cmsUrl: ' https://test2-cms.yunqueyi.com/',
ossImgUrl: 'https://test-file.yunqueyi.com/',
stsUrl: "https://test2-api.yunqueyi.com/middle/oss/token/", //sts服务器
bucketName: "pica-test-huabei2",
endpoint: "oss-cn-beijing.aliyuncs.com",
},
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/',
......@@ -112,8 +125,11 @@ export const envConfig = {
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
cmsUrl: ' https://uat-cms.yunqueyi.com/',
ossImgUrl: 'https://test-file.yunqueyi.com/',
},
ossImgUrl: 'https://file.yunqueyi.com/',
stsUrl: "https://uat-api.yunqueyi.com/middle/oss/token/", //sts服务器
bucketName: "pica-pro",
endpoint: "oss-cn-shanghai.aliyuncs.com",
},
pro: {
baseUrl: 'https://sc.yunqueyi.com/',
apiUrl: 'https://api.yunqueyi.com/',
......@@ -132,5 +148,8 @@ export const envConfig = {
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
cmsUrl: ' https://cms.yunqueyi.com/',
ossImgUrl: 'https://file.yunqueyi.com/',
}
stsUrl: "https://api.yunqueyi.com/middle/oss/token/", //sts服务器
bucketName: "pica-pro",
endpoint: "oss-cn-shanghai.aliyuncs.com"
}
}
src/utils/fetch.js
浏览文件 @ d1ce4b6f
......@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境qgit
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = '3F5F01DF814C46E59FF09F3E63A55D18';
// config.headers['token'] = 'B27DC440F5A04807AEA8E31B2B58EDF8';
config.headers['token'] = 'D800B8A02DC24E5492C9AFE3823859EA';
// config.headers['token'] = localStorage.getItem('storageToken')
}else{
config.headers['token'] = localStorage.getItem('storageToken')
......
src/utils/index.js
浏览文件 @ d1ce4b6f
......@@ -201,12 +201,36 @@ export function getWorkDomain(url) {
return getConfigByEnvType('workApiSrc') + url
}
/*
* OSS相关参数
*/
// 获取OSS域名
export function getOSSImgUrl() {
return getConfigByEnvType('ossImgUrl')
}
// 获取stsUrl域名
export function getSTSUrl() {
return getConfigByEnvType('stsUrl')
}
// 获取bucketName
export function getBucketName() {
return getConfigByEnvType('bucketName')
}
// 获取endpoint
export function getEndpoint() {
return getConfigByEnvType('endpoint')
}
// 根据不同环境，生成URL
function getConfigByEnvType(urlType) {
return envConfig[process.env.BUILD_ENV][urlType]
}
// 获取report服务器域名地址
export function getReportUrl(url) {
return getConfigByEnvType('reportUrl') + url
......@@ -227,6 +251,8 @@ export function getCmsUrl(url) {
return getConfigByEnvType('cmsUrl') + url
}
// 转换时间格式
export function convertTime(time, isToSlash = true) {
console.log('#########time', time);
......
src/utils/oss/fetch.js
浏览文件 @ d1ce4b6f
......@@ -9,10 +9,6 @@ export default async(url = '', data = {}, type = 'POST', method = 'fetch',server
url = localStorage.getItem("Url") + url;
}
// url =
console.log('@@@@@@@@@@@@@in oss fetch' , url);
// @@@@@@@@@@@@@in oss fetch null/5DF4291EDDA34BA08AD234C6BB7BE65D
// https://dev-api.yunqueyi.com/middle/oss/token/B1A7745D85D74EB4966125A4E0979ACE
console.log("完整url:",url)
if (type == 'GET' && data) {
......
src/utils/oss/ossUtil.js
浏览文件 @ d1ce4b6f
import {isEmptyUtils, isNotEmptyUtils, subString} from "@/utils/index";
import {isEmptyUtils, isNotEmptyUtils, subString, getBucketName, getEndpoint, getSTSUrl} from "@/utils/index";
import fetch from './fetch.js';
/**
......@@ -15,8 +15,11 @@ contentTypeMap.set("xlsx", "application/vnd.openxmlformats-officedocument.spread
// let bucketName = localStorage.getItem("bucketName");
// let endpoint = localStorage.getItem("endpoint");
let bucketName = 'pica-test-huabei2';
let endpoint = 'oss-cn-beijing.aliyuncs.com';
// let bucketName = 'pica-test-huabei2';
// let endpoint = 'oss-cn-beijing.aliyuncs.com';
let bucketName = getBucketName();
let endpoint = getEndpoint();
console.log(bucketName, endpoint);
......@@ -39,9 +42,11 @@ const doOSSAction = () => {
//sts服务器
// let stsUrl = localStorage.getItem("stsUrl") + "/" + localStorage.getItem("token");
// let stsUrl = 'https://dev-api.yunqueyi.com/middle/oss/token/' + localStorage.getItem("token");
let stsUrl = 'https://dev-api.yunqueyi.com/middle/oss/token/D1AA498C1C1C4298B712B3678EF9BD07'
// let stsUrl = 'https://dev-api.yunqueyi.com/middle/oss/token/D1AA498C1C1C4298B712B3678EF9BD07'
// let stsUrl = 'https://dev-api.yunqueyi.com/middle/oss/token/' + localStorage.getItem("token");
let stsUrl = getSTSUrl() + localStorage.getItem("token");
return new Promise(function (resolve, reject) {
fetch(stsUrl, {}, 'GET').then(function (result) {
let client = null;
......
src/views/layout/slidebar.vue
浏览文件 @ d1ce4b6f
......@@ -380,11 +380,11 @@
icon: 'el-icon-document',
index: 'credit-send-manage'
},
{
title: '外部资源管理',
icon: 'el-icon-document',
index: 'external-resource-manage'
},
// {
// title: '外部资源管理',
// icon: 'el-icon-document',
// index: 'external-resource-manage'
// },
]
}
const yqRange = {
......@@ -393,12 +393,21 @@
index: 'yq-range'
};
const outResourceManage = {
title: '外部资源管理',
icon: 'el-icon-document',
index: 'external-resource-manage',
isMessageSend: false,
checkAuth: false,
}
vm.items[1].subs.push(itemComponent);
vm.items[1].subs.push(templateManager);
vm.items[1].subs.push(followSider);
vm.items.push(eduRole);
vm.items.push(cme);
vm.items.push(yqRange);
vm.items.push(outResourceManage);
},
goToMessageSendPage(checkAuth) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或