From 10743074fffe57e6b649d704bcbc86cbd024aeb7 Mon Sep 17 00:00:00 2001
From: 13218645326 <sjf13651675634@163.com>
Date: Sat, 9 Dec 2023 21:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.dev                                  |  2 +-
 src/components/com/editorWang.vue             |  2 +-
 src/views/Login.vue                           |  4 +-
 src/views/com/1.vue                           | 26 ++---
 .../privacyAgreement/com/addCom.vue           |  4 +-
 .../privacyAgreement/com/headerTop.vue        |  2 +-
 .../configuration/privacyAgreement/index.vue  |  2 +-
 .../com/addCom.vue                            |  4 +-
 .../com/headerTop.vue                         |  6 +-
 .../configuration/swiperConfig/com/addCom.vue |  2 +-
 .../swiperConfig/com/headerTop.vue            |  4 +-
 .../equipmentListingApproval/com/addCom.vue   |  2 +-
 .../com/headerTop.vue                         | 14 +--
 .../equipmentListingApproval/index.vue        | 96 ++++++++++++-------
 .../iotEquipmentManagement/com/addCom.vue     |  2 +-
 .../iotEquipmentManagement/com/headerTop.vue  |  4 +-
 .../businessReview/com/addCom.vue             |  4 +-
 .../businessReview/com/headerTop.vue          | 10 +-
 .../enterpriseEntryReview/com/addCom.vue      |  4 +-
 .../enterpriseEntryReview/com/headerTop.vue   |  8 +-
 .../enterpriseEntryReview/index.vue           |  6 ++
 .../enterpriseInfo/com/addCom.vue             |  4 +-
 .../enterpriseInfo/com/headerTop.vue          |  8 +-
 .../enterpriseType/com/addCom.vue             |  4 +-
 .../enterpriseType/com/headerTop.vue          | 10 +-
 .../enterpriseType/index.vue                  |  2 +-
 .../lonLatPick/com/addCom.vue                 |  6 +-
 .../lonLatPick/com/headerTop.vue              |  4 +-
 src/views/orderManagement/com/headerTop.vue   | 14 +--
 src/views/orderManagement/com/infoCom.vue     |  2 +-
 .../systemManage/systemLog/com/addCom.vue     |  4 +-
 .../systemManage/systemLog/com/headerTop.vue  |  4 +-
 .../systemManage/systemVersion/com/addCom.vue |  4 +-
 .../systemVersion/com/headerTop.vue           |  6 +-
 .../systemManage/userManage/com/addCom.vue    |  8 +-
 .../systemManage/userManage/com/headerTop.vue |  4 +-
 36 files changed, 160 insertions(+), 132 deletions(-)

diff --git a/env/.env.dev b/env/.env.dev
index 50c8a19..891cf15 100644
--- a/env/.env.dev
+++ b/env/.env.dev
@@ -5,5 +5,5 @@ VITE_BUILD_MODE = 'dev'
 # 开发环境接口地址
 VITE_API_URL = '/proxyApi'
 
-VITE_proxyTarget = 'http://10.40.92.16:9206' 
+VITE_proxyTarget = 'http://10.40.92.16:9502' 
 # 9502  9206
\ No newline at end of file
diff --git a/src/components/com/editorWang.vue b/src/components/com/editorWang.vue
index 36dfb51..1bc2c8d 100644
--- a/src/components/com/editorWang.vue
+++ b/src/components/com/editorWang.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="border: 1px solid #ccc">
     <Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig" :mode="mode" />
-    <Editor style="height: 500px; overflow-y: hidden;" v-model="valueHtml"  :defaultConfig="editorConfig" :mode="mode"
+    <Editor style="height: 500px; overflow-y: hidden;" v-model.trim="valueHtml"  :defaultConfig="editorConfig" :mode="mode"
       @onCreated="handleCreated" />
   </div>
 </template>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8a46818..640c272 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -39,11 +39,11 @@
 
                 <el-form>
                     <el-form-item>
-                        <el-input v-model="loginForm.username" placeholder="账号" clearable />
+                        <el-input v-model.trim="loginForm.username" placeholder="账号" clearable />
                     </el-form-item>
                     <el-form-item>
                         <el-input
-                            v-model="loginForm.password"
+                            v-model.trim="loginForm.password"
                             placeholder="密码"
                             clearable
                             type="password"
diff --git a/src/views/com/1.vue b/src/views/com/1.vue
index 8e6baf5..92daf50 100644
--- a/src/views/com/1.vue
+++ b/src/views/com/1.vue
@@ -24,7 +24,7 @@
                             <el-select
                                 placeholder="请选择企业类型"
                                 clearable
-                                v-model="applyParams.companyType"
+                                v-model.trim="applyParams.companyType"
                                 @change="changeProvince">
                                 <el-option
                                     v-for="item in selcompanyTypeList"
@@ -41,7 +41,7 @@
                             <el-select
                                 placeholder="请选择企业所属"
                                 clearable
-                                v-model="applyParams.companyLtd"
+                                v-model.trim="applyParams.companyLtd"
                                 @change="changeProvince">
                                 <el-option
                                     v-for="item in selcompanyLtdList"
