From 7b4f22222d94806bd2609bd7f5ba5fd3a08dcae9 Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Thu, 22 Aug 2024 16:00:04 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=80loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/asset/image/bulbLogo/fault.png     | Bin 0 -> 5978 bytes
 .../public/asset/image/bulbLogo/fault1.png    | Bin 0 -> 5222 bytes
 .../public/asset/image/bulbLogo/repair.png    | Bin 5978 -> 5935 bytes
 hx-ai-intelligent/src/App.vue                 |   7 +-
 .../airConditionControlSystem/device.vue      |  57 +++++++++---
 .../airConditionControlSystem/tabs1.vue       |  71 ++++++++-------
 .../airConditionControlSystem/tabs2.vue       |  14 ++-
 .../airConditionControlSystem/tabs3.vue       |  50 ++++++-----
 .../lightingManage/indexs.vue                 |  56 ++++++------
 .../equipmentControl/lightingManage/light.vue |  84 +++++++++++++-----
 .../lightingManage/lightPosition.ts           |  37 ++++----
 .../equipmentControl/lightingManage/tabs1.vue |  78 ++++++++--------
 .../equipmentControl/lightingManage/tabs2.vue |  14 ++-
 .../equipmentControl/lightingManage/tabs3.vue |  49 ++++++----
 .../equipmentControl/style/dialogStyle.less   |   4 +-
 .../components/fanControl.vue                 |  71 ++++++++-------
 .../ventilationSystem/components/fanLog.vue   |  46 +++++-----
 .../ventilationSystem/components/fanPlant.vue |  14 ++-
 18 files changed, 401 insertions(+), 251 deletions(-)
 create mode 100644 hx-ai-intelligent/public/asset/image/bulbLogo/fault.png
 create mode 100644 hx-ai-intelligent/public/asset/image/bulbLogo/fault1.png

diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/fault.png b/hx-ai-intelligent/public/asset/image/bulbLogo/fault.png
new file mode 100644
index 0000000000000000000000000000000000000000..a30b50ded7c4bf7476d204bb5d48547b0fb609ca
GIT binary patch
literal 5978
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
Y@3am0C!I^6^{?M%`>gOc_7Y<L2X%BlegFUf

literal 0
HcmV?d00001

diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/fault1.png b/hx-ai-intelligent/public/asset/image/bulbLogo/fault1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef86a7738a3aa24413cdd53962d311f8ba5e82d5
GIT binary patch
literal 5222
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

literal 0
HcmV?d00001

diff --git a/hx-ai-intelligent/public/asset/image/bulbLogo/repair.png b/hx-ai-intelligent/public/asset/image/bulbLogo/repair.png
index a30b50ded7c4bf7476d204bb5d48547b0fb609ca..d77cfc08a8d08a48137fd99e0475e5c88e879b15 100644
GIT binary patch
delta 4409
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

delta 4449
zcma)-X*ARi*oJ4p&=68%Um}FTU<_)q_ZPBn*~h+Q88l@54TZ8K8GF`{$ud*6NDNwR
zC6Rs2Qg+Ic{dLa!>HYRT-<}Wmb?)n&=bVQkGbTg*0D;S4%;n^+DWa~)DW>&7g#XWe
z1TnrM=PWO;DDS2$?J6&)EbZ)qc9K?hMmb3<xuaCv+%RY*c}4d$JXG?EJjzW@MFpiO
zt>h}_CXG=*yGScLIVnh^l`$&L7_>7ArHHO+fr>%?e@G(T#WW*&M*9D4Rz!zQ%c4i5
zg)>+Kq)X7(AP}3kuC|8x{js&Ya6I3S^!V2C0fiUb$ya*9M&BUEaZ;bSv`}IUunvS#
z8b}{fVyceeeRbhnf*btVQ)63eGari)Q8<&2(9N}W_h_4Q;$?^oB#s%w<-<V(w{9L@
zhM!SvDcoNw`cC?#zufCfDhc&;_ffVmdkGj8SWX84k%GVS!~OJ4AQ#xx@L&{7`OASK
zv~Gyf)wIKipEw|Z!mFnJW+F??%SY-fgk!cXaNKx$d_c6oJDxlA&Bdg#PhEz>^7h*6
zoT*jvTeZ5{>z7g`#6^rb6FYl^oo{VPhzZLkbcVW3i{6|MoVh$RA?JU7ue~T`7Wi%X
zdkQ}JPG}I?=EAm&+1OH4cat_B>X=tC4&g!PGYx!&`s1)-@8L&w5<3poU@_qx8YMbc
zVd^4F+xib`_$9tEkbQxuTANe1@_gC;w>Mm4)x`RWPx4#3GpeQLKo^)Jl{fk&QP<0V
z<UJ4OSYWrADU~T_@Sa-lF$1y*U?~Hn2khgcHzZ0e)9Fy`Tc8wBNZEU*KJWX#91G`O
zlpsv$ROeQx+p1XsPS+}!XEbKOrKF22D0VNf1H=?Il>dGcP>VZWQ8yEE9ujZ-;1nvn
z6O_^RCce<yTP$S$ztX`iCfIH5uP_HNj~QtL%e<imiOWjo4y9zQ&T{}&A%`=?1?~F{
zFDtrLaoMKcpC6t%DuMc-0=dNv{0;};dwx((wwKNSYCqzS&1NV;mSonq|4Hl^ww;-^
z(&rnRtcF1yT6mM%KIA6D-+tdTU9RAnX%a6IT`R$Vye|$_G^AG3In+&A#hlq&9t%hA
zUDdJnqOP)M?G1kgB+o+<(@kyvF!b6$tD#4jk4-wW4?c5nkc!mP(zF}`WsxlkdE){3
zrmsXiXxdjmJ}?`fggpStD+tp)2oe>~Z2l+nc5~yo#S|mbMDL@5Q*m-X?L>;c(#VmR
zY?Srh%&QO?^`?s#fZLwVRBj9-)uay*V!{o!`U!Mvk#NAFaUjA><fM3BcDTUli4;pv
z(Jb?(<!G|XHh7zmRS_3i0k=IN7||;ApZ{nzm)IG4d#3F!b?X;zqcWZ=zZDS|Q-;MJ
zx)yK!9<Pr57^1#YyLE_}jT+fT`b3?NiQG>Y<lMCC_#*qDb!s<(sG>(M+Jfvd;6s1L
zfTjH801^17t3A)0UIrkKy)xUs7pPkVttU3&)s7Za{>^l)_Jlb2J1|a1jWK=h&?6T-
zVai%~UQM+>+LRdi=jw#$PK+XT{r#GJP4%JLBs3KZW!GPi4)P;7*cXz<p0lIaO=yO=
z;C9Y+;%N)mId!`yWh?LoC{x-<$zk5;b8!1Iuprhqs>&J>B1-229=9Ty4nM)@PdP*3
zxGxVDd9*^J%ND-M9&G)_twmgNIAmJ2&Aovm_~MrW%gehaRYe#!PP+H!?`pd`*w8A6
zcHrY{Yb&#xju*@Vt0UUJp!RaJqr+xx7ZX*eGJ8ZbdtSR8d{nSN1Zz{n^@1bZn2ZD<
zY-QV1KzF>szqv2IPsm&hn$1ml$z2P>9sA>c70~#Jq9Gl<r87+PR#Rm!XZuc552yRy
zvQ<ZL>AVd&*gPlHs2|n08*iUG+lk-^&6Em>T4(*vTfZDN^0#U9kKc(%t$m)_9gxSA
zYw#DlwHt522V;53%kH+BwHQlE&8235;C6yDxWSpznqxywK4q{kXn$VewA2TO4x&OK
z_#uP+(f4k#f62fcUxy!^q|f96%_fMu$gA=1zEauaN&qtM5W}s177!Erq_z=vw5s}4
zeyf)wRUr-huD5LJv|feH+h)DFn87Bqgxe*b-jUGcsWIEhi*meGy{i*L1=K{#?t8h@
z#+2sw;z)3t)_j}Px$xQF?#joK<vuwhlk*ZDzdTNhcD{-`Fc&6vE~&TMrYZAHIt%CV
z$t0!a@!hI%nQocl6LEL^`p|6B2k+H54!8!{(9pPmgkc}9!s|yQp9KlHsZ@Zg)cse5
zyS0yDmAkb^tE>em=y_cVpsww{LgTKFd9qGD2z-{A!C^EP-GnaB)iUX{&jxNZg(!#X
z<(}`YyEJ&(IO>~ZV!1z;IsnFeW2sY+;E}Le-{t-3;{*ya1M~i_J!1D*=`=Oe={flk
z@%Ll#yc{y~U_0bm!ARLlpU(5a*&&HU)5gD^s7NIV1bxb)W6F#P@XO4WU~7I!z1VU!
z_virF(8#KP^vr~M{WR<YL!OcEcQAz?B_bE+rJLI2voQ65L^9+<t)x~Q$EhPlH7CoV
z>lbO~<l^{8U4!)-TG2%Qu)aX{KU^KA@#zQ_s<`jc)X|({M{|(b<EA+|g=rDT!y7Fm
z@w>zuT-AqPMsGF(7wm#M=YDJeHE816zk>D=%FFF1E#|c56ZBmv-=sP#hDb*kUs&tE
zstOk^r`0|4GWykrYo<4=RQ{1m@|-i>Gi&-c!hZDnOCuudi}AbRVx<pR(YTbgXRYic
zKjBIik?QMH+K7XqIqLrCPa<K)SNV_E>?%c%NoaMb%C`=nv%rWB;mEleWoDU=<(E?Y
z;?|^Qll%?%?iBbxTm#S=okK0R57hM-z2nc1m?5ABx&yBlGPx}6v_!?T+{ylqa7F2F
z5mB>k%NxW#2Z%x6WXrvSLAD>k{8U(!SRdxpCTRX+N=7Zl;kcf&u!$b>B^D~BN+)=X
zNV-+*F%Nhbn5lWy*VKOD*(CdxZJTQmYUmqx2JB+f)S|vux)%LT^XRqT*BrN1=(sIu
zXq;l|9q+zSL3!QqrtvZO^*1ac`oRXmbH9euaJ7Kz`pU0TA7;q!3@YNS*y|5iUR7Xv
zb<UfF-M8D}UnvR>&N-|h?X|i!(Z$vq5y|j8B2dL`otxN+?0t}{8y?T9b+zke52-Ui
za``wJpD&$fM)cAn8}h45)EQ}GMt&Y9duSbA3ztmKi2hYf$@dOEw)2{yX2ayzcNO#J
zkZT5|<{p8Wbbo1@5ULj^?HBLuX*%88jj=yv)M`&G)`@kLSeNT!G#RDa`T>#uVK-b^
zfgSpB>3m7gJ2=&=p~)7v8rkFyHOG|}uy~6R=Wn#`)R7OjM)e4Zoi6Idf9sLa>s4Zv
z&I^sK9nUGNw++U(U^O3;n45K9)IjbDBAdjSkka6=%WHRaN2^ZLO}$a{sKh9yiLaa1
z!T=O48`B|}Tf>xdgI7g%^tCqG_d&M_@Z|2w)ZpEm3gRwfZApnO3n*o*ms*D}J)hXw
z3JpoJdmhEKy&Cfy_j9)XQz}}~<Asv&lbMYe<c*{9AMJt2Y4V<7Tn1@7PKRXrzCMKX
zi3CHsRvA~p-0l5Jp`xD??RMpaY>&UmJ&FwyY-PCqM{1g^7MWf1&~T=}jEB$-D8Dl2
zq+(0o4fZt@l;8tvS9ii4yI5*>>)5Vk0Q()yp>lMlU(ZdvB<V3Ndvp&B%k^=6srPO5
zjT8`mKcst3f;l9#@J;_c9$Q%k$H-S2uTgw=+=A!ul<XId<$t7jXQh-zm2S`U>5*%l
z()*u$MbfF(+A|Y6s?*7HMs2~bfcK~s@5AvY+Z|I@PUY`57nY(t-}T=sde;7p)~H9m
zVGVYV-i@5$J{;+13U^=-$sf5a;9z-CZ&xWR^!P&TiB>GoQr4SSq%zImm>0x!&$=w=
zKNrYZ=K74zZWZyEdP*?#&Z%R5Ws_&MVWoE*Xzm!wNA#ktDA!zkkVoAB6#uFd^>{eq
zI+_<G?_TR|zHlVr$a~*Vg0Pa6n7Gx<EY%YR#b-p`zRm!1l=V@^3wK$76*8k6hRC5T
z|Kd!$uQK8go(8n*>bVB&ESjHr7zqoRYYP3%#q2gRa+!C6!}@p{KJ5(E95Z*g&iK-1
zGvN1pWAdx^Vf5mfes@3s0sh@$k7cH5D<)m>jAUV{k!VKJ(wW^1d&F!!*!S7>=ah}-
zH9^Vc0Sh-#{D9}LcW}s^3wT!WUTI35fBd?ydM*0?l0$hOYnuGxz*H3}4Egersj5r)
zBRdc_exF4vUjF<stT2RA`yfHV(qd5K%MzO>A#A;4n|(9ywjr?e5b7Si*nt(^+jH%{
z$FiqBt;&V<TrAKqEMV4`lH!-NEeb>27k9IJ1w92}G5OheO>hvh^n@d;V84uuj<v%$
zrE&1__Ch_w_F&E|m*b6pIh8(3N!vV|TBYXUmzS+KDLx6EA<^N{u`bhmN`G&?fU@yY
zcUiw%le0Y}cL31aicfdDduT88$co~zDOZI#A9n@`Uy%F>6A9Oz4`9!Z{4O)9U1F;3
zm%2&2&H*vOVuX(4r=RBePgy1%T-@kr*fTNcm{3UW$&?)|lWroacR(guEYa_;RlvCW
zW!fLC{pa{uXY7Q)TP)>&I=B|BfX9YWmzkdAUnB0D^aIx?;S+v3q=ua%y+y#|T3Xrg
zEQQ?8U*5h(fv^j=sm6sJGVyPeuGEM$9~&JiAlQ=pOj^alx<L#=thaNxlW&SQ#_Ru>
z)P7;|Cxakee)1adkXtU~B&h$zx32{bYr721f><UTl=i!sKN?=FIA>!54&T%k47e2X
z?ma^>Ge8;^dX*I6W>dDE|BOf$Vvy+*I@c!nGzM?9@U$s1<lo@gclEPUlc8w;)GM!)
z4;A=>^Dm)fEw0>zAyvt&Ky4d`-0%Z|)@%q$c*SA!N|(!TDMcd_uv8e_Y|lRtXa2B1
zz0is=?&A(~1p58`;^iW(A~PNo=qOAr$70C|Sf@P2V|4{mrZP{5dyLN0Ufn(DM?)7B
zHf^xQ+*1ixLa_&rFvi;grf(D%HxPZ=W{oLDGMR1mE4yT&z~u%M4zwp!e8uOg#$GlS
zo{hgp9l@nvq^ct^pr+X!dgfxeG>^-3yDS;)>(9W5rl4cC{AJ~>M>D(nmJ@;~<$6Hu
zUo51T!e*>75yc(oCC0VBjlC(D96Q*D(sODs^pbcKcqj=`WfW~RQ+@Zmm{P@@(T%Gj
zdERVo#WQAp7DBL3RDbYCj)qcC6CqhT(n{Z)weCYMB)oIQM&Q(imk%y&$zH*M2GI{0
zdE;b_@3LW-3l<gsOM_aRJS#hwE&xzjbK}daFdnUA-fb2739AOrV3Jy;Xe$$jE3%Uq
zZc1Rv(yBlruSJ7uP%Wu`c>%<wI?N_Rfin?#P)1C2Gzr*pglONyKsSW?Z3`8Ug42HZ
zR%bKxgV?a`pQV${Od|NKLjYup>yp6I2KNO??03Ps`+ZN@_HH?Lq6V#i44oD_pAVls
zSvU|cye$(o?j*emOSBCnXc?67^&$mn!jUEs2AWu;xn&kscWUUSHK^>W$TN$c3a?7z
zZNB&}-R!USTJ40MLw)wI64M9<V>5oy5@yLUX3cJ)5!{~x^6NlQMZ`qHyq_2Ptta1`
zqlC-9&k;j@28kJVBM>&g8*J1So{Pm6n!WQn#Tv8E1wXaWAzAh>eMk53uJ}w#X;;L?
zJw<<Per<O;{+m243dR^bHt;Ps9dwE+uXv;2V7N#Q?9e~DT8~|H;zYr+2v#M}ZL%!=
z&Td)r(0a@F!3|By@KteY_XQMa%KmO|#k-N2AAgpgxEaW{{44GeKXBA{{QmaS8+m&D
f$DNt};_w5&BZE=<^Y9@QbT+y-4YjK^aWVe`N5W^$

diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue
index d862cbb..2956895 100644
--- a/hx-ai-intelligent/src/App.vue
+++ b/hx-ai-intelligent/src/App.vue
@@ -1,6 +1,8 @@
 <template>
   <a-config-provider :locale="locale">
-    <router-view />
+    <a-spin :spinning="state.isLoading" size="large">
+      <router-view />
+    </a-spin>
   </a-config-provider>
 </template>
 
@@ -10,6 +12,7 @@
   import { useRouter } from 'vue-router';
   import Cookies from 'js-cookie';
   import { message } from 'ant-design-vue';
+  import { items } from '/@/store/item';
   export default defineComponent({
     name: 'App',
 
@@ -37,6 +40,8 @@
       return {
         cachedViews,
         locale: zhCN,
+        // 获得全局变量
+        state: items(),
       };
     },
   });
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/device.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/device.vue
index 3fe7ca6..3b5b3e4 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/device.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/device.vue
@@ -9,29 +9,29 @@
               device.regionName + ' > ' + device.deviceGroupName
             }}</span></div
           >
-          <button class="right-button">{{
-            record?.runStatus?.label ? record.runStatus.label : '--'
+          <button class="right-button" :class="getClass(record)">{{
+            record.runStatus.value != 0 ? record.runStatus.label : record.switchStatus.label
           }}</button>
         </div>
         <div class="light-tag-box">
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">控制模式</span>
+            <span class="title-text">控制模式</span>
             <span class="result">{{ record.autoStatus.label }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">温度</span>
+            <span class="title-text">温度</span>
             <span class="result">{{ record.temp + record.tempUnit }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">控制场景</span>
+            <span class="title-text">控制场景</span>
             <span class="result">{{ device.scene.label }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">风速</span>
+            <span class="title-text">风速</span>
             <span class="result">{{ record.windSpeed + record.windSpeedUnit }}</span>
           </div>
         </div>
@@ -75,6 +75,23 @@
   const device = computed(() => props.device);
   // 设备信息
   const record = computed(() => props.device.record);
+
+  const getClass = (data: any) => {
+    let state = data.runStatus.value;
+    let isOpen = data.switchStatus.value;
+    // 故障
+    if (state == 1) {
+      return 'button-fault';
+    } else if (state == 2) {
+      return 'button-repair';
+    } else if (state == 3) {
+      return 'button-alarm';
+    } else if (state == 0 && isOpen == 1) {
+      return 'button-on';
+    } else if (state == 0 && isOpen == 0) {
+      return 'button-off';
+    }
+  };
 </script>
 <style lang="less" scoped>
   .icon-box {
@@ -116,9 +133,29 @@
         width: 5em;
         height: 26px;
         background: rgba(57, 215, 187, 0.1);
-        border: 1px solid rgba(57, 215, 187, 1);
+        border-width: 1px;
+        border-style: solid;
         font-size: 12px;
-        color: rgba(57, 215, 187, 1);
+      }
+      .button-on {
+        color: #0dffa4;
+        border-color: #0dffa4;
+      }
+      .button-off {
+        color: #bfcde2;
+        border-color: #bfcde2;
+      }
+      .button-repair {
+        color: #ffbc46;
+        border-color: #ffbc46;
+      }
+      .button-alarm {
+        color: #f36163;
+        border-color: #f36163;
+      }
+      .button-fault {
+        color: #ff7636;
+        border-color: #ff7636;
       }
     }
   }
@@ -140,9 +177,9 @@
         vertical-align: middle;
       }
 
-      .title {
+      .title-text {
         position: absolute;
-        left: 60px;
+        left: 53px;
         top: 13px;
         color: rgba(64, 255, 252, 1);
       }
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.vue
index 90c6c8d..5f5d654 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.vue
@@ -269,7 +269,7 @@
 <script setup lang="ts">
   import { ref, computed, onMounted } from 'vue';
   import { DownOutlined, UpOutlined, StopOutlined } from '@ant-design/icons-vue';
-  import { message } from 'ant-design-vue';
+  import { message, Modal } from 'ant-design-vue';
   // 请求
   import { http } from '/nerv-lib/util/http';
   import { airConditionControl } from '/@/api/airConditionControlSystem';
@@ -736,47 +736,47 @@
     if (!changeList.value.length && !lockList.value.length) {
       return message.info('未产生任何修改');
     }
+    state.setLoading(true);
     http
       .get(planManage.getRunningPlan, {
-        deviceType: 2,
+        ctrlType: 2,
         projectId: state.projectId,
         siteId: state.siteId,
       })
       .then((res) => {
         // 如果有计划正在执行
         if (res.data && res.data.length) {
+          state.setLoading(false);
           // 此处框架本身存在问题，弹出层在本地环境无法关闭，暂时使用浏览器自带的confirm方法
-          // Modal.confirm({
-          //   title: '提示信息',
-          //   content: '有计划正在执行，点击"确定"将暂停当前计划',
-          //   onOk() {
-          //     return new Promise((resolve, reject) => {
-          //     });
-          //   },
-          //   onCancel() {  },
-          // });
-
-          let flag = window.confirm('有计划正在执行，点击"确定"将暂停当前计划');
-          if (flag) {
-            // 如果点击了确定，将先终止所有进行中的计划
-            http
-              .post(airConditionControl.submitChangeList, {
-                projectId: state.projectId,
-                siteId: state.siteId,
-                lockList: [],
-                sceneList: [],
-              })
-              .then((res) => {
-                console.log(res, '成功');
-                // 如果重置成功，则获取修改前后对比数据
-                if (res.retcode == 0) {
-                  sendChangeList();
-                  // 未成功提示
-                } else {
-                  message.error('关闭进行中的任务操作失败，请重新尝试');
-                }
-              });
-          }
+          Modal.confirm({
+            title: '提示信息',
+            content: '有计划正在执行，点击"确定"将暂停当前计划',
+            onOk() {
+              state.setLoading(true);
+              // 如果点击了确定，将先终止所有进行中的计划
+              http
+                .post(airConditionControl.submitChangeList, {
+                  projectId: state.projectId,
+                  siteId: state.siteId,
+                  lockList: [],
+                  sceneList: [],
+                })
+                .then((res) => {
+                  // 如果重置成功，则获取修改前后对比数据
+                  if (res.retcode == 0) {
+                    sendChangeList();
+                    // 未成功提示
+                  } else {
+                    state.setLoading(false);
+                    message.error('关闭进行中的任务操作失败，请重新尝试');
+                  }
+                })
+                .catch(() => {
+                  state.setLoading(false);
+                });
+            },
+            onCancel() {},
+          });
           // 没有计划正在执行，则直接请求
         } else {
           sendChangeList();
@@ -793,6 +793,7 @@
         siteId: state.siteId,
       })
       .then((res) => {
+        state.setLoading(false);
         if (res.retcode == 0) {
           diffList.value = res.data;
           executeVisible.value = true;
@@ -800,7 +801,9 @@
           message.warning('获取修改内容失败');
         }
       })
-      .catch(() => {});
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
   // 通用取消
   const changeCancel = () => {};
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
index 016ad97..fccad2a 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
@@ -30,7 +30,7 @@
       </tr>
     </thead>
     <tbody>
-      <tr v-for="(row, index) in dataSource" :key="index">
+      <tr v-for="(row, index) in dataSource" v-show="row.executeStatus.value != 0" :key="index">
         <td>{{ index + 1 }}</td>
         <td>{{ row.startTime }}</td>
         <td>{{ row.planName }}</td>
@@ -162,7 +162,7 @@
         projectId: state.projectId,
         siteId: state.siteId,
         // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
-        deviceType: 2,
+        ctrlType: 2,
       })
       .then((res) => {
         dataSource.value = res.data;
@@ -184,6 +184,10 @@
   };
   // 将对表格的修改统一发送
   const sendTable = () => {
+    if (!dataSource.value.length) {
+      return message.info('没有任何数据可以提交');
+    }
+    state.setLoading(true);
     http
       .post(
         airConditionControl.submitTableData +
@@ -191,6 +195,7 @@
         dataSource.value,
       )
       .then((res) => {
+        state.setLoading(false);
         if (res.retcode == 0) {
           message.success('操作成功');
           // 刷新数据
@@ -198,6 +203,9 @@
         } else {
           message.info(res.msg);
         }
+      })
+      .catch(() => {
+        state.setLoading(false);
       });
   };
 
@@ -228,7 +236,7 @@
         projectId: state.projectId,
         siteId: state.siteId,
         // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
-        deviceType: 2,
+        ctrlType: 2,
       })
       .then((res) => {
         let arr: Array<Object> = [];
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
index 2cd10a0..00d4f0c 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
@@ -55,16 +55,10 @@
             <div class="btn-item">
               <div class="left">控制模式</div>
               <div class="right">
-                <span>{{
-                  item.autoStatusBefore.label.indexOf('模式') != -1
-                    ? item.autoStatusBefore.label.replace('模式', '')
-                    : item.autoStatusBefore.label
-                }}</span>
+                <span>{{ item.autoStatusBefore.label ? item.autoStatusBefore.label : '--' }}</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
                 <span>{{
-                  item.autoStatusAfter.label.indexOf('模式') != -1
-                    ? item.autoStatusAfter.label.replace('模式', '')
-                    : item.autoStatusAfter.label
+                  item.autoStatusAfter.label ? item.autoStatusAfter.label : '--'
                 }}</span></div
               >
             </div>
@@ -110,7 +104,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 80px"></div>
+    <div style="width: 100%; height: 160px"></div>
     <div class="button-box">
       <button class="cancel" @click="logModalVisible = false">关闭</button>
     </div>
@@ -126,7 +120,8 @@
   import { Pagination } from 'ant-design-vue';
   import { http } from '/nerv-lib/util/http';
   import { airConditionControl } from '/@/api/airConditionControlSystem';
-
+  // 全局变量
+  import { items } from '/@/store/item';
   // 初始化 =======================================================
 
   // 组件
@@ -140,6 +135,9 @@
     getTable();
   });
 
+  // 全局变量
+  const state = items();
+
   // 日志业务 ======================================================
 
   // 分页设置
@@ -154,6 +152,7 @@
   let trIndex = ref(-1);
   // 获得表格数据
   const getTable = (changePage = false) => {
+    state.setLoading(true);
     // 如果是切换页面，则清除当前序列、关闭弹窗
     if (changePage) {
       trIndex.value = -1;
@@ -166,9 +165,13 @@
         pageNum: pagination.value.pageNum,
       })
       .then((res) => {
+        state.setLoading(false);
         let data = res.data;
         dataSource.value = data.records;
         pagination.value.total = data.total;
+      })
+      .catch(() => {
+        state.setLoading(false);
       });
   };
   // 刷新功能（右下角）
@@ -193,16 +196,23 @@
   // 日志详情显隐
   const logModalVisible = ref(false);
   const getLogDetail = (id: any) => {
-    http.get(airConditionControl.getLogDetail, { logId: id }).then((res) => {
-      const data = res.data;
-      if (data && data.length) {
-        // 显示模态框
-        logModalVisible.value = true;
-        cxList.value = res.data;
-      } else {
-        return message.info('返回值无效');
-      }
-    });
+    state.setLoading(true);
+    http
+      .get(airConditionControl.getLogDetail, { logId: id })
+      .then((res) => {
+        const data = res.data;
+        state.setLoading(false);
+        if (data && data.length) {
+          // 显示模态框
+          logModalVisible.value = true;
+          cxList.value = res.data;
+        } else {
+          return message.info('返回值无效');
+        }
+      })
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
   // 日志详情
   const cxList = ref([]);
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 313da81..74af70e 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -3,18 +3,14 @@
     <div class="lighting-img-box" :class="{ lightingImgBox1: thisFloor == '2' }">
       <!-- 左上角，区域切换 -->
       <div class="btn-box">
-        <a-popconfirm
+        <button
           v-for="(item, index) in floorData"
           :key="index"
-          title="切换楼层将取消当前的所有修改项"
-          ok-text="确定"
-          cancel-text="取消"
-          placement="bottomLeft"
-          @confirm="changeFloor(item.childList, item.dataCode)">
-          <button class="btn-item" :class="{ btnActive: item.dataCode == thisFloor }">{{
-            item.name
-          }}</button>
-        </a-popconfirm>
+          class="btn-item"
+          :class="{ btnActive: item.dataCode == thisFloor }"
+          @click="changeFloor(item.childList, item.dataCode)"
+          >{{ item.name }}</button
+        >
       </div>
       <!-- 楼层区域 -->
       <div class="area">
@@ -84,6 +80,7 @@
   import { lightingManage } from '/@/api/IlluminationInfo';
   // ICON
   import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons-vue';
+  import { message, Modal } from 'ant-design-vue';
   // 全局变量
   import { items } from '/@/store/item';
 
@@ -110,23 +107,30 @@
   // 左上角分层切换
   const changeFloor = (area: any, floor: string) => {
     if (floor == thisFloor.value) {
-      return;
+      return message.info('已选择此楼层');
     }
-    // 切换前还原修改内容
-    tabs1Ref.value.refresh(false);
-    // 清空设备点阵
-    bulbs.value = [];
-    thisFloor.value = floor;
-    getBulbs();
-    // 重置数据
-    reset();
-    // 重置视图
-    changeArea(['1']);
-    // 切换楼层数据
-    treeData.value = area;
-    // 默认选择第一项
-    treeData.value[0].selected = true;
-    tabs1Ref.value.changeArea(treeData.value[0]);
+    Modal.confirm({
+      title: '提示信息',
+      content: '切换楼层会放弃已保存的修改内容',
+      onOk() {
+        // 切换前还原修改内容
+        tabs1Ref.value.refresh(false);
+        // 清空设备点阵
+        bulbs.value = [];
+        thisFloor.value = floor;
+        getBulbs();
+        // 重置数据
+        reset();
+        // 重置视图
+        changeArea(['1']);
+        // 切换楼层数据
+        treeData.value = area;
+        // 默认选择第一项
+        treeData.value[0].selected = true;
+        tabs1Ref.value.changeArea(treeData.value[0]);
+      },
+      onCancel() {},
+    });
   };
 
   // 分区业务 =====================================================
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
index df43b38..0f6b9e6 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
@@ -7,59 +7,65 @@
             <img src="/asset/image//bulbLogo/21962.png" alt="" />
             <span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span></div
           >
-          <button class="right-button">{{
-            record?.runStatus?.label ? record.runStatus.label : '--'
+          <button class="right-button" :class="getClass(record)">{{
+            record.runStatus.value != 0 ? record.runStatus.label : record.switchStatus.label
           }}</button>
         </div>
         <div class="light-tag-box">
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">控制模式</span>
+            <span class="title-text">控制模式</span>
             <span class="result">{{ record.autoStatus.label }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">亮度</span>
+            <span class="title-text">亮度</span>
             <span class="result">{{ record.brightness + record.brightnessUnit }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">控制场景</span>
+            <span class="title-text">控制场景</span>
             <span class="result">{{ blub.scene.label }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
-            <span class="title">色温</span>
+            <span class="title-text">色温</span>
             <span class="result">{{ record.LwctemC + record.LwctemCUnit }}</span>
           </div>
         </div>
       </div>
     </template>
     <div class="icon-box" :style="props.blub.styleText">
-      <!-- 正常=0 -->
-      <img
-        v-if="record?.runStatus?.value == 0"
-        class="icon-item"
-        src="/asset/image/bulbLogo/on.png"
-        alt="" />
       <!-- 故障=1 -->
       <img
-        v-if="record?.runStatus?.value == 1"
+        v-if="record.runStatus.value == 1"
         class="icon-item"
-        src="/asset/image/bulbLogo/off.png"
+        src="/asset/image/bulbLogo/fault.png"
         alt="" />
       <!-- 维修=2 -->
       <img
-        v-if="record?.runStatus?.value == 2"
+        v-if="record.runStatus.value == 2"
         class="icon-item"
         src="/asset/image/bulbLogo/repair.png"
         alt="" />
       <!-- 警告=3 -->
       <img
-        v-if="record?.runStatus?.value == 3"
+        v-if="record.runStatus.value == 3"
         class="icon-item"
         src="/asset/image/bulbLogo/alarm.png"
         alt="" />
+      <!-- 开启 -->
+      <img
+        v-if="record.runStatus.value == 0 && record.switchStatus.value == 1"
+        class="icon-item"
+        src="/asset/image/bulbLogo/on.png"
+        alt="" />
+      <!-- 关闭 -->
+      <img
+        v-if="record.runStatus.value == 0 && record.switchStatus.value == 0"
+        class="icon-item"
+        src="/asset/image/bulbLogo/off.png"
+        alt="" />
     </div>
   </a-popover>
 </template>
@@ -73,13 +79,29 @@
   const blub = computed(() => props.blub);
   // 设备信息
   const record = computed(() => props.blub.record);
+
+  const getClass = (data: any) => {
+    let state = data.runStatus.value;
+    let isOpen = data.switchStatus.value;
+    // 故障
+    if (state == 1) {
+      return 'button-fault';
+    } else if (state == 2) {
+      return 'button-repair';
+    } else if (state == 3) {
+      return 'button-alarm';
+    } else if (state == 0 && isOpen == 1) {
+      return 'button-on';
+    } else if (state == 0 && isOpen == 0) {
+      return 'button-off';
+    }
+  };
 </script>
 <style lang="less" scoped>
   .icon-box {
     width: 28px;
     height: 40px;
     position: absolute;
-
     .icon-item {
       width: 25px;
       cursor: pointer;
@@ -115,9 +137,29 @@
         width: 5em;
         height: 26px;
         background: rgba(57, 215, 187, 0.1);
-        border: 1px solid rgba(57, 215, 187, 1);
+        border-width: 1px;
+        border-style: solid;
         font-size: 12px;
-        color: rgba(57, 215, 187, 1);
+      }
+      .button-on {
+        color: #0dffa4;
+        border-color: #0dffa4;
+      }
+      .button-off {
+        color: #bfcde2;
+        border-color: #bfcde2;
+      }
+      .button-repair {
+        color: #ffbc46;
+        border-color: #ffbc46;
+      }
+      .button-alarm {
+        color: #f36163;
+        border-color: #f36163;
+      }
+      .button-fault {
+        color: #ff7636;
+        border-color: #ff7636;
       }
     }
   }
@@ -139,9 +181,9 @@
         vertical-align: middle;
       }
 
-      .title {
+      .title-text {
         position: absolute;
-        left: 60px;
+        left: 53px;
         top: 13px;
         color: rgba(64, 255, 252, 1);
       }
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/lightPosition.ts b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/lightPosition.ts
index bc860b7..0139477 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/lightPosition.ts
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/lightPosition.ts
@@ -1,51 +1,52 @@
 // 此文件只定义light（即俯视图小灯泡）的位置信息
 // 与显示状态和分组信息无关
 export const lightPosition = [
-  // 安检区A
+  // 走廊西
   { left: '160px', bottom: '270px' },
   { left: '185px', bottom: '230px' },
   { left: '220px', bottom: '180px' },
   { left: '250px', bottom: '130px' },
-  // 站厅区B 1组
+  // 办公西区 1组
   { left: '240px', bottom: '290px' },
   { left: '260px', bottom: '260px' },
   { left: '280px', bottom: '230px' },
   { left: '310px', bottom: '190px' },
   { left: '330px', bottom: '160px' },
-  // 站厅区B 2组
+  // 办公西区 2组
   { left: '300px', bottom: '305px' },
   { left: '325px', bottom: '275px' },
   { left: '350px', bottom: '245px' },
   { left: '375px', bottom: '215px' },
   { left: '400px', bottom: '180px' },
-  // 站台区A 1组
+  // 站厅西区 1组
   { left: '370px', bottom: '320px' },
   { left: '470px', bottom: '210px' },
-  // 站台区A 2组
+  // 站厅西区 2组
   { left: '425px', bottom: '335px' },
   { left: '530px', bottom: '230px' },
-  // 站台区A 3组
+  // 站厅西区 3组
   { left: '475px', bottom: '350px' },
   { left: '590px', bottom: '250px' },
-  // 站台区A 4组
+  // 站厅西区 4组
   { left: '530px', bottom: '365px' },
   { left: '640px', bottom: '270px' },
-  // 一楼办公区
+  // 临检区
   { left: '570px', bottom: '390px' },
   { left: '605px', bottom: '365px' },
   { left: '640px', bottom: '340px' },
   { left: '675px', bottom: '315px' },
   { left: '710px', bottom: '290px' },
-  // 安保区 4 分组
-  { left: '670px', bottom: '370px' },
-  { left: '720px', bottom: '385px' },
-  { left: '770px', bottom: '400px' },
-  { left: '820px', bottom: '415px' },
-  // 一楼男厕A
-  { left: '810px', bottom: '455px' },
-  { left: '970px', bottom: '370px' },
-  { left: '850px', bottom: '465px' },
-  { left: '1010px', bottom: '385px' },
+  // 安检区
+  { left: '635px', bottom: '405px' },
+  { left: '675px', bottom: '375px' },
+  { left: '725px', bottom: '340px' },
+  { left: '780px', bottom: '305px' },
+  // 站厅东区 共4组
+  { left: '690px', bottom: '420px' },
+  { left: '835px', bottom: '330px' },
+  { left: '800px', bottom: '390px' },
+  { left: '850px', bottom: '400px' },
+  { left: '900px', bottom: '410px' },
 ];
 
 export const lightPosition1 = [
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 5739fb5..cdbf70f 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -249,7 +249,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 60px"></div>
+    <div style="width: 100%; height: 100px"></div>
     <div class="button-box">
       <button class="cancel" @click="executeVisible = false">取消</button>
       <a-popconfirm
@@ -736,47 +736,46 @@
     if (!changeList.value.length && !lockList.value.length) {
       return message.info('未产生任何修改');
     }
+    state.setLoading(true);
     http
       .get(planManage.getRunningPlan, {
-        deviceType: 1,
+        ctrlType: 1,
         projectId: state.projectId,
         siteId: state.siteId,
       })
       .then((res) => {
         // 如果有计划正在执行
         if (res.data && res.data.length) {
-          // 此处框架本身存在问题，弹出层在本地环境无法关闭，暂时使用浏览器自带的confirm方法
-          // Modal.confirm({
-          //   title: '提示信息',
-          //   content: '有计划正在执行，点击"确定"将暂停当前计划',
-          //   onOk() {
-          //     return new Promise((resolve, reject) => {
-          //     });
-          //   },
-          //   onCancel() {  },
-          // });
-
-          let flag = window.confirm('有计划正在执行，点击"确定"将暂停当前计划');
-          if (flag) {
-            // 如果点击了确定，将先终止所有进行中的计划
-            http
-              .post(lightingManage.submitChangeList, {
-                projectId: state.projectId,
-                siteId: state.siteId,
-                lockList: [],
-                sceneList: [],
-              })
-              .then((res) => {
-                console.log(res, '成功');
-                // 如果重置成功，则获取修改前后对比数据
-                if (res.retcode == 0) {
-                  sendChangeList();
-                  // 未成功提示
-                } else {
-                  message.error('关闭进行中的任务操作失败，请重新尝试');
-                }
-              });
-          }
+          state.setLoading(false);
+          Modal.confirm({
+            title: '提示信息',
+            content: '有计划正在执行，点击"确定"将暂停当前计划',
+            onOk() {
+              state.setLoading(true);
+              // 如果点击了确定，将先终止所有进行中的计划
+              http
+                .post(lightingManage.submitChangeList, {
+                  projectId: state.projectId,
+                  siteId: state.siteId,
+                  lockList: [],
+                  sceneList: [],
+                })
+                .then((res) => {
+                  // 如果重置成功，则获取修改前后对比数据
+                  if (res.retcode == 0) {
+                    sendChangeList();
+                    // 未成功提示
+                  } else {
+                    state.setLoading(false);
+                    message.error('关闭进行中的任务操作失败，请重新尝试');
+                  }
+                })
+                .catch(() => {
+                  state.setLoading(false);
+                });
+            },
+            onCancel() {},
+          });
           // 没有计划正在执行，则直接请求
         } else {
           sendChangeList();
@@ -793,6 +792,7 @@
         siteId: state.siteId,
       })
       .then((res) => {
+        state.setLoading(false);
         if (res.retcode == 0) {
           diffList.value = res.data;
           executeVisible.value = true;
@@ -800,7 +800,9 @@
           message.error('获取修改内容失败');
         }
       })
-      .catch(() => {});
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
   // 通用取消
   const changeCancel = () => {};
@@ -838,6 +840,7 @@
   };
   // 提交本次修改
   const submitChangeList = () => {
+    state.setLoading(true);
     http
       .post(lightingManage.submitChangeList, {
         sceneList: changeList.value,
@@ -846,6 +849,7 @@
         siteId: state.siteId,
       })
       .then((res) => {
+        state.setLoading(false);
         let data = res.data;
         // 修改请求发送了，但操作时产生了失败结果
         if (res.retcode != 0) {
@@ -862,7 +866,9 @@
         refresh(true);
         emit('resetAll');
       })
-      .catch(() => {});
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
 
   // 其他业务 ========================================================================
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index 3345668..2c3a7e3 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -30,7 +30,7 @@
       </tr>
     </thead>
     <tbody>
-      <tr v-for="(row, index) in dataSource" :key="index">
+      <tr v-for="(row, index) in dataSource" v-show="row.executeStatus.value != 0" :key="index">
         <td>{{ index + 1 }}</td>
         <td>{{ row.startTime }}</td>
         <td>{{ row.planName }}</td>
@@ -163,7 +163,7 @@
         projectId: state.projectId,
         siteId: state.siteId,
         // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
-        deviceType: 1,
+        ctrlType: 1,
       })
       .then((res) => {
         dataSource.value = res.data;
@@ -185,6 +185,10 @@
   };
   // 将对表格的修改统一发送
   const sendTable = () => {
+    if (!dataSource.value.length) {
+      return message.info('没有任何数据可以提交');
+    }
+    state.setLoading(true);
     http
       .post(
         lightingManage.submitTableData +
@@ -192,6 +196,7 @@
         dataSource.value,
       )
       .then((res) => {
+        state.setLoading(false);
         if (res.retcode == 0) {
           message.success('操作成功');
           // 刷新数据
@@ -199,6 +204,9 @@
         } else {
           message.info(res.msg);
         }
+      })
+      .catch(() => {
+        state.setLoading(false);
       });
   };
 
@@ -229,7 +237,7 @@
         projectId: state.projectId,
         siteId: state.siteId,
         // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
-        deviceType: 1,
+        ctrlType: 1,
       })
       .then((res) => {
         let arr: Array<Object> = [];
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
index f76c28a..1f6b3ff 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
@@ -55,16 +55,10 @@
             <div class="btn-item">
               <div class="left">控制模式</div>
               <div class="right">
-                <span>{{
-                  item.autoStatusBefore.label.indexOf('模式') != -1
-                    ? item.autoStatusBefore.label.replace('模式', '')
-                    : item.autoStatusBefore.label
-                }}</span>
+                <span>{{ item.autoStatusBefore.label ? item.autoStatusBefore.label : '--' }}</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
                 <span>{{
-                  item.autoStatusAfter.label.indexOf('模式') != -1
-                    ? item.autoStatusAfter.label.replace('模式', '')
-                    : item.autoStatusAfter.label
+                  item.autoStatusAfter.label ? item.autoStatusAfter.label : '--'
                 }}</span></div
               >
             </div>
@@ -109,7 +103,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 80px"></div>
+    <div style="width: 100%; height: 160px"></div>
     <div class="button-box">
       <button class="cancel" @click="logModalVisible = false">关闭</button>
     </div>
@@ -125,6 +119,8 @@
   import { Pagination } from 'ant-design-vue';
   import { http } from '/nerv-lib/util/http';
   import { lightingManage } from '/@/api/IlluminationInfo';
+  // 全局变量
+  import { items } from '/@/store/item';
 
   // 初始化 =======================================================
 
@@ -139,6 +135,9 @@
     getTable();
   });
 
+  // 全局变量
+  const state = items();
+
   // 日志业务 ======================================================
 
   // 分页设置
@@ -153,6 +152,7 @@
   let trIndex = ref(-1);
   // 获得表格数据
   const getTable = (changePage = false) => {
+    state.setLoading(true);
     // 如果是切换页面，则清除当前序列、关闭弹窗
     if (changePage) {
       trIndex.value = -1;
@@ -165,9 +165,13 @@
         pageNum: pagination.value.pageNum,
       })
       .then((res) => {
+        state.setLoading(false);
         let data = res.data;
         dataSource.value = data.records;
         pagination.value.total = data.total;
+      })
+      .catch(() => {
+        state.setLoading(false);
       });
   };
   // 刷新功能（右下角）
@@ -192,16 +196,23 @@
   // 日志详情显隐
   const logModalVisible = ref(false);
   const getLogDetail = (id: any) => {
-    http.get(lightingManage.getLogDetail, { logId: id }).then((res) => {
-      const data = res.data;
-      if (data && data.length) {
-        // 显示模态框
-        logModalVisible.value = true;
-        cxList.value = res.data;
-      } else {
-        return message.info('返回值无效');
-      }
-    });
+    state.setLoading(true);
+    http
+      .get(lightingManage.getLogDetail, { logId: id })
+      .then((res) => {
+        state.setLoading(false);
+        const data = res.data;
+        if (data && data.length) {
+          // 显示模态框
+          logModalVisible.value = true;
+          cxList.value = res.data;
+        } else {
+          return message.info('返回值无效');
+        }
+      })
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
   // 日志详情
   const cxList = ref([]);
diff --git a/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less b/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
index a0229eb..831c65e 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
@@ -108,7 +108,7 @@
             line-height: 35px;
             text-align: left;
             padding-left: 10px;
-            font-size: 14px;
+            font-size: 13px;
             :first-child {
               color: white;
             }
@@ -116,7 +116,7 @@
               vertical-align: middle;
             }
             img {
-              padding: 0 5px;
+              padding: 0 2px;
             }
           }
         }
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
index bafed91..4d9e8d6 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
@@ -215,7 +215,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 60px"></div>
+    <div style="width: 100%; height: 100px"></div>
     <div class="button-box">
       <button class="cancel" @click="executeVisible = false">取消</button>
       <a-popconfirm
@@ -686,47 +686,47 @@
     if (!changeList.value.length && !lockList.value.length) {
       return message.info('未产生任何修改');
     }
+    state.setLoading(true);
     http
       .get(planManage.getRunningPlan, {
-        deviceType: url.deviceType,
+        ctrlType: url.deviceType,
         projectId: state.projectId,
         siteId: state.siteId,
       })
       .then((res) => {
         // 如果有计划正在执行
         if (res.data && res.data.length) {
-          // 此处框架本身存在问题，弹出层在本地环境无法关闭，暂时使用浏览器自带的confirm方法
-          // Modal.confirm({
-          //   title: '提示信息',
-          //   content: '有计划正在执行，点击"确定"将暂停当前计划',
-          //   onOk() {
-          //     return new Promise((resolve, reject) => {
-          //     });
-          //   },
-          //   onCancel() {  },
-          // });
+          state.setLoading(false);
+          Modal.confirm({
+            title: '提示信息',
+            content: '有计划正在执行，点击"确定"将暂停当前计划',
+            onOk() {
+              state.setLoading(false);
+              // 如果点击了确定，将先终止所有进行中的计划
+              http
+                .post(url.getList, {
+                  projectId: state.projectId,
+                  siteId: state.siteId,
+                  lockList: [],
+                  sceneList: [],
+                })
+                .then((res) => {
+                  // 如果重置成功，则获取修改前后对比数据
+                  if (res.retcode == 0) {
+                    sendChangeList();
+                    // 未成功提示
+                  } else {
+                    state.setLoading(false);
+                    message.error('关闭进行中的任务操作失败，请重新尝试');
+                  }
+                })
+                .catch(() => {
+                  state.setLoading(false);
+                });
+            },
+            onCancel() {},
+          });
 
-          let flag = window.confirm('有计划正在执行，点击"确定"将暂停当前计划');
-          if (flag) {
-            // 如果点击了确定，将先终止所有进行中的计划
-            http
-              .post(url.getList, {
-                projectId: state.projectId,
-                siteId: state.siteId,
-                lockList: [],
-                sceneList: [],
-              })
-              .then((res) => {
-                console.log(res, '成功');
-                // 如果重置成功，则获取修改前后对比数据
-                if (res.retcode == 0) {
-                  sendChangeList();
-                  // 未成功提示
-                } else {
-                  message.error('关闭进行中的任务操作失败，请重新尝试');
-                }
-              });
-          }
           // 没有计划正在执行，则直接请求
         } else {
           sendChangeList();
@@ -743,6 +743,7 @@
         siteId: state.siteId,
       })
       .then((res) => {
+        state.setLoading(false);
         if (res.retcode == 0) {
           diffList.value = res.data;
           executeVisible.value = true;
@@ -750,7 +751,9 @@
           message.error('获取修改内容失败');
         }
       })
-      .catch(() => {});
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
   // 通用取消
   const changeCancel = () => {};
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
index 2e4ede5..832c97f 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
@@ -55,16 +55,10 @@
             <div class="btn-item">
               <div class="left">控制模式</div>
               <div class="right">
-                <span>{{
-                  item.autoStatusBefore.label.indexOf('模式') != -1
-                    ? item.autoStatusBefore.label.replace('模式', '')
-                    : item.autoStatusBefore.label
-                }}</span>
+                <span>{{ item.autoStatusBefore.label ? item.autoStatusBefore.label : '--' }}</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
                 <span>{{
-                  item.autoStatusAfter.label.indexOf('模式') != -1
-                    ? item.autoStatusAfter.label.replace('模式', '')
-                    : item.autoStatusAfter.label
+                  item.autoStatusAfter.label ? item.autoStatusAfter.label : '--'
                 }}</span></div
               >
             </div>
@@ -109,7 +103,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 80px"></div>
+    <div style="width: 100%; height: 160px"></div>
     <div class="button-box">
       <button class="cancel" @click="logModalVisible = false">关闭</button>
     </div>
@@ -125,7 +119,6 @@
   import { Pagination } from 'ant-design-vue';
   import { http } from '/nerv-lib/util/http';
   import { ventilating } from '/@/api/ventilatingSystem';
-
   // 全局变量
   import { items } from '/@/store/item';
 
@@ -183,6 +176,7 @@
   let trIndex = ref(-1);
   // 获得表格数据
   const getTable = (changePage = false) => {
+    state.setLoading(true);
     // 如果是切换页面，则清除当前序列、关闭弹窗
     if (changePage) {
       trIndex.value = -1;
@@ -195,16 +189,19 @@
         pageNum: pagination.value.pageNum,
       })
       .then((res) => {
+        state.setLoading(false);
         let data = res.data;
         dataSource.value = data.records;
         pagination.value.total = data.total;
+      })
+      .catch(() => {
+        state.setLoading(false);
       });
   };
   // 刷新功能（右下角）
   const reset = () => {
     trIndex.value = -1;
     logModalVisible.value = false;
-    // state.setLoading(true);
     pagination.value = {
       pageSize: 10,
       pageNum: 1,
@@ -223,16 +220,23 @@
   // 日志详情显隐
   const logModalVisible = ref(false);
   const getLogDetail = (id: any) => {
-    http.get(logDetail, { logId: id }).then((res) => {
-      const data = res.data;
-      if (data && data.length) {
-        // 显示模态框
-        logModalVisible.value = true;
-        cxList.value = res.data;
-      } else {
-        return message.info('返回值无效');
-      }
-    });
+    state.setLoading(true);
+    http
+      .get(logDetail, { logId: id })
+      .then((res) => {
+        state.setLoading(false);
+        const data = res.data;
+        if (data && data.length) {
+          // 显示模态框
+          logModalVisible.value = true;
+          cxList.value = res.data;
+        } else {
+          return message.info('返回值无效');
+        }
+      })
+      .catch(() => {
+        state.setLoading(false);
+      });
   };
   const cxList = ref([]);
 
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
index d448115..da7fa3e 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
@@ -30,7 +30,7 @@
       </tr>
     </thead>
     <tbody>
-      <tr v-for="(row, index) in dataSource" :key="index">
+      <tr v-for="(row, index) in dataSource" v-show="row.executeStatus.value != 0" :key="index">
         <td>{{ index + 1 }}</td>
         <td>{{ row.startTime }}</td>
         <td>{{ row.planName }}</td>
@@ -177,7 +177,7 @@
         projectId: state.projectId,
         siteId: state.siteId,
         // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
-        deviceType: props.type,
+        ctrlType: props.type,
       })
       .then((res) => {
         dataSource.value = res.data;
@@ -199,12 +199,17 @@
   };
   // 将对表格的修改统一发送
   const sendTable = () => {
+    if (!dataSource.value.length) {
+      return message.info('没有任何数据可以提交');
+    }
+    state.setLoading(true);
     http
       .post(
         url + `?projectId=${state.projectId}${state.siteId ? `&siteId=${state.siteId}` : ''}`,
         dataSource.value,
       )
       .then((res) => {
+        state.setLoading(false);
         if (res.retcode == 0) {
           message.success('操作成功');
           // 刷新数据
@@ -212,6 +217,9 @@
         } else {
           message.info(res.msg);
         }
+      })
+      .catch(() => {
+        state.setLoading(false);
       });
   };
 
@@ -242,7 +250,7 @@
         projectId: state.projectId,
         siteId: state.siteId,
         // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
-        deviceType: props.type,
+        ctrlType: props.type,
       })
       .then((res) => {
         let arr: Array<Object> = [];