修复bug7-1am

src/components/map/index.vue

@@ -184,8 +184,8 @@ export default {
         new TileLayer({
           source: new XYZ({
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
-            url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
+            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
           }),
         }),
         new VectorLayer({

src/views/dataAdministration/index.vue

@@ -951,6 +951,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@keyframes striped-flow {
+  from {
+    background-position: 0 100px;
+  }
+  to {
+    background-position: 1.25em 1.25em;
+  }
+}
 ::v-deep.dialogBox {
   .el-form-item__content .el-input--small .el-input__inner {
     width: 188px !important;
@@ -966,44 +974,20 @@ export default {
     width: auto;
   }
 }
-</style>
-<style scoped>
-@keyframes indeterminate {
-  0% {
-    left: -100%;
-    width: 100%;
-  }
-  50% {
-    left: 100%;
-    width: 10%;
-  }
-  100% {
-    left: 100%;
-    width: 100%;
-  }
-}
-::v-deep .el-progress__text {
-  font-size: 14px !important;
-}
-.el-progress-bar__outer {
-  position: relative;
-  vertical-align: middle;
-}
-.el-progress-bar__inner {
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 100%;
-  text-align: right;
-  border-radius: 100px;
-  line-height: 1;
-  white-space: nowrap;
-  transition: width 0.6s ease;
-}
-.animated-progress .el-progress-bar__inner {
-  position: relative;
-  transform: translateZ(0);
-  animation: indeterminate 3s infinite;
-  background-color: #409eff; /* 或者你想要的任何颜色 */
+::v-deep .animated-progress .el-progress-bar__outer {
+  height: 20px; /* Adjust height as needed */
+  background-color: rgb(235, 238, 245);
+  background-image: linear-gradient(
+    45deg,
+    rgba(0, 0, 0, 0.1) 25%,
+    transparent 25%,
+    transparent 50%,
+    rgba(0, 0, 0, 0.1) 50%,
+    rgba(0, 0, 0, 0.1) 75%,
+    transparent 75%,
+    transparent
+  );
+  background-size: 1.25em 1.25em;
+  animation: striped-flow 3s linear infinite;
 }
 </style>

src/views/performance/assetssMag.vue

@@ -60,6 +60,7 @@
               :percentage="scope.row.analysisProgress"
               :class="{
                 'indeterminate-progress': scope.row.analysisProgress < 100,
+                'animated-progress': true,
               }"
             ></el-progress>
             <span v-else>/</span>
@@ -342,6 +343,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@keyframes striped-flow {
+  from {
+    background-position: 0 100px;
+  }
+  to {
+    background-position: 1.25em 1.25em;
+  }
+}
 .general {
   display: flex;
   flex-wrap: wrap;
@@ -393,36 +402,20 @@ export default {
     margin-bottom: 25px;
   }
 }
-</style>
-<style scoped>
-@keyframes indeterminate {
-  0% {
-    left: -100%;
-    width: 100%;
-  }
-  50% {
-    left: 0%;
-    width: 100%;
-  }
-  100% {
-    left: 100%;
-    width: 10%;
-  }
-}
-
-.indeterminate-progress {
-  position: relative;
-  overflow: hidden;
-}
-
-.indeterminate-progress::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  background-color: #409eff; /* 你可以根据需要更改颜色 */
-  animation: indeterminate 3s infinite;
-  transform: translateZ(0);
+::v-deep .animated-progress .el-progress-bar__outer {
+  height: 20px; /* Adjust height as needed */
+  background-color: rgb(235, 238, 245);
+  background-image: linear-gradient(
+    45deg,
+    rgba(0, 0, 0, 0.1) 25%,
+    transparent 25%,
+    transparent 50%,
+    rgba(0, 0, 0, 0.1) 50%,
+    rgba(0, 0, 0, 0.1) 75%,
+    transparent 75%,
+    transparent
+  );
+  background-size: 1.25em 1.25em;
+  animation: striped-flow 3s linear infinite;
 }
 </style>

src/views/performance/components/EditAnalysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:14:23
- * @LastEditTime: 2024-06-26 15:23:00
+ * @LastEditTime: 2024-07-01 15:56:26
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue
@@ -314,6 +314,7 @@ export default {
       this.loading = true;
       try {
         const response = await analysisDetail(formData);
+        console.log(response.data, "获取详情信息 编辑详情");
         if (response.data.length === 0 || response.data === null) {
           this.flage = true;
         } else {
@@ -321,8 +322,8 @@ export default {
         }
         if (
           response.data.length > 0 &&
-          response.data[0].commentDescriptionVos &&
-          response.data[0].commentDescriptionVos.length > 0
+          response.data[0].commentTypeRelations &&
+          response.data[0].commentTypeRelations.length > 0
         ) {
           this.editableTabs = this.mergeData(
             response.data[0].commentDescriptionVos,