diff --git a/public/js/config.js b/public/js/config.js
index b5d0e08e..fde19c6d 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -11,7 +11,7 @@ var COMPANY = '' //通用
// COMPANY = 'hengtong'//瑞士恒通
// COMPANY = 'yunlian'//云联万物
// COMPANY = 'neimenggu'//内蒙古项目
-// COMPANY = 'zjsj'//中建四局
+COMPANY = 'zjsj'//中建四局
// COMPANY = 'zjwj'//中建五局
// COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目
@@ -26,7 +26,7 @@ var PROJECT = {
online_gxlt: 'gxlt', // 广西联通
}
-var PROJECT_TYPE = PROJECT.local_test
+var PROJECT_TYPE = PROJECT.online_zjsj
var headerShow = true // 是否显示头部
var tabsShow = true // 是否显示tabs
if (COMPANY == 'xingxuan') {
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 1b2b505a..15309b9e 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -83,13 +83,13 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
- axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+ // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// 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/'//中建四局(沙湖)线上（最新）地址
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue
index 533233e8..474ef96a 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue
@@ -103,6 +103,7 @@ export default {
Object.keys(pollingData).forEach((key) => {
pollingData[key] = res.result[key]
})
+ console.log('安全管理:=======2 ', pollingData)
pollingData.days = pollingData.constructionDay.toString()
console.log('pollingData.days', pollingData.days)
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
index 9a817ea4..ee415313 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
@@ -131,7 +131,7 @@ export default {
// this.state = res.result.constructionStage
this.state = 3;
if (this.COMPANY == "zjsj") {
- this.state = 4;
+ this.state = 3;
}
console.log("999999999999999", this.state, res);
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
index 2cfd43a0..c73380ab 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
@@ -48,6 +48,44 @@ export default {
14: '竣工验收完成'
},
stageList: [
+ {
+ id: 1,
+ name: '开工',
+ Time: '2023-01-06'
+ },
+ {
+ id: 2,
+ name: '地下室结构施工',
+ Time: '2024-01-20'
+ },
+ {
+ id: 3,
+ name: '2#楼地上结构施',
+ Time: '2024-07-30'
+ },
+ {
+ id: 4,
+ name: '1#楼地上结构施',
+ Time: '2024-11-15'
+ },
+ {
+ id: 5,
+ name: '幕墙施工',
+ Time: '2025-03-18'
+ },
+ {
+ id: 6,
+ name: '机电安装施工',
+ Time: '2025-04-24'
+ },
+ {
+ id: 7,
+ name: '装饰装修工程',
+ Time: '2025-08-02'
+ }
+ ],
+ // 2024.3.15由stageList改为stageList_last
+ stageList_last: [
{
id: 1,
name: '开工',
diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue
index 2c97eb37..f54ccc74 100644
--- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue
@@ -72,8 +72,9 @@
近零能耗建筑 绿建三星 LEED金级 WELL金级
省级智慧建造试点项目
AAA装配式建筑
- 鲁班奖
- 全国建设工程施工安全生产标准化工地
+
+ 广东省建设工程优质奖、争创鲁班奖（国优）
+ 获得省建筑业绿色施工示范工程、省房屋市政工程安全生产文明施工示范工地证书
质量目标
@@ -205,13 +206,12 @@ export default {
.row1 {
// float: right;
// // margin: -203px 83px 0px 0px;
- font-size: 16px;
+ font-size: 13px;
// &:not(:last-child) {
// margin-bottom: 12px;
// display: flow-root;
// // margin-right: 120px;
// }
-
div {
// text-align: center;
@@ -230,7 +230,7 @@ export default {
// text-overflow: ellipsis;
// overflow: hidden;
// white-space: nowrap;
- margin: 20px 0 20px 0;
+ margin: 23px 0 20px 0;
}
// img {