Explorar o código

调整文字描述之类的。

wukai hai 7 meses
pai
achega
b6b3634eba

+ 2 - 2
src/views/hl/bm/component/bmTable.vue

@@ -11,9 +11,9 @@
         {{scope.row.bizObj.objName}}
       </template>
     </el-table-column>
-    <el-table-column label="对象地址" width="200">
+    <el-table-column label="应用编码/对象实例" width="200">
       <template #default="scope">
-        {{scope.row.bizObj.objAddr}}:{{scope.row.bizObj.objPort}}
+        {{scope.row.bizObj.objAddr}}
       </template>
     </el-table-column>
     <el-table-column label="操作" width="100" align="center">

+ 1 - 1
src/views/ms/mstpl/component/editIndicator.vue

@@ -86,7 +86,7 @@ const form = ref({
 })
 const passValidate = ref(true)
 
-const disabled = computed(() => props.rowsInfo.metricsDef.metricsType === "2")
+const disabled = computed(() => props.rowsInfo.metricsDef.metricsType != "1")
 const rules = {
   dataExp: {required: true, message: '请输入数据接口配置', trigger: 'change'},
   findRule: {required: true, message: '请选择自动发现规则', trigger: 'change'},

+ 1 - 1
src/views/obj/obj/component/echartsInfo.vue

@@ -45,7 +45,7 @@ function getList() {
   proxy.$modal.loading("正在加载缓存监控数据,请稍候!");
   metricsHistory(objMetricsId.value).then(res=>{
     proxy.$modal.closeLoading();
-    const times = res.data.times.map(t=>parseTime(t,'{y}/{m}/{d} {h}:{mi}'))
+    const times = res.data.times.map(t=>parseTime(t,'{y}/{m}/{d} {h}:{mi}:{s}'))
     const commandstatsIntance = echarts.init(commandstats.value);
     commandstatsIntance.setOption({
       grid:{

+ 7 - 7
src/views/obj/obj/component/runMetricsInfo.vue

@@ -14,13 +14,13 @@
 
   <el-table v-loading="loading" border :data="metricsList">
     <el-table-column label="ID" align="center" prop="objMetricsId" width="80"/>
-    <el-table-column label="指标分类" align="left" width="120">
-      <template #default="scope">
-            <span v-for="(item,i) in scope.row.metricsDef.metricsTypes" :key="`${scope.$index}_${item}`">
-              {{ item.typeName }}<span v-if="scope.row.metricsTypes && i!==scope.row.metricsTypes.length-1">、</span>
-            </span>
-      </template>
-    </el-table-column>
+<!--    <el-table-column label="指标分类" align="left" width="120">-->
+<!--      <template #default="scope">-->
+<!--            <span v-for="(item,i) in scope.row.metricsDef.metricsTypes" :key="`${scope.$index}_${item}`">-->
+<!--              {{ item.typeName }}<span v-if="scope.row.metricsTypes && i!==scope.row.metricsTypes.length-1">、</span>-->
+<!--            </span>-->
+<!--      </template>-->
+<!--    </el-table-column>-->
     <el-table-column label="指标名称" align="left" prop="metricsName" />
     <el-table-column label="指标编码" align="left" prop="metricsCode" width="120"/>
     <el-table-column label="指标当前值" align="left" prop="dvalue" width="120"/>