Commit 32511e2e authored by 张牧越's avatar 张牧越

样式修正

parent fb63cf6b
NODE_ENV = "development" NODE_ENV = "development"
Mock: true Mock: true
VUE_APP_API_URL = "http://qjwl.ythplan.io/" VUE_APP_API_URL = "http://qjwl.ythplan.com/"
VUE_APP_RESOURCE_URL= "http://qjwl.ythplan.io/" VUE_APP_RESOURCE_URL= "http://qjwl.ythplan.com/"
\ No newline at end of file \ No newline at end of file
NODE_ENV = "production" NODE_ENV = "production"
Mock: false Mock: false
VUE_APP_API_URL = "http://qjwl.ythplan.io/" VUE_APP_API_URL = "http://qjwl.ythplan.com/"
VUE_APP_RESOURCE_URL= "http://qjwl.ythplan.io/" VUE_APP_RESOURCE_URL= "http://qjwl.ythplan.com/"
\ No newline at end of file \ No newline at end of file
...@@ -3,112 +3,114 @@ ...@@ -3,112 +3,114 @@
<div class="side-area"> <div class="side-area">
<Title text="项目概况"></Title> <Title text="项目概况"></Title>
<ShadowContainer> <ShadowContainer>
<div class="divider"> <div class="construction-status">
<div class="divider-line"></div> <div class="divider">
<div class="divider-text">·工程名称·</div> <div class="divider-line"></div>
<div class="divider-line"></div> <div class="divider-text">·工程名称·</div>
</div> <div class="divider-line"></div>
<div class="construction-name">{{ screenDetail.project_name }}</div>
<div class="construction-details">
<div class="construction-detail">
<div class="data">{{ screenDetail.project_cost }}</div>
<div class="text">工程造价(万元)</div>
</div>
<div class="construction-detail">
<div class="data">{{ screenDetail.build_area }}</div>
<div class="text">建筑面积(㎡)</div>
</div> </div>
<div class="construction-detail"> <div class="construction-name">{{ screenDetail.project_name }}</div>
<div class="data small"> <div class="construction-details">
{{ <div class="construction-detail">
screenDetail.manageList && <div class="data">{{ screenDetail.project_cost }}</div>
screenDetail.manageList[0] && <div class="text">工程造价(万元)</div>
screenDetail.manageList[0].person_name
}}
<br />
{{
screenDetail.manageList &&
screenDetail.manageList[0] &&
screenDetail.manageList[0].person_mobile
}}
</div> </div>
<div class="text">项目经理</div> <div class="construction-detail">
</div> <div class="data">{{ screenDetail.build_area }}</div>
</div> <div class="text">建筑面积(㎡)</div>
<div class="divider">
<div class="divider-line"></div>
<div class="divider-text">·建造单位·</div>
<div class="divider-line"></div>
</div>
<div class="unit-scroll">
<div class="unit">
<div>
<div class="dot"></div>
<span class="unit-text">建设单位:</span>
</div> </div>
<div> <div class="construction-detail">
<div <div class="data small">
v-for="(unit, index) in screenDetail.unitList.jsList" {{
:key="index" screenDetail.manageList &&
style="margin-bottom: 12px" screenDetail.manageList[0] &&
> screenDetail.manageList[0].person_name
<div class="unit-name">{{ unit.company_name }}</div> }}
<div class="unit-contact"> <br />
{{ unit.contact_person }}({{ unit.contact_mobile }}) {{
</div> screenDetail.manageList &&
screenDetail.manageList[0] &&
screenDetail.manageList[0].person_mobile
}}
</div> </div>
<div class="text">项目经理</div>
</div> </div>
</div> </div>
<div class="unit"> <div class="divider">
<div> <div class="divider-line"></div>
<div class="dot"></div> <div class="divider-text">·建造单位·</div>
<span class="unit-text">施工单位:</span> <div class="divider-line"></div>
</div> </div>
<div> <div class="unit-scroll">
<div <div class="unit">
v-for="(unit, index) in screenDetail.unitList.sgList" <div>
:key="index" <div class="dot"></div>
style="margin-bottom: 12px" <span class="unit-text">建设单位:</span>
> </div>
<div class="unit-name">{{ unit.company_name }}</div> <div>
<div class="unit-contact"> <div
{{ unit.contact_person }}({{ unit.contact_mobile }}) v-for="(unit, index) in screenDetail.unitList.jsList"
:key="index"
style="margin-bottom: 12px"
>
<div class="unit-name">{{ unit.company_name }}</div>
<div class="unit-contact">
{{ unit.contact_person }}({{ unit.contact_mobile }})
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="unit">
<div class="unit"> <div>
<div> <div class="dot"></div>
<div class="dot"></div> <span class="unit-text">施工单位:</span>
<span class="unit-text">监理单位:</span> </div>
</div> <div>
<div> <div
<div v-for="(unit, index) in screenDetail.unitList.sgList"
v-for="(unit, index) in screenDetail.unitList.jlList" :key="index"
:key="index" style="margin-bottom: 12px"
style="margin-bottom: 12px" >
> <div class="unit-name">{{ unit.company_name }}</div>
<div class="unit-name">{{ unit.company_name }}</div> <div class="unit-contact">
<div class="unit-contact"> {{ unit.contact_person }}({{ unit.contact_mobile }})
{{ unit.contact_person }}({{ unit.contact_mobile }}) </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="unit">
<div class="unit"> <div>
<div> <div class="dot"></div>
<div class="dot"></div> <span class="unit-text">监理单位:</span>
<span class="unit-text">设计单位:</span> </div>
<div>
<div
v-for="(unit, index) in screenDetail.unitList.jlList"
:key="index"
style="margin-bottom: 12px"
>
<div class="unit-name">{{ unit.company_name }}</div>
<div class="unit-contact">
{{ unit.contact_person }}({{ unit.contact_mobile }})
</div>
</div>
</div>
</div> </div>
<div> <div class="unit">
<div <div>
v-for="(unit, index) in screenDetail.unitList.sjList" <div class="dot"></div>
:key="index" <span class="unit-text">设计单位:</span>
style="margin-bottom: 12px" </div>
> <div>
<div class="unit-name">{{ unit.company_name }}</div> <div
<div class="unit-contact"> v-for="(unit, index) in screenDetail.unitList.sjList"
{{ unit.contact_person }}({{ unit.contact_mobile }}) :key="index"
style="margin-bottom: 12px"
>
<div class="unit-name">{{ unit.company_name }}</div>
<div class="unit-contact">
{{ unit.contact_person }}({{ unit.contact_mobile }})
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -131,7 +133,7 @@ ...@@ -131,7 +133,7 @@
<img class="rt" src="@/assets/rt.png" alt="" /> <img class="rt" src="@/assets/rt.png" alt="" />
<img class="rb" src="@/assets/rb.png" alt="" /> <img class="rb" src="@/assets/rb.png" alt="" />
<img class="lb" src="@/assets/lb.png" alt="" /> <img class="lb" src="@/assets/lb.png" alt="" />
<el-carousel :interval="5000" arrow="always" height="48vh"> <el-carousel :interval="5000" arrow="always" height="600px">
<el-carousel-item <el-carousel-item
v-for="(item, index) in screenDetail.plane_image_arr" v-for="(item, index) in screenDetail.plane_image_arr"
:key="index" :key="index"
...@@ -494,7 +496,9 @@ export default { ...@@ -494,7 +496,9 @@ export default {
} }
}); });
getProgressDetail().then((res) => { getProgressDetail().then((res) => {
this.progressDetail = res.data; if (res.status == 200) {
this.progressDetail = res.data;
}
}); });
}, },
}, },
...@@ -632,13 +636,13 @@ export default { ...@@ -632,13 +636,13 @@ export default {
width: 40%; width: 40%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
top: 19%; top: 17%;
} }
} }
#security-chart, #security-chart,
#quality-chart { #quality-chart {
width: 100%; width: 100%;
height: 400px; height: 370px;
} }
.steps { .steps {
padding-top: 40px; padding-top: 40px;
...@@ -717,7 +721,7 @@ export default { ...@@ -717,7 +721,7 @@ export default {
position: relative; position: relative;
.container-img { .container-img {
width: 100%; width: 100%;
height: 48vh; height: calc(100vh - 500px);
vertical-align: top; vertical-align: top;
} }
.lt, .lt,
...@@ -783,4 +787,7 @@ export default { ...@@ -783,4 +787,7 @@ export default {
max-height: 200px; max-height: 200px;
overflow: scroll; overflow: scroll;
} }
.construction-status {
min-height: 380px;
}
</style> </style>
\ No newline at end of file
...@@ -458,7 +458,7 @@ export default { ...@@ -458,7 +458,7 @@ export default {
} }
.warp { .warp {
width: 100%; width: 100%;
height: 680px; height: 660px;
overflow: hidden; overflow: hidden;
} }
.person-check { .person-check {
...@@ -512,7 +512,7 @@ export default { ...@@ -512,7 +512,7 @@ export default {
} }
#warning-chart { #warning-chart {
width: 100%; width: 100%;
height: 300px; height: 280px;
} }
.total-chart { .total-chart {
display: flex; display: flex;
......
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
</ShadowContainer> </ShadowContainer>
<Title text="扬尘噪音"></Title> <Title text="扬尘噪音"></Title>
<ShadowContainer> <ShadowContainer>
<div style="height: 590px"> <div style="height: 570px">
<div <div
class="noise-monitor" class="noise-monitor"
v-for="(monitor, index) in noiseMonitors" v-for="(monitor, index) in noiseMonitors"
...@@ -615,7 +615,7 @@ export default { ...@@ -615,7 +615,7 @@ export default {
display: flex; display: flex;
font-size: 14px; font-size: 14px;
color: #c6def9; color: #c6def9;
padding: 4px; padding: 3px;
.slider { .slider {
width: 70%; width: 70%;
vertical-align: top; vertical-align: top;
...@@ -642,7 +642,7 @@ export default { ...@@ -642,7 +642,7 @@ export default {
} }
#aqi-chart { #aqi-chart {
width: 100%; width: 100%;
height: 234px; height: 214px;
} }
.monitor { .monitor {
display: flex; display: flex;
......
...@@ -614,8 +614,11 @@ export default { ...@@ -614,8 +614,11 @@ export default {
.status-count { .status-count {
background: url("@/assets/realname/rect.png") no-repeat; background: url("@/assets/realname/rect.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
padding: 12px 20px; padding: 10px 20px;
margin-bottom: 20px; margin-bottom: 20px;
&:last-child {
margin-bottom: 0;
}
.status-img { .status-img {
width: 120px; width: 120px;
} }
...@@ -658,7 +661,7 @@ export default { ...@@ -658,7 +661,7 @@ export default {
} }
} }
.warp { .warp {
height: 475px; height: 480px;
overflow: hidden; overflow: hidden;
} }
.person-check { .person-check {
...@@ -707,7 +710,7 @@ export default { ...@@ -707,7 +710,7 @@ export default {
} }
#area-chart { #area-chart {
width: 100%; width: 100%;
height: 300px; height: 270px;
} }
.chart-title { .chart-title {
background: rgba(40, 137, 195, 0.2); background: rgba(40, 137, 195, 0.2);
...@@ -731,7 +734,7 @@ export default { ...@@ -731,7 +734,7 @@ export default {
} }
#in-out-chart { #in-out-chart {
width: 100%; width: 100%;
height: 300px; height: 270px;
} }
.i-type { .i-type {
display: flex; display: flex;
...@@ -773,7 +776,7 @@ export default { ...@@ -773,7 +776,7 @@ export default {
transform: translateY(-50%) translateX(-50%); transform: translateY(-50%) translateX(-50%);
} }
.work-types { .work-types {
max-height: 300px; max-height: 270px;
overflow-y: scroll; overflow-y: scroll;
} }
</style> </style>
\ No newline at end of file
...@@ -439,7 +439,7 @@ export default { ...@@ -439,7 +439,7 @@ export default {
position: relative; position: relative;
.container-img { .container-img {
width: 100%; width: 100%;
height: 88vh; height: 960px;
vertical-align: top; vertical-align: top;
} }
.lt, .lt,
...@@ -542,7 +542,7 @@ export default { ...@@ -542,7 +542,7 @@ export default {
} }
.warn-message { .warn-message {
position: relative; position: relative;
height: 400px; height: 420px;
.warn-icon { .warn-icon {
position: absolute; position: absolute;
left: 50%; left: 50%;
......
...@@ -64,7 +64,7 @@ request.interceptors.response.use( ...@@ -64,7 +64,7 @@ request.interceptors.response.use(
}) })
} }
if (response.data.status == 401) { if (response.data.status == 401) {
window.location.href = process.env.VUE_APP_RESOURCE_URL + 'pweb/m/login' // window.location.href = process.env.VUE_APP_RESOURCE_URL + 'pweb/m/login'
} }
return response.data return response.data
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment