From 269295c841129da40e1920f8ef291f5d543cd374 Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Fri, 14 Apr 2023 14:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9E=97=E6=B9=BE=E5=A4=A7=E5=B1=8F-?=
=?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=A0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/js/config.js | 4 ++--
src/assets/js/http.js | 6 +++---
src/views/projectAdmin/jlw/index.vue | 5 +++--
src/views/projectAdmin/jlw/style.less | 6 ++++--
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/public/js/config.js b/public/js/config.js
index c2af2faa..ac71fcbb 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,4 +1,4 @@
-// var COMPANY = ''; //通用
+var COMPANY = ''; //通用
// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
// var COMPANY='hezhan'; //合展-宿迁
// var COMPANY='nanchang'; //南昌地铁、衢州
@@ -9,7 +9,7 @@
// COMPANY = 'xingxuan'
// COMPANY = 'hengtong'//瑞士恒通
// COMPANY = 'yunlian'//云联万物
-COMPANY = 'neimenggu'//内蒙古项目
+// COMPANY = 'neimenggu'//内蒙古项目
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 6a89d612..4152301e 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -80,10 +80,10 @@ 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://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://101.43.164.214:12345/'//内蒙古线上
+ axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'
diff --git a/src/views/projectAdmin/jlw/index.vue b/src/views/projectAdmin/jlw/index.vue
index 0c8c29ad..50439dba 100644
--- a/src/views/projectAdmin/jlw/index.vue
+++ b/src/views/projectAdmin/jlw/index.vue
@@ -5,10 +5,11 @@
{{wea}} {{tem}}
-
+
-
{{'金林湾项目监管平台'}}
+
+ 项目监管大屏
diff --git a/src/views/projectAdmin/jlw/style.less b/src/views/projectAdmin/jlw/style.less
index edcee04e..fc6f3521 100644
--- a/src/views/projectAdmin/jlw/style.less
+++ b/src/views/projectAdmin/jlw/style.less
@@ -19,6 +19,7 @@
align-items: center;
.leftmodel{
flex: 1;
+ margin-top: 5px;
.wetherImg{
margin-left:10px;
}
@@ -35,9 +36,10 @@
.centermodel{
flex: 1;
.title{
- margin-top: 25px;
+ margin-top: -3px;
color: #fcfcfc;
- margin-left: 40px;
+ margin-left: 90px;
+ position: absolute;
}
}