From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/mixins/JeecgListMixin.js | 208 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 194 insertions(+), 14 deletions(-)
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index eb70391..841a3e7 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -4,7 +4,7 @@
* data涓璾rl瀹氫箟 list涓烘煡璇㈠垪琛� delete涓哄垹闄ゅ崟鏉¤褰� deleteBatch涓烘壒閲忓垹闄�
*/
import { filterObj } from '@/utils/util';
-import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/manage'
+import { deleteAction, getAction, downFile, getFileAccessHttpUrl, httpAction } from '@/api/manage'
import Vue from 'vue'
import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
import store from '@/store'
@@ -81,11 +81,10 @@
this.ipagination.current = 1;
}
var params = this.getQueryParams();//鏌ヨ鏉′欢
-
+ console.log('params',params)
if(!params){
return false;
}
-
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
@@ -139,7 +138,6 @@
return false;
}
}
-
return filterObj(param);
},
getQueryField() {
@@ -150,7 +148,6 @@
});
return str;
},
-
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
@@ -175,7 +172,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -192,11 +193,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -215,10 +224,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -267,10 +284,18 @@
//娓呯┖鍒楄〃閫変腑
this.onClearSelected()
},
+ /**
+ * 鐐瑰嚮琛ㄦ牸涓鎯呮寜閽簨浠�
+ * @param record 閫変腑鐨勫綋鍓嶈鏁版嵁
+ */
handleDetail:function(record){
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title="璇︽儏";
this.$refs.modalForm.disableSubmit = true;
+ // 鎵撳紑璇︽儏鎶藉眽鏃剁鐢ㄨ澶囩紪鐮併�佽澶囧悕绉拌緭鍏ユ
+ this.$refs.modalForm.disSeach = true;
+ // 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶
+ this.$refs.modalForm.removeValidate()
},
/* 瀵煎嚭 */
handleExportXls2(){
@@ -289,7 +314,11 @@
console.log("瀵煎嚭鍙傛暟",param)
downFile(this.url.exportXlsUrl,param).then((data)=>{
if (!data) {
- this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ // this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"鏂囦欢涓嬭浇澶辫触"
+ });
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
@@ -323,9 +352,9 @@
this.$warning({
title: message,
content: (<div>
- <span>{msg}</span><br/>
- <span>鍏蜂綋璇︽儏璇� <a href={href} target="_blank" download={fileName}>鐐瑰嚮涓嬭浇</a> </span>
- </div>
+ <span>{msg}</span><br/>
+ <span>鍏蜂綋璇︽儏璇� <a href={href} target="_blank" download={fileName}>鐐瑰嚮涓嬭浇</a> </span>
+ </div>
)
})
} else {
@@ -379,6 +408,157 @@
let url = getFileAccessHttpUrl(text)
window.open(url);
},
+
+ /**
+ * 鍗曟嵁鎵归噺鎻愪氦
+ */
+ handleSubmitBatch: function() {
+ if (!this.url.submitBatch) {
+ this.$message.error('璇疯缃畊rl.submitBatch灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ let httpurl = this.url.submitBatch
+ let method = 'post'
+ var params = { ids: ids }
+
+ const that = this
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+
+ })
+
+ }
+ },
+ /**
+ * 鎵归噺鎾ゅ洖宸叉彁浜ょ殑璁板綍
+ */
+ handleRevocationBatch: function() {
+ if (!this.url.revocationBatch) {
+ this.$message.error('璇疯缃畊rl.revocationBatch灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ let httpurl = this.url.revocationBatch
+ let method = 'post'
+ var params = { ids: ids }
+
+ const that = this
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+
+ }
+ },
+ /**
+ * 鍗曟嵁鎻愪氦
+ */
+ handleSubmit: function() {
+ if (!this.url.submit) {
+ this.$message.error('璇疯缃畊rl.submit灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length != 1) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var id = this.selectedRowKeys[0]
+ let httpurl = this.url.submit
+ let method = 'post'
+ var params = { id: id }
+
+ const that = this
+
+ this.$confirm({
+ title: '纭鎻愪氦锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+
+ })
+ }
+ })
+
+
+ }
+ },
+ /**
+ * 鎾ゅ洖宸叉彁浜ょ殑璁板綍
+ */
+ handleRevocation: function() {
+ if (!this.url.revocation) {
+ this.$message.error('璇疯缃畊rl.revocation灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length != 1) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var id = this.selectedRowKeys[0]
+ let httpurl = this.url.revocation
+ let method = 'post'
+ var params = { id: id }
+
+ const that = this
+ this.$confirm({
+ title: '纭鎾ゅ洖锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
+ }
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3