From b21a33bc75956ace07b4fa8584c8f2acc91d048b Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 10 Jan 2022 17:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BD=BF=E7=94=A8=E6=89=8B?=
=?UTF-8?q?=E5=86=8C=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E7=AD=9B?=
=?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/pages/manual.html | 28 ++++++++++++++++++
web/src/x.min.js | 4 ++-
web/srczip/logic/dashboard.js | 4 ++-
.../006E6A9A-2ACE-4bce-8FA1-5CFD595DEC0C.png | Bin 0 -> 43097 bytes
.../0895115A-06AC-4eab-925E-B3CF0400EAF1.png | Bin 0 -> 48498 bytes
.../197F32D6-D6AC-4390-8E4E-FB4A4BC504C8.png | Bin 0 -> 102403 bytes
.../20E44A3B-77A7-40f8-8BA2-3524C69B43AE.png | Bin 0 -> 112267 bytes
.../293E88FF-DC27-4211-88C5-5030E24E636A.png | Bin 0 -> 126236 bytes
.../32D36F11-FFC8-49c2-AC31-8A048FCAC1A0.png | Bin 0 -> 49259 bytes
.../390A7109-3566-4ffc-8D0E-EE4178217A01.png | Bin 0 -> 111508 bytes
.../502EE768-DC25-44a6-BE18-FCE03CEC722B.png | Bin 0 -> 41265 bytes
.../62345614-31D9-4ace-A9EE-B6931ECFA211.png | Bin 0 -> 103739 bytes
12 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 web/static/img/manual/006E6A9A-2ACE-4bce-8FA1-5CFD595DEC0C.png
create mode 100644 web/static/img/manual/0895115A-06AC-4eab-925E-B3CF0400EAF1.png
create mode 100644 web/static/img/manual/197F32D6-D6AC-4390-8E4E-FB4A4BC504C8.png
create mode 100644 web/static/img/manual/20E44A3B-77A7-40f8-8BA2-3524C69B43AE.png
create mode 100644 web/static/img/manual/293E88FF-DC27-4211-88C5-5030E24E636A.png
create mode 100644 web/static/img/manual/32D36F11-FFC8-49c2-AC31-8A048FCAC1A0.png
create mode 100644 web/static/img/manual/390A7109-3566-4ffc-8D0E-EE4178217A01.png
create mode 100644 web/static/img/manual/502EE768-DC25-44a6-BE18-FCE03CEC722B.png
create mode 100644 web/static/img/manual/62345614-31D9-4ace-A9EE-B6931ECFA211.png
diff --git a/web/pages/manual.html b/web/pages/manual.html
index 02b627a..4eb2ec5 100644
--- a/web/pages/manual.html
+++ b/web/pages/manual.html
@@ -182,6 +182,31 @@
用户维度可按 角色或设备
订单筛选可筛选符合条件的订单
+
+
+ 
+ 
+ 查看筛选条件
+ 当次报表有筛选数据时查看筛选按钮显示，点击按钮弹出筛选项数据
+ 
+
+ 自定义别名的意义
+ 此功能主要针对筛选功能，自定义添加筛选项里的筛选条件
+ 
+ 上传对应的work文档，会自动生成报表方便筛选功能筛选
+ 
+
+
+
+ 用户标签列表页，左边是已添加标签，右边是标签信息，点击添加标签
+ 
+ 填写标签名，显示名，备注，选择对应的标签属性并保存，添加完后返回列表页就可以看见添加标签数据。
+ 
+ 点击标签详情，可查看当前标签对应的用户信息，并可下载导出
+ 
+ 添加完的用户标签可在分析看板里使用
+ 
+
@@ -200,6 +225,9 @@
+
+
+
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 3095ce1..07cb32c 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -6095,7 +6095,7 @@ var X = window.X || {
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
});
- })
+ })
})
}
})
@@ -6408,6 +6408,7 @@ var X = window.X || {
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var name = obj.attr('data-name');
+ $("#sxjg"+id).hide();
X.parametersopen(X['DATA']['screenlist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
// console.log(d);
@@ -6500,6 +6501,7 @@ var X = window.X || {
name:$(this).attr('data-name'),
}
X.DATA.oclickarr =arr;
+ $("#sxjg"+$(this).attr('data-id')).hide();
});
//更多按钮配置下拉框
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index e6e6fb6..403fccb 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -261,7 +261,7 @@
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
});
- })
+ })
})
}
})
@@ -574,6 +574,7 @@
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var name = obj.attr('data-name');
+ $("#sxjg"+id).hide();
X.parametersopen(X['DATA']['screenlist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
// console.log(d);
@@ -666,6 +667,7 @@
name:$(this).attr('data-name'),
}
X.DATA.oclickarr =arr;
+ $("#sxjg"+$(this).attr('data-id')).hide();
});
//更多按钮配置下拉框
diff --git a/web/static/img/manual/006E6A9A-2ACE-4bce-8FA1-5CFD595DEC0C.png b/web/static/img/manual/006E6A9A-2ACE-4bce-8FA1-5CFD595DEC0C.png
new file mode 100644
index 0000000000000000000000000000000000000000..3086c9fae7f186bc8318ff701fb46e07d1ca7afd
GIT binary patch
literal 43097
zcmeFZd012D*6