修复bug

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

@@ -116,10 +116,13 @@ const queryParams = reactive({
 
 // 选择指标
 const getSelectDetails = (tplId: number) => {
+  console.log(tplId)
   loading.value = true;
   editRow.value = [];
-  rowTplId.value = tplId;
-  tplId && (queryParams.tplId = tplId)
+  if(tplId){
+    rowTplId.value = tplId;
+    queryParams.tplId = tplId
+  }
   listDetail(queryParams).then((response) => {
     listData.value = response.rows
     total.value = response.total;

src/views/obj/obj/component/step1.vue

@@ -89,22 +89,14 @@ onMounted(() => {
       editForm()
     })
   }
+  remoteMethod("")
 })
 
 const editForm = () => {
   getObj(props.rowId).then(res => {
     const {objId, objType, appId, objName, objAddr, objPort} = res.data
     form.value = {objId, objType, appId, objName, objAddr, objPort}
-    if(objType == 1){
-      listApp({ pageNum: 1,pageSize: 5,appId}).then(res=>{
-        options.value = res.rows.map(item => {
-          return {
-            value: item.appId,
-            label: item.appName
-          }
-        })
-      })
-    }
+
   });
 }
 
@@ -121,7 +113,6 @@ const resetForm = () => {
 }
 
 const remoteMethod = (appName: string) => {
-  if (appName) {
     const params = {
       pageNum: 1,
       pageSize: 10,
@@ -137,9 +128,6 @@ const remoteMethod = (appName: string) => {
       })
       loading.value = false
     })
-  } else {
-    options.value = []
-  }
 }
 
 const submitForm = () => {

src/views/obj/obj/component/step3.vue

@@ -3,23 +3,15 @@
     <el-col :span="12">
       <el-button type="primary" @click="handleSelect">选择指标</el-button>
     </el-col>
-    <el-col :span="12" style="text-align: right"> 接口配置已完成: {{ scheduleData.complete }}/{{ scheduleData.total }} </el-col>
   </el-row>
-  <metrics-list :listData="listData" :edit="false">
+  <metrics-list :listData="listData" :edit="true">
     <template #operation="scope">
-      <el-button link
-                 :type="!scope.row.dataExp ? 'primary' : 'success'"
-                 :icon="!scope.row.dataExp ? 'Edit' : 'CircleCheck'"
-                 @click="handleConfigMetrics(scope.row)">
-        {{!scope.row.dataExp?'未配置' : '已配置'}}
-      </el-button>
-<!--      <el-button link type="primary" icon="Edit" @click="handleUpdateMetrics(scope.row)">保存</el-button>-->
+      <el-button link type="primary" icon="Edit" @click="handleUpdateMetrics(scope.row)">保存</el-button>
       <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
     </template>
   </metrics-list>
   <el-dialog title="选择指标" v-model="openDialog" :width="1000" append-to-body style="top:15vh">
-    <metrics-config :metrics="metricsRow" v-if="metricsType==='config'" @cancel="openDialog=false" @success="initData"/>
-    <metrics-list :listData="addMetricsList" :edit="false" v-else>
+    <metrics-list :listData="addMetricsList" :edit="false">
       <template #operation="scope">
         <el-button link type="primary" icon="Delete" @click="handleAddMetrics(scope.row)">添加</el-button>
       </template>
@@ -27,10 +19,8 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import {scheduleObj} from "@/api/obj/obj"
 import {onMounted, ref} from "vue";
 import metricsList from "./metricsList.vue"
-import metricsConfig from  "./metricsConfig.vue"
 const {proxy,emit} = getCurrentInstance()
 const props = defineProps(['rowId'])
 import {selectMetrics,addMetrics} from "@/api/obj/obj"
@@ -38,30 +28,12 @@ import {listMetrics,delMetrics,updateMetrics} from '@/api/obj/metrics'
 const listData=ref([])
 const openDialog=ref(false)
 const addMetricsList=ref([])
-const metricsRow=ref({})
-const metricsType=ref("list")
-const scheduleData=ref({})
 onMounted(()=>{
-  initData()
+  queryList()
 })
 
-const initData=()=>{
-  openDialog.value = false
-  queryList()
-  getScheduleTotal()
-}
 
-const getScheduleTotal=()=>{
-  scheduleObj(props.rowId).then(res=>{
-    scheduleData.value = res.data
-  })
-}
 
-const handleConfigMetrics=(row)=>{
-  metricsType.value = "config"
-  metricsRow.value = {...row}
-  openDialog.value = true
-}
 
 const queryList=()=>{
   listMetrics({objId:props.rowId,tplId:-1}).then(res=>{
@@ -77,7 +49,6 @@ const handleAddMetrics = row =>{
 }
 
 const handleSelect=()=>{
-  metricsType.value = "list"
   openDialog.value = true
   selectMetrics(props.rowId).then(res=>{
     addMetricsList.value = res.rows.map(p=>{

src/views/obj/obj/component/step4.vue

@@ -1,55 +1,62 @@
 <template>
-  <el-table :data="addressData" border style="width: 100%">
-    <el-table-column label="指标类型" width="180">
-      <template #default="scope">
-        {{metrics_category.find(item=>item.value==scope.row.metricsType).label}}
-      </template>
-    </el-table-column>
-    <el-table-column label="普罗米修斯job">
-      <template #default="scope">
-        <el-input v-model="scope.row.apiAddr" />
-      </template>
-    </el-table-column>
-    <el-table-column label="操作" width="100" align="center">
-      <template #default="scope">
-        <el-button link type="primary" icon="CircleCheck" @click="handleSave(scope.row)">保存</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
+  <el-row :gutter="20">
+    <el-col :span="12"> 接口配置已完成: {{ scheduleData.complete }}/{{ scheduleData.total }} </el-col>
+  </el-row>
+  <metrics-list :listData="listData" :edit="false">
+    <template #operation="scope">
+      <el-button link
+                 :type="!scope.row.dataExp ? 'primary' : 'success'"
+                 :icon="!scope.row.dataExp ? 'Edit' : 'CircleCheck'"
+                 @click="handleConfigMetrics(scope.row)">
+        {{!scope.row.dataExp?'未配置' : '已配置'}}
+      </el-button>
+    </template>
+  </metrics-list>
+  <el-dialog title="选择指标" v-model="openDialog" :width="1000" append-to-body style="top:15vh">
+    <metrics-config :metrics="metricsRow"  @cancel="openDialog=false" @success="initData"/>
+  </el-dialog>
 </template>
 <script setup lang="ts">
-import {getDataList,updateData,delData} from "@/api/obj/data"
+import {scheduleObj} from "@/api/obj/obj"
 import {onMounted, ref} from "vue";
+import metricsList from "./metricsList.vue"
+import metricsConfig from  "./metricsConfig.vue"
 const {proxy,emit} = getCurrentInstance()
-const {metrics_category} = proxy.useDict('metrics_category');
 const props = defineProps(['rowId'])
-const addressData = ref([])
-
+import {listMetrics} from '@/api/obj/metrics'
+const listData=ref([])
+const openDialog=ref(false)
+const metricsRow=ref({})
+const scheduleData=ref({})
 onMounted(()=>{
-  dataList()
+  initData()
 })
 
-const handleDelete=(row)=>{
-  delData(row.dataId).then(res=>{
-    proxy.$modal.msgSuccess(res.msg)
-    dataList()
-  })
+const initData=()=>{
+  openDialog.value = false
+  queryList()
+  getScheduleTotal()
 }
 
-const handleSave=(row)=>{
-  updateData(row).then(res=>{
-    proxy.$modal.msgSuccess(res.msg)
+const getScheduleTotal=()=>{
+  scheduleObj(props.rowId).then(res=>{
+    scheduleData.value = res.data
   })
 }
 
-const dataList = () => {
-  getDataList(props.rowId).then(res => {
-    addressData.value =  res.rows
+const handleConfigMetrics=(row)=>{
+  metricsRow.value = {...row}
+  openDialog.value = true
+}
+
+const queryList=()=>{
+  listMetrics({objId:props.rowId,tplId:-1}).then(res=>{
+    listData.value = res.rows
   })
 }
 
 const submitForm=()=>{
-  emit("nextStep", "done")
+  emit("nextStep", 1)
 }
 
 defineExpose({submitForm})

src/views/obj/obj/component/step4_bg.vue

@@ -0,0 +1,59 @@
+<template>
+  <el-table :data="addressData" border style="width: 100%">
+    <el-table-column label="指标类型" width="180">
+      <template #default="scope">
+        {{metrics_category.find(item=>item.value==scope.row.metricsType).label}}
+      </template>
+    </el-table-column>
+    <el-table-column label="普罗米修斯job">
+      <template #default="scope">
+        <el-input v-model="scope.row.apiAddr" />
+      </template>
+    </el-table-column>
+    <el-table-column label="操作" width="100" align="center">
+      <template #default="scope">
+        <el-button link type="primary" icon="CircleCheck" @click="handleSave(scope.row)">保存</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+<script setup lang="ts">
+import {getDataList,updateData,delData} from "@/api/obj/data"
+import {onMounted, ref} from "vue";
+const {proxy,emit} = getCurrentInstance()
+const {metrics_category} = proxy.useDict('metrics_category');
+const props = defineProps(['rowId'])
+const addressData = ref([])
+
+onMounted(()=>{
+  dataList()
+})
+
+const handleDelete=(row)=>{
+  delData(row.dataId).then(res=>{
+    proxy.$modal.msgSuccess(res.msg)
+    dataList()
+  })
+}
+
+const handleSave=(row)=>{
+  updateData(row).then(res=>{
+    proxy.$modal.msgSuccess(res.msg)
+  })
+}
+
+const dataList = () => {
+  getDataList(props.rowId).then(res => {
+    addressData.value =  res.rows
+  })
+}
+
+const submitForm=()=>{
+  emit("nextStep", "done")
+}
+
+defineExpose({submitForm})
+
+</script>
+<style scoped lang="scss">
+</style>