Compare commits

..

No commits in common. "bbb844b266ea424977be785951d3cd5bd6fa78f5" and "c2cf9ae0f47a6e1ff3da31ad1eacb0f361497d70" have entirely different histories.

6 changed files with 28 additions and 33 deletions

View File

@ -283,11 +283,10 @@ export default {
background-color: #ebf1f7; background-color: #ebf1f7;
.banner { .banner {
background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg); background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: contain; background-size: 100% 100%;
width: 100%; width: 100%;
height: 480px; height: 480px;
display: flex; display: flex;

View File

@ -283,11 +283,10 @@ export default {
background-color: #ebf1f7; background-color: #ebf1f7;
.banner { .banner {
background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg); background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: contain; background-size: 100% 100%;
width: 100%; width: 100%;
height: 480px; height: 480px;
display: flex; display: flex;

View File

@ -282,11 +282,10 @@ export default {
background-color: #ebf1f7; background-color: #ebf1f7;
.banner { .banner {
background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg); background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: contain; background-size: 100% 100%;
width: 100%; width: 100%;
height: 480px; height: 480px;
display: flex; display: flex;

View File

@ -70,13 +70,14 @@
</template> </template>
<script> <script>
import Vue from 'vue'
import BarChart from './components/BarChart.vue' import BarChart from './components/BarChart.vue'
import PieChart from './components/PieChart.vue' import PieChart from './components/PieChart.vue'
import { reportList, shipTotal, shipUnit, shipUnitYear, shipVoyage } from '../../api/statistics' import { reportList, shipTotal, shipUnit, shipUnitYear, shipVoyage } from '../../api/statistics'
import { getYearRange, filterDictItems } from '../../utils/index' import { getYearRange, filterDictItems } from '../../utils/index'
import { initMapbox } from '@/utils/mapbox-utils' import { initMapbox, handleWheel, initSprites, triggerLayerClick } from "@/utils/mapbox-utils";
import { loadVectorLayer, loadJsonPointFeature } from '@/utils/vector-layer-utils' import { loadVectorLayer, loadJsonLineFeature, loadJsonPointFeature, highlightFeaturesByProperty } from '@/utils/vector-layer-utils'
import { ColorGenerator } from '@/utils/color-generator' import { ColorGenerator } from '@/utils/color-generator';
export default { export default {
components: { components: {
@ -133,20 +134,20 @@ export default {
this.getChartBar({ year: '2025' }) this.getChartBar({ year: '2025' })
}, },
mounted() { mounted() {
initMapbox('workUnitMap_ship', { initMapbox("workUnitMap_ship", {
tileKey: 'gaode', tileKey: "gaode",
zoom: 3, zoom: 3,
center: [110, 31], center: [110, 31],
minZoom: 2, minZoom: 2,
maxZoom: 29 maxZoom: 29
}) });
initMapbox('voyageMap_ship', { initMapbox("voyageMap_ship", {
tileKey: 'GEBCO_basemap_NCEI', tileKey: "GEBCO_basemap_NCEI",
zoom: 3, zoom: 3,
center: [113, 15], center: [113, 15],
minZoom: 2, minZoom: 2,
maxZoom: 29 maxZoom: 29
}) });
}, },
beforeDestroy() { beforeDestroy() {
@ -188,15 +189,15 @@ export default {
// //
getShipUnit() { getShipUnit() {
shipUnit().then(res => { shipUnit().then(res => {
const geojson = { let geojson = {
type: 'FeatureCollection', type: "FeatureCollection",
features: [] features: []
} };
res.array.forEach(element => { res.array.forEach(element => {
geojson.features.push({ geojson.features.push({
type: 'Feature', type: "Feature",
geometry: { geometry: {
type: 'Point', type: "Point",
coordinates: [element.unit_lon, element.unit_lat] coordinates: [element.unit_lon, element.unit_lat]
}, },
properties: { properties: {
@ -205,9 +206,9 @@ export default {
create_time: element.create_time, create_time: element.create_time,
tsy_id: element.tsy_id tsy_id: element.tsy_id
} }
}) });
}) });
loadJsonPointFeature('workUnit', 'blue', geojson, 'unit_name', 'workUnitMap_ship') loadJsonPointFeature("workUnit", "blue", geojson, "unit_name", "workUnitMap_ship");
const typeCount = res.array.reduce((acc, unit) => { const typeCount = res.array.reduce((acc, unit) => {
const type = unit.unit_type const type = unit.unit_type
@ -224,13 +225,13 @@ export default {
// //
gitShipVoyage(params = {}) { gitShipVoyage(params = {}) {
shipVoyage(params).then(res => { shipVoyage(params).then(res => {
let i = 0 let i = 0;
const colors = ColorGenerator.generateDivergingColors(res.array.length) const colors = ColorGenerator.generateDivergingColors(res.array.length);
// //
res.array.forEach(item => { res.array.forEach(item => {
// //
loadVectorLayer(item.voyage_name, ['line', 'symbol'], [colors[i], '#FFFFFF'], 'visible', 'voyageMap_ship', 'dsds') loadVectorLayer(item.voyage_name, ["line", "symbol"], [colors[i], "#FFFFFF"], "visible", "voyageMap_ship", "dsds");
i++ i++;
}) })
}) })
}, },
@ -305,11 +306,10 @@ export default {
background-color: #ebf1f7; background-color: #ebf1f7;
.banner { .banner {
background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg); background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: contain; background-size: 100% 100%;
width: 100%; width: 100%;
height: 480px; height: 480px;
display: flex; display: flex;

View File

@ -266,11 +266,10 @@ export default {
background-color: #ebf1f7; background-color: #ebf1f7;
.banner { .banner {
background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg); background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: contain; background-size: 100% 100%;
width: 100%; width: 100%;
height: 480px; height: 480px;
display: flex; display: flex;

View File

@ -395,11 +395,10 @@ export default {
background-color: #ebf1f7; background-color: #ebf1f7;
.banner { .banner {
background-color: #012458;
background-image: url(../../../static/images/bannerny1.jpg); background-image: url(../../../static/images/bannerny1.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: contain; background-size: 100% 100%;
width: 100%; width: 100%;
height: 480px; height: 480px;
display: flex; display: flex;