diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..88b3bfc --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +dist +node_modules +yarn.lock diff --git a/Caddyfile b/Caddyfile index 5d8937f..f0d9ded 100644 --- a/Caddyfile +++ b/Caddyfile @@ -14,6 +14,4 @@ } } -#localhost:4173 { -# redir https://192.168.0.200:4173{uri} -#} + diff --git a/package.json b/package.json index 32cea30..faf6f37 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "dev": "vite", "build:prod": "vite build", "build:stage": "vite build --mode staging", - "preview": "vite preview" + "preview": "vite preview", + "format": "prettier --write \"src/**/*.{vue,js,ts,json,html,css,scss,md}\"" }, "repository": { "type": "git", @@ -37,6 +38,7 @@ "devDependencies": { "@vitejs/plugin-vue": "2.3.3", "@vue/compiler-sfc": "3.2.36", + "prettier": "^2.8.8", "sass": "1.52.1", "unplugin-auto-import": "0.8.5", "vite": "2.9.13", diff --git a/src/App.vue b/src/App.vue index d91599f..98240ae 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,3 +1,3 @@ - + diff --git a/src/api/Businessneeds/index.js b/src/api/Businessneeds/index.js index a82b2ba..90130b8 100644 --- a/src/api/Businessneeds/index.js +++ b/src/api/Businessneeds/index.js @@ -1,7 +1,8 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 获取企业需求列表 -export const businessList = (params) => request({ +export const businessList = (params) => + request({ url: "/business/dataReview/technologyDemandList", - method: 'get', - params -}) \ No newline at end of file + method: "get", + params, + }); diff --git a/src/api/dataApproval/enterpriseTechnologyDemand.js b/src/api/dataApproval/enterpriseTechnologyDemand.js index b005d76..5e3cdd1 100644 --- a/src/api/dataApproval/enterpriseTechnologyDemand.js +++ b/src/api/dataApproval/enterpriseTechnologyDemand.js @@ -21,3 +21,20 @@ export const deleteTechnologyDemand = (ids) => url: `/business/dataReview/deleteTechnologyDemand/${ids}`, method: "DELETE", }); + +/** + * 企业技术需求指派经纪人 + * @param demandId + * @param brokerId + * @param brokerName + * @return {*} + */ +export const dataReviewAppointBroker = ( + demandId, // 企业技术需求id + brokerId, // 经纪人id + brokerName // 经纪人姓名 // 获取企业技术需求详情 +) => + request({ + url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`, + method: "POST", + }); diff --git a/src/api/dataList/agent.js b/src/api/dataList/agent.js index e1b86a6..de06582 100644 --- a/src/api/dataList/agent.js +++ b/src/api/dataList/agent.js @@ -1,42 +1,67 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 经纪人列表 -export function agentList(data) { - return request({ - url: '/admin/v1/manage/agent', - method: 'post', - data, - }) +export function agentList(params) { + return request({ + url: "/business/casBroker/list", + method: "GET", + params, + }); } + // 经纪人信息添加 export function agentAdd(data) { - return request({ - url: '/admin/v1/manage/agent/add', - method: 'post', - data, - }) + return request({ + url: "/business/casBroker", + method: "post", + data, + }); } + // 经纪人详细信息 -export function agentDetail(data) { - return request({ - url: '/admin/v1/manage/agent/detail', - method: 'post', - data, - }) +export function agentDetail(id) { + return request({ + url: `/business/casBroker/${id}`, + method: "GET", + }); } + // 经纪人信息修改 export function agentEdit(data) { - return request({ - url: '/admin/v1/manage/agent/edit', - method: 'post', - data, - }) + return request({ + url: "/business/casBroker", + method: "put", + data, + }); } -// 经纪人审核操作 -export function agentExamine(data) { - return request({ - url: '/admin/v1/manage/agent/examine', - method: 'post', - data, - }) + +// 科研机构获取账号 +export function getAccount(id) { + return request({ + url: `/business/casBroker/getAccount/${id}`, + method: "get", + }); +} + +export function resetPassword(id, password) { + return request({ + url: `/business/casBroker/restPassword/${id}/${password}`, + method: "put", + }); +} + +// 分配账号 +export function allocateAccount(data) { + return request({ + url: "/business/casBroker/allocateAccount", + method: "post", + data, + }); +} + +export function deleteAgent(ids) { + return request({ + url: `/business/casBroker/${ids}`, + method: "DELETE", + }); } diff --git a/src/api/dataList/enterprise.js b/src/api/dataList/enterprise.js index a4bb83a..afd9ae8 100644 --- a/src/api/dataList/enterprise.js +++ b/src/api/dataList/enterprise.js @@ -46,14 +46,6 @@ export const companyExport = () => { }); }; -// 公司企业审核操作 -export function companyExamine(data) { - return request({ - url: "/admin/v1/manage/company/examine", - method: "post", - data, - }); -} // 公司企业分配账号 export function allocateAccount(data) { return request({ @@ -89,7 +81,7 @@ export function openCasVip(data) { return request({ url: `/business/casVip`, method: "post", - data + data, }); } // 公司企业修改会员 @@ -97,6 +89,6 @@ export function updateCasVip(data) { return request({ url: `/business/casVip`, method: "put", - data + data, }); } diff --git a/src/api/dataList/laboratory.js b/src/api/dataList/laboratory.js index e3970f7..9626d33 100644 --- a/src/api/dataList/laboratory.js +++ b/src/api/dataList/laboratory.js @@ -2,81 +2,80 @@ import request from "@/utils/request"; // 实验室列表 export function casLaboratoryList(params) { - return request({ - url: "/business/casLaboratory/list", - method: "GET", - params, - }); + return request({ + url: "/business/casLaboratory/list", + method: "GET", + params, + }); } // 新增 export function casLaboratoryAdd(data) { - return request({ - url: "/business/casLaboratory", - method: "POST", - data, - }); + return request({ + url: "/business/casLaboratory", + method: "POST", + data, + }); } // 修改 export function casLaboratoryUpdate(data) { - return request({ - url: "/business/casLaboratory", - method: "PUT", - data, - }); + return request({ + url: "/business/casLaboratory", + method: "PUT", + data, + }); } // id详情 export function casLaboratoryDetail(id) { - return request({ - url: `/business/casLaboratory/${id}`, - method: "GET", - }); + return request({ + url: `/business/casLaboratory/${id}`, + method: "GET", + }); } // 删除 export function casLaboratoryDelete(ids) { - return request({ - url: `/business/casLaboratory`, - method: "DELETE", - data: { - ids, - }, - }); + return request({ + url: `/business/casLaboratory`, + method: "DELETE", + data: { + ids, + }, + }); } // 导入 export function casLaboratoryImportData(data) { - return request({ - url: `/business/casLaboratory/importData`, - method: "POST", - data, - }); + return request({ + url: `/business/casLaboratory/importData`, + method: "POST", + data, + }); } // 实验室获取账号 export function getAccount(id) { - return request({ - url: `/business/casLaboratory/getAccount/${id}`, - method: "GET", - - }); + return request({ + url: `/business/casLaboratory/getAccount/${id}`, + method: "GET", + }); } // 实验室分配账号 export function allocateAccount(data) { - return request({ - url: "/business/casLaboratory/allocateAccount", - method: "post", - data, - }); + return request({ + url: "/business/casLaboratory/allocateAccount", + method: "post", + data, + }); } // 实验室重置密码 export function restPassword(id, password) { - return request({ - url: `/business/casLaboratory/restPassword/${id}/${password}`, - method: "put", - }); -} \ No newline at end of file + return request({ + url: `/business/casLaboratory/restPassword/${id}/${password}`, + method: "put", + }); +} diff --git a/src/api/dataList/list.js b/src/api/dataList/list.js index 4bc19f8..f8ff08a 100644 --- a/src/api/dataList/list.js +++ b/src/api/dataList/list.js @@ -2,22 +2,24 @@ import request from "@/utils/request"; // 企业审核列表列表 export function enterpriseList(params) { - return request({ - url: "/business/enterprise/list", - method: "get", - params, - }); - } + return request({ + url: "/business/enterprise/list", + method: "get", + params, + }); +} - // 修改企业类型 - export const editType=(data)=>request({ - url:`/business/enterprise`, - method:'put', - data - }) +// 修改企业类型 +export const editType = (data) => + request({ + url: `/business/enterprise`, + method: "put", + data, + }); - // 删除当前项 - export const delItem=(id)=>request({ - url:`/business/enterprise/${id}`, - method:'delete', - }) \ No newline at end of file +// 删除当前项 +export const delItem = (id) => + request({ + url: `/business/enterprise/${id}`, + method: "delete", + }); diff --git a/src/api/dataList/research.js b/src/api/dataList/research.js index 75c7ecf..9e2e8c5 100644 --- a/src/api/dataList/research.js +++ b/src/api/dataList/research.js @@ -1,55 +1,85 @@ -import request from '@/utils/request' - +import request from "@/utils/request"; // 科研机构列表 export function researchList(params) { - return request({ - url: '/business/casResearch/list', - method: 'GET', - params, - }) + return request({ + url: "/business/casResearch/list", + method: "GET", + params, + }); +} + +// 科研机构获取账号 +export function getAccount(id) { + return request({ + url: `/business/casResearch/getAccount/${id}`, + method: "get", + }); } // 科研机构筛选信息 export function researchSelect(data) { - return request({ - url: '/admin/v1/manage/research/select', - method: 'post', - data, - }) + return request({ + url: "/admin/v1/manage/research/select", + method: "post", + data, + }); } // 科研机构信息添加 export function researchAdd(data) { - return request({ - url: '/business/casResearch', - method: 'post', - data, - }) + return request({ + url: "/business/casResearch", + method: "post", + data, + }); } // 科研机构信息修改 export function researchEdit(data) { - return request({ - url: '/business/casResearch', - method: 'PUT', - data, - }) + return request({ + url: "/business/casResearch", + method: "PUT", + data, + }); +} + +// 机构重置密码 +export function resetPassword(id, password) { + return request({ + url: `/business/casResearch/restPassword/${id}/${password}`, + method: "put", + }); } // 科研机构详细信息 export function researchDetail(id) { - return request({ - url: `/business/casResearch/${id}`, - method: 'GET', - }) + return request({ + url: `/business/casResearch/${id}`, + method: "GET", + }); } // 科研机构详细信息 export function researchDelete(ids) { - return request({ - url: `/business/casResearch/${ids}`, - method: 'DELETE', - }) + return request({ + url: `/business/casResearch/${ids}`, + method: "DELETE", + }); } +// 分配账号 +export function allocateAccount(data) { + return request({ + url: "/business/casResearch/allocateAccount", + method: "post", + data, + }); +} + +export function casResearchDelete(ids) { + return request({ + url: `/business/casResearch/${ids}`, + method: "DELETE", + }); +} diff --git a/src/api/expert/expert.js b/src/api/expert/expert.js index 69d2672..66a9058 100644 --- a/src/api/expert/expert.js +++ b/src/api/expert/expert.js @@ -1,38 +1,41 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 获取专家列表 export function expertList(params) { return request({ url: "/business/casExpert/list", method: "get", - params + params, }); } // 新镇专家接口 -export const companyAdd = (data) => request({ - url: "/business/casExpert", - method: 'post', - data -}) +export const companyAdd = (data) => + request({ + url: "/business/casExpert", + method: "post", + data, + }); // 专家详情接口 -export const companyDetail = (id) => request({ - url: `/business/casExpert/${id}`, - method: 'get', -}) +export const companyDetail = (id) => + request({ + url: `/business/casExpert/${id}`, + method: "get", + }); // 修改专家详情 -export const companyEdit = (data) => request({ - url: '/business/casExpert', - method: 'put', - data -}) +export const companyEdit = (data) => + request({ + url: "/business/casExpert", + method: "put", + data, + }); // 专家分配账号 export function allocateAccount(data) { return request({ - url: '/business/casExpert/allocateAccount', - method: 'post', + url: "/business/casExpert/allocateAccount", + method: "post", data, - }) -} \ No newline at end of file + }); +} diff --git a/src/api/innovation-demand-service/demand.js b/src/api/innovation-demand-service/demand.js new file mode 100644 index 0000000..af13913 --- /dev/null +++ b/src/api/innovation-demand-service/demand.js @@ -0,0 +1,17 @@ +import request from "@/utils/request"; + +/*需求列表*/ +export function casDemandList(params) { + return request({ + url: "/business/casDemand/list", + method: "GET", + params, + }); +} + +export function casDemandDelete(ids) { + return request({ + url: `/business/casDemand/${ids}`, + method: "DELETE", + }); +} diff --git a/src/api/login.js b/src/api/login.js index 26742e7..12a774f 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,59 +1,59 @@ -import request from '@/utils/request' - -// 登录方法 -export function login(username, password, code, uuid) { - const data = { - username, - password, - code, - uuid - } - return request({ - url: '/login', - headers: { - isToken: false - }, - method: 'post', - data: data - }) -} - -// 注册方法 -export function register(data) { - return request({ - url: '/register', - headers: { - isToken: false - }, - method: 'post', - data: data - }) -} - -// 获取用户详细信息 -export function getInfo() { - return request({ - url: '/getInfo', - method: 'get' - }) -} - -// 退出方法 -export function logout() { - return request({ - url: '/logout', - method: 'post' - }) -} - -// 获取验证码 -export function getCodeImg() { - return request({ - url: '/captchaImage', - headers: { - isToken: false - }, - method: 'get', - timeout: 20000 - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 登录方法 +export function login(username, password, code, uuid) { + const data = { + username, + password, + code, + uuid, + }; + return request({ + url: "/login", + headers: { + isToken: false, + }, + method: "post", + data: data, + }); +} + +// 注册方法 +export function register(data) { + return request({ + url: "/register", + headers: { + isToken: false, + }, + method: "post", + data: data, + }); +} + +// 获取用户详细信息 +export function getInfo() { + return request({ + url: "/getInfo", + method: "get", + }); +} + +// 退出方法 +export function logout() { + return request({ + url: "/logout", + method: "post", + }); +} + +// 获取验证码 +export function getCodeImg() { + return request({ + url: "/captchaImage", + headers: { + isToken: false, + }, + method: "get", + timeout: 20000, + }); +} diff --git a/src/api/menu.js b/src/api/menu.js index 6e52e6e..2dbb85e 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -1,9 +1,9 @@ -import request from '@/utils/request' - -// 获取路由 -export const getRouters = () => { - return request({ - url: '/getRouters', - method: 'get' - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 获取路由 +export const getRouters = () => { + return request({ + url: "/getRouters", + method: "get", + }); +}; diff --git a/src/api/monitor/cache.js b/src/api/monitor/cache.js index e1f2c87..b13c6ff 100644 --- a/src/api/monitor/cache.js +++ b/src/api/monitor/cache.js @@ -1,57 +1,57 @@ -import request from '@/utils/request' - -// 查询缓存详细 -export function getCache() { - return request({ - url: '/monitor/cache', - method: 'get' - }) -} - -// 查询缓存名称列表 -export function listCacheName() { - return request({ - url: '/monitor/cache/getNames', - method: 'get' - }) -} - -// 查询缓存键名列表 -export function listCacheKey(cacheName) { - return request({ - url: '/monitor/cache/getKeys/' + cacheName, - method: 'get' - }) -} - -// 查询缓存内容 -export function getCacheValue(cacheName, cacheKey) { - return request({ - url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey, - method: 'get' - }) -} - -// 清理指定名称缓存 -export function clearCacheName(cacheName) { - return request({ - url: '/monitor/cache/clearCacheName/' + cacheName, - method: 'delete' - }) -} - -// 清理指定键名缓存 -export function clearCacheKey(cacheKey) { - return request({ - url: '/monitor/cache/clearCacheKey/' + cacheKey, - method: 'delete' - }) -} - -// 清理全部缓存 -export function clearCacheAll() { - return request({ - url: '/monitor/cache/clearCacheAll', - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询缓存详细 +export function getCache() { + return request({ + url: "/monitor/cache", + method: "get", + }); +} + +// 查询缓存名称列表 +export function listCacheName() { + return request({ + url: "/monitor/cache/getNames", + method: "get", + }); +} + +// 查询缓存键名列表 +export function listCacheKey(cacheName) { + return request({ + url: "/monitor/cache/getKeys/" + cacheName, + method: "get", + }); +} + +// 查询缓存内容 +export function getCacheValue(cacheName, cacheKey) { + return request({ + url: "/monitor/cache/getValue/" + cacheName + "/" + cacheKey, + method: "get", + }); +} + +// 清理指定名称缓存 +export function clearCacheName(cacheName) { + return request({ + url: "/monitor/cache/clearCacheName/" + cacheName, + method: "delete", + }); +} + +// 清理指定键名缓存 +export function clearCacheKey(cacheKey) { + return request({ + url: "/monitor/cache/clearCacheKey/" + cacheKey, + method: "delete", + }); +} + +// 清理全部缓存 +export function clearCacheAll() { + return request({ + url: "/monitor/cache/clearCacheAll", + method: "delete", + }); +} diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js index b33ad3d..94c7905 100644 --- a/src/api/monitor/job.js +++ b/src/api/monitor/job.js @@ -1,71 +1,70 @@ -import request from '@/utils/request' - -// 查询定时任务调度列表 -export function listJob(query) { - return request({ - url: '/monitor/job/list', - method: 'get', - params: query - }) -} - -// 查询定时任务调度详细 -export function getJob(jobId) { - return request({ - url: '/monitor/job/' + jobId, - method: 'get' - }) -} - -// 新增定时任务调度 -export function addJob(data) { - return request({ - url: '/monitor/job', - method: 'post', - data: data - }) -} - -// 修改定时任务调度 -export function updateJob(data) { - return request({ - url: '/monitor/job', - method: 'put', - data: data - }) -} - -// 删除定时任务调度 -export function delJob(jobId) { - return request({ - url: '/monitor/job/' + jobId, - method: 'delete' - }) -} - -// 任务状态修改 -export function changeJobStatus(jobId, status) { - const data = { - jobId, - status - } - return request({ - url: '/monitor/job/changeStatus', - method: 'put', - data: data - }) -} - - -// 定时任务立即执行一次 -export function runJob(jobId, jobGroup) { - const data = { - jobId, - jobGroup - } - return request({ - url: '/monitor/job/run', - method: 'put', - data: data - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 查询定时任务调度列表 +export function listJob(query) { + return request({ + url: "/monitor/job/list", + method: "get", + params: query, + }); +} + +// 查询定时任务调度详细 +export function getJob(jobId) { + return request({ + url: "/monitor/job/" + jobId, + method: "get", + }); +} + +// 新增定时任务调度 +export function addJob(data) { + return request({ + url: "/monitor/job", + method: "post", + data: data, + }); +} + +// 修改定时任务调度 +export function updateJob(data) { + return request({ + url: "/monitor/job", + method: "put", + data: data, + }); +} + +// 删除定时任务调度 +export function delJob(jobId) { + return request({ + url: "/monitor/job/" + jobId, + method: "delete", + }); +} + +// 任务状态修改 +export function changeJobStatus(jobId, status) { + const data = { + jobId, + status, + }; + return request({ + url: "/monitor/job/changeStatus", + method: "put", + data: data, + }); +} + +// 定时任务立即执行一次 +export function runJob(jobId, jobGroup) { + const data = { + jobId, + jobGroup, + }; + return request({ + url: "/monitor/job/run", + method: "put", + data: data, + }); +} diff --git a/src/api/monitor/jobLog.js b/src/api/monitor/jobLog.js index 654bbae..aabc0b2 100644 --- a/src/api/monitor/jobLog.js +++ b/src/api/monitor/jobLog.js @@ -1,26 +1,26 @@ -import request from '@/utils/request' - -// 查询调度日志列表 -export function listJobLog(query) { - return request({ - url: '/monitor/jobLog/list', - method: 'get', - params: query - }) -} - -// 删除调度日志 -export function delJobLog(jobLogId) { - return request({ - url: '/monitor/jobLog/' + jobLogId, - method: 'delete' - }) -} - -// 清空调度日志 -export function cleanJobLog() { - return request({ - url: '/monitor/jobLog/clean', - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询调度日志列表 +export function listJobLog(query) { + return request({ + url: "/monitor/jobLog/list", + method: "get", + params: query, + }); +} + +// 删除调度日志 +export function delJobLog(jobLogId) { + return request({ + url: "/monitor/jobLog/" + jobLogId, + method: "delete", + }); +} + +// 清空调度日志 +export function cleanJobLog() { + return request({ + url: "/monitor/jobLog/clean", + method: "delete", + }); +} diff --git a/src/api/monitor/logininfor.js b/src/api/monitor/logininfor.js index cd78151..f9b7d85 100644 --- a/src/api/monitor/logininfor.js +++ b/src/api/monitor/logininfor.js @@ -1,26 +1,26 @@ -import request from '@/utils/request' - -// 查询登录日志列表 -export function list(query) { - return request({ - url: '/monitor/logininfor/list', - method: 'get', - params: query - }) -} - -// 删除登录日志 -export function delLogininfor(infoId) { - return request({ - url: '/monitor/logininfor/' + infoId, - method: 'delete' - }) -} - -// 清空登录日志 -export function cleanLogininfor() { - return request({ - url: '/monitor/logininfor/clean', - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询登录日志列表 +export function list(query) { + return request({ + url: "/monitor/logininfor/list", + method: "get", + params: query, + }); +} + +// 删除登录日志 +export function delLogininfor(infoId) { + return request({ + url: "/monitor/logininfor/" + infoId, + method: "delete", + }); +} + +// 清空登录日志 +export function cleanLogininfor() { + return request({ + url: "/monitor/logininfor/clean", + method: "delete", + }); +} diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js index 288ebe0..a3e95e6 100644 --- a/src/api/monitor/online.js +++ b/src/api/monitor/online.js @@ -1,18 +1,18 @@ -import request from '@/utils/request' - -// 查询在线用户列表 -export function list(query) { - return request({ - url: '/monitor/online/list', - method: 'get', - params: query - }) -} - -// 强退用户 -export function forceLogout(tokenId) { - return request({ - url: '/monitor/online/' + tokenId, - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询在线用户列表 +export function list(query) { + return request({ + url: "/monitor/online/list", + method: "get", + params: query, + }); +} + +// 强退用户 +export function forceLogout(tokenId) { + return request({ + url: "/monitor/online/" + tokenId, + method: "delete", + }); +} diff --git a/src/api/monitor/operlog.js b/src/api/monitor/operlog.js index 6e881df..ffcbf5c 100644 --- a/src/api/monitor/operlog.js +++ b/src/api/monitor/operlog.js @@ -1,26 +1,26 @@ -import request from '@/utils/request' - -// 查询操作日志列表 -export function list(query) { - return request({ - url: '/monitor/operlog/list', - method: 'get', - params: query - }) -} - -// 删除操作日志 -export function delOperlog(operId) { - return request({ - url: '/monitor/operlog/' + operId, - method: 'delete' - }) -} - -// 清空操作日志 -export function cleanOperlog() { - return request({ - url: '/monitor/operlog/clean', - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询操作日志列表 +export function list(query) { + return request({ + url: "/monitor/operlog/list", + method: "get", + params: query, + }); +} + +// 删除操作日志 +export function delOperlog(operId) { + return request({ + url: "/monitor/operlog/" + operId, + method: "delete", + }); +} + +// 清空操作日志 +export function cleanOperlog() { + return request({ + url: "/monitor/operlog/clean", + method: "delete", + }); +} diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js index cac7791..1181761 100644 --- a/src/api/monitor/server.js +++ b/src/api/monitor/server.js @@ -1,9 +1,9 @@ -import request from '@/utils/request' - -// 获取服务信息 -export function getServer() { - return request({ - url: '/monitor/server', - method: 'get' - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 获取服务信息 +export function getServer() { + return request({ + url: "/monitor/server", + method: "get", + }); +} diff --git a/src/api/order/broker-order.js b/src/api/order/broker-order.js new file mode 100644 index 0000000..5f53b03 --- /dev/null +++ b/src/api/order/broker-order.js @@ -0,0 +1,55 @@ +import request from "@/utils/request"; + +/** + * 经纪人订单列表 + * @param params + * @return {*} + */ +export const brokerDealLogList = (params) => { + return request({ + url: `/business/brokerDealLog/list`, + method: "GET", + params, + }); +}; + +export const addBrokerDealLog = (data) => { + return request({ + url: `/business/brokerDealLog`, + method: "POST", + data, + }); +}; + +export const updateBrokerDealLog = (data) => { + return request({ + url: `/business/brokerDealLog`, + method: "PUT", + data, + }); +}; + +// /business/brokerDealLog/{ids} +export const deleteBrokerDealLog = (ids) => { + return request({ + url: `/business/brokerDealLog/${ids}`, + method: "DELETE", + }); +}; + +// /business/brokerDealLog/{id} +export const brokerDealLogDetail = (id) => { + return request({ + url: `/business/brokerDealLog/${id}`, + method: "GET", + }); +}; + +// /business/brokerDealLog/billList +export const brokerBillList = (params) => { + return request({ + url: `/business/brokerDealLog/billList`, + method: "GET", + params, + }); +}; diff --git a/src/api/order/index.js b/src/api/order/index.js index 7d45aba..c9fa8cf 100644 --- a/src/api/order/index.js +++ b/src/api/order/index.js @@ -1,37 +1,37 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 获取订单列表 export function casDealLogList(params) { - return request({ - url: `/business/casDealLog/list`, - method: "get", - params - }); + return request({ + url: `/business/casDealLog/list`, + method: "get", + params, + }); } // 获取发票列表 export function billList(params) { - return request({ - url: `/business/casDealLog/billList`, - method: "get", - params - }); + return request({ + url: `/business/casDealLog/billList`, + method: "get", + params, + }); } export function addDealLog(data) { - return request({ - url: `/business/casDealLog`, - method: "post", - data - }); + return request({ + url: `/business/casDealLog`, + method: "post", + data, + }); } export function DealLogDetail(id) { - return request({ - url: `/business/casDealLog/${id}`, - method: "get", - }); + return request({ + url: `/business/casDealLog/${id}`, + method: "get", + }); } export function updateDealLog(data) { - return request({ - url: `/business/casDealLog`, - method: "put", - data - }); -} \ No newline at end of file + return request({ + url: `/business/casDealLog`, + method: "put", + data, + }); +} diff --git a/src/api/patent/index.js b/src/api/patent/index.js index 52204a3..d818a71 100644 --- a/src/api/patent/index.js +++ b/src/api/patent/index.js @@ -1,15 +1,16 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 获取专利列表 export function expertList(id) { - return request({ - url:`/business/casExpert/patent/${id}`, - method:"get" - }); - } + return request({ + url: `/business/casExpert/patent/${id}`, + method: "get", + }); +} - // 解除专利 - export const delList=(params)=>request({ - url:'/business/casExpert/kill', - method:'get', - params - }) +// 解除专利 +export const delList = (params) => + request({ + url: "/business/casExpert/kill", + method: "get", + params, + }); diff --git a/src/api/system/config.js b/src/api/system/config.js index 7858c69..65d1f86 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -1,60 +1,60 @@ -import request from '@/utils/request' - -// 查询参数列表 -export function listConfig(query) { - return request({ - url: '/system/config/list', - method: 'get', - params: query - }) -} - -// 查询参数详细 -export function getConfig(configId) { - return request({ - url: '/system/config/' + configId, - method: 'get' - }) -} - -// 根据参数键名查询参数值 -export function getConfigKey(configKey) { - return request({ - url: '/system/config/configKey/' + configKey, - method: 'get' - }) -} - -// 新增参数配置 -export function addConfig(data) { - return request({ - url: '/system/config', - method: 'post', - data: data - }) -} - -// 修改参数配置 -export function updateConfig(data) { - return request({ - url: '/system/config', - method: 'put', - data: data - }) -} - -// 删除参数配置 -export function delConfig(configId) { - return request({ - url: '/system/config/' + configId, - method: 'delete' - }) -} - -// 刷新参数缓存 -export function refreshCache() { - return request({ - url: '/system/config/refreshCache', - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询参数列表 +export function listConfig(query) { + return request({ + url: "/system/config/list", + method: "get", + params: query, + }); +} + +// 查询参数详细 +export function getConfig(configId) { + return request({ + url: "/system/config/" + configId, + method: "get", + }); +} + +// 根据参数键名查询参数值 +export function getConfigKey(configKey) { + return request({ + url: "/system/config/configKey/" + configKey, + method: "get", + }); +} + +// 新增参数配置 +export function addConfig(data) { + return request({ + url: "/system/config", + method: "post", + data: data, + }); +} + +// 修改参数配置 +export function updateConfig(data) { + return request({ + url: "/system/config", + method: "put", + data: data, + }); +} + +// 删除参数配置 +export function delConfig(configId) { + return request({ + url: "/system/config/" + configId, + method: "delete", + }); +} + +// 刷新参数缓存 +export function refreshCache() { + return request({ + url: "/system/config/refreshCache", + method: "delete", + }); +} diff --git a/src/api/system/dept.js b/src/api/system/dept.js index 0535e8a..94fa2f6 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -1,68 +1,68 @@ -import request from '@/utils/request' - -// 查询部门列表 -export function listDept(query) { - return request({ - url: '/system/dept/list', - method: 'get', - params: query - }) -} - -// 查询部门列表（排除节点） -export function listDeptExcludeChild(deptId) { - return request({ - url: '/system/dept/list/exclude/' + deptId, - method: 'get' - }) -} - -// 查询部门详细 -export function getDept(deptId) { - return request({ - url: '/system/dept/' + deptId, - method: 'get' - }) -} - -// 查询部门下拉树结构 -export function treeselect() { - return request({ - url: '/system/dept/treeselect', - method: 'get' - }) -} - -// 根据角色ID查询部门树结构 -export function roleDeptTreeselect(roleId) { - return request({ - url: '/system/dept/roleDeptTreeselect/' + roleId, - method: 'get' - }) -} - -// 新增部门 -export function addDept(data) { - return request({ - url: '/system/dept', - method: 'post', - data: data - }) -} - -// 修改部门 -export function updateDept(data) { - return request({ - url: '/system/dept', - method: 'put', - data: data - }) -} - -// 删除部门 -export function delDept(deptId) { - return request({ - url: '/system/dept/' + deptId, - method: 'delete' - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 查询部门列表 +export function listDept(query) { + return request({ + url: "/system/dept/list", + method: "get", + params: query, + }); +} + +// 查询部门列表（排除节点） +export function listDeptExcludeChild(deptId) { + return request({ + url: "/system/dept/list/exclude/" + deptId, + method: "get", + }); +} + +// 查询部门详细 +export function getDept(deptId) { + return request({ + url: "/system/dept/" + deptId, + method: "get", + }); +} + +// 查询部门下拉树结构 +export function treeselect() { + return request({ + url: "/system/dept/treeselect", + method: "get", + }); +} + +// 根据角色ID查询部门树结构 +export function roleDeptTreeselect(roleId) { + return request({ + url: "/system/dept/roleDeptTreeselect/" + roleId, + method: "get", + }); +} + +// 新增部门 +export function addDept(data) { + return request({ + url: "/system/dept", + method: "post", + data: data, + }); +} + +// 修改部门 +export function updateDept(data) { + return request({ + url: "/system/dept", + method: "put", + data: data, + }); +} + +// 删除部门 +export function delDept(deptId) { + return request({ + url: "/system/dept/" + deptId, + method: "delete", + }); +} diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js index 2a6e481..3fd149f 100644 --- a/src/api/system/dict/data.js +++ b/src/api/system/dict/data.js @@ -1,52 +1,52 @@ -import request from '@/utils/request' - -// 查询字典数据列表 -export function listData(query) { - return request({ - url: '/system/dict/data/list', - method: 'get', - params: query - }) -} - -// 查询字典数据详细 -export function getData(dictCode) { - return request({ - url: '/system/dict/data/' + dictCode, - method: 'get' - }) -} - -// 根据字典类型查询字典数据信息 -export function getDicts(dictType) { - return request({ - url: '/system/dict/data/type/' + dictType, - method: 'get' - }) -} - -// 新增字典数据 -export function addData(data) { - return request({ - url: '/system/dict/data', - method: 'post', - data: data - }) -} - -// 修改字典数据 -export function updateData(data) { - return request({ - url: '/system/dict/data', - method: 'put', - data: data - }) -} - -// 删除字典数据 -export function delData(dictCode) { - return request({ - url: '/system/dict/data/' + dictCode, - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询字典数据列表 +export function listData(query) { + return request({ + url: "/system/dict/data/list", + method: "get", + params: query, + }); +} + +// 查询字典数据详细 +export function getData(dictCode) { + return request({ + url: "/system/dict/data/" + dictCode, + method: "get", + }); +} + +// 根据字典类型查询字典数据信息 +export function getDicts(dictType) { + return request({ + url: "/system/dict/data/type/" + dictType, + method: "get", + }); +} + +// 新增字典数据 +export function addData(data) { + return request({ + url: "/system/dict/data", + method: "post", + data: data, + }); +} + +// 修改字典数据 +export function updateData(data) { + return request({ + url: "/system/dict/data", + method: "put", + data: data, + }); +} + +// 删除字典数据 +export function delData(dictCode) { + return request({ + url: "/system/dict/data/" + dictCode, + method: "delete", + }); +} diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js index d89dbd1..a0c99f6 100644 --- a/src/api/system/dict/type.js +++ b/src/api/system/dict/type.js @@ -1,60 +1,60 @@ -import request from '@/utils/request' - -// 查询字典类型列表 -export function listType(query) { - return request({ - url: '/system/dict/type/list', - method: 'get', - params: query - }) -} - -// 查询字典类型详细 -export function getType(dictId) { - return request({ - url: '/system/dict/type/' + dictId, - method: 'get' - }) -} - -// 新增字典类型 -export function addType(data) { - return request({ - url: '/system/dict/type', - method: 'post', - data: data - }) -} - -// 修改字典类型 -export function updateType(data) { - return request({ - url: '/system/dict/type', - method: 'put', - data: data - }) -} - -// 删除字典类型 -export function delType(dictId) { - return request({ - url: '/system/dict/type/' + dictId, - method: 'delete' - }) -} - -// 刷新字典缓存 -export function refreshCache() { - return request({ - url: '/system/dict/type/refreshCache', - method: 'delete' - }) -} - -// 获取字典选择框列表 -export function optionselect() { - return request({ - url: '/system/dict/type/optionselect', - method: 'get' - }) -} +import request from "@/utils/request"; + +// 查询字典类型列表 +export function listType(query) { + return request({ + url: "/system/dict/type/list", + method: "get", + params: query, + }); +} + +// 查询字典类型详细 +export function getType(dictId) { + return request({ + url: "/system/dict/type/" + dictId, + method: "get", + }); +} + +// 新增字典类型 +export function addType(data) { + return request({ + url: "/system/dict/type", + method: "post", + data: data, + }); +} + +// 修改字典类型 +export function updateType(data) { + return request({ + url: "/system/dict/type", + method: "put", + data: data, + }); +} + +// 删除字典类型 +export function delType(dictId) { + return request({ + url: "/system/dict/type/" + dictId, + method: "delete", + }); +} + +// 刷新字典缓存 +export function refreshCache() { + return request({ + url: "/system/dict/type/refreshCache", + method: "delete", + }); +} + +// 获取字典选择框列表 +export function optionselect() { + return request({ + url: "/system/dict/type/optionselect", + method: "get", + }); +} diff --git a/src/api/system/menu.js b/src/api/system/menu.js index 97258ee..e7e9866 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -1,60 +1,60 @@ -import request from '@/utils/request' - -// 查询菜单列表 -export function listMenu(query) { - return request({ - url: '/system/menu/list', - method: 'get', - params: query - }) -} - -// 查询菜单详细 -export function getMenu(menuId) { - return request({ - url: '/system/menu/' + menuId, - method: 'get' - }) -} - -// 查询菜单下拉树结构 -export function treeselect() { - return request({ - url: '/system/menu/treeselect', - method: 'get' - }) -} - -// 根据角色ID查询菜单下拉树结构 -export function roleMenuTreeselect(roleId) { - return request({ - url: '/system/menu/roleMenuTreeselect/' + roleId, - method: 'get' - }) -} - -// 新增菜单 -export function addMenu(data) { - return request({ - url: '/system/menu', - method: 'post', - data: data - }) -} - -// 修改菜单 -export function updateMenu(data) { - return request({ - url: '/system/menu', - method: 'put', - data: data - }) -} - -// 删除菜单 -export function delMenu(menuId) { - return request({ - url: '/system/menu/' + menuId, - method: 'delete' - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 查询菜单列表 +export function listMenu(query) { + return request({ + url: "/system/menu/list", + method: "get", + params: query, + }); +} + +// 查询菜单详细 +export function getMenu(menuId) { + return request({ + url: "/system/menu/" + menuId, + method: "get", + }); +} + +// 查询菜单下拉树结构 +export function treeselect() { + return request({ + url: "/system/menu/treeselect", + method: "get", + }); +} + +// 根据角色ID查询菜单下拉树结构 +export function roleMenuTreeselect(roleId) { + return request({ + url: "/system/menu/roleMenuTreeselect/" + roleId, + method: "get", + }); +} + +// 新增菜单 +export function addMenu(data) { + return request({ + url: "/system/menu", + method: "post", + data: data, + }); +} + +// 修改菜单 +export function updateMenu(data) { + return request({ + url: "/system/menu", + method: "put", + data: data, + }); +} + +// 删除菜单 +export function delMenu(menuId) { + return request({ + url: "/system/menu/" + menuId, + method: "delete", + }); +} diff --git a/src/api/system/notice.js b/src/api/system/notice.js index 737fc16..2e80624 100644 --- a/src/api/system/notice.js +++ b/src/api/system/notice.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' - -// 查询公告列表 -export function listNotice(query) { - return request({ - url: '/system/notice/list', - method: 'get', - params: query - }) -} - -// 查询公告详细 -export function getNotice(noticeId) { - return request({ - url: '/system/notice/' + noticeId, - method: 'get' - }) -} - -// 新增公告 -export function addNotice(data) { - return request({ - url: '/system/notice', - method: 'post', - data: data - }) -} - -// 修改公告 -export function updateNotice(data) { - return request({ - url: '/system/notice', - method: 'put', - data: data - }) -} - -// 删除公告 -export function delNotice(noticeId) { - return request({ - url: '/system/notice/' + noticeId, - method: 'delete' - }) -} \ No newline at end of file +import request from "@/utils/request"; + +// 查询公告列表 +export function listNotice(query) { + return request({ + url: "/system/notice/list", + method: "get", + params: query, + }); +} + +// 查询公告详细 +export function getNotice(noticeId) { + return request({ + url: "/system/notice/" + noticeId, + method: "get", + }); +} + +// 新增公告 +export function addNotice(data) { + return request({ + url: "/system/notice", + method: "post", + data: data, + }); +} + +// 修改公告 +export function updateNotice(data) { + return request({ + url: "/system/notice", + method: "put", + data: data, + }); +} + +// 删除公告 +export function delNotice(noticeId) { + return request({ + url: "/system/notice/" + noticeId, + method: "delete", + }); +} diff --git a/src/api/system/post.js b/src/api/system/post.js index 8faa266..0258833 100644 --- a/src/api/system/post.js +++ b/src/api/system/post.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' - -// 查询岗位列表 -export function listPost(query) { - return request({ - url: '/system/post/list', - method: 'get', - params: query - }) -} - -// 查询岗位详细 -export function getPost(postId) { - return request({ - url: '/system/post/' + postId, - method: 'get' - }) -} - -// 新增岗位 -export function addPost(data) { - return request({ - url: '/system/post', - method: 'post', - data: data - }) -} - -// 修改岗位 -export function updatePost(data) { - return request({ - url: '/system/post', - method: 'put', - data: data - }) -} - -// 删除岗位 -export function delPost(postId) { - return request({ - url: '/system/post/' + postId, - method: 'delete' - }) -} +import request from "@/utils/request"; + +// 查询岗位列表 +export function listPost(query) { + return request({ + url: "/system/post/list", + method: "get", + params: query, + }); +} + +// 查询岗位详细 +export function getPost(postId) { + return request({ + url: "/system/post/" + postId, + method: "get", + }); +} + +// 新增岗位 +export function addPost(data) { + return request({ + url: "/system/post", + method: "post", + data: data, + }); +} + +// 修改岗位 +export function updatePost(data) { + return request({ + url: "/system/post", + method: "put", + data: data, + }); +} + +// 删除岗位 +export function delPost(postId) { + return request({ + url: "/system/post/" + postId, + method: "delete", + }); +} diff --git a/src/api/system/role.js b/src/api/system/role.js index 7710cc2..b8865ab 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -1,111 +1,111 @@ -import request from '@/utils/request' - -// 查询角色列表 -export function listRole(query) { - return request({ - url: '/system/role/list', - method: 'get', - params: query - }) -} - -// 查询角色详细 -export function getRole(roleId) { - return request({ - url: '/system/role/' + roleId, - method: 'get' - }) -} - -// 新增角色 -export function addRole(data) { - return request({ - url: '/system/role', - method: 'post', - data: data - }) -} - -// 修改角色 -export function updateRole(data) { - return request({ - url: '/system/role', - method: 'put', - data: data - }) -} - -// 角色数据权限 -export function dataScope(data) { - return request({ - url: '/system/role/dataScope', - method: 'put', - data: data - }) -} - -// 角色状态修改 -export function changeRoleStatus(roleId, status) { - const data = { - roleId, - status - } - return request({ - url: '/system/role/changeStatus', - method: 'put', - data: data - }) -} - -// 删除角色 -export function delRole(roleId) { - return request({ - url: '/system/role/' + roleId, - method: 'delete' - }) -} - -// 查询角色已授权用户列表 -export function allocatedUserList(query) { - return request({ - url: '/system/role/authUser/allocatedList', - method: 'get', - params: query - }) -} - -// 查询角色未授权用户列表 -export function unallocatedUserList(query) { - return request({ - url: '/system/role/authUser/unallocatedList', - method: 'get', - params: query - }) -} - -// 取消用户授权角色 -export function authUserCancel(data) { - return request({ - url: '/system/role/authUser/cancel', - method: 'put', - data: data - }) -} - -// 批量取消用户授权角色 -export function authUserCancelAll(data) { - return request({ - url: '/system/role/authUser/cancelAll', - method: 'put', - params: data - }) -} - -// 授权用户选择 -export function authUserSelectAll(data) { - return request({ - url: '/system/role/authUser/selectAll', - method: 'put', - params: data - }) -} +import request from "@/utils/request"; + +// 查询角色列表 +export function listRole(query) { + return request({ + url: "/system/role/list", + method: "get", + params: query, + }); +} + +// 查询角色详细 +export function getRole(roleId) { + return request({ + url: "/system/role/" + roleId, + method: "get", + }); +} + +// 新增角色 +export function addRole(data) { + return request({ + url: "/system/role", + method: "post", + data: data, + }); +} + +// 修改角色 +export function updateRole(data) { + return request({ + url: "/system/role", + method: "put", + data: data, + }); +} + +// 角色数据权限 +export function dataScope(data) { + return request({ + url: "/system/role/dataScope", + method: "put", + data: data, + }); +} + +// 角色状态修改 +export function changeRoleStatus(roleId, status) { + const data = { + roleId, + status, + }; + return request({ + url: "/system/role/changeStatus", + method: "put", + data: data, + }); +} + +// 删除角色 +export function delRole(roleId) { + return request({ + url: "/system/role/" + roleId, + method: "delete", + }); +} + +// 查询角色已授权用户列表 +export function allocatedUserList(query) { + return request({ + url: "/system/role/authUser/allocatedList", + method: "get", + params: query, + }); +} + +// 查询角色未授权用户列表 +export function unallocatedUserList(query) { + return request({ + url: "/system/role/authUser/unallocatedList", + method: "get", + params: query, + }); +} + +// 取消用户授权角色 +export function authUserCancel(data) { + return request({ + url: "/system/role/authUser/cancel", + method: "put", + data: data, + }); +} + +// 批量取消用户授权角色 +export function authUserCancelAll(data) { + return request({ + url: "/system/role/authUser/cancelAll", + method: "put", + params: data, + }); +} + +// 授权用户选择 +export function authUserSelectAll(data) { + return request({ + url: "/system/role/authUser/selectAll", + method: "put", + params: data, + }); +} diff --git a/src/api/system/user.js b/src/api/system/user.js index ad227f9..26b3610 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -1,127 +1,127 @@ -import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; - -// 查询用户列表 -export function listUser(query) { - return request({ - url: '/system/user/list', - method: 'get', - params: query - }) -} - -// 查询用户详细 -export function getUser(userId) { - return request({ - url: '/system/user/' + parseStrEmpty(userId), - method: 'get' - }) -} - -// 新增用户 -export function addUser(data) { - return request({ - url: '/system/user', - method: 'post', - data: data - }) -} - -// 修改用户 -export function updateUser(data) { - return request({ - url: '/system/user', - method: 'put', - data: data - }) -} - -// 删除用户 -export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) -} - -// 用户密码重置 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} - -// 用户状态修改 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) -} - -// 查询用户个人信息 -export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) -} - -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) -} - -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - params: data - }) -} - -// 用户头像上传 -export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'post', - data: data - }) -} - -// 查询授权角色 -export function getAuthRole(userId) { - return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) -} - -// 保存授权角色 -export function updateAuthRole(data) { - return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) -} +import request from "@/utils/request"; +import { parseStrEmpty } from "@/utils/ruoyi"; + +// 查询用户列表 +export function listUser(query) { + return request({ + url: "/system/user/list", + method: "get", + params: query, + }); +} + +// 查询用户详细 +export function getUser(userId) { + return request({ + url: "/system/user/" + parseStrEmpty(userId), + method: "get", + }); +} + +// 新增用户 +export function addUser(data) { + return request({ + url: "/system/user", + method: "post", + data: data, + }); +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: "/system/user", + method: "put", + data: data, + }); +} + +// 删除用户 +export function delUser(userId) { + return request({ + url: "/system/user/" + userId, + method: "delete", + }); +} + +// 用户密码重置 +export function resetUserPwd(userId, password) { + const data = { + userId, + password, + }; + return request({ + url: "/system/user/resetPwd", + method: "put", + data: data, + }); +} + +// 用户状态修改 +export function changeUserStatus(userId, status) { + const data = { + userId, + status, + }; + return request({ + url: "/system/user/changeStatus", + method: "put", + data: data, + }); +} + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: "/system/user/profile", + method: "get", + }); +} + +// 修改用户个人信息 +export function updateUserProfile(data) { + return request({ + url: "/system/user/profile", + method: "put", + data: data, + }); +} + +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword, + }; + return request({ + url: "/system/user/profile/updatePwd", + method: "put", + params: data, + }); +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: "/system/user/profile/avatar", + method: "post", + data: data, + }); +} + +// 查询授权角色 +export function getAuthRole(userId) { + return request({ + url: "/system/user/authRole/" + userId, + method: "get", + }); +} + +// 保存授权角色 +export function updateAuthRole(data) { + return request({ + url: "/system/user/authRole", + method: "put", + params: data, + }); +} diff --git a/src/api/tool/gen.js b/src/api/tool/gen.js index afaf2a9..e3461ab 100644 --- a/src/api/tool/gen.js +++ b/src/api/tool/gen.js @@ -1,76 +1,76 @@ -import request from '@/utils/request' - -// 查询生成表数据 -export function listTable(query) { - return request({ - url: '/tool/gen/list', - method: 'get', - params: query - }) -} -// 查询db数据库列表 -export function listDbTable(query) { - return request({ - url: '/tool/gen/db/list', - method: 'get', - params: query - }) -} - -// 查询表详细信息 -export function getGenTable(tableId) { - return request({ - url: '/tool/gen/' + tableId, - method: 'get' - }) -} - -// 修改代码生成信息 -export function updateGenTable(data) { - return request({ - url: '/tool/gen', - method: 'put', - data: data - }) -} - -// 导入表 -export function importTable(data) { - return request({ - url: '/tool/gen/importTable', - method: 'post', - params: data - }) -} - -// 预览生成代码 -export function previewTable(tableId) { - return request({ - url: '/tool/gen/preview/' + tableId, - method: 'get' - }) -} - -// 删除表数据 -export function delTable(tableId) { - return request({ - url: '/tool/gen/' + tableId, - method: 'delete' - }) -} - -// 生成代码（自定义路径） -export function genCode(tableName) { - return request({ - url: '/tool/gen/genCode/' + tableName, - method: 'get' - }) -} - -// 同步数据库 -export function synchDb(tableName) { - return request({ - url: '/tool/gen/synchDb/' + tableName, - method: 'get' - }) -} +import request from "@/utils/request"; + +// 查询生成表数据 +export function listTable(query) { + return request({ + url: "/tool/gen/list", + method: "get", + params: query, + }); +} +// 查询db数据库列表 +export function listDbTable(query) { + return request({ + url: "/tool/gen/db/list", + method: "get", + params: query, + }); +} + +// 查询表详细信息 +export function getGenTable(tableId) { + return request({ + url: "/tool/gen/" + tableId, + method: "get", + }); +} + +// 修改代码生成信息 +export function updateGenTable(data) { + return request({ + url: "/tool/gen", + method: "put", + data: data, + }); +} + +// 导入表 +export function importTable(data) { + return request({ + url: "/tool/gen/importTable", + method: "post", + params: data, + }); +} + +// 预览生成代码 +export function previewTable(tableId) { + return request({ + url: "/tool/gen/preview/" + tableId, + method: "get", + }); +} + +// 删除表数据 +export function delTable(tableId) { + return request({ + url: "/tool/gen/" + tableId, + method: "delete", + }); +} + +// 生成代码（自定义路径） +export function genCode(tableName) { + return request({ + url: "/tool/gen/genCode/" + tableName, + method: "get", + }); +} + +// 同步数据库 +export function synchDb(tableName) { + return request({ + url: "/tool/gen/synchDb/" + tableName, + method: "get", + }); +} diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss index 46a41f3..c13df57 100644 --- a/src/assets/styles/btn.scss +++ b/src/assets/styles/btn.scss @@ -1,99 +1,99 @@ -@import './variables.module.scss'; - -@mixin colorBtn($color) { - background: $color; - - &:hover { - color: $color; - - &:before, - &:after { - background: $color; - } - } -} - -.blue-btn { - @include colorBtn($blue) -} - -.light-blue-btn { - @include colorBtn($light-blue) -} - -.red-btn { - @include colorBtn($red) -} - -.pink-btn { - @include colorBtn($pink) -} - -.green-btn { - @include colorBtn($green) -} - -.tiffany-btn { - @include colorBtn($tiffany) -} - -.yellow-btn { - @include colorBtn($yellow) -} - -.pan-btn { - font-size: 14px; - color: #fff; - padding: 14px 36px; - border-radius: 8px; - border: none; - outline: none; - transition: 600ms ease all; - position: relative; - display: inline-block; - - &:hover { - background: #fff; - - &:before, - &:after { - width: 100%; - transition: 600ms ease all; - } - } - - &:before, - &:after { - content: ''; - position: absolute; - top: 0; - right: 0; - height: 2px; - width: 0; - transition: 400ms ease all; - } - - &::after { - right: inherit; - top: inherit; - left: 0; - bottom: 0; - } -} - -.custom-button { - display: inline-block; - line-height: 1; - white-space: nowrap; - cursor: pointer; - background: #fff; - color: #fff; - -webkit-appearance: none; - text-align: center; - box-sizing: border-box; - outline: 0; - margin: 0; - padding: 10px 15px; - font-size: 14px; - border-radius: 4px; -} +@import "./variables.module.scss"; + +@mixin colorBtn($color) { + background: $color; + + &:hover { + color: $color; + + &:before, + &:after { + background: $color; + } + } +} + +.blue-btn { + @include colorBtn($blue); +} + +.light-blue-btn { + @include colorBtn($light-blue); +} + +.red-btn { + @include colorBtn($red); +} + +.pink-btn { + @include colorBtn($pink); +} + +.green-btn { + @include colorBtn($green); +} + +.tiffany-btn { + @include colorBtn($tiffany); +} + +.yellow-btn { + @include colorBtn($yellow); +} + +.pan-btn { + font-size: 14px; + color: #fff; + padding: 14px 36px; + border-radius: 8px; + border: none; + outline: none; + transition: 600ms ease all; + position: relative; + display: inline-block; + + &:hover { + background: #fff; + + &:before, + &:after { + width: 100%; + transition: 600ms ease all; + } + } + + &:before, + &:after { + content: ""; + position: absolute; + top: 0; + right: 0; + height: 2px; + width: 0; + transition: 400ms ease all; + } + + &::after { + right: inherit; + top: inherit; + left: 0; + bottom: 0; + } +} + +.custom-button { + display: inline-block; + line-height: 1; + white-space: nowrap; + cursor: pointer; + background: #fff; + color: #fff; + -webkit-appearance: none; + text-align: center; + box-sizing: border-box; + outline: 0; + margin: 0; + padding: 10px 15px; + font-size: 14px; + border-radius: 4px; +} diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index bb5414d..63c04e7 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -1,96 +1,96 @@ -// cover some element-ui styles - -.el-breadcrumb__inner, -.el-breadcrumb__inner a { - font-weight: 400 !important; -} - -.el-upload { - input[type="file"] { - display: none !important; - } -} - -.el-upload__input { - display: none; -} - -.cell { - .el-tag { - margin-right: 0px; - } -} - -.small-padding { - .cell { - padding-left: 5px; - padding-right: 5px; - } -} - -.fixed-width { - .el-button--mini { - padding: 7px 10px; - width: 60px; - } -} - -.status-col { - .cell { - padding: 0 10px; - text-align: center; - - .el-tag { - margin-right: 0px; - } - } -} - -// to fixed https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; -} - -// refine element ui upload -.upload-container { - .el-upload { - width: 100%; - - .el-upload-dragger { - width: 100%; - height: 200px; - } - } -} - -// dropdown -.el-dropdown-menu { - a { - display: block - } -} - -// fix date-picker ui bug in filter-item -.el-range-editor.el-input__inner { - display: inline-flex !important; -} - -// to fix el-date-picker css style -.el-range-separator { - box-sizing: content-box; -} - -.el-menu--collapse - > div - > .el-submenu - > .el-submenu__title - .el-submenu__icon-arrow { - display: none; -} - -.el-dropdown .el-dropdown-link{ - color: var(--el-color-primary) !important; -} \ No newline at end of file +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + +.cell { + .el-tag { + margin-right: 0px; + } +} + +.small-padding { + .cell { + padding-left: 5px; + padding-right: 5px; + } +} + +.fixed-width { + .el-button--mini { + padding: 7px 10px; + width: 60px; + } +} + +.status-col { + .cell { + padding: 0 10px; + text-align: center; + + .el-tag { + margin-right: 0px; + } + } +} + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block; + } +} + +// fix date-picker ui bug in filter-item +.el-range-editor.el-input__inner { + display: inline-flex !important; +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} + +.el-menu--collapse + > div + > .el-submenu + > .el-submenu__title + .el-submenu__icon-arrow { + display: none; +} + +.el-dropdown .el-dropdown-link { + color: var(--el-color-primary) !important; +} diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 4f3a36f..1193f31 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -1,193 +1,201 @@ -@import './variables.module.scss'; -@import './mixin.scss'; -@import './transition.scss'; -@import './element-ui.scss'; -@import './sidebar.scss'; -@import './btn.scss'; -@import './ruoyi.scss'; - -body { - height: 100%; - margin: 0; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; -} - -label { - font-weight: 700; -} - -html { - height: 100%; - box-sizing: border-box; -} - -#app { - height: 100%; -} - -*, -*:before, -*:after { - box-sizing: inherit; -} - -.no-padding { - padding: 0px !important; -} - -.padding-content { - padding: 4px 0; -} - -a:focus, -a:active { - outline: none; -} - -a, -a:focus, -a:hover { - cursor: pointer; - color: inherit; - text-decoration: none; -} - -div:focus { - outline: none; -} - -.fr { - float: right; -} - -.fl { - float: left; -} - -.pr-5 { - padding-right: 5px; -} - -.pl-5 { - padding-left: 5px; -} - -.block { - display: block; -} - -.pointer { - cursor: pointer; -} - -.inlineBlock { - display: block; -} - -.clearfix { - &:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; - } -} - -aside { - background: #eef1f6; - padding: 8px 24px; - margin-bottom: 20px; - border-radius: 2px; - display: block; - line-height: 32px; - font-size: 16px; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - color: #2c3e50; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - a { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } - } -} - -//main-container全局样式 -.app-container { - padding: 20px; -} - -.components-container { - margin: 30px 50px; - position: relative; -} - -.pagination-container { - margin-top: 30px; -} - -.text-center { - text-align: center -} - -.sub-navbar { - height: 50px; - line-height: 50px; - position: relative; - width: 100%; - text-align: right; - padding-right: 20px; - transition: 600ms ease position; - background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); - - .subtitle { - font-size: 20px; - color: #fff; - } - - &.draft { - background: #d0d0d0; - } - - &.deleted { - background: #d0d0d0; - } -} - -.link-type, -.link-type:focus { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } -} - -.filter-container { - padding-bottom: 10px; - - .filter-item { - display: inline-block; - vertical-align: middle; - margin-bottom: 10px; - } -} - -//refine vue-multiselect plugin -.multiselect { - line-height: 16px; -} - -.multiselect--active { - z-index: 1000 !important; -} +@import "./variables.module.scss"; +@import "./mixin.scss"; +@import "./transition.scss"; +@import "./element-ui.scss"; +@import "./sidebar.scss"; +@import "./btn.scss"; +@import "./ruoyi.scss"; + +body { + height: 100%; + margin: 0; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, + Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +.no-padding { + padding: 0px !important; +} + +.padding-content { + padding: 4px 0; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.fr { + float: right; +} + +.fl { + float: left; +} + +.pr-5 { + padding-right: 5px; +} + +.pl-5 { + padding-left: 5px; +} + +.block { + display: block; +} + +.pointer { + cursor: pointer; +} + +.inlineBlock { + display: block; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +aside { + background: #eef1f6; + padding: 8px 24px; + margin-bottom: 20px; + border-radius: 2px; + display: block; + line-height: 32px; + font-size: 16px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, + Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; + color: #2c3e50; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + a { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } + } +} + +//main-container全局样式 +.app-container { + padding: 20px; +} + +.components-container { + margin: 30px 50px; + position: relative; +} + +.pagination-container { + margin-top: 30px; +} + +.text-center { + text-align: center; +} + +.sub-navbar { + height: 50px; + line-height: 50px; + position: relative; + width: 100%; + text-align: right; + padding-right: 20px; + transition: 600ms ease position; + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); + + .subtitle { + font-size: 20px; + color: #fff; + } + + &.draft { + background: #d0d0d0; + } + + &.deleted { + background: #d0d0d0; + } +} + +.link-type, +.link-type:focus { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } +} + +.filter-container { + padding-bottom: 10px; + + .filter-item { + display: inline-block; + vertical-align: middle; + margin-bottom: 10px; + } +} + +//refine vue-multiselect plugin +.multiselect { + line-height: 16px; +} + +.multiselect--active { + z-index: 1000 !important; +} diff --git a/src/assets/styles/infinite-select.scss b/src/assets/styles/infinite-select.scss index c331a47..b48a267 100644 --- a/src/assets/styles/infinite-select.scss +++ b/src/assets/styles/infinite-select.scss @@ -2,4 +2,4 @@ .el-scrollbar { height: 260px; } -} \ No newline at end of file +} diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 64d9cf6..9172448 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -1,66 +1,60 @@ -@mixin clearfix { - &:after { - content: ""; - display: table; - clear: both; - } -} - -@mixin scrollBar { - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } -} - -@mixin relative { - position: relative; - width: 100%; - height: 100%; -} - -@mixin pct($pct) { - width: #{$pct}; - position: relative; - margin: 0 auto; -} - -@mixin triangle($width, $height, $color, $direction) { - $width: $width/2; - $color-border-style: $height solid $color; - $transparent-border-style: $width solid transparent; - height: 0; - width: 0; - - @if $direction==up { - border-bottom: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - - @else if $direction==right { - border-left: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } - - @else if $direction==down { - border-top: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - - @else if $direction==left { - border-right: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } -} +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} + +@mixin pct($pct) { + width: #{$pct}; + position: relative; + margin: 0 auto; +} + +@mixin triangle($width, $height, $color, $direction) { + $width: $width/2; + $color-border-style: $height solid $color; + $transparent-border-style: $width solid transparent; + height: 0; + width: 0; + + @if $direction==up { + border-bottom: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } @else if $direction==right { + border-left: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } @else if $direction==down { + border-top: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } @else if $direction==left { + border-right: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } +} diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 6cdc2b6..1689bab 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -1,274 +1,287 @@ - /** - * 通用css样式布局处理 - * Copyright (c) 2019 ruoyi - */ - - /** 基础通用 **/ -.pt5 { - padding-top: 5px; -} -.pr5 { - padding-right: 5px; -} -.pb5 { - padding-bottom: 5px; -} -.mt5 { - margin-top: 5px; -} -.mr5 { - margin-right: 5px; -} -.mb5 { - margin-bottom: 5px; -} -.mb8 { - margin-bottom: 8px; -} -.ml5 { - margin-left: 5px; -} -.mt10 { - margin-top: 10px; -} -.mr10 { - margin-right: 10px; -} -.mb10 { - margin-bottom: 10px; -} -.ml10 { - margin-left: 10px; -} -.mt20 { - margin-top: 20px; -} -.mr20 { - margin-right: 20px; -} -.mb20 { - margin-bottom: 20px; -} -.ml20 { - margin-left: 20px; -} - -.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-family: inherit; - font-weight: 500; - line-height: 1.1; - color: inherit; -} - -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; -} - -.el-dialog.scrollbar .el-dialog__body { - overflow: auto; - overflow-x: hidden; - max-height: 70vh; - padding: 10px 20px 0; -} - -.el-table { - .el-table__header-wrapper, .el-table__fixed-header-wrapper { - th { - word-break: break-word; - background-color: #f8f8f9 !important; - color: #515a6e; - height: 40px !important; - font-size: 13px; - } - } - .el-table__body-wrapper { - .el-button [class*="el-icon-"] + span { - margin-left: 1px; - } - } -} - -/** 表单布局 **/ -.form-header { - font-size:15px; - color:#6379bb; - border-bottom:1px solid #ddd; - margin:8px 10px 25px 10px; - padding-bottom:5px -} - -/** 表格布局 **/ -.pagination-container { - // position: relative; - height: 25px; - margin-bottom: 10px; - margin-top: 15px; - padding: 10px 20px !important; -} - -/* tree border */ -.tree-border { - margin-top: 5px; - border: 1px solid #e5e6e7; - background: #FFFFFF none; - border-radius:4px; - width: 100%; -} - -.pagination-container .el-pagination { - right: 0; - position: absolute; -} - -@media ( max-width : 768px) { - .pagination-container .el-pagination > .el-pagination__jump { - display: none !important; - } - .pagination-container .el-pagination > .el-pagination__sizes { - display: none !important; - } -} - -.el-table .fixed-width .el-button--small { - padding-left: 0; - padding-right: 0; - width: inherit; -} - -/** 表格更多操作下拉样式 */ -.el-table .el-dropdown-link { - cursor: pointer; - color: #409EFF; - margin-left: 10px; -} - -.el-table .el-dropdown, .el-icon-arrow-down { - font-size: 12px; -} - -.el-tree-node__content > .el-checkbox { - margin-right: 8px; -} - -.list-group-striped > .list-group-item { - border-left: 0; - border-right: 0; - border-radius: 0; - padding-left: 0; - padding-right: 0; -} - -.list-group { - padding-left: 0px; - list-style: none; -} - -.list-group-item { - border-bottom: 1px solid #e7eaec; - border-top: 1px solid #e7eaec; - margin-bottom: -1px; - padding: 11px 0px; - font-size: 13px; -} - -.pull-right { - float: right !important; -} - -.el-card__header { - padding: 14px 15px 7px !important; - min-height: 40px; -} - -.el-card__body { - padding: 15px 20px 20px 20px !important; -} - -.card-box { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 10px; -} - -/* button color */ -.el-button--cyan.is-active, -.el-button--cyan:active { - background: #20B2AA; - border-color: #20B2AA; - color: #FFFFFF; -} - -.el-button--cyan:focus, -.el-button--cyan:hover { - background: #48D1CC; - border-color: #48D1CC; - color: #FFFFFF; -} - -.el-button--cyan { - background-color: #20B2AA; - border-color: #20B2AA; - color: #FFFFFF; -} - -/* text color */ -.text-navy { - color: #1ab394; -} - -.text-primary { - color: inherit; -} - -.text-success { - color: #1c84c6; -} - -.text-info { - color: #23c6c8; -} - -.text-warning { - color: #f8ac59; -} - -.text-danger { - color: #ed5565; -} - -.text-muted { - color: #888888; -} - -/* image */ -.img-circle { - border-radius: 50%; -} - -.img-lg { - width: 120px; - height: 120px; -} - -.avatar-upload-preview { - position: absolute; - top: 50%; - transform: translate(50%, -50%); - width: 200px; - height: 200px; - border-radius: 50%; - box-shadow: 0 0 4px #ccc; - overflow: hidden; -} - -/* 拖拽列样式 */ -.sortable-ghost{ - opacity: .8; - color: #fff!important; - background: #42b983!important; -} - -/* 表格右侧工具栏样式 */ -.top-right-btn { - margin-left: auto; -} +/** + * 通用css样式布局处理 + * Copyright (c) 2019 ruoyi + */ + +/** 基础通用 **/ +.pt5 { + padding-top: 5px; +} +.pr5 { + padding-right: 5px; +} +.pb5 { + padding-bottom: 5px; +} +.mt5 { + margin-top: 5px; +} +.mr5 { + margin-right: 5px; +} +.mb5 { + margin-bottom: 5px; +} +.mb8 { + margin-bottom: 8px; +} +.ml5 { + margin-left: 5px; +} +.mt10 { + margin-top: 10px; +} +.mr10 { + margin-right: 10px; +} +.mb10 { + margin-bottom: 10px; +} +.ml10 { + margin-left: 10px; +} +.mt20 { + margin-top: 20px; +} +.mr20 { + margin-right: 20px; +} +.mb20 { + margin-bottom: 20px; +} +.ml20 { + margin-left: 20px; +} + +.h1, +.h2, +.h3, +.h4, +.h5, +.h6, +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: inherit; + font-weight: 500; + line-height: 1.1; + color: inherit; +} + +.el-dialog:not(.is-fullscreen) { + margin-top: 6vh !important; +} + +.el-dialog.scrollbar .el-dialog__body { + overflow: auto; + overflow-x: hidden; + max-height: 70vh; + padding: 10px 20px 0; +} + +.el-table { + .el-table__header-wrapper, + .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9 !important; + color: #515a6e; + height: 40px !important; + font-size: 13px; + } + } + .el-table__body-wrapper { + .el-button [class*="el-icon-"] + span { + margin-left: 1px; + } + } +} + +/** 表单布局 **/ +.form-header { + font-size: 15px; + color: #6379bb; + border-bottom: 1px solid #ddd; + margin: 8px 10px 25px 10px; + padding-bottom: 5px; +} + +/** 表格布局 **/ +.pagination-container { + // position: relative; + height: 25px; + margin-bottom: 10px; + margin-top: 15px; + padding: 10px 20px !important; +} + +/* tree border */ +.tree-border { + margin-top: 5px; + border: 1px solid #e5e6e7; + background: #ffffff none; + border-radius: 4px; + width: 100%; +} + +.pagination-container .el-pagination { + right: 0; + position: absolute; +} + +@media (max-width: 768px) { + .pagination-container .el-pagination > .el-pagination__jump { + display: none !important; + } + .pagination-container .el-pagination > .el-pagination__sizes { + display: none !important; + } +} + +.el-table .fixed-width .el-button--small { + padding-left: 0; + padding-right: 0; + width: inherit; +} + +/** 表格更多操作下拉样式 */ +.el-table .el-dropdown-link { + cursor: pointer; + color: #409eff; + margin-left: 10px; +} + +.el-table .el-dropdown, +.el-icon-arrow-down { + font-size: 12px; +} + +.el-tree-node__content > .el-checkbox { + margin-right: 8px; +} + +.list-group-striped > .list-group-item { + border-left: 0; + border-right: 0; + border-radius: 0; + padding-left: 0; + padding-right: 0; +} + +.list-group { + padding-left: 0px; + list-style: none; +} + +.list-group-item { + border-bottom: 1px solid #e7eaec; + border-top: 1px solid #e7eaec; + margin-bottom: -1px; + padding: 11px 0px; + font-size: 13px; +} + +.pull-right { + float: right !important; +} + +.el-card__header { + padding: 14px 15px 7px !important; + min-height: 40px; +} + +.el-card__body { + padding: 15px 20px 20px 20px !important; +} + +.card-box { + padding-right: 15px; + padding-left: 15px; + margin-bottom: 10px; +} + +/* button color */ +.el-button--cyan.is-active, +.el-button--cyan:active { + background: #20b2aa; + border-color: #20b2aa; + color: #ffffff; +} + +.el-button--cyan:focus, +.el-button--cyan:hover { + background: #48d1cc; + border-color: #48d1cc; + color: #ffffff; +} + +.el-button--cyan { + background-color: #20b2aa; + border-color: #20b2aa; + color: #ffffff; +} + +/* text color */ +.text-navy { + color: #1ab394; +} + +.text-primary { + color: inherit; +} + +.text-success { + color: #1c84c6; +} + +.text-info { + color: #23c6c8; +} + +.text-warning { + color: #f8ac59; +} + +.text-danger { + color: #ed5565; +} + +.text-muted { + color: #888888; +} + +/* image */ +.img-circle { + border-radius: 50%; +} + +.img-lg { + width: 120px; + height: 120px; +} + +.avatar-upload-preview { + position: absolute; + top: 50%; + transform: translate(50%, -50%); + width: 200px; + height: 200px; + border-radius: 50%; + box-shadow: 0 0 4px #ccc; + overflow: hidden; +} + +/* 拖拽列样式 */ +.sortable-ghost { + opacity: 0.8; + color: #fff !important; + background: #42b983 !important; +} + +/* 表格右侧工具栏样式 */ +.top-right-btn { + margin-left: auto; +} diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 88be1a9..aeefcc9 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,238 +1,237 @@ -#app { - - .main-container { - min-height: 100%; - transition: margin-left .28s; - margin-left: $base-sidebar-width; - position: relative; - } - - .sidebarHide { - margin-left: 0!important; - } - - .sidebar-container { - -webkit-transition: width .28s; - transition: width 0.28s; - width: $base-sidebar-width !important; - background-color: $base-menu-background; - height: 100%; - position: fixed; - font-size: 0px; - top: 0; - bottom: 0; - left: 0; - z-index: 1001; - overflow: hidden; - -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); - box-shadow: 2px 0 6px rgba(0,21,41,.35); - - // reset element-ui css - .horizontal-collapse-transition { - transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; - } - - .scrollbar-wrapper { - overflow-x: hidden !important; - } - - .el-scrollbar__bar.is-vertical { - right: 0px; - } - - .el-scrollbar { - height: 100%; - } - - &.has-logo { - .el-scrollbar { - height: calc(100% - 50px); - } - } - - .is-horizontal { - display: none; - } - - a { - display: inline-block; - width: 100%; - overflow: hidden; - } - - .svg-icon { - margin-right: 16px; - } - - .el-menu { - border: none; - height: 100%; - width: 100% !important; - } - - .el-menu-item, .menu-title { - overflow: hidden !important; - text-overflow: ellipsis !important; - white-space: nowrap !important; - } - - .el-menu-item .el-menu-tooltip__trigger { - display: inline-block !important; - } - - // menu hover - .sub-menu-title-noDropdown, - .el-sub-menu__title { - &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - & .theme-dark .is-active > .el-sub-menu__title { - color: $base-menu-color-active !important; - } - - & .nest-menu .el-sub-menu>.el-sub-menu__title, - & .el-sub-menu .el-menu-item { - min-width: $base-sidebar-width !important; - - &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - & .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title, - & .theme-dark .el-sub-menu .el-menu-item { - background-color: $base-sub-menu-background !important; - - &:hover { - background-color: $base-sub-menu-hover !important; - } - } - } - - .hideSidebar { - .sidebar-container { - width: 54px !important; - } - - .main-container { - margin-left: 54px; - } - - .sub-menu-title-noDropdown { - padding: 0 !important; - position: relative; - - .el-tooltip { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - } - } - - .el-sub-menu { - overflow: hidden; - - &>.el-sub-menu__title { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - - } - } - - .el-menu--collapse { - .el-sub-menu { - &>.el-sub-menu__title { - &>span { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - } - &>i { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - } - } - } - } - } - - .el-menu--collapse .el-menu .el-sub-menu { - min-width: $base-sidebar-width !important; - } - - // mobile responsive - .mobile { - .main-container { - margin-left: 0px; - } - - .sidebar-container { - transition: transform .28s; - width: $base-sidebar-width !important; - } - - &.hideSidebar { - .sidebar-container { - pointer-events: none; - transition-duration: 0.3s; - transform: translate3d(-$base-sidebar-width, 0, 0); - } - } - } - - .withoutAnimation { - - .main-container, - .sidebar-container { - transition: none; - } - } -} - -// when menu collapsed -.el-menu--vertical { - &>.el-menu { - .svg-icon { - margin-right: 16px; - } - } - - .nest-menu .el-sub-menu>.el-sub-menu__title, - .el-menu-item { - &:hover { - // you can use $sub-menuHover - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - // the scroll bar appears when the sub-menu is too long - >.el-menu--popup { - max-height: 100vh; - overflow-y: auto; - - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } - } -} +#app { + .main-container { + min-height: 100%; + transition: margin-left 0.28s; + margin-left: $base-sidebar-width; + position: relative; + } + + .sidebarHide { + margin-left: 0 !important; + } + + .sidebar-container { + -webkit-transition: width 0.28s; + transition: width 0.28s; + width: $base-sidebar-width !important; + background-color: $base-menu-background; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35); + box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35); + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, + 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + .el-menu-item, + .menu-title { + overflow: hidden !important; + text-overflow: ellipsis !important; + white-space: nowrap !important; + } + + .el-menu-item .el-menu-tooltip__trigger { + display: inline-block !important; + } + + // menu hover + .sub-menu-title-noDropdown, + .el-sub-menu__title { + &:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + & .theme-dark .is-active > .el-sub-menu__title { + color: $base-menu-color-active !important; + } + + & .nest-menu .el-sub-menu > .el-sub-menu__title, + & .el-sub-menu .el-menu-item { + min-width: $base-sidebar-width !important; + + &:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title, + & .theme-dark .el-sub-menu .el-menu-item { + background-color: $base-sub-menu-background !important; + + &:hover { + background-color: $base-sub-menu-hover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .sub-menu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-sub-menu { + overflow: hidden; + + & > .el-sub-menu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-menu--collapse { + .el-sub-menu { + & > .el-sub-menu__title { + & > span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + & > i { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-sub-menu { + min-width: $base-sidebar-width !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform 0.28s; + width: $base-sidebar-width !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$base-sidebar-width, 0, 0); + } + } + } + + .withoutAnimation { + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + & > .el-menu { + .svg-icon { + margin-right: 16px; + } + } + + .nest-menu .el-sub-menu > .el-sub-menu__title, + .el-menu-item { + &:hover { + // you can use $sub-menuHover + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + // the scroll bar appears when the sub-menu is too long + > .el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/src/assets/styles/transition.scss b/src/assets/styles/transition.scss index 25e7e18..b02f60b 100644 --- a/src/assets/styles/transition.scss +++ b/src/assets/styles/transition.scss @@ -1,48 +1,48 @@ -// global transition css - -/* fade */ -.fade-enter-active, -.fade-leave-active { - transition: opacity 0.28s; -} - -.fade-enter, -.fade-leave-active { - opacity: 0; -} - -/* fade-transform */ -.fade-transform-leave-active, -.fade-transform-enter-active { - transition: all .5s; -} - -.fade-transform-enter { - opacity: 0; - transform: translateX(-30px); -} - -.fade-transform-leave-to { - opacity: 0; - transform: translateX(30px); -} - -/* breadcrumb transition */ -.breadcrumb-enter-active, -.breadcrumb-leave-active { - transition: all .5s; -} - -.breadcrumb-enter, -.breadcrumb-leave-active { - opacity: 0; - transform: translateX(20px); -} - -.breadcrumb-move { - transition: all .5s; -} - -.breadcrumb-leave-active { - position: absolute; -} +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all 0.5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all 0.5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all 0.5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index e065775..639b23b 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,65 +1,65 @@ -// base color -$blue: #324157; -$light-blue: #3A71A8; -$red: #C03639; -$pink: #E65D6E; -$green: #30B08F; -$tiffany: #4AB7BD; -$yellow: #FEC171; -$panGreen: #30B08F; - -// 默认菜单主题风格 -$base-menu-color: #bfcbd9; -$base-menu-color-active: #f4f4f5; -$base-menu-background: #304156; -$base-logo-title-color: #ffffff; - -$base-menu-light-color: rgba(0, 0, 0, 0.7); -$base-menu-light-background: #ffffff; -$base-logo-light-title-color: #001529; - -$base-sub-menu-background: #1f2d3d; -$base-sub-menu-hover: #001528; - -// 自定义暗色菜单风格 -/** -$base-menu-color:hsla(0,0%,100%,.65); -$base-menu-color-active:#fff; -$base-menu-background:#001529; -$base-logo-title-color: #ffffff; - -$base-menu-light-color:rgba(0,0,0,.70); -$base-menu-light-background:#ffffff; -$base-logo-light-title-color: #001529; - -$base-sub-menu-background:#000c17; -$base-sub-menu-hover:#001528; -*/ - -$--color-primary: #409EFF; -$--color-success: #67C23A; -$--color-warning: #E6A23C; -$--color-danger: #F56C6C; -$--color-info: #909399; - -$base-sidebar-width: 200px; - -// the :export directive is the magic sauce for webpack -// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass -:export { - menuColor: $base-menu-color; - menuLightColor: $base-menu-light-color; - menuColorActive: $base-menu-color-active; - menuBackground: $base-menu-background; - menuLightBackground: $base-menu-light-background; - subMenuBackground: $base-sub-menu-background; - subMenuHover: $base-sub-menu-hover; - sideBarWidth: $base-sidebar-width; - logoTitleColor: $base-logo-title-color; - logoLightTitleColor: $base-logo-light-title-color; - primaryColor: $--color-primary; - successColor: $--color-success; - dangerColor: $--color-danger; - infoColor: $--color-info; - warningColor: $--color-warning; -} +// base color +$blue: #324157; +$light-blue: #3a71a8; +$red: #c03639; +$pink: #e65d6e; +$green: #30b08f; +$tiffany: #4ab7bd; +$yellow: #fec171; +$panGreen: #30b08f; + +// 默认菜单主题风格 +$base-menu-color: #bfcbd9; +$base-menu-color-active: #f4f4f5; +$base-menu-background: #304156; +$base-logo-title-color: #ffffff; + +$base-menu-light-color: rgba(0, 0, 0, 0.7); +$base-menu-light-background: #ffffff; +$base-logo-light-title-color: #001529; + +$base-sub-menu-background: #1f2d3d; +$base-sub-menu-hover: #001528; + +// 自定义暗色菜单风格 +/** +$base-menu-color:hsla(0,0%,100%,.65); +$base-menu-color-active:#fff; +$base-menu-background:#001529; +$base-logo-title-color: #ffffff; + +$base-menu-light-color:rgba(0,0,0,.70); +$base-menu-light-background:#ffffff; +$base-logo-light-title-color: #001529; + +$base-sub-menu-background:#000c17; +$base-sub-menu-hover:#001528; +*/ + +$--color-primary: #409eff; +$--color-success: #67c23a; +$--color-warning: #e6a23c; +$--color-danger: #f56c6c; +$--color-info: #909399; + +$base-sidebar-width: 200px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuColor: $base-menu-color; + menuLightColor: $base-menu-light-color; + menuColorActive: $base-menu-color-active; + menuBackground: $base-menu-background; + menuLightBackground: $base-menu-light-background; + subMenuBackground: $base-sub-menu-background; + subMenuHover: $base-sub-menu-hover; + sideBarWidth: $base-sidebar-width; + logoTitleColor: $base-logo-title-color; + logoLightTitleColor: $base-logo-light-title-color; + primaryColor: $--color-primary; + successColor: $--color-success; + dangerColor: $--color-danger; + infoColor: $--color-info; + warningColor: $--color-warning; +} diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index db66c37..49adcdb 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -1,66 +1,72 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index 0f49315..a02568d 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -1,49 +1,50 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 53fc381..c1637e8 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -1,199 +1,225 @@ - - - - - + + + + + diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 8b6f7a8..b7add79 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -1,41 +1,43 @@ - - - - - + + + + + diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue index 89acd33..3de9bff 100644 --- a/src/components/HeaderSearch/index.vue +++ b/src/components/HeaderSearch/index.vue @@ -1,180 +1,194 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue index 1199456..928ac28 100644 --- a/src/components/IconSelect/index.vue +++ b/src/components/IconSelect/index.vue @@ -1,74 +1,80 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/IconSelect/requireIcons.js b/src/components/IconSelect/requireIcons.js index 158b536..196e4ed 100644 --- a/src/components/IconSelect/requireIcons.js +++ b/src/components/IconSelect/requireIcons.js @@ -1,8 +1,8 @@ -let icons = [] -const modules = import.meta.glob('./../../assets/icons/svg/*.svg'); -for (const path in modules) { - const p = path.split('assets/icons/svg/')[1].split('.svg')[0]; - icons.push(p); -} - -export default icons \ No newline at end of file +let icons = []; +const modules = import.meta.glob("./../../assets/icons/svg/*.svg"); +for (const path in modules) { + const p = path.split("assets/icons/svg/")[1].split(".svg")[0]; + icons.push(p); +} + +export default icons; diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index cbc2b5f..f402470 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -1,86 +1,86 @@ - - - - - + + + + + diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 8b7e9c9..af1bf9e 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -1,206 +1,206 @@ - - - - - + + + + + diff --git a/src/components/InfiniteSelect/index.vue b/src/components/InfiniteSelect/index.vue index 749e9de..c20d92d 100644 --- a/src/components/InfiniteSelect/index.vue +++ b/src/components/InfiniteSelect/index.vue @@ -1,9 +1,17 @@ - - \ No newline at end of file + + + + + diff --git a/src/components/ParentView/index.vue b/src/components/ParentView/index.vue index ad6360c..98240ae 100644 --- a/src/components/ParentView/index.vue +++ b/src/components/ParentView/index.vue @@ -1,3 +1,3 @@ - + diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue index fcdd1a6..3efca58 100644 --- a/src/components/RightToolbar/index.vue +++ b/src/components/RightToolbar/index.vue @@ -1,89 +1,100 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/RuoYi/Doc/index.vue b/src/components/RuoYi/Doc/index.vue index ace6d47..89aeae6 100644 --- a/src/components/RuoYi/Doc/index.vue +++ b/src/components/RuoYi/Doc/index.vue @@ -1,13 +1,13 @@ - - - \ No newline at end of file + + + diff --git a/src/components/RuoYi/Git/index.vue b/src/components/RuoYi/Git/index.vue index 3fe77d0..73f6a9c 100644 --- a/src/components/RuoYi/Git/index.vue +++ b/src/components/RuoYi/Git/index.vue @@ -1,13 +1,13 @@ - - - + + + diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue index c3b9b94..eaed38f 100644 --- a/src/components/Screenfull/index.vue +++ b/src/components/Screenfull/index.vue @@ -1,22 +1,25 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue index f3cf567..d38fc03 100644 --- a/src/components/SizeSelect/index.vue +++ b/src/components/SizeSelect/index.vue @@ -1,45 +1,50 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index 41f64c9..bb66d79 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -1,53 +1,53 @@ - - - - - + + + + + diff --git a/src/components/SvgIcon/svgicon.js b/src/components/SvgIcon/svgicon.js index b7c1907..f7369ef 100644 --- a/src/components/SvgIcon/svgicon.js +++ b/src/components/SvgIcon/svgicon.js @@ -1,10 +1,10 @@ -import * as components from '@element-plus/icons-vue' - -export default { - install: (app) => { - for (const key in components) { - const componentConfig = components[key]; - app.component(componentConfig.name, componentConfig); - } - }, -}; +import * as components from "@element-plus/icons-vue"; + +export default { + install: (app) => { + for (const key in components) { + const componentConfig = components[key]; + app.component(componentConfig.name, componentConfig); + } + }, +}; diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 003e5f6..4530670 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -1,181 +1,195 @@ - - - - - + + + + + diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue index 82cafb7..f392b38 100644 --- a/src/components/TreeSelect/index.vue +++ b/src/components/TreeSelect/index.vue @@ -1,156 +1,155 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue index 95d22f5..3bc16f5 100644 --- a/src/components/WangEditor/index.vue +++ b/src/components/WangEditor/index.vue @@ -1,24 +1,24 @@ @@ -36,6 +36,7 @@ import { import { Editor, Toolbar } from "@wangeditor/editor-for-vue"; import request from "@/utils/request"; import { getToken } from "@/utils/auth"; + export default { components: { Editor, Toolbar }, props: { @@ -80,7 +81,7 @@ export default { watch( () => props.modelValue, (val) => { - valueHtml.value = val; + valueHtml.value = val ?? ""; }, { immediate: true } ); @@ -171,11 +172,13 @@ export default { .disabled { background-color: #f5f7fa; cursor: not-allowed; + :deep(.w-e-text-container) { background-color: inherit; // color: green; opacity: 0.5; } + :deep(.w-e-toolbar) { user-select: none; pointer-events: none; diff --git a/src/components/iFrame/index.vue b/src/components/iFrame/index.vue index 2e88332..90837b7 100644 --- a/src/components/iFrame/index.vue +++ b/src/components/iFrame/index.vue @@ -1,31 +1,32 @@ -