王旭
2022-10-11 045050594dca9a2f52058f055a42ea543bb8b912
登录操作资源日志条件搜索接口对接
已修改5个文件
414 ■■■■■ 文件已修改
src/assets/lang/en.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/zh.js 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/eventlogManage.vue 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/logLog.vue 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/operationLog.vue 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/en.js
@@ -242,7 +242,9 @@
      queryRegion: 'QueryRegion',
      resourceName: 'resourceName',
      operationType: 'operationType',
      operatingTime: 'operatingTime',
      startTime: 'start time',
      endTime: 'end time',
      operatingTime:"Operating Time",
      inquire: 'inquire',
      empty: 'empty',
      num: 'num',
@@ -254,10 +256,19 @@
      optionDate: 'optionDate',
      selectTime: 'selectTime',
      operationModule: 'operation ndule',
      operationModule1: 'Primary module',
      operationModule2: 'Secondary module',
      url: 'url',
      className: 'class name',
      category: 'category',
      bak: 'bak',
      check: 'check',
      added: 'added',
      modification: 'modification',
      delete: 'delete',
      uploading: 'uploading',
      download: 'download',
      otherOne: 'other one',
    },
  },
  synthesis: {
@@ -329,6 +340,9 @@
    username: 'Username',
    applicationProgram: 'Application Program',
    describe: 'Describe',
    login: 'login',
    checkout: 'checkout',
    logout: 'log out',
  },
  themaic: {
    name: 'Themaic Map',
src/assets/lang/zh.js
@@ -242,7 +242,9 @@
      queryRegion: '查询区',
      resourceName: '资源名称',
      operationType: '操作类型',
      operatingTime: '操作时间',
      operatingTime:"操作时间",
      startTime: '开始时间',
      endTime: '结束时间',
      inquire: '查询',
      empty: '清空',
      num: '序号',
@@ -251,13 +253,21 @@
      IP: ' IP',
      pleaseInput: '请输入',
      pleaseSelect: '请选择',
      optionDate: '选择日期',
      optionDate: '选择日期和时间',
      selectTime: '选择时间',
      operationModule: '操作模块',
      operationModule1: '一级模块',
      operationModule2: '二级模块',
      url: '操作网址',
      className: '类名',
      category: '类别',
      bak: '备注',
      check: '查看',
      added: '新增',
      modification: '修改',
      delete: '删除',
      uploading: '上传',
      download: '下载',
      otherOne: '其它',
    },
  },
  synthesis: {
@@ -329,6 +339,9 @@
    username: '用户名',
    applicationProgram: '应用程序',
    describe: '描述',
    login: '登录',
    checkout: '校验',
    logout: '登出',
  },
  themaic: {
src/views/maintenance/eventlogManage.vue
@@ -8,68 +8,88 @@
    ></My-bread>
    <el-divider />
    <div class="inquire">
      <el-form ref="ruleForm" :model="form" :inline="true">
        <el-form-item :label="$t('operatManage.ELM.username')" prop="username">
      <el-form ref="formData2" :model="form" :inline="true">
        <el-form-item
          :label="$t('operatManage.operationLogObj.username')"
          prop="uname"
        >
          <el-input
            v-model="form.username"
            :placeholder="$t('operatManage.ELM.usernameInfo')"
            v-model="form.uname"
            :placeholder="$t('operatManage.operationLogObj.pleaseInput')"
          />
        </el-form-item>
        <el-form-item
          :label="$t('operatManage.ELM.ownedSystem')"
          prop="ownedSystem"
          :label="$t('operatManage.operationLogObj.operationType')"
          prop="type"
        >
          <el-select
            v-model="form.ownedSystem"
            :placeholder="$t('operatManage.ELM.please')"
            clearable
            v-model="form.type"
            :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
          >
            <el-option :label="$t('operatManage.ELM.all')" value="all" />
            <el-option :label="$t('operatManage.ELM.one')" value="one" />
            <el-option
              :label="$t('operatManage.operationLogObj.check')"
              value="1"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.added')"
              value="2"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.modification')"
              value="3"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.delete')"
              value="4"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.uploading')"
              value="5"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.download')"
              value="6"
            />
          </el-select>
        </el-form-item>
        <el-form-item
          :label="$t('operatManage.ELM.operationType')"
          prop="operationType"
          prop="start"
          :label="$t('operatManage.operationLogObj.startTime')"
        >
          <el-select
            v-model="form.operationType"
            :placeholder="$t('operatManage.ELM.please')"
          >
            <el-option :label="$t('operatManage.ELM.all')" value="all" />
            <el-option :label="$t('operatManage.ELM.add')" value="add" />
            <el-option :label="$t('operatManage.ELM.delete')" value="delete" />
            <el-option :label="$t('operatManage.ELM.edit')" value="edit" />
            <el-option :label="$t('operatManage.ELM.query')" value="query" />
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('operatManage.ELM.date')" prop="date">
          <el-date-picker
            v-model="form.date"
            type="daterange"
            align="right"
            unlink-panels
            :range-separator="$t('operatManage.ELM.to')"
            :start-placeholder="$t('operatManage.ELM.startDate')"
            :end-placeholder="$t('operatManage.ELM.endDate')"
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            v-model="form.start"
            style="width: 100%"
            type="datetime"
            :placeholder="$t('operatManage.operationLogObj.optionDate')"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item :label="$t('operatManage.ELM.ip')" prop="requestIp">
          <el-input v-model="form.requestIp" placeholder="请输入" />
        <el-form-item
          prop="end"
          :label="$t('operatManage.operationLogObj.endTime')"
        >
          <el-date-picker
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            v-model="form.end"
            style="width: 100%"
            type="datetime"
            :placeholder="$t('operatManage.operationLogObj.optionDate')"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button @click="onSubmit"
            ><i class="el-icon-search"></i> &nbsp;{{
              $t("operatManage.ELM.search")
            }}</el-button
          >
        </el-form-item>
        <el-form-item>
          <el-button @click="resetForm('ruleForm')"
            ><i class="el-icon-delete"></i>&nbsp;{{
              $t("operatManage.ELM.reset")
            }}</el-button
          >
          <el-button @click="onSubmit" icon="el-icon-search">{{
            $t("operatManage.operationLogObj.inquire")
          }}</el-button>
          <el-button @click="onEmpty('formData2')" icon="el-icon-delete">{{
            $t("operatManage.operationLogObj.empty")
          }}</el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -83,7 +103,7 @@
        />
        <el-table-column
          align="center"
          prop="userid"
          prop="uname"
          :label="$t('operatManage.ELM.username')"
        />
        <el-table-column
@@ -91,7 +111,7 @@
          prop="ip"
          :label="$t('operatManage.ELM.ip')"
        />
        <el-table-column
          align="center"
          prop="resid"
@@ -104,7 +124,7 @@
          :label="$t('operatManage.ELM.date')"
        />
        <el-table-column
         :formatter="formatType"
          :formatter="formatType"
          align="center"
          prop="type"
          :label="$t('operatManage.ELM.operationType')"
@@ -138,13 +158,7 @@
  data() {
    return {
      currentPage: 1,
      form: {
        username: "",
        ownedSystem: "",
        requestIp: "",
        operationType: "",
        date: "",
      },
      form: {},
      tableData: [],
      listData: {
        pageIndex: 1,
@@ -154,7 +168,7 @@
    };
  },
  methods: {
      //格式化时间
    //格式化时间
    add0(m) {
      return m < 10 ? "0" + m : m;
    },
@@ -223,7 +237,15 @@
      this.getList();
    },
    onSubmit() {
      console.log("submit!");
      this.listData = { ...this.listData, ...this.form };
      //  console.log(this.listData)
      this.getList();
    },
    onEmpty(formData1) {
      this.$refs[formData1].resetFields(); //重置表单数据
      // this.form = {}
      this.form.start = null;
      this.form.end = null;
    },
    resetForm(formName) {
      this.$refs[formName].resetFields();
src/views/maintenance/logLog.vue
@@ -12,46 +12,74 @@
        {{ $t("operatManage.operationLogObj.queryRegion") }}
      </div>
      <el-form ref="formData1" :model="form" :inline="true">
        <!-- 用户名 -->
        <el-form-item :label="$t('common.username')" prop="name">
        <el-form-item
          :label="$t('operatManage.operationLogObj.username')"
          prop="uname"
        >
          <el-input
            style="width: 300px"
            v-model="form.name"
            :placeholder="$t('common.pleaseInput')"
            v-model="form.uname"
            :placeholder="$t('operatManage.operationLogObj.pleaseInput')"
          />
        </el-form-item>
        <!-- 所属系统 -->
        <el-form-item :label="$t('loglog.systematic')" prop="region">
          <el-select v-model="form.region" :placeholder="$t('common.choose')">
            <el-option label="Zone one" value="shanghai" />
            <el-option label="Zone two" value="beijing" />
        <el-form-item
          :label="$t('operatManage.operationLogObj.operationType')"
          prop="type"
        >
          <el-select
            clearable
            v-model="form.type"
            :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
          >
            <el-option
              :label="$t('loglog.login')"
              value="1"
            />
            <el-option
              :label="$t('loglog.checkout')"
              value="2"
            />
            <el-option
              :label="$t('loglog.logout')"
              value="3"
            />
          </el-select>
        </el-form-item>
        <!-- 操作时间 -->
        <el-form-item :label="$t('loglog.operationtime')">
          <el-col :span="11">
            <el-date-picker
              type="date"
              :placeholder="$t('common.selectdate')"
              v-model="form.date1"
              style="width: 100%"
            ></el-date-picker>
          </el-col>
          <el-col class="line text-center" :span="2">-</el-col>
          <el-col :span="11">
            <el-date-picker
              type="date"
              :placeholder="$t('common.selectdate')"
              v-model="form.date2"
              style="width: 100%"
            ></el-date-picker>
          </el-col>
        <el-form-item
          prop="start"
          :label="$t('operatManage.operationLogObj.startTime')"
        >
          <el-date-picker
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            v-model="form.start"
            style="width: 100%"
            type="datetime"
            :placeholder="$t('operatManage.operationLogObj.optionDate')"
          >
          </el-date-picker>
        </el-form-item>
        <!-- 查询 清空 -->
        <el-form-item
          prop="end"
          :label="$t('operatManage.operationLogObj.endTime')"
        >
          <el-date-picker
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            v-model="form.end"
            style="width: 100%"
            type="datetime"
            :placeholder="$t('operatManage.operationLogObj.optionDate')"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button @click="onSubmit">{{ $t("common.iquery") }}</el-button>
          <el-button @click="onEmpty('formData1')">{{
            $t("common.empty")
          <el-button @click="onSubmit" icon="el-icon-search">{{
            $t("operatManage.operationLogObj.inquire")
          }}</el-button>
          <el-button @click="onEmpty('formData1')" icon="el-icon-delete">{{
            $t("operatManage.operationLogObj.empty")
          }}</el-button>
        </el-form-item>
      </el-form>
@@ -64,7 +92,7 @@
          type="index"
          :label="$t('loglog.serialnumber')"
        />
        <el-table-column prop="userid" :label="$t('loglog.username')" />
        <el-table-column prop="uname" :label="$t('loglog.username')" />
        <el-table-column
          prop="appid"
          :label="$t('loglog.applicationProgram')"
@@ -118,9 +146,7 @@
    return {
      currentPage4: 1,
      form: {
        name: "",
        region: "",
        jurisdiction: "",
      },
      tableData: [],
      listData: {
@@ -212,16 +238,21 @@
      this.getList();
    },
    onSubmit() {
      console.log("submit!");
      this.listData = { ...this.listData, ...this.form };
      //  console.log(this.listData)
      this.getList();
    },
    onEmpty(formData1) {
      this.$refs[formData1].resetFields(); //重置表单数据
      // this.form = {};
      this.form.start =null
      this.form.end =null
    },
    async getList() {
      const data = await loginSelectByPageAndCount(this.listData);
      if (data.code != 200) {
       return this.$message.error("列表调用失败");
        return this.$message.error("列表调用失败");
      }
      this.tableData = data.result;
      this.count = data.count;
src/views/maintenance/operationLog.vue
@@ -11,62 +11,96 @@
      <div class="herder_box">
        {{ $t("operatManage.operationLogObj.queryRegion") }}
      </div>
      <el-form ref="formData1" :model="form" :inline="true">
      <el-form ref="formData3" :model="form" :inline="true">
        <el-form-item
          :label="$t('operatManage.operationLogObj.resourceName')"
          prop="name"
          :label="$t('operatManage.operationLogObj.username')"
          prop="uname"
        >
          <el-input
            v-model="form.name"
            v-model="form.uname"
            :placeholder="$t('operatManage.operationLogObj.pleaseInput')"
          />
        </el-form-item>
        <el-form-item
          :label="$t('operatManage.operationLogObj.operationType')"
          prop="region"
          prop="type"
        >
          <el-select
            v-model="form.region"
            clearable
            v-model="form.type"
            :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
          >
            <el-option label="全部" value="shanghai" />
            <el-option label="浏览" value="beijing" />
            <el-option label="下载" value="shanghai" />
            <el-option label="调用" value="beijing" />
            <el-option label="收藏" value="shanghai" />
            <el-option
              :label="$t('operatManage.operationLogObj.check')"
              value="1"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.added')"
              value="2"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.modification')"
              value="3"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.delete')"
              value="4"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.uploading')"
              value="5"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.download')"
              value="6"
            />
            <el-option
              :label="$t('operatManage.operationLogObj.otherOne')"
              value="0"
            />
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('operatManage.operationLogObj.operatingTime')">
          <el-col :span="11">
            <el-date-picker
              type="date"
              :placeholder="$t('operatManage.operationLogObj.optionDate')"
              v-model="form.date1"
              style="width: 100%"
            ></el-date-picker>
          </el-col>
          <el-col class="line text-center" :span="2">-</el-col>
          <el-col :span="11">
            <el-time-picker
              :placeholder="$t('operatManage.operationLogObj.selectTime')"
              v-model="form.date2"
              style="width: 100%"
            ></el-time-picker>
          </el-col>
        <el-form-item
          prop="start"
          :label="$t('operatManage.operationLogObj.startTime')"
        >
          <el-date-picker
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            v-model="form.start"
            style="width: 100%"
            type="datetime"
            :placeholder="$t('operatManage.operationLogObj.optionDate')"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item
          prop="end"
          :label="$t('operatManage.operationLogObj.endTime')"
        >
          <el-date-picker
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            v-model="form.end"
            style="width: 100%"
            type="datetime"
            :placeholder="$t('operatManage.operationLogObj.optionDate')"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button @click="onSubmit" icon="el-icon-search">{{
            $t("operatManage.operationLogObj.inquire")
          }}</el-button>
          <el-button icon="el-icon-delete">{{
          <el-button @click="onEmpty('formData3')" icon="el-icon-delete">{{
            $t("operatManage.operationLogObj.empty")
          }}</el-button>
        </el-form-item>
      </el-form>
    </div>
    <div class="table_box">
      <el-table :data="tableData" stripe style="width: 100%">
      <el-table :data="tableData" stripe style="width: 100%" height="550">
        <!-- <el-table-column type="selection" width="55" /> -->
        <el-table-column
          :label="$t('operatManage.operationLogObj.num')"
@@ -76,31 +110,30 @@
        </el-table-column>
        <!-- <el-table-column prop="Accessnumber" label="访问编号" /> -->
        <el-table-column
          align="center"
          prop="modular"
          :label="$t('operatManage.operationLogObj.operationModule')"
          prop="modular1"
          :label="$t('operatManage.operationLogObj.operationModule1')"
        />
        <el-table-column
          align="center"
          prop="modular2"
          :label="$t('operatManage.operationLogObj.operationModule2')"
        />
        <el-table-column
          prop="url"
          :label="$t('operatManage.operationLogObj.url')"
        />
        <!-- <el-table-column prop="loginaddress" label="登录地点" /> -->
        <el-table-column
          align="center"
          prop="clazz"
          :label="$t('operatManage.operationLogObj.className')"
        />
        <el-table-column
          align="center"
          :formatter="formatType"
          prop="type"
          :label="$t('operatManage.operationLogObj.operationType')"
        />
        <el-table-column
          align="center"
          prop="userid"
          prop="uname"
          :label="$t('operatManage.operationLogObj.username')"
        />
        <el-table-column
@@ -109,13 +142,11 @@
        />
        <el-table-column
          align="center"
          prop="optime"
          :formatter="formatData"
          :label="$t('operatManage.operationLogObj.operatingTime')"
        />
        <el-table-column
          align="center"
          prop="bak"
          :label="$t('operatManage.operationLogObj.bak')"
        />
@@ -155,11 +186,7 @@
  data() {
    return {
      currentPage4: 1,
      form: {
        name: "",
        region: "",
        jurisdiction: "",
      },
      form: {},
      tableData: [],
      listData: {
        pageIndex: 1,
@@ -237,12 +264,20 @@
      this.listData.pageIndex = val;
      this.getList();
    },
    onEmpty(formData1) {
      this.$refs[formData1].resetFields(); //重置表单数据
      // this.form = {}
      this.form.start =null
      this.form.end =null
    },
    onSubmit() {
      console.log("submit!");
      this.listData = { ...this.listData, ...this.form };
      //  console.log(this.listData)
      this.getList();
    },
    async getList() {
      const data = await operateSelectByPageAndCount(this.listData);
      console.log(data);
      if (data.code != 200) {
        return this.$message.error("列表调用失败");
      }
@@ -263,6 +298,7 @@
  height: 100%;
  padding: 10px;
  box-sizing: border-box;
  .inquire {
    padding: 10px;
    margin-top: 20px;
@@ -282,6 +318,8 @@
    background: #fff;
    border-radius: 5px;
    border: 1px solid rgb(202, 201, 204);
    overflow: auto;
    height: 70%;
  }
  .text-center {
    text-align: center;