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

Merge branch 'dev-cjw' into shenzhen-dev

Browse Source
This commit is contained in:
vce 2024-03-22 17:56:32 +08:00
commit 24a75f18e3
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -11,7 +11,7 @@ var COMPANY = '' //通用
// COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'hengtong'//瑞士恒通
// COMPANY = 'yunlian'//云联万物 // COMPANY = 'yunlian'//云联万物
// COMPANY = 'neimenggu'//内蒙古项目 // COMPANY = 'neimenggu'//内蒙古项目
COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjsj'//中建四局
// COMPANY = 'zjwj'//中建五局 // COMPANY = 'zjwj'//中建五局
// COMPANY = 'sccr'//四川成润 // COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目 // COMPANY = 'pssh'//坪山沙湖项目
@ -26,7 +26,7 @@ var PROJECT = {
online_gxlt: 'gxlt', // 广西联通 online_gxlt: 'gxlt', // 广西联通
} }
var PROJECT_TYPE = PROJECT.online_zjsj var PROJECT_TYPE = PROJECT.local_test
var headerShow = true // 是否显示头部 var headerShow = true // 是否显示头部
var tabsShow = true // 是否显示tabs var tabsShow = true // 是否显示tabs
if (COMPANY == 'xingxuan') { if (COMPANY == 'xingxuan') {

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

@ -88,8 +88,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址

3
src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue
View File

@ -206,7 +206,8 @@ export default {
// pageSize: this.pagInfo.pageSize, // pageSize: this.pagInfo.pageSize,
pageSize: 100000, pageSize: 100000,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
personType: 1 // personType: 1,
inserviceType: 1
}).then(result => { }).then(result => {
if (result.success) { if (result.success) {
this.workerList = result.result.records this.workerList = result.result.records

3
src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
View File

@ -201,7 +201,8 @@ export default {
// pageSize: this.pagInfo.pageSize, // pageSize: this.pagInfo.pageSize,
pageSize: 100000, pageSize: 100000,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
personType: 1 // personType: 1
inserviceType: 1
}).then(result => { }).then(result => {
if (result.success) { if (result.success) {
this.workerList = result.result.records this.workerList = result.result.records