From 3432c3100ccb4c3b78dc0a5f7f242bdcda503a63 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 18 六月 2025 10:45:49 +0800
Subject: [PATCH] 1、终端程序呼叫页面呼叫原因组件由输入框改为多行文本域 2、设备管理页面新增设备图片字段同时在新增和编辑设备时添加设备图片 3、设备监控以及设备看板页面新增故障状态同时替换设备图片为设备管理页面中维护的设备图片而不再是设备所属设备类型图片以及三色灯增加故障状态灯
---
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue | 92 ---------------------------------------------
1 files changed, 1 insertions(+), 91 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 727cdb6..ef2bb0a 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -1,84 +1,9 @@
<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>{{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>
@@ -113,13 +38,6 @@
width: 200
},
{
- title: '璁惧寮傚父',
- align: 'center',
- dataIndex: 'equipmentStatus',
- scopedSlots: { customRender: 'equipmentStatus' },
- width: 200
- },
- {
title: '閲囬泦鏃堕棿',
align: 'center',
dataIndex: 'collecttime',
@@ -129,14 +47,6 @@
},
width: 350
}
- // {
- // title: '鎿嶄綔',
- // dataIndex: 'action',
- // scopedSlots: {customRender: 'action'},
- // align: "center",
- // width: 150,
- // fixed:'right'
- // }
],
scrollY: 465
}
--
Gitblit v1.9.3