Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/package-lock.json

@@ -19,6 +19,7 @@
         "echarts": "^5.3.3",
         "element-ui": "^2.15.8",
         "font-awesome": "^4.7.0",
+        "gsap": "^3.12.2",
         "heatmap.js": "^2.0.5",
         "highlight.js": "^11.5.1",
         "js-export-excel": "^1.1.4",
@@ -28,11 +29,13 @@
         "secure-ls": "^1.2.6",
         "swiper": "5",
         "three": "^0.155.0",
+        "v-scale-screen": "1.0.2",
         "v-viewer": "^1.6.4",
         "vue": "^2.6.14",
         "vue-highlightjs": "^1.3.3",
         "vue-lazyload": "1.3.3",
         "vue-router": "^3.5.1",
+        "vuedraggable": "^2.24.3",
         "vuex": "^3.6.2",
         "vuex-persistedstate": "^4.1.0"
       },
@@ -6434,6 +6437,11 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
+    "node_modules/gsap": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.2.tgz",
+      "integrity": "sha512-EkYnpG8qHgYBFAwsgsGEqvT1WUidX0tt/ijepx7z8EUJHElykg91RvW1XbkT59T0gZzzszOpjQv7SE41XuIXyQ=="
+    },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -10419,6 +10427,11 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "node_modules/sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -11269,6 +11282,17 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v-scale-screen": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/v-scale-screen/-/v-scale-screen-1.0.2.tgz",
+      "integrity": "sha512-qMXPglHIs8KnhzDBdEBLcIoF3q7jgFCTWNIVPD5M0FGBkD+amYjbFUoLdKol/Xylm+pli4AHOZOqwyL6xX62SA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "vue": "^2.6.14"
+      }
+    },
     "node_modules/v-viewer": {
       "version": "1.6.4",
       "resolved": "https://registry.npmmirror.com/v-viewer/-/v-viewer-1.6.4.tgz",
@@ -11501,6 +11525,14 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "node_modules/vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "dependencies": {
+        "sortablejs": "1.10.2"
+      }
+    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
@@ -17075,6 +17107,11 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
+    "gsap": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.2.tgz",
+      "integrity": "sha512-EkYnpG8qHgYBFAwsgsGEqvT1WUidX0tt/ijepx7z8EUJHElykg91RvW1XbkT59T0gZzzszOpjQv7SE41XuIXyQ=="
+    },
     "gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -20039,6 +20076,11 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -20645,6 +20687,12 @@
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true
     },
+    "v-scale-screen": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/v-scale-screen/-/v-scale-screen-1.0.2.tgz",
+      "integrity": "sha512-qMXPglHIs8KnhzDBdEBLcIoF3q7jgFCTWNIVPD5M0FGBkD+amYjbFUoLdKol/Xylm+pli4AHOZOqwyL6xX62SA==",
+      "requires": {}
+    },
     "v-viewer": {
       "version": "1.6.4",
       "resolved": "https://registry.npmmirror.com/v-viewer/-/v-viewer-1.6.4.tgz",
@@ -20835,6 +20883,14 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "requires": {
+        "sortablejs": "1.10.2"
+      }
+    },
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",

portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/components/pie2.vue

@@ -19,6 +19,19 @@ export default {
       type: Object,
       default: () => {},
     },
+    data() {
+      return {
+        info: this.info || {},
+      };
+    },
+  },
+  watch: {
+    info: {
+      deep: true,
+      handler(val) {
+        this._initEcharts();
+      },
+    },
   },
   mounted() {
     this._initEcharts();
@@ -29,7 +42,11 @@ export default {
       const echarts = this.$echarts;
       let option = {
         title: {
-          text: `{c|${this.info.starttime}~${this.info.endtime}} \n{a|` + (this.info.success_rate * 100).toFixed(2) + "%" + "}",
+          text:
+            `{c|${this.info.starttime}~${this.info.endtime}} \n{a|` +
+            (this.info.success_rate * 100).toFixed(2) +
+            "%" +
+            "}",
           x: "center",
           y: "center",
           textStyle: {
@@ -107,4 +124,4 @@ export default {
     },
   },
 };
-</script>
+</script>
\ No newline at end of file