Skip to content

D
digital-construction
Commit 1a10b267 authored by 张牧越's avatar 张牧越
Browse files
Options

bugfix

parent bf602083
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 129 deletions
.env.development
View file @ 1a10b267
NODE_ENV = "development"
Mock: true
VUE_APP_API_URL = "http://qjwl.ythplan.com/"
VUE_APP_API_URL = " http://cmhv8b.natappfree.cc"
dist.zip 0 → 100644
View file @ 1a10b267
File added
src/api/index.js
View file @ 1a10b267
import request from "@/utils/request"
import noLoadingrequest from "@/utils/request"
import noLoadingrequest from "@/utils/noloadingRequest"
export function getXAccessToken(token) {
return request({
......@@ -245,7 +245,7 @@ export function getNoiseDeviceList(params) {
}
export function getCurrentMonitorStatis(params) {
return request({
return noLoadingrequest({
url: '/pweb/s/env/realtime/data',
method: 'get',
params
......
src/components/Index.vue
View file @ 1a10b267
......@@ -160,13 +160,14 @@ export default {
},
bodyScale() {
var deviceHeight = window.screen.height;
// var deviceWidth = window.screen.width;
var scale = deviceHeight / 1250; // height:550=2100 height:720=1680 height:940=1250 height:2160=1080
var pixelHeights = document.body.clientHeight;
var minus = pixelHeights - deviceHeight;
console.log(minus);
var scale = deviceHeight / 1220; // height:550=2100 height:720=1680 height:940=1220 height:2160=1080
// var canvasScale = deviceWidth / 1920;
// 1.777778 16:9 1080
//1.6 16:10 1100
// 1.547 1728:890 1350
console.log(window.screen.width / window.screen.height);
document.body.style.zoom = scale;
document.styleSheets[document.styleSheets.length - 1].insertRule(
"canvas:not(.amap-layer):not(.amap-labels) {zoom: " +
......
src/components/construction/Index.vue
View file @ 1a10b267
......@@ -545,6 +545,7 @@ export default {
display: flex;
justify-content: space-between;
height: 100%;
padding-bottom: 0;
}
.side-area {
width: 25%;
......
src/components/earlywarning/Index.vue
View file @ 1a10b267
......@@ -509,6 +509,7 @@ export default {
<style lang="less" scoped>
#earlywarning {
padding: 12px 20px;
padding-bottom: 0;
}
.top-stauts {
display: flex;
......
src/components/elevator/Index.vue
View file @ 1a10b267
......@@ -401,6 +401,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
}
.side-area {
width: 25%;
......
src/components/fallprotection/Index.vue
View file @ 1a10b267
......@@ -199,7 +199,7 @@ export default {
methods: {
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
})
......@@ -211,10 +211,10 @@ export default {
zoom: 20,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
console.log(document.getElementById("amap-container").style);
document.getElementById("amap-container").style.zoom = 1 / scale;
});
......@@ -421,6 +421,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
}
.side-area {
width: 25%;
......
src/components/management/Index.vue
View file @ 1a10b267
......@@ -225,7 +225,7 @@ export default {
},
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
})
......@@ -237,11 +237,11 @@ export default {
zoom: 19,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.map.on("click", () => {});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
document.getElementById("amap-container").style.zoom = 1 / scale;
});
})
......@@ -287,6 +287,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
}
.side-area {
width: 25%;
......
src/components/management/sampleDialog.vue
View file @ 1a10b267
......@@ -74,7 +74,7 @@ export default {
},
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
}).then((AMap) => {
......@@ -85,10 +85,10 @@ export default {
zoom: 20,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
document.getElementById("sample-map-container").style.zoom =
1 / scale;
});
......
src/components/noise/Index.vue
View file @ 1a10b267
......@@ -31,7 +31,11 @@
<div class="mid-area">
<Title text="实时监测" type="long"></Title>
<ShadowContainer>
<div id="stats-container">
<div
id="stats-container"
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.8)"
>
<div class="temp">
<div class="text">温度/℃</div>
<div class="value" style="color: #ff6151">
......@@ -190,6 +194,7 @@ export default {
activeType: "pm25_data",
lineChart: null,
page: 1,
loading: false,
};
},
computed: {},
......@@ -511,8 +516,10 @@ export default {
});
},
changeMonitor(monitor, index) {
this.loading = true;
this.activeIndex = index;
getCurrentMonitorStatis({ device_id: monitor.id }).then((res) => {
this.loading = false;
this.currentMonitorStatis = res.data;
});
},
......@@ -586,8 +593,10 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
.side-area {
width: 28%;
min-width: calc(calc(100% - 880px) / 2);
}
.mid-area {
width: calc(44% - 40px);
......@@ -641,7 +650,7 @@ export default {
}
#aqi-chart {
width: 100%;
height: 200px;
height: 250px;
}
.monitor {
display: flex;
......@@ -934,4 +943,7 @@ export default {
}
}
}
::v-deep .el-loading-mask {
position: absolute !important;
}
</style>
\ No newline at end of file
src/components/projectcheck/CorrectDialog.vue
View file @ 1a10b267
......@@ -3,136 +3,170 @@
:visible.sync="dialogVisible"
title="整改详情"
width="70vw"
top="10vh"
top="20px"
append-to-body
>
<div class="step-area" v-if="correctDetail.check_result == 2">
<el-steps :active="correctDetail.step" align-center>
<el-step
v-for="(step, index) in correctDetail.progress"
:key="index"
:title="step.title"
:description="`${step.person} / ${step.time}`"
:status="
step.status == 1
? 'process'
: step.status == 3
? 'error'
: step.status == 2
? 'success'
: 'wait'
"
></el-step>
</el-steps>
</div>
<div
class="dialog-title"
:style="{ marginTop: correctDetail.check_result == 1 ? '0px' : '12px' }"
>
生成检查单
</div>
<div class="dialog-form">
<div class="dialog-item">
检查人员：{{ correctDetail.check_person_name }}
</div>
<div class="dialog-item">检查时间：{{ correctDetail.check_date }}</div>
<div class="dialog-item">巡查类型：{{ correctDetail.check_type }}</div>
<div class="dialog-item">
检查部位：{{ correctDetail.check_part_name }}
</div>
<div class="dialog-item">
检查事项：{{ correctDetail.check_item_name }}
</div>
<div class="dialog-item">
检查结果：
<span
:style="{
color: correctDetail.check_result == 1 ? '#24F0B8' : '#FF5A56',
}"
>{{ correctDetail.check_result_text }}</span
>
<div id="scroll-dialog">
<div class="step-area" v-if="correctDetail.check_result == 2">
<el-steps :active="correctDetail.step" align-center>
<el-step
v-for="(step, index) in correctDetail.progress"
:key="index"
:title="step.title"
:description="`${step.person} / ${step.time}`"
:status="
step.status == 1
? 'process'
: step.status == 3
? 'error'
: step.status == 2
? 'success'
: 'wait'
"
></el-step>
</el-steps>
</div>
<div class="dialog-item">
负责人：{{ correctDetail.duty_person_name }}
<div
class="dialog-title"
:style="{ marginTop: correctDetail.check_result == 1 ? '0px' : '12px' }"
>
生成检查单
</div>
<template v-if="correctDetail.check_result == 2">
<div class="dialog-item inline">
问题描述：{{ correctDetail.check_describe }}
</div>
<div class="dialog-item inline">
隐患图片：
<el-image
class="imgs"
v-for="(img, index) in correctDetail.check_images_list"
:key="index"
:src="img.url"
:preview-src-list="computedUrlList(correctDetail.check_images_list)"
/>
<div class="dialog-form">
<div class="dialog-item">
检查人员：{{ correctDetail.check_person_name }}
</div>
<div class="dialog-item">检查时间：{{ correctDetail.check_date }}</div>
<div class="dialog-item">
问题等级：<span style="color: #ff5a56">{{
correctDetail.level_text
}}</span>
巡查类型：{{ correctDetail.check_type_text }}
</div>
<div class="dialog-item">
整改期限：{{ correctDetail.rectify_date }}
检查部位：{{ correctDetail.check_part_name }}
</div>
<div class="dialog-item">
整改人员：{{ correctDetail.rectify_person_name }}
检查事项：{{ correctDetail.check_item_name }}
</div>
<div class="dialog-item">
短信通知：{{ correctDetail.is_message_text }}
检查结果：
<span
:style="{
color: correctDetail.check_result == 1 ? '#24F0B8' : '#FF5A56',
}"
>{{ correctDetail.check_result_text }}</span
>
</div>
<div class="dialog-item">
整改要求：{{ correctDetail.rectify_require }}
负责人：{{ correctDetail.duty_person_name }}
</div>
<div class="dialog-item">
补充描述：{{ correctDetail.other_describe }}
隐患类型：{{ correctDetail.problem_type_text }}
</div>
</template>
</div>
<template v-if="correctDetail.check_result == 2">
<div v-for="(correct, index) in correctDetail.rectify_list" :key="index">
<div class="dialog-title">整改上传</div>
<div class="dialog-form">
<div class="dialog-item">
整改人员：{{ correct.rectify_person_name }}
</div>
<div class="dialog-item">整改时间：{{ correct.create_time }}</div>
<template v-if="correctDetail.check_result == 2">
<div class="dialog-item inline">
整改描述：{{ correct.rectify_describe }}
问题描述：{{ correctDetail.check_describe }}
</div>
<div class="dialog-item inline">
整改图片:
隐患图片：
<el-image
class="imgs"
v-for="(img, index) in correct.rectify_images_list"
v-for="(img, index) in correctDetail.check_images_list"
:key="index"
:src="img.url"
:preview-src-list="computedUrlList(correct.rectify_images_list)"
:preview-src-list="
computedUrlList(correctDetail.check_images_list)
"
/>
</div>
</div>
<template v-if="correct.examine_status != 1">
<div class="dialog-title">复查审核</div>
<div class="dialog-item">
问题等级：<span style="color: #ff5a56">{{
correctDetail.level_text
}}</span>
</div>
<div class="dialog-item">
整改期限：{{ correctDetail.rectify_date }}
</div>
<div class="dialog-item">
整改人员：{{ correctDetail.rectify_person_name }}
</div>
<div class="dialog-item">
短信通知：{{ correctDetail.is_message_text }}
</div>
<div class="dialog-item">
整改要求：{{ correctDetail.rectify_require }}
</div>
<div class="dialog-item">
补充描述：{{ correctDetail.other_describe }}
</div>
</template>
</div>
<template v-if="correctDetail.check_result == 2">
<div
v-for="(correct, index) in correctDetail.rectify_list"
:key="index"
>
<div class="dialog-title">整改上传</div>
<div class="dialog-form">
<div class="dialog-item">
复查人员：{{ correct.examine_person_name }} /
<span
:style="{
color: correct.examine_status == 2 ? '#24F0B8' : '#FF5A56',
}"
>{{ correct.examine_status_text }}</span
>
整改人员：{{ correct.rectify_person_name }}
</div>
<div class="dialog-item">复查时间：{{ correct.examine_time }}</div>
<div class="dialog-item">整改时间：{{ correct.create_time }}</div>
<div class="dialog-item inline">
审核备注：{{ correct.examine_remark }}
整改描述：{{ correct.rectify_describe }}
</div>
<div class="dialog-item inline">
整改图片:
<el-image
class="imgs"
v-for="(img, index) in correct.rectify_images_list"
:key="index"
:src="img.url"
:preview-src-list="computedUrlList(correct.rectify_images_list)"
/>
</div>
</div>
</template>
</div>
</template>
<template v-if="correct.examine_status != 1">
<div class="dialog-form border">
<div class="dialog-item">
检查员复查：{{ correct.check_person_name }}
/
<span
:style="{
color:
correct.check_examine_status == 2 ? '#24F0B8' : '#FF5A56',
}"
>{{ correct.check_examine_status_text }}</span
>
</div>
<div class="dialog-item">
复查时间：{{ correct.check_examine_time }}
</div>
<div class="dialog-item inline">
审核备注：{{ correct.check_examine_remark }}
</div>
</div>
<div class="dialog-form border">
<div class="dialog-item">
负责人复查：{{ correct.duty_person_name }}
/
<span
:style="{
color:
correct.duty_examine_status == 2 ? '#24F0B8' : '#FF5A56',
}"
>{{ correct.duty_examine_status_text }}</span
>
</div>
<div class="dialog-item">
复查时间：{{ correct.duty_examine_time }}
</div>
<div class="dialog-item inline">
审核备注：{{ duty_examine_remark }}
</div>
</div>
</template>
</div>
</template>
</div>
</el-dialog>
</template>
<script>
......@@ -212,6 +246,12 @@ export default {
&.inline {
width: 100%;
}
&:last-child {
margin-bottom: 0;
}
}
&.border {
border-top: 10px solid #0e3b72;
}
}
.imgs {
......@@ -227,7 +267,7 @@ export default {
}
::v-deep .el-step.is-center .el-step__description {
padding: 0 !important;
margin: 0 20% !important;
margin: 0 15% !important;
}
::v-deep .el-step__title.is-finish {
color: #67c23a !important;
......@@ -250,4 +290,8 @@ export default {
::v-deep div.el-step__icon-inner {
color: transparent !important;
}
#scroll-dialog {
max-height: 800px;
overflow-y: auto;
}
</style>
\ No newline at end of file
src/components/projectcheck/Index.vue
View file @ 1a10b267
......@@ -597,6 +597,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
.side-area {
width: 28%;
}
......
src/components/realname/Index.vue
View file @ 1a10b267
......@@ -621,6 +621,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
.lt-area {
width: 20%;
}
......
src/components/safecap/Index.vue
View file @ 1a10b267
......@@ -253,7 +253,7 @@ export default {
methods: {
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
})
......@@ -265,14 +265,14 @@ export default {
zoom: 20,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.map.on("click", (e) => {
console.log(e);
this.capWindowVisible = false;
});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
document.getElementById("amap-container").style.zoom = 1 / scale;
});
this.getSafeCapDeviceList();
......@@ -410,6 +410,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
.side-area {
width: 20%;
}
......
src/components/safecap/mapDialog.vue
View file @ 1a10b267
......@@ -84,7 +84,7 @@ export default {
},
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
}).then((AMap) => {
......@@ -95,10 +95,10 @@ export default {
zoom: 20,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
document.getElementById("route-map-container").style.zoom = 1 / scale;
});
this.search();
......
src/components/supervisory/Index.vue
View file @ 1a10b267
......@@ -314,6 +314,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
.side-area {
width: 20%;
}
......
src/components/tower/Index.vue
View file @ 1a10b267
......@@ -446,7 +446,7 @@ export default {
},
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
})
......@@ -458,10 +458,10 @@ export default {
zoom: 19,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
document.getElementById("amap-container").style.zoom = 1 / scale;
});
this.map.on("click", (e) => {
......@@ -723,6 +723,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
.side-area {
width: 25%;
}
......
src/components/unloadingplatform/Index.vue
View file @ 1a10b267
......@@ -189,7 +189,7 @@ export default {
methods: {
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
key: "a7387204aeee9f238b217bad35460ba9",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
})
......@@ -201,11 +201,11 @@ export default {
zoom: 20,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
mapStyle: "amap://styles/1dda787b3ac1ce28f171d2f153726eb7",
});
this.$nextTick(() => {
var scale = window.screen.height / 1250;
var scale = window.screen.height / 1220;
document.getElementById("amap-container").style.zoom = 1 / scale;
});
this.map.on("click", () => {
......@@ -499,6 +499,7 @@ export default {
padding: 12px 20px;
display: flex;
justify-content: space-between;
padding-bottom: 0;
}
.side-area {
width: 25%;
......
src/main.js
View file @ 1a10b267
......@@ -9,7 +9,9 @@ import ShadowContainer from "@/components/ShadowContainer"
import * as echarts from "echarts"
import scroll from 'vue-seamless-scroll'
import "@/assets/iconfont/iconfont.css";
window._AMapSecurityConfig = {
securityJsCode: 'c74dee3a77a5864a52dbe04fc8f93586',
}
Vue.use(scroll)
Vue.prototype.$echarts = echarts
......
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