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-23 13:01:40 +08:00
commit d35ca96cd7
6 changed files with 84 additions and 48 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 = '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') {

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://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://101.43.164.214:11111/' // 百色三标段项目
axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址

9
src/views/projectAdmin/fourEngin/command/leftOne.vue
View File

@ -16,11 +16,11 @@
<div style="margin-left: 72px; margin-top: 5px">广州分公司SOM建筑设计事务所</div>
<div style="margin-left: 72px; margin-top: 5px">广东省建筑设计研究院有限公司</div>
</div>
<!-- <div v-if="COMPANY == 'zjsj' && projectSn != nowProjectSn && projectSn != gzProjectSn">设计单位:德国gmp建筑师事务所 (方案设计)</div> -->
<div v-if="COMPANY == 'zjsj' && projectSn != nowProjectSn && projectSn != gzProjectSn">设计单位:中国建筑西南设计研究院有限公司</div>
<!-- <p v-if="COMPANY == 'zjsj' && projectSn != nowProjectSn && projectSn != gzProjectSn" style="margin-left: 70px; margin-top: 9px">
<div v-if="COMPANY == 'zjsj' && projectSn != nowProjectSn && projectSn != gzProjectSn && projectSn != zhtProjectSn">设计单位:德国gmp建筑师事务所 (方案设计)</div>
<p v-if="COMPANY == 'zjsj' && projectSn != nowProjectSn && projectSn != gzProjectSn && projectSn != zhtProjectSn" style="margin-left: 70px; margin-top: 9px">
中国建筑第四工程局有限公司 (施工图设计)
</p> -->
</p>
<div v-if="COMPANY == 'zjsj' && projectSn === zhtProjectSn">设计单位:中国建筑西南设计研究院有限公司</div>
<div v-if="COMPANY == 'pssh'">设计单位:香港华艺设计顾问（深圳）有限公司</div>
<div style="margin-top: 10px">总包单位:{{ list.bidWinner }}</div>
</div>
@ -40,6 +40,7 @@ export default {
COMPANY: COMPANY,
nowProjectSn: '62622728E8EF4F97AA24E43DA97D584A',
gzProjectSn: '3E4B980B04A9410685EE9E205F356C01',
zhtProjectSn: 'D5144AFEEA41403D8CE4A00A59905217',
projectSn: ''
}),
created() {

5
src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
View File

@ -100,6 +100,7 @@ export default {
data() {
return {
projectSn: "",
zhtProjectSn: 'D5144AFEEA41403D8CE4A00A59905217',
projectData: {
constructionStage: 10,
},
@ -131,9 +132,11 @@ export default {
// this.state = res.result.constructionStage
this.state = 3;
if (this.COMPANY == "zjsj") {
this.state = 4;
}
if (this.COMPANY == "zjsj" && this.projectSn === this.zhtProjectSn) {
this.state = 3;
}
console.log("999999999999999", this.state, res);
});
},

6
src/views/projectAdmin/fourEngin/command/leftThree/index.vue
View File

@ -4,6 +4,7 @@
<vue-scroll :ops="ops" ref="stageScroll">
<Process v-if="projectSn == gzProjectSn" style="transform: translateX(0)" :list="stageList3" />
<Process v-if="projectSn == nowProjectSn" style="transform: translateX(0)" :list="stageList2" />
<Process v-if="COMPANY == 'zjsj' && projectSn == zhtProjectSn" style="transform: translateX(0)" :list="stageList_zht" />
<Process v-if="COMPANY == 'zjsj' && projectSn != nowProjectSn && projectSn != gzProjectSn" style="transform: translateX(0)" :list="stageList" />
<Process v-if="COMPANY == 'pssh'" style="transform: translateX(0)" :listPssh="stageListPssh" />
</vue-scroll>
@ -28,6 +29,7 @@ export default {
nowProjectSn: '62622728E8EF4F97AA24E43DA97D584A',
gzProjectSn: '3E4B980B04A9410685EE9E205F356C01',
projectSn: '',
zhtProjectSn: 'D5144AFEEA41403D8CE4A00A59905217',
COMPANY: COMPANY,
// projectData.constructionStage
// stageList: this.$t('message.companyDiagram.CONSTRUCTIONSTAGE'),
@ -47,7 +49,7 @@ export default {
13: '消防验收',
14: '竣工验收完成'
},
stageList: [
stageList_zht: [
{
id: 1,
name: '开工',
@ -85,7 +87,7 @@ export default {
}
],
// 2024.3.15由stageList改为stageList_last
stageList_last: [
stageList: [
{
id: 1,
name: '开工',

104
src/views/projectAdmin/fourEngin/command/leftTwo.vue
View File

@ -20,8 +20,9 @@
</div>
<div class="row1" v-if="COMPANY == 'zjsj'">
<div>
满足招文要求, 广州市建设工程结构优质奖,
<div>广东省建设工程优质结构奖, 争创广东省建设
满足招文要求, 广州市建设工程结构优质奖,
<div>
广东省建设工程优质结构奖, 争创广东省建设
<div>工程金匠奖,国家优质工程奖</div>
</div>
</div>
@ -33,8 +34,8 @@
</div>
<div>
整体获国家绿色建筑二星级认证,塔楼A及塔楼B获LEED-CS铂金、WELLCORE铂金绿色建筑认证; 裙楼获LEED-CS金、WELLCORE金
绿色建筑认证
整体获国家绿色建筑二星级认证,塔楼A及塔楼B获LEED-CS铂金、WELLCORE铂金绿色建筑认证;
裙楼获LEED-CS金、WELLCORE金 绿色建筑认证
</div>
</div>
</vue-scroll>
@ -43,15 +44,19 @@
<vue-scroll style="width: 95%">
<div class="row" v-if="COMPANY == 'zjsj'">
<div class="td">质量</div>
<div class="td" style="margin-top: 38px">安全</div>
<div class="td" style="margin-top: 55px">党建</div>
<div class="td" style="margin-top: 38px">安全</div>
<div class="td" style="margin-top: 55px">党建</div>
<!-- <div class="td" style="margin-top: 55px"></div> -->
</div>
<div class="row1" v-if="COMPANY == 'zjsj'">
<div>确保南京市“金陵杯”,江苏省“扬子杯”,<span>争创“鲁班奖”</span></div>
<div>
确保南京市“金陵杯”,江苏省“扬子杯”,<span>争创“鲁班奖”</span>
</div>
<div>
江苏省建筑施工标准化星级工地(三星),<span>建设工程项目施工安全生产标准化工地,</span>
江苏省建筑施工标准化星级工地(三星),<span
>建设工程项目施工安全生产标准化工地,</span
>
<span>确保江苏省建筑业绿色施工(示范)工程。</span>
</div>
@ -59,16 +64,40 @@
</div>
</vue-scroll>
</div>
<div class="tbody" v-if="projectSn != gzProjectSn && projectSn != nowProjectSn">
<div
class="tbody"
v-if="projectSn != gzProjectSn && projectSn != nowProjectSn"
>
<vue-scroll style="width: 95%">
<!-- <div style="display: flex;"> -->
<div>
<table class="zjsj-target">
<tr><td class="target-1">质量目标</td><td class="target-2">确保省优质奖，争创鲁班奖（国优）</td></tr>
<tr><td class="target-1">安全目标</td><td class="target-2">确保双优工程、争创AAA工地</td></tr>
<tr><td class="target-1">设计目标</td><td class="target-2">绿建三星、EarthCheck银奖认证、省部级勘察设计奖</td></tr>
<tr><td class="target-1">科技目标</td><td class="target-2">省科技、省绿色施工示范工程，局、集团科技示范项目</td></tr>
</table>
<div style="display: flex;margin-top: 15px;">
<table class="zjsj-target" v-if="projectSn === zhtProjectSn">
<tr><td class="target-1">质量目标</td><td class="target-2">确保省优质奖，争创鲁班奖（国优）</td></tr>
<tr><td class="target-1">安全目标</td><td class="target-2">确保双优工程、争创AAA工地</td></tr>
<tr><td class="target-1">设计目标</td><td class="target-2">绿建三星、EarthCheck银奖认证、省部级勘察设计奖</td></tr>
<tr><td class="target-1">科技目标</td><td class="target-2">省科技、省绿色施工示范工程，局、集团科技示范项目</td></tr>
</table>
<!-- <table class="zjsj-target">
<tr><td class="target-1">绿色建筑</td><td class="target-2">近零能耗建筑 绿建三星 LEED金级 WELL金级</td></tr>
<tr><td class="target-1">智慧建筑</td><td class="target-2">省级智慧建造试点项目</td></tr>
<tr><td class="target-1">装配式建筑</td><td class="target-2">AAA装配式建筑</td></tr>
<tr><td class="target-1">质量</td><td class="target-2">鲁班奖</td></tr>
<tr><td class="target-1">安全</td><td class="target-2">全国建设工程施工安全生产标准化工地</td></tr>
</table> -->
<div class="row" v-if="COMPANY == 'zjsj' && projectSn !== zhtProjectSn">
<div class="td">绿色建筑</div>
<div class="td">智慧建筑</div>
<div class="td">装配式建筑</div>
<div class="td">质量</div>
<div class="td">安全</div>
</div>
<div class="row1" v-if="COMPANY == 'zjsj' && projectSn !== zhtProjectSn">
<div>近零能耗建筑 绿建三星 LEED金级 WELL金级</div>
<div style="margin-left: 0px">省级智慧建造试点项目</div>
<div>AAA装配式建筑</div>
<div>鲁班奖</div>
<!-- <div>(注释解开，需注释此个div)获得省建筑业绿色施工示范工程、省房屋市政工程安全生产文明施工示范工地证书</div> -->
<div>全国建设工程施工安全生产标准化工地</div>
</div>
<!-- <div class="" v-if="COMPANY == 'zjsj'">
<div class="td">质量目标</div>
<div class="td">安全目标</div>
@ -82,7 +111,7 @@
<div style="margin-left: -20px">省新技术示范、省绿色施工示范、局科技应用示范</div>
</div> -->
</div>
<div class="row" v-if="COMPANY == 'pssh'">
<div class="td">质量目标</div>
<div class="td">安全目标</div>
@ -118,8 +147,8 @@
</template>
<script>
import Card from '../components/Card.vue'
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
import Card from "../components/Card.vue";
import { listProjectInfo } from "@/assets/js/api/zhongjianFourth";
export default {
components: { Card },
@ -127,38 +156,39 @@ export default {
return {
list: {},
COMPANY: COMPANY,
nowProjectSn: '62622728E8EF4F97AA24E43DA97D584A',
gzProjectSn: '3E4B980B04A9410685EE9E205F356C01',
projectSn: ''
}
nowProjectSn: "62622728E8EF4F97AA24E43DA97D584A",
gzProjectSn: "3E4B980B04A9410685EE9E205F356C01",
zhtProjectSn: "D5144AFEEA41403D8CE4A00A59905217",
projectSn: "",
};
},
created() {
this.projectSn = this.$store.state.projectSn
this.getList()
this.projectSn = this.$store.state.projectSn;
this.getList();
},
methods: {
/** 查询列表 */
getList() {
listProjectInfo({ projectSn: this.projectSn }).then(res => {
this.list = res.result
console.log('项目信息11111: ', this.list)
})
}
}
}
listProjectInfo({ projectSn: this.projectSn }).then((res) => {
this.list = res.result;
console.log("项目信息11111: ", this.list);
});
},
},
};
</script>
<style lang="less" scoped>
.zjsj-target{
.zjsj-target {
width: 100%;
padding: 10px 10px;
font-size: 16px;
.target-1{
.target-1 {
width: 18%;
height: 40px;
line-height: 40px;
}
.target-2{
.target-2 {
font-size: 14px;
width: 82%;
}
@ -251,7 +281,7 @@ export default {
// text-overflow: ellipsis;
// overflow: hidden;
// white-space: nowrap;
margin: 20px 0 20px 0;
margin: 0px 0 20px 0;
}
// img {