Merge branch 'dev' of http://git.cestong.com.cn/cecf/observe-front into dev

src/views/business-analysis/topology/components/allBusinessCon.vue

@@ -23,7 +23,7 @@
       <el-col :span="5">
         <div class="flex">
           <span class="seach-title">错误率 >=</span>
-          <el-input v-model="queryParams.error_rate" style="width: 70%" size="small" clearable placeholder="请输入0-1之间的小数" @keyup.enter.native="handleQuery" @clear="handleQuery" />
+          <el-input v-model="queryParams.error_rate" style="width: 70%" size="small" clearable placeholder="请输入0-100之间的小数" @keyup.enter.native="handleQuery" @clear="handleQuery" />
           <!-- <el-input-number size="small" controls-position="right"  style="width: 70%" v-model="queryParams.error_rate" :step="0.1" :min="0" :max="1"  clearable placeholder="请输入0-1之间的小数" @keyup.enter.native="handleQuery" ></el-input-number> -->
         </div>
       </el-col>
@@ -122,7 +122,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="colData[5].istrue" header-align="center" align="center" label="错误率" prop="error_rate" :show-overflow-tooltip="true">
+        <el-table-column v-if="colData[5].istrue" header-align="center" align="center" label="错误率" sortable prop="error_rate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div :class="scope.row.error_rate==0?'table_bg':'table_bg_red'">
               <div class="table-num-box">
@@ -137,10 +137,18 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="colData[6].istrue" header-align="center" align="center" label="最大延迟(ms)" sortable prop="max" :show-overflow-tooltip="true">
+        <el-table-column v-if="colData[6].istrue" header-align="center" align="center" label="最大延迟(ms)" sortable prop="duration_max" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <div :class="scope.row.max<2000?'table_bg':'table_bg_red'">
-              {{ scope.row.max==undefined?0:Number(scope.row.max).toFixed(2) }}
+            <div :class="scope.row.duration_max<2000?'table_bg':'table_bg_red'">
+              <div class="table-num-box">
+                {{ scope.row.duration_max==undefined?0:Number(scope.row.duration_max).toFixed(2) }}
+              </div>
+              <div class="table-day-rate-box">
+                <i v-show="processNumber(scope.row.duration_max_dod).sign" :class="processNumber(scope.row.duration_max_dod).sign == 'up'? 'el-icon-up up':'el-icon-down down'" />
+                <span>
+                  {{ scope.row.duration_max_dod==undefined?0:getErrRate(processNumber(scope.row.duration_max_dod).value) }}
+                </span>
+              </div>
             </div>
           </template>
         </el-table-column>
@@ -705,7 +713,7 @@ export default {
                 if (response.code == 200) {
                   if (response.data.biz_id != undefined) {
                     if (_this.serveceMapList[i].id == response.data.biz_id) {
-                      _this.serveceMapList[i] = Object.assign({}, _this.serveceMapList[i], response.data)
+                      _this.serveceMapList[i].quantiles = response.data.quantiles
                       _this.isUpdate = !_this.isUpdate
                     }
                   }

src/views/business-analysis/topology/components/keyBusinessCon.vue

@@ -52,7 +52,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="colData[5].istrue" header-align="center" align="center" label="错误率" prop="error_rate" :show-overflow-tooltip="true">
+        <el-table-column v-if="colData[5].istrue" header-align="center" align="center" label="错误率" sortable prop="error_rate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div :class="scope.row.error_rate==0?'table_bg':'table_bg_red'">
               <div class="table-num-box">
@@ -355,7 +355,6 @@ export default {
     }
   },
   created() {
-    console.log(34567890,'created')
     this.$store.commit('time/setTimeFlag', false)
 
     this.appItem = storage.get('appsItem')
@@ -507,7 +506,6 @@ export default {
       return data
     },
     handleData(data) {
-      console.log(3000, data)
       data.forEach((v, k) => {
         v.id = v.biz_id
 
@@ -574,7 +572,7 @@ export default {
                 if (response.code == 200) {
                   if (response.data.biz_id != undefined) {
                     if (_this.serveceMapList[i].id == response.data.biz_id) {
-                      _this.serveceMapList[i] = Object.assign({}, _this.serveceMapList[i], response.data)
+                      _this.serveceMapList[i].quantiles = response.data.quantiles
                       _this.isUpdate = !_this.isUpdate
                     }
                   }
@@ -829,7 +827,6 @@ export default {
       const that = this
       let obj = {}
       obj = row
-      // if(row.quantiles != undefined&&row.quantiles.time !=null){
       const option = {
         tooltip: {
           trigger: 'axis',