@@ -67,7 +67,7 @@
                             <el-select
                                 placeholder="请选择省份"
                                 clearable
-                                v-model="applyParams.registerAddress"
+                                v-model.trim="applyParams.registerAddress"
                                 @change="changeProvince">
                                 <el-option
                                     v-for="item in selProvinceList"
@@ -78,7 +78,7 @@
                         </el-col>
                         <el-col :span="5">
                             <el-select
-                                v-model="applyParams.registerAddressProvince"
+                                v-model.trim="applyParams.registerAddressProvince"
                                 placeholder="请选择市"
                                 @change="changeMarket"
                                 clearable>
@@ -91,7 +91,7 @@
                         </el-col>
                         <el-col :span="5">
                             <el-select
-                                v-model="applyParams.registerAddressArea"
+                                v-model.trim="applyParams.registerAddressArea"
                                 placeholder="请选择区"
                                 clearable
                                 @change="changeArea">
@@ -104,7 +104,7 @@
                         </el-col>
                         <el-col :span="6">
                             <el-input
-                                v-model="applyParams.registerRealityAddress"
+                                v-model.trim="applyParams.registerRealityAddress"
                                 placeholder="请输入实际办公地址"
                                 clearable></el-input>
                         </el-col>
@@ -117,7 +117,7 @@
                             <el-select
                                 placeholder="请选择省份"
                                 clearable
-                                v-model="applyParams.operateAddress"
+                                v-model.trim="applyParams.operateAddress"
                                 @change="opeChangeProvince">
                                 <el-option
                                     v-for="item in selProvinceList"
@@ -128,7 +128,7 @@
                         </el-col>
                         <el-col :span="5">
                             <el-select
-                                v-model="applyParams.operateAddressProvince"
+                                v-model.trim="applyParams.operateAddressProvince"
                                 placeholder="请选择市"
                                 @change="opeChangeMarket"
                                 clearable>
@@ -141,7 +141,7 @@
                         </el-col>
                         <el-col :span="5">
                             <el-select
-                                v-model="applyParams.operateAddressArea"
+                                v-model.trim="applyParams.operateAddressArea"
                                 placeholder="请选择区"
                                 @change="opeChangeArea"
                                 clearable>
@@ -154,7 +154,7 @@
                         </el-col>
                         <el-col :span="6">
                             <el-input
-                                v-model="applyParams.operateRealityAddress"
+                                v-model.trim="applyParams.operateRealityAddress"
                                 clearable
                                 placeholder="请输入实际办公地址"></el-input>
                         </el-col>
@@ -165,7 +165,7 @@
                     <el-col :span="5">
                         <el-form-item label="法人证件类型">
                             <el-select
-                                v-model="applyParams.certificatetype"
+                                v-model.trim="applyParams.certificatetype"
                                 clearable
                                 placeholder="请选法人证件类型">
                                 <el-option
@@ -415,7 +415,7 @@
             <el-table border :data="bankTableList">
                 <el-table-column align="center" label="开户行">
                     <template #default="{ row }">
-                        <el-input v-model="row.v_kaihu"></el-input>
+                        <el-input v-model.trim="row.v_kaihu"></el-input>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="账号名称">
@@ -460,7 +460,7 @@
             </el-form-item>
         </el-row>
 
-        <el-dialog v-model="picItemVisible" title="图片示例" width="40%">
+        <el-dialog v-model.trim="picItemVisible" title="图片示例" width="40%">
             <el-image :src="previewPicUrl" fit="cover" style="display: block; margin: 0 auto" />
         </el-dialog>
     </div>
diff --git a/src/views/configuration/privacyAgreement/com/addCom.vue b/src/views/configuration/privacyAgreement/com/addCom.vue
index 66661f4..ccd10bc 100644
--- a/src/views/configuration/privacyAgreement/com/addCom.vue
+++ b/src/views/configuration/privacyAgreement/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
+  <el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="模版编号：" prop="title">
         <el-input v-model.trim="form.title" placeholder="请输入模版编号" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="应用模块" prop="applyModel">
-        <el-select v-model="form.applyModel" placeholder="Select" clearable filterable style="width: 100%;">
+        <el-select v-model.trim="form.applyModel" placeholder="Select" clearable filterable style="width: 100%;">
           <el-option v-for="item in applyModelList.list" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/configuration/privacyAgreement/com/headerTop.vue b/src/views/configuration/privacyAgreement/com/headerTop.vue
index 282dc49..e299ce5 100644
--- a/src/views/configuration/privacyAgreement/com/headerTop.vue
+++ b/src/views/configuration/privacyAgreement/com/headerTop.vue
@@ -3,7 +3,7 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="是否启用">
-                <el-select v-model="filterForm.isEnable" placeholder="请选择是否启用"  clearable filterable >
+                <el-select v-model.trim="filterForm.isEnable" placeholder="请选择是否启用"  clearable filterable >
                     <el-option v-for="item in isEnableList.list" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
