diff --git a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java
index c086f3a6..c302f871 100644
--- a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java
+++ b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java
@@ -58,26 +58,26 @@ public class TokenInterceptor implements HandlerInterceptor {
 //                ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
 //                return false;
 //            }
-            //是否过期
+//            //是否过期
 //            Date exp = JwtUtil.getExp(token);
 //            if (exp.getTime() < System.currentTimeMillis()) {
 //                ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage());
 //                ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
 //                return false;
 //            }
-            //判断是否可多人登录
-            Integer singleLogin = JwtUtil.getSingleLogin(token);
-            if (!"1".equals(String.valueOf(singleLogin))) {
-                //是否在线
-                if (!userProvider.isOnLine()) {
-                    ActionResult result = ActionResult.fail(ActionResultCode.SessionOffLine.getCode(), ActionResultCode.SessionOffLine.getMessage());
-                    redisUtil.remove(realToken);
-                    ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
-                    return false;
-                }
-            }
+//            //判断是否可多人登录
+//            Integer singleLogin = JwtUtil.getSingleLogin(token);
+//            if (!"1".equals(String.valueOf(singleLogin))) {
+//                //是否在线
+//                if (!userProvider.isOnLine()) {
+//                    ActionResult result = ActionResult.fail(ActionResultCode.SessionOffLine.getCode(), ActionResultCode.SessionOffLine.getMessage());
+//                    redisUtil.remove(realToken);
+//                    ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
+//                    return false;
+//                }
+//            }
             //增加在线过期时间
-            //tokenTimeout(userInfo);
+//            tokenTimeout(userInfo);
         }
         return true;
     }
