Commit 94ef9805 authored by 张牧越's avatar 张牧越

商混检测页面编写

parent f371f505
File deleted
......@@ -10124,6 +10124,11 @@
"csstype": "^3.1.0"
}
},
"vue-calendar-component": {
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz",
"integrity": "sha512-BJh7xOBzM7QVcapcN4EbPQ1eZ8Pii1/oy+dzqjZTilRSIDD7SRPdFpnUJwZvs8lCrhtBAyJbYFsdm2SogXWHVQ=="
},
"vue-cli-plugin-style-resources-loader": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/vue-cli-plugin-style-resources-loader/-/vue-cli-plugin-style-resources-loader-0.1.5.tgz",
......
::v-deep .el-dialog__header {
text-align: center;
padding: 20px;
background: #2268bf;
.el-dialog__title {
color: #fff !important;
}
.el-dialog__headerbtn {
font-size: 24px;
right: 20px;
top: 20px;
}
.el-dialog__headerbtn .el-dialog__close {
color: #fff !important;
}
}
::v-deep .el-dialog__body {
background: #164b8e;
}
::v-deep .el-table,
::v-deep .el-table__expanded-cell {
background: rgba(14, 60, 117, 0.2);
}
::v-deep .el-table--border::after,
::v-deep .el-table--group::after,
::v-deep .el-table::before {
background-color: transparent;
}
::v-deep .el-table tr {
background: transparent;
}
::v-deep .el-table th.el-table__cell {
background: #0e3c75;
}
::v-deep .el-table td.el-table__cell,
::v-deep .el-table th.el-table__cell.is-leaf {
border-color: transparent;
}
::v-deep .el-table__empty-text {
color: #fff;
}
::v-deep .el-table thead {
color: #fff;
}
::v-deep .el-table {
color: #fff;
}
::v-deep .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
background: rgba(39, 172, 251, 0.2) !important;
}
::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: rgba(14, 60, 117, 0.4);
}
::v-deep .el-input__inner {
background: rgba(40, 137, 195, 0.2);
border: 1px solid #217ff7;
}
::v-deep .el-input__inner::placeholder {
color: rgba(255, 255, 255, 0.3);
}
::v-deep .el-pagination {
text-align: right;
background: rgba(14, 60, 117, 0.99);
padding: 12px;
.el-pagination__total,
.el-pagination__jump {
color: #fff;
}
.el-input__inner {
color: #fff;
}
button {
background: transparent !important;
}
.el-pagination button:disabled {
background: transparent !important;
}
.el-pager li {
background: transparent;
color: #fff;
}
.el-pager li.active {
color: #409eff;
}
.btn-next,
.btn-prev {
color: #fff !important;
}
button:disabled {
color: #c0c4cc !important;
}
}
::v-deep .el-form-item__label {
color: #fff;
}
::v-deep .el-range-input {
background: transparent;
}
::v-deep .el-date-editor .el-range-input {
color: #fff;
}
::v-deep .el-range-separator {
color: #fff !important;
}
::v-deep .el-input__inner {
background: rgba(40, 137, 195, 0.2);
border: 1px solid #217ff7;
color: #fff;
}
::v-deep .el-input__inner::placeholder {
color: rgba(255, 255, 255, 0.3);
}
::v-deep .el-tree {
background: transparent !important;
color: rgba(255, 255, 255, 0.8) !important;
}
::v-deep .el-tree-node__content:hover {
background: rgba(44, 96, 162, 0.5) !important;
color: #00a2ff;
}
::v-deep .el-tree-node:focus>.el-tree-node__content {
background: rgba(44, 96, 162, 0.5) !important;
color: #00a2ff;
}
::v-deep .el-tree-node__content {
height: 40px;
}
::v-deep .el-step__icon-inner {
display: none !important;
}
::v-deep .el-step__head.is-success {
::v-deep .el-step__icon {
border-width: 4px !important;
border-color: #67c23a !important;
}
}
::v-deep .el-step__icon.is-text {
border-width: 4px !important;
border-color: #22c2ec;
}
::v-deep .el-step__head.is-success {
.el-step__icon {
border-color: #67c23a !important;
}
}
::v-deep .el-divider {
background: #5f7890;
opacity: 0.5;
}
\ No newline at end of file
......@@ -34,7 +34,7 @@
<div class="overflowed">{{ screenDetail.short_name }}</div>
</el-tooltip>
</div>
<div class="right-nav" style="padding-left: 40px">
<div class="right-nav">
<router-link
v-for="(router, index) in rightNav"
:key="index"
......
......@@ -488,6 +488,7 @@ export default {
};
</script>
<style scoped lang="less">
@import "@/assets/common/element.less";
#construction {
padding: 12px 20px;
display: flex;
......@@ -651,25 +652,7 @@ table {
font-size: 14px;
color: #fff;
}
::v-deep .el-step__icon-inner {
display: none !important;
}
::v-deep .el-step__head.is-success {
::v-deep .el-step__icon {
border-width: 4px !important;
border-color: #67c23a !important;
}
}
::v-deep .el-step__icon.is-text {
border-width: 4px !important;
border-color: #22c2ec;
}
::v-deep .el-step__head.is-success {
.el-step__icon {
border-color: #67c23a !important;
}
}
.progress-contains {
padding: 8px 0;
}
......
This diff is collapsed.
<template>
<el-dialog
:visible.sync="dialogVisible"
title="近三日预委托记录"
width="80vw"
top="10vh"
>
<div>
<el-table :data="tableData" height="550px" stripe>
<el-table-column
label="订单编号"
prop=""
align="center"
></el-table-column>
<el-table-column
label="现场联系"
prop=""
align="center"
></el-table-column>
<el-table-column
label="供应日期"
prop=""
align="center"
></el-table-column>
<el-table-column
label="供应量"
prop=""
align="center"
></el-table-column>
<el-table-column label="状态" prop="" align="center"></el-table-column>
<el-table-column
label="下单时间"
prop=""
align="center"
></el-table-column>
</el-table>
</div>
</el-dialog>
</template>
<script>
export default {
name: "PreComDialog",
props: {
visible: {
type: Boolean,
default: false,
},
},
data() {
return {
tableData: [],
};
},
methods: {},
computed: {
dialogVisible: {
get() {
return this.visible;
},
set(val) {
this.$emit("changeVisible", val);
},
},
},
watch: {},
};
</script>
<style lang="less" scoped>
@import "@/assets/common/element.less";
</style>
\ No newline at end of file
<template>
<el-dialog
:visible.sync="dialogVisible"
title="取样详情"
width="80vw"
top="10vh"
>
<div id="sample-container">
<div id="sample-map-container"></div>
<div class="sample-info">
<div class="sample-title">取样信息</div>
<div class="sample-description">
<div>拍摄人:</div>
<div>样品编号:</div>
<div>检测项目:</div>
<div>检测单位:</div>
<div>施工单位:</div>
<div>工程部位:</div>
</div>
<div class="sample-imgs">
<div class="sample-img">
<img src="" alt="" />
<div class="img-des">自拍照</div>
</div>
<div class="sample-img">
<img src="" alt="" />
<div class="img-des">自拍照</div>
</div>
<div class="sample-img">
<img src="" alt="" />
<div class="img-des">自拍照</div>
</div>
<div class="sample-img">
<img src="" alt="" />
<div class="img-des">自拍照</div>
</div>
</div>
</div>
</div>
</el-dialog>
</template>
<script>
import { getBaseInfo } from "@/api/index";
import AMapLoader from "@amap/amap-jsapi-loader";
export default {
name: "MapDialog",
props: {
visible: {
type: Boolean,
default: false,
},
sampleId: {
type: [String, Number],
default: "",
},
},
data() {
return {
date: "",
map: null,
Amap: null, //高德地图amap方法实例
mapCenter: [],
hour: "",
};
},
methods: {
init() {
getBaseInfo().then((res) => {
this.mapCenter = [res.data.longitude, res.data.latitude];
this.$nextTick(() => {
this.initMap();
});
});
},
initMap() {
AMapLoader.load({
key: "fc00c5b70f67a8414344682f217d4b6e",
version: "1.4.15",
plugins: ["AMap.MarkerClusterer", "AMap.DistrictSearch"],
}).then((AMap) => {
// 初始化地图
this.AMap = AMap;
this.map = new AMap.Map("sample-map-container", {
viewMode: "2D",
zoom: 20,
center: this.mapCenter,
resizeEnable: true,
mapStyle: "amap://styles/darkblue",
});
});
},
search() {
this.map.clearMap();
// getSafeCapRoute({
// bind_id: this.userId,
// start_time: `${this.date} ${this.hour}:00:00`,
// }).then((res) => {
// const paths = res.data.line.map((point) => {
// return [point.longitude, point.latitude];
// });
// new this.AMap.Polyline({
// path: paths,
// map: this.map,
// showDir: true,
// strokeColor: "#3366bb",
// strokeWeight: 8,
// });
// });
},
},
computed: {
dialogVisible: {
get() {
return this.visible;
},
set(val) {
this.$emit("changeVisible", val);
},
},
},
watch: {
dialogVisible(val) {
if (val) {
this.$nextTick(() => {
this.init();
});
}
},
},
mounted() {
this.init();
},
};
</script>
<style lang="less" scoped>
@import "@/assets/common/element.less";
#sample-container {
display: flex;
justify-content: space-between;
}
#sample-map-container {
width: 70%;
height: 700px;
}
.sample-info {
width: 29%;
.sample-title {
line-height: 40px;
color: #fff;
text-align: center;
background: #02306a;
}
.sample-description {
padding: 20px;
line-height: 24px;
font-size: 14px;
color: #c6def9;
background: #0e3c75;
}
.sample-imgs {
background: #0e3c75;
padding: 10px;
margin-top: 10px;
height: 446px;
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
}
.sample-img {
width: 48%;
margin-right: 2%;
position: relative;
img {
vertical-align: top;
width: 100%;
}
.img-des {
position: absolute;
background: rgba(0, 0, 0, 0.7);
line-height: 30px;
height: 30px;
text-align: center;
width: 100%;
bottom: 0;
left: 0;
color: #fff;
}
}
}
</style>
\ No newline at end of file
......@@ -395,6 +395,7 @@ export default {
};
</script>
<style lang="less" scoped>
@import "@/assets/common/element.less";
#safecap {
padding: 12px 20px;
display: flex;
......@@ -406,13 +407,6 @@ export default {
width: calc(80% - 20px);
}
}
::v-deep .el-input__inner {
background: rgba(40, 137, 195, 0.2);
border: 1px solid #217ff7;
}
::v-deep .el-input__inner::placeholder {
color: rgba(255, 255, 255, 0.3);
}
.swagger-container {
position: relative;
......@@ -567,116 +561,7 @@ export default {
color: rgba(62, 236, 111, 1);
}
}
::v-deep .el-pagination {
text-align: right;
background: rgba(14, 60, 117, 0.99);
padding: 12px;
.el-pagination__total,
.el-pagination__jump {
color: #fff;
}
.el-input__inner {
color: #fff;
}
button {
background: transparent !important;
}
.el-pagination button:disabled {
background: transparent !important;
}
.el-pager li {
background: transparent;
color: #fff;
}
.el-pager li.active {
color: #409eff;
}
.btn-next,
.btn-prev {
color: #fff !important;
}
button:disabled {
color: #c0c4cc !important;
}
}
::v-deep .el-dialog__header {
text-align: center;
padding: 20px;
background: #2268bf;
.el-dialog__title {
color: #fff !important;
}
.el-dialog__headerbtn {
font-size: 24px;
right: 20px;
top: 20px;
}
.el-dialog__headerbtn .el-dialog__close {
color: #fff !important;
}
}
::v-deep .el-dialog__body {
background: #164b8e;
}
::v-deep .el-form-item__label {
color: #fff;
}
::v-deep .el-table,
::v-deep .el-table__expanded-cell {
background: rgba(14, 60, 117, 0.2);
}
::v-deep .el-table--border::after,
::v-deep .el-table--group::after,
::v-deep .el-table::before {
background-color: transparent;
}
::v-deep .el-table tr {
background: transparent;
}
::v-deep .el-table th.el-table__cell {
background: #0e3c75;
}
::v-deep .el-table td.el-table__cell,
::v-deep .el-table th.el-table__cell.is-leaf {
border-color: transparent;
}
::v-deep .el-table__empty-text {
color: #fff;
}
::v-deep .el-table thead {
color: #fff;
}
::v-deep .el-table {
color: #fff;
}
::v-deep
.el-table--enable-row-hover
.el-table__body
tr:hover
> td.el-table__cell {
background: rgba(39, 172, 251, 0.2) !important;
}
::v-deep
.el-table--striped
.el-table__body
tr.el-table__row--striped
td.el-table__cell {
background: rgba(14, 60, 117, 0.4);
}
::v-deep .el-range-input {
background: transparent;
}
::v-deep .el-date-editor .el-range-input {
color: #fff;
}
::v-deep .el-range-separator {
color: #fff !important;
}
::v-deep .el-input__inner {
color: #fff;
}
.device-user {
display: flex;
justify-content: space-between;
......
......@@ -307,6 +307,7 @@ export default {
};
</script>
<style lang="less" scoped>
@import "@/assets/common/element.less";
#supervisory {
padding: 12px 20px;
display: flex;
......@@ -315,25 +316,6 @@ export default {
width: 20%;
}
}
::v-deep .el-input__inner {
background: rgba(40, 137, 195, 0.2);
border: 1px solid #217ff7;
}
::v-deep .el-input__inner::placeholder {
color: rgba(255, 255, 255, 0.3);
}
::v-deep .el-tree {
background: transparent !important;
color: rgba(255, 255, 255, 0.8) !important;
}
::v-deep .el-tree-node__content:hover {
background: rgba(44, 96, 162, 0.5) !important;
color: #00a2ff;
}
::v-deep .el-tree-node:focus > .el-tree-node__content {
background: rgba(44, 96, 162, 0.5) !important;
color: #00a2ff;
}
::v-deep .custom-tree-node {
flex: 1;
......@@ -352,9 +334,7 @@ export default {
vertical-align: top;
}
}
::v-deep .el-tree-node__content {
height: 40px;
}
.tree-container {
height: 860px;
overflow-y: scroll;
......@@ -440,26 +420,6 @@ export default {
}
}
::v-deep .el-dialog__header {
text-align: center;
padding: 20px;
background: #2268bf;
.el-dialog__title {
color: #fff !important;
}
.el-dialog__headerbtn {
font-size: 24px;
right: 20px;
top: 20px;
}
.el-dialog__headerbtn .el-dialog__close {
color: #fff !important;
}
}
::v-deep .el-dialog__body {
background: #164b8e;
}
.vueVideoPlayer {
& .video-js {
& .vjs-big-play-button {
......
......@@ -17,13 +17,7 @@
<div id="dip-chart" ref="dipChart"></div>
</ShadowContainer>
</div>
<div class="mid-area">
<div class="swagger-container">
<img class="lt" src="@/assets/lt.png" alt="" />
<img class="rt" src="@/assets/rt.png" alt="" />
<img class="rb" src="@/assets/rb.png" alt="" />
<img class="lb" src="@/assets/lb.png" alt="" />
<div id="amap-container"></div>
<div id="mid-area">
<div class="towerwindow" v-if="towerWindowVisible">
<div class="tower-description">
<img
......@@ -53,13 +47,13 @@
</div>
<div class="recent-open">最近使用:{{ windowData.log_time }}</div>
</div>
<div class="swagger-container" id="container">
<img class="lt" src="@/assets/lt.png" alt="" />
<img class="rt" src="@/assets/rt.png" alt="" />
<img class="rb" src="@/assets/rb.png" alt="" />
<img class="lb" src="@/assets/lb.png" alt="" />
<div id="amap-container"></div>
</div>
<device-dialog
:deviceId="windowData.id"
:deviceData="deviceData"
:visible="deviceDialogVisible"
@changeVisible="(val) => (deviceDialogVisible = val)"
></device-dialog>
</div>
<div class="side-area">
<Title text="报警信息"></Title>
......@@ -119,6 +113,13 @@
</div>
</ShadowContainer>
</div>
<device-dialog
:deviceId="windowData.id"
:deviceData="deviceData"
:visible="deviceDialogVisible"
@changeVisible="(val) => (deviceDialogVisible = val)"
></device-dialog>
</div>
</template>
<script>
......@@ -546,8 +547,8 @@ export default {
sinSigma *
(cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)));
var revAz = Math.atan2(sinAlpha, -tmp); // final bearing
console.log(revAz);
// var revAz = Math.atan2(sinAlpha, -tmp); // final bearing
var lngLatObj = {
lng: lon1 + this.deg(L),
lat: this.deg(lat2),
......@@ -622,9 +623,20 @@ export default {
});
});
},
resetMapSize() {
let screenWidth =
document.body.clientWidth || document.documentElement.clientWidth;
let defWidth = 1920;
let xScale = screenWidth / defWidth;
let mapContent = document.getElementById("container");
mapContent.style.zoom = 1 / xScale;
mapContent.style.height = xScale * 960 + "px";
},
},
mounted() {
this.getTowerData();
this.resetMapSize();
},
beforeDestroy() {
clearInterval(this.timer);
......@@ -632,6 +644,7 @@ export default {
};
</script>
<style lang="less" scoped>
@import "@/assets/common/element.less";
#tower {
padding: 12px 20px;
display: flex;
......@@ -639,9 +652,10 @@ export default {
.side-area {
width: 25%;
}
.mid-area {
#mid-area {
width: calc(50% - 40px);
margin: 0 20px;
position: relative;
}
}
.swagger-container {
......@@ -726,29 +740,7 @@ export default {
font-size: 14px;
color: #22c3ed;
}
::v-deep .el-step__icon-inner {
display: none !important;
}
::v-deep .el-step__head.is-success {
::v-deep .el-step__icon {
border-width: 4px !important;
border-color: #67c23a !important;
}
}
::v-deep .el-step__icon.is-text {
border-width: 4px !important;
border-color: #22c2ec;
}
::v-deep .el-step__head.is-success {
.el-step__icon {
border-color: #67c23a !important;
}
}
::v-deep .el-divider {
background: #5f7890;
opacity: 0.5;
}
.warn-message {
position: relative;
height: 420px;
......@@ -857,6 +849,7 @@ export default {
background: url("@/assets/safecap/cap-window-bg.png") no-repeat;
background-size: 100% 100%;
padding: 20px;
z-index: 1000;
}
.recent-open {
font-size: 16px;
......@@ -880,25 +873,4 @@ export default {
color: rgba(62, 236, 111, 1);
}
}
::v-deep .el-dialog__header {
text-align: center;
padding: 20px;
background: #2268bf;
.el-dialog__title {
color: #fff !important;
}
.el-dialog__headerbtn {
font-size: 24px;
right: 20px;
top: 20px;
}
.el-dialog__headerbtn .el-dialog__close {
color: #fff !important;
}
}
::v-deep .el-dialog__body {
background: #164b8e;
}
</style>
\ No newline at end of file
This diff is collapsed.
......@@ -8,6 +8,7 @@ import Supervisory from "@/components/supervisory/Index"
import Tower from "@/components/tower/Index"
import Noise from "@/components/noise/Index"
import Safecap from "@/components/safecap/Index"
import Management from "@/components/management/Index"
......@@ -25,6 +26,7 @@ const router = new VueRouter({
{ path: 'tower', component: Tower },
{ path: 'noise', component: Noise },
{ path: 'safecap', component: Safecap },
{ path: 'management', component: Management },
]
},
......
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