From 20f77a55f8eeaceb026d1c5ad96de75d6edb712a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 14:18:14 +0800
Subject: [PATCH] 1、报警分析页面报警页面调整比例饼图颜色 2、维修看板页面设备平均故障率柱状图Y轴去除%号以及去除柱子注释含义 3、设备管理页面新增弹窗添加禁止手输设备编号，新增安装位置字段（同时将MDC模块内所有设备名称显示调整为安装位置） 4、设备级看板页面的设备选择框新增安装位置显示 5、首页添加法士特沃克背景图 6、对比分析页面解决时间段查询选择框无法选择问题以及柱状图组件重置按钮关联设备树选择 7、OEE页面列表取消展示合格零件数量和加工零件数量字段，仅展示合格率字段
---
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue | 104 +--------------------------------------------------
1 files changed, 3 insertions(+), 101 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 07795c1..c9f70f3 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -1,84 +1,8 @@
<template>
<a-card :bordered="false" style="display: flex;flex-direction: column">
-
- <!-- 鏌ヨ鍖哄煙 -->
- <!--<div 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-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParam.equipmentName"></a-input>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="7" :sm="7">-->
- <!--<a-form-item label="鐘舵��">-->
- <!--<a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">-->
- <!--<a-select-option value="">璇烽�夋嫨</a-select-option>-->
- <!--<a-select-option value="0">鍏虫満</a-select-option>-->
- <!--<a-select-option value="2">寰呮満</a-select-option>-->
- <!--<a-select-option value="3">杩愯</a-select-option>-->
- <!--<a-select-option value="22">鎶ヨ</a-select-option>-->
- <!--</a-select>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="3" :sm="3">-->
- <!--<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
- <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
- <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
- <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
- <!--</a>-->
- <!--</span>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<template v-if="toggleSearchStatus">-->
- <!--<a-col :md="12" :sm="12">-->
- <!--<a-form-item label="閲囬泦鏃堕棿">-->
- <!--<a-range-picker @change="dateParamChange" v-model="dates"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</template>-->
-
- <!--</a-row>-->
- <!--</a-form>-->
- <!--</div>-->
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <!--<div class="table-operator" style="border-top: 5px">-->
- <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
- <!--<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>-->
- <!--</div>-->
-
<div class="equipmentList" id="DeviceList">
- <!--<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
- <!--<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>-->
- <!--</div>-->
-
<a-table ref="table" bordered size="middle" rowKey="equipmentId" :columns="columns" :dataSource="dataSource"
- :pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}">
- <template slot="equipmentId" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="equipmentName" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="oporationDict" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="equipmentStatus" slot-scope="text">
- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
- </template>
- <template slot="collecttime" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="action" slot-scope="text, record">
- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
- <a>鐘舵�佸弽棣�</a>
- </a-popconfirm>
- </template>
- </a-table>
-
+ :pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}"/>
</div>
</a-card>
</template>
@@ -92,36 +16,23 @@
data() {
return {
loading:false,
- url: {
-
- },
columns: [
{
- title: '璁惧ID',
+ title: '璁惧缂栧彿',
align: "center",
dataIndex: 'equipmentId',
- scopedSlots: {customRender: 'equipmentId'},
width:210
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: "center",
dataIndex: 'equipmentName',
- scopedSlots: {customRender: 'equipmentName'},
width:300
},
{
title: '鐘舵��',
align: "center",
dataIndex: 'oporationDict',
- scopedSlots: {customRender: 'oporationDict'},
- width:200
- },
- {
- title: '璁惧寮傚父',
- align: "center",
- dataIndex: 'equipmentStatus',
- scopedSlots: {customRender: 'equipmentStatus'},
width:200
},
{
@@ -130,16 +41,7 @@
dataIndex: 'collecttime',
defaultSortOrder:'descend',
sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
- scopedSlots: {customRender: 'collecttime'},
width:350
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
- align: "center",
- width: 150,
- fixed:'right'
}
],
scrollY:465,
--
Gitblit v1.9.3