From a5c3402dc1632a91cdc38222b2acdb7c09df18a1 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 27 Jan 2026 09:46:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 66 ---------------------------------
applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue | 1
2 files changed, 0 insertions(+), 67 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
index 0aca836..d62faa6 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
@@ -2,7 +2,6 @@
<el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close
:close-on-click-modal="false">
<div class="detail-container" v-if="dialogReadonly">
- <div class="detail-title">用户详情</div>
<el-row>
<el-col :span="12">
<div class="label">登录账号</div>
diff --git a/applications/task-work-order/src/components/map-container/mapContainer-copy.vue b/applications/task-work-order/src/components/map-container/mapContainer-copy.vue
deleted file mode 100644
index 66d1b89..0000000
--- a/applications/task-work-order/src/components/map-container/mapContainer-copy.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<!--
- * @Author: shuishen 1109946754@qq.com
- * @Date: 2024-10-25 15:07:51
- * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2025-04-28 11:34:40
- * @FilePath: \drone-command\src\components\map-container\mapContainer.vue
- * @Description:
- *
- * Copyright (c) 2024 by shuishen, All Rights Reserved.
--->
-<template>
- <div class="map-container">
- <div class="viewer-container" id="viewer-container">
- <div class="content">
- <slot name="content"></slot>
- </div>
- </div>
- </div>
-</template>
-
-<script setup>
-import * as turf from '@turf/turf'
-
-import { nextTick, onMounted, onUnmounted } from 'vue'
-import { read } from 'xlsx'
-
-import startPng from '@/assets/map_images/Startingpointicon.png'
-import endPng from '@/assets/map_images/EndPointicon.png'
-
-window.$viewer = null
-window.$Cesium = null
-let pointLayer = null
-let polylineLayer = null
-let pointHtmlLayer = null
-
-const { VITE_APP_BASE } = import.meta.env
-// import * as Cesium from 'cesium'
-// import 'cesium/Build/Cesium/Widgets/widgets.css'
-const isViewerReady = ref(false)
-const { rowDetails } = defineProps({
- rowDetails: {
- type: Object,
- default: () => ({}),
- }
-})
-
-
-async function initMap () {
- if (window.$viewer) return
-
- await DC.ready({
- // Cesium: Cesium,
- baseUrl: `${VITE_APP_BASE}/libs/dc-sdk/resources/`,
- })
-
- window.$Cesium = DC.getLib('Cesium')
-
- // 天地图地图
- const imageryProvider_standZh = new window.$Cesium.UrlTemplateImageryProvider({
- url: 'https://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
- subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
- maximumLevel: 18,
- credit: 'stand_zj',
- })
- const imageryProvider_stand = new window.$Cesium.UrlTemplateImageryProvider({
- url: 'https://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
- subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
- // format: 'image/jpeg',
- // show: true,
- maximumLevel: 18,
- credit: 'stand_tc',
- })
-
- window.$viewer = new DC.Viewer('viewer-container', {
- "sceneMode": 2 //1: 2.5D，2: 2D，3: 3D
- })
-
- window.$viewer.locationBar.enable = false
-
- window.$viewer?.zoomToPosition(new DC.Position(115.892151, 28.676493, 1000000, 0, -90, 0))
-
- window.$viewer?.imageryLayers.addImageryProvider(imageryProvider_stand)
- window.$viewer?.imageryLayers.addImageryProvider(imageryProvider_standZh)
-
- pointLayer = new DC.VectorLayer('pointLayer')
- window.$viewer?.addLayer(pointLayer)
- polylineLayer = new DC.VectorLayer('polylineLayer')
- window.$viewer?.addLayer(polylineLayer)
- pointHtmlLayer = new DC.HtmlLayer('pointHtmlLayer')
- window.$viewer?.addLayer(pointHtmlLayer)
-
- isViewerReady.value = true
-}
-
-/**
-* 初始化标注添加
-* @param type 类型
-* @param data 数据
-*/
-const initAddEntity = (type, data) => {
- watch(() => isViewerReady.value,
- (ready) => {
- if (ready) {
- type === 'point' ? addPoint(data) : addPolyline(data)
- }
- },
- { deep: true, immediate: true } // 初始化时立即执行
- )
-}
-
-/**
-* 添加点标注
-* @param data 数据 数据格式 [lng, lat]
-*/
-function addPoint (data) {
- if (pointLayer) pointLayer.clear()
-
- const [lng, lat] = data
-
- if (!lng || !lat) return
-
- let point = new DC.Point(new DC.Position(lng, lat))
- pointLayer.addOverlay(point)
-
- window.$viewer?.zoomTo(pointLayer)
-}
-
-/**
-* 添加点标注
-* @param data 数据 数据格式 [[lng, lat], [lng, lat], [lng, lat]]
-*/
-function addPolyline (data) {
- if (polylineLayer) polylineLayer.clear()
- if (pointHtmlLayer) pointHtmlLayer.clear()
-
- if (data.length === 0) return
-
- const positionStr = data.map(item => {
- const [lng, lat] = item
-
- return `${lng}, ${lat}`
- }).join(';')
-
- let polyline = new DC.Polyline(positionStr)
- polyline.setStyle({
- width: 4,
- material: new DC.PolylineTrailMaterialProperty({
- color: DC.Color.DEEPSKYBLUE,
- speed: 10
- }),
- clampToGround: true
- })
- polylineLayer.addOverlay(polyline)
-
-
- data.forEach((item, index) => {
- const [lng, lat] = item
- let position = new DC.Position(lng, lat)
-
- console.log(lng, lat)
- let billboard = null
-
- if (index === 0) {
- billboard = new DC.Billboard(position, startPng)
- }
-
- if (index === data.length - 1) {
- billboard = new DC.Billboard(position, endPng)
- }
-
-
- billboard && (billboard.size = [20, 20])
- billboard && (billboard.setStyle({
- "pixelOffset": { "x": 0, "y": -8 }
- }))
- billboard && polylineLayer.addOverlay(billboard)
-
- if (index !== 0 && index !== data.length - 1) {
- let divIcon = new DC.DivIcon(
- position,
- `<div class="point-icon-box">${index}</div>`
- )
- pointHtmlLayer.addOverlay(divIcon)
- }
- })
-
- const line = turf.lineString(positionStr.split(';').map(i => i.split(',')))
- const bbox = turf.bbox(line)
- const bboxPolygon = turf.bboxPolygon(bbox)
- const scaledPolygon = turf.transformScale(bboxPolygon, 3)
- const newBbox = turf.bbox(scaledPolygon)
-
- window.$viewer?.flyToBounds(
- newBbox,
- { heading: 0, pitch: -90, roll: 0 },
- () => { },
- 0
- )
-}
-
-onMounted(() => {
- nextTick(() => {
- initMap()
- })
-})
-
-onUnmounted(() => {
- if (pointLayer) {
- window.$viewer?.removeLayer(pointLayer)
- pointLayer = null
- }
-
- if (polylineLayer) {
- window.$viewer?.removeLayer(polylineLayer)
- polylineLayer = null
- }
-
- window.$viewer?.entities.removeAll()
- window.$viewer?.imageryLayers.removeAll()
- window.$viewer?.dataSources.removeAll()
- let gl = window.$viewer.scene.context._originalGLContext
- gl.canvas.width = 1
- gl.canvas.height = 1
-
- window.$viewer && window.$viewer.setTerrain()
- window.$viewer && window.$viewer.destroy()
- window.$viewer = null
- delete window.$viewer
- window.$Cesium = null
- delete window.$Cesium
- var cesiumContainer = document.getElementById('viewer-container')
- if (cesiumContainer) {
- cesiumContainer.remove() // 移除与地图相关的DOM元素
- }
-})
-
-defineExpose({
- initAddEntity
-})
-</script>
-
-<script>
-export default {
- name: 'MapContainer'
-}
-</script>
-
-<style lang="scss" scoped>
-.map-container {
- position: relative;
- width: 100% !important;
- height: 100% !important;
- overflow: hidden;
-}
-
-.viewer-container {
- position: absolute;
- top: 50%;
- left: 50%;
- width: 120%;
- height: 120%;
- transform: translate(-50%, -50%);
-}
-</style>
diff --git a/applications/task-work-order/src/views/orderView/organizationalMessage/agenciesManagement/agenciesApi.js b/applications/task-work-order/src/views/orderView/organizationalMessage/agenciesManagement/agenciesApi.js
deleted file mode 100644
index 2f4dd8c..0000000
--- a/applications/task-work-order/src/views/orderView/organizationalMessage/agenciesManagement/agenciesApi.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import request from '@/axios'
-
-// 列表
-export const agenciesPageApi = params => {
- return request({
- url: `/blade-system/dept/page`,
- method: 'get',
- params: { ...params },
- })
-}
-
-// 新增或编辑
-export const agenciesSubmitApi = data => {
- return request({
- url: `/blade-system/dept/submit`,
- method: 'post',
- data,
- })
-}
-
-// 删除
-export const agenciesRemoveApi = params => {
- return request({
- url: `/blade-system/dept/remove`,
- method: 'post',
- params,
- })
-}
-
-// 详情
-export const agenciesDetailApi = params => {
- return request({
- url: `/blade-system/dept/detail`,
- method: 'get',
- params,
- })
-}
-
-// 导入机构
-export const agenciesImportApi = (data,params) => {
- return request({
- url: `/blade-system/dept/import-region`,
- method: 'post',
- data,
- params
- })
-}
-
-// 导出机构
-export const agenciesExportApi = params => {
- return request({
- url: `/blade-system/dept/export-region`,
- method: 'get',
- params,
- responseType: 'blob',
- })
-}
-
-// 懒加载列表
-export const regionLazyTreeApi = params => {
- return request({
- url: `/blade-system/region/lazy-tree`,
- method: 'get',
- params,
- })
-}
--
Gitblit v1.9.3