diff --git a/src/views/configuration/privacyAgreement/index.vue b/src/views/configuration/privacyAgreement/index.vue
index 53c1436..00f16c2 100644
--- a/src/views/configuration/privacyAgreement/index.vue
+++ b/src/views/configuration/privacyAgreement/index.vue
@@ -11,7 +11,7 @@
             <el-table-column prop="v_attachment" label="附件" min-width="120" />
             <el-table-column prop="v_isEnable" label="是否启用" min-width="220">
                 <template #default="scope">
-                    <el-switch v-model="scope.row.v_isEnable" :before-change="beforeChange" />
+                    <el-switch v-model.trim="scope.row.v_isEnable" :before-change="beforeChange" />
                 </template>
             </el-table-column>
             <el-table-column label="操作" width="210" align="center">
diff --git a/src/views/configuration/specialInformationConfiguration/com/addCom.vue b/src/views/configuration/specialInformationConfiguration/com/addCom.vue
index b938f1b..0334349 100644
--- a/src/views/configuration/specialInformationConfiguration/com/addCom.vue
+++ b/src/views/configuration/specialInformationConfiguration/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
+  <el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
     <el-form :model="form" ref="ruleFormRef" label-width="88px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="标题：" prop="title">
         <el-input v-model.trim="form.title" placeholder="请输入标题" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="分类" prop="category">
-        <el-select v-model="form.category" placeholder="Select" clearable filterable>
+        <el-select v-model.trim="form.category" placeholder="Select" clearable filterable>
           <el-option v-for="item in categoryList.list" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/configuration/specialInformationConfiguration/com/headerTop.vue b/src/views/configuration/specialInformationConfiguration/com/headerTop.vue
index aafb324..d5007af 100644
--- a/src/views/configuration/specialInformationConfiguration/com/headerTop.vue
+++ b/src/views/configuration/specialInformationConfiguration/com/headerTop.vue
@@ -3,15 +3,15 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="分类">
-                <el-select v-model="filterForm.category" placeholder="Select"  clearable filterable >
+                <el-select v-model.trim="filterForm.category" placeholder="Select"  clearable filterable >
                     <el-option v-for="item in categoryList.list" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
             <el-form-item label="关键字">
-                <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item>
             <el-form-item label="时间范围">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To"
                     start-placeholder="Start date" end-placeholder="End date" />
             </el-form-item>
             <el-form-item>
diff --git a/src/views/configuration/swiperConfig/com/addCom.vue b/src/views/configuration/swiperConfig/com/addCom.vue
index b349e47..41791bd 100644
--- a/src/views/configuration/swiperConfig/com/addCom.vue
+++ b/src/views/configuration/swiperConfig/com/addCom.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable  :close-on-click-modal="false" >
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable  :close-on-click-modal="false" >
     <el-form :model="form" ref="ruleFormRef" label-width="88px" :rules="formRules" style="padding: 0 80px 0px 0;"  >
       <el-form-item label="标题：" prop="title">
         <el-input v-model.trim="form.title" placeholder="请输入标题" clearable maxlength="30" />
diff --git a/src/views/configuration/swiperConfig/com/headerTop.vue b/src/views/configuration/swiperConfig/com/headerTop.vue
index c420522..c7cda8a 100644
--- a/src/views/configuration/swiperConfig/com/headerTop.vue
+++ b/src/views/configuration/swiperConfig/com/headerTop.vue
@@ -3,10 +3,10 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="关键字">
-                <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item>
             <el-form-item label="时间范围">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
                     end-placeholder="End date" />
             </el-form-item>
             <el-form-item>
diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue
index 5bd467f..489681e 100644
--- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" :inline="true" label-width="106px" :rules="formRules"
       style="padding: 0 0px 0px 0;">
       <el-form-item label="企业名称：" prop="enterprise">
diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue
index ce05a92..f5432cf 100644
--- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/headerTop.vue
@@ -3,20 +3,20 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <!-- <el-form-item label="关键字">
-                <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item> -->
 
             <el-form-item label="编码">
-                <el-input v-model="filterForm.code" placeholder="请输入编码" clearable />
+                <el-input v-model.trim="filterForm.code" placeholder="请输入编码" clearable />
             </el-form-item>
             <el-form-item label="装备名称">
-                <el-input v-model="filterForm.name" placeholder="请输入装备名称" clearable />
+                <el-input v-model.trim="filterForm.name" placeholder="请输入装备名称" clearable />
             </el-form-item>
             <el-form-item label="企业名称">
-                <el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
+                <el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
             </el-form-item>
             <el-form-item label="装备类型">
-                <el-cascader :options="treeList" filterable v-model="filterForm.typeId" clearable :props="{
+                <el-cascader :options="treeList" filterable v-model.trim="filterForm.typeId" clearable :props="{
                     label: 'name',
                     value: 'id'
 
@@ -53,7 +53,7 @@ const filterForm = reactive({
     code: "",
     name: '',
     companyName: "",
-    typeId: ''
+    typeId: []
 })
 
 const treeList = ref([])
@@ -66,7 +66,7 @@ const resetFn = () => {
     filterForm.code = ""
     filterForm.name = ''
     filterForm.companyName = ""
-    filterForm.typeId = ''
+    filterForm.typeId = []
 
     emits('reset', filterForm)
 }
diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue
index 75787ee..158af56 100644
--- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue
+++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/index.vue
@@ -1,14 +1,14 @@
 <template>
