From 65a5e8c7ec6d6eab78b76c5831eaf40c30e23c61 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 13 九月 2024 14:56:50 +0800
Subject: [PATCH] 1、设备管理页面设备种类字段改成重要程度字段；新增设备异常状态字段，若表格记录的设备状态不为正常时，则标红此表格记录 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析新增按照重要程度字段查询表格数据；左侧树数据新增参数key，用来过滤异常状态设备 3、设备利用率页面新增设备型号字段
---
src/views/system/DepartList1.vue | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/src/views/system/DepartList1.vue b/src/views/system/DepartList1.vue
index b6ce4d7..693bdb6 100644
--- a/src/views/system/DepartList1.vue
+++ b/src/views/system/DepartList1.vue
@@ -320,7 +320,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -333,11 +337,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTree()
that.onClearSelected()
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -355,7 +367,11 @@
that.departTree.push(temp)
}
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
} else {
@@ -427,16 +443,25 @@
this.$refs.form.validate(valid => {
if (valid) {
if (!this.currSelected.id) {
- this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�"
+ });
return
}
httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
if (res.success) {
- this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
this.loadTree()
} else {
- this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -463,7 +488,11 @@
} else if (num == 2) {
let key = this.currSelected.key
if (!key) {
- this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇閮ㄩ棬锛�')
+ // this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇閮ㄩ棬锛�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇峰厛鐐瑰嚮閫変腑涓婄骇閮ㄩ棬锛�"
+ });
return false
}
this.$refs.departModal.add(this.selectedKeys)
@@ -483,7 +512,11 @@
if (resp.success) {
//鍒犻櫎鎴愬姛鍚庯紝鍘婚櫎宸查�変腑涓殑鏁版嵁
that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
- that.$message.success('鍒犻櫎鎴愬姛!')
+ // that.$message.success('鍒犻櫎鎴愬姛!')
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"鍒犻櫎鎴愬姛"
+ });
that.loadTree()
//鍒犻櫎鍚庡悓姝ユ竻绌哄彸渚у熀鏈俊鎭唴瀹�
let orgCode=that.model.orgCode;
@@ -491,7 +524,11 @@
that.onClearSelected()
}
} else {
- that.$message.warning('鍒犻櫎澶辫触!')
+ // that.$message.warning('鍒犻櫎澶辫触!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"鍒犻櫎澶辫触"
+ });
}
})
}
@@ -550,7 +587,7 @@
}
}
//---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
-
+
},
created() {
this.currFlowId = this.$route.params.id
@@ -598,10 +635,6 @@
.ant-modal-cust-warp .ant-modal-content {
height: 90% !important;
overflow-y: hidden
- }
-
- #app .desktop {
- height: auto !important;
}
/** Button鎸夐挳闂磋窛 */
--
Gitblit v1.9.3