From 4bdafebef311d37a28f84c09dcf74bebb096dbb6 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 23 六月 2025 14:43:50 +0800
Subject: [PATCH] 1、mdc设备多选输入框优化新增点击输入框同样触发查询按钮弹出抽屉或弹窗 2、解决进入过产品结构树页面后再进入设备日志页面后设备状态分布图样式变形问题以及优化组件代码
---
src/views/eam/repair/EamReportRepairList.vue | 409 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 278 insertions(+), 131 deletions(-)
diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue
index c02937e..0984200 100644
--- a/src/views/eam/repair/EamReportRepairList.vue
+++ b/src/views/eam/repair/EamReportRepairList.vue
@@ -5,37 +5,50 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
-
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鏁呴殰寮�濮嬫椂闂�">
- <a-input placeholder="璇疯緭鍏ユ晠闅滃紑濮嬫椂闂�" v-model="queryParam.faultStartTime"></a-input>
+ <a-form-item label="璁惧缂栧彿">
+ <!--<a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentId"/>-->
+ <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储" v-model="queryParam.equipmentId"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="isDisplayOperation">
+ <a-form-item label="鎶ヤ慨鐘舵��">
+ <a-select placeholder="璇烽�夋嫨鎶ヤ慨鐘舵��" v-model="queryParam.reportStatus" allow-clear>
+ <a-select-option v-for="item in report_repair_status_list" :key="item.value">{{ item.label }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鏁呴殰鎻忚堪">
+ <a-input placeholder="璇疯緭鍏ユ晠闅滄弿杩�" v-model="queryParam.faultDescription" allow-clear/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鏁呴殰鏃堕棿">
+ <a-range-picker showTime v-model="faultTimeRange" value-format="YYYY-MM-DD HH:mm:ss"
+ @change="handleTimeRangeChange"
+ style="width: 100%"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鏄惁鍋滄満">
+ <a-radio-group v-model="queryParam.breakdownFlag">
+ <a-radio v-for="item in breakdown_flag_list" :value="item.value">{{ item.label }}</a-radio>
+ </a-radio-group>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鏄惁鍋滄満">
- <a-input placeholder="璇疯緭鍏ユ槸鍚﹀仠鏈�" v-model="queryParam.breakdownFlag"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧ID">
- <a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="queryParam.equipmentId"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鏁呴殰鍒嗙被">
- <a-input placeholder="璇疯緭鍏ユ晠闅滃垎绫�" v-model="queryParam.faultType"></a-input>
- </a-form-item>
- </a-col>
+
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
+ <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
+ <!-- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
+ <!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+ <!-- </a>-->
</span>
</a-col>
@@ -44,29 +57,29 @@
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('鏁呴殰鎶ヤ慨')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
- @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
+ <div class="table-operator" v-if="isDisplayOperation">
+ <a-button @click="handleAdd" type="primary" icon="plus" v-if="isShowAuth('eam:reportRepair:add')">鏂板</a-button>
+ <!--<a-button type="primary" icon="download" @click="handleExportXls('鏁呴殰鎶ヤ慨')">瀵煎嚭</a-button>-->
+ <!--<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 key="1" @click="batchDel" v-if="isShowAuth('eam:reportRepair:abolish')">
+ <a-icon type="delete"/>
+ 浣滃簾
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
- <a-icon type="down" />
+ <a-icon type="down"/>
</a-button>
</a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;" v-if="isDisplayOperation">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a
style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
@@ -82,23 +95,25 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:isDisplayOperation?'checkbox':'radio',getCheckboxProps:getCheckboxProps}"
@change="handleTableChange">
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <template slot="imageFiles" slot-scope="text, record" v-if="text">
+ <a @click="handlePreviewImages(record)">棰勮</a>
+ </template>
- <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'">
+ <a @click="handleEdit(record)" v-if="isShowAuth('eam:reportRepair:edit')">缂栬緫</a>
+
+ <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:edit')"/>
+
+ <a @click="handleAssign(record)" v-if="isShowAuth('eam:reportRepair:assign')">鎸囨淳</a>
+
+ <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:assign')"/>
+
+ <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)" v-if="isShowAuth('eam:reportRepair:abolish')">
+ <a>浣滃簾</a>
+ </a-popconfirm>
</span>
</a-table>
@@ -106,100 +121,232 @@
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamReportRepair-modal ref="modalForm" @ok="modalFormOk"></eamReportRepair-modal>
+ <eamReportRepair-modal ref="modalForm" :breakdownFlagList="breakdown_flag_list" :faultReasonList="faultReasonList"
+ @ok="modalFormOk"/>
+ <!-- 鍥剧墖棰勮寮圭獥 -->
+ <images-preview-modal ref="imagesPreviewModalRef" :imageListUrl="currentImageListUrl"/>
+ <!--鎸囨淳鎶ヤ慨寮圭獥-->
+ <assign-repair-report-modal ref="assignRepairReportModalRef" @ok="modalFormOk"/>
</a-card>
</template>
<script>
-import '@/assets/less/TableExpand.less'
-import EamReportRepairModal from './modules/EamReportRepairModal'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import '@/assets/less/TableExpand.less'
+ import EamReportRepairModal from './modules/EamReportRepairList/EamReportRepairModal'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
+ import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
+ import ImagesPreviewModal from '@views/eam/repair/modules/ImagesPreviewModal.vue'
+ import { getAction } from '@/api/manage'
+ import AssignRepairReportModal from './modules/EamReportRepairList/AssignRepairReportModal'
-export default {
- name: 'EamReportRepairList',
- mixins: [JeecgListMixin],
- components: {
- EamReportRepairModal
- },
- data() {
- return {
- description: '鏁呴殰鎶ヤ慨绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
+
+ export default {
+ name: 'EamReportRepairList',
+ mixins: [JeecgListMixin],
+ components: {
+ AssignRepairReportModal,
+ ImagesPreviewModal,
+ LxSearchEquipmentSelect,
+ EamReportRepairModal
+ },
+ props: {
+ isDisplayOperation: {
+ type: Boolean,
+ default: true
+ },
+ propsQueryParam: {
+ type: Object
+ }
+ },
+ data() {
+ return {
+ description: '鏁呴殰鎶ヤ慨绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '璁惧缂栧彿',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ width: 200
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ width: 200
+ },
+ {
+ title: '鎶ヤ慨鐘舵��',
+ align: 'center',
+ dataIndex: 'reportStatus_dictText',
+ width: 100
+ },
+ {
+ title: '鏁呴殰绠�绉�',
+ align: 'center',
+ dataIndex: 'faultName',
+ width: 100
+ },
+ {
+ title: '鏁呴殰鍒嗙被',
+ align: 'center',
+ dataIndex: 'faultType_dictText',
+ width: 100
+ },
+ {
+ title: '鏁呴殰鎻忚堪',
+ align: 'center',
+ dataIndex: 'faultDescription',
+ width: 200
+ },
+ {
+ title: '鏁呴殰寮�濮嬫椂闂�',
+ align: 'center',
+ dataIndex: 'faultStartTime',
+ width: 200
+ },
+ {
+ title: '鏄惁鍋滄満',
+ align: 'center',
+ dataIndex: 'breakdownFlag_dictText',
+ width: 100
+ },
+ {
+ title: '鎶ヤ慨鍥剧墖',
+ align: 'center',
+ dataIndex: 'imageFiles',
+ scopedSlots: { customRender: 'imageFiles' },
+ width: 100
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
}
- },
- {
- title: '鏁呴殰寮�濮嬫椂闂�',
- align: 'center',
- dataIndex: 'faultStartTime'
- },
- {
- title: '鏄惁鍋滄満',
- align: 'center',
- dataIndex: 'breakdownFlag'
- },
- {
- title: '璁惧ID',
- align: 'center',
- dataIndex: 'equipmentId'
- },
- {
- title: '鏁呴殰鍒嗙被',
- align: 'center',
- dataIndex: 'faultType'
- },
- {
- title: '鏁呴殰鎻忚堪',
- align: 'center',
- dataIndex: 'faultDescription'
- },
- {
- title: '鎶ヤ慨鐘舵��',
- align: 'center',
- dataIndex: 'reportStatus'
- },
- {
- title: '鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧',
- align: 'center',
- dataIndex: 'imageFiles'
- },
- {
- title: '澶囨敞',
- align: 'center',
- dataIndex: 'remark'
- },
- {
+ ],
+ breakdown_flag_list: [],
+ report_repair_status_list: [],
+ faultTimeRange: [],
+ faultReasonList: [],
+ currentImageListUrl: '',
+ url: {
+ list: '/eam/eamReportRepair/list',
+ delete: '/eam/eamReportRepair/abolish',
+ deleteBatch: '/eam/eamReportRepair/abolishBatch',
+ exportXlsUrl: 'eam/eamReportRepair/exportXls',
+ importExcelUrl: 'eam/eamReportRepair/importExcel',
+ faultReasonList: '/eam/equipmentFaultReason/list'
+ }
+ }
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ created() {
+ this.initDictData('breakdown_flag')
+ this.initDictData('report_repair_status')
+ if (!this.isDisplayOperation) this.queryParam = Object.assign({}, this.propsQueryParam)
+ else {
+ const operationColumn = {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- scopedSlots: { customRender: 'action' }
+ scopedSlots: { customRender: 'action' },
+ width: 200
}
- ],
- url: {
- list: '/eam/eamReportRepair/list',
- delete: '/eam/eamReportRepair/delete',
- deleteBatch: '/eam/eamReportRepair/deleteBatch',
- exportXlsUrl: 'eam/eamReportRepair/exportXls',
- importExcelUrl: 'eam/eamReportRepair/importExcel'
+ this.columns = [...this.columns, operationColumn]
+ this.getFaultReasonListByApi()
+ }
+ this.loadData(1)
+ },
+ methods: {
+ /**
+ * 鑾峰彇鏁版嵁瀛楀吀鍊�
+ * @param dictCode 鏁版嵁瀛楀吀瀵瑰簲璁板綍缂栫爜
+ */
+ initDictData(dictCode) {
+ // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
+ if (getDictItemsFromCache(dictCode)) {
+ this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
+ return
+ }
+ //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+ ajaxGetDictItems(dictCode, null).then((res) => {
+ if (res.success) {
+ this[dictCode + '_list'] = res.result
+ return
+ }
+ })
+ },
+
+ // 璋冪敤鎺ュ彛鑾峰彇鏁呴殰鍘熷洜鍒楄〃
+ getFaultReasonListByApi() {
+ const that = this
+ getAction(this.url.faultReasonList)
+ .then(res => {
+ console.log('res', res)
+ that.faultReasonList = res.result.records
+ })
+ },
+
+ /**
+ * 鏁呴殰鏃堕棿閫夋嫨鍣ㄥ彉鍖栨椂瑙﹀彂
+ * @param valueArray
+ */
+ handleTimeRangeChange(valueArray) {
+ this.queryParam.startTime = valueArray[0]
+ this.queryParam.endTime = valueArray[1]
+ },
+
+ /**
+ * 棰勮鍥剧墖
+ * @param imageFiles 琛ㄦ牸琛屽浘鐗囧湴鍧�
+ */
+ handlePreviewImages({ imageFiles }) {
+ this.currentImageListUrl = imageFiles
+ this.$refs.imagesPreviewModalRef.visible = true
+ },
+
+ /**
+ * 鎸囨淳鎶ヤ慨鍗�
+ * @param record 琛ㄦ牸琛屼俊鎭�
+ */
+ handleAssign(record) {
+ this.$refs.assignRepairReportModalRef.visible = true
+ this.$refs.assignRepairReportModalRef.model = Object.assign({}, { id: record.id })
+ },
+
+ getCheckboxProps(record) {
+ return {
+ props: {
+ disabled: record.reportStatus !== 'WAIT_REPAIR'
+ }
+ }
+ },
+
+ searchReset() {
+ if (this.isDisplayOperation) this.queryParam = {}
+ else this.queryParam = Object.assign({}, this.propsQueryParam)
+ this.faultTimeRange = []
+ this.loadData(1)
}
}
- },
- computed: {
- importExcelUrl: function() {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- }
- },
- methods: {}
-}
+ }
</script>
<style scoped>
-@import '~@assets/less/common.less';
+ @import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3