Merge remote-tracking branch 'origin/master'

张含笑

2026-02-04 196216d8e0b08db3f8c49f3847a532782aba6ac7

Merge remote-tracking branch 'origin/master'

 applications/mobile-web-view/src/appComponents/SvgIcon.vue

 applications/mobile-web-view/src/appComponents/error-page/403.vue

File was renamed from applications/mobile-web-view/src/components/error-page/403.vue
@@ -19,5 +19,5 @@
};
</script>
<style lang="scss" scoped>
@use './style.scss';
@use 'style';
</style>

 applications/mobile-web-view/src/appComponents/error-page/404.vue

File was renamed from applications/mobile-web-view/src/components/error-page/404.vue
@@ -19,5 +19,5 @@
};
</script>
<style lang="scss" scoped>
@use './style.scss';
@use 'style';
</style>

 applications/mobile-web-view/src/appComponents/error-page/500.vue

File was renamed from applications/mobile-web-view/src/components/error-page/500.vue
@@ -19,5 +19,5 @@
};
</script>
<style lang="scss" scoped>
@use './style.scss';
@use 'style';
</style>

 applications/mobile-web-view/src/appComponents/error-page/style.scss

 applications/mobile-web-view/src/appComponents/index.js

 applications/mobile-web-view/src/appDataSource/add.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/downpointing.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/fullscreen.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/leftBtn.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/leftBtn1.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/navigation.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/pointing.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/positioning.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/rightBtn.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/appwork/rightBtn1.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/big_drone.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/drone.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/leftArrow.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/qxfh.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/xzs.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/xzs1.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/xzs2.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/信号.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/刷新.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/变焦.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/喊话.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/录像.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/时间.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/暂停任务.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/滑块.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/电池.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/相机切换.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/箭头.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/继续任务.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/返航.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/速度.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/风速.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/droneConsole/高度.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/error.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/fang-bg.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/fang-bg1.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/fang.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/fly.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/gou.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/link.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/suo-bg.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/suo-bg1.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/suo.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/inspectionTask/task_drone.png

Binary files differ

 applications/mobile-web-view/src/appDataSource/inspectionTask/video-play.png

Binary files differ

 applications/mobile-web-view/src/appDataSource/leafletMapIcon/back-icon.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/leafletMapIcon/drone-icon2.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/leafletMapIcon/drone-icon3.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/leafletMapIcon/qr-code.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/leafletMapIcon/search-normal.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/leafletMapIcon/switchover-icon.svg

File was deleted

 applications/mobile-web-view/src/appDataSource/routePlan/customDirName.png

Binary files differ

 applications/mobile-web-view/src/appDataSource/routePlan/gimbalRotate.png

Binary files differ

 applications/mobile-web-view/src/appDataSource/sf.svg

 applications/mobile-web-view/src/appPages/inspectionTask/DroneConsole/DroneConsole.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/TaskInProgress/TaskContent.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/TaskInProgress/TaskInProgress.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/addTask/index.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/cancelExecution.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/executeing.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/executionError.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/executioned.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/myTask.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/pendingExecution.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/compoment/planExecute.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/execution/compoment/achievementData.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/execution/compoment/details.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/execution/compoment/events.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/execution/index.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/index.vue

File was deleted

 applications/mobile-web-view/src/appPages/inspectionTask/indexcopy.vue

File was deleted

 applications/mobile-web-view/src/appPages/login/index.vue

 applications/mobile-web-view/src/appPages/login/noLogin.vue

 applications/mobile-web-view/src/appPages/login/userlogin.vue

File was renamed from applications/mobile-web-view/src/page/login/userlogin.vue
@@ -32,10 +32,10 @@
                    <img
                        v-if="showPasswordModel"
                        @click="showPasswordModel = !showPasswordModel"
                        src="@/assets/images/login/close-eye.png"
                        src="../../assets/images/login/close-eye.png"
                        alt=""
                    />
                    <img v-else @click="showPasswordModel = !showPasswordModel" src="@/assets/images/login/see.png" alt="" />
                    <img v-else @click="showPasswordModel = !showPasswordModel" src="../../assets/images/login/see.png" alt="" />
                </el-form-item>
            </div>
            <!-- <div class="forgot-password">忘记密码</div> -->
@@ -59,7 +59,7 @@
            class="tip-dialogs"
        >
            <div class="dialog-close" @click="tipDialogVisible = false">
                <img src="@/assets/images/clusterScheduling/close.png" alt="" />
                <img src="../../assets/images/clusterScheduling/close.png" alt="" />
            </div>
            <div class="dialog-contents">
                <div class="tip-contents">{{ tipInfo }}</div>

 applications/mobile-web-view/src/appPages/work/index.vue

