From 0f1483829699de97e0da487869d427c80f831008 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Fri, 1 Mar 2024 09:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E4=B8=8E?= =?UTF-8?q?=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/map/bottom/ico3_select.png | Bin 1791 -> 1815 bytes src/assets/images/map/bottom/ico5_select.png | Bin 1663 -> 1740 bytes src/assets/images/map/bottom/ico6_select.png | Bin 2367 -> 2358 bytes src/assets/images/map/bottom/ico7_select.png | Bin 2546 -> 2515 bytes src/assets/images/map/bottom/ico8_select.png | Bin 1815 -> 1765 bytes src/request/map.js | 1 + src/views/BI/components/bottom_options.vue | 33 +- .../components/dialog/electricity_dialog.vue | 422 ++++++++++++++++++ src/views/BI/components/work_safely.vue | 17 +- src/views/BI/js/eight_work.js | 133 ++---- src/views/BI/js/map.js | 47 +- .../user_card/components/batchaddcard.vue | 3 +- src/views/device_manager/user_card/index.vue | 1 - .../components/assignment_type.vue | 2 +- .../layer_settings/components/add.vue | 6 - 15 files changed, 552 insertions(+), 113 deletions(-) create mode 100644 src/views/BI/components/dialog/electricity_dialog.vue diff --git a/src/assets/images/map/bottom/ico3_select.png b/src/assets/images/map/bottom/ico3_select.png index c15206e3ab5737dd86fad3d782051ae8fde47e5a..a37a4772aa00415c2dd2ac177d6a7c728cce664a 100644 GIT binary patch delta 980 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 delta 794 zcmV+#1Lge84gU9&IXN*jMKDA|K|wY`LNYNylez+AlO6&llSBi6e=l@YyZ`_K zpGibPRCwC#m`!LCK@`XTvmYrzY_uPEsA4@-6hTxxc+i6fKTd*p7d#Y&f`XzqKQ8qk zN>My`5xuEU#6T!$F%a}1B3@N2ibYIJV==KY>F&<1Z$H$eYt}H?q&e(^mzmjFW`4Xk z@6F3H%d*hTBB9GA0*nA7f4~T^&7uTNvUefxrY(*@RxY7ZeubThTlN!DZcjD3FaiN# zh6Glv3_*=ugwk`&+0(>kYLlcn(x2ik<}K?0G-Cp4dQ $$ol6*6gKTj|XUV3NTJ!CkgBvf%W;0f5^Ao2RyiWAGgO} z(&&qK2GI!%#$f296aeQ5Y>f}>dtnx-yOX$a_L+@InkOxg{s^*O7=RK?eiTf)0H$v6 zfh`pCn7%iOiBoClT44#8)=U_R0x|+SOkm?+@+O}RDhu<-JbZ*}V~?pnR|8feUBq+C z1>4OKJ|H&^64+%re`ni$U|O|=7gH%*J)T0bkoUmmJg_P<9vBZPQP(YG=(`|ES0E{S z9I(1Mt%BE2r*M5NiR{N*4Or0uOIuttE3lxFpH0^$ZJs2n9r|}d=Q>PN2V>SB^_H)D z?|?K+zhykJ-00o^*TrHtNu8Cr3`K76qO8(cRNb8d<8p*_e}>kbZ-a|128LFppL907 zGiWU7w+_f0HQEs*JjCLRM}QGvlX>utu@_p|%`L^R1IWG|LMgu*Tvvp^OrFL19iOpw zOVJshSe5Z`O|d)(C5>3Z?G92qxH0U%9P7O5rqbzxwOJWc|6D9v=k=i%t%Q3SZ$@=JgL Y0II|r!gJkgd;kCd07*qoM6N<$f(QRzEC2ui diff --git a/src/assets/images/map/bottom/ico6_select.png b/src/assets/images/map/bottom/ico6_select.png index 5a1f47308e7f0d6b89d233a0dc746b5ac32cc11a..7296e71513e1fafea4650ae09109869ab6aa6ac7 100644 GIT binary patch delta 1527 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 GLSTZ+HqAr; diff --git a/src/assets/images/map/bottom/ico7_select.png b/src/assets/images/map/bottom/ico7_select.png index f47d4508334f752851128bbea9ca683fa7583ec6..2788cd132a32c02141f7a6f2bffd9bf642e5c276 100644 GIT binary patch delta 1686 zcmV;H25I^76Vns0UIHLRIYLD_Loqi*HaSBvF-1i=Lper4I5RUhF)%koHa0esegYgI zML9x6IYTivL^e4?F)>9&IYT){K{zurH!(0bL^d`ylez+ABxGSXFf%Y?Gc9H}Wi>4| zW;8G@Vly;3EoC+{F=07oWHM%CG?PLDf`3pACRYFe1@lQnK~#9!>{tm*6jvCYc{6*+ zval$Zf>N(y5fPgxq75mOqLyl{JN8=8nq@~ zSSaPP%3%?xTnn;tEPJv$Gq3-{S<0@soJ~y2OTNs!Yv!B(`2M#`V~nX6xgqKWZ-0XX z2MG=m93=REC&)URRBmtUdV;qEQ%G`}!h!^wnp3!q84Ytu6)EWrx8_r2x9iy$ky0 zhZqU|K`6bDK({p%;;M{d-M4=0Eq_;Y<&9bYP^0Y1d)S>a(x4-F%O~ zaO*Y(of7mr(2_~fbohX#CB~efYe=l$9GC<>6G=H|1f6CvBc;Nh8fAc$gAr!I^(R0L zz}RP*VHjQu7IYtIhPYD95ewJ0UQhjzZ)tdfv0#P!d*typ_x72fCS~1Ua7hD@q(CFq z9GwC3U{6rsIpc#{H=5IvGN4!I=(3>;){KNbYt1DYIl8R$QW$Ci5Pu750p@-Ygk}Le z5g$q`0z<~Jl7IAzYkpi_f9&gI!yh+Gpj!o~6$8Jcsix0n$R5vmE2m4nM^rYZAFLG# z66*>5l9`a7)%LD5>Y^DJ zXSvEp2OWS|p3Jzo27ek#a+gig~D&h8{lckgCS z<=(CDjoY5`sbWIt2D)9a1t4M~;yjFmL+3r1=jSuZA#O4s|9?-g)m$U93CIgqVvq?jR3U5~5`TqGo9U=O*M5*M1PAMTO|jJp(a{CXBmBgk;t zz3x=<8nNQwo{6S2f({mx`+819QWR+y+YmhFM@9E+L5~>gQLyYH-ef$-wbUOjOW7Ue zGjHK6uqM(K7JpQD#mtNHU$WvmAZy8r7#||ajdegQh|Oj=ok%+RR&9&A>d2nty0fS9 zZ1N#!8&X-7$7@ohJZ{*GnQ^MglXDGa57LGNjE(YoJt`5Bg@KQ=^*Yv!&H#fMx9B2%`oUxK*FtK9x+?knqAAdy0=!^6A!`acuX&W>$uc4E0 zTWd9xPR80$efz<-RSEeY&rR)#)b!4R(5HD*Vfp@~LoIjn8^cbYUn2AIjpYpbTv5#R zM5xX6YIQ+;+)kgEIp;<#i~oq0NTd*`=9&|SKPyYxT_LU`Wv??*6tQ zHr6{b!hbdF>!knGev{^fFxi@&c$H8F6hV$|?RAXfn6 zj{v2jsO!2bcfHa^VbmZ@XAT7q4!WMHjPm0-S>>}uGd*q$g@&6XVf35ZDH1i_-e?9o; g(HnoB;NJoa0M5bHv)Nm*a{vGU07*qoM6N<$f>NF(VgLXD delta 1684 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 Eg3KAF5C8xG delta 947 zcmV;k15Eto4VMnEUIHLCI6*Z)G&MFuGetK9&K{z-#Ml>}xLo-D;L^w1tlez+AlO6&llSBi6f1Wi4YXATP zH%UZ6RCwC#Sx-n5Q5gT;o0)aB*08jMOvMVSgAf+z!6G_DMRh6awp|1}6cl;rQm5#m z1mPtQ9RtaWK~O{E1B z-}n7ymoUb_&5eS~TMl3je_#$^4q%p>EHde5Ls7zU-GoCjg)X~`4$YbV0}tjq@Gy#I zE{!KD8bSbxoVeOV<4p3OAfLA?ySVze=|c-jmSC5eNj@TF*TIxEDkKxB)h#UL>l z`s@QFlx21gCS!@1&KLwK!$AT{k|#EC+zkMeGH5tskYpYp`zyVKe=&j)T#XZeJ4#7K z+c|ID-mSE1e@pl&4jIeS&5E@}1nX3@FG2ifrj<0Q+pwEPi#X4NN>){OrIoNF&R?-7 ztJRF>L?xqp&~>$#cw7(AweIu!qxt0cjrcu097UVA@?RJ&lyq&8 zJg7eQt~mD{jZy32cu&^lgYVs4Pg_|DIhE`l{X^_k{l)lg!-Qcx{cbVGtOTtu7S04% zgaC%Ryea+b567g+Qc~R2sa#q;r8XN|KL{|RvY&u_m47ywL* VQAjfOLB#+7002ovPDHLkV1l export const getEightWorks = (params) => post("/map/getEightWorks", params); export const getHotworkList = (params) => post("/map/getHotworkList", params); +export const getEightWorksByType = (params) => post("/map/getEightWorksByType", params); export const getCameraList = (params) => post("/map/getCameraList", params); export const getConfinedspaceWorkList = (params) => diff --git a/src/views/BI/components/bottom_options.vue b/src/views/BI/components/bottom_options.vue index 8dfc568..bbea9e5 100644 --- a/src/views/BI/components/bottom_options.vue +++ b/src/views/BI/components/bottom_options.vue @@ -50,11 +50,7 @@ import VideoAIAnalysis from "@/views/BI/components/video_ai_analysis.vue"; import VideoAIAnalysisRight from "@/views/BI/components/video_ai_analysisRight.vue"; import { useVModels } from "@vueuse/core"; import { handleTrajectory, handleFence } from "@/views/BI/js/trajectory.js"; -import { - handleHortwork, - handleConfinedspaceWork, - handleHighWork, -} from "@/views/BI/js/eight_work.js"; +import { handleWork } from "@/views/BI/js/eight_work.js"; import { handleCamera } from "@/views/BI/js/camera.js"; const props = defineProps({ @@ -167,9 +163,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "动火作业", - type: "hotWork", + type: "HOTWORK", check: false, - action: handleHortwork, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico5.png", import.meta.url) @@ -179,9 +175,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "受限空间作业", - type: "acceptance", + type: "CONFINEDSPACE", check: false, - action: handleConfinedspaceWork, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico6.png", import.meta.url) @@ -191,8 +187,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "临时用电作业", - type: "temporaryElectricalWork", + type: "ELECTRICITY", check: false, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico7.png", import.meta.url) @@ -202,9 +199,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "高处作业", - type: "workAtHeight", + type: "HIGHWORK", check: false, - action: handleHighWork, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico8.png", import.meta.url) @@ -214,8 +211,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "断路作业", - type: "circuitBreakingOperations", + type: "CUTROAD", check: false, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico9.png", import.meta.url) @@ -225,8 +223,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "动土作业", - type: "groundbreakingWork", + type: "BREAKGROUND", check: false, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico10.png", import.meta.url) @@ -236,7 +235,8 @@ const bottomOptionsList = [ import.meta.url ).href, title: "吊装作业", - type: "hoistingOperations", + type: "HOISTING", + action: handleWork, check: false, }, { @@ -247,8 +247,9 @@ const bottomOptionsList = [ import.meta.url ).href, title: "盲板抽堵作业", - type: "blindPlatePluggingOperation", + type: "BLINDBOARD", check: false, + action: handleWork, }, { img: new URL("/src/assets/images/map/bottom/ico12.png", import.meta.url) diff --git a/src/views/BI/components/dialog/electricity_dialog.vue b/src/views/BI/components/dialog/electricity_dialog.vue new file mode 100644 index 0000000..06d50b3 --- /dev/null +++ b/src/views/BI/components/dialog/electricity_dialog.vue @@ -0,0 +1,422 @@ + + + + + diff --git a/src/views/BI/components/work_safely.vue b/src/views/BI/components/work_safely.vue index 37938dd..8669a7a 100644 --- a/src/views/BI/components/work_safely.vue +++ b/src/views/BI/components/work_safely.vue @@ -18,7 +18,7 @@
- +
@@ -107,6 +107,21 @@ const formatWork = (work) => { case "HIGHWORK": type = "高处作业"; break; + case "BLINDBOARD": + type = "盲板抽堵作业"; + break; + case "CUTROAD": + type = "断路作业"; + break; + case "ELECTRICITY": + type = "临时用点作业"; + break; + case "HOISTING": + type = "吊装作业"; + break; + case "BREAKGROUND": + type = "动土作业"; + break; } return type + "编号:" + work.CHECK_NO; }; diff --git a/src/views/BI/js/eight_work.js b/src/views/BI/js/eight_work.js index 6729edc..ff14173 100644 --- a/src/views/BI/js/eight_work.js +++ b/src/views/BI/js/eight_work.js @@ -1,103 +1,64 @@ -import { - getHotworkList, - getConfinedspaceWorkList, - getHighWorkList, -} from "@/request/map"; +import { getEightWorksByType } from "@/request/map"; import { addEntity } from "./map.js"; -let hotworkList = []; -let confinedspaceList = []; -let highWorkList = []; - -export const handleHortwork = (b) => { +const workTypeList = { + BLINDBOARD: "盲板抽堵作业", + HOISTING: "吊装作业", + BREAKGROUND: "动土作业", + CUTROAD: "断路作业", + HIGHWORK: "高处作业", + ELECTRICITY: "临时用电作业", + CONFINEDSPACE: "受限空间作业", + HOTWORK: "动火作业", +}; +const workList = { + BLINDBOARD: {}, + HOISTING: {}, + BREAKGROUND: {}, + CUTROAD: {}, + HIGHWORK: {}, + ELECTRICITY: {}, + CONFINEDSPACE: {}, + HOTWORK: {}, +}; +const workIndexList = { + BLINDBOARD: "8", + HOISTING: "7", + BREAKGROUND: "6", + CUTROAD: "5", + HIGHWORK: "4", + ELECTRICITY: "3", + CONFINEDSPACE: "2", + HOTWORK: "1", +}; +export const handleWork = (b, type) => { if (b) { - showHotworkList(); + showEitghtworkList(type, workList[type]); } else { - if (hotworkList) { - hotworkList.children.forEach((e) => { + if (workList[type]) { + workList[type].children.forEach((e) => { e.destroy(); }); } } }; +const showEitghtworkList = async (type, list) => { + let x = {}; + x = new window.CustomCesium.GroupModel(workTypeList[type]); -const showHotworkList = async () => { - hotworkList = new window.CustomCesium.GroupModel("动火作业"); - - const { varList } = await getHotworkList(); - varList.forEach(({ HOTWORK_ID, CHECK_NO, WORK_POSITION }) => { + const { varList } = await getEightWorksByType({ TYPE: type }); + varList.forEach(({ ID, CHECK_NO, WORK_POSITION }) => { addEntity( - hotworkList, - HOTWORK_ID, - "动火作业", - '动火作业:'+CHECK_NO, + x, + ID, + workTypeList[type], + workTypeList[type] + ":" + CHECK_NO, WORK_POSITION.split(",")[0], WORK_POSITION.split(",")[1], WORK_POSITION.split(",")[2], - "/src/assets/images/map/bottom/ico1_select.png" + "/src/assets/images/map/bottom/ico" + workIndexList[type] + "_select.png" ); }); - hotworkList.show(true); -}; - -export const handleConfinedspaceWork = (b) => { - if (b) { - showConfinedspaceWorkList(); - } else { - if (confinedspaceList) { - confinedspaceList.children.forEach((e) => { - e.destroy(); - }); - } - } -}; - -const showConfinedspaceWorkList = async () => { - confinedspaceList = new window.CustomCesium.GroupModel("受限空间作业"); - - const { varList } = await getConfinedspaceWorkList(); - varList.forEach(({ CONFINEDSPACE_ID, CHECK_NO, WORK_POSITION }) => { - addEntity( - confinedspaceList, - CONFINEDSPACE_ID, - "受限空间作业", - '受限空间作业:'+CHECK_NO, - WORK_POSITION.split(",")[0], - WORK_POSITION.split(",")[1], - WORK_POSITION.split(",")[2], - "/src/assets/images/map/bottom/ico2_select.png" - ); - }); - confinedspaceList.show(true); -}; - -export const handleHighWork = (b) => { - if (b) { - showHighWorkList(); - } else { - if (highWorkList) { - highWorkList.children.forEach((e) => { - e.destroy(); - }); - } - } -}; - -const showHighWorkList = async () => { - highWorkList = new window.CustomCesium.GroupModel("高处作业"); - - const { varList } = await getHighWorkList(); - varList.forEach(({ HIGHWORK_ID, CHECK_NO, WORK_POSITION }) => { - addEntity( - highWorkList, - HIGHWORK_ID, - "高处作业", - '高处作业:'+CHECK_NO, - WORK_POSITION.split(",")[0], - WORK_POSITION.split(",")[1], - WORK_POSITION.split(",")[2], - "/src/assets/images/map/bottom/ico4_select.png" - ); - }); - highWorkList.show(true); + x.show(true); + Object.assign(list, x); }; diff --git a/src/views/BI/js/map.js b/src/views/BI/js/map.js index 2dff39d..b0844fe 100644 --- a/src/views/BI/js/map.js +++ b/src/views/BI/js/map.js @@ -1,6 +1,7 @@ import { h, render, ref } from "vue"; import userDialog from "../components/dialog/user_dialog.vue"; import hotworkDialog from "../components/dialog/hotwork_dialog.vue"; +import electricityDialog from "../components/dialog/electricity_dialog.vue"; import confinedspaceDialog from "../components/dialog/confinedspace_dialog.vue"; import highworkDialog from "../components/dialog/highwork_dialog.vue"; import cameraDialog from "../components/dialog/camera_dialog.vue"; @@ -11,6 +12,11 @@ import { getConfinedSpaceView, getHighWorkView, getHotWorkView, + getHoistingView, + getBlindBoardView, + getGroundbreakingView, + getOpenCircuitView, + getTemporaryElectricityUsageView, } from "@/request/eight_work.js"; import { getVideoManagerView } from "@/request/video_manager.js"; // const mapUrl = @@ -164,9 +170,24 @@ const handleMouseClick = () => { if (model._name.indexOf("受限空间作业") > -1) { clickConfinedspaceWork(model); } + if (model._name.indexOf("临时用电作业") > -1) { + clickElectricityWork(model); + } if (model._name.indexOf("高处作业") > -1) { clickHighwork(model); } + if (model._name.indexOf("断路作业") > -1) { + clickCutroadwork(model); + } + if (model._name.indexOf("动土作业") > -1) { + clickBreakgroundwork(model); + } + if (model._name.indexOf("吊装作业") > -1) { + clickHoistingwork(model); + } + if (model._name.indexOf("盲板抽堵作业") > -1) { + clickBlindboardwork(model); + } if (model._name.indexOf("摄像头") > -1) { clickCamera(model); } @@ -284,7 +305,6 @@ const clickPerson = async (model) => { handleDialog(userDialog, pd); }; const clickCamera = async (model) => { - console.log("clickCamera"); const id = model._id; const pd = await getVideoManagerView({ VIDEOMANAGER_ID: id }); pd.pd.cameraType = model._name; @@ -296,13 +316,38 @@ const clickHotwork = async (model) => { const pd = await getHotWorkView({ HOTWORK_ID: id }); handleDialog(hotworkDialog, pd); }; +const clickElectricityWork = async (model) => { + const id = model._id; + const pd = await getTemporaryElectricityUsageView({ ELECTRICITY_ID: id }); + handleDialog(electricityDialog, pd); +}; const clickConfinedspaceWork = async (model) => { const id = model._id; const pd = await getConfinedSpaceView({ CONFINEDSPACE_ID: id }); handleDialog(confinedspaceDialog, pd); }; +const clickCutroadwork = async (model) => { + const id = model._id; + const pd = await getOpenCircuitView({ CUTROAD_ID: id }); + handleDialog(confinedspaceDialog, pd); +}; +const clickBlindboardwork = async (model) => { + const id = model._id; + const pd = await getBlindBoardView({ BLINDBOARD_ID: id }); + handleDialog(highworkDialog, pd); +}; +const clickHoistingwork = async (model) => { + const id = model._id; + const pd = await getHoistingView({ HOISTING_ID: id }); + handleDialog(highworkDialog, pd); +}; +const clickBreakgroundwork = async (model) => { + const id = model._id; + const pd = await getGroundbreakingView({ BREAKGROUND_ID: id }); + handleDialog(highworkDialog, pd); +}; const clickHighwork = async (model) => { const id = model._id; const pd = await getHighWorkView({ HIGHWORK_ID: id }); diff --git a/src/views/device_manager/user_card/components/batchaddcard.vue b/src/views/device_manager/user_card/components/batchaddcard.vue index c012703..c1f9aa3 100644 --- a/src/views/device_manager/user_card/components/batchaddcard.vue +++ b/src/views/device_manager/user_card/components/batchaddcard.vue @@ -54,7 +54,7 @@ const handleChange = () => { data.form.end = data.form.begin + 1; } }; -const emits = defineEmits(["update:visible", "submit"]); +const emits = defineEmits(["update:visible", "submit", "get-data"]); const { visible } = useVModels(props, emits); const fnClose = () => { visible.value = false; @@ -72,6 +72,7 @@ const fnSubmit = debounce( }); fnClose(); emits("submit"); + emits("get-data"); }, { atBegin: true } ); diff --git a/src/views/device_manager/user_card/index.vue b/src/views/device_manager/user_card/index.vue index 62bb8c7..58812e1 100644 --- a/src/views/device_manager/user_card/index.vue +++ b/src/views/device_manager/user_card/index.vue @@ -39,7 +39,6 @@ - diff --git a/src/views/map_settings/layer_settings/components/add.vue b/src/views/map_settings/layer_settings/components/add.vue index 63f630f..c84e1ea 100644 --- a/src/views/map_settings/layer_settings/components/add.vue +++ b/src/views/map_settings/layer_settings/components/add.vue @@ -14,12 +14,6 @@ - - - - - -