update

components.d.ts

@@ -7,28 +7,8 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElCarousel: typeof import('element-plus/es')['ElCarousel']
-    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCol: typeof import('element-plus/es')['ElCol']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElForm: typeof import('element-plus/es')['ElForm']
-    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElMenu: typeof import('element-plus/es')['ElMenu']
-    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }

src/views/pages/OpticalStoragePage/index.vue

@@ -296,7 +296,7 @@
                 </div> -->
         </div>
         <div class="loading" v-if="loadingFlag">
-          <loadingPage></loadingPage>
+          <div class="text">计算中...</div>
         </div>
       </el-dialog>
     </div>
@@ -508,7 +508,7 @@ let dialogVisible = ref<boolean>(false)
 let draw: any = null //  svg图
 let SVGContainer = ref() //  svg图DOM
 let tabValue = ref<string>('有功')
-let loadingFlag = ref<boolean>(false)
+let loadingFlag = ref<boolean>(true)
 let timer = ref<any>('')
 // 点击弹窗关闭-------单线图
 let handleClose = () => {
@@ -529,8 +529,8 @@ let svgImage = new URL('@/assets/images/svgImage/active.jpg', import.meta.url).h
 let svgLevel = ref<number>(1)
 // svg入口事件 打开一个svg图
 let handleEnter = () => {
-  dialogVisible.value = true
   loadingFlag.value = true
+  dialogVisible.value = true
   send3d_xuehua()
   nextTick(() => {
     SVGContainer.value.innerHTML = OpticalStorageSVG as any
@@ -542,6 +542,7 @@ let handleEnter = () => {
 
   setTimeout(() => {
     nextTick(() => {
+      loadingFlag.value = false
       let data = [
         {
           id: '555_1',
@@ -1149,7 +1150,7 @@ let handleEnter = () => {
         }
       })
     })
-  }, 3000)
+  }, 5000)
 }
 // svg入口事件 发送雪花网三维移动位置
 const send3d_xuehua = () => {
@@ -1168,8 +1169,6 @@ const send3d_xuehua = () => {
 // svg入口事件 打开一个svg图
 let handleEnter2 = () => {
   dialogVisible.value = true
-  loadingFlag.value = true
-
   getSvgData_api({})
     .then(res => {
       nextTick(() => {
@@ -1308,6 +1307,8 @@ let handleEnter2 = () => {
   // }
 }
 let handleShowSvg = async (svgIndex: string) => {
+  loadingFlag.value = true
+
   // let setData = { id: svgIndex }
   // svgdApi(setData)
   //   .then(res => {
@@ -1447,6 +1448,8 @@ let handleShowSvg = async (svgIndex: string) => {
 }
 // 处理自定义的图
 let handleCustomLine = (svgHtml, result) => {
+  loadingFlag.value = true
+
   nextTick(() => {
     SVGContainer.value.innerHTML = svgHtml as any
     draw = SVG(SVGContainer.value.getElementsByTagName('svg')[0])
@@ -1455,6 +1458,8 @@ let handleCustomLine = (svgHtml, result) => {
     draw.zoom(0.5)
 
     setTimeout(() => {
+      loadingFlag.value = false
+
       console.log(result, 'result')
       let polyline = draw.find('polyline')
       const dom = draw.find('g')
@@ -1682,6 +1687,8 @@ let handleCustomLine = (svgHtml, result) => {
 }
 // 处理线的动画、文字
 let handleAnimate = async (result: any) => {
+  loadingFlag.value = false
+
   console.log(result, 'resultresultresultresultresult')
   // 获取所有的g
   let aclineDOM = draw.find('g')
@@ -2304,7 +2311,6 @@ let handleAnimate = async (result: any) => {
     const polyine = item.findOne('polyline')
     polyine.attr({ stroke: '#FFFFFF' })
   })
-  loadingFlag.value = false
 }
 
 // const handleClose = () => {
@@ -3262,7 +3268,6 @@ const styleVar = computed(() => {
           height: changeHeight(515);
           width: 80%;
           width: 100%;
-
         }
 
         .os2info2 {
@@ -3276,7 +3281,6 @@ const styleVar = computed(() => {
 
           width: 80%;
           width: 100%;
-
         }
       }
     }
@@ -3934,11 +3938,18 @@ const styleVar = computed(() => {
     width: 100%;
     height: 100%;
     position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 99999;
-    background-color: rgba(0, 0, 0, 0.3);
-    display: none;
+    top: 0%;
+    left: 0%;
+    // transform: translate(-50% -50%);
+    font-size: changeHeight(70);
+    color: #fff;
+    .text {
+      width: changeHeight(300);
+      height: changeHeight(100);
+      position: absolute;
+      top: 15%;
+      left: 5%;
+    }
   }
 }
 </style>