From d7a8405c0f57f8947f971b798d3e4713a8d1800f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 16:49:39 +0800
Subject: [PATCH] 1、利用率分段分析页面增加导出功能，默认进入页面的计算时间段修改为00:00至23:59 2、设备管理页面增加设备属性的维护（普通、重点）同时TEEP页面新增对应筛选条件 3、看板增加MES产量数据展示（饼图里面改为设备产量对比，饼图下方增加两行展示计划量和完成量数目，点击饼图出现弹窗展示对应车间或车间工段下产量列表）2h 4、设备管理页面新增字段展示权限（弹窗中设备状态字段增加菜单按钮权限控制显隐） 5、OEE计算弹窗新增loading提示与计算成功后刷新列表功能 6、删除用户管理冗余字段展示
---
src/views/system/UserList.vue | 48 +++++++++++++-----------------------------------
1 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index f29115e..0e25598 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -7,55 +7,33 @@
<a-row :gutter="24">
<a-col :md="6" :sm="12">
- <a-form-item label="璐﹀彿">
+ <a-form-item label="鐢ㄦ埛璐﹀彿">
<!--<a-input placeholder="璇疯緭鍏ヨ处鍙锋煡璇�" v-model="queryParam.username"></a-input>-->
<j-input placeholder="杈撳叆璐﹀彿妯＄硦鏌ヨ" v-model="queryParam.username"></j-input>
</a-form-item>
</a-col>
+
<a-col :md="6" :sm="8">
- <a-form-item label="鎬у埆">
- <a-select v-model="queryParam.sex" placeholder="璇烽�夋嫨鎬у埆">
- <a-select-option value="">璇烽�夋嫨</a-select-option>
- <a-select-option value="1">鐢�</a-select-option>
- <a-select-option value="2">濂�</a-select-option>
- </a-select>
+ <a-form-item label="鐢ㄦ埛濮撳悕">
+ <a-input placeholder="璇疯緭鍏ョ敤鎴峰鍚�" v-model="queryParam.realname"></a-input>
</a-form-item>
</a-col>
-
- <template v-if="toggleSearchStatus">
- <a-col :md="6" :sm="8">
- <a-form-item label="鐪熷疄鍚嶅瓧">
- <a-input placeholder="璇疯緭鍏ョ湡瀹炲悕瀛�" v-model="queryParam.realname"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :md="6" :sm="8">
- <a-form-item label="鎵嬫満鍙风爜">
- <a-input placeholder="璇疯緭鍏ユ墜鏈哄彿鐮佹煡璇�" v-model="queryParam.phone"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :md="6" :sm="8">
- <a-form-item label="鐢ㄦ埛鐘舵��">
- <a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">
- <a-select-option value="">璇烽�夋嫨</a-select-option>
- <a-select-option value="1">姝ｅ父</a-select-option>
- <a-select-option value="2">鍐荤粨</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </template>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鐢ㄦ埛鐘舵��">
+ <a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">
+ <a-select-option value="">璇烽�夋嫨</a-select-option>
+ <a-select-option value="1">姝ｅ父</a-select-option>
+ <a-select-option value="2">鍐荤粨</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
<a-col :md="6" :sm="8">
<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>
</span>
</a-col>
--
Gitblit v1.9.3