diff --git a/src/assets/js/api/baseInfo.js b/src/assets/js/api/baseInfo.js index 257f7c74..8d5a4afa 100644 --- a/src/assets/js/api/baseInfo.js +++ b/src/assets/js/api/baseInfo.js @@ -18,6 +18,5 @@ export const getProjectExtendInfoApi = data => post('xmgl/projectExtend/getProje export const editProjectExtendApi = data => post('xmgl/projectExtend/editProjectExtend', data); //编辑项目信息扩展信息 export const getSafeEducationDataApi = data => post('xmgl/safeEducationQuestion/selectSafeEducationCoursePage', data); //获取安全教育培训数据列表 - - - +export const configWeekVideoSaveApi = data => post('xmgl/educationConfigWeekVideo/save', data); //保存现场大屏视频数据 +export const configWeekVideoListApi = data => get('xmgl/educationConfigWeekVideo/list', data); //获取现场大屏视频数据列表 \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 7f845479..100006b5 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -187,6 +187,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index d62f7fe8..959a8d74 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -1178,7 +1178,7 @@ export default { if (!arr2.length) { if (this.loginType == 1) { // this.$router.push("/projectIndex"); - if (!this.$store.state.userInfo.personMail) { + if (!this.$store.state.userInfo.personMail && this.company == 'agjt') { this.checkInfoComplete(); } this.$router.push("/workSpace"); @@ -1196,7 +1196,7 @@ export default { ) { if (this.loginType == 1) { // this.$router.push("/projectIndex"); - if (!this.$store.state.userInfo.personMail) { + if (!this.$store.state.userInfo.personMail && this.company == 'agjt') { this.checkInfoComplete(); } this.$router.push("/workSpace"); diff --git a/src/views/projectFront/projectSummary/extendInfo.vue b/src/views/projectFront/projectSummary/extendInfo.vue index 64adfe38..d94586ca 100644 --- a/src/views/projectFront/projectSummary/extendInfo.vue +++ b/src/views/projectFront/projectSummary/extendInfo.vue @@ -338,6 +338,32 @@ type="textarea" > + +
+
+ + {{item.title}} + +
+ +
+
{ + if (res.result) { + this.videoConfigData = res.result; + } + }) + }, + async configWeekVideoEditFn(url,weekIndex){ + console.log(url); + let requestData = { + // projectSn: this.$store.state.projectSn, + projectSn: "", + type: 3 + }; + if(axios.defaults.baseURL == 'http://182.90.224.237:51234/' || axios.defaults.baseURL == 'http://192.168.34.221:9111/') requestData.projectSn = 'BD3137498CB84BF0969979E0342CDBCA' + if(axios.defaults.baseURL == 'http://42.180.188.17:9809/' || axios.defaults.baseURL == 'http://42.180.188.17:11211/') requestData.projectSn = '471568F45EB247A3912A0D10EA1BFCEB' + // 星期参数 + console.log("=============================") + console.log(weekIndex,"weekIndex") + console.log("=============================") + // const today = weekIndex == 6 ? 0 : weekIndex + 1; + // const weekParamsKey = ["sun", "mon", "tues", "wed", "thur", "fri", "sat"]; + // requestData[weekParamsKey[+today]] = url; + if(weekIndex == 0) requestData.mon = url + if(weekIndex == 1) requestData.tues = url + if(weekIndex == 2) requestData.wed = url + if(weekIndex == 3) requestData.thur = url + if(weekIndex == 4) requestData.fri = url + if(weekIndex == 5) requestData.sat = url + if(weekIndex == 6) requestData.sun = url + + // type参数 + // 项目看板：1 总览大屏：2 现场大屏：3 + requestData.type = 3 + // id参数 + if (this.videoConfigData && this.videoConfigData.length) { + requestData.id = this.videoConfigData[0].id; + } + const res = await configWeekVideoSaveApi(requestData); + if (res.success) { + console.log("修改成功", res); + this.$message({ + showClose: true, + message: "上传成功", + type: "success" + }); + // configWeekVideoListFn(true); + // emits("updateConfig"); + } + }, + handleSuccess(file,index){ + if (file.code == 200 || file.status == "SUCCESS") { + console.log(file, "上传成功"); + let url = file.data[0].imageUrl; + // this.imgUrl = url; + this.configWeekVideoEditFn( url, index); + } + }, + handleBeforeUploadVideo(file){ + console.log(file, "上传之前"); + let fileType = file.type.split("/")[0]; + if (fileType == "video") { + return true; + } else { + this.$message({ + showClose: true, + message: "请选择正确的视频文件", + type: "warning" + }); + return false; + } + }, getEducationListFn() { let requestData = { projectSn: this.projectSn, @@ -527,6 +639,14 @@ export default { };