From c33a119c89c56f82871a230d543a60aa458a6753 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 18 Jun 2024 18:36:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=9E=8D=E9=92=A2?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/login_v2.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"); From 5fa165ddac4f33911658933a24c5aabf7ad04e2a Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 18 Jun 2024 20:17:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=B8=AD=E7=A7=91=E4=BD=B3=E6=88=90?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f12c1aad..9bbceeb7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -178,7 +178,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 @@ -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") { From f060f0e3fbae1fd7b527dd41633df7c91f1e5a69 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 20 Jun 2024 00:42:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=8E=B0?= =?UTF-8?q?=E5=9C=BA=E5=A4=A7=E5=B1=8F=E9=85=8D=E7=BD=AE=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8CprojectSn=E6=9A=82=E6=97=B6=E5=86=99?= =?UTF-8?q?=E6=AD=BB=EF=BC=8C=E9=83=A8=E7=BD=B2=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9B=B8=E5=BA=94=E7=9A=84projectSn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/baseInfo.js | 5 +- .../projectSummary/extendInfo.vue | 116 +++++++++++++++++- 2 files changed, 117 insertions(+), 4 deletions(-) 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/views/projectFront/projectSummary/extendInfo.vue b/src/views/projectFront/projectSummary/extendInfo.vue index 64adfe38..d608ae0e 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: "BD3137498CB84BF0969979E0342CDBCA", // yh001 + type: 3 + }; + // 星期参数 + 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 +633,14 @@ export default { };