From 8e80f2f2be0154d628404319da097c4b9977bbea Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Mon, 13 Nov 2023 13:33:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- .env.production | 4 +-- .env.staging | 4 +-- .gitignore | 63 +++++++++++++--------------------------- README.md | 54 ++++++++++++++++++---------------- bin/package.bat | 4 +-- package.json | 6 ++-- src/api/system/config.js | 14 ++++----- src/utils/request.js | 2 +- src/views/index.vue | 4 +-- src/views/login.vue | 6 ++-- src/views/register.vue | 2 +- vue.config.js | 2 +- 13 files changed, 73 insertions(+), 96 deletions(-) diff --git a/.env.development b/.env.development index 2a13b08..302ecd1 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 企业管理系统 +VUE_APP_TITLE = 若依管理系统 # 开发环境配置 ENV = 'development' -# 企业管理系统/开发环境 +# 若依管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/.env.production b/.env.production index 1d9fb19..b4893b0 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 企业管理系统 +VUE_APP_TITLE = 若依管理系统 # 生产环境配置 ENV = 'production' -# 企业管理系统/生产环境 +# 若依管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/.env.staging b/.env.staging index 774cb9c..361859f 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 企业管理系统 +VUE_APP_TITLE = 若依管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 企业管理系统/测试环境 +# 若依管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/.gitignore b/.gitignore index 09bdfea..78a752d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,46 +1,23 @@ -###################################################################### -# Build Tools - -.gradle -/build/ -!gradle/wrapper/gradle-wrapper.jar - -target/ -!.mvn/wrapper/maven-wrapper.jar - -###################################################################### -# IDE - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### JRebel ### -rebel.xml -### NetBeans ### -nbproject/private/ -build/* -nbbuild/ +.DS_Store +node_modules/ dist/ -nbdist/ -.nb-gradle/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log -###################################################################### -# Others -*.log -*.xml.versionsBackup -*.swp +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log -!*/build/*.java -!*/build/*.html -!*/build/*.xml \ No newline at end of file +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/README.md b/README.md index cf4627d..9dfbeaa 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,30 @@ -## 系统模块 +## 开发 -~~~ -com.muyu -├── muyu-ui // 前端框架 [80] -├── muyu-gateway // 网关模块 [8080] -├── muyu-auth // 认证中心 [9200] -├── muyu-common // 通用模块 -│ └── muyu-common-core // 核心模块 -│ └── muyu-common-datascope // 权限范围 -│ └── muyu-common-datasource // 多数据源 -│ └── muyu-common-log // 日志记录 -│ └── muyu-common-redis // 缓存服务 -│ └── muyu-common-seata // 分布式事务 -│ └── muyu-common-security // 安全模块 -│ └── muyu-common-swagger // 系统接口 -│ └── muyu-common-system // 系统基础 -├── muyu-modules // 业务模块 -│ └── muyu-system // 系统模块 [9201] -│ └── muyu-gen // 代码生成 [9202] -│ └── muyu-job // 定时任务 [9203] -│ └── muyu-file // 文件服务 [9300] -├── muyu-visual // 图形化管理模块 -│ └── muyu-visual-monitor // 监控中心 [9100] -├──pom.xml // 公共依赖 -~~~ +```bash +# 克隆项目 +git clone https://gitee.com/y_project/MuYu-Vue + +# 进入项目目录 +cd muyu-ui + +# 安装依赖 +npm install + +# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 +npm install --registry=https://registry.npmmirror.com + +# 启动服务 +npm run dev +``` + +浏览器访问 http://localhost:80 + +## 发布 + +```bash +# 构建测试环境 +npm run build:stage + +# 构建生产环境 +npm run build:prod +``` \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat index c693ec0..0e5bc0f 100644 --- a/bin/package.bat +++ b/bin/package.bat @@ -1,12 +1,12 @@ @echo off echo. -echo [Ϣ] Weḅwar/jarļ +echo [Ϣ] װWeḅnode_modulesļ echo. %~d0 cd %~dp0 cd .. -call mvn clean package -Dmaven.test.skip=true +npm install --registry=https://registry.npmmirror.com pause \ No newline at end of file diff --git a/package.json b/package.json index 45cd4a0..6a46cc5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "muyu", "version": "3.6.3", - "description": "企业管理系统", + "description": "若依管理系统", "author": "若依", "license": "MIT", "scripts": { @@ -41,7 +41,7 @@ "clipboard": "2.0.8", "core-js": "3.25.3", "echarts": "5.4.0", - "element-ui": "2.15.14", + "element-ui": "2.15.13", "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", @@ -67,7 +67,7 @@ "babel-eslint": "10.1.0", "babel-plugin-dynamic-import-node": "2.3.3", "chalk": "4.1.0", - "compression-webpack-plugin": "6.1.2", + "compression-webpack-plugin": "5.0.2", "connect": "3.6.6", "eslint": "7.15.0", "eslint-plugin-vue": "7.2.0", diff --git a/src/api/system/config.js b/src/api/system/config.js index a404d82..fee4b3e 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询参数列表 export function listConfig(query) { return request({ - url: '/system/config/list', + url: '/system/config/plus/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listConfig(query) { // 查询参数详细 export function getConfig(configId) { return request({ - url: '/system/config/' + configId, + url: '/system/config/plus/' + configId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getConfig(configId) { // 根据参数键名查询参数值 export function getConfigKey(configKey) { return request({ - url: '/system/config/configKey/' + configKey, + url: '/system/config/plus/configKey/' + configKey, method: 'get' }) } @@ -28,7 +28,7 @@ export function getConfigKey(configKey) { // 新增参数配置 export function addConfig(data) { return request({ - url: '/system/config', + url: '/system/config/plus', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addConfig(data) { // 修改参数配置 export function updateConfig(data) { return request({ - url: '/system/config', + url: '/system/config/plus', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateConfig(data) { // 删除参数配置 export function delConfig(configId) { return request({ - url: '/system/config/' + configId, + url: '/system/config/plus/' + configId, method: 'delete' }) } @@ -54,7 +54,7 @@ export function delConfig(configId) { // 刷新参数缓存 export function refreshCache() { return request({ - url: '/system/config/refreshCache', + url: '/system/config/plus/refreshCache', method: 'delete' }) } diff --git a/src/utils/request.js b/src/utils/request.js index beb9f3a..47d1bcb 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,7 +73,7 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - // debugger + debugger // 未设置状态码则默认成功状态 const code = res.data.code || 200; // 获取错误信息 diff --git a/src/views/index.vue b/src/views/index.vue index 27378af..93edae1 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -5,7 +5,6 @@
领取阿里云通用云产品1888优惠券
- -

