//细节调整

fdapfe-admin/src/main/java/com/cn/fdapfe/biz/domain/Formulas.java

@@ -50,7 +50,6 @@ public class Formulas extends BasePO
     @Excel(name = "所属指标")
     @TableField(value ="formula_indicator")
     private String formulaIndicator;
-
-
-
+    @TableField(exist = false)
+    private String indicatorName;
 }

fdapfe-admin/src/main/resources/mapper/eval/FormulasMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="formulaStoredProcedure"    column="formula_stored_procedure"    />
         <result property="originalFormula"    column="original_formula"    />
         <result property="formulaIndicator"    column="formula_indicator"    />
+        <result property="indicatorName"    column="indicator_name"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -24,5 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getoptions" resultType="com.cn.fdapfe.biz.domain.Formulas">
         SELECT t.formula_id,t.formula_name FROM biz_formula_t t
     </select>
-
+    <select id="selectList" resultMap="FormulasResult">
+        select  t.*,b.name AS indicator_name  from biz_formula_t t LEFT JOIN biz_evaluation_indicator b on t.formula_indicator= b.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

fdapfe-ui/src/views/eval/formulas/index.vue

@@ -75,10 +75,10 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公式名称" align="center" prop="formulaName" />
       <el-table-column label="公式简称" align="center" prop="formulaShortName" />
-      <el-table-column label="所属指标" align="center" prop="formulaIndicator" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.biz_perf_eval_type" :value="scope.row.formulaIndicator" />
-        </template>
+      <el-table-column label="所属指标" align="center" prop="indicatorName" >
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.biz_perf_eval_type" :value="scope.row.indicatorName" />-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column label="原始公式" align="center" prop="originalFormula" />
       <el-table-column label="说明" align="center" prop="remark" >

fdapfe-ui/src/views/workflow/workflow/index.vue

@@ -148,6 +148,15 @@
           >
             运行
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-share"
+            @click="handleQUeryInfo(scope.row)"
+            v-hasPermi="['workflow:workflow:remove']"
+          >
+            查看
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -179,20 +188,6 @@
       @close="handleDialogClose"
     >
       <el-form :model="verifyRow" label-width="80px">
-<!--        <el-form-item v-if="!returnDataShow" label="所属指标" prop="verifyData">-->
-<!--          <el-select-->
-<!--            v-model="verifyRow.verifyData"-->
-<!--            placeholder="请选择所属指标"-->
-<!--            style="width: 100%"-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.biz_perf_eval_type"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
         <el-form-item label="验证结果" >
           <template>
             <el-row :gutter="5" class="mb-4">
@@ -216,6 +211,48 @@
       :options="options"
       @callback="getList"
     />
+    <!-- 比对结果对话框 -->
+    <el-dialog
+      title="任务信息看板"
+      :visible.sync="compareDialogVisible"
+      width="800px"
+      :before-close="handleCompareDialogClose"
+    >
+      <el-descriptions label-style="width: 150px;background-color: #0A0E27;color:#FFF;" contentStyle="color:#FFF;background-color: #0A0E27" label-class-name="margin-top" :column="1"  border>
+        <el-descriptions-item label="任务名称">
+          {{compareResult.workName}}
+        </el-descriptions-item>
+        <el-descriptions-item label="诊断算法">
+          {{compareResult.diagModelName}}
+        </el-descriptions-item>
+        <el-descriptions-item label="物理模型">
+          {{compareResult.modelName}}
+        </el-descriptions-item>
+        <el-descriptions-item label="模型类型">
+          <dict-tag :options="dict.type.biz_model_type" :value="compareResult.modelType" />
+        </el-descriptions-item>
+        <el-descriptions-item  label="模型种类">
+          <dict-tag :options="dict.type.model_tepe_t" :value="compareResult.modelTypet" />
+        </el-descriptions-item>
+        <el-descriptions-item label="开始时间" >
+          {{compareResult.startTime}}
+        </el-descriptions-item>
+        <el-descriptions-item label="结束时间" >
+          {{compareResult.endTime}}
+        </el-descriptions-item>
+        <el-descriptions-item label="文本内容" >
+         {{compareResult.returnData}}
+        </el-descriptions-item>
+        <el-descriptions-item label="说明" >
+          {{compareResult.remark}}
+        </el-descriptions-item>
+      </el-descriptions>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCompareDialogClose">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -227,10 +264,12 @@ import {
 } from "@/api/workflow/workflow";
 import { listFormulas } from "@/api/eval/formulas";
 import WorkflowForm from "./form.vue";
+import infoData from '@/views/form.vue'
 
 export default {
   name: "Workflow",
   components: {
+    infoData,
     WorkflowForm,
   },
   dicts: [
@@ -242,6 +281,8 @@ export default {
   ],
   data() {
     return {
+      compareResult:{},
+      compareDialogVisible:false,
       options:'add',
       loading: true,
       ids: [], // 选中项 ID 数组
@@ -294,7 +335,15 @@ export default {
         this.verifyOptions = response.rows;
       });
     },
-
+    handleQUeryInfo(data){
+      // 保存比对结果并显示对话框
+      console.log('保存比对结果并显示对话框',data)
+      this.compareResult = data
+      this.compareDialogVisible = true
+    },
+    handleCompareDialogClose() {
+      this.compareDialogVisible = false
+    },
     // 表单重置
     reset() {
       this.currentRow = {};
@@ -466,8 +515,15 @@ export default {
 .el-table th {
   background-color: #f5f7fa;
 }
-
 .el-table td {
   padding: 8px 0;
 }
+.margin-top{
+  color: #FFFFFF;
+  background-color: #0A0E27!important;
+}
+.el-descriptions__table .is-bordered .el-descriptions--medium{
+  color: #FFFFFF;
+  background-color: #0A0E27!important;
+}
 </style>