日志管理页面接口添加

sgzb-ui/src/api/inventoryLogs/index.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+
+/* 日志列表 */
 export const getLogsListApi = (data) => {
-    return request.post('/login', data)
+    return request.get('/bm_num_logs/list', data)
+}
+
+/* 日志详情 */
+export const getLogsDetailsApi = (id) => {
+    return request.get(`/bm_num_logs/selectByPrimaryKey/${id}`)
 }

sgzb-ui/src/views/base/unit/index.vue

@@ -117,14 +117,6 @@
       @pagination="getList"
     />
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog
       :title="title"

sgzb-ui/src/views/inventoryLogs/index.vue

@@ -2,12 +2,7 @@
   <!-- 库存日志 -->
   <div class="app-container">
     <el-row>
-            <el-form
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-                :model="queryParams"
-                ref="queryForm"
-                size="small"
-                :inline="true"
-            >
         <el-form-item label="模块名称" prop="userName">
           <el-input
             placeholder="请输入模块名称"
@@ -51,10 +46,7 @@
             @click="handleQuery"
             >搜索</el-button
           >
-                    <el-button
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                        icon="el-icon-refresh"
-                        size="mini"
-                        @click="resetQuery"
             >重置</el-button
           >
         </el-form-item>
@@ -62,27 +54,28 @@
     </el-row>
 
     <el-table :data="tableList" border>
-            <el-table-column
+      <el-table-column align="center" label="序号" type="index" width="60" />
-                align="center"
+      <el-table-column align="center" prop="modelTitle" label="模块名称" />
-                label="序号"
+      <el-table-column align="center" prop="method" label="请求方式" />
-                type="index"
+      <el-table-column align="center" prop="task" label="实例" />
-                width="60"
+      <el-table-column align="center" prop="id" label="机具名称" />
-            />
+      <el-table-column align="center" prop="typeId" label="机具规格" />
-            <el-table-column align="center" prop="title" label="模块名称" />
+      <el-table-column align="center" prop="description" label="描述" />
-            <el-table-column align="center" prop="title" label="请求方式" />
+      <el-table-column align="center" prop="time" label="日期" />
-            <el-table-column align="center" prop="title" label="实例" />
+      <el-table-column align="center" label="状态">
-            <el-table-column align="center" prop="v_name" label="机具名称" />
+        <template slot-scope="{ row }">
-            <el-table-column align="center" prop="title" label="机具规格" />
+          <el-tag size="mini" type="success" v-if="row.status == 0"
-            <el-table-column align="center" prop="title" label="描述" />
+            >正常</el-tag
-            <el-table-column align="center" prop="title" label="响应内容" />
+          >
-            <el-table-column align="center" prop="title" label="请求时间" />
+          <el-tag size="mini" type="warning" v-else>异常</el-tag>
-            <el-table-column align="center" prop="title1" label="创建人" />
+        </template>
-            <el-table-column align="center" prop="title" label="备注" />
+      </el-table-column>
+      <el-table-column align="center" prop="creator" label="创建人" />
+      <el-table-column align="center" prop="remark" label="备注" />
       <el-table-column align="center" label="操作">
         <template slot-scope="{ row }">
-                    <el-button size="mini" type="text">查询</el-button>
+          <el-button size="mini" type="text" @click="previewLogsDetails(row.id)"
-                    <el-button size="mini" type="text" style="color: #f56c6c"
+            >详情</el-button
-                        >删除</el-button
           >
         </template>
       </el-table-column>
@@ -95,57 +88,108 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <!-- 详情弹框 -->
+    <el-dialog
+      title="日志详情"
+      :visible.sync="logsDetailsDialogVisible"
+      width="60%"
+    >
+      <el-descriptions
+        class="margin-top"
+        :column="3"
+        size="medium"
+        border
+        :labelStyle="commonStyle"
+        :contentStyle="commonStyle"
+      >
+        <el-descriptions-item v-for="(item, v) in detailsLabelList" :key="v">
+          <template slot="label"> {{ item.label }} </template>
+          {{ logsDetailsInfoDemo[item.content] || "" }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-    import { getLogsListApi } from '@/api/inventoryLogs'
+import { getLogsListApi, getLogsDetailsApi } from "@/api/inventoryLogs";
 export default {
-        name: 'myInventoryLogs',
+  name: "myInventoryLogs",
   data() {
     return {
-                tableList: [
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                ],
-                total: 5,
       queryParams: {
         pageNum: 5,
         pageSize: 1,
       },
-            }
+      tableList: [{ id: 1 }, { id: 2 }],
+      total: 5,
+      logsDetailsInfo: null /* 日志详情 */,
+      logsDetailsDialogVisible: false,
+      commonStyle: {
+        "text-align": "center",
+      },
+      /* 日志详情label以及内容 */
+      detailsLabelList: [
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+      ],
+      logsDetailsInfoDemo: {
+        vdDemo: "123",
+      },
+    };
   },
   methods: {
     /* 查询列表 */
     async getList() {
-                const res = await getLogsListApi(this.queryParams)
+      const { data: res } = await getLogsListApi();
-                console.log(res, '日志列表')
+      this.tableList = res.rows;
+      this.total = res.total;
+      console.log(res, "=======日志列表");
     },
-            /* 搜索按钮操作 */
+    /* 搜索按钮 */
     handleQuery() {
-                this.getList()
+      this.getList();
     },
-            /* 重置按钮操作 */
+    /* 重置按钮 */
     resetQuery() {
-                this.resetForm('queryForm')
+      this.resetForm("queryForm");
-                this.getList()
+      this.getList();
+    },
+    /* 查看详情 */
+    async previewLogsDetails(id) {
+      // const { data: res } = await getLogsDetailsApi(id)
+      // console.log(res, '=======日志详情')
+
+      this.logsDetailsDialogVisible = true;
+      // this.logsDetailsInfo = res
     },
   },
   created() {
-            this.getList()
+    this.getList();
   },
-    }
+};
 </script>
 
 <style scoped>
 .el-table :empty::before {
-        content: '-';
+  content: "-";
   color: gray;
 }
+.margin-top {
+  margin-top: -15px;
+}
 </style>