MRC
/
geodata-catalog
2
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: MRC:main
Branches Tags
MRC:dev
MRC:main
MRC:abandoned-update
MRC:v0.8
MRC:map
MRC:v0.7
MRC:v0.6
MRC:v0.5
MRC:v0.4
MRC:v0.3
MRC:v0.2
MRC:v0.1
..
compare: MRC:abandoned-update
Branches Tags
MRC:dev
MRC:main
MRC:abandoned-update
MRC:v0.8
MRC:map
MRC:v0.7
MRC:v0.6
MRC:v0.5
MRC:v0.4
MRC:v0.3
MRC:v0.2
MRC:v0.1

3 Commits
main ... abandoned-

Author SHA1 Message Date
rrr-marble 65791a60ae add: translate search placeholder text
3 years ago
rrr-marble dd14f13020 msc: update vuestic-ui to 1.5.0
3 years ago
rrr-marble 54b16d4cee msc: update node to 16.18
3 years ago
20 changed files with 164 additions and 57 deletions
Show Stats

10
backend/src/main.py
Unescape View File

@ -201,15 +201,7 @@ def create_items(
for row in sheet["data"] for row in sheet["data"]
] ]
# dump all the data into database # dump all the data into database
try: accepted, processed = crud.insert_items(db=db, items=spreadsheet_item_list)
accepted, processed = crud.insert_items(db=db, items=spreadsheet_item_list)
except Exception as e:
raise HTTPException(
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
detail="{}".format(
e
),
)
# transform spreadsheet coordinates data into spacial # transform spreadsheet coordinates data into spacial
crud.add_spacial_data(db=db) crud.add_spacial_data(db=db)

2
docker/Dockerfile.frontend
Unescape View File

@ -3,7 +3,7 @@ FROM caddy:2-builder-alpine as xcaddy-stage
RUN xcaddy build --with github.com/ggicci/caddy-jwt RUN xcaddy build --with github.com/ggicci/caddy-jwt
FROM node:12.22.12-bullseye as build-stage FROM node:16.18-bullseye as build-stage
WORKDIR /app WORKDIR /app
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN npm install RUN npm install

67
frontend/package-lock.json generated
Unescape View File