-    <headerTop @search="searchFn" @reset="resetFn" @export="exportFn" @deleteBatch="deleteBatchFn" @auditBatch="auditBatchFn"  :selectItemList="selectItemList"></headerTop>
+    <headerTop @search="searchFn" @reset="resetFn" @export="exportFn" @deleteBatch="deleteBatchFn"
+        @auditBatch="auditBatchFn" :selectItemList="selectItemList"></headerTop>
     <addCom ref="addComRef" @send="initTableList"></addCom>
     <el-card shadow="always" class="content_body_row">
         <el-table :data="tableListInfo.list" border style="width: 100%" show-overflow-tooltip
             :max-height="'calc(100vh - 72px - 48px - 65px - 12px - 60px - 88px)'"
-            :height="'calc(100vh - 72px - 48px - 65px - 12px - 60px  - 88px)'"
-            :row-key="getRowKeys"  @selection-change="handleSelectionChange"
-            :header-cell-style="{ background: '#F2F3F5' }">
+            :height="'calc(100vh - 72px - 48px - 65px - 12px - 60px  - 88px)'" :row-key="getRowKeys"
+            @selection-change="handleSelectionChange" :header-cell-style="{ background: '#F2F3F5' }">
             <el-table-column type="selection" width="55" :reserve-selection="true" />
-            <el-table-column type="index" width="72" label="序号"  />
+            <el-table-column type="index" width="72" label="序号" />
             <el-table-column prop="companyName" label="企业名称" min-width="150" />
             <el-table-column prop="code" label="编码" min-width="160">
             </el-table-column>
@@ -16,35 +16,35 @@
             </el-table-column>
             <el-table-column prop="parentDevType" label="装备类型" min-width="160">
             </el-table-column>
- 
+
             <el-table-column prop="devName" label="装备名称" min-width="160">
             </el-table-column>
             <el-table-column prop="v_money" label="租金" min-width="160">
                 <template #default="scope">
                     <div>
-                        {{scope.row.monthLeasePrice  }}
+                        {{ scope.row.monthLeasePrice }}
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column   label="状态" min-width="160">
+            <el-table-column label="状态" min-width="160">
                 <template #default="scope">
-                    <div class="todo_status_c" v-if="scope.row.maStatus=='15'">
+                    <div class="todo_status_c" v-if="scope.row.maStatus == '15'">
                         待上架
 
                     </div>
-                    <div class="pass_status_c" v-else-if="scope.row.maStatus=='16'">
-                        待租 
+                    <div class="pass_status_c" v-else-if="scope.row.maStatus == '16'">
+                        待租
                     </div>
-                    <div class="pass_status_c" v-else-if="scope.row.maStatus=='17'">
+                    <div class="pass_status_c" v-else-if="scope.row.maStatus == '17'">
                         在租
                     </div>
-                    <div class="reject_status_c" v-else-if="scope.row.maStatus=='18'">
-                       下架
+                    <div class="reject_status_c" v-else-if="scope.row.maStatus == '18'">
+                        下架
                     </div>
-                    <div class="pass_status_c" v-else-if="scope.row.maStatus=='331'">
+                    <div class="pass_status_c" v-else-if="scope.row.maStatus == '331'">
                         待审批
                     </div>
-                    <div class="pass_status_c" v-else-if="scope.row.maStatus=='332'">
+                    <div class="pass_status_c" v-else-if="scope.row.maStatus == '332'">
                         上架驳回
                     </div>
                 </template>
@@ -75,7 +75,8 @@
 import headerTop from "./com/headerTop.vue"
 import addCom from "./com/addCom.vue"
 import { ElConfirmBeforeOpert } from "utils/elementCom"
