.env.development
@@ -3,7 +3,7 @@ VITE_APP_ENV = 'development' #开发环境代理地址(推荐本地新建文件 .env.development.local 来进行覆盖) # VITE_APP_API_URL = https://wrj.shuixiongit.com/api VITE_APP_API_URL = https://wrj.shuixiongit.com/api # VITE_APP_API_URL = http://192.168.1.7 # ws地址 VITE_APP_WS_API_URL = wss://wrj.shuixiongit.com/drone-wss/api/v1/ws src/views/Home/HomeLeft/HomeLeft.vue
@@ -17,7 +17,7 @@ <script setup> import OverviewNext from './OverviewNext.vue'; import InspectionRaskDetails from './InspectionRaskDetails.vue'; import InspectionRaskDetails from './InspectionRaskDetails/InspectionRaskDetails.vue'; import CommonWeather from '@/components/CommonWeather.vue'; import MachineNestList from './MachineNestList.vue'; import { useStore } from 'vuex'; src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetails.vue
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
New file @@ -0,0 +1,9 @@ <template> </template> <script setup> </script> <style scoped lang="scss"> </style> src/views/SignMachineNest/MachineRight/MachineRight.vue
@@ -9,7 +9,7 @@ <script setup> import UserOperate from '@/components/UserOperate.vue'; import MachineStatus from './MachineStatus.vue'; import MachineStatus from './MachineStatus/MachineStatus.vue'; import MachineMonitor from './MachineMonitor.vue'; import InspectionRaskList from './InspectionRaskList.vue'; </script> @@ -26,4 +26,4 @@ height: 43px; } } </style> </style> src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
File was renamed from src/views/SignMachineNest/MachineRight/MachineStatus.vue @@ -4,7 +4,7 @@ <div :style="{ marginLeft: pxToRem(14) }"> <div class="machine-status"> <div class="info"> <img src="../../../assets/images/signMachineNest/machineRight/wrj.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/wrj.png" alt=""> <div class="info-right"> <div class="name">{{ osdVisible?.callsign || '--' }}</div> <div class="wz"> @@ -20,28 +20,28 @@ <div class="status"> <div class="card"> <div> <img src="../../../assets/images/signMachineNest/machineRight/height.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/height.png" alt=""> <span class="text">实时真高</span> </div> <div class="text-data">{{ detailInfo.height || '--' }}<span class="text">米</span></div> </div> <div class="card"> <div> <img src="../../../assets/images/signMachineNest/machineRight/speed.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/speed.png" alt=""> <span class="text">飞行速度</span> </div> <div class="text-data">{{ detailInfo.horizontal_speed }}<span class="text">米/秒</span></div> </div> <div class="card"> <div> <img src="../../../assets/images/signMachineNest/machineRight/signal.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/signal.png" alt=""> <span class="text">信号强度</span> </div> <div class="text-data">{{ detailInfo.quality }}</div> </div> <div class="card"> <div> <img src="../../../assets/images/signMachineNest/machineRight/electricity.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/electricity.png" alt=""> <span class="text">电池电量</span> </div> <div v-if="drone_charge_state.capacity_percent != 0" class="text-data"> @@ -51,14 +51,14 @@ </div> <div class="card"> <div> <img src="../../../assets/images/signMachineNest/machineRight/distance.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/distance.png" alt=""> <span class="text">飞行距离</span> </div> <div class="text-data">{{ singleTotal.flight_mileage }}<span class="text">km</span></div> </div> <div class="card"> <div> <img src="../../../assets/images/signMachineNest/machineRight/duration.png" alt=""> <img src="../../../../assets/images/signMachineNest/machineRight/duration.png" alt=""> <span class="text">飞行时长</span> </div> <div class="text-data">{{ singleTotal.hour_count }}<span class="text">h</span></div> @@ -75,7 +75,7 @@ import { EModeCode, EDockModeText, EModeText } from '@/utils/staticData/device'; import { getLnglatAltitude } from '@/utils/cesium/mapUtil.js'; import { useStore } from 'vuex'; import MachineTableDetails from '@/views/SignMachineNest/MachineRight/MachineTableDetails/MachineTableDetails.vue'; import MachineTableDetails from '@/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue'; const store = useStore(); // 获取机巢信息 src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetailsMap.vue
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/JobRelatedEvents.vue
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
File was renamed from src/views/SignMachineNest/MachineRight/MachineTableDetails/MachineTableDetails.vue @@ -21,8 +21,8 @@ </template> <script setup> import DeviceEvent from '@/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceEvent.vue' import DeviceJob from '@/views/SignMachineNest/MachineRight/MachineTableDetails/DeviceJob/DeviceJob.vue' import DeviceEvent from '@/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue' import DeviceJob from '@/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue' import { pxToRem } from '@/utils/rem'; import { useStore } from 'vuex' @@ -36,7 +36,6 @@ { name: '机巢位置', value: '',field:'address' }, ]) const store = useStore(); // state必须带上.home const singleTotal = computed(() => store.state.home.singleTotal); watch(singleTotal, (val) => { if (val?.device_info){