优化

2025-12-15 17:33:20 +08:00
parent 2bc6feb754
commit 8c6329b191
12 changed files with 135 additions and 65 deletions
--- a/ruoyi-ui/src/views/device/api/index.vue
+++ b/ruoyi-ui/src/views/device/api/index.vue
@@ -1,6 +1,16 @@
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="接口类型" prop="endpoint">
+        <el-select v-model="queryParams.endpoint" placeholder="请选择接口类型" clearable>
+          <el-option
+            v-for="dict in dict.type.interface_endpoint"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
      <el-form-item label="请求参数" prop="requestBody">
        <el-input
          v-model="queryParams.requestBody"
@@ -88,10 +98,10 @@
      <el-table-column label="接口名称" align="left" prop="endpoint" />
      <el-table-column label="url路径" align="left" prop="requestUrl" />
      <el-table-column label="请求方式" align="left" prop="requestMethod" />
-      <el-table-column label="请求头信息" align="left" prop="requestHeaders" />
-      <el-table-column label="请求参数" align="left" prop="requestBody" />
+      <el-table-column label="请求头信息" align="left" prop="requestHeaders"/>
+      <el-table-column label="请求参数" align="left" prop="requestBody" :show-overflow-tooltip="true"/>
      <el-table-column label="响应时间" align="left" prop="responseTime" />
-      <el-table-column label="响应主体" align="left" prop="responseBody" />
+      <el-table-column label="响应主体" align="left" prop="responseBody" :show-overflow-tooltip="true"/>
      <el-table-column label="响应状态" align="left" prop="responseStatus" />
      <el-table-column label="错误信息" align="left" prop="errorDetails" />
      <el-table-column label="耗时" align="left" prop="duration" />
@@ -100,7 +110,7 @@
          <dict-tag :options="dict.type.interface_status" :value="scope.row.isSuccessful"/>
        </template>
      </el-table-column>
-      
+
    </el-table>

    <pagination
@@ -168,7 +178,7 @@ import { listApi, getApi, delApi, addApi, updateApi } from "@/api/device/api"

 export default {
  name: "Api",
-  dicts: ['interface_status'],
+  dicts: ['interface_status','interface_endpoint'],
  data() {
    return {
      // 遮罩层
--- a/ruoyi-ui/src/views/job/jobCallBack/index.vue
+++ b/ruoyi-ui/src/views/job/jobCallBack/index.vue
@@ -35,51 +35,55 @@
      </el-form-item>
    </el-form>

-    <!--    <el-row :gutter="10" class="mb8">-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="primary"-->
-    <!--          plain-->
-    <!--          icon="el-icon-plus"-->
-    <!--          size="mini"-->
-    <!--          @click="handleAdd"-->
-    <!--          v-hasPermi="['job:mydoJob:add']"-->
-    <!--        >新增</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="success"-->
-    <!--          plain-->
-    <!--          icon="el-icon-edit"-->
-    <!--          size="mini"-->
-    <!--          :disabled="single"-->
-    <!--          @click="handleUpdate"-->
-    <!--          v-hasPermi="['job:mydoJob:edit']"-->
-    <!--        >修改</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="danger"-->
-    <!--          plain-->
-    <!--          icon="el-icon-delete"-->
-    <!--          size="mini"-->
-    <!--          :disabled="multiple"-->
-    <!--          @click="handleDelete"-->
-    <!--          v-hasPermi="['job:mydoJob:remove']"-->
-    <!--        >删除</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="warning"-->
-    <!--          plain-->
-    <!--          icon="el-icon-download"-->
-    <!--          size="mini"-->
-    <!--          @click="handleExport"-->
-    <!--          v-hasPermi="['job:mydoJob:export']"-->
-    <!--        >导出</el-button>-->
-    <!--      </el-col>-->
-    <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-    <!--    </el-row>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['job:callBack:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['job:callBack:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['job:callBack:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['job:callBack:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>

    <el-table v-loading="loading" :data="jobCallBackList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center"/>
@@ -132,25 +136,29 @@
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="主键" prop="id">
-          <el-input v-model="form.id" placeholder="请输入主键" disabled/>
+          <el-input v-model="form.id" placeholder="请输入主键" style="width: 240px" disabled/>
        </el-form-item>
        <el-form-item label="作业ID" prop="jobId">
-          <el-input v-model="form.mydojobId" placeholder="请输入作业ID"/>
+          <el-input v-model="form.mydojobId" placeholder="请输入作业ID" style="width: 240px"/>
        </el-form-item>
        <el-form-item label="任务号" prop="taskNo">
-          <el-input v-model="form.taskNo" placeholder="请输入任务号"/>
+          <el-input v-model="form.taskNo" placeholder="请输入任务号" style="width: 240px"/>
        </el-form-item>
        <el-form-item label="任务类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入任务类型"/>
+          <el-select v-model="form.type" placeholder="请选择任务类型" style="width: 240px">
+            <el-option v-for="dict in dict.type.job_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
        </el-form-item>
        <el-form-item label="回传状态" prop="status">
-          <el-input v-model="form.status" placeholder="请输入回传状态"/>
+          <el-select v-model="form.status" placeholder="请选择回传状态" style="width: 240px">
+            <el-option v-for="dict in dict.type.call_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
        </el-form-item>
        <el-form-item label="创建时间" prop="createTime">
-          <el-input v-model="form.createTime" placeholder="请输入创建时间"/>
+          <el-date-picker v-model="form.createTime" style="width: 240px" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请输入创建时间"></el-date-picker>
        </el-form-item>
        <el-form-item label="失败次数" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入失败次数"/>
+          <el-input v-model="form.spare1" style="width: 240px" placeholder="请输入失败次数"/>
        </el-form-item>

      </el-form>