diff --git a/src/api/talk.ts b/src/api/talk.ts new file mode 100644 index 0000000..ca397c3 --- /dev/null +++ b/src/api/talk.ts @@ -0,0 +1,22 @@ +import request from "@/utils/request/indexs"; + +/** + * 绑定scoket + */ +export const bindScoket = (data: any) => + request.post({ url: "/common/im/doBindUid", data }); +// 发送消息 +export const sendMsgApi = (data: any) => + request.post({ url: "/common/im/sendTextMsg", data }); +// 发送文件 +export const sendFileApi = (data: any) => + request.post({ url: "/common/im/sendFileMsg", data }); +// 消息列表 +export const getMsgListApi = (data: any) => + request.post({ url: "/common/im/msgList", data }); +// 片区经理id +export const getAreaManagerApi = (data: any) => + request.post({ url: "/common/im/getAreaManager", data }); +// 联系人列表 +export const getContactListApi = (data: any) => + request.post({ url: "/common/im/contactList", data }); diff --git a/src/assets/images/SP.png b/src/assets/images/SP.png new file mode 100644 index 0000000..a786f63 Binary files /dev/null and b/src/assets/images/SP.png differ diff --git a/src/assets/images/XC.png b/src/assets/images/XC.png new file mode 100644 index 0000000..e9eba65 Binary files /dev/null and b/src/assets/images/XC.png differ diff --git a/src/utils/request/indexs.ts b/src/utils/request/indexs.ts new file mode 100644 index 0000000..530f736 --- /dev/null +++ b/src/utils/request/indexs.ts @@ -0,0 +1,131 @@ +import { merge } from "lodash"; +import configs from "@/config"; +import { Axios } from "./axios"; +import { + ContentTypeEnum, + RequestCodeEnum, + RequestMethodsEnum, +} from "@/enums/requestEnums"; +import type { AxiosHooks } from "./type"; +import { clearAuthInfo, getToken } from "../auth"; +import feedback from "../feedback"; +import NProgress from "nprogress"; +import { AxiosError, type AxiosRequestConfig } from "axios"; +import router from "@/router"; +import { PageEnum } from "@/enums/pageEnum"; + +// 处理axios的钩子函数 +const axiosHooks: AxiosHooks = { + requestInterceptorsHook(config) { + NProgress.start(); + const { withToken, isParamsToData } = config.requestOptions; + const params = config.params || {}; + const headers = config.headers || {}; + + // 添加token + if (withToken) { + const token = getToken(); + headers.token = token; + } + // POST请求下如果无data，则将params视为data + if ( + isParamsToData && + !Reflect.has(config, "data") && + config.method?.toUpperCase() === RequestMethodsEnum.POST + ) { + config.data = params; + config.params = {}; + } + config.headers = headers; + return config; + }, + requestInterceptorsCatchHook(err) { + NProgress.done(); + return err; + }, + async responseInterceptorsHook(response) { + NProgress.done(); + const { isTransformResponse, isReturnDefaultResponse } = + response.config.requestOptions; + + //返回默认响应，当需要获取响应头及其他数据时可使用 + if (isReturnDefaultResponse) { + return response; + } + // 是否需要对数据进行处理 + if (!isTransformResponse) { + return response.data; + } + const { code, data, show, msg } = response.data; + switch (code) { + case RequestCodeEnum.SUCCESS: + if (show) { + msg && feedback.msgSuccess(msg); + } + return data; + case RequestCodeEnum.FAIL: + if (show) { + msg && feedback.msgError(msg); + } + return Promise.reject(data); + case RequestCodeEnum.LOGIN_FAILURE: + clearAuthInfo(); + router.push(PageEnum.LOGIN); + return Promise.reject(); + case RequestCodeEnum.OPEN_NEW_PAGE: + window.location.href = data.url; + return data; + default: + return data; + } + }, + responseInterceptorsCatchHook(error) { + NProgress.done(); + if (error.code !== AxiosError.ERR_CANCELED) { + error.message && feedback.msgError(error.message); + } + return Promise.reject(error); + }, +}; + +const defaultOptions: AxiosRequestConfig = { + //接口超时时间 + timeout: configs.timeout, + // 基础接口地 + baseURL: configs.baseUrl, + + // baseURL: "http://192.168.1.11:8081/", + + //请求头 + headers: { "Content-Type": ContentTypeEnum.JSON, version: configs.version }, + // 处理 axios的钩子函数 + axiosHooks: axiosHooks, + // 每个接口可以单独配置 + requestOptions: { + // 是否将params视为data参数，仅限post请求 + isParamsToData: true, + //是否返回默认的响应 + isReturnDefaultResponse: false, + // 需要对返回数据进行处理 + isTransformResponse: true, + // 接口拼接地址 + urlPrefix: "", + // 忽略重复请求 + ignoreCancelToken: false, + // 是否携带token + withToken: true, + // 开启请求超时重新发起请求请求机制 + isOpenRetry: true, + // 重新请求次数 + retryCount: 2, + }, +}; + +function createAxios(opt?: Partial) { + return new Axios( + // 深度合并 + merge(defaultOptions, opt || {}) + ); +} +const request = createAxios(); +export default request; diff --git a/src/views/business/index.vue b/src/views/business/index.vue new file mode 100644 index 0000000..9454242 --- /dev/null +++ b/src/views/business/index.vue @@ -0,0 +1,686 @@ + + + + + \ No newline at end of file diff --git a/src/views/contract/vehicle_detail.vue b/src/views/contract/vehicle_detail.vue index fcb4228..2ed5bcd 100644 --- a/src/views/contract/vehicle_detail.vue +++ b/src/views/contract/vehicle_detail.vue @@ -99,15 +99,15 @@
租赁信息
- + - - @@ -117,7 +117,7 @@ - @@ -127,9 +127,9 @@ -
+ +
租赁信息
-
@@ -176,10 +176,16 @@ const formData = reactive({ company_b_code: "", company_b_email: "@service.ebaoquan.org", num: "", - cars_info: { + cars_info: + [ + { id: "", license: "", - }, + type:"", + rent_time:"" + } + ] + , car_list: [], type: 0, status: 0, @@ -204,6 +210,11 @@ const handChangeFn = (e) => { }); }); }; +const typeFn=(type)=>{ +if(type==0)return"租赁车辆" +if(type==1)return"自有车辆" +if(type==2)return"购买车辆" +} const test = () => { window.open(formData.file, "_blank"); }; @@ -211,7 +222,10 @@ leaseContractDetail({ id: route.query.id }).then((res) => { for (let key in formData) { formData[key] = res[key]; } - formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); + // formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); + formData.cars_info.forEach(item=>{ + item.type=typeFn(item.type) + }) }); const handleAvatarSuccess_three = (response, uploadFile) => { diff --git a/src/views/contract/vehicle_list.vue b/src/views/contract/vehicle_list.vue index 6fa5218..b40fd1f 100644 --- a/src/views/contract/vehicle_list.vue +++ b/src/views/contract/vehicle_list.vue @@ -1,161 +1,80 @@