Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

#872 ping详情页调整-增加表格字段采集器id collectorId #3



See merge request !574

@@ -131,10 +131,3 @@
   </div>
   </div>
 </div>
 </div>
 
 
-<!--弹框-->
-<cm-dialog :title="dialog.title" width="60%" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
-  <template v-slot>
-    <pingDetail  :detail="dialog.detail" />
-  </template>
-</cm-dialog>
-

 export default {
 export default {
     name: 'pingIndex',
     name: 'pingIndex',
     template: '',
     template: '',
-    components: {
-        'pingDetail': Vue.defineAsyncComponent(
-            () => myImport('views/ping/pingDetail/index')
-        )
-    },
+    components: {},
     props: [],
     props: [],
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
@@ -95,6 +91,13 @@ export default {
                     align: 'center',
                     align: 'center',
                     width: '200'
                     width: '200'
                 },
                 },
+                {
+                    prop: 'collectorId',
+                    label: '采集器id',
+                    sortable: true,
+                    align: 'center',
+                    width: '200'
+                },
             ]
             ]
         })
         })
         let resTypeArr = Vue.ref([]);
         let resTypeArr = Vue.ref([]);

-<div class="esData-detail-container">
-  <el-descriptions
-          class=""
-          title="日志信息"
-          :column="2"
-          :size="size"
-          border
-  >
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          资源名称
-        </div>
-      </template>
-      {{detail.resName}}
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          IP地址
-        </div>
-      </template>
-      {{detail.host}}
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          资源类型
-        </div>
-      </template>
-      {{detail.resTypeName}}
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          日志来源
-        </div>
-      </template>
-      {{detail.type}}
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          日志类型
-        </div>
-      </template>
-      {{detail.program}}
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          采集时间
-        </div>
-      </template>
-      {{detail.dbTimeStr}}
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          日志时间
-        </div>
-      </template>
-      {{detail.logDate}}
-    </el-descriptions-item>
-  </el-descriptions>
-  <div class="info-title">
-    <span style="font-weight:bold">日志内容</span>
-  </div>
-  <div class="esData-detail-info-content" v-html="detail.message">
-  </div>
-</div>

-export default {
-    name: 'esDataDetail',
-    template: '',
-    components: {
-
-    },
-    props: {
-        detail:{
-            type:Object,
-            default: {}
-        }
-    },
-    setup(props, {attrs, slots, emit}) {
-        const {proxy} = Vue.getCurrentInstance();
-
-        // 挂载完
-        Vue.onMounted(() => {
-        })
-
-
-        return {
-
-        }
-    }
-
-}