From 3a097696dbc536ad29ccf60b7cf381a08e1bebf0 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期四, 26 六月 2025 17:41:30 +0800 Subject: [PATCH] 1、设备日利用率以及设备日利用率对比页面优化图表加载展示区域及代码 2、调整操作工终端登录页背景图片 --- src/mixins/JeecgListMixin.js | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 16d8a8c..f19dddc 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -8,6 +8,7 @@ import Vue from 'vue' import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types" import store from '@/store' +import { buttonShowAuthFilter } from '@/utils/authFilter' export const JeecgListMixin = { data(){ @@ -30,6 +31,10 @@ }, /* 鎺掑簭鍙傛暟 */ isorter:{ + column: 'createTime', + order: 'desc', + }, + defaultSorter:{ column: 'createTime', order: 'desc', }, @@ -74,6 +79,9 @@ } }, methods:{ + isShowAuth(code){ + return buttonShowAuthFilter(code); + }, loadData(arg) { if(!this.url.list){ this.$message.error("璇疯缃畊rl.list灞炴��!") @@ -84,7 +92,6 @@ this.ipagination.current = 1; } var params = this.getQueryParams();//鏌ヨ鏉′欢 - console.log('params',params) if(!params){ return false; } @@ -298,7 +305,10 @@ // 鎵撳紑璇︽儏鎶藉眽鏃剁鐢ㄨ澶囩紪鐮併�佽澶囧悕绉拌緭鍏ユ this.$refs.modalForm.disSeach = true; // 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶 - this.$refs.modalForm.removeValidate() + if(this.$refs.modalForm.removeValidate) { + this.$refs.modalForm.removeValidate() + } + }, /* 瀵煎嚭 */ handleExportXls2(){ @@ -370,6 +380,7 @@ this.loadData() } else { // this.$message.error(`${info.file.name} ${info.file.response.message}.`); + this.loading = false this.$notification.error({ message:'娑堟伅', description:`${info.file.name} ${info.file.response.message}.` -- Gitblit v1.9.3