Skip to content

D
device-new-platform
Commit ee9d4ab9 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents d73d80d6 70591c76
Expand all Show whitespace changes
Inline Side-by-side
Showing with 664 additions and 136 deletions
device-manager-ui/admin/package.json
View file @ ee9d4ab9
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
"quill": "1.3.7", "quill": "1.3.7",
"screenfull": "5.0.2", "screenfull": "5.0.2",
"sockjs-client": "^1.5.1", "sockjs-client": "^1.5.1",
"three": "^0.152.2",
"v-charts": "^1.17.10", "v-charts": "^1.17.10",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-amap": "^0.5.10", "vue-amap": "^0.5.10",
......
device-manager-ui/admin/src/assets/less/base.less
View file @ ee9d4ab9
...@@ -8,58 +8,114 @@ html * { ...@@ -8,58 +8,114 @@ html * {
outline: 0; outline: 0;
box-sizing: inherit; box-sizing: inherit;
-webkit-text-size-adjust: none; -webkit-text-size-adjust: none;
-webkit-tap-highlight-color: rgba(0,0,0,0) -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
} }
html,body { html,
height: 100%; body {
width: 100%;
// height: 100%;
min-height: 100%; min-height: 100%;
font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial, sans-serif; font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial,
sans-serif;
} }
body { body {
overflow-y: auto; overflow-y: auto;
} }
body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section {
body,
div,
dl,
dt,
dd,
ul,
ol,
li,
h1,
h2,
h3,
h4,
h5,
h6,
pre,
code,
form,
fieldset,
legend,
input,
textarea,
p,
blockquote,
th,
td,
hr,
button,
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
margin: 0; margin: 0;
padding: 0 padding: 0;
} }
input,select,textarea,button { input,
select,
textarea,
button {
font-size: 100%; font-size: 100%;
-webkit-appearance: none; -webkit-appearance: none;
border:0; border: 0;
outline: 0; outline: 0;
} }
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0 border-spacing: 0;
} }
fieldset,img { fieldset,
border: 0 img {
border: 0;
} }
abbr,acronym { abbr,
acronym {
border: 0; border: 0;
font-variant: normal font-variant: normal;
} }
del { del {
text-decoration: line-through text-decoration: line-through;
} }
address,caption,cite,code,dfn,em,th,var { address,
caption,
cite,
code,
dfn,
em,
th,
var {
font-style: normal; font-style: normal;
font-weight: 500 font-weight: 500;
} }
ol,ul { ol,
list-style: none ul {
list-style: none;
} }
caption,th { caption,
text-align: left th {
text-align: left;
} }
// h1,h2,h3,h4,h5,h6 { // h1,h2,h3,h4,h5,h6 {
...@@ -67,29 +123,33 @@ caption,th { ...@@ -67,29 +123,33 @@ caption,th {
// font-weight: 500 // font-weight: 500
// } // }
q:before,q:after { q:before,
content: '' q:after {
content: "";
} }
sub,sup { sub,
sup {
font-size: 75%; font-size: 75%;
line-height: 0; line-height: 0;
position: relative; position: relative;
vertical-align: baseline vertical-align: baseline;
} }
sup { sup {
top: -.5em top: -0.5em;
} }
sub { sub {
bottom: -.25em bottom: -0.25em;
} }
ins,a { ins,
a {
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
/* ============================================================ /* ============================================================
flex：定义布局为盒模型 flex：定义布局为盒模型
flex-v：盒模型垂直布局 flex-v：盒模型垂直布局
...@@ -99,111 +159,167 @@ ins,a { ...@@ -99,111 +159,167 @@ ins,a {
flex-pack-justify：子元素两端对齐 flex-pack-justify：子元素两端对齐
兼容性：ios 4+、android 2.3+、winphone8+ 兼容性：ios 4+、android 2.3+、winphone8+
============================================================ */ ============================================================ */
.flex{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;} .flex {
.flex-v{-webkit-box-orient:vertical;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;} display: -webkit-box;
.flex-1{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;} display: -webkit-flex;
.flex-align-center{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;} display: -ms-flexbox;
.flex-pack-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;} display: flex;
.flex-pack-justify{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;} }
.clearfix{ .flex-v {
&:after{ -webkit-box-orient: vertical;
content: ''; -webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
.flex-1 {
-webkit-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
.flex-align-center {
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
}
.flex-pack-center {
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
.flex-pack-justify {
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
}
.clearfix {
&:after {
content: "";
display: table; display: table;
clear: both; clear: both;
font-size: 0; font-size: 0;
} }
} }
.fl{float: left};
.fr{float: right}; .fl {
.hide{display: none;} float: left;
.disabled{ }
.fr {
float: right;
}
.hide {
display: none;
}
.disabled {
pointer-events: none; pointer-events: none;
} }
#app,.pages{ #app,
.pages {
.flex; .flex;
.flex-v; .flex-v;
height: 100%; height: 100%;
} }
.ellipsis {
.ellipsis{
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
[v-cloak] { [v-cloak] {
display: none; display: none;
} }
[disabled] { [disabled] {
pointer-events: none; pointer-events: none;
} }
.el-dialog{
.el-checkbox-group{ .el-dialog {
.el-checkbox{ .el-checkbox-group {
.el-checkbox {
margin: 5px 0; margin: 5px 0;
width: 33.33%; width: 33.33%;
} }
.pointBox{
.pointBox {
width: 50%; width: 50%;
} }
} }
} }
.table-foot{
.table-foot {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.el-table th { .el-table th {
user-select: all; user-select: all;
} }
/* el-table列数据为空自动显示-- */ /* el-table列数据为空自动显示-- */
.cell:empty::before{ .cell:empty::before {
content:'--'; content: "--";
color:gray; color: gray;
} }
.el-progress-bar{
.el-progress-bar {
padding-right: 70px; padding-right: 70px;
margin-right: -70px; margin-right: -70px;
} }
#operatorUserCabinCheckBox .el-checkbox{ #operatorUserCabinCheckBox .el-checkbox {
white-space: normal !important; white-space: normal !important;
width: 100% width: 100%;
} }
#operatorUserCabinCheckBox .el-checkbox__label{ #operatorUserCabinCheckBox .el-checkbox__label {
display: inline; display: inline;
} }
// 统计页面隔日期变色 // 统计页面隔日期变色
.page-statistics{ .page-statistics {
.chart{ .chart {
margin-bottom: 80px; margin-bottom: 80px;
border: 1px solid #ededed; border: 1px solid #ededed;
height: 400px; height: 400px;
} }
.el-table th, .el-table tr{
&.color-gray{ .el-table th,
.el-table tr {
&.color-gray {
background-color: #f0f9eb; background-color: #f0f9eb;
} }
} }
} }
@media screen and (max-width: 800px) {
.page {
@media screen and (max-width: 800px){
.page{
margin: 5px 5px; margin: 5px 5px;
} }
.el-dialog{
width: 98%!important; .el-dialog {
.el-checkbox-group{ width: 98% !important;
.el-checkbox{
.el-checkbox-group {
.el-checkbox {
margin: 5px 0; margin: 5px 0;
width: 50%; width: 50%;
font-size: 12px; font-size: 12px;
.el-checkbox__label{
.el-checkbox__label {
font-size: 12px; font-size: 12px;
} }
} }
...@@ -215,18 +331,21 @@ ins,a { ...@@ -215,18 +331,21 @@ ins,a {
// background-color: red; // background-color: red;
// } // }
.mobile-table-card{ .mobile-table-card {
margin: 10px auto; margin: 10px auto;
padding: 10px; padding: 10px;
box-shadow: 0 0 5px #ccc; box-shadow: 0 0 5px #ccc;
.mobile-table-cell{
.mobile-table-cell {
padding: 5px 0; padding: 5px 0;
border-bottom: 1px dotted #eee; border-bottom: 1px dotted #eee;
.cell-title{
.cell-title {
font-size: 13px; font-size: 13px;
color: #666; color: #666;
} }
.cell-content{
.cell-content {
padding-left: 5px; padding-left: 5px;
text-align: right; text-align: right;
word-break: break-word; word-break: break-word;
......
device-manager-ui/admin/src/components/three/Three.vue 0 → 100644
View file @ ee9d4ab9
This diff is collapsed.
device-manager-ui/admin/src/views/analysis/Analysis.vue
View file @ ee9d4ab9
...@@ -61,7 +61,9 @@ ...@@ -61,7 +61,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="center"></div> <div class="center">
<Three class="three" :lv="lv" :floorArr="floorArr"></Three>
</div>
<div class="right"> <div class="right">
<div class="right-content"> <div class="right-content">
<!-- 设备告警汇总 --> <!-- 设备告警汇总 -->
...@@ -95,13 +97,13 @@ ...@@ -95,13 +97,13 @@
</div> </div>
<div class="warning-info-item2"> <div class="warning-info-item2">
<div class="item2-info"> <div class="item2-info">
<div class="title">危险</div> <div class="title">次要</div>
<div class="percent">24%</div> <div class="percent">24%</div>
</div> </div>
</div> </div>
<div class="warning-info-item1"> <div class="warning-info-item1">
<div class="item1-info"> <div class="item1-info">
<div class="title">危险</div> <div class="title">一般</div>
<div class="percent">24%</div> <div class="percent">24%</div>
</div> </div>
</div> </div>
...@@ -126,10 +128,12 @@ ...@@ -126,10 +128,12 @@
<script> <script>
import HeaderSite from "./components/HeaderSite.vue"; import HeaderSite from "./components/HeaderSite.vue";
import TitleItem from "./components/TitleItem.vue"; import TitleItem from "./components/TitleItem.vue";
import Three from "@/components/three/Three.vue";
export default { export default {
components: { components: {
HeaderSite, HeaderSite,
TitleItem, TitleItem,
Three,
}, },
data() { data() {
return { return {
...@@ -217,12 +221,46 @@ export default { ...@@ -217,12 +221,46 @@ export default {
["一楼排号机", "5", "15:00", "在线"], ["一楼排号机", "5", "15:00", "在线"],
], ],
}, },
floorArr: [],
lv: "1",
}; };
}, },
mounted() { mounted() {
this.getDevTypeDisEchart(); this.getDevTypeDisEchart();
this.getWarningDisEchart(); this.getWarningDisEchart();
this.getManufacturersTopEchart(); this.getManufacturersTopEchart();
setTimeout(() => {
this.floorArr = [
{
id: 4,
building: 1,
lv: 1,
picture: "",
phonepicture: "",
mtl_url: "/uploads/floor/yibin2/L1.mtl",
obj_url: "/uploads/floor/L1-1/L1-1.gltf",
siteid: 1,
type: 1,
create_time: "2023-03-13 11:32:38",
update_time: "2023-04-08 11:40:07",
zip_url: "/uploads/floor/L1-1/L1-1.zip",
},
{
id: 5,
building: 1,
lv: 2,
picture: "",
phonepicture: "",
mtl_url: "/uploads/floor/yibin/L2.mtl",
obj_url: "/uploads/floor/L2-1/L2-1.gltf",
siteid: 1,
type: 1,
create_time: "2023-03-13 16:54:14",
update_time: "2023-04-08 11:40:21",
zip_url: "/uploads/floor/L2-1/L2-1.zip",
},
];
});
}, },
methods: { methods: {
// 获取设备类型分布图标 // 获取设备类型分布图标
...@@ -430,7 +468,7 @@ export default { ...@@ -430,7 +468,7 @@ export default {
grid: { grid: {
top: "0px", top: "0px",
left: "0px", left: "0px",
right: "20px", right: "0px",
bottom: "-30px", bottom: "-30px",
containLabel: true, containLabel: true,
}, },
...@@ -551,7 +589,7 @@ export default { ...@@ -551,7 +589,7 @@ export default {
}, },
}, },
{ {
// 分隔 // 分隔背景
type: "pictorialBar", type: "pictorialBar",
itemStyle: { itemStyle: {
color: "#022539", color: "#022539",
...@@ -582,10 +620,9 @@ export default { ...@@ -582,10 +620,9 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.analysis { .analysis {
width: 100%; width: 100%;
height: 100%; height: 1080px;
padding-bottom: 40px;
background: url("../../assets/images/data/bg.png") no-repeat center; background: url("../../assets/images/data/bg.png") no-repeat center;
background-size: 100% 100%; background-size: 100% 1080px;
color: #fff; color: #fff;
.header { .header {
width: 100%; width: 100%;
...@@ -650,9 +687,13 @@ export default { ...@@ -650,9 +687,13 @@ export default {
.left { .left {
width: 500px; width: 500px;
height: 100%; height: 100%;
position: relative;
} }
.left-centent { .left-centent {
width: 100%; width: 100%;
position: absolute;
left: 0px;
top: -20px;
.dev-total { .dev-total {
height: 120px; height: 120px;
} }
...@@ -679,12 +720,22 @@ export default { ...@@ -679,12 +720,22 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.center {
// .three {
// height: 500px;
// width: 500px;
// }
}
.right { .right {
width: 500px; width: 500px;
height: 100%; height: 100%;
position: relative;
} }
.right-content { .right-content {
width: 500px; width: 500px;
position: absolute;
left: 0px;
top: -20px;
.warning-rank-info { .warning-rank-info {
height: 188px; height: 188px;
background: url("~@/assets/images/data/kuang2.png") no-repeat center; background: url("~@/assets/images/data/kuang2.png") no-repeat center;
......
device-manager-ui/admin/yarn.lock
View file @ ee9d4ab9
...@@ -9076,6 +9076,11 @@ thread-loader@^2.1.3: ...@@ -9076,6 +9076,11 @@ thread-loader@^2.1.3:
loader-utils "^1.1.0" loader-utils "^1.1.0"
neo-async "^2.6.0" neo-async "^2.6.0"
three@^0.152.2:
version "0.152.2"
resolved "https://registry.npmmirror.com/three/-/three-0.152.2.tgz#2ee0f2c504d31a4bc29b45495c12bded9fda7bfc"
integrity sha512-Ff9zIpSfkkqcBcpdiFo2f35vA9ZucO+N8TNacJOqaEE6DrB0eufItVMib8bK8Pcju/ZNT6a7blE1GhTpkdsILw==
throttle-debounce@^1.0.1: throttle-debounce@^1.0.1:
version "1.1.0" version "1.1.0"
resolved "https://registry.nlark.com/throttle-debounce/download/throttle-debounce-1.1.0.tgz" resolved "https://registry.nlark.com/throttle-debounce/download/throttle-debounce-1.1.0.tgz"
......
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