suojin
/
jiahe_device
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改样式

Browse Source
main
jn517618 2 years ago
parent 326a8c2b0e
commit 056871fe44
7 changed files with 54 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/energySources/component/dmodal.vue
  2. 10
      src/views/energySources/component/dosage.vue
  3. 2
      src/views/energySources/component/emodal.vue
  4. 6
      src/views/energySources/component/equipmentAnalyze.vue
  5. 4
      src/views/energySources/component/equipmentLoad.vue
  6. 53
      src/views/energySourcesProvince/component/pathMap.vue
  7. 10
      src/views/energySourcesProvince/component/statistics.vue

2
src/views/energySources/component/dmodal.vue
Unescape View File

@ -162,7 +162,7 @@ export default {
}
.equipmentLoadmodal /deep/ .el-table td span {
font-size: 0.14rem !important;
font-size: 0.16rem;
font-family: Acumin-Pro-Condensed-Regular-2;
}

10
src/views/energySources/component/dosage.vue
Unescape View File

@ -18,7 +18,7 @@
:row-class-name="tableRowClassName">
<el-table-column prop="name" label="部门/车间" show-overflow-tooltip>
<template slot-scope="scope">
<span style="color: #fff">{{ scope.row.name }}</span>
<span style="color: #fff;font-size: 0.14rem;">{{ scope.row.name }}</span>
<span class="rank" v-if="scope.$index <= 2" :style="rankStyle(scope.$index)">TOP.{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
@ -290,7 +290,7 @@ export default {
.dosage /deep/ .el-table td span {
font-size: 0.14rem !important;
font-size: 0.16rem;
font-family: Acumin-Pro-Condensed-Regular-2;
}
@ -379,11 +379,11 @@ export default {
.rank {
display: inline-block;
width: 0.36rem;
width: 0.32rem;
height: 0.18rem;
line-height: 0.21rem;
line-height: 0.22rem;
text-align: center;
font-size: 0.14rem;
font-size: 0.14rem !important;
font-weight: normal;
color: #FFFFFF;
border-radius: 0.08rem;

2
src/views/energySources/component/emodal.vue
Unescape View File

@ -152,7 +152,7 @@ export default {
}
.equipmentLoadmodal /deep/ .el-table td span {
font-size: 0.14rem !important;
font-size: 0.16rem;
font-family: Acumin-Pro-Condensed-Regular-2;
}

6
src/views/energySources/component/equipmentAnalyze.vue
Unescape View File

@ -10,9 +10,9 @@
</tit>
<el-table :data="tableData" style="width: 100%;" height="92%" :stripe="true" :size="mini"
:row-class-name="tableRowClassName">
<el-table-column prop="name" label="设备名称">
<el-table-column prop="name" label="设备名称" show-overflow-tooltip>
<template slot-scope="scope">
<span style="color: #fff">{{ scope.row.name }}</span>
<span style="color: #fff;font-size: 0.14rem;">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column prop="kongzai" label="空载">
@ -119,7 +119,7 @@ export default {
}
.equipmentAnalyze /deep/ .el-table td span {
font-size: 0.14rem !important;
font-size: 0.16rem;
font-family: Acumin-Pro-Condensed-Regular-2;
}

4
src/views/energySources/component/equipmentLoad.vue
Unescape View File

@ -7,7 +7,7 @@
:row-class-name="tableRowClassName">
<el-table-column prop="name" label="设备名称" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="address" label="负载率">
<el-table-column prop="loadRate" label="负载率">
<template slot-scope="scope">
<span>{{ scope.row.loadRate }}%</span>
</template>
@ -88,7 +88,7 @@ export default {
}
.equipmentLoad /deep/ .el-table td span {
font-size: 0.14rem !important;
font-size: 0.16rem !important;
}
.equipmentLoad /deep/ .el-table::before {

53
src/views/energySourcesProvince/component/pathMap.vue
Unescape View File

@ -55,13 +55,13 @@ export default {
// locationAcc: { 0: '关闭', 1: '开启' },
// carList: carList,//车辆设备
markList: [
{ lng: 112.37268, lat: 25.63787, name: "福顺机械实业公司" },
{ lng: 112.375261, lat: 25.63742, name: "巨人机床实业公司" },
{ lng: 112.365047, lat: 25.630574, name: "郴州雄建实业公司" },
{ lng: 112.36587, lat: 25.63132, name: "众合实业公司" },
{ lng: 112.372727, lat: 25.635608, name: "雄达实业公司" },
{ lng: 112.373909, lat: 25.634179, name: "峰达实业公司" },
{ lng: 112.37275, lat: 25.63676, name: "伟铸机械实业公司" },
{ lng: 112.37268, lat: 25.63787, name: "福顺机械实业公司", carbon: 0, electricity: 0 },
{ lng: 112.375261, lat: 25.63742, name: "巨人机床实业公司", carbon: 0, electricity: 0 },
{ lng: 112.365047, lat: 25.630574, name: "郴州雄建实业公司", carbon: 0, electricity: 0 },
{ lng: 112.36587, lat: 25.63132, name: "众合实业公司", carbon: 0, electricity: 0 },
{ lng: 112.372727, lat: 25.635608, name: "雄达实业公司", carbon: 0, electricity: 0 },
{ lng: 112.373909, lat: 25.634179, name: "峰达实业公司", carbon: 0, electricity: 0 },
{ lng: 112.37275, lat: 25.63676, name: "伟铸机械实业公司", carbon: 0, electricity: 0 },
],//标注点记录
polyline: null,//昨日轨迹
viewData: [],//点聚合坐标集合
@ -84,6 +84,14 @@ export default {
created() {
this.$nextTick(() => {
this.getData()
// setTimeout(() => {
// this.initMap();
// }, 0);
// window.addEventListener('resize', () => {
// if (this.baiduMap) {
// this.backMap();
// }
// });
})
},
mounted() {
@ -93,12 +101,13 @@ export default {
getData() {
getEnterprisePower({ today: this.$moment().format('yyyy-MM-DD') }).then(res => {
let data = res.data.data
console.log(data, '.....')
this.markList.forEach(e => {
data.forEach(r => {
if (e.name.includes(r.name)) {
e.carbon = r.carbon
e.electricity = r.electricity
e.carbon = r.carbon || 0
e.electricity = r.electricity || 0
}
})
})
@ -130,9 +139,21 @@ export default {
this.baiduMap.centerAndZoom(point, 12);
}
else {
this.baiduMap = new BMapGL.Map('container');
this.baiduMap = new BMapGL.Map('container', {enableMapClick: false});
this.baiduMap.centerAndZoom(point, 12);
this.baiduMap.enableScrollWheelZoom(true);
this.baiduMap.setMinZoom(12);
// this.baiduMap.setMaxZoom(12)
// this.baiduMap.disableDragging();
// this.baiduMap.setCurrentCity('嘉禾县');
// var b = new BMapGL.Bounds(new BMapGL.Point(112.37558, 25.59342), new BMapGL.Point(112.832025, 40.126349));
// console.log(b)
// try {
// BMapLib.AreaRestriction.setBounds(this.baiduMap, b);
// } catch (e) {
// alert(e);
// }
// var opts = { type: BMAP_NAVIGATION_CONTROL_SMALL }
// this.baiduMap.addControl(new BMapGL.NavigationControl(opts));
// this.baiduMap.setMapStyleV2({ style: 'midnight' });
@ -194,8 +215,8 @@ export default {
}
var prism = new BMapGL.Prism(path, 2000, {
topFillColor: '#000',
topFillOpacity: 0.6,
topFillColor: '#8de0ff',
topFillOpacity: 0.8,
sideFillColor: '#0e2566',
sideFillOpacity: 0.9
@ -203,10 +224,10 @@ export default {
this.baiduMap.addOverlay(prism);
// var prism1 = new BMapGL.Prism(path, 1000, {
// topFillColor: '#000',
// topFillOpacity: 0,
// sideFillColor: '#fff',
// sideFillOpacity: 0.9
// topFillColor: '#8dc6ff',
// topFillOpacity: 0.3,
// sideFillColor: '#8dc6ff',
// sideFillOpacity: 0
// });
// this.baiduMap.addOverlay(prism1);

10
src/views/energySourcesProvince/component/statistics.vue
Unescape View File

@ -16,7 +16,7 @@
:row-class-name="tableRowClassName">
<el-table-column prop="name" label="企业名称" width="200%">
<template slot-scope="scope">
<span>{{ scope.row.name }}</span>
<span style="font-size: 0.14rem;">{{ scope.row.name }}</span>
<span class="rank" v-if="scope.$index <= 2" :style="rankStyle(scope.$index)">TOP.{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
@ -125,7 +125,7 @@ export default {
}
.statistics /deep/ .el-table td span{
font-size: 0.14rem !important;
font-size: 0.16rem;
font-family: Acumin-Pro-Condensed-Regular-2;
}
.statistics /deep/ .el-table::before {
@ -181,11 +181,11 @@ export default {
.rank {
display: inline-block;
width: 0.36rem;
width: 0.32rem;
height: 0.18rem;
line-height: 0.21rem;
line-height: 0.22rem;
text-align: center;
font-size: 0.14rem;
font-size: 0.14rem !important;
font-weight: normal;
color: #FFFFFF;
// padding: 0.04rem 0.06rem;

Write Preview
Loading…
Cancel
Save