@ -14,7 +14,6 @@
"vuestic-ui": "^1.4.13" "vuestic-ui": "^1.4.13"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.0.0",
"@vue/cli-service": "~5.0.0", "@vue/cli-service": "~5.0.0",
"nodemon": "^2.0.19", "nodemon": "^2.0.19",
"vue-cli-plugin-vuestic-ui": "~1.0.8" "vue-cli-plugin-vuestic-ui": "~1.0.8"
@ -39,6 +38,7 @@
"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
"integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@jridgewell/gen-mapping": "^0.1.0", "@jridgewell/gen-mapping": "^0.1.0",
"@jridgewell/trace-mapping": "^0.3.9" "@jridgewell/trace-mapping": "^0.3.9"
@ -73,6 +73,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
"integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==", "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@ampproject/remapping": "^2.1.0", "@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6", "@babel/code-frame": "^7.18.6",
@ -103,6 +104,7 @@
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
"dev": true, "dev": true,
"peer": true,
"bin": { "bin": {
"json5": "lib/cli.js" "json5": "lib/cli.js"
}, },
@ -115,6 +117,7 @@
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.10.tgz",
"integrity": "sha512-0+sW7e3HjQbiHbj1NeU/vN8ornohYlacAfZIaXhdoGweQqgcNy69COVciYYqEXJ/v+9OBA7Frxm4CVAuNqKeNA==", "integrity": "sha512-0+sW7e3HjQbiHbj1NeU/vN8ornohYlacAfZIaXhdoGweQqgcNy69COVciYYqEXJ/v+9OBA7Frxm4CVAuNqKeNA==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.18.10", "@babel/types": "^7.18.10",
"@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/gen-mapping": "^0.3.2",
@ -129,6 +132,7 @@
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@jridgewell/set-array": "^1.0.1", "@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/sourcemap-codec": "^1.4.10",
@ -161,6 +165,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
"integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
} }
@ -170,6 +175,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
"integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/template": "^7.18.6", "@babel/template": "^7.18.6",
"@babel/types": "^7.18.9" "@babel/types": "^7.18.9"
@ -183,6 +189,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
"integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
}, },
@ -195,6 +202,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
"integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
}, },
@ -207,6 +215,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
"integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-module-imports": "^7.18.6", "@babel/helper-module-imports": "^7.18.6",
@ -226,6 +235,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
"integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==", "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
}, },
@ -238,6 +248,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
"integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
}, },
@ -250,6 +261,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
"integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
} }
@ -277,6 +289,7 @@
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
"integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/template": "^7.18.6", "@babel/template": "^7.18.6",
"@babel/traverse": "^7.18.9", "@babel/traverse": "^7.18.9",
@ -378,6 +391,7 @@
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/code-frame": "^7.18.6", "@babel/code-frame": "^7.18.6",
"@babel/parser": "^7.18.10", "@babel/parser": "^7.18.10",
@ -392,6 +406,7 @@
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.10.tgz",
"integrity": "sha512-J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g==", "integrity": "sha512-J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/code-frame": "^7.18.6", "@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.18.10", "@babel/generator": "^7.18.10",
@ -413,6 +428,7 @@
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
"integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==", "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@babel/helper-string-parser": "^7.18.10", "@babel/helper-string-parser": "^7.18.10",
"@babel/helper-validator-identifier": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6",
@ -442,6 +458,7 @@
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@jridgewell/set-array": "^1.0.0", "@jridgewell/set-array": "^1.0.0",
"@jridgewell/sourcemap-codec": "^1.4.10" "@jridgewell/sourcemap-codec": "^1.4.10"
@ -2333,6 +2350,7 @@
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"safe-buffer": "~5.1.1" "safe-buffer": "~5.1.1"
} }
@ -2341,7 +2359,8 @@
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true "dev": true,
"peer": true
}, },
"node_modules/cookie": { "node_modules/cookie": {
"version": "0.4.2", "version": "0.4.2",
@ -3568,6 +3587,7 @@
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
} }
@ -3646,6 +3666,7 @@
"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
@ -4281,6 +4302,7 @@
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
"dev": true, "dev": true,
"peer": true,
"bin": { "bin": {
"jsesc": "bin/jsesc" "jsesc": "bin/jsesc"
}, },
@ -7275,6 +7297,7 @@
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
@ -8120,6 +8143,7 @@
"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
"integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@jridgewell/gen-mapping": "^0.1.0", "@jridgewell/gen-mapping": "^0.1.0",
"@jridgewell/trace-mapping": "^0.3.9" "@jridgewell/trace-mapping": "^0.3.9"
@ -8145,6 +8169,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
"integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==", "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@ampproject/remapping": "^2.1.0", "@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6", "@babel/code-frame": "^7.18.6",
@ -8167,7 +8192,8 @@
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
"dev": true "dev": true,
"peer": true
} }
} }
}, },
@ -8176,6 +8202,7 @@
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.10.tgz",
"integrity": "sha512-0+sW7e3HjQbiHbj1NeU/vN8ornohYlacAfZIaXhdoGweQqgcNy69COVciYYqEXJ/v+9OBA7Frxm4CVAuNqKeNA==", "integrity": "sha512-0+sW7e3HjQbiHbj1NeU/vN8ornohYlacAfZIaXhdoGweQqgcNy69COVciYYqEXJ/v+9OBA7Frxm4CVAuNqKeNA==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/types": "^7.18.10", "@babel/types": "^7.18.10",
"@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/gen-mapping": "^0.3.2",
@ -8187,6 +8214,7 @@
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@jridgewell/set-array": "^1.0.1", "@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/sourcemap-codec": "^1.4.10",
@ -8211,13 +8239,15 @@
"version": "7.18.9", "version": "7.18.9",
"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
"integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
"dev": true "dev": true,
"peer": true
}, },
"@babel/helper-function-name": { "@babel/helper-function-name": {
"version": "7.18.9", "version": "7.18.9",
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
"integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/template": "^7.18.6", "@babel/template": "^7.18.6",
"@babel/types": "^7.18.9" "@babel/types": "^7.18.9"
@ -8228,6 +8258,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
"integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
} }
@ -8237,6 +8268,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
"integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
} }
@ -8246,6 +8278,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
"integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-module-imports": "^7.18.6", "@babel/helper-module-imports": "^7.18.6",
@ -8262,6 +8295,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
"integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==", "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
} }
@ -8271,6 +8305,7 @@
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
"integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/types": "^7.18.6" "@babel/types": "^7.18.6"
} }
@ -8279,7 +8314,8 @@
"version": "7.18.10", "version": "7.18.10",
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
"integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
"dev": true "dev": true,
"peer": true
}, },
"@babel/helper-validator-identifier": { "@babel/helper-validator-identifier": {
"version": "7.18.6", "version": "7.18.6",
@ -8298,6 +8334,7 @@
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
"integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/template": "^7.18.6", "@babel/template": "^7.18.6",
"@babel/traverse": "^7.18.9", "@babel/traverse": "^7.18.9",
@ -8377,6 +8414,7 @@
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/code-frame": "^7.18.6", "@babel/code-frame": "^7.18.6",
"@babel/parser": "^7.18.10", "@babel/parser": "^7.18.10",
@ -8388,6 +8426,7 @@
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.10.tgz",
"integrity": "sha512-J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g==", "integrity": "sha512-J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/code-frame": "^7.18.6", "@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.18.10", "@babel/generator": "^7.18.10",
@ -8406,6 +8445,7 @@
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
"integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==", "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@babel/helper-string-parser": "^7.18.10", "@babel/helper-string-parser": "^7.18.10",
"@babel/helper-validator-identifier": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6",
@ -8432,6 +8472,7 @@
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@jridgewell/set-array": "^1.0.0", "@jridgewell/set-array": "^1.0.0",
"@jridgewell/sourcemap-codec": "^1.4.10" "@jridgewell/sourcemap-codec": "^1.4.10"
@ -9966,6 +10007,7 @@
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"safe-buffer": "~5.1.1" "safe-buffer": "~5.1.1"
}, },
@ -9974,7 +10016,8 @@
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true "dev": true,
"peer": true
} }
} }
}, },
@ -10903,7 +10946,8 @@
"version": "1.0.0-beta.2", "version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
"dev": true "dev": true,
"peer": true
}, },
"geojson-vt": { "geojson-vt": {
"version": "3.2.1", "version": "3.2.1",
@ -10963,7 +11007,8 @@
"version": "11.12.0", "version": "11.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
"dev": true "dev": true,
"peer": true
}, },
"globby": { "globby": {
"version": "11.1.0", "version": "11.1.0",
@ -11432,7 +11477,8 @@
"version": "2.5.2", "version": "2.5.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
"dev": true "dev": true,
"peer": true
}, },
"json-parse-better-errors": { "json-parse-better-errors": {
"version": "1.0.2", "version": "1.0.2",
@ -13658,7 +13704,8 @@
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
"dev": true "dev": true,
"peer": true
}, },
"to-regex-range": { "to-regex-range": {
"version": "5.0.1", "version": "5.0.1",

2
frontend/package.json
Unescape View File

@ -10,7 +10,7 @@
"maplibre-gl": "^2.1.9", "maplibre-gl": "^2.1.9",
"vue": "^3.2.13", "vue": "^3.2.13",
"vue-router": "^4.1.5", "vue-router": "^4.1.5",
"vuestic-ui": "^v1.8.6" "vuestic-ui": "^1.5.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-service": "~5.0.0", "@vue/cli-service": "~5.0.0",

46
frontend/src/components/ActiveSchemaScreen.vue
Unescape View File

@ -2,7 +2,9 @@
<div> <div>
<h1 style="font-size: 3rem; margin: 1rem;">Текущий формат</h1> <h1 style="font-size: 3rem; margin: 1rem;">Текущий формат</h1>
<h2 style="margin-left: 1rem;">(скоординированный)</h2> <h2 style="margin-left: 1rem;">(скоординированный)</h2>
<div class="va-table-responsive" style="margin: 1rem;"> <va-radio class="radio-switcher" v-for="(option, index) in viewOptions" :key="index" v-model="selectedOption"
:option="option" :label="viewLabels[index]"></va-radio>
<div class="va-table-responsive" v-if="selectedOption === 'table-view'">
<table class="va-table va-table--striped detail-table"> <table class="va-table va-table--striped detail-table">
<thead> <thead>
<tr> <tr>
@ -18,6 +20,24 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<va-list v-else-if="selectedOption === 'list-view'">
<va-list-item v-for="(_, header, index) in items[0]" :key="index" class="header-list">
<va-list-item-section icon>
<va-icon name="circle" color="#babfc2" size="small"></va-icon>
</va-list-item-section>
<va-list-item-section>
<va-list-item-label class="header-item" :lines="2">{{ header }}</va-list-item-label>
</va-list-item-section>
</va-list-item>
</va-list>
<div v-else class="card-row">
<div class="card-item flex lg4" v-for="(_, header, index) in items[0]" :key="index">
<va-card :bordered="false">
<va-card-content>{{ header }}</va-card-content>
</va-card>
</div>
</div>
</div> </div>
</template> </template>
@ -28,7 +48,18 @@ export default defineComponent({
name: "active-schema-screen", name: "active-schema-screen",
data() { data() {
return { return {
columns: [] columns: [],
viewOptions: [
"table-view",
"list-view",
"mosaic-view",
],
viewLabels: [
"Табличный вид",
"Списочный вид",
"Мозаичный вид",
],
selectedOption: "table-view"
} }
}, },
methods: { methods: {
@ -58,9 +89,20 @@ export default defineComponent({
<style lang="css" scoped> <style lang="css" scoped>
.radio-switcher {
margin: 1rem;
}
.header-item { .header-item {
padding: 0.5rem; padding: 0.5rem;
} }
.card-row {
display: flex;
flex-wrap: wrap;
}
.card-item {
margin: 1rem;
}
</style> </style>

2
frontend/src/components/ItemMapComponent.vue
Unescape View File

@ -30,7 +30,7 @@ export default {
const addSamplesLayer = () => { const addSamplesLayer = () => {
map.value.addSource('samples', { map.value.addSource('samples', {
'type': 'vector', 'type': 'vector',
"tiles": ["http://localhost/martin/public.geodata/{z}/{x}/{y}.pbf"], "tiles": ["http://localhost:8080/martin/public.geodata/{z}/{x}/{y}.pbf"],
'promoteId': 'fadr', 'promoteId': 'fadr',
}); });

35
frontend/src/components/MapComponent.vue
Unescape View File

@ -102,7 +102,7 @@ export default {
map.value.addSource('samples', { map.value.addSource('samples', {
'type': 'vector', 'type': 'vector',
"tiles": ["http://localhost/martin/public.geodata/{z}/{x}/{y}.pbf"], "tiles": ["http://localhost:8080/martin/public.geodata/{z}/{x}/{y}.pbf"],
'promoteId': 'fadr', 'promoteId': 'fadr',
}); });
@ -132,7 +132,7 @@ export default {
closeOnClick: false, closeOnClick: false,
}); });
map.value.on("click", "fields-layer", (e) => { map.value.on("dblclick", "fields-layer", (e) => {
new maplibregl.Popup({}) new maplibregl.Popup({})
.setLngLat(e.lngLat) .setLngLat(e.lngLat)
.setHTML(e.features[0].properties["descriptio"]) .setHTML(e.features[0].properties["descriptio"])
@ -154,7 +154,7 @@ export default {
// Populate the popup and set its coordinates // Populate the popup and set its coordinates
// based on the feature found. // based on the feature found.
popup popup
.setLngLat(e.features[0].geometry.coordinates) .setLngLat(e.lngLat)
.setHTML(`Записей в точке: <b>${e.features.length}</b>`) .setHTML(`Записей в точке: <b>${e.features.length}</b>`)
.addTo(map.value); .addTo(map.value);
}); });
@ -222,10 +222,30 @@ export default {
}; };
const updateSamplesLayer = () => { const updateSamplesLayer = () => {
if (props.idlist.length < 2000) { if (map.value.getLayer('samples-layer')) {
map.value.setFilter('samples-layer', ["in", "internal_id", ...props.idlist]) map.value.removeLayer('samples-layer');
} else { }
map.value.setFilter('samples-layer', null)
if (props.idlist.length) {
map.value.addLayer({
'id': 'samples-layer',
'source': 'samples',
'source-layer': 'public.geodata',
'type': 'circle',
'paint': {
'circle-stroke-width': 1,
'circle-stroke-color': '#FFFFFF',
'circle-color': [
'case',
['boolean', ['feature-state', 'beenClicked'], false],
'#fec44f',
'#d95f0e'
],
'circle-opacity': 0.8,
'circle-radius': 8
},
filter: ["match", ["get", "internal_id"], props.idlist, true, false]
});
} }
}; };
@ -300,5 +320,6 @@ export default {
.va-radio__text, .va-checkbox__label { .va-radio__text, .va-checkbox__label {
color: white; color: white;
text-shadow: 0 0 3px black;
} }
</style> </style>

6
frontend/src/components/Navbar.vue
Unescape View File

@ -4,7 +4,7 @@
<template #left> <template #left>
<va-navbar-item class="top-icon"> <va-navbar-item class="top-icon">
<va-popover message="Карта" prevent-overflow stick-to-edges> <va-popover message="Карта" prevent-overflow stick-to-edges>
<va-icon size="3rem" name="public" @click="$router.push('/')" /> <va-icon size="3rem" color="#babfc2" name="public" @click="$router.push('/')" />
</va-popover> </va-popover>
</va-navbar-item> </va-navbar-item>
<slot></slot> <slot></slot>
@ -14,7 +14,7 @@
<template #anchor> <template #anchor>
<va-navbar-item class="top-icon"> <va-navbar-item class="top-icon">
<va-popover message="Корзина" prevent-overflow stick-to-edges> <va-popover message="Корзина" prevent-overflow stick-to-edges>
<va-icon size="3rem" name="shopping_basket" @click="" /> <va-icon size="3rem" color="#babfc2" name="shopping_basket" @click="" />
</va-popover> </va-popover>
</va-navbar-item> </va-navbar-item>
</template> </template>
@ -52,7 +52,7 @@
</va-dropdown> </va-dropdown>
<va-navbar-item class="top-icon"> <va-navbar-item class="top-icon">
<va-popover message="Аккаунт" prevent-overflow stick-to-edges> <va-popover message="Аккаунт" prevent-overflow stick-to-edges>
<va-icon size="3rem" name="account_box" @click="$emit('accountClick')" /> <va-icon size="3rem" color="#babfc2" name="account_box" @click="$emit('accountClick')" />
</va-popover> </va-popover>
</va-navbar-item> </va-navbar-item>
</template> </template>

3
frontend/src/components/OverviewScreen.vue
Unescape View File

@ -6,7 +6,7 @@
</va-card> </va-card>
<va-card class="content-container"> <va-card class="content-container">
<va-scroll-container vertical> <va-scroll-container vertical>
<va-data-table virtual-scroller sticky-header v-if="items.length" :items="items" :columns="columns" :hoverable="true" :clickable="true" <va-data-table v-if="items.length" :items="items" :columns="columns" :hoverable="true" :clickable="true"
@row:click="(e) => $router.push(`/items/${e.item.id}`)" @row:click="(e) => $router.push(`/items/${e.item.id}`)"
no-data-filtered-html="Не найдено образцов, соответствующих данному запросу" /> no-data-filtered-html="Не найдено образцов, соответствующих данному запросу" />
<h1 v-else class="no-items">Не найдено образцов, соответствующих данному запросу</h1> <h1 v-else class="no-items">Не найдено образцов, соответствующих данному запросу</h1>
@ -39,6 +39,7 @@ export default {
methods: {}, methods: {},
computed: { computed: {
itemIdList() { itemIdList() {
return this.items.map(item => item.internal_id) return this.items.map(item => item.internal_id)
}, },

4
frontend/src/components/Sidebar.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<va-sidebar class="sidebar-proper" width="18rem"> <va-sidebar color="#ffffff" text-color="#000000" class="sidebar-proper" width="18rem">
<slot></slot> <slot></slot>
</va-sidebar> </va-sidebar>
</div> </div>
@ -17,7 +17,7 @@ export default {
<style lang="css"> <style lang="css">
.sidebar-proper { .sidebar-proper {
height: max(100vh, 100%); height: max(100vh, 100%);
box-shadow: 0 0 15px rgba(0, 0, 0, 0.5); box-shadow: 0 0 15px rgba(0, 0, 0, 0.75);
clip-path: inset(0px -15px 0px 0px); clip-path: inset(0px -15px 0px 0px);
overflow-y: hidden; overflow-y: hidden;
} }

4
frontend/src/components/filters/BasinFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="basinOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="basinOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>

4
frontend/src/components/filters/CategoryFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="categoryOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="categoryOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>

4
frontend/src/components/filters/DatalistFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="datalistOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="datalistOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>

4
frontend/src/components/filters/DescriptionFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="descriptionOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="descriptionOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>

4
frontend/src/components/filters/FormDimensionsFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="formDimentionsOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="formDimentionsOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>

5
frontend/src/components/filters/GisCategoryFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="categoryOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="categoryOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>
@ -34,4 +34,5 @@ export default {
<style lang="css"> <style lang="css">
</style> </style>

5
frontend/src/components/filters/OrgFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" v-model="selectedOptions" :options="orgOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" v-model="selectedOptions"
@update:model-value="applyFilter" multiple searchable> :options="orgOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>
@ -35,4 +35,5 @@ export default {
<style lang="css"> <style lang="css">
</style> </style>

4
frontend/src/components/filters/ProjectFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" :options="projectOptions" v-model="selectedOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" :options="projectOptions"
@update:model-value="applyFilter" multiple searchable> v-model="selectedOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>

5
frontend/src/components/filters/ScannerFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" v-model="selectedOptions" :options="scannerOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" v-model="selectedOptions"
@update:model-value="applyFilter" multiple searchable> :options="scannerOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>
@ -34,4 +34,5 @@ export default {
<style lang="css"> <style lang="css">
</style> </style>

5
frontend/src/components/filters/StratumFilter.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<va-select class="multi-selector" v-model="selectedOptions" :options="stratumOptions" <va-select search-placeholder-text="Поиск…" class="multi-selector" v-model="selectedOptions"
@update:model-value="applyFilter" multiple searchable> :options="stratumOptions" @update:model-value="applyFilter" multiple searchable>
</va-select> </va-select>
</div> </div>
</template> </template>
@ -31,4 +31,5 @@ export default {
<style lang="css"> <style lang="css">
</style> </style>
Write Preview
Loading…
Cancel
Save