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 @@
{{ item.name }}
-
-
{{ item.val }}
-
-
+
{{ item.val }}
+
@@ -71,37 +60,30 @@ export default { { name: "车辆总数", val: "326", - color: "#e9f1ff", }, { name: "在线总数", val: "260", - color: "#f0faff", }, { name: "工地总数", val: "34", - color: "#e9f1ff", }, { name: "油耗", val: "153", - color: "#f0faff", }, { name: "报警统计", val: "15", - color: "#e9f1ff", }, { name: "故障总量", val: "30", - color: "#f0faff", }, { name: "维修总量", val: "26", - color: "#e9f1ff", }, ], }; @@ -172,10 +154,11 @@ export default { }, ], grid: { - width: "80%", + width: "82%", height: "auto", left: "15%", - // bottom:'15%' + top:'5%', + bottom:'10%' }, }) ); @@ -277,6 +260,7 @@ export default { width: "80%", height: "auto", left: "10%", + top:'5%', bottom: "20%", }, }) @@ -340,9 +324,9 @@ export default { }, ], grid: { - width: "80%", + width: "90%", height: "auto", - left: "15%", + top:'10%', bottom: "20%", }, }) @@ -357,6 +341,9 @@ export default { axisLine: { show: true, }, + axisLabel:{ + interval:0 + }, data: [ "牵引工具", "紧固工具", @@ -395,13 +382,12 @@ export default { normal: { color: function (params) { var arr = [ - "#418fe2", + "#23d96e", "#d5adff", "#39d8f9", "#689fff", "#fdd67c", ]; - console.log(params,99); return arr[params.dataIndex]; }, label: { @@ -418,15 +404,14 @@ export default { }, ], grid: { - width: "80%", + width: "90%", height: "auto", - left: "15%", - bottom: "20%", + top:'10%', + bottom: "10%", }, }) ); }, - initMap() { AMapLoader.load({ key: "e49669059fa36494531a82ed982f395c", // 申请好的Web端开发者Key,首次调用 load 时必填 @@ -435,7 +420,7 @@ export default { }) .then((AMap) => { this.map = new AMap.Map("map", { - zoom: 15, //级别 + zoom: 16, //级别 center: [106.503005,29.515668], //中心点坐标 }); this.map.on("click", (e) => { @@ -446,22 +431,35 @@ export default { const marks=[ { locaton:[106.49925434121705,29.516762649621796], - name:'新世纪百货', - device:'AI摄像头-CAM90801' + name:'张建波', + device:'川A56578', + phone:'18715351234', + type:'渣土车' }, { locaton:[106.50233888158418, 29.51453123556404], - name:'五洲小区东区彩虹广场', - device:'AI摄像头-CAM90802' + name:'管春鹏', + device:'川A66666', + phone:'15615312983', + type:'推土车' }, { locaton:[106.50438272485353,29.518270460128708], - name:'虹桥小区', - device:'AI摄像头-CAM90804' - } + name:'张志扬', + device:'川A99999', + phone:'16615371234', + type:'破石车' + }, + { + locaton:[106.50738272485353,29.518570460128708], + name:'孙留住', + device:'川A32621', + phone:'18515371234', + type:'渣土车' + }, ] marks.forEach((item, index) => { - this.addMapMarker(item.locaton, 'car2', { name: item.name, device: item.device }) + this.addMapMarker(item.locaton, 'car2', { name: item.name, device: item.device,type:item.type,phone: item.phone}) }); }) .catch((e) => { @@ -469,7 +467,7 @@ export default { }); }, // 添加图形点标记 - addMapMarker(sourceData = [], type = "sxt", info = {}) { + addMapMarker(sourceData = [], type = "car2", info = {}) { const marker = new AMap.Marker({ position: new AMap.LngLat(sourceData[0], sourceData[1]), offset: new AMap.Pixel(-30, -52), @@ -487,12 +485,16 @@ export default { // 显示信息窗体 showInfoWindow(lng, lat, sourceInfo) { let content = ` -
+
车牌:${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 @@ + + + \ No newline at end of file