diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 126cf079..10a4abea 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -72,11 +72,12 @@ if (process.env.NODE_ENV == 'development') { // 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:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 diff --git a/src/components/account.vue b/src/components/account.vue index db3c9f1c..66817933 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -70,16 +70,16 @@ class="width_100" @click="goProjectBackstage" v-if=" - $route.path.indexOf('/projectIndex') == -1 || - ($route.path.indexOf('/equipmentCenterIndx') == -1 && + $route.path.indexOf('/equipmentCenterIndx') == -1 && $store.state.userInfo.accountType != 5 && $store.state.userInfo.accountType != 6 && - $store.state.userInfo.enterProjectBackType == 0) + $store.state.userInfo.enterProjectBackType === 0 " > - {{ projectBackground }} + {{ projectBackground }} +
质量

- 待整改：{{ qualityCount.notCloseNum }} + 待整改：{{ qualityCount.rectificationNum }}

整改率：{{ qualityCount.completeRatio }}% @@ -133,7 +133,7 @@

  • 安全

    - 待整改：{{ securityCount.notRectificationNum }} + 待整改：{{ securityCount.rectificationNum }}

    整改率：{{ securityCount.completeRatio }}% @@ -583,7 +583,7 @@ export default { selectProjectWorkAndInspectCount({ projectSn: data.projectSn, }).then((res) => { - console.log(res); + console.log('大屏项目',res); if (res.code == 200) { this.personCount = res.result.personCount; this.attendancePerson = this.personCount.attendancePerson; @@ -653,7 +653,7 @@ export default { sn: this.projectSn, }; selectCompanyProjectTypeCountApi(data).then((res) => { - // console.log(res.result) + console.log('大屏顶部数据',res.result) if (res.code == 200) { this.companyProjectData = res.result; this.projectCount = res.result.count; diff --git a/src/views/companyAdmin/bigScreen/leftMenu.vue b/src/views/companyAdmin/bigScreen/leftMenu.vue index e35d56de..1aeb5e0b 100644 --- a/src/views/companyAdmin/bigScreen/leftMenu.vue +++ b/src/views/companyAdmin/bigScreen/leftMenu.vue @@ -268,6 +268,7 @@ export default { } arr.sort(sortNum) this.newProjectData = arr + console.log("项目概览数据",arr) if (this.pageType == 1 ){ this.$nextTick(()=>{ this.createEchart1(); @@ -468,6 +469,7 @@ export default { let data1 = [], data2 = [], data3 = []; + console.log("左上角数据",this.projectData) this.projectData.list.forEach((item)=>{ for(let j = 1; j < 13; j++){ if(Number(item.monthTitle.split('-')[1]) == j){ @@ -593,7 +595,7 @@ export default { } ] } - + // console.log("左上角项目概览数据",data1,data2,data3) echart1.setOption(this.option1); }, createEchart2(){ @@ -949,7 +951,7 @@ export default { .seamless-warp{ width: 100%; - height: 164px; + height: 80px; overflow: auto; li:nth-child(2n){ background: rgba(2, 251, 226, 0.07); diff --git a/src/views/companyAdmin/bigScreen/rightMenu.vue b/src/views/companyAdmin/bigScreen/rightMenu.vue index 167d5d91..b91b33ef 100644 --- a/src/views/companyAdmin/bigScreen/rightMenu.vue +++ b/src/views/companyAdmin/bigScreen/rightMenu.vue @@ -19,9 +19,10 @@

    巡检情况
    -
    暂无数据 - +
    + +
    检查总数208
    +
    @@ -29,8 +30,9 @@
    累计预警工程排行
    -
    暂无数据 - +
    + +
    diff --git a/src/views/projectAdmin/dataBoard/laborManage.vue b/src/views/projectAdmin/dataBoard/laborManage.vue index 56d6332b..fce5eb56 100644 --- a/src/views/projectAdmin/dataBoard/laborManage.vue +++ b/src/views/projectAdmin/dataBoard/laborManage.vue @@ -593,9 +593,9 @@ export default { }).then((res) => { console.log('在场人员', res) this.inSecenList = res.result - this.timer = window.setTimeout(() => { - this.selectProjectPresentWorkerList() - }, 5000) + // this.timer = window.setTimeout(() => { + // this.selectProjectPresentWorkerList() + // }, 5000) }) }, //项目人员统计 @@ -610,17 +610,17 @@ export default { var json2 = this.statisticsCount.workercount var yData1 = [ json1.age18, - json1.age18to25, - json1.age25to35, - json1.age35to45, + json1.age18to25 + json1.age25to35 + json1.age35to45, + // json1.age25to35, + // json1.age35to45, json1.age45to60, json1.age60 ] var yData2 = [ json2.age18, - json2.age18to25, - json2.age25to35, - json2.age35to45, + json2.age18to25 + json1.age25to35 + json1.age35to45, + // json2.age25to35, + // json2.age35to45, json2.age45to60, json2.age60 ] diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue index 5df1eadb..ef3bb562 100644 --- a/src/views/projectFront/highModulus/pointManage.vue +++ b/src/views/projectFront/highModulus/pointManage.vue @@ -164,8 +164,7 @@ @@ -179,8 +178,7 @@