diff --git a/ruoyi-ui/src/api/carpool/blacklist.js b/ruoyi-ui/src/api/carpool/blacklist.js new file mode 100644 index 000000000..43019a32c --- /dev/null +++ b/ruoyi-ui/src/api/carpool/blacklist.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询黑名单列表 +export function listBlacklist(query) { + return request({ + url: '/carpool/blacklist/list', + method: 'get', + params: query + }) +} + +// 查询黑名单详细 +export function getBlacklist(id) { + return request({ + url: '/carpool/blacklist/' + id, + method: 'get' + }) +} + +// 新增黑名单 +export function addBlacklist(data) { + return request({ + url: '/carpool/blacklist', + method: 'post', + data: data + }) +} + +// 修改黑名单 +export function updateBlacklist(data) { + return request({ + url: '/carpool/blacklist', + method: 'put', + data: data + }) +} + +// 删除黑名单 +export function delBlacklist(id) { + return request({ + url: '/carpool/blacklist/' + id, + method: 'delete' + }) +} + +// 导出黑名单 +export function exportBlacklist(query) { + return request({ + url: '/carpool/blacklist/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/api/carpool/driver.js b/ruoyi-ui/src/api/carpool/driver.js new file mode 100644 index 000000000..f1d998f9d --- /dev/null +++ b/ruoyi-ui/src/api/carpool/driver.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +// 查询司机信息列表 +export function listDriver(query) { + return request({ + url: '/carpool/driver/list', + method: 'get', + params: query + }) +} + +// 查询司机信息详细 +export function getDriver(id) { + return request({ + url: '/carpool/driver/' + id, + method: 'get' + }) +} + +// 新增司机信息 +export function addDriver(data) { + return request({ + url: '/carpool/driver', + method: 'post', + data: data + }) +} + +// 修改司机信息 +export function updateDriver(data) { + return request({ + url: '/carpool/driver', + method: 'put', + data: data + }) +} + +// 删除司机信息 +export function delDriver(id) { + return request({ + url: '/carpool/driver/' + id, + method: 'delete' + }) +} + +// 设置黑名单 +export function setBlacklist(data) { + return request({ + url: '/carpool/blacklist' , + method: 'post', + data: data + }) +} + + + +// 导出司机信息 +export function exportDriver(query) { + return request({ + url: '/carpool/driver/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/carpool/order.js b/ruoyi-ui/src/api/carpool/order.js new file mode 100644 index 000000000..3b35cf70e --- /dev/null +++ b/ruoyi-ui/src/api/carpool/order.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询订单信息列表 +export function listOrder(query) { + return request({ + url: '/carpool/order/list', + method: 'get', + params: query + }) +} + +// 查询订单信息详细 +export function getOrder(id) { + return request({ + url: '/carpool/order/' + id, + method: 'get' + }) +} + +// 新增订单信息 +export function addOrder(data) { + return request({ + url: '/carpool/order', + method: 'post', + data: data + }) +} + +// 修改订单信息 +export function updateOrder(data) { + return request({ + url: '/carpool/order', + method: 'put', + data: data + }) +} + +// 删除订单信息 +export function delOrder(id) { + return request({ + url: '/carpool/order/' + id, + method: 'delete' + }) +} + +// 导出订单信息 +export function exportOrder(query) { + return request({ + url: '/carpool/order/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/api/carpool/passenger.js b/ruoyi-ui/src/api/carpool/passenger.js new file mode 100644 index 000000000..5fde85ca9 --- /dev/null +++ b/ruoyi-ui/src/api/carpool/passenger.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +// 查询乘客信息列表 +export function listPassenger(query) { + return request({ + url: '/carpool/passenger/list', + method: 'get', + params: query + }) +} + +// 查询乘客信息详细 +export function getPassenger(id) { + return request({ + url: '/carpool/passenger/' + id, + method: 'get' + }) +} + +// 新增乘客信息 +export function addPassenger(data) { + return request({ + url: '/carpool/passenger', + method: 'post', + data: data + }) +} + +// 修改乘客信息 +export function updatePassenger(data) { + return request({ + url: '/carpool/passenger', + method: 'put', + data: data + }) +} + +// 删除乘客信息 +export function delPassenger(id) { + return request({ + url: '/carpool/passenger/' + id, + method: 'delete' + }) +} + +// 设置黑名单 +export function setBlacklist(data) { + return request({ + url: '/carpool/blacklist' , + method: 'post', + data: data + }) +} + + +// 导出乘客信息 +export function exportPassenger(query) { + return request({ + url: '/carpool/passenger/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index a826980f2..8b3a65164 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -66,7 +66,7 @@ export const constantRoutes = [ children: [ { path: 'index', - component: (resolve) => require(['@/views/index'], resolve), + component: (resolve) => require(['@/views/index_v1'], resolve), name: 'Index', meta: { title: '首页', icon: 'dashboard', affix: true } } diff --git a/ruoyi-ui/src/views/carpool/blacklist/index.vue b/ruoyi-ui/src/views/carpool/blacklist/index.vue new file mode 100644 index 000000000..7e5824a45 --- /dev/null +++ b/ruoyi-ui/src/views/carpool/blacklist/index.vue @@ -0,0 +1,298 @@ + + + diff --git a/ruoyi-ui/src/views/carpool/driver/index.vue b/ruoyi-ui/src/views/carpool/driver/index.vue new file mode 100644 index 000000000..81cffabf2 --- /dev/null +++ b/ruoyi-ui/src/views/carpool/driver/index.vue @@ -0,0 +1,414 @@ + + + diff --git a/ruoyi-ui/src/views/carpool/order/index.vue b/ruoyi-ui/src/views/carpool/order/index.vue new file mode 100644 index 000000000..292b1fbe2 --- /dev/null +++ b/ruoyi-ui/src/views/carpool/order/index.vue @@ -0,0 +1,365 @@ + + + diff --git a/ruoyi-ui/src/views/carpool/passenger/index.vue b/ruoyi-ui/src/views/carpool/passenger/index.vue new file mode 100644 index 000000000..e541b50cf --- /dev/null +++ b/ruoyi-ui/src/views/carpool/passenger/index.vue @@ -0,0 +1,395 @@ + + + diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 255eafca0..a2796e81e 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,215 +1,215 @@ - - - - - + + + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 76707460a..e565dfb2e 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -1,117 +1,117 @@ -'use strict' -const path = require('path') - -function resolve(dir) { - return path.join(__dirname, dir) -} - -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 - -const port = process.env.port || process.env.npm_config_port || 80 // 端口 - -// vue.config.js 配置说明 -//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions -// 这里只列一部分，具体配置参考文档 -module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - // webpack-dev-server 相关配置 - devServer: { - host: '0.0.0.0', - port: port, - open: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, - changeOrigin: true, - pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - } - }, - disableHostCheck: true - }, - configureWebpack: { - name: name, - resolve: { - alias: { - '@': resolve('src') - } - } - }, - chainWebpack(config) { - config.plugins.delete('preload') // TODO: need test - config.plugins.delete('prefetch') // TODO: need test - - // set svg-sprite-loader - config.module - .rule('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: 'icon-[name]' - }) - .end() - - config - .when(process.env.NODE_ENV !== 'development', - config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - config - .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single'), - { - from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './' //到根目录下 - } - } - ) - } -} +'use strict' +const path = require('path') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 + +const port = process.env.port || process.env.npm_config_port || 80 // 端口 + +// vue.config.js 配置说明 +//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions +// 这里只列一部分，具体配置参考文档 +module.exports = { + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + // webpack-dev-server 相关配置 + devServer: { + host: '0.0.0.0', + port: port, + open: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:16009`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + }, + disableHostCheck: true + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/assets/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single'), + { + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './' //到根目录下 + } + } + ) + } +}