-import { apiOffList, apiUpOffList } from "http/api/equip"
+import { apiOffList, apiOff } from "http/api/equip"
+import {ElMessage} from "element-plus"
 const addComRef = ref()
 const paginationInfo = reactive({
     pageNum: 1,
@@ -85,8 +86,10 @@ let total = ref(0)
 let tableListInfo = reactive({
     list: []
 })
-let searchParams: any = {}
-const selectItemList =ref([])
+let searchParams: any = {
+    typeId: []
+}
+const selectItemList = ref([])
 
 
 const editRowFn = (row: any) => {
@@ -113,25 +116,26 @@ const deleteRowFn = (row: any) => {
 
 }
 
-const searchFn = (params:any) => {
+const searchFn = (params: any) => {
     searchParams = params
     initTableList()
 }
 
-const resetFn = (val:any) => {
-
+const resetFn = (params: any) => {
+    searchParams = params
+    initTableList()
 }
 
-const exportFn = (val:any) => {
+const exportFn = (val: any) => {
 
 }
 const auditFn = (row: any) => {
     addComRef.value.edit(row)
 }
 const showFn = (row: any) => {
-addComRef.value.open(row)
+    addComRef.value.open(row)
 }
- 
+
 
 
 
@@ -144,7 +148,8 @@ const getPageFn = (val: any) => {
 const initTableList = async () => {
     const params = {
         ...searchParams,
-        ...paginationInfo
+        ...paginationInfo,
+        typeId: searchParams.typeId.pop()
     }
     const res: any = await apiOffList(params)
     console.log("apiGetCompanyInfoSelectList", res)
@@ -153,24 +158,24 @@ const initTableList = async () => {
     total.value = res.total
 }
 
-const getRowKeys =(row:any)=>{
+const getRowKeys = (row: any) => {
     return row.maId
 }
 
-const handleSelectionChange =(val:any)=>{
-    console.log("valhandleSelectionChange",val)
-    selectItemList.value=val
+const handleSelectionChange = (val: any) => {
+    console.log("valhandleSelectionChange", val)
+    selectItemList.value = val
 }
 
-const deleteBatchFn =()=>{
-    const selectList =  selectItemList.value 
+const deleteBatchFn = () => {
+    const selectList = selectItemList.value
     console.log("selectList",)
 }
-const auditBatchFn =()=>{
-    const selectList =  selectItemList.value 
+const auditBatchFn = () => {
+    const selectList = selectItemList.value
     ElConfirmBeforeOpert(
         '操作确认',
-        '是否确定下架？',
+        '是否确定审批？',
         batchFn,
         '确定',
         '取消',
@@ -178,8 +183,25 @@ const auditBatchFn =()=>{
     )
 }
 
-const batchFn=(ev:any)=>{
-    
+const batchFn = async (ev: any) => {
+    console.log("batchFn", ev)
+
+    const params = ev.map((ele: any) => {
+        return {
+            maId: ele.maId,
+            id: ele.creator,
+            applyCompany: ele.companyName,
+            type: "1",
+            status: '1'
+        }
+    })
+    const res = await apiOff(params)
+    console.log("apiOff", res)
+    ElMessage({
+        type: 'success',
+        message: "审批成功"
+    })
+    initTableList()
 }
 
 
diff --git a/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/addCom.vue b/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/addCom.vue
index 8286d79..0b8effa 100644
--- a/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/addCom.vue
+++ b/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/addCom.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="120px" :rules="formRules" style="padding: 0 80px 0px 0;" :readonly="readOnlyFlag">
       <el-form-item label="iot设备名称：" prop="deviceName">
         <el-input v-model.trim="form.deviceName" placeholder="请输入iot设备名称" clearable maxlength="30" />
diff --git a/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/headerTop.vue b/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/headerTop.vue
index c745b2d..ee2181d 100644
--- a/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/headerTop.vue
+++ b/src/views/enterpriseEquipmentManage/iotEquipmentManagement/com/headerTop.vue
@@ -3,11 +3,11 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="关键字">
-                <el-input v-model="filterForm.keyword" placeholder="请输入设备名称" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入设备名称" clearable />
             </el-form-item>
           
             <el-form-item label="编码">
-                <el-input v-model="filterForm.code" placeholder="请输入规格型号" clearable />
+                <el-input v-model.trim="filterForm.code" placeholder="请输入规格型号" clearable />
             </el-form-item>
  
             <el-form-item >
diff --git a/src/views/enterpriseManagement/businessReview/com/addCom.vue b/src/views/enterpriseManagement/businessReview/com/addCom.vue
index f88befc..24c9575 100644
--- a/src/views/enterpriseManagement/businessReview/com/addCom.vue
+++ b/src/views/enterpriseManagement/businessReview/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="企业类型：" prop="enterprise">
         <el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="是否启用：" prop="isEnable">
-        <el-switch v-model="form.isEnable" :before-change="beforeChange" />
+        <el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/enterpriseManagement/businessReview/com/headerTop.vue b/src/views/enterpriseManagement/businessReview/com/headerTop.vue
index e566bf0..7721149 100644
--- a/src/views/enterpriseManagement/businessReview/com/headerTop.vue
+++ b/src/views/enterpriseManagement/businessReview/com/headerTop.vue
@@ -3,19 +3,19 @@
 
         <el-form :inline="true" :model="filterForm"  class="demo-form-inline">
             <!-- <el-form-item label="关键字">
-                <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item> -->
             <el-form-item label="企业名称">
-                <el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
+                <el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
             </el-form-item>
             <el-form-item label="统一社会信用代码">
-                <el-input v-model="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
+                <el-input v-model.trim="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
             </el-form-item>
             <el-form-item label="用户名">
-                <el-input v-model="filterForm.userName" placeholder="请输入用户名" clearable />
+                <el-input v-model.trim="filterForm.userName" placeholder="请输入用户名" clearable />
             </el-form-item>
             <el-form-item label="申请日期范围">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
                     end-placeholder="End date" />
             </el-form-item>
             <el-form-item style="float: right;margin-top: 12px;">
diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/com/addCom.vue b/src/views/enterpriseManagement/enterpriseEntryReview/com/addCom.vue
index f88befc..24c9575 100644
--- a/src/views/enterpriseManagement/enterpriseEntryReview/com/addCom.vue
+++ b/src/views/enterpriseManagement/enterpriseEntryReview/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="企业类型：" prop="enterprise">
         <el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="是否启用：" prop="isEnable">
-        <el-switch v-model="form.isEnable" :before-change="beforeChange" />
+        <el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue
index a3d5c38..2ad8098 100644
--- a/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue
+++ b/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue
@@ -3,16 +3,16 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="企业名称">
-                <el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
+                <el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
             </el-form-item>
             <el-form-item label="统一社会信用代码">
-                <el-input v-model="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
+                <el-input v-model.trim="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
             </el-form-item>
             <el-form-item label="用户名">
-                <el-input v-model="filterForm.userName" placeholder="请输入用户名" clearable />
+                <el-input v-model.trim="filterForm.userName" placeholder="请输入用户名" clearable />
             </el-form-item>
             <el-form-item label="发布时间">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To"
                     start-placeholder="Start date" end-placeholder="End date" />
             </el-form-item>
             <el-form-item>
diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/index.vue b/src/views/enterpriseManagement/enterpriseEntryReview/index.vue
index a4c3bf7..072cf0b 100644
--- a/src/views/enterpriseManagement/enterpriseEntryReview/index.vue
+++ b/src/views/enterpriseManagement/enterpriseEntryReview/index.vue
@@ -34,6 +34,12 @@
                     <div class="reject_status_c" v-else-if="scope.row.status == '2'">
                         已驳回
                     </div>
+                    <div class="reject_status_c" v-else-if="scope.row.status == '3'">
+                        已下架
+                    </div>
+                    <div class="reject_status_c" v-else-if="scope.row.status == '4'">
+                        已注销
+                    </div>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="160">
diff --git a/src/views/enterpriseManagement/enterpriseInfo/com/addCom.vue b/src/views/enterpriseManagement/enterpriseInfo/com/addCom.vue
index f88befc..24c9575 100644
--- a/src/views/enterpriseManagement/enterpriseInfo/com/addCom.vue
+++ b/src/views/enterpriseManagement/enterpriseInfo/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="企业类型：" prop="enterprise">
         <el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="是否启用：" prop="isEnable">
-        <el-switch v-model="form.isEnable" :before-change="beforeChange" />
+        <el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue
index 02c5dd5..491766b 100644
--- a/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue
+++ b/src/views/enterpriseManagement/enterpriseInfo/com/headerTop.vue
@@ -3,16 +3,16 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="企业名称">
-                <el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
+                <el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
             </el-form-item>
             <el-form-item label="统一社会信用代码">
-                <el-input v-model="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
+                <el-input v-model.trim="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
             </el-form-item>
             <el-form-item label="用户名">
-                <el-input v-model="filterForm.userName" placeholder="请输入用户名" clearable />
+                <el-input v-model.trim="filterForm.userName" placeholder="请输入用户名" clearable />
             </el-form-item>
             <el-form-item label="入驻日期">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
                     end-placeholder="End date" />
             </el-form-item>
             <el-form-item style="margin-top:12px;float:right;">
diff --git a/src/views/enterpriseManagement/enterpriseType/com/addCom.vue b/src/views/enterpriseManagement/enterpriseType/com/addCom.vue
index 655b7f7..38ffe9f 100644
--- a/src/views/enterpriseManagement/enterpriseType/com/addCom.vue
+++ b/src/views/enterpriseManagement/enterpriseType/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="企业类型：" prop="name">
         <el-input v-model.trim="form.name" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="是否启用：" prop="status">
-        <el-switch v-model="form.status" :before-change="beforeChange" />
+        <el-switch v-model.trim="form.status" :before-change="beforeChange" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue
index f1ff04a..2013ffb 100644
--- a/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue
+++ b/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue
@@ -5,7 +5,7 @@
                 <el-input v-model.trim="filterForm.name" placeholder="请输入企业类型" clearable maxlength="30" />
             </el-form-item>
             <el-form-item label="是否启用">
-                <el-select v-model="filterForm.status" placeholder="请选择是否启用" clearable filterable>
+                <el-select v-model.trim="filterForm.status" placeholder="请选择是否启用" clearable filterable>
                     <el-option v-for="item in isEnableList.list" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
@@ -28,12 +28,12 @@ const formRef = ref()
 const isEnableList = reactive({
     list: [{
 
-        value: 'Option1',
-        label: 'Option1',
+        value: '1',
+        label: '启用',
     },
     {
-        value: 'Option2',
-        label: 'Option2',
+        value: '0',
+        label: '禁用',
 
     }]
 })
diff --git a/src/views/enterpriseManagement/enterpriseType/index.vue b/src/views/enterpriseManagement/enterpriseType/index.vue
index ccadb5a..96d79ec 100644
--- a/src/views/enterpriseManagement/enterpriseType/index.vue
+++ b/src/views/enterpriseManagement/enterpriseType/index.vue
@@ -10,7 +10,7 @@
             <el-table-column prop="name" label="企业类型" min-width="150" />
             <el-table-column prop="status" label="是否启用" min-width="220">
                 <template #default="scope">
-                    <el-switch v-model="scope.row.status" :before-change="beforeChange.bind(this, scope.row)" />
+                    <el-switch v-model.trim="scope.row.status" :before-change="beforeChange.bind(this, scope.row)" />
                     <!-- 1 启用
                         0 禁用  -->
                 </template>
diff --git a/src/views/enterpriseManagement/lonLatPick/com/addCom.vue b/src/views/enterpriseManagement/lonLatPick/com/addCom.vue
index 06ce681..72ec23c 100644
--- a/src/views/enterpriseManagement/lonLatPick/com/addCom.vue
+++ b/src/views/enterpriseManagement/lonLatPick/com/addCom.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="地址名称：" prop="v_addressName">
         <el-input v-model.trim="form.v_addressName" placeholder="请输入企业类型" clearable maxlength="30" />
@@ -11,7 +11,7 @@
         <el-input v-model.trim="form.v_lat" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="装备类型：" prop="deviceType">
-        <el-select placeholder="请选择装备类型" clearable v-model="form.deviceType" @change="changeType">
+        <el-select placeholder="请选择装备类型" clearable v-model.trim="form.deviceType" @change="changeType">
           <el-option v-for="item in deviceTypeInfo.list" :key="item.id" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
@@ -22,7 +22,7 @@
         <el-input v-model.trim="form.deviceStatus" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="GPS编号：" prop="GPScode">
-        <el-radio-group v-model="GPScode">
+        <el-radio-group v-model.trim="GPScode">
           <el-radio :label="3">Option A</el-radio>
           <el-radio :label="6">Option B</el-radio>
           <el-radio :label="9">Option C</el-radio>
diff --git a/src/views/enterpriseManagement/lonLatPick/com/headerTop.vue b/src/views/enterpriseManagement/lonLatPick/com/headerTop.vue
index b2e6f8c..4a281f8 100644
--- a/src/views/enterpriseManagement/lonLatPick/com/headerTop.vue
+++ b/src/views/enterpriseManagement/lonLatPick/com/headerTop.vue
@@ -2,13 +2,13 @@
     <el-card shadow="always" class="search_header_top_row1">
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="地址搜索：">
-                <el-select v-model="filterForm.address" placeholder="请输入地址" clearable filterable>
+                <el-select v-model.trim="filterForm.address" placeholder="请输入地址" clearable filterable>
                     <el-option v-for="item in addressList.list" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
             </el-form-item>
             <el-form-item label="经纬度：">
-                <el-input v-model="filterForm.lngLat" placeholder="请输入经纬度" clearable />
+                <el-input v-model.trim="filterForm.lngLat" placeholder="请输入经纬度" clearable />
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" @click="serachFn">保存地点</el-button>
diff --git a/src/views/orderManagement/com/headerTop.vue b/src/views/orderManagement/com/headerTop.vue
index e62fe06..5cbfc56 100644
--- a/src/views/orderManagement/com/headerTop.vue
+++ b/src/views/orderManagement/com/headerTop.vue
@@ -3,25 +3,25 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="关键字">
-                <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item>
             <el-form-item label="装备名称">
-                <el-input v-model="filterForm.equipment" placeholder="请输入装备名称" clearable />
+                <el-input v-model.trim="filterForm.equipment" placeholder="请输入装备名称" clearable />
             </el-form-item>
             <el-form-item label="装备编号">
-                <el-input v-model="filterForm.equipment_code" placeholder="请输装备编号" clearable />
+                <el-input v-model.trim="filterForm.equipment_code" placeholder="请输装备编号" clearable />
             </el-form-item>
             <el-form-item label="订单编号">
-                <el-input v-model="filterForm.order_code" placeholder="请输入订单编号" clearable />
+                <el-input v-model.trim="filterForm.order_code" placeholder="请输入订单编号" clearable />
             </el-form-item>
             <el-form-item label="求租方企业">
-                <el-input v-model="filterForm.q_company" placeholder="请输入求租方企业名称" clearable />
+                <el-input v-model.trim="filterForm.q_company" placeholder="请输入求租方企业名称" clearable />
             </el-form-item>
             <el-form-item label="出租方企业">
-                <el-input v-model="filterForm.c_company" placeholder="请输入出租方企业名称" clearable />
+                <el-input v-model.trim="filterForm.c_company" placeholder="请输入出租方企业名称" clearable />
             </el-form-item>
             <el-form-item label="时间范围">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
                     end-placeholder="End date" />
             </el-form-item>
             <el-form-item >
diff --git a/src/views/orderManagement/com/infoCom.vue b/src/views/orderManagement/com/infoCom.vue
index 7f836fc..729054f 100644
--- a/src/views/orderManagement/com/infoCom.vue
+++ b/src/views/orderManagement/com/infoCom.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="1000px" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="1000px" draggable :close-on-click-modal="false">
     <div class="sub_title">
       订单信息
     </div>
diff --git a/src/views/systemManage/systemLog/com/addCom.vue b/src/views/systemManage/systemLog/com/addCom.vue
index f88befc..24c9575 100644
--- a/src/views/systemManage/systemLog/com/addCom.vue
+++ b/src/views/systemManage/systemLog/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="企业类型：" prop="enterprise">
         <el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="是否启用：" prop="isEnable">
-        <el-switch v-model="form.isEnable" :before-change="beforeChange" />
+        <el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/systemManage/systemLog/com/headerTop.vue b/src/views/systemManage/systemLog/com/headerTop.vue
index 9057046..3f2dd29 100644
--- a/src/views/systemManage/systemLog/com/headerTop.vue
+++ b/src/views/systemManage/systemLog/com/headerTop.vue
@@ -3,10 +3,10 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="用户ID">
-                <el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
             </el-form-item>
             <el-form-item label="操作时间">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To"
                     start-placeholder="Start date" end-placeholder="End date" />
             </el-form-item>
             <el-form-item >
diff --git a/src/views/systemManage/systemVersion/com/addCom.vue b/src/views/systemManage/systemVersion/com/addCom.vue
index 95950b0..060f07a 100644
--- a/src/views/systemManage/systemVersion/com/addCom.vue
+++ b/src/views/systemManage/systemVersion/com/addCom.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
+  <el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
     <el-form :model="form" ref="ruleFormRef" label-width="120px" :rules="formRules" style="padding: 0 80px 0px 0;">
       <el-form-item label="版本号：" prop="versionName">
         <el-input v-model.trim="form.versionName" placeholder="请输入版本号" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="系统类型：" prop="systemType">
-        <el-select v-model="form.systemType" placeholder="请选择系统类型" clearable filterable>
+        <el-select v-model.trim="form.systemType" placeholder="请选择系统类型" clearable filterable>
           <el-option v-for="item in systemTypeList.list" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/systemManage/systemVersion/com/headerTop.vue b/src/views/systemManage/systemVersion/com/headerTop.vue
index c5eb0ed..efbeedc 100644
--- a/src/views/systemManage/systemVersion/com/headerTop.vue
+++ b/src/views/systemManage/systemVersion/com/headerTop.vue
@@ -3,13 +3,13 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="系统类型">
-                <el-input v-model="filterForm.systemType" placeholder="请选择系统类型" clearable />
+                <el-input v-model.trim="filterForm.systemType" placeholder="请选择系统类型" clearable />
             </el-form-item>
             <el-form-item label="版本号">
-                <el-input v-model="filterForm.versionCode" placeholder="请输入版本号" clearable />
+                <el-input v-model.trim="filterForm.versionCode" placeholder="请输入版本号" clearable />
             </el-form-item>
             <el-form-item label="部署时间范围">
-                <el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
+                <el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
                     end-placeholder="End date" />
             </el-form-item>
             <el-form-item  >
diff --git a/src/views/systemManage/userManage/com/addCom.vue b/src/views/systemManage/userManage/com/addCom.vue
index beb37d7..4e24a32 100644
--- a/src/views/systemManage/userManage/com/addCom.vue
+++ b/src/views/systemManage/userManage/com/addCom.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="addShow" :title="title" width="660px" draggable :close-on-click-modal="false">
+  <el-dialog v-model.trim="addShow" :title="title" width="660px" draggable :close-on-click-modal="false">
     <el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
         <el-form-item label="姓名：" prop="userName">
         <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable maxlength="30" />
@@ -8,7 +8,7 @@
         <el-input v-model.trim="form.IDCard" placeholder="请输入身份证" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="性别：" prop="sex">
-        <el-select v-model="form.sex" placeholder="请选择性别" clearable filterable style="width:100%;">
+        <el-select v-model.trim="form.sex" placeholder="请选择性别" clearable filterable style="width:100%;">
           <el-option v-for="item in sexInfo.list" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -16,12 +16,12 @@
         <el-input v-model.trim="form.contactgWays" placeholder="请输入联系方式" clearable maxlength="30" />
       </el-form-item>
       <el-form-item label="所属岗位：" prop="position">
-        <el-select v-model="form.position" placeholder="请选择所属岗位" clearable filterable style="width:100%;">
+        <el-select v-model.trim="form.position" placeholder="请选择所属岗位" clearable filterable style="width:100%;">
           <el-option v-for="item in positionIfo.list" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="系统角色：" prop="roleType">
-        <el-select v-model="form.roleType" placeholder="请选择系统角色" clearable filterable style="width:100%;">
+        <el-select v-model.trim="form.roleType" placeholder="请选择系统角色" clearable filterable style="width:100%;">
           <el-option v-for="item in roleTypeInfo.list" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
diff --git a/src/views/systemManage/userManage/com/headerTop.vue b/src/views/systemManage/userManage/com/headerTop.vue
index 5bc7832..ed09dfc 100644
--- a/src/views/systemManage/userManage/com/headerTop.vue
+++ b/src/views/systemManage/userManage/com/headerTop.vue
@@ -3,10 +3,10 @@
 
         <el-form :inline="true" :model="filterForm" class="demo-form-inline">
             <el-form-item label="姓名/身份证/联系方式"> 
-                <el-input v-model="filterForm.keyword" placeholder="请输入姓名/身份证/联系方式" clearable style="width:250px;" />
+                <el-input v-model.trim="filterForm.keyword" placeholder="请输入姓名/身份证/联系方式" clearable style="width:250px;" />
             </el-form-item>
             <el-form-item label="系统角色" prop="roleType">
-                <el-select v-model="filterForm.roleType" placeholder="请选择系统角色" clearable filterable>
+                <el-select v-model.trim="filterForm.roleType" placeholder="请选择系统角色" clearable filterable>
                     <el-option v-for="item in roleTypeInfo.list" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>