From ead1fa92bcc4193b6c7c64601bacc51ed66635b0 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Thu, 29 Jan 2026 13:47:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/meshing/inspection/LeftTable.vue | 4 ++-- .../demo/meshing/inspection/LeftView.vue | 21 ++++++------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/views/demo/meshing/inspection/LeftTable.vue b/src/views/demo/meshing/inspection/LeftTable.vue index ec8f5cf..94f7657 100644 --- a/src/views/demo/meshing/inspection/LeftTable.vue +++ b/src/views/demo/meshing/inspection/LeftTable.vue @@ -13,8 +13,8 @@ />
查询 - 统计 - 巡检 +
diff --git a/src/views/demo/meshing/inspection/LeftView.vue b/src/views/demo/meshing/inspection/LeftView.vue index ce7205d..96bdad2 100644 --- a/src/views/demo/meshing/inspection/LeftView.vue +++ b/src/views/demo/meshing/inspection/LeftView.vue @@ -11,26 +11,17 @@ 打卡点信息 - - {{ itemData.pointname }} + + {{ itemData.pointname }} - - {{ itemData.createtime }} + + {{ itemData.createtime }} - - {{ itemData.lng }},{{ itemData.lat }}   + + {{ itemData.lng }},  {{ itemData.lat }} From ac09af6c8b2079e1da160a84dc1f858f8441c3e9 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 30 Jan 2026 15:02:57 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=A2=84=E6=A1=88=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8C=83=E5=9B=B4=EF=BC=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- .../ContingencyPlanList/index.vue | 140 +++++++++++++++--- 2 files changed, 120 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 26e61a2..156f5a7 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/packages/components/ContingencyPlan/ContingencyPlan/ContingencyPlanList/index.vue b/src/packages/components/ContingencyPlan/ContingencyPlan/ContingencyPlanList/index.vue index 705f22a..4f6ed2e 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,8 @@ 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'; const chartEditStore = useChartEditStore(); let { VITE_GLOB_API_URL } = getAppEnvConfig(); const props = defineProps({ @@ -210,21 +219,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, @@ -299,6 +325,10 @@ } const closeAddPlan = () => { addPlanDiv.value = false + lastGraphics.value.forEach(item => { + drawLayer && drawLayer.removeGraphic(item) + }) + drawLayer && drawLayer.stopDraw() } const query = () => { let params = { @@ -312,11 +342,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 +380,10 @@ message.success('预案添加成功') query() addPlanDiv.value = false + lastGraphics.value.forEach(item => { + drawLayer && drawLayer.removeGraphic(item) + }) + drawLayer && drawLayer.stopDraw() }) } } @@ -358,6 +414,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 From 19a59b8f6ccba7823b7632ffd0ec79b59ffadc30 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Thu, 26 Feb 2026 16:04:02 +0800 Subject: [PATCH 10/10] =?UTF-8?q?mqtt=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 7 +++++++ src/store/modules/airport.ts | 9 +++++++-- src/utils/env.ts | 10 ++++++++++ src/utils/mqtt.ts | 6 ++++-- 4 files changed, 28 insertions(+), 4 deletions(-) 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/src/store/modules/airport.ts b/src/store/modules/airport.ts index bc6546b..5dd90d8 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://175.27.168.120:6019/live/', - url: 'http://175.27.168.120: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://175.27.168.120:5005/rtc/v1/whip/?app=live&stream=', diff --git a/src/utils/env.ts b/src/utils/env.ts index 3089516..56b4694 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, } = ENV; @@ -61,6 +66,11 @@ export function getAppEnvConfig() { VITE_GLOB_API_URL_SITUATION, VITE_GLOB_FILE_PREVIEW, VITE_GLOB_GEOSERVER_BASE_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 3bea9e7..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: '175.27.168.120', + 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,