123

ruoyi-ui/src/views/service/info/fabu.vue

@@ -230,7 +230,7 @@ import {getCatalog} from "@/api/service/catalog";
 import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
 import { reactive } from 'vue'
 import { changeSerShenhe } from "@/api/register/regCom";
-import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,publishModel } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,publishModel,testLog } from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
 import { getUserProfile } from "@/api/system/user";
 import JsonViewer from 'vue-json-viewer'

ruoyi-ui/src/views/service/info/shenhe.vue

@@ -317,7 +317,7 @@
           <div style="margin-top:0%;font-size: 18px;">
             {{titleShen}}
           </div>
-          <el-table 
+          <!-- <el-table 
           style="margin-top: 2%;width: 98%;min-height: 400px;height: 40vh;"
           :data="tableDataLog" 
           :cell-style="{ textAlign: 'center',padding:'2px 0' }"
@@ -343,7 +343,46 @@
               </el-table-column>
               <el-table-column prop="remark" label="审核备注" show-overflow-tooltip>
               </el-table-column>
-          </el-table>
+          </el-table> -->
+          <el-table 
+            style="margin-top: 2%;width: 98%;height: 40vh;"
+            :data="tableDataLog" 
+            :cell-style="{ textAlign: 'center',padding:'3px 0' }"
+            :header-cell-style="{ textAlign: 'center'}"
+            :row-style="{ height: heightAll*0.01+'px',fontSize: '16px',textAlign:'center'  }"
+            border >
+                <el-table-column prop="createBy" label="测试发起人">
+                </el-table-column>
+                <el-table-column prop="runTm" label="测试时间">
+                </el-table-column>
+                <el-table-column prop="execTm" label="测试耗时" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="returnData" label="测试返回结果" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="audit" label="测试状态" width="100">
+                  <template #default="scope">
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.senState==1">
+                      已测试
+                    </div>
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.senState==0">
+                      测试失败
+                    </div>
+                    <div style="text-align: center;display: flex;color:#E6A23C" v-if="scope.row.senState==null">
+                      未测试
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="errorMessage" label="错误信息" show-overflow-tooltip>
+                  <template #default="scope">
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.errorMessage!==null">
+                      {{scope.row.errorMessage}}
+                    </div>
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.errorMessage==null">
+                      /
+                    </div>
+                  </template>
+                </el-table-column>
+            </el-table>
           <template #footer>
               <span class="dialog-footer">
                 <el-button type="primary" size="mini" @click="dialogVisibleLevel = false">确定</el-button>
@@ -358,7 +397,7 @@ import {getCatalog} from "@/api/service/catalog";
 import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
 import { reactive } from 'vue'
 import { changeSerShenhe } from "@/api/register/regCom";
-import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,testLog } from "@/api/service/info";
 import { ref, onMounted } from 'vue';
 import { getUserProfile } from "@/api/system/user";
 import JsonViewer from 'vue-json-viewer'
@@ -582,11 +621,10 @@ const parShenhe = ref({})
 function showLog(row){
   dialogVisibleLevel.value = true
   var par = {
-    proId:row.srvId,
-    proType:'AUDIT'
+    serId:row.srvId
   }
-  shenheLog(par).then(res=>{
-    tableDataLog.value = res.data
+  testLog(par).then(res=>{
+    tableDataLog.value = res.rows
   })
 }
 function showShen(){

ruoyi-ui/src/views/service/info/test.vue

@@ -240,7 +240,7 @@
           <el-table 
             style="margin-top: 2%;width: 98%;height: 40vh;"
             :data="tableDataLog" 
-            :cell-style="{ textAlign: 'center',padding:'2px 0' }"
+            :cell-style="{ textAlign: 'center',padding:'3px 0' }"
             :header-cell-style="{ textAlign: 'center'}"
             :row-style="{ height: heightAll*0.01+'px',fontSize: '16px',textAlign:'center'  }"
             border >