zhangzengfei
2021-12-02 1daae83b90e0772a4e8d4e59e4f135af159c9cf3
完善事件推送日志
2个文件已修改
212 ■■■■■ 已修改文件
src/api/log.ts 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/syslog/views/eventPushLog.vue 187 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/log.ts
@@ -1,35 +1,40 @@
import request from "@/scripts/httpRequest";
// /data/api-v//
export const queryOperationLog = (data: any) => {
    return request({
        url: "/data/api-v/log/queryOperationLog",
        method: "post",
        data
    })
}
  });
};
export const getOperations = (query: any) => {
    return request({
        url: "/data/api-v/log/operations",
        method: "get",
    params: query
    })
}
  });
};
export const getModules = (query: any) => {
    return request({
        url: "/data/api-v/log/modules",
        method: "get",
    params: query
    })
}
  });
};
export const queryScheduleLog = (data: any) => {
    return request({
        url: "/data/api-v/log/queryScheduleLog",
        method: "post",
        data
    })
}
  });
};
export const queryDataPushLog = (data: any) => {
  return request({
    url: "/data/api-v/log/ruleServerLog",
    method: "post",
    data
  });
};
src/pages/syslog/views/eventPushLog.vue
@@ -23,29 +23,19 @@
            v-model="fuzzySearch"
            size="small"
            class="input-with-select"
            @keyup.enter.native="getOperationLog(1)"
            @keyup.enter.native="getPushLog(1)"
          >
            <span
              class="icon iconfont icon_clear"
              @click="clearSearch"
              slot="append"
              v-if="fuzzySearch"
            >
            <span class="icon iconfont icon_clear" @click="clearSearch" slot="append" v-if="fuzzySearch">
              &#xe785;
            </span>
            <span
              class="icon iconfont icon_search"
              @click="getOperationLog(1)"
              slot="append"
              v-else
            >
            <span class="icon iconfont icon_search" @click="getPushLog(1)" slot="append" v-else>
              &#xe714;
            </span>
            <!-- <el-button
              slot="append"
              icon="el-icon-search"
              @click="getOperationLog(1)"
              @click="getPushLog(1)"
            ></el-button> -->
          </el-input>
        </div>
@@ -54,19 +44,9 @@
        <div class="bar">
          <div class="name">状态:</div>
          <el-select
            v-model="level"
            placeholder="请选择"
            size="small"
            @change="levelChange"
          >
          <el-select v-model="level" placeholder="请选择" size="small" @change="levelChange">
            <el-option label="全部" :value="''"> </el-option>
            <el-option
              v-for="(item, i) in levelOptions"
              :key="i"
              :label="item.proc_name"
              :value="item.proc_name"
            >
            <el-option v-for="(item, i) in levelOptions" :key="i" :label="item.proc_name" :value="item.proc_name">
            </el-option>
          </el-select>
        </div>
@@ -75,7 +55,6 @@
    <div class="table">
      <el-table
        class="tableBox"
        @cell-click="clickFaults"
        ref="multipleTable"
        :cell-style="styleFunc"
        highlight-current-row
@@ -88,42 +67,20 @@
        <template slot="empty">
          <img :src="png1" class="empty_img" alt="" />
        </template>
        <el-table-column :align="'center'" label="序号" type="index" width="50">
        <el-table-column :align="'center'" label="序号" type="index" width="50"> </el-table-column>
        <el-table-column sortable :align="'center'" prop="name" label="任务名称"></el-table-column>
        <el-table-column :align="'center'" sortable prop="state" label="状态"></el-table-column>
        <el-table-column :align="'center'" sortable prop="lastSendDate" label="最近一次推送时间"></el-table-column>
        <el-table-column :align="'center'" prop="lastSendState" label="最近一次推送状态">
          <template #default="{ row }">
            <span v-show="row.lastSendState != ''" :style="row.lastSendState === 'true' ? 'color:green' : 'color:red'"
              >{{ row.lastSendState === "true" ? "成功" : "失败" }}
            </span>
          </template>
        </el-table-column>
        <el-table-column
          :align="'center'"
          sortable
          prop="add_time"
          label="状态"
        ></el-table-column>
        <el-table-column
          sortable
          :align="'center'"
          prop="userName"
          label="任务名称"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          sortable
          prop="module"
          label="最近一次推送时间"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          prop="procName"
          label="最近一次推送状态"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          sortable
          prop="result"
          label="成功总量"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          prop="msg"
          label="失败总量"
        ></el-table-column>
        <el-table-column :align="'center'" sortable prop="totalSuccess" label="成功总量"></el-table-column>
        <el-table-column :align="'center'" prop="totalFailure" label="失败总量"></el-table-column>
        <!-- <el-table-column :align="'center'" prop="totalCached" label="等待重推"></el-table-column> -->
      </el-table>
      <div class="back" v-if="showSubTable" @click="showSubTable = false">
