diff --git a/src/assets/js/api/company/project.js b/src/assets/js/api/company/project.js
index ac83c9bd..3f023492 100644
--- a/src/assets/js/api/company/project.js
+++ b/src/assets/js/api/company/project.js
@@ -49,4 +49,4 @@ export const getProjectEnterpriseApi = data => post('xmgl/projectEnterprise/sele
//金林湾视频
-export const getPlayUrlFromHikvisionApi = data => get('/xmgl/videoItem/getPlayUrlFromHikvision', data); //获取项目下所有合作单位
+export const getPlayUrlFromHikvisionApi = data => get('/xmgl/videoItem/getPlayUrlFromHikvision', data);
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 3791490e..f5290567 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
// axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
- axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
+ // 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/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
- // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+ axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL ='http://192.168.34.221:8070' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
@@ -97,8 +97,8 @@ if (process.env.NODE_ENV == 'development') {
axios.defaults.baseURL = 'https://www.ceshi.com'
} else if (process.env.NODE_ENV == 'production') {
let host = window.location.host
- axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
- // axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
+ // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
+ axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
// axios.defaults.baseURL ='http://192.168.34.216:6023/'
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
diff --git a/src/store/index.js b/src/store/index.js
index 66cd9107..fdbdd31c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,9 +45,9 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// 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 + "/", //正式环境
+ BASEURL: baseUrl
+ ? baseUrl
+ : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
@@ -55,15 +55,15 @@ export default new Vuex.Store({
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//---------------------------------------------------------------------------------------------
- BASEURL: baseUrl
- ? baseUrl
- : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
- UPLOADURL:
- window.location.protocol +
- "//" +
- window.location.host +
- "/api/upload/image", //金林湾部署地址
- FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
+ // BASEURL: baseUrl
+ // ? baseUrl
+ // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
+ // UPLOADURL:
+ // window.location.protocol +
+ // "//" +
+ // window.location.host +
+ // "/api/upload/image", //金林湾部署地址
+ // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
@@ -95,8 +95,8 @@ export default new Vuex.Store({
// 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://182.90.224.147:15551/upload/image',//四川成润
- // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润
+ UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润
+ FILEURL: 'http://182.90.224.147:15551/image/',//四川成润
ACCOUNTTYPE: [
"系统管理员",
diff --git a/src/views/projectFront/contractManagement/basicInformation.vue b/src/views/projectFront/contractManagement/basicInformation.vue
index 384cc79e..29914a96 100644
--- a/src/views/projectFront/contractManagement/basicInformation.vue
+++ b/src/views/projectFront/contractManagement/basicInformation.vue
@@ -164,9 +164,10 @@
@@ -761,7 +762,7 @@
>
@@ -1110,10 +1111,11 @@
placeholder="请输入"
>
-
+
diff --git a/src/views/projectFront/inOutboundManagement/departmentTeam.vue b/src/views/projectFront/inOutboundManagement/departmentTeam.vue
index 6bd246f8..677619b3 100644
--- a/src/views/projectFront/inOutboundManagement/departmentTeam.vue
+++ b/src/views/projectFront/inOutboundManagement/departmentTeam.vue
@@ -120,6 +120,7 @@
@@ -153,6 +154,9 @@
+
\ No newline at end of file
diff --git a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
index 2e947996..e8d0d6a7 100644
--- a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
+++ b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
@@ -108,7 +108,7 @@