bug修复

src/layout/components/topMenu/menu.js

@@ -14,9 +14,9 @@ export const menuData = [
         {title: '业务应用可持续性服务评估分析', path: '/pxf-risk-monitor-web/risk/bizServer', icon: "SetUp"},
     ],
     [
-        {title: '指标类别定义', path: '/pxf-risk-monitor-web/ms/type', icon: "EditPen"},
-        {title: '运行指标定义', path: '/pxf-risk-monitor-web/ms/def', icon: "Edit"},
-        {title: '运行模板定义', path: '/pxf-risk-monitor-web/ms/mstpl', icon: "Memo"},
+        {title: '数据指标类别定义', path: '/pxf-risk-monitor-web/ms/type', icon: "EditPen"},
+        {title: '运行数据指标定义', path: '/pxf-risk-monitor-web/ms/def', icon: "Edit"},
+        {title: '应用数据场景标准化模板定义', path: '/pxf-risk-monitor-web/ms/mstpl', icon: "Memo"},
     ],
     [
         {title: '推送配置', path: '/pxf-risk-monitor-web/sendMsg/pushConfig', icon: "Setting"},

src/views/alarm/record/bizAccess.vue

@@ -75,7 +75,7 @@
             <span>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="指标名称" align="center" prop="metricsName"/>
+        <el-table-column label="数据指标" align="center" prop="metricsName"/>
         <el-table-column label="风险级别" align="center" prop="alarmLevel">
           <template #default="scope">
             <dict-tag :options="alarm_level" :value="scope.row.alarmLevel"/>

src/views/alarm/record/bizSort.vue

@@ -37,7 +37,7 @@
                 <span>{{ scope.$index + 1 }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="指标名称" align="left" prop="name"/>
+            <el-table-column label="数据指标" align="left" prop="name"/>
             <el-table-column label="告警数量" align="center" width="120">
               <template #default="scope">
                 <el-button link type="primary" @click="msDetail(scope.row)">{{ scope.row.num }}</el-button>

src/views/alarm/record/bizType.vue

@@ -44,7 +44,7 @@
                 <span>{{ scope.$index + 1 }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="指标名称" align="left" prop="name"/>
+            <el-table-column label="数据指标" align="left" prop="name"/>
             <el-table-column label="告警数量" align="center" width="120">
               <template #default="scope">
                 <el-button link type="primary" @click="msDetail(scope.row)">{{ scope.row.num }}</el-button>

src/views/biz/mc/index.vue

@@ -25,26 +25,26 @@
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="告警-低" prop="alarmLow">
+      <el-form-item label="风险-低" prop="alarmLow">
         <el-input
             v-model="queryParams.alarmLow"
-            placeholder="请输入告警-低"
+            placeholder="请输入风险-低"
             clearable
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="告警-中" prop="alarmMid">
+      <el-form-item label="风险-中" prop="alarmMid">
         <el-input
             v-model="queryParams.alarmMid"
-            placeholder="请输入告警-中"
+            placeholder="请输入风险-中"
             clearable
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="告警-高" prop="alarmHigh">
+      <el-form-item label="风险-高" prop="alarmHigh">
         <el-input
             v-model="queryParams.alarmHigh"
-            placeholder="请输入告警-高"
+            placeholder="请输入风险-高"
             clearable
             @keyup.enter="handleQuery"
         />
@@ -169,9 +169,9 @@
       <el-table-column label="对象ID" align="center" prop="objId" />
       <el-table-column label="指标ID" align="center" prop="metricsId" />
       <el-table-column label="指标编码" align="center" prop="metricsCode" />
-      <el-table-column label="告警-低" align="center" prop="alarmLow" />
-      <el-table-column label="告警-中" align="center" prop="alarmMid" />
-      <el-table-column label="告警-高" align="center" prop="alarmHigh" />
+      <el-table-column label="风险-低" align="center" prop="alarmLow" />
+      <el-table-column label="风险-中" align="center" prop="alarmMid" />
+      <el-table-column label="风险-高" align="center" prop="alarmHigh" />
       <el-table-column label="健康度事件" align="center" prop="event" />
       <el-table-column label="数据获取表达式" align="center" prop="dataExp" />
       <el-table-column label="自动发现关键字" align="center" prop="findKey" />
@@ -222,14 +222,14 @@
         <el-form-item label="指标编码" prop="metricsCode">
           <el-input v-model="form.metricsCode" placeholder="请输入指标编码" />
         </el-form-item>
-        <el-form-item label="告警-低" prop="alarmLow">
-          <el-input v-model="form.alarmLow" placeholder="请输入告警-低" />
+        <el-form-item label="风险-低" prop="alarmLow">
+          <el-input v-model="form.alarmLow" placeholder="请输入风险-低" />
         </el-form-item>
-        <el-form-item label="告警-中" prop="alarmMid">
-          <el-input v-model="form.alarmMid" placeholder="请输入告警-中" />
+        <el-form-item label="风险-中" prop="alarmMid">
+          <el-input v-model="form.alarmMid" placeholder="请输入风险-中" />
         </el-form-item>
-        <el-form-item label="告警-高" prop="alarmHigh">
-          <el-input v-model="form.alarmHigh" placeholder="请输入告警-高" />
+        <el-form-item label="风险-高" prop="alarmHigh">
+          <el-input v-model="form.alarmHigh" placeholder="请输入风险-高" />
         </el-form-item>
         <el-form-item label="健康度事件" prop="event">
           <el-input v-model="form.event" placeholder="请输入健康度事件" />

src/views/biz/msConfig/index.vue

@@ -9,10 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="指标名称" prop="metricsName">
+      <el-form-item label="数据指标" prop="metricsName">
         <el-input
           v-model="queryParams.metricsName"
-          placeholder="请输入指标名称"
+          placeholder="请输入数据指标"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -125,7 +125,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="首页指标ID" align="center" prop="imId" />
       <el-table-column label="指标ID" align="center" prop="metricsId" />
-      <el-table-column label="指标名称" align="center" prop="metricsName" />
+      <el-table-column label="数据指标" align="center" prop="metricsName" />
       <el-table-column label="对象ID" align="center" prop="objId" />
       <el-table-column label="对象名称" align="center" prop="objName" />
       <el-table-column label="ID" align="center" prop="objMetricsId" />
@@ -164,8 +164,8 @@
         <el-form-item label="指标ID" prop="metricsId">
           <el-input v-model="form.metricsId" placeholder="请输入指标ID" />
         </el-form-item>
-        <el-form-item label="指标名称" prop="metricsName">
-          <el-input v-model="form.metricsName" placeholder="请输入指标名称" />
+        <el-form-item label="数据指标" prop="metricsName">
+          <el-input v-model="form.metricsName" placeholder="请输入数据指标" />
         </el-form-item>
         <el-form-item label="对象ID" prop="objId">
           <el-input v-model="form.objId" placeholder="请输入对象ID" />

src/views/check/chkc/index.vue

@@ -33,10 +33,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="指标名称" prop="metricsName">
+      <el-form-item label="数据指标" prop="metricsName">
         <el-input
           v-model="queryParams.metricsName"
-          placeholder="请输入指标名称"
+          placeholder="请输入数据指标"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -152,7 +152,7 @@
       <el-table-column label="巡检顶" align="center" prop="checkName" />
       <el-table-column label="巡检项编码" align="center" prop="checkCode" />
       <el-table-column label="指标ID" align="center" prop="metricsId" />
-      <el-table-column label="指标名称" align="center" prop="metricsName" />
+      <el-table-column label="数据指标" align="center" prop="metricsName" />
       <el-table-column label="计算方法" align="center" prop="checkMethod" />
       <el-table-column label="巡检规则" align="center" prop="checkRule" />
       <el-table-column label="最近值" align="center" prop="lValue" />
@@ -200,8 +200,8 @@
         <el-form-item label="指标ID" prop="metricsId">
           <el-input v-model="form.metricsId" placeholder="请输入指标ID" />
         </el-form-item>
-        <el-form-item label="指标名称" prop="metricsName">
-          <el-input v-model="form.metricsName" placeholder="请输入指标名称" />
+        <el-form-item label="数据指标" prop="metricsName">
+          <el-input v-model="form.metricsName" placeholder="请输入数据指标" />
         </el-form-item>
         <el-form-item label="计算方法" prop="checkMethod">
           <el-input v-model="form.checkMethod" placeholder="请输入计算方法" />

src/views/hl/bm/component/widget/hmList.vue

@@ -1,7 +1,7 @@
 <template>
   <el-button type="primary" plain @click="changeHm">选择指标</el-button>
   <el-table :data="hmData" border style="width: 100%;margin-top:10px;">
-    <el-table-column prop="metricsName" label="指标名称" />
+    <el-table-column prop="metricsName" label="数据指标" />
     <el-table-column prop="metricsCode" label="指标编码" width="120"/>
     <el-table-column prop="hlMetricsName" label="健康度分值"  width="120">
       <template #default="scope">
@@ -31,7 +31,7 @@
   <el-dialog title="选择指标" v-model="visibleHm">
     <el-table :data="selectHmData" border style="width: 100%;margin-top:10px;" max-height="60vh" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column prop="metricsName" label="指标名称" />
+      <el-table-column prop="metricsName" label="数据指标" />
       <el-table-column prop="metricsCode" label="指标编码" width="120"/>
     </el-table>
     <div class="btn-row">

src/views/hl/bm/component/widget/scoreDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <el-table :data="scoreData" border width="100%">
     <el-table-column label="业务对象" prop="objName" />
-    <el-table-column label="指标名称" prop="metricsName" />
+    <el-table-column label="数据指标" prop="metricsName" />
     <el-table-column label="当前值" prop="value" width="100"/>
     <el-table-column label="健康事件触发" prop="event" />
     <el-table-column label="事件时间" prop="time" />

src/views/hl/bm/component/widget/timeDetail.vue

@@ -22,7 +22,7 @@
       </el-table-column>
     </el-table>
     <el-table :data="hmsDetailData" style="width: 48%" border v-if="hmsVisible">
-      <el-table-column label="指标名称" prop="metricsName" width="150"/>
+      <el-table-column label="数据指标" prop="metricsName" width="150"/>
       <el-table-column label="指标编码" prop="metricsCode"/>
       <el-table-column label="健康度分值" prop="hlScore" width="100"/>
       <el-table-column label="评分标准" width="120">

src/views/hl/check/index.vue

@@ -63,7 +63,7 @@
         <el-table-column prop="remark" label="备注" align="center" width="160">
           <template #default="{row}">
             <span v-if="checkTime">
-              <span v-if="row.resultR" :style="`color:${row.resultR === '正常'?'#1ab43f':'#e43'}`">
+              <span v-if="row.resultR" :style="`color:${row.resultR === '正常'||row.resultR === '是'?'#1ab43f':'#e43'}`">
                 {{ row.resultR }}
               </span>
               <el-icon size="25" color="#388e3c" class="rotate" v-else><Loading/></el-icon>

src/views/hl/check/widget/checkReport.vue

@@ -12,7 +12,7 @@
       </el-table-column>
     </el-table>
     <el-table :data="reportDetail" v-show="visibleDetail" style="width: 48%" border>
-      <el-table-column label="指标名称" width="120" prop="name"/>
+      <el-table-column label="数据指标" width="120" prop="name"/>
       <el-table-column label="检查描述" prop="remark"/>
       <el-table-column label="当前值" width="100">
         <template #default="scope">

src/views/hl/check/widget/nCheckReport.vue

@@ -1,15 +1,15 @@
 <template>
   <div style="margin-top: -20px">
-    <div style="margin-bottom:10px;text-align: right">
-      <el-button icon="Download" @click="exportReport" size="small">导出报告</el-button>
-    </div>
+<!--    <div style="margin-bottom:10px;text-align: right">-->
+<!--      <el-button icon="Download" @click="exportReport" size="small">导出报告</el-button>-->
+<!--    </div>-->
     <el-table :data="reportData" style="width: 100%;" border :span-method="spanMethod">
       <el-table-column prop="className" label="分类" width="180" align="center"/>
       <el-table-column prop="checkName" label="巡检项"/>
       <el-table-column label="巡检结果" width="160" align="center" prop="resultL"/>
       <el-table-column prop="remark" label="备注" align="center" width="160">
         <template #default="{row}">
-        <span :style="`color:${row.resultR === '正常'?'#1ab43f':'#e43'}`">
+        <span :style="`color:${row.resultR === '正常'||row.resultR === '是'?'#1ab43f':'#e43'}`">
           {{ row.resultR || "-" }}
         </span>
         </template>

src/views/index/widget/indexConfig.vue

@@ -2,7 +2,7 @@
   <el-button type="primary" icon="plus" @click="addIndex">新增指标</el-button>
   <el-table :data="listData" border style="width: 100%;margin-top:10px">
     <el-table-column prop="objName" label="对象名称" width="180" />
-    <el-table-column prop="metricsName" label="指标名称">
+    <el-table-column prop="metricsName" label="数据指标">
       <template #default="scope">
         <el-input v-model="scope.row.metricsName" @keyup.enter="editMName(scope.row)"/>
       </template>
@@ -16,13 +16,13 @@
   <el-dialog title="新增指标" v-model="visible" width="800">
     <div style="margin-top:-10px;">
       <el-input v-model="query.objName" placeholder="请输入对象名称" style="width: 150px;margin-right:10px;"/>
-      <el-input v-model="query.metricsName" placeholder="请输入指标名称" style="width: 150px;margin-right:10px;"/>
+      <el-input v-model="query.metricsName" placeholder="请输入数据指标" style="width: 150px;margin-right:10px;"/>
       <el-button type="primary" @click="addIndex">查询</el-button>
     </div>
     <el-table :data="indexData" border style="width: 100%;margin-top:10px" size="small" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="objName" label="对象名称" width="180" />
-      <el-table-column prop="metricsName" label="指标名称" />
+      <el-table-column prop="metricsName" label="数据指标" />
     </el-table>
     <pagination :background="false" v-show="total>0" :total="total" v-model:page="query.pageNum" layout="prev, pager, next" v-model:limit="query.pageSize" @pagination="addIndex" />
     <div class="food-list-footer">

src/views/monitor/job/log.vue

@@ -86,9 +86,9 @@
             >导出</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button 
-               type="warning" 
-               plain 
+            <el-button
+               type="warning"
+               plain
                icon="Close"
                @click="handleClose"
             >关闭</el-button>
@@ -211,7 +211,7 @@ function getList() {
 }
 // 返回按钮
 function handleClose() {
-  const obj = { path: "/monitor/job" };
+  const obj = { path: "/pxf-risk-monitor-web/monitor/job" };
   proxy.$tab.closeOpenPage(obj);
 }
 /** 搜索按钮操作 */

src/views/ms/def/index.vue

@@ -7,7 +7,7 @@
           <el-form-item label="" prop="metricsName" style="margin-right:10px">
             <el-input
                 v-model="queryParams.metricsName"
-                placeholder="请输入指标名称"
+                placeholder="请输入数据指标"
                 clearable
                 @keyup.enter.native="handleQuery"
             />
@@ -46,7 +46,7 @@
     </el-row>
     <el-table v-loading="loading" :data="defList" border>
       <el-table-column label="指标ID" align="center" prop="metricsId" width="80"/>
-      <el-table-column label="指标名称" align="left" prop="metricsName"/>
+      <el-table-column label="数据指标" align="left" prop="metricsName"/>
       <el-table-column label="指标分类" align="left" width="150">
         <template #default="scope">
           <span v-for="(item,i) in scope.row.metricsTypes" :key="`${scope.$index}_${item}`">
@@ -99,8 +99,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="指标名称" prop="metricsName">
-          <el-input v-model="form.metricsName" placeholder="请输入指标名称"/>
+        <el-form-item label="数据指标" prop="metricsName">
+          <el-input v-model="form.metricsName" placeholder="请输入数据指标"/>
         </el-form-item>
         <el-form-item label="指标编码" v-if="form.metricsCode">
 <!--          <el-input v-model="form.metricsCode" placeholder="请输入指标编码"/>-->
@@ -114,14 +114,14 @@
 <!--        <el-form-item label="指标获取公式" prop="metricsExp">-->
 <!--          <el-input v-model="form.metricsExp" type="textarea" placeholder="请输入内容"/>-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="告警-低" prop="alarmLow">-->
-<!--          <el-input v-model="form.alarmLow" placeholder="请输入告警-低数值"/>-->
+<!--        <el-form-item label="风险-低" prop="alarmLow">-->
+<!--          <el-input v-model="form.alarmLow" placeholder="请输入风险-低数值"/>-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="告警-中" prop="alarmMid">-->
-<!--          <el-input v-model="form.alarmMid" placeholder="请输入告警-中数值"/>-->
+<!--        <el-form-item label="风险-中" prop="alarmMid">-->
+<!--          <el-input v-model="form.alarmMid" placeholder="请输入风险-中数值"/>-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="告警-高" prop="alarmHigh">-->
-<!--          <el-input v-model="form.alarmHigh" placeholder="请输入告警-高数值"/>-->
+<!--        <el-form-item label="风险-高" prop="alarmHigh">-->
+<!--          <el-input v-model="form.alarmHigh" placeholder="请输入风险-高数值"/>-->
 <!--        </el-form-item>-->
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :autosize="{maxRows:6,minRows:3}" maxlength="300" show-word-limit/>
@@ -176,7 +176,7 @@ const data = reactive({
   },
   rules: {
     metricsName: [
-      {required: true, message: "指标名称不能为空", trigger: "blur"}
+      {required: true, message: "数据指标不能为空", trigger: "blur"}
     ],
     metricsExp: [
       {required: true, message: "指标公式不能为空", trigger: "blur"}

src/views/ms/mstpl/component/editIndicator.vue

@@ -2,7 +2,7 @@
   <el-form :model="form" label-width="120" label-suffix=":" :rules="rules" ref="fRef">
     <el-row :gutter="10">
       <el-col :span="12">
-        <el-form-item label="指标名称">{{ rowsInfo.metricsDef.metricsName }}</el-form-item>
+        <el-form-item label="数据指标">{{ rowsInfo.metricsDef.metricsName }}</el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="指标类型">
@@ -31,17 +31,17 @@
     </el-form-item>
     <el-row :gutter="10">
       <el-col :span="12">
-        <el-form-item label="告警-低">
+        <el-form-item label="风险-低">
           <el-input v-model="form.alarmLow" @change="checkInput"/>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="告警-中">
+        <el-form-item label="风险-中">
           <el-input v-model="form.alarmMid" @change="checkInput"/>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="告警-高">
+        <el-form-item label="风险-高">
           <el-input v-model="form.alarmHigh" @change="checkInput"/>
         </el-form-item>
       </el-col>

src/views/ms/mstpl/component/indicatorManger.vue

@@ -13,23 +13,23 @@
 <!--            </span>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="指标名称" align="left">
+        <el-table-column label="数据指标名称" align="left">
           <template #default="scope">
             {{ scope.row.metricsDef.metricsName }}
           </template>
         </el-table-column>
         <el-table-column label="指标编码" align="left" prop="metricsCode" width="160"/>
-        <el-table-column label="告警-低" align="center" width="80">
+        <el-table-column label="风险-低" align="center" width="80">
           <template #default="scope">
             {{ scope.row.alarmLow }}
           </template>
         </el-table-column>
-        <el-table-column label="告警-中" align="center" width="80">
+        <el-table-column label="风险-中" align="center" width="80">
           <template #default="scope">
             {{ scope.row.alarmMid }}
           </template>
         </el-table-column>
-        <el-table-column label="告警-高" align="center" width="80">
+        <el-table-column label="风险-高" align="center" width="80">
           <template #default="scope">
             {{ scope.row.alarmHigh }}
           </template>
@@ -88,11 +88,11 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="指标名称" align="left" prop="metricsName"/>
+        <el-table-column label="数据指标" align="left" prop="metricsName"/>
         <el-table-column label="指标编码" align="left" prop="metricsCode" width="160"/>
-        <el-table-column label="告警-低" align="left" width="80" prop="alarmLow"/>
-        <el-table-column label="告警-中" align="left" width="80" prop="alarmMid"/>
-        <el-table-column label="告警-高" align="left" width="80" prop="alarmHigh"/>
+        <el-table-column label="风险-低" align="left" width="80" prop="alarmLow"/>
+        <el-table-column label="风险-中" align="left" width="80" prop="alarmMid"/>
+        <el-table-column label="风险-高" align="left" width="80" prop="alarmHigh"/>
       </el-table>
       <pagination
           v-show="adTotal>0"

src/views/ms/mstpl/index.vue

@@ -6,7 +6,7 @@
           <el-form-item label="" prop="tplName" style="margin-right:10px">
             <el-input
                 v-model="queryParams.tplName"
-                placeholder="请输入模板名称"
+                placeholder="请输入数据场景标准化模板"
                 clearable
                 @keyup.enter="handleQuery"
             />
@@ -32,7 +32,7 @@
     <el-table v-loading="loading" :data="tplList" border  @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" v-if="selectTpl"/>
       <el-table-column label="模板ID" align="center" prop="tplId" width="80"/>
-      <el-table-column label="模板名称" align="left" prop="tplName"/>
+      <el-table-column label="数据场景标准化模板" align="left" prop="tplName"/>
       <el-table-column label="指标数量" align="left" prop="num" width="150"/>
       <el-table-column label="完成配置" align="center" width="120">
         <template #default="scope">

src/views/obj/metrics/index.vue

@@ -25,10 +25,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="指标名称" prop="metricsName">
+      <el-form-item label="数据指标" prop="metricsName">
         <el-input
           v-model="queryParams.metricsName"
-          placeholder="请输入指标名称"
+          placeholder="请输入数据指标"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -127,7 +127,7 @@
       <el-table-column label="业务对象ID" align="center" prop="objId" />
       <el-table-column label="模板ID" align="center" prop="tplId" />
       <el-table-column label="指标ID" align="center" prop="metricsId" />
-      <el-table-column label="指标名称" align="center" prop="metricsName" />
+      <el-table-column label="数据指标" align="center" prop="metricsName" />
       <el-table-column label="指标编码" align="center" prop="metricsCode" />
       <el-table-column label="告警规则" align="center" prop="alarmRule" />
       <el-table-column label="创建人" align="center" prop="createBy" />
@@ -171,8 +171,8 @@
         <el-form-item label="指标ID" prop="metricsId">
           <el-input v-model="form.metricsId" placeholder="请输入指标ID" />
         </el-form-item>
-        <el-form-item label="指标名称" prop="metricsName">
-          <el-input v-model="form.metricsName" placeholder="请输入指标名称" />
+        <el-form-item label="数据指标" prop="metricsName">
+          <el-input v-model="form.metricsName" placeholder="请输入数据指标" />
         </el-form-item>
         <el-form-item label="指标编码" prop="metricsCode">
           <el-input v-model="form.metricsCode" placeholder="请输入指标编码" />

src/views/obj/obj/component/metricsConfig.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-form ref="mcRef" :model="form" :rules="rules" label-width="120px" label-suffix=":">
-    <el-form-item label="指标名称">
+  <el-form ref="mcRef" :model="form" :rules="rules" label-width="140px" label-suffix=":">
+    <el-form-item label="数据指标">
       {{form.metricsName || '-'}}
     </el-form-item>
     <el-form-item label="指标类型">
@@ -9,7 +9,7 @@
     <el-form-item label="指标编码">
       {{form.metricsCode || '-'}}
     </el-form-item>
-    <el-form-item label="公式解析结果">
+    <el-form-item label="数据转换公式解析">
       {{form.dataExp}}
 <!--      <el-input type="textarea" placeholder="请输入数据接口配置" v-model="form.dataExp" show-word-limit maxlength="900" :autosize="{ minRows: 4, maxRows: 6 }" />-->
 

src/views/obj/obj/component/metricsList.vue

@@ -1,15 +1,15 @@
 <template>
   <el-table :data="listData" border size="small" style="margin:10px 0" max-height="450">
     <el-table-column label="指标ID" align="center" prop="metricsId" width="80"/>
-    <el-table-column label="指标名称" align="left">
+    <el-table-column label="数据指标" align="left">
       <template #default="scope">
         {{ scope.row.metricsName }}
       </template>
     </el-table-column>
     <el-table-column label="指标编码" align="left" prop="metricsCode" width="160"/>
-    <el-table-column label="告警-低" align="left" width="80" prop="alarmLow" />
-    <el-table-column label="告警-中" align="left" width="80" prop="alarmMid" />
-    <el-table-column label="告警-高" align="left" width="80" prop="alarmHigh" />
+    <el-table-column label="风险-低" align="left" width="80" prop="alarmLow" />
+    <el-table-column label="风险-中" align="left" width="80" prop="alarmMid" />
+    <el-table-column label="风险-高" align="left" width="80" prop="alarmHigh" />
     <el-table-column label="健康事件" align="left" width="80" prop="event" />
     <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="180">
       <template #default="scope">

src/views/obj/obj/component/runMetricsInfo.vue

@@ -3,7 +3,7 @@
     <el-form-item label="" prop="metricsName">
       <el-input
           v-model="queryParams.metricsName"
-          placeholder="请输入指标名称"
+          placeholder="请输入数据指标"
           clearable
       />
     </el-form-item>
@@ -21,7 +21,7 @@
 <!--            </span>-->
 <!--      </template>-->
 <!--    </el-table-column>-->
-    <el-table-column label="指标名称" align="left" prop="metricsName" />
+    <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"/>
 <!--    <el-table-column label="告警规则" align="left" prop="alarmRule" />-->

src/views/obj/obj/index.vue

@@ -32,7 +32,7 @@
 
     <el-table v-loading="loading" :data="objList" border>
       <el-table-column label="对象ID" align="center" prop="objId" width="80"/>
-      <el-table-column label="对象名称" align="left" prop="objName"/>
+      <el-table-column label="数据对象" align="left" prop="objName"/>
       <el-table-column label="业务类型" align="left" prop="objType" width="120">
         <template #default="scope">
           <dict-tag :options="biz_type" :value="scope.row.objType"/>
@@ -43,7 +43,7 @@
           {{ scope.row.objAddr }}
         </template>
       </el-table-column>
-      <el-table-column label="应用模板" align="left" width="260">
+      <el-table-column label="数据模板" align="left" width="260">
         <template #default="scope">
           <span v-for="(item,index) in scope.row.tplList" :key="`ip_${item.objId}`">
             {{item.tplName}}<span v-if="index!==scope.row.tplList.length-1">,</span>
@@ -60,7 +60,7 @@
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['obj:obj:edit']">
             修改
           </el-button>
-          <el-button link type="primary" icon="Position" @click="handleRunSearch(scope.row)">运行指标查询</el-button>
+          <el-button link type="primary" icon="Position" @click="handleRunSearch(scope.row)">数据指标查询</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['obj:obj:remove']">
             删除
           </el-button>
@@ -196,7 +196,7 @@ function handleAdd(vTitle) {
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  handleAdd("修改业务对象")
+  handleAdd("业务数据对象")
   rowId.value = row.objId || ids.value
 }
 

src/views/risk/config/index.vue

@@ -9,10 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="指标名称;" prop="metricsName">
+      <el-form-item label="数据指标;" prop="metricsName">
         <el-input
           v-model="queryParams.metricsName"
-          placeholder="请输入指标名称;"
+          placeholder="请输入数据指标;"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -117,7 +117,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="配置ID;" align="center" prop="hcId" />
       <el-table-column label="指标ID" align="center" prop="metricsId" />
-      <el-table-column label="指标名称;" align="center" prop="metricsName" />
+      <el-table-column label="数据指标;" align="center" prop="metricsName" />
       <el-table-column label="显示名称" align="center" prop="viewName" />
       <el-table-column label="配置类型" align="center" prop="configType" />
       <el-table-column label="排序依据" align="center" prop="rankingBased" />
@@ -156,8 +156,8 @@
         <el-form-item label="指标ID" prop="metricsId">
           <el-input v-model="form.metricsId" placeholder="请输入指标ID" />
         </el-form-item>
-        <el-form-item label="指标名称;" prop="metricsName">
-          <el-input v-model="form.metricsName" placeholder="请输入指标名称;" />
+        <el-form-item label="数据指标;" prop="metricsName">
+          <el-input v-model="form.metricsName" placeholder="请输入数据指标;" />
         </el-form-item>
         <el-form-item label="显示名称" prop="viewName">
           <el-input v-model="form.viewName" placeholder="请输入显示名称" />

src/views/risk/model/index.vue

@@ -9,10 +9,10 @@
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="指标名称;" prop="metricsName">
+      <el-form-item label="数据指标;" prop="metricsName">
         <el-input
             v-model="queryParams.metricsName"
-            placeholder="请输入指标名称;"
+            placeholder="请输入数据指标;"
             clearable
             @keyup.enter="handleQuery"
         />
@@ -117,7 +117,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="风险预测ID;" align="center" prop="riskId" />
       <el-table-column label="指标ID" align="center" prop="metricsId" />
-      <el-table-column label="指标名称;" align="center" prop="metricsName" />
+      <el-table-column label="数据指标;" align="center" prop="metricsName" />
       <el-table-column label="选择对象类型" align="center" prop="objType">
         <template #default="scope">
           <dict-tag :options="select_obj" :value="scope.row.objType"/>
@@ -161,8 +161,8 @@
         <el-form-item label="指标ID" prop="metricsId">
           <el-input v-model="form.metricsId" placeholder="请输入指标ID" />
         </el-form-item>
-        <el-form-item label="指标名称;" prop="metricsName">
-          <el-input v-model="form.metricsName" placeholder="请输入指标名称;" />
+        <el-form-item label="数据指标;" prop="metricsName">
+          <el-input v-model="form.metricsName" placeholder="请输入数据指标;" />
         </el-form-item>
         <el-form-item label="选择对象类型" prop="objType">
           <el-select v-model="form.objType" placeholder="请选择选择对象类型">

src/views/risk/r2/index.vue

@@ -12,7 +12,7 @@
     </el-row>
     <el-table v-loading="loading" :data="modelData" border width="100%">
       <el-table-column prop="riskId" label="风险ID" align="center" width="80"/>
-      <el-table-column prop="metricsName" label="指标名称" align="left"/>
+      <el-table-column prop="metricsName" label="数据指标" align="left"/>
       <el-table-column label="运行业务对象" align="left" width="250">
         <template #default="scope">
           <span v-if="scope.row.objType == '1'">全部</span>

src/views/risk/r3/components/historyAnalyse.vue

@@ -1,14 +1,14 @@
 <template>
   <el-row :gutter="20">
     <el-col :span="24">
-      <el-input v-model="params.metricsName" placeholder="请输入指标名称" style="width: 200px;margin-right: 10px" size="small"/>
+      <el-input v-model="params.metricsName" placeholder="请输入数据指标" style="width: 200px;margin-right: 10px" size="small"/>
       <el-input v-model="params.objName" placeholder="请输入对象名称" style="width: 200px;margin-right: 10px" size="small" />
       <el-button type="primary" icon="Search" @click="getAnalysis" size="small">搜索</el-button>
     </el-col>
   </el-row>
   <el-table v-loading="loading" :data="analysisList" border width="100%" size="small" style="margin-top:10px">
     <el-table-column label="#" type="index" width="80" align="center"/>
-    <el-table-column label="指标名称" prop="metricsName"/>
+    <el-table-column label="数据指标" prop="metricsName"/>
     <el-table-column label="运行业务对象" prop="objName">
       <template #default="scope">
         <span v-if="scope.row.objType == '1'">全部</span>

src/views/risk/r3/components/hzAnalyse.vue

@@ -1,7 +1,7 @@
 <template>
   <el-row :gutter="20">
     <el-col :span="18">
-      <el-input v-model="params.metricsName" placeholder="请输入指标名称" style="width: 200px;margin-right: 10px"
+      <el-input v-model="params.metricsName" placeholder="请输入数据指标" style="width: 200px;margin-right: 10px"
                 size="small"/>
       <el-button type="primary" icon="Search" @click="getModelList" size="small">搜索</el-button>
     </el-col>
@@ -11,7 +11,7 @@
   </el-row>
   <el-table v-loading="loading" :data="modelList" border width="100%" size="small" style="margin-top:10px">
     <el-table-column label="#" type="index" width="80" align="center"/>
-    <el-table-column label="指标名称" prop="metricsName"/>
+    <el-table-column label="数据指标" prop="metricsName"/>
     <el-table-column label="运行业务对象" width="250">
       <template #default="scope">
         <span v-if="scope.row.objType == '1'">全部</span>

src/views/risk/r5/components/hostSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <el-button type="primary" @click="editConfig(null)">新增配置</el-button>
   <el-table :data="configData" border style="width: 100%;margin-top:10px;" size="small">
-    <el-table-column prop="metricsName" label="指标名称" />
+    <el-table-column prop="metricsName" label="数据指标" />
     <el-table-column prop="viewName" label="图表标题" />
     <el-table-column label="排名依据">
         <template #default="{row}">