@@ -144,37 +101,12 @@
        <template slot="empty">
          <img :src="png2" class="empty_img2" alt="" />
        </template>
        <el-table-column :align="'center'" label="序号" type="index" width="50">
        </el-table-column>
        <el-table-column
          :align="'center'"
          sortable
          prop="add_time"
          label="推送时间"
        ></el-table-column>
        <el-table-column
          sortable
          :align="'center'"
          prop="userName"
          label="推送状态"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          sortable
          prop="module"
          label="详细信息"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          prop="procName"
          label="再次推送时间"
        ></el-table-column>
        <el-table-column
          :align="'center'"
          sortable
          prop="result"
          label="再次推送状态"
        ></el-table-column>
        <el-table-column :align="'center'" label="序号" type="index" width="50"> </el-table-column>
        <el-table-column :align="'center'" sortable prop="add_time" label="推送时间"></el-table-column>
        <el-table-column sortable :align="'center'" prop="userName" label="推送状态"></el-table-column>
        <el-table-column :align="'center'" sortable prop="module" label="详细信息"></el-table-column>
        <el-table-column :align="'center'" prop="procName" label="再次推送时间"></el-table-column>
        <el-table-column :align="'center'" sortable prop="result" label="再次推送状态"></el-table-column>
      </el-table>
    </div>
@@ -192,9 +124,8 @@
</template>
<script>
import { deleteDate } from "@/api/system";
import { pad0 } from "@/api/utils";
import { getModules } from "@/api/log";
import { queryDataPushLog } from "@/api/log";
export default {
  data() {
@@ -204,10 +135,7 @@
      loading: false,
      loadingText: "",
      showSubTable: false,
      tableData: [
        { msg: 2, userName: "车辆识别" },
        { userName: "人脸识别", msg: 4 },
      ],
      tableData: [],
      subTableData: [],
      dateArr: ["今日", "近三天", "近七天", "近一个月", "近六个月"],
      levelOptions: [],
@@ -215,16 +143,16 @@
      resultOptions: [
        {
          value: "",
          label: "全部",
          label: "全部"
        },
        {
          value: "成功",
          label: "成功",
          label: "成功"
        },
        {
          value: "失败",
          label: "失败",
        },
          label: "失败"
        }
      ],
      value: "",
      page: 1,
@@ -236,13 +164,12 @@
      timeStart: "",
      timeEnd: "",
      fuzzySearch: "",
      total: 0,
      total: 0
    };
  },
  mounted() {
    this.getTimeRange(24 * 60 * 60 * 1000);
    // this.getOperationLog();
    this.getOptions();
    this.getPushLog();
  },
  methods: {
    styleFunc({ row, column, rowIndex, columnIndex }) {
@@ -253,26 +180,20 @@
    },
    handleSizeChange(val) {
      this.pageSize = val;
      // this.getOperationLog();
      // this.getPushLog();
    },
    handleCurrentChange(val) {
      this.page = val;
      // this.getOperationLog();
      // this.getPushLog();
    },
    levelChange(val) {
      // this.getOperationLog(1);
      // this.getPushLog(1);
      // this.hostName = "";
      // getOperations({
      //   module: this.level,
      // }).then((res) => {
      //   this.hostNameOptions = res.data;
      // });
    },
    getOptions() {
      getModules().then((res) => {
        this.levelOptions = res.data;
        this.png1 = require("../../../../public/images/syslog/没数据.png");
      });
    },
    clickFaults(row, column, cell, event) {
      this.showSubTable = true;
@@ -297,26 +218,26 @@
        default:
          break;
      }
      // this.getOperationLog(1);
      // this.getPushLog(1);
      this.activeDateChoise = i;
    },
    getOperationLog(typ) {
    getPushLog(typ) {
      if (typ == 1) {
        this.page = 1;
      }
      // queryOperationLog({
      //   timeStart: this.timeStart,
      //   timeEnd: this.timeEnd,
      //   page: this.page,
      //   pageSize: this.pageSize,
      //   module: this.level,
      //   function: this.hostName,
      //   result: this.result,
      //   fuzzySearch: this.fuzzySearch,
      // }).then((res) => {
      //   this.tableData = res.data.logs;
      //   this.total = res.data.total;
      // });
      queryDataPushLog({
        timeStart: this.timeStart,
        timeEnd: this.timeEnd,
        page: this.page,
        pageSize: this.pageSize,
        state: this.level,
        function: this.hostName,
        result: this.result,
        fuzzySearch: this.fuzzySearch
      }).then((res) => {
        this.tableData = res.data.logs;
        this.total = res.data.total;
      });
    },
    getTimeStr(date) {
      var month = pad0(date.getMonth() + 1); //月
@@ -334,9 +255,9 @@
    },
    clearSearch() {
      this.fuzzySearch = "";
      this.getOperationLog(1);
    },
  },
      this.getPushLog(1);
    }
  }
};
</script>
<style lang="scss">