From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/components/jeecg/JSuperQuery.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/components/jeecg/JSuperQuery.vue b/src/components/jeecg/JSuperQuery.vue
index 75631da..52feb8d 100644
--- a/src/components/jeecg/JSuperQuery.vue
+++ b/src/components/jeecg/JSuperQuery.vue
@@ -29,6 +29,7 @@
@cancel="handleCancel"
:mask="false"
:fullscreen="izMobile"
+ draggable
class="j-super-query-modal"
style="top:5%;max-height: 95%;"
>
@@ -103,6 +104,8 @@
<a-col :md="8" :xs="24" style="margin-bottom: 12px;">
<!-- 涓嬫媺鎼滅储 -->
<j-search-select-tag v-if="item.type==='sel_search'" v-model="item.val" :dict="getDictInfo(item)" placeholder="璇烽�夋嫨"/>
+ <!-- 涓嬫媺妗� -->
+ <j-search-select-tag v-else-if="item.type==='list' && item.dictTable" v-model="item.val" :dict="getDictInfo(item)" placeholder="璇烽�夋嫨"/>
<!-- 涓嬫媺澶氶�� -->
<template v-else-if="item.type==='list_multi'">
<j-multi-select-tag v-if="item.options" v-model="item.val" :options="item.options" placeholder="璇烽�夋嫨"/>
@@ -136,14 +139,14 @@
v-else-if="item.type === 'select-user' || item.type === 'sel_user'"
v-model="item.val"
:buttons="false"
- :multiple="false"
+ :multiple="allowMultiple(item)"
placeholder="璇烽�夋嫨鐢ㄦ埛"
:returnKeys="['id', item.customReturnField || 'username']"
/>
<j-select-depart
v-else-if="item.type === 'select-depart' || item.type === 'sel_depart'"
v-model="item.val"
- :multi="false"
+ :multi="allowMultiple(item)"
placeholder="璇烽�夋嫨閮ㄩ棬"
:customReturnField="item.customReturnField || 'id'"
/>
@@ -161,8 +164,10 @@
<a-time-picker v-else-if="item.type==='time'" :value="item.val ? moment(item.val,'HH:mm:ss') : null" format="HH:mm:ss" style="width: 100%" @change="(time,value)=>item.val=value"/>
<a-input-number v-else-if=" item.type=='int'||item.type=='number' " style="width: 100%" placeholder="璇疯緭鍏ユ暟鍊�" v-model="item.val"/>
<a-select v-else-if="item.type=='switch'" placeholder="璇烽�夋嫨" v-model="item.val">
- <a-select-option value="Y">鏄�</a-select-option>
- <a-select-option value="N">鍚�</a-select-option>
+ <!-- update-begin-author:taoyan for: VUEN-242銆恛nline琛ㄥ崟 楂樼骇鏌ヨ銆戝紑鍏崇粍浠惰缃墿灞曞弬鏁颁负[0,1] 鏃讹紝楂樼骇鏌ヨ閫夋嫨鍚庢煡璇粛鐒舵槸Y/N -->
+ <a-select-option :value="item.extendOption[0]">鏄�</a-select-option>
+ <a-select-option :value="item.extendOption[1]">鍚�</a-select-option>
+ <!-- update-end-author:taoyan for: VUEN-242銆恛nline琛ㄥ崟 楂樼骇鏌ヨ銆戝紑鍏崇粍浠惰缃墿灞曞弬鏁颁负[0,1] 鏃讹紝楂樼骇鏌ヨ閫夋嫨鍚庢煡璇粛鐒舵槸Y/N -->
</a-select>
<a-input v-else v-model="item.val" placeholder="璇疯緭鍏ュ��"/>
</a-col>
@@ -331,7 +336,12 @@
let child = { ...item2 }
child.label = child.label || child.text
child.label = data.label + '-' + child.label
- child.value = data.value + ',' + child.value
+ // update--begin--author:sunjianlei-----date:20220121------for锛氥�怞TC-1167銆戙�愯〃鍗曡璁″櫒銆戦珮绾ф煡璇紝涓�瀵逛竴瀛楁鏌ヨ涓嶅ソ浣�
+ // 鏄惁浠呭寘鍚瓧娈靛悕锛屼笉闇�瑕佹嫾鎺ュ瓙琛ㄨ〃鍚�
+ if (!data.onlyFieldName) {
+ child.value = data.value + ',' + child.value
+ }
+ // update--end--author:sunjianlei-----date:20220121------for锛氥�怞TC-1167銆戙�愯〃鍗曡璁″櫒銆戦珮绾ф煡璇紝涓�瀵逛竴瀛楁鏌ヨ涓嶅ソ浣�
child.val = ''
return child
})
@@ -419,10 +429,17 @@
item['dictCode'] = dictCode
item['dictTable'] = dictTable
item['dictText'] = dictText
+ //update-begin-author:taoyan for: VUEN-242銆恛nline琛ㄥ崟 楂樼骇鏌ヨ銆戝紑鍏崇粍浠惰缃墿灞曞弬鏁颁负[0,1] 鏃讹紝楂樼骇鏌ヨ閫夋嫨鍚庢煡璇粛鐒舵槸Y/N
+ item['extendOption'] = node.dataRef.extendOption || ['Y', 'N']
+ //update-begin-author:taoyan for: VUEN-242銆恛nline琛ㄥ崟 楂樼骇鏌ヨ銆戝紑鍏崇粍浠惰缃墿灞曞弬鏁颁负[0,1] 鏃讹紝楂樼骇鏌ヨ閫夋嫨鍚庢煡璇粛鐒舵槸Y/N
item['customReturnField'] = customReturnField
if (popup) {
item['popup'] = popup
}
+ // 鏍煎紡鍖栧瓧绗︿覆锛屼竴鑸敤浜庨珮绾ф煡璇㈢殑鏃ユ湡鏍煎紡澶勭悊
+ if (node.dataRef.formatStr) {
+ item['formatStr'] = node.dataRef.formatStr
+ }
this.$set(item, 'val', undefined)
},
handleOpen() {
--
Gitblit v1.9.3