diff --git a/.env.development b/.env.development index ee7c009..83c77d3 100644 --- a/.env.development +++ b/.env.development @@ -30,3 +30,10 @@ VITE_GLOB_APP_MANAGEMENT_UNIT = 管理单位：临沂市自然资源和规划局 VITE_GLOB_APP_TECHINICAL_SUPPORT = 技术⽀持：山东慧创信息科技有限公司 VITE_GLOB_APP_VERSIONS = 系统版本：V1.0 + +VITE_GLOB_MQTT_URL = wrj.wisestcity.com +VITE_GLOB_MQTT_PORT = 6010 + +VITE_GLOB_APP_RTMP_URL = rtmp://123.132.248.154:1935 +VITE_GLOB_APP_FLV_URL = http://123.132.248.154:1986 +VITE_GLOB_SRS_API_URL = http://123.132.248.154:1985 diff --git a/package.json b/package.json index 0f8f80e..d5ab0d0 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,8 @@ "vuedraggable": "^4.1.0", "vuex": "^4.1.0", "xe-utils": "^3.5.14", - "xlsx": "^0.18.5" + "xlsx": "^0.18.5", + "@turf/helpers": "^7.2.0" }, "devDependencies": { "@amap/amap-jsapi-loader": "^1.0.1", diff --git a/src/api/demo/contingencyplan.ts b/src/api/demo/contingencyplan.ts index 9d74266..ef8caae 100644 --- a/src/api/demo/contingencyplan.ts +++ b/src/api/demo/contingencyplan.ts @@ -8,6 +8,8 @@ enum Api { AddPreventionplan = '/api/FmPreventionPlan/AddPreventionplan', // 删除预案 DeletePreventionplan = '/api/FmPreventionPlan/DeletePreventionplan', + // 根据坐标点获取预案 + LoadClueInfoByLngLat = '/api/FmPreventionPlan/LoadClueInfoByLngLat', } export function GetPreventionplanPageList(params) { return defHttp.get({ @@ -31,4 +33,10 @@ export function DeletePreventionplan(id) { return defHttp.post({ url: `${Api.DeletePreventionplan}?id=${id}`, }); +} +export function LoadClueInfoByLngLat(params) { + return defHttp.get({ + url: Api.LoadClueInfoByLngLat, + params + }); } \ No newline at end of file diff --git a/src/api/demo/forestranger.ts b/src/api/demo/forestranger.ts new file mode 100644 index 0000000..a606ab3 --- /dev/null +++ b/src/api/demo/forestranger.ts @@ -0,0 +1,8 @@ +import { defHttp } from '@/utils/http/axios'; +enum Api { + LoadTimeSoltByUserId = '/api/FireManagement/LoadTimeSoltByUserId', + AddOrUpdateTimeSolt = '/api/FireManagement/AddOrUpdateTimeSolt', +} +export const LoadTimeSoltByUserId = (params: { id:number }) => defHttp.get({ url: Api.LoadTimeSoltByUserId, params }); + +export const AddOrUpdateTimeSolt = (params) => defHttp.post({ url: Api.AddOrUpdateTimeSolt, params }); \ No newline at end of file diff --git a/src/packages/components/ContingencyPlan/ContingencyPlan/ContingencyPlanList/index.vue b/src/packages/components/ContingencyPlan/ContingencyPlan/ContingencyPlanList/index.vue index 705f22a..9aab66e 100644 --- a/src/packages/components/ContingencyPlan/ContingencyPlan/ContingencyPlanList/index.vue +++ b/src/packages/components/ContingencyPlan/ContingencyPlan/ContingencyPlanList/index.vue @@ -50,19 +50,20 @@
预案名称
- +
预案编号
- +
预案类别
管理级别
- +
描述
- +
内容
- +
状态
写入单元
- +
生效日期
到期日期
负责人
- +
联系方式
- +
@@ -156,6 +160,9 @@ 上传附件
+
+ 设置预案范围 +
保存
@@ -178,6 +185,11 @@ import { message } from 'ant-design-vue'; import { uploadFile } from '@/api/demo/files' import { getAppEnvConfig } from '@/utils/env' + import { point, polygon as trfPolygon } from '@turf/helpers'; + import { WktToGeojson, GeojsonToWkt } from '@/views/demo/layer/geometryHandler'; + import { contingencyPlanStore } from '@/store/modules/contingencyplan'; + + const contingencyPlanStoreVal = contingencyPlanStore(); const chartEditStore = useChartEditStore(); let { VITE_GLOB_API_URL } = getAppEnvConfig(); const props = defineProps({ @@ -210,21 +222,38 @@ { label: '负责人', key: 'responsiblePerson' }, { label: '联系方式', key: 'contact' }, ] + const planName = ref(null) + const planCode = ref(null) + const planCategory = ref(null) + const admLevel = ref(null) + const description = ref(null) + const content = ref(null) + const status = ref(null) + const writeUnit = ref(null) + const effectiveDate = ref(null) + const expiry_date = ref(null) + const responsiblePerson = ref(null) + const contact = ref(null) + const geom = ref(null) const addPlanItemList = [ - { label: '预案名称', key: 'planName' }, - { label: '预案编号', key: 'planCode' }, - { label: '预案类别', key: 'planCategory' }, - { label: '管理级别', key: 'admLevel' }, - { label: '描述', key: 'description' }, - { label: '内容', key: 'content' }, - { label: '状态', key: 'status' }, - { label: '写入单元', key: 'writeUnit' }, - { label: '生效日期', key: 'effectiveDate' }, - { label: '到期日期', key: 'expiry_date' }, - { label: '负责人', key: 'responsiblePerson' }, - { label: '联系方式', key: 'contact' }, + { label: '预案名称', key: 'planName', dom: planName }, + { label: '预案编号', key: 'planCode', dom: planCode }, + { label: '预案类别', key: 'planCategory', dom: planCategory }, + { label: '管理级别', key: 'admLevel', dom: admLevel }, + { label: '描述', key: 'description', dom: description }, + { label: '内容', key: 'content', dom: content }, + { label: '状态', key: 'status', dom: status }, + { label: '写入单元', key: 'writeUnit', dom: writeUnit }, + { label: '生效日期', key: 'effectiveDate', dom: effectiveDate }, + { label: '到期日期', key: 'expiry_date', dom: expiry_date }, + { label: '负责人', key: 'responsiblePerson', dom: responsiblePerson }, + { label: '联系方式', key: 'contact', dom: contact }, + { label: '预案范围', key: 'geom', dom: geom }, ] let geojsonLayer: mars3d.layer.GeoJsonLayer + let drawLayer; + let graphic; + const lastGraphics = ref([]) const { w, h } = toRefs(props.chartConfig.attr); const { dataset, @@ -264,14 +293,10 @@ }) }); const showInfo = async (item) => { - if(!geojsonLayer){ - geojsonLayer = new mars3d.layer.GeoJsonLayer({ - name: 'fire-plan-layer', - clampToGround: true - }) - window.globalMap.addLayer(geojsonLayer); + if(!contingencyPlanStoreVal.getLayer()){ + contingencyPlanStoreVal.setLayer() }else{ - geojsonLayer.clear() + contingencyPlanStoreVal.clearData() } if(item.attachment){ const res = await fetch(`${VITE_GLOB_API_URL}/${item.attachment}`) @@ -280,12 +305,7 @@ return } const data = await res.json() - geojsonLayer.load({ - data: data - }) - geojsonLayer.flyTo({ - scale: 1.5 - }) + contingencyPlanStoreVal.reloadData(data) } EventBus.emit('ContingencyPlanListToContingencyPlanInfo',item) } @@ -299,6 +319,10 @@ } const closeAddPlan = () => { addPlanDiv.value = false + lastGraphics.value.forEach(item => { + drawLayer && drawLayer.removeGraphic(item) + }) + drawLayer && drawLayer.stopDraw() } const query = () => { let params = { @@ -312,11 +336,33 @@ } const save = () => { let isCheck = true + addPlanData.value.geom = addAndUpdateWorkArea() addPlanItemList.forEach(item => { if(!(addPlanData.value[item.key])){ isCheck = false - message.warning(`${item.label}为空！`) - return + if(['planCategory', 'status'].includes(item.key)){ + const el = item.dom?.value?.$el + const selector = el.querySelector('.ant-select-selector') + selector.style.borderColor = '#ff3939' + }else if(item.key == 'geom'){ + const el = item.dom?.value?.$el + el.style.background = '#ff3939' + }else{ + const el = item.dom?.value?.$el + el.style.borderColor = '#ff3939' + } + }else{ + if(['planCategory', 'status'].includes(item.key)){ + const el = item.dom?.value?.$el + const selector = el.querySelector('.ant-select-selector') + selector.style.borderColor = '#00611A' + }else if(item.key == 'geom'){ + const el = item.dom?.value?.$el + el.style.background = '#00611A' + }else{ + const el = item.dom?.value?.$el + el.style.borderColor = '#00611A' + } } }) if(isCheck){ @@ -328,6 +374,10 @@ message.success('预案添加成功') query() addPlanDiv.value = false + lastGraphics.value.forEach(item => { + drawLayer && drawLayer.removeGraphic(item) + }) + drawLayer && drawLayer.stopDraw() }) } } @@ -358,6 +408,46 @@ fileList.value = resFileList; }) } + const getGeom = async () => { + lastGraphics.value.forEach(item => { + drawLayer && drawLayer.removeGraphic(item) + }) + if(!drawLayer){ + drawLayer = new mars3d.layer.GraphicLayer({ + isAutoEditing: true, + }); + window.globalMap.addLayer(drawLayer) + } + graphic = await drawLayer.startDraw({ + type: 'polygon', + style: { + color: "#00B569", + opacity: 0.2, + outline: true, + outlineColor: "#00B569", + outlineWidth: 2, + }, + }); + lastGraphics.value.push(graphic) + console.log('draw',graphic) + } + function addAndUpdateWorkArea(addOrUpdate = 'add') { + if(!graphic){ + return '' + } + let graphicJson = graphic.toJSON(); + let coordinates = graphicJson.position || graphicJson.positions; + let polygonData: any = []; + let geom = ''; + coordinates.push(coordinates[0]); + if (addOrUpdate == 'add') { + polygonData.push(coordinates); + } else { + polygonData = coordinates; + } + geom = GeojsonToWkt(trfPolygon(polygonData).geometry); + return geom + } \ No newline at end of file diff --git a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue index 16e31e6..556db8d 100644 --- a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue +++ b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue @@ -113,7 +113,7 @@ }, 5000); }); -// <<<<<<< HEAD +// // const navsClick = function(item,index){ // navsIndex.value = index // props.chartConfig.request.requestSQLContent.sql = item.sql diff --git a/src/packages/components/Informations/Texts/TextGradient/index.vue b/src/packages/components/Informations/Texts/TextGradient/index.vue index 0b1d481..4c5f049 100644 --- a/src/packages/components/Informations/Texts/TextGradient/index.vue +++ b/src/packages/components/Informations/Texts/TextGradient/index.vue @@ -20,6 +20,9 @@ import { option as configOption } from './config'; import { eventHandlerHook } from '@/hooks/eventHandler.hook'; import { EventBus } from '@/utils/eventBus'; + import { contingencyPlanStore } from '@/store/modules/contingencyplan'; + + const contingencyPlanStoreVal = contingencyPlanStore(); const chartEditStore = useChartEditStore(); const props = defineProps({ @@ -58,6 +61,7 @@ 'click', val, ); + contingencyPlanStoreVal.clearData() }; const dblclickBtn = (val) => { eventHandlerHook( diff --git a/src/packages/components/Tasks/Tasks/TaskAssign/index.vue b/src/packages/components/Tasks/Tasks/TaskAssign/index.vue index 990ff23..7c69f08 100644 --- a/src/packages/components/Tasks/Tasks/TaskAssign/index.vue +++ b/src/packages/components/Tasks/Tasks/TaskAssign/index.vue @@ -425,6 +425,10 @@ import {drcDownTopicReize,eventsTopicSubscribeReize,servicesTopicReize,services_replyTopicReize,} from '@/utils/debugging/events'; import {getRedisUser,addOrUpdateRedisUser,getLockedClients,getTsgzProjectId,applyDroneControl} from '@/api/demo/airportMaintenance'; import { airPortStore } from '@/store/modules/airport'; + import { LoadClueInfoByLngLat } from '@/api/demo/contingencyplan' + import { contingencyPlanStore } from '@/store/modules/contingencyplan'; + + const contingencyPlanStoreVal = contingencyPlanStore(); const airPortStoreVal = airPortStore(); @@ -1682,6 +1686,24 @@ hikversionShow.value = false; changeButton("应急响应") + let params = { + lng: clueInfo.value.lng, + lat: clueInfo.value.lat, + } + LoadClueInfoByLngLat(params).then(async res => { + if(res.length > 0){ + let resultData = res[0] + if(resultData.Attachment){ + const res = await fetch(`${VITE_GLOB_API_URL}/${resultData.Attachment}`) + if (!res.ok) { + console.error('下载失败', res.status) + return + } + const data = await res.json() + contingencyPlanStoreVal.reloadData(data) + } + } + }) } const changeButton = (type) => { diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaPersons/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaPersons/index.vue index 3720034..a8c0ac9 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaPersons/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaPersons/index.vue @@ -68,6 +68,11 @@ const goflyaddress=(e)=>{ }) entityArr.value = [] } + if(e.state == '离线'){ + return message.warning('当前人员离线') + }else if(e.lng == null || e.lat == null || e.lng == 0 || e.lat == 0){ + return message.warning('人员位置异常') + } handlerAddEntity(e) } // 添加Entity diff --git a/src/store/modules/airport.ts b/src/store/modules/airport.ts index befaebc..cefe91b 100644 --- a/src/store/modules/airport.ts +++ b/src/store/modules/airport.ts @@ -1,4 +1,6 @@ import { defineStore } from 'pinia'; +import { getAppEnvConfig } from '@/utils/env'; +const { VITE_GLOB_APP_RTMP_URL, VITE_GLOB_APP_FLV_URL, VITE_GLOB_SRS_API_URL } = getAppEnvConfig(); export const airPortStore = defineStore({ id: 'airport', @@ -17,8 +19,11 @@ export const airPortStore = defineStore({ video_id: null, }, liveInfo: { - rtmp: 'rtmp://wrj.wisestcity.com:6019/live/', - url: 'https://wrj.wisestcity.com:6012/live/', + rtmp: `${VITE_GLOB_APP_RTMP_URL}/live/`, + url: `${VITE_GLOB_APP_FLV_URL}/live/`, + getUrl: `${VITE_GLOB_SRS_API_URL}/`, + // rtmp: 'rtmp://175.27.168.120:6019/live/', + // url: 'http://175.27.168.120:6012/live/', // rtmp: 'rtmp://box.wisestcity.com:1935/live/', // url: 'http://box.wisestcity.com:8081/live/', // rtmp: 'http://wrj.wisestcity.com:5005/rtc/v1/whip/?app=live&stream=', diff --git a/src/store/modules/contingencyplan.ts b/src/store/modules/contingencyplan.ts new file mode 100644 index 0000000..a980998 --- /dev/null +++ b/src/store/modules/contingencyplan.ts @@ -0,0 +1,35 @@ +import { defineStore } from 'pinia'; +import * as mars3d from 'mars3d'; + +interface ContingencyPlanState { + contingencyPlanLayer: mars3d.layer.GeoJsonLayer | null +} +export const contingencyPlanStore = defineStore({ + id: 'contingencyPlan', + state: ():ContingencyPlanState => ({ + contingencyPlanLayer: null, + }), + actions: { + setLayer() { + this.contingencyPlanLayer = new mars3d.layer.GeoJsonLayer({ + name: 'fire-plan-layer', + clampToGround: true + }) + window.globalMap.addLayer(this.contingencyPlanLayer); + }, + clearData(){ + this.contingencyPlanLayer?.clear() + }, + reloadData(data){ + this.contingencyPlanLayer?.load({ + data: data + }) + this.contingencyPlanLayer?.flyTo({ + scale: 1.5 + }) + }, + getLayer(){ + return this.contingencyPlanLayer + } + } +}) \ No newline at end of file diff --git a/src/utils/env.ts b/src/utils/env.ts index 44c2dee..6f73900 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -40,6 +40,11 @@ export function getAppEnvConfig() { VITE_GLOB_APP_TECHINICAL_SUPPORT, VITE_GLOB_APP_VERSIONS, VITE_GLOB_API_URL_SITUATION, + VITE_GLOB_MQTT_URL, + VITE_GLOB_MQTT_PORT, + VITE_GLOB_APP_RTMP_URL, + VITE_GLOB_APP_FLV_URL, + VITE_GLOB_SRS_API_URL, VITE_GLOB_FILE_PREVIEW, VITE_GLOB_GEOSERVER_BASE_URL, VITE_GLOB_COFFEE_API_URL, @@ -63,6 +68,11 @@ export function getAppEnvConfig() { VITE_GLOB_FILE_PREVIEW, VITE_GLOB_GEOSERVER_BASE_URL, VITE_GLOB_COFFEE_API_URL, + VITE_GLOB_MQTT_URL, + VITE_GLOB_MQTT_PORT, + VITE_GLOB_APP_RTMP_URL, + VITE_GLOB_APP_FLV_URL, + VITE_GLOB_SRS_API_URL, }; } diff --git a/src/utils/mqtt.ts b/src/utils/mqtt.ts index 6b3b654..d2d6a2b 100644 --- a/src/utils/mqtt.ts +++ b/src/utils/mqtt.ts @@ -3,6 +3,8 @@ import { useMessage } from '@/hooks/web/useMessage'; import { getRedisUser, addOrUpdateRedisUser } from '@/api/demo/airportMaintenance'; import { useUserStore } from '@/store/modules/user'; import { timestampToFormattedDate } from '@/utils/index'; +import { getAppEnvConfig } from '@/utils/env'; +const { VITE_GLOB_MQTT_URL, VITE_GLOB_MQTT_PORT } = getAppEnvConfig(); const userStore = useUserStore(); const userInfo = userStore.getUserInfo; @@ -12,9 +14,9 @@ const { createMessage } = useMessage(); const seizeClientId = 'mqtt_client_1581F8HGX254V00A0BUY_seize'; const connection = { protocol: 'ws', - host: 'wrj.wisestcity.com', + host: VITE_GLOB_MQTT_URL, // server less服务器只有两种协议：mqtts: 8883; wss: 8084 - port: 6010, + port: VITE_GLOB_MQTT_PORT, endpoint: '/mqtt', // for more options, please refer to https://github.com/mqttjs/MQTT.js#mqttclientstreambuilder-options clean: true, diff --git a/src/views/demo/meshing/firemanagement/data.ts b/src/views/demo/meshing/firemanagement/data.ts index 8a54611..d630a22 100644 --- a/src/views/demo/meshing/firemanagement/data.ts +++ b/src/views/demo/meshing/firemanagement/data.ts @@ -15,7 +15,7 @@ export const columns: BasicColumn[] = [ { title: '审核状态', dataIndex: 'state', - width: 80, + width: 90, customRender: ({ record }) => { const status = record.state; let color = ''; @@ -36,10 +36,12 @@ export const columns: BasicColumn[] = [ { title: '负责人', dataIndex: 'director', + width: 150, }, { title: '负责人电话', dataIndex: 'phone', + width: 130, }, ]; diff --git a/src/views/demo/meshing/forestranger/AddModal.vue b/src/views/demo/meshing/forestranger/AddModal.vue index ba21839..3ee4f30 100644 --- a/src/views/demo/meshing/forestranger/AddModal.vue +++ b/src/views/demo/meshing/forestranger/AddModal.vue @@ -1,35 +1,17 @@