diff --git a/god-ui/public/images/icon.png b/god-ui/public/images/icon.png
new file mode 100644
index 00000000..0b20264b
Binary files /dev/null and b/god-ui/public/images/icon.png differ
diff --git a/god-ui/public/images/xinjiang.png b/god-ui/public/images/xinjiang.png
new file mode 100644
index 00000000..b46bd94d
Binary files /dev/null and b/god-ui/public/images/xinjiang.png differ
diff --git a/god-ui/src/layout/components/Sidebar/Logo.vue b/god-ui/src/layout/components/Sidebar/Logo.vue
index 96fb1e64..940d0e26 100644
--- a/god-ui/src/layout/components/Sidebar/Logo.vue
+++ b/god-ui/src/layout/components/Sidebar/Logo.vue
@@ -98,6 +98,11 @@ export default {
this.title = '工程设备新能源电池溯源'
document.title = '工程设备新能源电池溯源'
break;
+ case '9340':
+ // 新疆天山钢铁新能源监控
+ this.title = '新疆天山钢铁新能源监控'
+ document.title = '新疆天山钢铁新能源监控'
+ break;
// case '9320':
// // 工程车作业及人员行为AI系统
// this.title = '工程车作业及人员行为AI系统'
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top1.png b/god-ui/src/views/engineeringVehicle/home/assets/top1.png
index 62d5130b..5dfae914 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top1.png and b/god-ui/src/views/engineeringVehicle/home/assets/top1.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top2.png b/god-ui/src/views/engineeringVehicle/home/assets/top2.png
index 617887b1..56c5e724 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top2.png and b/god-ui/src/views/engineeringVehicle/home/assets/top2.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top3.png b/god-ui/src/views/engineeringVehicle/home/assets/top3.png
index cb9ac85a..d1a6e4ea 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top3.png and b/god-ui/src/views/engineeringVehicle/home/assets/top3.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top4.png b/god-ui/src/views/engineeringVehicle/home/assets/top4.png
index 655698f9..d84997fe 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top4.png and b/god-ui/src/views/engineeringVehicle/home/assets/top4.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top5.png b/god-ui/src/views/engineeringVehicle/home/assets/top5.png
index 5541e48e..24f812e4 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top5.png and b/god-ui/src/views/engineeringVehicle/home/assets/top5.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top6.png b/god-ui/src/views/engineeringVehicle/home/assets/top6.png
index 764f7c25..e26ce44b 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top6.png and b/god-ui/src/views/engineeringVehicle/home/assets/top6.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/assets/top7.png b/god-ui/src/views/engineeringVehicle/home/assets/top7.png
index 6fd9f2af..55177f13 100644
Binary files a/god-ui/src/views/engineeringVehicle/home/assets/top7.png and b/god-ui/src/views/engineeringVehicle/home/assets/top7.png differ
diff --git a/god-ui/src/views/engineeringVehicle/home/index.vue b/god-ui/src/views/engineeringVehicle/home/index.vue
index 4ab8eed0..59c52fe4 100644
--- a/god-ui/src/views/engineeringVehicle/home/index.vue
+++ b/god-ui/src/views/engineeringVehicle/home/index.vue
@@ -5,23 +5,12 @@
+
车牌:${sourceInfo.device}
司机:${sourceInfo.name}
-
联系方式:${sourceInfo.name}
-
车辆类型:${sourceInfo.name}
+
联系方式:${sourceInfo.phone}
+
车辆类型:${sourceInfo.type}
+
`;
@@ -514,7 +516,6 @@ export default {
.box {
width: 100%;
padding: 10px 15px;
- height: calc(100% - 84px) !important;
background: #f1f1f1;
}
.box-title {
@@ -527,15 +528,11 @@ export default {
grid-gap: 20px;
.top-warper-item {
padding: 15px;
+ background-size: 100% 100%;
display: flex;
width: 100%;
+
flex-direction: column;
- align-items: center;
- .top-card-icon{
- width: 2rem;
- height: 2rem;
- background-size: 100% 100%;
- }
}
}
//中间
@@ -568,7 +565,7 @@ export default {
}
}
.center {
- width: 43%;
+ width: 41%;
height: 600px;
#map{
width: 100%;
@@ -598,8 +595,8 @@ export default {
}
}
}
-@for $i from 1 through 7{
- .top-icon-#{$i} {
+@for $i from 1 through 7 {
+ .top-img-#{$i} {
background-image: url(./assets/top#{$i}.png);
}
}
diff --git a/god-ui/src/views/index.vue b/god-ui/src/views/index.vue
index efa18a11..2bd98cb2 100644
--- a/god-ui/src/views/index.vue
+++ b/god-ui/src/views/index.vue
@@ -30,6 +30,7 @@ import constructionHome from './constructionSiteData/analysis/index.vue'
import waterHome from './waterHome/index.vue'
import battery from './battery/index.vue'
import hlsnHome from './hlsnManage/home/index.vue'
+import engineer from './engineeringVehicle/home/index.vue'
export default {
components: {
HomePage,
@@ -44,7 +45,8 @@ export default {
constructionHome,
waterHome,
battery,
- hlsnHome
+ hlsnHome,
+ engineer
},
data() {
return {
diff --git a/god-ui/src/views/login.vue b/god-ui/src/views/login.vue
index 37276758..d1891072 100644
--- a/god-ui/src/views/login.vue
+++ b/god-ui/src/views/login.vue
@@ -214,6 +214,11 @@ export default {
loginDom.style.backgroundImage = 'url(/images/xinnengyuan-bg.png)'
this.redirect = '/index'
break;
+ case '9340':
+ document.title = '新疆天山钢铁新能源监控'
+ loginDom.style.backgroundImage = 'url(/images/xinjiang-bg.png)'
+ this.redirect = '/index'
+ break;
// case '9350':
// document.title = '工程车作业管控及人员行为AI智能识别系统'
// loginDom.style.backgroundImage = 'url(/images/zuoye.png)'
diff --git a/god-ui/src/views/newEnergy/home/assets/top1.png b/god-ui/src/views/newEnergy/home/assets/top1.png
new file mode 100644
index 00000000..16323dd8
Binary files /dev/null and b/god-ui/src/views/newEnergy/home/assets/top1.png differ
diff --git a/god-ui/src/views/newEnergy/home/assets/top2.png b/god-ui/src/views/newEnergy/home/assets/top2.png
new file mode 100644
index 00000000..ace16f16
Binary files /dev/null and b/god-ui/src/views/newEnergy/home/assets/top2.png differ
diff --git a/god-ui/src/views/newEnergy/home/assets/top3.png b/god-ui/src/views/newEnergy/home/assets/top3.png
new file mode 100644
index 00000000..e754598b
Binary files /dev/null and b/god-ui/src/views/newEnergy/home/assets/top3.png differ
diff --git a/god-ui/src/views/newEnergy/home/assets/top4.png b/god-ui/src/views/newEnergy/home/assets/top4.png
new file mode 100644
index 00000000..966296dc
Binary files /dev/null and b/god-ui/src/views/newEnergy/home/assets/top4.png differ
diff --git a/god-ui/src/views/newEnergy/home/assets/top5.png b/god-ui/src/views/newEnergy/home/assets/top5.png
new file mode 100644
index 00000000..4dc8d19f
Binary files /dev/null and b/god-ui/src/views/newEnergy/home/assets/top5.png differ
diff --git a/god-ui/src/views/newEnergy/home/assets/top6.png b/god-ui/src/views/newEnergy/home/assets/top6.png
new file mode 100644
index 00000000..c7292d5e
Binary files /dev/null and b/god-ui/src/views/newEnergy/home/assets/top6.png differ
diff --git a/god-ui/src/views/newEnergy/home/index.vue b/god-ui/src/views/newEnergy/home/index.vue
new file mode 100644
index 00000000..4f02583f
--- /dev/null
+++ b/god-ui/src/views/newEnergy/home/index.vue
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
设备统计
+
+
+
{{ item.name }}
+
+
+ {{ item.value }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file