Compare commits
No commits in common. "d43a53e7f5186afbc46cca94261179d3883ce9bd" and "006d44b842bc64f54c6bd47ba34ff4e0f374a4fa" have entirely different histories.
d43a53e7f5
...
006d44b842
@ -106,8 +106,6 @@
|
|||||||
import { listOperateLog, exportOperateLog } from "@/api/system/operatelog";
|
import { listOperateLog, exportOperateLog } from "@/api/system/operatelog";
|
||||||
import tableHeightMixin from "@/mixins/tableHeightMixin";
|
import tableHeightMixin from "@/mixins/tableHeightMixin";
|
||||||
import statusBtn3 from "./../components/statusBtn3.vue";
|
import statusBtn3 from "./../components/statusBtn3.vue";
|
||||||
import { DICT_TYPE, publicFormatter } from "@/utils/dict";
|
|
||||||
import { parseTime } from "@/utils/ruoyi";
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: "id",
|
prop: "id",
|
||||||
@ -125,16 +123,9 @@ const tableProps = [
|
|||||||
minWidth: 200,
|
minWidth: 200,
|
||||||
showOverflowtooltip: true,
|
showOverflowtooltip: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
prop: "type",
|
|
||||||
label: "操作类型",
|
|
||||||
minWidth: 80,
|
|
||||||
filter: publicFormatter(DICT_TYPE.SYSTEM_OPERATE_TYPE),
|
|
||||||
showOverflowtooltip: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
prop: "userNickname",
|
prop: "userNickname",
|
||||||
label: "操作人员",
|
label: "操作人",
|
||||||
minWidth: 80,
|
minWidth: 80,
|
||||||
showOverflowtooltip: true,
|
showOverflowtooltip: true,
|
||||||
},
|
},
|
||||||
@ -143,13 +134,6 @@ const tableProps = [
|
|||||||
label: "操作结果",
|
label: "操作结果",
|
||||||
subcomponent: statusBtn3,
|
subcomponent: statusBtn3,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
prop: "startTime",
|
|
||||||
label: "操作时间",
|
|
||||||
filter: parseTime,
|
|
||||||
minWidth: 150,
|
|
||||||
showOverflowtooltip: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
prop: "duration",
|
prop: "duration",
|
||||||
label: "执行时长",
|
label: "执行时长",
|
||||||
@ -182,7 +166,6 @@ export default {
|
|||||||
labelField: "label",
|
labelField: "label",
|
||||||
valueField: "value",
|
valueField: "value",
|
||||||
param: "type",
|
param: "type",
|
||||||
width: 100,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "select",
|
type: "select",
|
||||||
@ -192,7 +175,6 @@ export default {
|
|||||||
{ id: false, name: "失败" },
|
{ id: false, name: "失败" },
|
||||||
],
|
],
|
||||||
param: "success",
|
param: "success",
|
||||||
width: 100,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "datePicker",
|
type: "datePicker",
|
||||||
|
@ -193,7 +193,6 @@ export default {
|
|||||||
console.log(val);
|
console.log(val);
|
||||||
if (val.btnName === "search") {
|
if (val.btnName === "search") {
|
||||||
this.queryParams.pageNo = 1;
|
this.queryParams.pageNo = 1;
|
||||||
this.queryParams.name = val.name;
|
|
||||||
this.getList();
|
this.getList();
|
||||||
} else {
|
} else {
|
||||||
this.addOrEditTitle = "新增";
|
this.addOrEditTitle = "新增";
|
||||||
|
@ -801,7 +801,7 @@ export default {
|
|||||||
console.log(val);
|
console.log(val);
|
||||||
switch (val.btnName) {
|
switch (val.btnName) {
|
||||||
case "search":
|
case "search":
|
||||||
this.handleQuery(val);
|
this.handleQuery();
|
||||||
break;
|
break;
|
||||||
case "addNew":
|
case "addNew":
|
||||||
this.handleAdd();
|
this.handleAdd();
|
||||||
@ -899,12 +899,8 @@ export default {
|
|||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
handleQuery(val) {
|
handleQuery() {
|
||||||
this.queryParams.pageNo = 1;
|
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();
|
this.getList();
|
||||||
},
|
},
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
|
Loading…
Reference in New Issue
Block a user