Your Name 3 жил өмнө
parent
commit
987e7f5003

+ 16 - 1
public/meeting.js

@@ -331,9 +331,11 @@ Meeting.prototype = {
 
 
 
 
 
 
-    deleteAllMeeting() {
+    deleteAllMeeting(callback) {
         let _this = this;
         let _this = this;
         let s = "?";
         let s = "?";
+        var index =0;
+        var doindex=0;
         let searchParams = {
         let searchParams = {
             "userDomain": "",
             "userDomain": "",
             "userId": _this.localUserInfo.userId,
             "userId": _this.localUserInfo.userId,
@@ -364,6 +366,8 @@ Meeting.prototype = {
                     if (JSON.parse(res).results !== null) {
                     if (JSON.parse(res).results !== null) {
                         JSON.parse(res).results.forEach((item) => {
                         JSON.parse(res).results.forEach((item) => {
                             if (item.meetId) {
                             if (item.meetId) {
+                                index++;
+
                                 allRelateMeeting.push(item);
                                 allRelateMeeting.push(item);
                                 $.ajax({
                                 $.ajax({
                                     type: "DELETE",
                                     type: "DELETE",
@@ -377,21 +381,32 @@ Meeting.prototype = {
                                     },
                                     },
                                     success: function(res) {
                                     success: function(res) {
                                         //obj
                                         //obj
+                                        doindex++;
+                                        if(doindex == index){
+                                            callback();
+                                        }
                                     
                                     
                                     },
                                     },
                                     error: function(data) {
                                     error: function(data) {
                                         //obj
                                         //obj
+                                        doindex++;
+                                        if(doindex == index){
+                                            callback();
+                                        }
                                       
                                       
                                     },
                                     },
                                 });
                                 });
 
 
                             }
                             }
                         });
                         });
+                    }else{
+                        callback();
                     }
                     }
                     _this._debug("查询所有该用户参与的会商success", allRelateMeeting);
                     _this._debug("查询所有该用户参与的会商success", allRelateMeeting);
                 }
                 }
             },
             },
             error: function(data) {
             error: function(data) {
+                callback();
 
 
             }
             }
         });
         });

+ 2 - 0
src/layout/BaseLayout/index.scss

@@ -110,6 +110,8 @@
             background-size: 100% 100%;
             background-size: 100% 100%;
             bottom: px2rem(24px * 2);
             bottom: px2rem(24px * 2);
             right: px2rem(45px * 2);
             right: px2rem(45px * 2);
+            
+	        animation-iteration-count: infinite;
         }
         }
     }
     }
 }
 }

+ 24 - 9
src/layout/BaseLayout/index.tsx

@@ -2,7 +2,7 @@ import { defineComponent, onMounted, watchEffect, ref } from "vue";
 import { RouterView, useRoute, useRouter } from 'vue-router';
 import { RouterView, useRoute, useRouter } from 'vue-router';
 import MarkerMap from '@/components/MarkerMap';
 import MarkerMap from '@/components/MarkerMap';
 import './index.scss';
 import './index.scss';
-import { useIncidentStore, useDaHuaStore, useMainStore } from '@/store';
+import { useIncidentStore, useDaHuaStore, useMainStore,useCommonStore } from '@/store';
 import { constants } from 'zlib';
 import { constants } from 'zlib';
 import clsx from "clsx";
 import clsx from "clsx";
 import moment from 'moment';
 import moment from 'moment';
