diff --git a/dist.zip b/dist.zip deleted file mode 100644 index a1675faa..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/store/index.js b/src/store/index.js index fde8c534..151aa154 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,16 +45,16 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl?baseUrl:window.location.protocol + '//' + window.location.host + '/', // - // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - // FILEURL: window.location.protocol + '//' + window.location.host + '/image/',//测试 + UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + FILEURL: window.location.protocol + '//' + window.location.host + '/image/',//测试 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 */ // tag: 本地测试接口 - UPLOADURL: 'http://192.168.34.125:6023/upload/image', - FILEURL: 'http://192.168.34.125:6023/image/', + // UPLOADURL: 'http://192.168.34.125:6023/upload/image', + // FILEURL: 'http://192.168.34.125:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 ACCOUNTTYPE: ['系统管理员', '企业一级管理员', '企业二级管理员', '企业三级管理员', '项目管理员'], //1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号 diff --git a/src/views/projectAdmin/projectList.vue b/src/views/projectAdmin/projectList.vue index 701641f3..f1d1e4d2 100644 --- a/src/views/projectAdmin/projectList.vue +++ b/src/views/projectAdmin/projectList.vue @@ -361,7 +361,13 @@ export default { }, // 去衢州版本 goProjectQu(value){ - console.log('value',value) + console.log('进去衢州',value) + this.$store.commit("setProjectSn", value.projectSn); + this.$store.commit("setProDetail", value); + this.$store.commit("changeMouduleIndex", 0); + this.$store.commit("changeSecondMenuIndex", 0); + this.$store.commit("changeThirdMenuIndex", 0); + this.$store.commit("changeFourMenuIndex", 0); let routeUrl = this.$router.resolve({ path: '/projectV3/taskList' }); diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue index 6f2d9e3c..d4f5eec6 100644 --- a/src/views/projectFront/laborManage/safetyTrainManage.vue +++ b/src/views/projectFront/laborManage/safetyTrainManage.vue @@ -299,7 +299,7 @@ > + class="photo" />