From 4dff7e8cc5a85d1d0ca44f2307b9b4fe485b622a Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Sat, 22 Nov 2025 10:06:20 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=B9=B1=E5=8D=A0=E8=80=95=E5=9C=B0?= =?UTF-8?q?=E5=BB=BA=E6=88=BF=E5=8F=8A=E8=AE=BE=E6=96=BD=E5=86=9C=E4=B8=9A?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E4=B8=93=E9=A2=98=E6=96=B9=E4=BD=8D=E8=A7=92?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/farmland/ShowInfoModal/index.vue | 2 +- src/views/demo/workflow/flowcode.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/farmland/ShowInfoModal/index.vue b/src/components/farmland/ShowInfoModal/index.vue index 990d02c3..dc3edf4d 100644 --- a/src/components/farmland/ShowInfoModal/index.vue +++ b/src/components/farmland/ShowInfoModal/index.vue @@ -300,7 +300,7 @@ async function getCaseImgList() { imageList.value = await getLoadCaseImgList({ caseid: props.showInfoData.id, - category: '巡察审计', + category: '乱占耕地建房', }); MapboxComponent.value.handlerLoadPictureAzimuth(imageList.value); diff --git a/src/views/demo/workflow/flowcode.ts b/src/views/demo/workflow/flowcode.ts index 66e0923d..35963c4a 100644 --- a/src/views/demo/workflow/flowcode.ts +++ b/src/views/demo/workflow/flowcode.ts @@ -39,6 +39,14 @@ export const flowCode = [ code: '0000008', name: '生态修复', }, + { + code: '0000009', + name: '乱占耕地建房', + }, + { + code: '0000010', + name: '设施农业监管', + }, ]; export const flowCodeName = (code) => { const item = flowCode.find((item) => item.code === code); From 75bf03fd3fd13b6e823397f22fbbc50bda7f741b Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Sat, 22 Nov 2025 11:05:52 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=A1=B5=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E4=B8=AD=E5=BF=83=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/subject/monitor_icon.png | Bin 0 -> 703 bytes .../subject/subject_lindidiaocha/index.vue | 34 ++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 public/subject/monitor_icon.png diff --git a/public/subject/monitor_icon.png b/public/subject/monitor_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b26525afa97e548454a5fcdfd049577da6d09e31 GIT binary patch literal 703 zcmV;w0zmzVP)jdmI>B2f@uMZk258i>Xuc2+4xtOH6qv&N{XkkWuf5D_$B zp{tE(qxb-oAZTd{vrNA4a&JQ3SWi4z_&$87f1^R z(s-V#FE9+JU>jJs9lxSk7>gLR25z%>09)W4^ujJ!wapBq;}%?kf6xuhMN!n?Gx3tf zMH~a`V@({0;5PHHlMERm>lOEqdr7>U-5^<`t^*$`1XY55(5^6S9BmVeS1<^zFvrN- zS0wRf^8M&lukbWNzGrt3*Rp;B`{6ru!ilHelb zVF!pGK{SRrz#2J-*qM6V3Cqy#z-A+O4x0B! z%pr#l9w7HlIIxbOxfT6G4{#kez)?7nFjg~%6!HVhy>$nUnt@)PVuAM^euMYjeT_d0 z?-M=*HFMSsrygHXO2ViEM~K|^UVK+k6jS&%u))Ur#J>{v@M`ATQf(KSz0Me^AWkCm zfi}PyThV^AXaUbWj?YioSgpkxYsn3O)`vFf6$S$DoA2*>GGi3_UN_MFI2^)nOc>Xw z@%w1a7_mJ=tL&ydpnCel@%w z-WOk~PgHte#aPXpH68SILxY-Vamz7E2a;ZT6HDJ|{{cUVZ4hHMb4{t1^sG$-00960 lV{g^M00006Nkl {{ currentTime_week }}
{{ currentTime_year }}
+
+
+
+
监测中心
+
spanWrap.value) { @@ -454,11 +463,36 @@ color: #ffffff; line-height: 12px; display: block; + margin-right: 27px; div { margin-bottom: 2px; } } + &_interval{ + width: 1px; + height: 100%; + background: linear-gradient(0deg, rgba(255,255,255,0.01), #FFFFFF, rgba(255,255,255,0)); + margin-right: 24px; + } + &_monitor{ + display: flex; + align-items: center; + cursor: pointer; + &_icon{ + width: 20px; + height: 20px; + background-image: url('/public/subject/monitor_icon.png'); + margin-right: 9px; + } + &_span{ + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #FFFFFF; + line-height: 24px; + } + } } &_adminAndLogout { From 571d1011a6dffe49fff3db9c4d9df56d030ddfff Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Sat, 22 Nov 2025 15:29:31 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E8=AE=BE=E6=96=BD=E5=86=9C=E4=B8=9A?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E4=B8=93=E9=A2=98=E9=A6=96=E9=A1=B5=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/demo/system.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts index aaf91512..375f58d0 100644 --- a/src/api/demo/system.ts +++ b/src/api/demo/system.ts @@ -416,6 +416,7 @@ const loadCaseInfoTuBanListUrlObj = { "生态保护红线": '/api/DroneCaseInfoSTHX/LoadCaseInfoTuBanList', "生态修复": '/api/DroneCaseInfoSTXF/LoadCaseInfoTuBanList', "乱占耕地建房": '/api/DroneCaseInfoLzwjf/LoadCaseInfoTuBanList', + "设施农业监管": '/api/DroneCaseinfoSsnyjg/LoadCaseInfoTuBanList', } export function homePageLoadCaseInfoTuBanList(type,params) { return defHttp.get({ From 302c7f0f04272f5efc9d55c9324b9a8476f999e1 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Sat, 22 Nov 2025 15:33:29 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E8=AE=BE=E6=96=BD=E5=86=9C=E4=B8=9A?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E4=B8=93=E9=A2=98=E8=AF=A6=E6=83=85=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facilityfarm/curbspotcity/MapList/ShowInfoModal/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/demo/facilityfarm/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/facilityfarm/curbspotcity/MapList/ShowInfoModal/index.vue index aff64d3b..1693fbaf 100644 --- a/src/views/demo/facilityfarm/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/facilityfarm/curbspotcity/MapList/ShowInfoModal/index.vue @@ -58,7 +58,7 @@ {{ props.showInfoData.linbao_area }} - {{ props.showInfoData.beianshijian }} + {{ props.showInfoData.beianshijian && dayjs(props.showInfoData.beianshijian).format('YYYY-MM-DD') }} {{ props.showInfoData.shijiyijian }} @@ -198,6 +198,7 @@ import Icon from '@/components/Icon/Icon.vue'; import { getAppEnvConfig } from '@/utils/env'; const { VITE_GLOB_INFO_IMAGE_URL } = getAppEnvConfig(); + import dayjs from 'dayjs'; import { mapTypeOptions, From bac296d73bcf76bb9dbc16f7b5771a547f1e5405 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Sat, 22 Nov 2025 15:34:56 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../curbspotcity/MapList/index.vue | 77 ------------------- 1 file changed, 77 deletions(-) diff --git a/src/views/demo/facilityfarm/curbspotcity/MapList/index.vue b/src/views/demo/facilityfarm/curbspotcity/MapList/index.vue index d86f91c6..f99e56b5 100644 --- a/src/views/demo/facilityfarm/curbspotcity/MapList/index.vue +++ b/src/views/demo/facilityfarm/curbspotcity/MapList/index.vue @@ -1,36 +1,6 @@ @@ -1383,6 +1387,10 @@ }); } }; + const handlerClearDate = (index) => { + locationArrays.value[index].lat = '' + locationArrays.value[index].lng = '' + } +