@@ -132,6 +132,7 @@ export default defineComponent({
     const daHuaStore = useDaHuaStore();
     const daHuaStore = useDaHuaStore();
 
 
     const mainStore = useMainStore();
     const mainStore = useMainStore();
+    const commonstore = useCommonStore();
 
 
     const sqdh = ref(import.meta.env.VITE_DH_SERVER as string + "/index.html");
     const sqdh = ref(import.meta.env.VITE_DH_SERVER as string + "/index.html");
 
 
@@ -261,6 +262,10 @@ export default defineComponent({
       // }, false);
       // }, false);
       try {
       try {
         (yjzh_btn.value)?.addEventListener("click", () => {
         (yjzh_btn.value)?.addEventListener("click", () => {
+          if(commonstore.isclick){
+            return;
+          }
+          commonstore.isclick = true;
 
 
 
 
        if(window.theSocket){
        if(window.theSocket){
@@ -279,7 +284,11 @@ export default defineComponent({
           
           
           meeting.settargetId("vPlayArea");
           meeting.settargetId("vPlayArea");
           window.metting = meeting;
           window.metting = meeting;
-          cremetting();
+          setTimeout(() => {
+            cremetting();
+            
+          }, 1000);
+         
         });
         });
 
 
        }
        }
@@ -290,11 +299,11 @@ export default defineComponent({
 
 
 
 
           try{
           try{
-            window.metting.deleteAllMeeting();
+            window.metting.deleteAllMeeting(dothing);
           }catch(E){}
           }catch(E){}
-          
-         
-          await window.metting.getLocalUserInfo();
+
+         async function dothing(){
+            await window.metting.getLocalUserInfo();
           const res = await window.metting.queryUser("5269853761765376");
           const res = await window.metting.queryUser("5269853761765376");
 
 
           // _this.localUserInfo.masterName = res.userName;
           // _this.localUserInfo.masterName = res.userName;
@@ -312,6 +321,12 @@ export default defineComponent({
             memberNumber: ""// 成员号码
             memberNumber: ""// 成员号码
           };
           };
           window.theSocket&&window.theSocket.createGroupChat(chartParams);
           window.theSocket&&window.theSocket.createGroupChat(chartParams);
+          commonstore.isclick = false;
+
+          }
+          
+         
+          
         }
         }
 
 
   
   
@@ -373,8 +388,8 @@ export default defineComponent({
           <div id="vPlayArea" ></div>
           <div id="vPlayArea" ></div>
         </div>
         </div>
         <header class="base-layout-title-contatisner">
         <header class="base-layout-title-contatisner">
-          <div class="back-to-home" onClick={() => router.push('/home')}></div>
-          <div class="time-text">
+          <div class="back-to-home " onClick={() => router.push('/home')}></div>
+          <div class="time-text ">
             <span>{timetext.value}</span>
             <span>{timetext.value}</span>
             <span>{datetext.value}</span>
             <span>{datetext.value}</span>
             <span>{weektext.value}</span>
             <span>{weektext.value}</span>
@@ -388,7 +403,7 @@ export default defineComponent({
           // marker={store.incidentDetail}
           // marker={store.incidentDetail}
           />
           />
 
 
-          <div class="yjld_btn" ref={yjzh_btn}></div>
+          <div class={"yjld_btn " + (commonstore.isclick?"animate__animated animate__rotateIn":"")} ref={yjzh_btn}></div>
         </main>
         </main>
       </section>
       </section>
     );
     );

+ 2 - 0
src/store/useCommonStore.ts

@@ -19,6 +19,7 @@ export interface CommonStateType {
   loading: boolean;
   loading: boolean;
   uploading: boolean;
   uploading: boolean;
   uploadFiles: UploadData[];
   uploadFiles: UploadData[];
+  isclick:boolean;
 }
 }
 
 
 export interface CommonActionsType {
 export interface CommonActionsType {
@@ -47,6 +48,7 @@ export default defineStore<"common", CommonStateType, {}, CommonActionsType>(
       loading: false,
       loading: false,
       uploading: false,
       uploading: false,
       uploadFiles: [],
       uploadFiles: [],
+      isclick:false,
     }),
     }),
     actions: {
     actions: {
       toggleLoading() {
       toggleLoading() {

+ 1 - 1
src/views/IncidentDetail/index.scss

@@ -76,7 +76,7 @@
     .event-list-c {
     .event-list-c {
         position: absolute;
         position: absolute;
         // top: px2rem(76px * 2);
         // top: px2rem(76px * 2);
-        top: 0;
+        top: -2px;
         left: 0;
         left: 0;
         // left: px2rem(30px * 2);
         // left: px2rem(30px * 2);
         width: px2rem(471px * 2);
         width: px2rem(471px * 2);