admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
金林湾大屏-顶部栏调整

See merge request !145
This commit is contained in:
袁晶琳 2023-04-14 14:46:52 +08:00
commit 89f55ab6e2
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -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'//内蒙古项目

6
src/assets/js/http.js
View File

@ -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'

5
src/views/projectAdmin/jlw/index.vue
View File

@ -5,10 +5,11 @@
<div class="leftmodel">
<img class="wetherImg" src="../../../assets/images/projectImg/sun.png" alt />
<div class="wether">{{wea}} {{tem}}</div>
<img class="logo" src="../../../assets/images/projectImg/logo.png" alt />
<!-- <img class="logo" src="../../../assets/images/projectImg/logo.png" alt /> -->
</div>
<div class="centermodel">
<h1 class="title">{{'金林湾项目监管平台'}}</h1>
<!-- <h1 class="title">{{ $store.state.currentProDetail.projectName }}</h1> -->
<h1 class="title">项目监管大屏</h1>
</div>
<div class="rightmodel">

6
src/views/projectAdmin/jlw/style.less
View File

@ -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;
}
}