Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua
commit
a206966b5f
|
|
@ -150,7 +150,7 @@
|
||||||
"vue3-print-nb": "0.1.4",
|
"vue3-print-nb": "0.1.4",
|
||||||
"vuedraggable": "^4.1.0",
|
"vuedraggable": "^4.1.0",
|
||||||
"vuex": "^4.1.0",
|
"vuex": "^4.1.0",
|
||||||
"vxe-table": "^4.5.17",
|
"vxe-table": "^4.17.48",
|
||||||
"vxe-table-plugin-export-xlsx": "^3.1.0",
|
"vxe-table-plugin-export-xlsx": "^3.1.0",
|
||||||
"xe-utils": "^3.5.14",
|
"xe-utils": "^3.5.14",
|
||||||
"xlsx": "^0.18.5",
|
"xlsx": "^0.18.5",
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ worldMapContainer1.style.width = "970px";
|
||||||
worldMapContainer1.style.position = "relative";
|
worldMapContainer1.style.position = "relative";
|
||||||
worldMapContainer1.style.left = "30px";
|
worldMapContainer1.style.left = "30px";
|
||||||
|
|
||||||
mapboxgl.accessToken = 'pk.eyJ1IjoibGllYmFvIiwiYSI6ImNsMXg1OHdtcTE3eDEza3FmODBmeXhldmIifQ.CYYMuikQnGHMtTNq60B_xA';
|
mapboxgl.accessToken = 'pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw';
|
||||||
let map = new mapboxgl.Map({
|
let map = new mapboxgl.Map({
|
||||||
container: 'distribution_map',
|
container: 'distribution_map',
|
||||||
style: {
|
style: {
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
let map: Map;
|
let map: Map;
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
mapboxgl.accessToken = "pk.eyJ1IjoiaHVhbmdsaWkiLCJhIjoiY2wwM2E4a2drMDVrZjNrcGRucHIxOHo0cyJ9.0ecG5KGQE6R-SmhxvLvhHg"
|
mapboxgl.accessToken = "pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw"
|
||||||
map = initMap();
|
map = initMap();
|
||||||
map.on('load', function () {
|
map.on('load', function () {
|
||||||
refreshLocation();
|
refreshLocation();
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
export enum MapboxConfig {
|
export enum MapboxConfig {
|
||||||
ACCESS_TOKEN = 'pk.eyJ1IjoiYzRzci1nc2FwcCIsImEiOiJja2J0ajRtNzMwOHBnMnNvNnM3Ymw5MnJzIn0.fsTNczOFZG8Ik3EtO9LdNQ',
|
ACCESS_TOKEN = 'pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw',
|
||||||
// ACCESS_TOKEN = "1234",
|
// ACCESS_TOKEN = "1234",
|
||||||
TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
|
TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
|
||||||
// add more config options here
|
// add more config options here
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import tableEmits from 'vxe-table/es/table/src/emits';
|
// import tableEmits from 'vxe-table/es/table/src/emits';
|
||||||
|
|
||||||
export const basicEmits = [
|
export const basicEmits = [
|
||||||
...tableEmits,
|
// ...tableEmits,
|
||||||
'page-change',
|
'page-change',
|
||||||
'form-submit',
|
'form-submit',
|
||||||
'form-submit-invalid',
|
'form-submit-invalid',
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
import { VxeGridPropTypes, VxeTablePropTypes } from 'vxe-table';
|
import { VxeGridPropTypes, VxeTablePropTypes } from 'vxe-table';
|
||||||
import tableProps from 'vxe-table/es/table/src/props';
|
// import tableProps from 'vxe-table/es/table/src/props';
|
||||||
import { CSSProperties } from 'vue';
|
import { CSSProperties } from 'vue';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description: table二次开发需要后,需要接受的所有prop属性
|
* @description: table二次开发需要后,需要接受的所有prop属性
|
||||||
*/
|
*/
|
||||||
export const basicProps = {
|
export const basicProps = {
|
||||||
...tableProps,
|
// ...tableProps,
|
||||||
columns: Array as PropType<VxeGridPropTypes.Columns>,
|
columns: Array as PropType<VxeGridPropTypes.Columns>,
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
type: Object as PropType<VxeGridPropTypes.PagerConfig>,
|
type: Object as PropType<VxeGridPropTypes.PagerConfig>,
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { REDIRECT_NAME, LAYOUT, EXCEPTION_COMPONENT, PAGE_NOT_FOUND_NAME } from
|
||||||
// 404 on a page
|
// 404 on a page
|
||||||
export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
|
export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
|
||||||
path: '/:path(.*)*',
|
path: '/:path(.*)*',
|
||||||
name: PAGE_NOT_FOUND_NAME,
|
name: '11',
|
||||||
component: LAYOUT,
|
component: LAYOUT,
|
||||||
meta: {
|
meta: {
|
||||||
title: 'ErrorPage',
|
title: 'ErrorPage',
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
export enum MapboxConfig {
|
export enum MapboxConfig {
|
||||||
ACCESS_TOKEN = 'pk.eyJ1IjoiYzRzci1nc2FwcCIsImEiOiJja2J0ajRtNzMwOHBnMnNvNnM3Ymw5MnJzIn0.fsTNczOFZG8Ik3EtO9LdNQ',
|
ACCESS_TOKEN = 'pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw',
|
||||||
// ACCESS_TOKEN = "1234",
|
// ACCESS_TOKEN = "1234",
|
||||||
TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
|
TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
|
||||||
// add more config options here
|
// add more config options here
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
export const MAPBOX_TOKEN = "pk.eyJ1IjoiYzRzci1nc2FwcCIsImEiOiJja2J0ajRtNzMwOHBnMnNvNnM3Ymw5MnJzIn0.fsTNczOFZG8Ik3EtO9LdNQ";
|
export const MAPBOX_TOKEN = "pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw";
|
||||||
|
|
||||||
export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
|
export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
export const MAPBOX_TOKEN = "pk.eyJ1IjoiYzRzci1nc2FwcCIsImEiOiJja2J0ajRtNzMwOHBnMnNvNnM3Ymw5MnJzIn0.fsTNczOFZG8Ik3EtO9LdNQ";
|
export const MAPBOX_TOKEN = "pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw";
|
||||||
|
|
||||||
export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
|
export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
export enum MapboxConfig {
|
export enum MapboxConfig {
|
||||||
ACCESS_TOKEN = 'pk.eyJ1IjoiYzRzci1nc2FwcCIsImEiOiJja2J0ajRtNzMwOHBnMnNvNnM3Ymw5MnJzIn0.fsTNczOFZG8Ik3EtO9LdNQ',
|
ACCESS_TOKEN = 'pk.eyJ1Ijoid2FsbGFieXdheSIsImEiOiJjbDV1MHF1MzkwZXAyM2tveXZjaDVlaXJpIn0.wyOgHkuGJ37Xrx1x_49gIw',
|
||||||
// ACCESS_TOKEN = "1234",
|
// ACCESS_TOKEN = "1234",
|
||||||
TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
|
TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
|
||||||
// add more config options here
|
// add more config options here
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue