From c1c3cdd81ea5fe5686033004382e9a9c261ad50a Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Fri, 28 Apr 2023 09:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AE=A1=E7=90=86=EF=BC=8C?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/js/http.js | 4 +--
src/store/index.js | 2 ++
.../projectAdmin/fourEngin/carbon/index.vue | 26 ++++++--------
.../fourEngin/quality/centerTop.vue | 5 ++-
.../fourEngin/sourse/rightTop.vue | 8 ++---
.../contractManagement/evaluationRecords.vue | 1 +
.../equipmentManagement/leasingEquipment.vue | 16 +++++++++
.../equipmentManagement/ownEquipment.vue | 36 +++++++++++++++----
.../inspectionWarehousing.vue | 2 +-
.../inOutboundManagement/materialOutbound.vue | 14 ++++----
.../materialSupplierManagement.vue | 6 ++--
.../entryRegistration.vue | 13 ++++---
.../exitRegistration.vue | 14 ++++----
13 files changed, 90 insertions(+), 57 deletions(-)
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 537341c8..9b5a5dd4 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -42,7 +42,7 @@ 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://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/'; //杨思瑞本地
@@ -80,7 +80,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
// axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
- axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
+ // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
// 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/'//内蒙古线上
diff --git a/src/store/index.js b/src/store/index.js
index 75e8f066..c2e7e314 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -93,6 +93,8 @@ export default new Vuex.Store({
// FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
// 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/',//中建四
ACCOUNTTYPE: [
"系统管理员",
diff --git a/src/views/projectAdmin/fourEngin/carbon/index.vue b/src/views/projectAdmin/fourEngin/carbon/index.vue
index 57b89951..166def28 100644
--- a/src/views/projectAdmin/fourEngin/carbon/index.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/index.vue
@@ -1,19 +1,13 @@
@@ -33,8 +27,8 @@ export default {