Merge branch 'dev' into feature_system_space

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

@@ -1,10 +1,10 @@
 <template>
   <div style="padding:16px;">
     <el-row :gutter="10" class="mb8">
-      <el-col :span="6">
+      <el-col :span="5">
         <div class="flex">
           <span class="seach-title">涉及的服务</span>
-          <el-select v-model="queryParams.service_name" size="small" clearable @change="handChange" @clear="handleQuery">
+          <el-select v-model="queryParams.service_name" style="width: 70%" size="small" clearable @change="handChange" @clear="handleQuery">
             <el-option
               v-for="item in serviceList"
               :key="item.id"
@@ -14,33 +14,31 @@
           </el-select>
         </div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="5">
         <div class="flex">
           <span class="seach-title">延迟范围 >=</span>
-          <el-input v-model="queryParams.duration" type="number" size="small" clearable placeholder="请输入延迟范围" @keyup.enter.native="handleQuery" @clear="handleQuery" />
+          <el-input v-model="queryParams.duration" style="width: 70%" type="number" size="small" clearable placeholder="请输入延迟范围" @keyup.enter.native="handleQuery" @clear="handleQuery" />
         </div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="5">
         <div class="flex">
           <span class="seach-title">错误率 >=</span>
-          <el-input v-model="queryParams.error_rate" type="number" size="small" clearable placeholder="请输入错误率" @keyup.enter.native="handleQuery" @clear="handleQuery" />
+          <!-- <el-input v-model="queryParams.error_rate" style="width: 70%" type="number" size="small" clearable placeholder="请输入0-1之间的小数" @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>
-      <el-col :span="6">
+      <el-col :span="5">
         <div class="flex">
           <span class="seach-title">请求量 >=</span>
-          <el-input v-model="queryParams.request_total" type="number" size="small" clearable placeholder="请输入错误率" @keyup.enter.native="handleQuery" @clear="handleQuery" />
+          <el-input v-model="queryParams.request_total" style="width: 70%" type="number" size="small" clearable placeholder="请输入请求量" @keyup.enter.native="handleQuery" @clear="handleQuery" />
         </div>
       </el-col>
-    </el-row>
-    <el-row :gutter="10" class="mb8 flex" style="margin-bottom: 10px;">
       <el-col :span="4">
         <el-checkbox v-model="queryParams.access_database" @change="handleQuery">涉及数据库</el-checkbox>
-      </el-col>
-      <el-col :span="2">
         <el-checkbox v-model="queryParams.favor" @change="handleQuery">仅收藏</el-checkbox>
       </el-col>
-
+    </el-row>
+    <el-row :gutter="10" class="mb8 flex" style="margin-bottom: 10px;">
       <el-col :span="2">
         <div class="flex">
           <el-dropdown
@@ -79,6 +77,7 @@
         v-loading="loading"
         :data="serveceMapList"
         @row-click="handleRowClick"
+        @sort-change="handleSortChang"
       >
         <el-table-column v-if="colData[0].istrue" align="center" header-align="center" class-name="column_one" label="业务名" prop="name" :show-overflow-tooltip="true" />
         <el-table-column v-if="colData[4].istrue" header-align="center" align="center" label="请求总数" sortable prop="request_total" :show-overflow-tooltip="true">
@@ -228,7 +227,6 @@
           align="center"
           class-name="small-padding fixed-width"
           width="160"
-          sortable
         >
           <template slot-scope="scope">
             <el-button
@@ -377,7 +375,7 @@ export default {
         node_num: '', // 最小节点数量
         access_database: '', // 是否涉及数据库
         favor: '', // 是否收藏
-        sort_field: '', // 支持 request_total(请求总数，调用占比)、error_rate(错误率)、duration_median(中位延迟)
+        sort_field: 'request_total', // 支持 request_total(请求总数，调用占比)、error_rate(错误率)、duration_median(中位延迟)
         sort_type: 'desc',
         page_num: 1, // 当前页码
         page_size: 10// 每页条数
@@ -786,12 +784,11 @@ export default {
       prop = column.prop
       order = column.order
       if (order === 'descending') {
-        this.queryParams[prop + 'Order'] = 'desc'
+        this.queryParams.sort_type = 'desc'
       } else if (order === 'ascending') {
-        this.queryParams[prop + 'Order'] = 'asc'
-      } else {
-        this.queryParams[prop + 'Order'] = undefined
+        this.queryParams.sort_type = 'asc'
       }
+      this.queryParams.sort_field = prop
       this.getList()
     },
     /** 修改按钮操作 */
@@ -1295,7 +1292,7 @@ export default {
   align-items: center;
 }
 .seach-title{
-  width:100px;
+  // width:100px;
   display: inline-block;
   margin-right: 10px;
 }

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

@@ -7,6 +7,7 @@
         v-loading="loading"
         :data="serveceMapList"
         @row-click="handleRowClick"
+        @sort-change="handleSortChang"
       >
         <el-table-column v-if="colData[0].istrue" align="center" header-align="center" class-name="column_one" label="业务名" prop="name" :show-overflow-tooltip="true" />
         <el-table-column v-if="colData[4].istrue" header-align="center" align="center" label="请求总数" sortable prop="request_total" :show-overflow-tooltip="true">
@@ -66,10 +67,10 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column header-align="center" align="center" label="最大延迟(ms)" sortable prop="max" :show-overflow-tooltip="true">
+        <el-table-column 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'">
+              {{ scope.row.duration_max==undefined?0:Number(scope.row.duration_max).toFixed(2) }}
             </div>
           </template>
         </el-table-column>
@@ -89,7 +90,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-if="colData[8].istrue" header-align="center" align="center" label="中位延迟11" prop="duration_median" width="200">
+        <el-table-column v-if="colData[8].istrue" header-align="center" align="center" label="中位延迟" prop="duration_median" width="200">
           <template slot-scope="scope">
             <div :class="scope.row.duration_median<2000?'table_bg':'table_bg_red'" style="display:flex;">
               <div>
@@ -116,7 +117,6 @@
           align="center"
           class-name="small-padding fixed-width"
           width="160"
-          sortable
         >
           <template slot-scope="scope">
             <el-button
@@ -183,10 +183,7 @@ import storage from '@/utils/storage'
 // import bus from '@/utils/bus'
 
 import { getToken } from '@/utils/auth'
-// import echarts from 'echarts'
 import resize from '../../mixins/resize'
-import moment from 'moment'
-// import elTableInfiniteScroll from 'el-table-infinite-scroll';
 import Topo from './Topo'
 import BigNumber from 'bignumber.js'
 export default {
@@ -241,7 +238,6 @@ export default {
       // 应用数据列表
       appData: [],
       // 遮罩层
-      loading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -269,6 +265,8 @@ export default {
         // access_database: '',//是否涉及数据库
         vip: true, // 是否为重点业务
         // favor:'',//是否收藏
+        sort_field: 'request_total',
+        sort_type: 'desc',
         page_num: 1, // 当前页码
         page_size: 10 // 每页条数
       },
@@ -643,12 +641,11 @@ export default {
       prop = column.prop
       order = column.order
       if (order === 'descending') {
-        this.queryParams[prop + 'Order'] = 'desc'
+        this.queryParams.sort_type = 'desc'
       } else if (order === 'ascending') {
-        this.queryParams[prop + 'Order'] = 'asc'
-      } else {
-        this.queryParams[prop + 'Order'] = undefined
+        this.queryParams.sort_type = 'asc'
       }
+      this.queryParams.sort_field = prop
       this.getList()
     },
     /** 修改按钮操作 */