diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 904b652e..d68caa7c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -42,7 +42,6 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址 - // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 @@ -87,8 +86,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 - // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上 - axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上 + // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) + axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2) + // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ + } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' diff --git a/src/components/GlobalUploader.vue b/src/components/GlobalUploader.vue index 4ef4a62f..a1132093 100644 --- a/src/components/GlobalUploader.vue +++ b/src/components/GlobalUploader.vue @@ -51,7 +51,7 @@ data() { return { options: { - target: this.$http.defaults.baseURL+'filetransfer/uploadfile?projectSn='+this.$store.state.projectSn, // 目标上传 URL + target: this.$http.defaults.baseURL+'filetransfer/uploadfile', // 目标上传 URL chunkSize: 1024 * 1024, fileParameterName: 'file', maxChunkRetries: 3, @@ -90,7 +90,7 @@ mounted() { this.$EventBus.$on('openUploader', query => { - console.log('openUploader') + console.log('openUploader',query) this.params = query || {}; // this.$refs.uploadBtn.click() var e = document.createEvent('MouseEvent'); diff --git a/src/store/index.js b/src/store/index.js index 5162b2ff..a68b9574 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -94,11 +94,9 @@ export default new Vuex.Store({ // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 - // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 - // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 - // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 - // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//中建四 - // FILEURL: 'http://182.90.224.147:15551/image/',//中建四 + // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 + UPLOADURL: 'http://182.90.224.147:30262/upload/image',//四川成润 + FILEURL: 'http://182.90.224.147:30262/image/',//四川成润 ACCOUNTTYPE: [ "系统管理员", diff --git a/src/views/projectAdmin/fourEngin/command/rightFour.vue b/src/views/projectAdmin/fourEngin/command/rightFour.vue index 16a080fa..1786f737 100644 --- a/src/views/projectAdmin/fourEngin/command/rightFour.vue +++ b/src/views/projectAdmin/fourEngin/command/rightFour.vue @@ -21,8 +21,7 @@

{{ itemVar.title }} {{itemVar.updateTime }}

-
- +
diff --git a/src/views/projectFront/electricityManage/alarmValueSet.vue b/src/views/projectFront/electricityManage/alarmValueSet.vue index 5270949c..288adc9c 100644 --- a/src/views/projectFront/electricityManage/alarmValueSet.vue +++ b/src/views/projectFront/electricityManage/alarmValueSet.vue @@ -460,7 +460,7 @@ export default { if (typeof obj.alarmPushWorkerId === "string"&& obj.alarmPushWorkerId != '') { this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId .split(",") - .map(Number); + } this.handle("edit", true); }, diff --git a/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue b/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue index 39957cbf..b47a68ef 100644 --- a/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue +++ b/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue @@ -127,14 +127,17 @@ export default { get() { let res = { filePath: this.filePath, - isDir: 0 + isDir: 0, + projectSn:this.$store.state.projectSn + } return res }, set() { return { filePath: '/', - isDir: 0 + isDir: 0, + projectSn:this.$store.state.projectSn } } }, diff --git a/src/views/projectFront/informatioBroadcast/broadcast.vue b/src/views/projectFront/informatioBroadcast/broadcast.vue index 090948fc..4406fda5 100644 --- a/src/views/projectFront/informatioBroadcast/broadcast.vue +++ b/src/views/projectFront/informatioBroadcast/broadcast.vue @@ -176,7 +176,7 @@ export default { [{ align: [] }], //对齐方式 ['clean'], //清除字体样式 - ['image', 'video'] //上传图片、上传视频 + ['image'] //上传图片、上传视频 ] }, theme: 'snow' diff --git a/src/views/projectFront/projectSummary/panoramaPlan.vue b/src/views/projectFront/projectSummary/panoramaPlan.vue index 55451b33..f30b2421 100644 --- a/src/views/projectFront/projectSummary/panoramaPlan.vue +++ b/src/views/projectFront/projectSummary/panoramaPlan.vue @@ -32,7 +32,8 @@ - + + diff --git a/src/views/projectFront/uavLnspection/uavview.vue b/src/views/projectFront/uavLnspection/uavview.vue index 57e7c1cc..e79e0b0a 100644 --- a/src/views/projectFront/uavLnspection/uavview.vue +++ b/src/views/projectFront/uavLnspection/uavview.vue @@ -26,11 +26,15 @@ prop="updateTime" label="更新时间" > - + + +