From f67b4c736c68cd3d1f75e5fc6b6e23189f12b979 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 19 十二月 2023 11:34:57 +0800
Subject: [PATCH] 设备管理增加按车间筛选条件
---
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue | 201 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 177 insertions(+), 24 deletions(-)
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
index dfeec49..b82d26a 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
@@ -1,12 +1,12 @@
<template>
- <a-card :bordered="false" class="device_list">
+ <div :bordered="false" class="device_list">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss" showTime/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
@@ -19,12 +19,18 @@
<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="2" :sm="3" :xs="3">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- </a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
+ <!--<a-col :md="2" :sm="3" :xs="3">-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
+ <!--</a-col>-->
<!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
<!--<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>-->
<!--</a-col>-->
@@ -39,6 +45,17 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete"/>
+ 鍒犻櫎
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
@@ -72,7 +89,7 @@
<!--<device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>-->
<!--<repair-model ref="repairModelFrom" @ok="modalFormOk"></repair-model>-->
- </a-card>
+ </div>
</template>
<script>
@@ -83,7 +100,9 @@
import {
requestPut,
deleteAction,
- getAction
+ getAction,
+ downFile,
+ getFileAccessHttpUrl
} from '@/api/manage'
import TorqueconfigurationModal from './TorqueconfigurationModal'
import TorqueconfigurationModaledit from './TorqueconfigurationModalEdit'
@@ -97,10 +116,12 @@
import JEllipsis from '@/components/jeecg/JEllipsis'
import Tooltip from 'ant-design-vue/es/tooltip'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+ import ACol from 'ant-design-vue/es/grid/Col'
export default {
name: 'TorqueconfigurationList',
mixins: [JeecgListMixin],
components: {
+ ACol,
Tooltip,
TorqueconfigurationModal,
TorqueconfigurationModaledit,
@@ -167,7 +188,8 @@
],
url: {
list: '/mdc/MdcTorqueConfig/pageList',
- deleteBatch: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
+ delete: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
+ deleteBatch: '/mdc/MdcTorqueConfig/deleteBatchMdcTorqueConfig',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
@@ -178,6 +200,7 @@
Type(valmath){
this.dataList = [];
this.queryParams.typeTree = valmath
+ console.log(valmath,'瑙﹀彂Type鐨剋atch鏂规硶')
// console.log(this.queryParams.typeTree)
},
nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
@@ -226,8 +249,12 @@
onOk(value) {
console.log('onOk: ', value);
},
+ /**
+ * 鏌ヨ鍖哄煙閲嶇疆鎸夐挳
+ */
searchReset() {
if(this.queryParams.typeTree == "1"){
+ console.log('绗竴涓殑typeTree',this.queryParams.typeTree)
this.typeTree = this.queryParams.typeTree
this.typeParent = this.queryParams.parentId
this.typeEquipment = this.queryParams.equipmentId
@@ -236,6 +263,7 @@
this.dates = []
this.queryParams.typeTree = this.typeTree
this.queryParams.parentId = this.typeParent
+ console.log('杩涘叆绗竴涓�')
if(this.queryParams.parentId != ""){
this.queryParams.equipmentId = ""
}else{
@@ -244,12 +272,12 @@
}else{
this.queryParams.equipmentId = this.queryParamEquip.equipmentId
}
-
}
-
this.ipagination.current = 1
this.ResetloadData();
}else{
+ console.log('杩涘叆绗簩涓�')
+ console.log('绗簩涓殑typeTree',this.queryParams.typeTree)
this.typeTree = this.queryParams.typeTree
this.typeParent = this.queryParams.parentId
// this.typeEquipment = this.queryParams.equipmentId
@@ -292,7 +320,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -337,7 +369,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -375,7 +411,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -385,10 +425,8 @@
if(this.queryParams.typeTree == "1"){
this.queryParams.parentId = this.queryParamEquip.parentId
// this.queryParams.equipmentId = this.queryParamEquip.equipmentId
-
}else{
this.queryParams.parentId = this.queryParamPeople.parentId
-
// this.queryParams.equipmentId = ""
}
this.dataSource = [];
@@ -406,7 +444,7 @@
param.equipmentId = this.queryParams.equipmentId;
param.startTime = this.queryParam.startTime;
param.endTime = this.queryParam.endTime;
- // console.log(param);
+ console.log('param',param);
getAction(this.url.list,param).then((res) => {
if(res.success){
this.dataSource = res.result.records||res.result;
@@ -417,10 +455,50 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() => {
this.loading = false
+ })
+ },
+ handleExportXls(fileName){
+ if(!fileName || typeof fileName != "string"){
+ fileName = "瀵煎嚭鏂囦欢"
+ }
+ let param = this.getQueryParams();
+ if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+ param['selections'] = this.selectedRowKeys.join(",")
+ }
+ param.pageSize = this.ipagination.pageSize;
+ param.field = this.getQueryField();
+ param.parentId = this.queryParams.parentId;
+ param.equipmentId = this.queryParams.equipmentId;
+ param.startTime = this.queryParam.startTime;
+ param.endTime = this.queryParam.endTime;
+ console.log("瀵煎嚭鍙傛暟",param)
+ downFile(this.url.exportXlsUrl,param).then((data)=>{
+ if (!data) {
+ this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ return
+ }
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
+ }else{
+ let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
+ let link = document.createElement('a')
+ link.style.display = 'none'
+ link.href = url
+ link.setAttribute('download', fileName+'.xls')
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link); //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ window.URL.revokeObjectURL(url); //閲婃斁鎺塨lob瀵硅薄
+ }
})
},
loadData(arg) {
@@ -451,7 +529,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -464,23 +546,80 @@
this.selectedRowKeys = []
},
handleDelete: function (id) {
- if(!this.url.deleteBatch){
+ if(!this.url.delete){
this.$message.error("璇疯缃畊rl.delete灞炴��!")
return
}
var that = this;
- deleteAction(that.url.deleteBatch, {id: id}).then((res) => {
+ deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
+ batchDel: function () {
+ if(!this.url.deleteBatch){
+ this.$message.error("璇疯缃畊rl.deleteBatch灞炴��!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
+ return;
+ } else {
+ var ids = "";
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ",";
+ }
+ var that = this;
+ this.$confirm({
+ title: "纭鍒犻櫎",
+ content: "鏄惁鍒犻櫎閫変腑鏁版嵁?",
+ onOk: function () {
+ that.loading = true;
+ deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ that.loadData();
+ that.onClearSelected();
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ that.loading = false;
+ });
+ }
+ });
+ }
+ },
handleAdd() {
+ console.log(this.$refs.modalForm.edit)
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板'
this.$refs.modalForm.disableSubmit = false
@@ -510,7 +649,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}
})
@@ -526,9 +669,19 @@
exclude_inputs: true
});
},
+ // /**
+ // * 杞﹂棿閫変腑椤瑰彇娑堝悗瑙﹀彂姝や簨浠讹紝鐢盉aseTree缁勪欢鐢变簨浠舵�荤嚎瑙﹀彂
+ // * @param value 鎻愮ず淇℃伅
+ // */
+ // treeClearSelected(value){
+ // this.queryParams.equipmentId=''
+ // this.queryParams.parentId=''
+ // this.ResetloadData()
+ // }
},
created() {
this.queryParam.typeTree = "1"
+ // this.$bus.$on('treeClearSelected',this.treeClearSelected)
}
}
</script>
--
Gitblit v1.9.3