Merge branch 'master-ajreport-lushangqing' into 'master'

update



See merge request !16

@@ -76,7 +76,8 @@
 
 <script>
 import customDialog from "./customDialog";
-import {Message} from "_element-ui@2.15.6@element-ui";
+// import {Message} from "_element-ui@2.15.6@element-ui";
+import {Message} from "element-ui";
 import {getAlarmPolicy,getAlarmSubscribe,saveKpiPolicy,saveSetKpiFilter,getKpiPressTimes,saveSetKpiPressTimes,saveCaAdd,getTrendBaseUrl} from "@/api/platform";
 
 export default {

@@ -7,7 +7,7 @@
         <el-tooltip v-model="visible">
           <template #content>
             <div class="basic-ul-all"  style="width:720px;" @click="pressingVisibleTip=false">
-              <el-row class="basic-item" :style="fontStyle" v-for="item in informationDataAll">
+              <el-row class="basic-item" :style="fontStyle" v-for="(item,index) in informationDataAll" :key="index">
                 <el-col class="basic-border basic-item-title basic-flex" :span="10">
                   {{ item.name }}
                   <span class="basic-img" v-if="item.code=='link'">
@@ -27,7 +27,7 @@
       </div>
     </div>
     <div class="basic-ul">
-      <el-row class="basic-item" :style="fontStyle" v-for="item in informationData">
+      <el-row class="basic-item" :style="fontStyle" v-for="(item,index) in informationData" :key="index">
         <el-col class="basic-border basic-item-title basic-flex" :span="10">
           {{ item.name }}
           <span class="basic-img" v-if="item.code=='link'">

@@ -35,10 +35,10 @@
 </template>
 
 <script>
-import {
+/*import {
   getData,
   getHealth
-} from "@/api/platform";
+} from "@/api/platform";*/
 export default {
   name: "healthStatus",
   data() {
@@ -211,11 +211,11 @@ export default {
       return this.healthData;
 
     },
-    async init(){
+  /*  async init(){
       const reportCode = this.$route.query.reportCode;
       const { code, data } = await getData(reportCode);
       if (code != 200) return;
-    },
+    },*/
     handlerData() {
       const resData = this.optionsData;
       console.log("resdata",resData)