diff --git a/package.json b/package.json
index c4f5beb8..7e008ea0 100644
--- a/package.json
+++ b/package.json
@@ -52,11 +52,13 @@
"js-cookie": "2.2.1",
"js-md5": "^0.7.3",
"jsencrypt": "3.0.0-rc.1",
+ "moment": "^2.29.4",
+ "node-sass": "^4.9.0",
"nprogress": "0.2.0",
"qrcodejs2": "^0.0.2",
"quill": "1.3.7",
- "node-sass": "^4.9.0",
"sass-loader": "^7.0.1",
+ "save": "^2.5.0",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"vue": "2.6.12",
@@ -75,13 +77,13 @@
"@vue/cli-service": "4.4.6",
"babel-eslint": "10.1.0",
"chalk": "4.1.0",
- "node-sass": "^4.9.0",
- "sass-loader": "^7.0.1",
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
"lint-staged": "10.5.3",
+ "node-sass": "^4.9.0",
"runjs": "4.4.2",
+ "sass-loader": "^7.0.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
"vue-template-compiler": "2.6.12"
diff --git a/public/images/icon01.png b/public/images/icon01.png
new file mode 100644
index 00000000..fc9cc005
Binary files /dev/null and b/public/images/icon01.png differ
diff --git a/public/images/icon02.png b/public/images/icon02.png
new file mode 100644
index 00000000..5c5473ee
Binary files /dev/null and b/public/images/icon02.png differ
diff --git a/public/images/icon03.png b/public/images/icon03.png
new file mode 100644
index 00000000..60668a0e
Binary files /dev/null and b/public/images/icon03.png differ
diff --git a/public/images/icon04.png b/public/images/icon04.png
new file mode 100644
index 00000000..968b2753
Binary files /dev/null and b/public/images/icon04.png differ
diff --git a/public/index.html b/public/index.html
index a7f8fe87..93bc3043 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,12 +9,17 @@
+
+
+
+
+
<%= webpackConfig.name %>
diff --git a/src/components/Amap/components/bigscLocation/indexV_3.vue b/src/components/Amap/components/bigscLocation/indexV_3.vue
index 988f2971..c0be7423 100644
--- a/src/components/Amap/components/bigscLocation/indexV_3.vue
+++ b/src/components/Amap/components/bigscLocation/indexV_3.vue
@@ -77,7 +77,7 @@ export default {
this.aMap = new AMap.Map("container", {
center: [this.mapCenter.lng, this.mapCenter.lat],
resizeEnable: true,
- viewMode: '3D',
+ viewMode: "3D",
// zoom: this.zoom,
mapStyle: "amap://styles/" + this.theme,
});
@@ -162,8 +162,8 @@ export default {
// map: this.aMap,
icon:
this.projectList[i].tenantIndexVo["unProcessed"] > 0
- ? markerAlarmIcon
- : markerIcon,
+ ? markerAlarmIcon
+ : markerIcon,
// icon:
// new AMap.Icon({
// image: this.projectList[i].tenantIndexVo["unProcessed"] > 0
@@ -417,12 +417,12 @@ export default {
align-items: center;
}
div.list-device {
- width: 100%;
+ width: calc(100% - 10px);
padding-left: 30px;
display: flex;
flex-wrap: wrap;
height: auto;
- padding-right: 30px;
+ padding-right: 20px;
max-height: 150px;
overflow: auto;
// justify-content: space-between;
@@ -461,5 +461,19 @@ export default {
top: 25px;
z-index: 1;
}
+ div.list-device::-webkit-scrollbar {
+ width: 6px; //对垂直方向滚动条
+ height: 6px; //对水平方向滚动条
+ }
+ //滚动的滑块
+ div.list-device::-webkit-scrollbar-thumb {
+ border-radius: 3px;
+ background-color: #00f7f8//滚动条的颜色;
+ }
+ //内层滚动槽
+ div.list-device::-webkit-scrollbar-track-piece {
+ background-color: #00f7f800;
+ }
}
+
diff --git a/src/components/Cards/CensusCard.vue b/src/components/Cards/CensusCard.vue
new file mode 100644
index 00000000..2e69da9d
--- /dev/null
+++ b/src/components/Cards/CensusCard.vue
@@ -0,0 +1,223 @@
+
+
+
+ {{ countNum || 0 }}
+ {{ countUnit || "(吨标准煤)" }}
+
+
+
+
+
![]()
+
+
+
+
+
+ {{
+ item[props["label"]]
+ }}
+ {{
+ item[props["value"]]
+ }}
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
diff --git a/src/components/Edescriptions/style.scss b/src/components/Edescriptions/style.scss
new file mode 100644
index 00000000..82466909
--- /dev/null
+++ b/src/components/Edescriptions/style.scss
@@ -0,0 +1,83 @@
+.el-descriptions {
+ box-sizing: border-box;
+ font-size: 14px;
+ color: #303133;
+}
+.margin-top {
+ margin-top: 20px;
+}
+.el-descriptions__header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 20px;
+}
+.el-descriptions__title {
+ font-size: 16px;
+ font-weight: 700;
+}
+.el-descriptions__extra {
+ box-sizing: border-box;
+ font-size: 14px;
+ color: #303133;
+}
+.el-descriptions__body {
+ color: #606266;
+ background-color: #fff;
+}
+.el-descriptions__table {
+ border-collapse: collapse;
+ width: 100%;
+ table-layout: fixed;
+}
+
+.is-bordered {
+ table-layout: auto;
+}
+
+.el-descriptions-row {
+ border-collapse: collapse;
+ width: 100%;
+ table-layout: fixed;
+}
+
+.el-descriptions .el-descriptions-item__cell {
+ padding-bottom: 12px;
+}
+.el-descriptions .el-descriptions-item__cell {
+ padding-bottom: 12px
+}
+.el-descriptions-row {}
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
+ box-sizing: border-box;
+ text-align: left;
+ font-weight: 400;
+ line-height: 1.5;
+}
+.el-descriptions-item__container {
+ display: flex;
+}
+.el-descriptions-item__label {
+ margin-right: 10px;
+}
+.el-descriptions-item__container .el-descriptions-item__content, .el-descriptions-item__container .el-descriptions-item__label {
+ display: inline-flex;
+ align-items: baseline;
+}
+
+.el-descriptions .is-bordered .el-descriptions-item__cell {
+ border: 1px solid #ebeef5;
+ padding: 12px 10px;
+}
+
+.el-descriptions-item__label.is-bordered-label {
+ font-weight: 700;
+ color: #909399;
+ background: #fafafa;
+}
+
+.el-descriptions__body .el-descriptions__table {
+ border-collapse: collapse;
+ width: 100%;
+}
diff --git a/src/views/bigScreen/v3/index.vue b/src/views/bigScreen/v3/index.vue
index f676a2fc..5622d9ee 100644
--- a/src/views/bigScreen/v3/index.vue
+++ b/src/views/bigScreen/v3/index.vue
@@ -22,12 +22,33 @@
-
+
-
-
+
+
+
+
+
{
+ this.projectStatInfo = res.data || {}
+ })
+ },
+ // 查询 能源数据 空间统计
+ getEnergySpaceCensus() {
+ this.projectSpaceCensusList = []
+ getEnergySpaceCensusList({
+ projectId: this.projectId
+ }).then(res => {
+ console.log(res)
+ this.projectSpaceCensusList = res.data || []
+ })
+ },
// 创建一个ws 监听获取报警实时数据
connection() {
if (this.stompClient) {
@@ -198,6 +281,8 @@ export default {
this.projectId = data;
this.homeCount();
this.warningAnalysisList();
+ this.getEnergyCensus()
+ this.getEnergySpaceCensus()
},
eventRegionalismId(data) {
this.regionalismId = data;
@@ -282,7 +367,8 @@ export default {
height: calc(100vh - 0px);
display: flex;
justify-content: center;
- background-image: url("../../../assets/images/big/v3/bg.jpg");
+ // background-image: url("../../../assets/images/big/v3/bg.jpg");
+ background-color: #051832;
cursor: default;
.main-block {
width: 100%;
@@ -296,20 +382,23 @@ export default {
flex-wrap: wrap;
color: #fff;
background: #1531f508;
- padding: 0px 20px;
+ padding: 0px 10px;
.count-left {
display: flex;
flex-wrap: wrap;
width: calc(100% - 400px);
height: calc(100%);
// padding-left: 20px;
+ padding: 0 10px;
.left-block-1 {
width: 400px;
height: calc(100% - 300px);
+ padding: 0 10px;
}
.map-block-1 {
width: calc(100% - 405px);
height: calc(100% - 320px);
+ padding-left: 10px;
}
.bottom-block-1 {
@@ -321,6 +410,7 @@ export default {
width: 400px;
height: calc(100%);
position: relative;
+ padding: 0 10px;
}
}
}
diff --git a/src/views/bigScreen/v3/profile/censusTempB.vue b/src/views/bigScreen/v3/profile/censusTempB.vue
new file mode 100644
index 00000000..d1459245
--- /dev/null
+++ b/src/views/bigScreen/v3/profile/censusTempB.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
{{ value }}
+
{{ title }}
+
+
+
+
+
diff --git a/src/views/bigScreen/v3/profile/deviceProportion.vue b/src/views/bigScreen/v3/profile/deviceProportion.vue
index 6483a950..8a0328d4 100644
--- a/src/views/bigScreen/v3/profile/deviceProportion.vue
+++ b/src/views/bigScreen/v3/profile/deviceProportion.vue
@@ -4,7 +4,7 @@
@@ -77,11 +77,11 @@ export default {
diff --git a/src/views/bigScreen/v3/profile/trend.vue b/src/views/bigScreen/v3/profile/trend.vue
index 18f67831..b1ceae4b 100644
--- a/src/views/bigScreen/v3/profile/trend.vue
+++ b/src/views/bigScreen/v3/profile/trend.vue
@@ -31,7 +31,7 @@ export default {
colorList: ["#FC6A16", "#1EEEFF"],
eId: "trendEchartsLine",
},
- title: "报警预警趋势",
+ title: "实时用能分析",
typeName: "alarm",
resultOption: {
color: ["#FC6A16", "#1EEEFF"],
@@ -147,14 +147,12 @@ export default {