From a2868a1c9a26a0d8c25fce5f3a4be09e6253c3d6 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 9 Jun 2022 12:03:43 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/AssignedBy/index.vue | 6 ++++++ jero-web/src/mixins/JeroListMixin.js | 2 ++ jero-web/src/views/projectManagement/dialog/configure.vue | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 12bbb7ef4..9441b302a 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -138,8 +138,14 @@ export default { pageSize: this.pageSize, ...this.form } + if(this.form.username !== undefined) { + this.form.username = `*${this.form.username}*` + } getAction(`sys/user/page`, params).then(res => { if (res.success) { + if(this.form.username !== undefined) { + this.form.username = this.form.username.slice(1,this.form.username.length-1) + } this.areaTable = [...res.result.records] this.total = res.result.total } diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index a02e10385..a63723895 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -81,6 +81,7 @@ export const JeroListMixin = { if (arg === 1) { this.ipagination.current = 1; } + var params = this.getQueryParams();//查询条件 this.loading = true; getAction(this.url.list, params).then((res) => { @@ -123,6 +124,7 @@ export const JeroListMixin = { sqp['superQueryParams']=encodeURI(this.superQueryParams) sqp['superQueryMatchType'] = this.superQueryMatchType } + console.log(this.queryParam,'this.queryParam') var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters); param.field = this.getQueryField(); param.pageNo = this.ipagination.current; diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index f15450981..41740661d 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -16,6 +16,7 @@
+ * {{$t('configurationName')}}
@@ -30,6 +31,7 @@
+ * {{$t('Version')}}
@@ -45,6 +47,7 @@
+ * {{$t('Model')}}
@@ -59,6 +62,7 @@
+ * {{$t('Battery')}}
@@ -74,6 +78,7 @@
+ * {{$t('electricMachinery')}}