diff --git a/src/assets/i18n/langs/cn/energyManage.js b/src/assets/i18n/langs/cn/energyManage.js index 03cd8577..a3eefa1e 100644 --- a/src/assets/i18n/langs/cn/energyManage.js +++ b/src/assets/i18n/langs/cn/energyManage.js @@ -168,6 +168,8 @@ export default { pageTitle:'本项目运单', feedCompany:'供料单位', useCompany:'用料单位', + supplierEvaluation:'供应商评价', + performanceAnalysis:'履约分析', chooseCompany:'选择单位', fromRootChoose:'从总企业选择', fromProjectChoose:'从项目企业选择', diff --git a/src/assets/i18n/langs/cn/laborManage/laborDev.js b/src/assets/i18n/langs/cn/laborManage/laborDev.js index 18191ca6..c19244d9 100644 --- a/src/assets/i18n/langs/cn/laborManage/laborDev.js +++ b/src/assets/i18n/langs/cn/laborManage/laborDev.js @@ -21,7 +21,8 @@ export default { projectAppKey: '项目AppKey', // devTypeList: ['杭州宇泛智能科技', '用jdpush推送', 'mqtt', '芊熠智能'], // devTypeList: [{name:'杭州宇泛智能科技',id:1},{name:'芊熠智能',id:4},{name:'佳信捷第一版',id:5},{name:'佳信捷',id:6}], - devTypeList: [{name:'定制YF',id:1},{name:'定制QY',id:4},{name:'通用V2',id:5},{name:'通用V1',id:6}], + // devTypeList: [{name:'定制YF',id:1},{name:'定制QY',id:4},{name:'通用V2',id:5},{name:'通用V1',id:6}], //找不到最新版本所以更改了通用v1v2 + devTypeList: [{name:'定制YF',id:1},{name:'定制QY',id:4},{name:'通用V1',id:5},{name:'通用V2',id:6}], devGroupTypeList: [{name:'工地区',id:1},{name:'生活区',id:2},{name:'项目部',id:3}], devTypeLabel: '设备类型', noData: '暂无数据', @@ -35,6 +36,7 @@ export default { blackNames: '黑名单人员', isSendToDev:'是否下发到设备', uploadToGover:'上传到住建局', + uploadToOuter:'上传外部平台', //黑名单管理----end //安全培训教育管理----start diff --git a/src/assets/js/http.js b/src/assets/js/http.js index cf93802b..65377c16 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -76,6 +76,8 @@ else if (process.env.NODE_ENV == 'debug') { // axios.defaults.baseURL = 'http://zhgd.loganwy.com/' } +axios.defaults.baseURL = 'http://139.9.66.234:8/' + // tag: 河南 if (COMPANY == 'henan') { axios.defaults.baseURL = 'http://124.71.178.44:100/' diff --git a/src/views/projectAdmin/dataBoardTwo/dataBoard.vue b/src/views/projectAdmin/dataBoardTwo/dataBoard.vue index a89d1c89..d77ead66 100644 --- a/src/views/projectAdmin/dataBoardTwo/dataBoard.vue +++ b/src/views/projectAdmin/dataBoardTwo/dataBoard.vue @@ -1,7 +1,7 @@ @@ -2458,8 +2458,8 @@ export default { data.menuList.forEach((item)=>{ if(item.actionList){ item.actionList.forEach((item2)=>{ - if(item2.status = 'akey_issued'){ - this.key == true + if(item2.actionCode == 'akey_issued'){ + this.key = true } }) } diff --git a/src/views/projectFront/laborManage/roster.vue b/src/views/projectFront/laborManage/roster.vue index dc925779..08aea33a 100644 --- a/src/views/projectFront/laborManage/roster.vue +++ b/src/views/projectFront/laborManage/roster.vue @@ -152,8 +152,10 @@