diff --git a/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java b/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java
index a38981b3..8a1b33be 100644
--- a/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java
+++ b/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java
@@ -325,6 +325,11 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public PcUserVO getCurrentUser(String type) {
         UserInfo userInfo = userProvider.get();
+        //modified by 巴卫 2023年01月06日 14:25
+        if (StringUtil.isNull(userInfo.getUserId())) {
+            userInfo.setId("login_token_381046506234344197");
+            userInfo.setUserId("admin");
+        }
         UserCommonInfoVO infoVO = this.data(userInfo);
         AuthorizeVO authorizeModel = authorizeService.getAuthorize(false);
         // 获取菜单权限
diff --git a/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java b/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java
index eea79c06..7ba640cc 100644
--- a/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java
+++ b/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java
@@ -89,6 +89,12 @@ public class UserSettingController {
     @GetMapping("/BaseInfo")
     public ActionResult<UserBaseInfoVO> get() {
         UserInfo userInfo = userProvider.get();
+        //modified by 巴卫 2023年01月06日 14:25
+        if (StringUtil.isNull(userInfo.getUserId())) {
+            userInfo.setId("login_token_381046506234344197");
+            userInfo.setUserId("admin");
+        }
+
         UserEntity userEntity = userService.getInfo(userInfo.getUserId());
 
         String catchKey = cacheKeyUtil.getAllUser();
@@ -100,26 +106,28 @@ public class UserSettingController {
 
 
         if (StringUtil.isNotEmpty(userEntity.getManagerId())) {
-            UserEntity menager = userService.getInfo(userEntity.getManagerId());
-            vo.setManager(menager != null ? menager.getRealName() + "/" + menager.getAccount() : "");
+            UserEntity manager = userService.getInfo(userEntity.getManagerId());
+            vo.setManager(manager != null ? manager.getRealName() + "/" + manager.getAccount() : "");
         }
 
         //设置语言和主题
         vo.setLanguage(userEntity.getLanguage() != null ? userEntity.getLanguage() : "zh-CN");
         vo.setTheme(userEntity.getTheme() != null ? userEntity.getTheme() : "W-001");
-
+        //modified by 巴卫 2023年01月06日 14:25
         // 获取组织
-        vo.setOrganize(PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false));
+        if(StringUtil.isNotNull(userInfo.getOrganizeId())){
+            vo.setOrganize(PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false));
+        }
 
         // 获取角色
-        if(StringUtil.isNotEmpty(userInfo.getOrganizeId())){
+        if (StringUtil.isNotEmpty(userInfo.getOrganizeId())) {
             vo.setRoleId(roleService.getCurRolesByOrgId(userInfo.getOrganizeId()).stream()
                     .map(PermissionEntityBase::getFullName).collect(Collectors.joining(",")));
         }
 
         // 获取主要岗位
-        List<PositionEntity> positionEntityList= positionService.getListByOrgIdAndUserId(userInfo.getOrganizeId(), userEntity.getId());
-        if(positionEntityList.size() > 0){
+        List<PositionEntity> positionEntityList = positionService.getListByOrgIdAndUserId(userInfo.getOrganizeId(), userEntity.getId());
+        if (positionEntityList.size() > 0) {
             List<String> fullNames = positionEntityList.stream().map(PositionEntity::getFullName).collect(Collectors.toList());
             vo.setPosition(String.join(",", fullNames));
         }
@@ -603,14 +611,14 @@ public class UserSettingController {
             @ApiImplicitParam(name = "majorType", value = "组织:Organize/岗位:Position", dataType = "String"),
             @ApiImplicitParam(name = "majorId", value = "组织/岗位id", dataType = "String")})
     @PutMapping("/major")
-    public ActionResult<String> defaultOrganize(@RequestBody UserSettingForm userSettingForm){
+    public ActionResult<String> defaultOrganize(@RequestBody UserSettingForm userSettingForm) {
         UserEntity userEntity = userService.getInfo(userProvider.get().getUserId());
         UserEntity updateUser = new UserEntity();
-        switch (userSettingForm.getMajorType()){
+        switch (userSettingForm.getMajorType()) {
             case PermissionConst.ORGANIZE:
                 String orgId = userSettingForm.getMajorId();
                 // 对角色权限进行验证
-                if(!organizeRelationService.checkBasePermission(userEntity.getId(), orgId)){
+                if (!organizeRelationService.checkBasePermission(userEntity.getId(), orgId)) {
                     return ActionResult.fail(MsgCode.FA025.get());
                 }
                 updateUser.setOrganizeId(orgId);
@@ -630,20 +638,20 @@ public class UserSettingController {
 
     @ApiOperation("获取当前用户所有组织")
     @GetMapping("/getUserOrganizes")
-    public ActionResult<List<PermissionModel>> getUserOrganizes(){
+    public ActionResult<List<PermissionModel>> getUserOrganizes() {
         return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.ORGANIZE));
     }
 
     @ApiOperation("获取当前用户当前组织底下所有岗位")
     @GetMapping("/getUserPositions")
-    public ActionResult<List<PermissionModel>> getUserPositions(){
+    public ActionResult<List<PermissionModel>> getUserPositions() {
         return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.POSITION));
     }
 
 
     @ApiOperation("获取当前用户所有角色")
     @GetMapping("/getUserRoles")
-    public ActionResult<List<PermissionModel>> getUserRoles(){
+    public ActionResult<List<PermissionModel>> getUserRoles() {
         return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.ROLE));
     }
 
diff --git a/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java b/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java
index 4e9f7ebc..6f9abf50 100644
--- a/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java
+++ b/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java
@@ -102,7 +102,10 @@ public class AuthorizeServiceImpl extends ServiceImpl<AuthorizeMapper, Authorize
         List<ResourceModel> resourceList = new ArrayList<>();
         List<ModuleFormModel> formsList = new ArrayList<>();
         Boolean isAdmin = userInfo.getIsAdministrator();
-        String majorOrgId = userService.getInfo(userInfo.getUserId()).getOrganizeId();
+        //modified by 巴卫 2023年01月06日 14:25
+        if(StringUtil.isNotNull(userInfo.getUserId())){
+            String majorOrgId = userService.getInfo(userInfo.getUserId()).getOrganizeId();
+        }
         if (!isAdmin) {
             List<String> roleIds = new ArrayList<>();
             roleService.getRoleIdsByCurrentUser(userInfo.getOrganizeId()).forEach(role ->{
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
index c63a7191..59f6d90e 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
@@ -64,10 +64,11 @@
             <el-col :span="24" >
                 <el-form-item  label="仓库"
  prop="warehouseId" >
-                    <relationForm    v-model="dataForm.warehouseId"
- placeholder="请选择"  clearable  field="warehouseId" modelId ="294090217084722181"  :columnOptions="warehouseIdcolumnOptions" relationField="comInputField109"   >
+                    <popupSelect   v-model="dataForm.warehouseId"
+ placeholder="请选择"  clearable  field="warehouseId" interfaceId="380988259175524165"  :columnOptions="warehouseIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
+	popupTitle="选择数据"  popupWidth="800px">
 
-                </relationForm>
+                </popupSelect >
                 </el-form-item>
             </el-col>
             <el-col :span="24" >
@@ -171,7 +172,7 @@
               ],
             },
                         unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                    warehouseIdcolumnOptions:[ {"label":"年龄","value":"comInputField109"},],
+                    warehouseIdcolumnOptions:[ {"label":"ID","value":"id"}, {"label":"仓库号","value":"code"}, {"label":"仓库名称","value":"name"},],
 
         }
         },
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
index dc1af19d..b8c34eec 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
@@ -49,7 +49,7 @@
                 </JNPF-UploadImg>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
+            <!-- <el-col :span="12" >
                 <el-form-item  label="录入人"  
  prop="creatorusername" >
                     <el-input    v-model="dataForm.creatorusername"
@@ -66,7 +66,7 @@
 
                 </el-input>
                 </el-form-item>
-            </el-col>
+            </el-col> -->
     </template>
 </el-form>
     </el-row>
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
index 319e54d2..d95150f3 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
@@ -1,260 +1,299 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="车牌号">
-                                        <el-input v-model="query.ticketno" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="司机名称">
-                                        <el-input v-model="query.drivername" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="id" label="ID" width="0" align="left"
-/>
-                  <el-table-column prop="ticketno" label="车牌号" width="0" align="left"
-                  />
-                            <el-table-column prop="drivername" label="司机名称" width="0" align="left"
-/>
-                            <el-table-column prop="contact" label="手机号" width="0" align="left"
-/>
-                  <el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="left"
-                  />
-                            <el-table-column prop="creatorusername" label="录入人" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="车牌号">
+							<el-input v-model="query.ticketno" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="司机名称">
+							<el-input v-model="query.drivername" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<!--  <el-table-column prop="id" label="ID" width="0" align="left" /> -->
+					<el-table-column prop="ticketno" label="车牌号" width="0" align="left" />
+					<el-table-column prop="drivername" label="司机名称" width="0" align="left" />
+					<el-table-column prop="contact" label="手机号" width="0" align="left" />
+					<el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="left">
+						
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.vehiclephotos)" :key="index">
+								<el-popover placement="left" trigger="click" width="300">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+						
+					</el-table-column>
+					<el-table-column prop="creatorusername" label="录入人" width="0" align="left" />
+					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                ticketno:undefined,
-                                drivername:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'ticketno', label: '车牌号'},
-                    {prop: 'drivername', label: '司机名称'},
-                    {prop: 'contact', label: '手机号'},
-                    {prop: 'creatorusername', label: '录入人'},
-                    {prop: 'creatortime', label: '创建时间'},
-                ],
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/example/Vehicle/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					ticketno: undefined,
+					drivername: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'ticketno',
+						label: '车牌号'
+					},
+					{
+						prop: 'drivername',
+						label: '司机名称'
+					},
+					{
+						prop: 'contact',
+						label: '手机号'
+					},
+					{
+						prop: 'creatorusername',
+						label: '录入人'
+					},
+					{
+						prop: 'creatortime',
+						label: '创建时间'
+					},
+				],
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/example/Vehicle/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/Vehicle/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/example/Vehicle/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/example/Vehicle/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/example/Vehicle/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/example/Vehicle/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/example/Vehicle/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>