Merge pull request '修改bug' (#32) from projects/mescc/zjl into projects/mescc/develop

Reviewed-on: #32

src/views/system/operatelog/index.vue

@@ -106,6 +106,8 @@
 import { listOperateLog, exportOperateLog } from "@/api/system/operatelog";
 import tableHeightMixin from "@/mixins/tableHeightMixin";
 import statusBtn3 from "./../components/statusBtn3.vue";
+import { DICT_TYPE, publicFormatter } from "@/utils/dict";
+import { parseTime } from "@/utils/ruoyi";
 const tableProps = [
   {
     prop: "id",
@@ -123,9 +125,16 @@ const tableProps = [
     minWidth: 200,
     showOverflowtooltip: true,
   },
+  {
+    prop: "type",
+    label: "操作类型",
+    minWidth: 80,
+    filter: publicFormatter(DICT_TYPE.SYSTEM_OPERATE_TYPE),
+    showOverflowtooltip: true,
+  },
   {
     prop: "userNickname",
-    label: "操作人",
+    label: "操作人员",
     minWidth: 80,
     showOverflowtooltip: true,
   },
@@ -134,6 +143,13 @@ const tableProps = [
     label: "操作结果",
     subcomponent: statusBtn3,
   },
+  {
+    prop: "startTime",
+    label: "操作时间",
+    filter: parseTime,
+    minWidth: 150,
+    showOverflowtooltip: true,
+  },
   {
     prop: "duration",
     label: "执行时长",
@@ -166,6 +182,7 @@ export default {
           labelField: "label",
           valueField: "value",
           param: "type",
+          width: 100,
         },
         {
           type: "select",
@@ -175,6 +192,7 @@ export default {
             { id: false, name: "失败" },
           ],
           param: "success",
+          width: 100,
         },
         {
           type: "datePicker",

src/views/system/role/index.vue

@@ -193,6 +193,7 @@ export default {
       console.log(val);
       if (val.btnName === "search") {
         this.queryParams.pageNo = 1;
+        this.queryParams.name = val.name;
         this.getList();
       } else {
         this.addOrEditTitle = "新增";

src/views/system/user/index.vue

@@ -801,7 +801,7 @@ export default {
       console.log(val);
       switch (val.btnName) {
         case "search":
-          this.handleQuery();
+          this.handleQuery(val);
           break;
         case "addNew":
           this.handleAdd();
@@ -899,8 +899,12 @@ export default {
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNo = 1;
+      this.queryParams.username = val.username;
+      this.queryParams.mobile = val.mobile;
+      this.queryParams.status = val.status;
+      this.queryParams.createTime = val.createTime;
       this.getList();
     },
     /** 新增按钮操作 */