企业后台管理框架

+

若依后台管理框架

一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。

@@ -885,7 +884,6 @@ diff --git a/src/views/customerBusiness/fence/index.vue b/src/views/customerBusiness/fence/index.vue new file mode 100644 index 0000000..a595618 --- /dev/null +++ b/src/views/customerBusiness/fence/index.vue @@ -0,0 +1,274 @@ + + + diff --git a/src/views/customerBusiness/vehicle/index.vue b/src/views/customerBusiness/vehicle/index.vue new file mode 100644 index 0000000..8dd83ae --- /dev/null +++ b/src/views/customerBusiness/vehicle/index.vue @@ -0,0 +1,431 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index 93edae1..042934d 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -46,7 +46,7 @@

若依后台管理框架

- 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。 + 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了客户业务系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。

当前版本: v{{ version }} diff --git a/vue.config.js b/vue.config.js index dd8b15d..9746c44 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '客户业务系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 From 78b3204656c8a4332330b3496d0e763a35ccc4d4 Mon Sep 17 00:00:00 2001 From: Jiang Peng <2622360564@qq.com> Date: Tue, 18 Jun 2024 09:48:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat():=E5=AE=A1=E6=A0=B8=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/customerBusiness/fence.js | 21 +- src/api/customerBusiness/vehicle.js | 59 ++- src/api/netWorking/car.js | 44 --- src/utils/request.js | 1 - .../perfect}/index.vue | 180 ++------- src/views/customerBusiness/vehicle/index.vue | 32 +- src/views/netWorking/car/index.vue | 369 ------------------ 7 files changed, 125 insertions(+), 581 deletions(-) delete mode 100644 src/api/netWorking/car.js rename src/views/{netWorking/examine => customerBusiness/perfect}/index.vue (54%) delete mode 100644 src/views/netWorking/car/index.vue diff --git a/src/api/customerBusiness/fence.js b/src/api/customerBusiness/fence.js index e3ebcca..097ea36 100644 --- a/src/api/customerBusiness/fence.js +++ b/src/api/customerBusiness/fence.js @@ -5,7 +5,10 @@ export function listFence(query) { return request({ url: '/customerBusiness/fence/list', method: 'get', - params: query + params: query, + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -13,7 +16,10 @@ export function listFence(query) { export function getFence(id) { return request({ url: '/customerBusiness/fence/' + id, - method: 'get' + method: 'get', + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -22,7 +28,10 @@ export function addFence(data) { return request({ url: '/customerBusiness/fence', method: 'post', - data: data + data: data, + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -31,7 +40,10 @@ export function updateFence(data) { return request({ url: '/customerBusiness/fence/'+data.id, method: 'put', - data: data + data: data, + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -42,3 +54,4 @@ export function delFence(id) { method: 'delete' }) } + diff --git a/src/api/customerBusiness/vehicle.js b/src/api/customerBusiness/vehicle.js index 5d6fbe2..32647d2 100644 --- a/src/api/customerBusiness/vehicle.js +++ b/src/api/customerBusiness/vehicle.js @@ -5,7 +5,10 @@ export function listVehicle(query) { return request({ url: '/customerBusiness/vehicle/list', method: 'get', - params: query + params: query, + // headers: { + // 'enterprise-code': 'jiang_0612' + // } }) } @@ -13,7 +16,10 @@ export function listVehicle(query) { export function getVehicle(id) { return request({ url: '/customerBusiness/vehicle/' + id, - method: 'get' + method: 'get', + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -22,7 +28,10 @@ export function addVehicle(data) { return request({ url: '/customerBusiness/vehicle', method: 'post', - data: data + data: data, + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -31,7 +40,10 @@ export function updateVehicle(data) { return request({ url: '/customerBusiness/vehicle/'+data.id, method: 'put', - data: data + data: data, + headers: { + 'enterprise-code': 'jiang_0612' + } }) } @@ -39,6 +51,43 @@ export function updateVehicle(data) { export function delVehicle(id) { return request({ url: '/customerBusiness/vehicle/' + id, - method: 'delete' + method: 'delete', + headers: { + 'enterprise-code': 'jiang_0612' + } + }) +} + +//查询车辆运营平台数据 +export function getCar(id) { + return request({ + url: '/netWorking/car/'+id, + method: 'get', + }) +} + +//修改车辆运营平台 +export function updateCar(data) { + return request({ + url: '/netWorking/car/'+data.id, + method: 'put', + data: data, + }) +} + +//完善企业信息 +export function updateEnterprise(data) { + return request({ + url: '/netWorking/car/updateEnterprise/'+data.id, + method: 'post', + data: data, + }) +} + +// 查询企业 +export function selectByName() { + return request({ + url: '/netWorking/car/selectByName', + method: 'get', }) } diff --git a/src/api/netWorking/car.js b/src/api/netWorking/car.js deleted file mode 100644 index a8dbcdb..0000000 --- a/src/api/netWorking/car.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询企业信息列表 -export function listCar(query) { - return request({ - url: '/netWorking/car/list', - method: 'get', - params: query - }) -} - -// 查询企业信息详细 -export function getCar(id) { - return request({ - url: '/netWorking/car/' + id, - method: 'get' - }) -} - -// 新增企业信息 -export function addCar(data) { - return request({ - url: '/netWorking/car', - method: 'post', - data: data - }) -} - -// 修改企业信息 -export function updateCar(data) { - return request({ - url: '/netWorking/car/'+data.id, - method: 'put', - data: data - }) -} - -// 删除企业信息 -export function delCar(id) { - return request({ - url: '/netWorking/car/' + id, - method: 'delete' - }) -} diff --git a/src/utils/request.js b/src/utils/request.js index 47d1bcb..406490d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,7 +73,6 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - debugger // 未设置状态码则默认成功状态 const code = res.data.code || 200; // 获取错误信息 diff --git a/src/views/netWorking/examine/index.vue b/src/views/customerBusiness/perfect/index.vue similarity index 54% rename from src/views/netWorking/examine/index.vue rename to src/views/customerBusiness/perfect/index.vue index 9b10013..521ed33 100644 --- a/src/views/netWorking/examine/index.vue +++ b/src/views/customerBusiness/perfect/index.vue @@ -1,45 +1,24 @@