@@ -81,7 +81,7 @@
import { usePermission } from '@/appPages/work/usePermission'
import hbb from '@/appDataSource/appwork/hbb.svg'
import hbbSelect from '@/appDataSource/appwork/hbbSelect.svg'
import sfSvg from '@/appDataSource/inspectionTask/sf.svg'
import sfSvg from '@/appDataSource/sf.svg'
import { getShowImg, getSmallImg } from '@/utils/util'
import { getList, getstatusCount, getDictionaryByCode, getChildList } from '/src/api/work/index.js'
import dayjs from 'dayjs'

 applications/mobile-web-view/src/components/CurrentTaskDetails/AppConsoleLeft.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/AppConsoleRight/AppConsoleRight.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/AppConsoleRight/BroadcastComponent.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/AppConsoleRight/ShoutComponent.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/AppConsoleRight/VolumeAdjustment.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/AppPtzControl.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/CurrentTaskDetails.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/DroneSlider.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/RealTimeMap.vue

File was deleted

 applications/mobile-web-view/src/components/CurrentTaskDetails/TaskDetailsHead.vue

File was deleted

 applications/mobile-web-view/src/components/LiveVideo.vue

File was deleted

 applications/mobile-web-view/src/main.js

@@ -28,7 +28,6 @@
import Avue from '@smallwei/avue'
import '@smallwei/avue/lib/index.css'
import avueUeditor from 'avue-plugin-ueditor'
import crudCommon from '@/mixins/crud.js'
import { getScreen } from './utils/util'
import './permission'
import error from './error'
@@ -40,15 +39,14 @@
// 系统组件
import debug from './debug'
import VueClipboard from 'vue3-clipboard'
import SvgIcon from './components/SvgIcon.vue'
import SvgIcon from './appComponents/SvgIcon.vue'
// 全局组件
import globalComponents from '@/components'
import globalComponents from '@/appComponents'
import globalDirections from '@/directive'

import { onResize, pxToRem } from '@/utils/rem'
onResize()
import 'virtual:svg-icons-register'
window.$crudCommon = crudCommon
debug()
window.axios = axios


 applications/mobile-web-view/src/mixins/crud.js

File was deleted

 applications/mobile-web-view/src/mockProdServer.js

File was deleted

 applications/mobile-web-view/src/router/page/index.js

@@ -2,7 +2,7 @@
    {
        path: '/login',
        name: '登录页',
        component: () => import('@/page/login/index.vue'),
        component: () => import('@/appPages/login/index.vue'),
        meta: {
            keepAlive: true,
            isTab: false,
@@ -19,18 +19,6 @@
        },

        children: [
            {
                path: 'DroneConsole',
                name: 'DroneConsole',
                component: () => import('@/appPages/inspectionTask/DroneConsole/DroneConsole.vue'),
                meta: { title: '任务详情'},
            },
            {
                path: 'TaskInProgress',
                name: 'TaskInProgress',
                component: () => import('@/appPages/inspectionTask/TaskInProgress/TaskInProgress.vue'),
                meta: { title: '任务详情'},
            },
            {
                path: 'defaultMap',
                name: 'app地图',
@@ -73,25 +61,6 @@
                meta: { title: '地图'},
            },


            {
                path: 'inspectionTask',
                name: '巡检列表',
                component: () => import('@/appPages/inspectionTask/index.vue'),
                meta: { title: '任务详情'},
            },
            {
                path: 'addTask',
                name: '新建任务',
                component: () => import('@/appPages/inspectionTask/addTask/index.vue'),
                meta: { title: '新建任务'},
            },
            {
                path: 'execution',
                name: '任务详情',
                component: () => import('@/appPages/inspectionTask/execution/index.vue'),
                meta: { title: '任务详情'},
            },
            {
                path: 'voiceCallDetail',
                name: '语音通话',
@@ -108,7 +77,7 @@
    {
        path: '/ssh',
        name: '免登录页',
        component: () => import('@/page/login/noLogin.vue'),
        component: () => import('@/appPages/login/noLogin.vue'),
        meta: {
            keepAlive: true,
            isTab: false,
@@ -119,7 +88,7 @@
    {
        path: '/oauth/redirect/:source',
        name: '第三方登录',
        component: () => import('@/page/login/index.vue'),
        component: () => import('@/appPages/login/index.vue'),
        meta: {
            keepAlive: true,
            isTab: false,
@@ -128,7 +97,7 @@
    },
    {
        path: '/404',
        component: () => import(/* webpackChunkName: "page" */ '@/components/error-page/404.vue'),
        component: () => import(/* webpackChunkName: "page" */ '@/appComponents/error-page/404.vue'),
        name: '404',
        meta: {
            keepAlive: true,
@@ -138,7 +107,7 @@
    },
    {
        path: '/403',
        component: () => import(/* webpackChunkName: "page" */ '@/components/error-page/403.vue'),
        component: () => import(/* webpackChunkName: "page" */ '@/appComponents/error-page/403.vue'),
        name: '403',
        meta: {
            keepAlive: true,
@@ -148,7 +117,7 @@
    },
    {
        path: '/500',
        component: () => import(/* webpackChunkName: "page" */ '@/components/error-page/500.vue'),
        component: () => import(/* webpackChunkName: "page" */ '@/appComponents/error-page/500.vue'),
        name: '500',
        meta: {
            keepAlive: true,

 applications/mobile-web-view/src/utils/cesium/pointWayLineUtils.js