feat(grafana): url

dgiot · Jun 8, 2022 · 530b9fd · 530b9fd
1 parent e36f501
commit 530b9fd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/src/views/CloudPressure/grafana.vue b/src/views/CloudPressure/grafana.vue
@@ -12,25 +12,37 @@
 <template>
   <div class="grafana-container">
     <div class="grafana">
-      <iframe frameborder="0" src="http://101.32.99.133:3000/login"></iframe>
+      <iframe frameborder="0" :src="iframeSrc"></iframe>
     </div>
   </div>
 </template>
 
 <script>
+  import { mapMutations } from 'vuex'
   export default {
     name: 'Grafana',
     components: {},
     props: {},
     data() {
-      return {}
+      return {
+        iframeSrc:
+          process.env.NODE_ENV !== 'development'
+            ? location.protocol + '//' + location.hostname + ':3000'
+            : 'http://101.32.99.133:3000/login',
+      }
     },
     computed: {},
     watch: {},
     created() {},
-    mounted() {},
+    mounted() {
+      this.setTreeFlag(false)
+    },
     destroyed() {},
-    methods: {},
+    methods: {
+      ...mapMutations({
+        setTreeFlag: 'settings/setTreeFlag',
+      }),
+    },
   }
 </script>
 

diff --git a/src/views/CloudPressure/index.vue b/src/views/CloudPressure/index.vue
@@ -127,7 +127,7 @@
         :closable="true"
         fullscreen
         :title="draw.row.name"
-        @on-cancel="close"
+        @on-cancel="beforeClose"
       >
         <div>
           <Tabs size="small" :value="defaultTable">
@@ -279,13 +279,13 @@
           >
             {{ $translateTitle('pressure.报告配置') }}
           </el-button>
-          <el-button
-            size="mini"
-            type="info"
-            @click.native="generateReport(row)"
-          >
-            {{ $translateTitle('pressure.生成报告') }}
-          </el-button>
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="info"-->
+          <!--            @click.native="generateReport(row)"-->
+          <!--          >-->
+          <!--            {{ $translateTitle('pressure.生成报告') }}-->
+          <!--          </el-button>-->
         </template>
       </el-table-column>
       <el-table-column
@@ -503,6 +503,9 @@
       ...mapMutations({
         setTreeFlag: 'settings/setTreeFlag',
       }),
+      beforeClose() {
+        this.fetchData()
+      },
       async generateReport(row) {
         console.log(row)
       },
@@ -831,22 +834,12 @@
         const timeExp = /\[(\d{2,}):(\d{2})(?:\.(\d{2,3}))?]/g
         results.forEach((i) => {
           i.startTime = i?.profile?.startTime
-            ? timeExp.exec(i.profile.startTime)
-              ? this.$moment
-                  .unix(i.profile.startTime)
-                  .format('YYYY-MM-DD HH:mm:ss')
-              : this.$moment
-                  .unix(i.profile.startTime)
-                  .format('YYYY-MM-DD HH:mm:ss')
+            ? this.$moment
+                .unix(i.profile.startTime)
+                .format('YYYY-MM-DD HH:mm:ss')
             : this.$translateTitle('pressure.暂未配置')
           i.endTime = i?.profile?.endTime
-            ? timeExp.exec(i.profile.endTime)
-              ? this.$moment
-                  .unix(i.profile.endTime)
-                  .format('YYYY-MM-DD HH:mm:ss')
-              : this.$moment
-                  .unix(i.profile.endTime)
-                  .format('YYYY-MM-DD HH:mm:ss')
+            ? this.$moment.unix(i.profile.endTime).format('YYYY-MM-DD HH:mm:ss')
             : this.$translateTitle('pressure.暂未配置')
         })
         this.list = results