From 8b47a6acff1683df5764c5df1b2460110255f544 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 29 四月 2024 17:16:33 +0800
Subject: [PATCH] 登录时将获取的mac地址例如：78b8d67511ca 作为client_info传进api/user/ace/VerifyPassword接口里
---
pages/modal/3200.vue | 402 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 231 insertions(+), 171 deletions(-)
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 0f03e85..3b0a5a3 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -271,15 +271,41 @@
margin-bottom: 5px;
}
.dv_panel_content .dv_panel_attr i{
- vertical-align: 22px;
+ vertical-align: super;
margin: 0 10px;
}
.dv_panel_content .dv_panel_attr .circel_node{}
/* 鏄彵褰㈢殑 */
-.dv_panel_content .dv_panel_attr .dv_diamond_node {}
-.dv_panel_content .dv_panel_attr .dv_box_node{
- display: inline-block;
- text-align: center;
+.dv_panel_content .dv_panel_attr .dv_diamond_node p{
+ width: 50px;
+ height: 50px;
+ background-color: #4D6AF4;
+ transform: rotate(45deg);
+ -ms-transform: rotate(45deg);
+ -moz-transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ -o-transform: rotate(45deg);
+ margin: 15px auto;
+ padding: 9px;
+ // line-height: 28px;
+ text-align: center;
+}
+.dv_panel_content .dv_panel_attr .dv_diamond_node p span{
+ color: #fff;
+ transform: rotate(-45deg);
+ display: inline-block;
+ text-align: center;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ // white-space: nowrap;
+}
+/* 榛樿褰�*/
+.dv_panel_content .dv_panel_attr .dv_box_node,
+.dv_panel_content .dv_panel_attr .dv_diamond_node{
+ vertical-align: middle;
+ display: inline-block;
+ text-align: center;
+ width: 100px;
}
.dv_panel_content .dv_panel_attr .dv_box_node p{
background: #4D6AF4;
@@ -311,24 +337,6 @@
<template>
<view class="content">
- <!-- <view class="dv_panel_condent">
- <view class="dv_panel_attr">
- <label>No锛�/label>
- <span>TA240129-00001</span>
- </view>
- <view class="dv_panel_attr">
- <view class="dv_inline">
- <p>姣涙枡绾胯竟</p>
- <label>L002-1</label>
- </view>
- <i class="mobox-normal-right"></i>
- <view class="dv_inline">
- <p>姣涙枡绾胯竟</p>
- <label>L003-3</label>
- </view>
- </view>
- </view> -->
-
<view class="v-content">
<!-- 琛ㄥご鏍峰紡 -->
<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" v-if="isFilter==true">
@@ -392,12 +400,12 @@
</div>
<div class="dv_panel_attr">
<div class="dv_box_node">
- <p>姣涙枡绾胯竟</p>
+ <p><span>姣涙枡绾胯竟</span></p>
<label>L002-1</label>
</div>
<i class="mobox-normal-right"></i>
<div class="dv_box_node">
- <p>姣涙枡绾胯竟</p>
+ <p><span>姣涙枡绾胯竟</span></p>
<label>L003-3</label>
</div>
</div>
@@ -666,35 +674,85 @@
uni.setNavigationBarTitle({ title: options.titlename}); //璁剧疆椤堕儴鏍囬
this.$data.title = options.titlename;
this.$data.param = JSON.parse(options.param);
- this.isFilter=true;
- if(this.param.ShowFilter)
- this.isFilter=false;
- //鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�- if(this.param.Query_Panel){
- this.Head_UIStyleGetInfo(this.param.DataCls.id,this.param.Query_Panel.id);
- }
- if(this.param.ListPage.ListItem_UIDef?.ui_type=="HTML椤甸潰"){
- // HTML椤甸潰
- //鑾峰彇鏁版嵁绫荤殑HTML椤甸潰
- await this.Html_UIstyleGetInfo(this.param.DataCls.id,this.param.ListPage.ListItem_UIDef.id);
- }else{
- await this.Detail1_UIstyleGetInfo(this.param.DataCls.id,this.param.ListPage.ListItem_UIDef.id);
- }
- this.orderby = this.param.Order?this.param.Order:'T_CREATE Desc';
- if(this.param.Query_Event){
- await this.onSearChange(this.param.DataCls.id,this.param.Query_Event.id);
- } else{
- this.wheres = this.param.Condition;
- this.pageindex = 1;
- this.page_size = 3;
- this.query_id = "";
- await this.loadDataGetList();
- }
- console.log(this.$data.param);
+ this.initial();
+ // this.isFilter=true;
+ // if(this.param.ShowFilter)
+ // this.isFilter=false;
+ // //鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�+ // if(this.param.Query_Panel){
+ // this.Head_UIStyleGetInfo(this.param.DataCls.id,this.param.Query_Panel.id);
+ // }
+ // if(this.param.ListPage.ListItem_UIDef?.ui_type=="HTML椤甸潰"){
+ // // HTML椤甸潰
+ // //鑾峰彇鏁版嵁绫荤殑HTML椤甸潰
+ // await this.Html_UIstyleGetInfo(this.param.DataCls.id,this.param.ListPage.ListItem_UIDef.id);
+ // }else{
+ // await this.Detail1_UIstyleGetInfo(this.param.DataCls.id,this.param.ListPage.ListItem_UIDef.id);
+ // }
+ // this.orderby = this.param.Order?this.param.Order:'T_CREATE Desc';
+ // if(this.param.Query_Event){
+ // await this.onSearChange(this.param.DataCls.id,this.param.Query_Event.id);
+ // } else{
+ // this.wheres = this.param.Condition;
+ // this.pageindex = 1;
+ // this.page_size = 3;
+ // this.query_id = "";
+ // await this.loadDataGetList();
+ // }
+ // console.log(this.$data.param);
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� // this.focusMateria=true;
},
methods: {
+ //鍒濆鍖�+ async initial(){
+ this.styledef={};
+ this.head_styledef={
+ form:{
+ items:[]
+ }
+ };
+ this.detail1_styledef={};
+ this.detail1StyleDefList=[];
+ this.detail2_styledef={};
+ this.detail2StyleDefList=[];
+ this.items=[];
+ this.active_id='';
+ this.activelist=[];
+ this.ListHtml_Panel="";
+ this.ListPageHtml_Show= {
+ name: "",
+ event: {
+ id: "",
+ name: ""
+ }
+ };
+
+ this.isFilter=true;
+ if(this.param.ShowFilter)
+ this.isFilter=false;
+ //鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�+ if(this.param.Query_Panel){
+ this.Head_UIStyleGetInfo(this.param.DataCls.id,this.param.Query_Panel.id);
+ }
+ if(this.param.ListPage.ListItem_UIDef?.ui_type=="HTML椤甸潰"){
+ // HTML椤甸潰
+ //鑾峰彇鏁版嵁绫荤殑HTML椤甸潰
+ await this.Html_UIstyleGetInfo(this.param.DataCls.id,this.param.ListPage.ListItem_UIDef.id);
+ }else{
+ await this.Detail1_UIstyleGetInfo(this.param.DataCls.id,this.param.ListPage.ListItem_UIDef.id);
+ }
+ this.orderby = this.param.Order?this.param.Order:'T_CREATE Desc';
+ if(this.param.Query_Event){
+ await this.onSearChange(this.param.DataCls.id,this.param.Query_Event.id);
+ } else{
+ this.wheres = this.param.Condition;
+ this.pageindex = 1;
+ this.page_size = 3;
+ this.query_id = "";
+ await this.loadDataGetList();
+ }
+ },
//婊氬姩鍒板簳閮ㄥ悗鎳掑姞杞芥暟鎹� async scrolltolower(e) {
// console.log(e)
@@ -1063,10 +1121,10 @@
//鍒锋柊
Refresh(value){
//鍒锋柊褰撳墠椤甸潰
- // location.reload();
- uni.redirectTo({
- url:'../modal/3200?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
- });
+ this.initial();
+ // uni.redirectTo({
+ // url:'../modal/3200?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title,
+ // });
},
//鐐瑰嚮鏄剧ず娴忚瀵硅薄鏄剧ず椤甸潰
async onViewPageClick(style){
@@ -1095,6 +1153,7 @@
start_transaction: true,
class_id: $this.param.DataCls.id,
event_id: eventid,
+ data_obj_id:$this.styledef.form.objId,
obj_attr,
input_param,
});
@@ -1302,7 +1361,7 @@
// $this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
setTimeout(function(){
uni.hideKeyboard();
- },100);
+ },1000);
// },500);
}
// if(onSuffixClickCallbackEvent.id){ //鍚庡浘鏍囩偣鍑讳簨浠�@@ -1503,9 +1562,9 @@
},
cancel(e){ //鍙栨秷
- var eventChannel = this.$scope.eventChannel;
- // const eventChannel = this.getOpenerEventChannel();
- eventChannel.emit('view_3201',"");
+ // var eventChannel = this.$scope.eventChannel;
+ // // const eventChannel = this.getOpenerEventChannel();
+ // eventChannel.emit('view_3201',"");
uni.navigateBack({
delta:1 ,//杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
@@ -1530,127 +1589,128 @@
* ]
* }
*/
+
toWhereBase64String(list) {
- if (typeof list == 'string') list = [list]
- var sql = []
- var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
- list.forEach(ls => {
- var where = ls.trim().toLowerCase()
- if (where.startsWith('(') && where.endsWith(')')) where = where.replace(/^\(/, '').replace(/\)$/, '')
- if (where.includes(' and ')) {
- // 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
- where.split(' and ').forEach(li => {
- var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
- var sep = ''
- for (var i = 0; i < seps.length; i++) {
- if (l.includes(seps[i])) {
- sep = seps[i]
- break
- }
- }
- if (sep) {
- var values = l.split(sep)
- var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
- var value = ''
- var op = sep.trim()
+ if (typeof list == 'string') list = [list]
+ var sql = []
+ var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
+ list.forEach(ls => {
+ var where = ls.trim()
+ if (where.startsWith('(') && where.endsWith(')')) where = where.replace(/^\(/, '').replace(/\)$/, '')
+ if (where.toLowerCase().includes(' and ')) {
+ // 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
+ where.split(/ and /i).forEach(li => {
+ var l = li.trim()
+ if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
+ var sep = ''
+ for (var i = 0; i < seps.length; i++) {
+ if (l.toLowerCase().includes(seps[i])) {
+ sep = seps[i]
+ break
+ }
+ }
+ if (sep) {
+ var values = l.split(new RegExp(sep, 'i'))
+ var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+ var value = ''
+ var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[1].includes('select ') && values[1].includes(' from ')) {
- value = l.replace(field, '').replace(/^\s*(in|not in)\s*/, '').trim()
- if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
- }
- else {
- value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+ if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') && values[1]?.toLowerCase().includes(' from ')) {
+ value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
+ if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
+ }
+ else {
+ value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
- if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '').replace(/\)$/, '')
- value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
- }
- }
- sql.push([{ field, value, op }])
- }
- })
- }
- else if (where.includes(' or ')) {
- // 浜岀骇or鏀惧湪绗簩绾у悓涓�粍鏁扮粍涓�- var s = []
- where.split(' or ').forEach(li => {
- var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
- var sep = ''
- for (var i = 0; i < seps.length; i++) {
- if (l.includes(seps[i])) {
- sep = seps[i]
- break
- }
- }
- if (sep) {
- var values = l.split(sep)
- var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
- var value = ''
- var op = sep.trim()
+ if (['in', 'not in'].includes(op)) {
+ value = value.replace(/^\(/, '').replace(/\)$/, '')
+ value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
+ }
+ }
+ sql.push([{ field, value, op }])
+ }
+ })
+ }
+ else if (where.toLowerCase().includes(' or ')) {
+ // 浜岀骇or鏀惧湪绗簩绾у悓涓�粍鏁扮粍涓�+ var s = []
+ where.split(/ or /i).forEach(li => {
+ var l = li.trim()
+ if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
+ var sep = ''
+ for (var i = 0; i < seps.length; i++) {
+ if (l.toLowerCase().includes(seps[i])) {
+ sep = seps[i]
+ break
+ }
+ }
+ if (sep) {
+ var values = l.split(new RegExp(sep, 'i'))
+ var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+ var value = ''
+ var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[1].includes('select ') && values[1].includes(' from ')) {
- value = l.replace(field, '').replace(/^\s*(in|not in)\s*/, '').trim()
- if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
- }
- else {
- value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+ if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') && values[1]?.toLowerCase().includes(' from ')) {
+ value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
+ if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
+ }
+ else {
+ value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
- if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '').replace(/\)$/, '')
- value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
- }
- }
- sql.push([{ field, value, op }])
- }
- })
- sql.push(s)
- }
- else {
- var li = where
- // 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
- var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
- var sep = ''
- for (var i = 0; i < seps.length; i++) {
- if (l.includes(seps[i])) {
- sep = seps[i]
- break
- }
- }
- if (sep) {
- var values = l.split(sep)
- var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
- var value = ''
- var op = sep.trim()
+ if (['in', 'not in'].includes(op)) {
+ value = value.replace(/^\(/, '').replace(/\)$/, '')
+ value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
+ }
+ }
+ sql.push([{ field, value, op }])
+ }
+ })
+ sql.push(s)
+ }
+ else {
+ var li = where
+ // 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
+ var l = li.trim()
+ if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
+ var sep = ''
+ for (var i = 0; i < seps.length; i++) {
+ if (l.toLowerCase().includes(seps[i])) {
+ sep = seps[i]
+ break
+ }
+ }
+ if (sep) {
+ var values = l.split(new RegExp(sep,'i'))
+ var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+ var value = ''
+ var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[1].includes('select ') && values[1].includes(' from ')) {
- value = l.replace(field, '').replace(/^\s*(in|not in)\s*/, '').trim()
- if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
- }
- else {
- value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+ if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') && values[1]?.toLowerCase().includes(' from ')) {
+ value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
+ if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
+ }
+ else {
+ value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
- if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '').replace(/\)$/, '')
- value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
- }
- }
- sql.push([{ field, value, op }])
- }
- }
- })
+ if (['in', 'not in'].includes(op)) {
+ value = value.replace(/^\(/, '').replace(/\)$/, '')
+ value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
+ }
+ }
+ sql.push([{ field, value, op }])
+ }
+ }
+ })
- if (sql.length > 0)
- return Base64.encode(JSON.stringify({
- model: 1,
- condition: sql
- }))
- else
- return ''
- }
-
+ if (sql.length > 0)
+ return Base64.encode(JSON.stringify({
+ model: 1,
+ condition: sql
+ }))
+ else
+ return ''
+ },
+
},
};
</script>
--
Gitblit v1.9.1