From 74bdc8f68ecea25840540ede26cd8596c1b0ee9a Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 10 May 2023 14:26:06 +0800
Subject: [PATCH] =?UTF-8?q?ota-=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../upgradeactivityrecord/index.vue           | 53 +++++++++++++++++-
 .../vehicleinformation/index.vue              | 56 ++++++++++++++++++-
 4 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a887cd5d6..7d1275aa0 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1829,4 +1829,5 @@ module.exports = {
   GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
   statisticalNodes:'Statistical Nodes',
   proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility',
+  contentsearch:'Content Search',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c8e96fe35..ab702cd81 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1930,4 +1930,5 @@ module.exports = {
   GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
   statisticalNodes:'统计节点',
   proportionWithInTheAreaOfResponsibility:'责任领域内占比',
+  contentsearch:'内容搜索',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
index d6a15c946..feb4c9855 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
@@ -48,6 +48,40 @@
       :maskClosable="false"
       @close="handleCancel"
     >
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('contentsearch')">
+                  <span>{{$t('contentsearch')}}</span>
+                </div>
+                <a-input
+                  class="box-input"
+                  :placeholder="$t('PleaseEnter')+$t('contentsearch')"
+                  v-model='queryParam.realname' />
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('module')">
+                  <span>{{$t('module')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" type="select"
+                                   v-model="queryParam.module"
+                                   dictCode="O_T_A_che1_xing2_mo2_kuai4"
+                                   :placeholder="$t('PleaseSelect')+$t('module')"/>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
       <!--      :components="drag(columnshistory,'columnshistory')"-->
       <a-table
         class="table"
@@ -118,9 +152,16 @@ export default {
   data() {
     return {
       title: '',
-      queryParam: {
-        projectName:this.$route.query.projectName?this.$route.query.projectName:''
+      queryParam: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
       },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      rules: {},
       visible:false,
       confirmLoading: false,
       pageNohistory: 1,
@@ -198,6 +239,7 @@ export default {
     },
     bussLogList(val) {
       let query = {
+        ...this.queryParam,
         pageNo: this.pageNohistory,
         pageSize: this.pageSizehistory,
         otaId:localStorage.getItem('otaId')
@@ -213,6 +255,13 @@ export default {
         }
       })
     },
+    searchQuery() {
+      this.bussLogList()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.bussLogList()
+    },
     handleOk() {
       this.pageNohistory = 1
       this.visible = false
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
index 7997af34d..d62bd937a 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
@@ -48,6 +48,40 @@
       :maskClosable="false"
       @close="handleCancel"
     >
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('contentsearch')">
+                  <span>{{$t('contentsearch')}}</span>
+                </div>
+                <a-input
+                  class="box-input"
+                  :placeholder="$t('PleaseEnter')+$t('contentsearch')"
+                  v-model='queryParam.realname' />
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('module')">
+                  <span>{{$t('module')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" type="select"
+                                   v-model="queryParam.module"
+                                   dictCode="O_T_A_che1_xing2_mo2_kuai4"
+                                   :placeholder="$t('PleaseSelect')+$t('module')"/>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 17px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button"  @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
       <!--      :components="drag(columnshistory,'columnshistory')"-->
       <a-table
         class="table"
@@ -118,9 +152,17 @@ export default {
   data() {
     return {
       title: '',
-      queryParam: {
-        projectName:this.$route.query.projectName?this.$route.query.projectName:''
+      queryParam: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
       },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      rules: {},
+      spinLoading: false,
       visible:false,
       confirmLoading: false,
       pageNohistory: 1,
@@ -199,6 +241,7 @@ export default {
     },
     bussLogList(val) {
       let query = {
+        ...this.queryParam,
         pageNo: this.pageNohistory,
         pageSize: this.pageSizehistory,
         otaId:localStorage.getItem('otaId')
@@ -214,6 +257,13 @@ export default {
         }
       })
     },
+    searchQuery() {
+      this.bussLogList()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.bussLogList()
+    },
     handleOk() {
       this.pageNohistory = 1
       this.visible = false
@@ -302,7 +352,7 @@ export default {
 
 .title-text {
   width: 20%;
-  min-width: 110px;
+  min-width: 90px;
   color: #000F16;
   display: inline-block;
   font-weight: 500;