From 28e6e129990cc51df12d69b477f27b80c87f1349 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Mon, 26 Feb 2024 16:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E7=82=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/map_tools/icon1.png | Bin 0 -> 2736 bytes src/assets/images/map_tools/icon2.png | Bin 0 -> 3078 bytes src/assets/images/map_tools/icon3.png | Bin 0 -> 2662 bytes src/components/map_tools/index.vue | 72 ++++++++++++++---- .../other_alarm_configurations/index.vue | 1 - .../components/selecting_points.vue | 6 +- .../assignment_ticket_area_settings/index.vue | 1 - .../components/selecting_points.vue | 18 ++--- 8 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 src/assets/images/map_tools/icon1.png create mode 100644 src/assets/images/map_tools/icon2.png create mode 100644 src/assets/images/map_tools/icon3.png diff --git a/src/assets/images/map_tools/icon1.png b/src/assets/images/map_tools/icon1.png new file mode 100644 index 0000000000000000000000000000000000000000..02d8bbc59603cf78b5543a5adc61fd7ef49c14a4 GIT binary patch literal 2736 zcmaJ@dpwi-AK&R5RB|ij6l0C!8nex8mbq=CVUELWI2?v&wzB(TbBWwKy1GP3q>xY| zcTp*a5K2iz8I?pFahwwMn@)9pfBgDAuh;W@FR%Ce{kgsWcv9TmoRrpYTMq((lt{Y> z9WghCv~pAfi1u=s!t$ zlieYBt^k0b%q&fV;T9+e+R6-WiL|h?+5thB!!a;(3=EDmg%@vtyhL_~yH1k#Kv2!+9|tgK+>2p9rkDnpnGB^(i5Y|0Vpeo-I* z!e9Z5Ct`6qkX1!`5O=Q#2bE>|PYG<^S6PnmbDLxhgNf-p7~IT!wWKdVGWq{Q+3c@q zp~wUHH{bs$ETl+y0L%jra`y^?WrJhru7=`a@dAJ@;tD8SZrGPDx-+>Vu8_&)LGbw1 zu3140X)I0%H$rIii9;r1NgSbw&Itxc1RPYRV#Z>HU>)ooFqT&4D1rsr0S+e;F({0M z1KJUTz!TvJ6ax8$OW+3YWdj`17jDSET+45ASM9*&$s!W~0V^B`aTIXbkWXb}S>MhD z`Axmg+>meQV)0EbOqL96b-4dE>@Qa`2d!?uT32@XYJPwtbG$%i?fZtkl^~D;gha5X zh=(3zOI#^5^#if<43M0hI-fX2&1?+prxu*7ww%Ngf0KKPZOhdKFVrq*}G2d_~Q zGxmibvX{E_H@PAL$I@fZ$IkRKcfE5`*tRa!VhodE28NOg4~S<3yi!%WKi2eRIu>jw z2-{e(xZXCA3hj4}Zp;>G;OxqAqv>Gu<+ITCz~i)ZHTOwX3&nx)CFh+c4gN(jImD^w zIw4BpR5ufLD&R@UY*}k8b(J1S1+t&sG(_jt;s!g5>as&ilt+Ra+Sg$d4?f)>FVV;6 zobK}bUVC)0qelz7k~{5ILv^|W>OP`J^V-^R0LQgX{=xEtubEKwWu z8u2?;fva_)j%VLu@ERL*Hk0Jbhi~7lk-yw9ks&@jI5aNo7}(ZaJoQTQB2c?*bU}1a z9R=0wDrV0~#GT|Ps1?kbj2#+I)?+QGKkY5$`^A|ww3Ch&^=y%M z9cuXTmcsSq$@#i*yEi`1Y)#ru{gfdcd~i!&tbOqZP1nYRQIpb^$w2Lux!NiPJ-p77 zO-X9__YmDF{ju=k_1C+X$CaJCj4Og#-WwX3Iyt@|PrWpx|r#3c_G~CF!TdSILqM%k!Hh{4a zn&Ad{Z3!H?jA|3jhOrY+bCJ{2~&6 zW@jvMId<}mscXSJpQ}VzD(Sv(@#4+IiX*q9`~qoV23w2bRp1>xN&9MCb|w?TOVW1M`5eygmEnZ&?+LlAGK*pjOLN=rmb?Jz$M=Dwsy+NI%>v zws=l^q->_Y@7aaX0cH~J&b>_YS^nW7Qc@-{0Ju?^G3mV}!|>>y&IS;z(SmT$b+9w$m?8YqWo7FC8(e2%RePtBMQc-)Hglf0EC* ziSFN4`1)}*L42Dz$5>uzstj7OH<2`F>C`HK8B@l8CFd+OA}3YKQXc+JkGWgBSMh58 z{FyCh>kG9sj4nN|yH~I$YPfy{WOH1*a5}(Dkd^v7rm%=py|(<9MXeNc&WLC6^2Zu# z-vata(}dz_|MI15e}us+7pZp4ngBH)>0+Xesx?NHJUn8~cidsRRlL)kCCw$UNj$_`{y{S|@YeW{u!wNc3%P;{ey(p%&xgq8yag(fCFq&r?0fHlRv`i2VDN-px?|+_t=q zgdDxZa*dKh&wbyIH^thQE!UKLTU7nvzE~gKLfD|wrx_Wu+1R+0w?M&eRL(ss#5b#@ zU`61+!d<%?#*>c3EFqr+rs{rB%yIA~#k(1RAuoMC<}JJ$ihqnpANpAv=K07*Xnu?w zbzni{LrI*x)AFInuFAi*SF1IHK5vN}iB3(`m7L!_ofjGvl&tsu4t?N5{hBj�#3J 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 Q(z!oBZx0_*sasgW-v_*o?f?J) literal 0 HcmV?d00001 diff --git a/src/components/map_tools/index.vue b/src/components/map_tools/index.vue index 1ab30e0..ddb9ea2 100644 --- a/src/components/map_tools/index.vue +++ b/src/components/map_tools/index.vue @@ -1,16 +1,29 @@ @@ -32,22 +45,18 @@ import { getEnterpriseInfo } from "@/request/enterprise_management.js"; const props = defineProps({ type: { type: Number, - required: true, default: 1, }, positions: { type: Array, - required: true, default: () => [], }, position: { type: Array, - required: true, default: () => [], }, modUuid: { type: String, - required: true, default: "", }, }); @@ -88,17 +97,48 @@ onBeforeUnmount(() => { window.$carmer = null; }); + diff --git a/src/views/alarm_configuration/other_alarm_configurations/index.vue b/src/views/alarm_configuration/other_alarm_configurations/index.vue index c0c2b65..fd2044b 100644 --- a/src/views/alarm_configuration/other_alarm_configurations/index.vue +++ b/src/views/alarm_configuration/other_alarm_configurations/index.vue @@ -111,7 +111,6 @@ import { nextTick, reactive } from "vue"; const props = defineProps({ isGatheringAlarm: { type: String, - required: true, default: "0", }, }); diff --git a/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue b/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue index 7373fd4..a0b6a9d 100644 --- a/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue +++ b/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue @@ -1,6 +1,6 @@