From 68586538edb8c5421361a0fa3d9730fc8c7a0c57 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Tue, 8 Oct 2024 17:28:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E4=BC=81=E4=B8=9A=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/car/fault/index.js | 14 +-- src/api/car/fault/log.js | 6 +- src/api/car/fault/test.js | 18 ++-- src/api/firm/enter/index.js | 14 +++ src/api/login.js | 2 +- src/views/car/fault/index.vue | 2 +- src/views/car/fault/log.vue | 7 +- src/views/car/fault/test.vue | 13 ++- src/views/firm/enter/index.vue | 147 ++++++++++++++++++++++++++++++++ src/views/register.vue | 42 ++++++--- src/views/system/dept/index.vue | 7 ++ src/views/system/user/index.vue | 2 +- 12 files changed, 234 insertions(+), 40 deletions(-) create mode 100644 src/api/firm/enter/index.js create mode 100644 src/views/firm/enter/index.vue diff --git a/src/api/car/fault/index.js b/src/api/car/fault/index.js index 02f15ff..006e7f2 100644 --- a/src/api/car/fault/index.js +++ b/src/api/car/fault/index.js @@ -3,7 +3,7 @@ import request from '@/utils/request' //查询车辆故障列表 export function findSysCarFaultList(data) { return request({ - url: '/breakdown/car/fault/findSysCarFaultList', + url: '/vehicleManagement/car/fault/findSysCarFaultList', method: 'post', data:data }) @@ -11,7 +11,7 @@ export function findSysCarFaultList(data) { //添加车辆故障码 export function addSysCarFault(data) { return request({ - url: '/breakdown/car/fault/addSysCarFault', + url: '/vehicleManagement/car/fault/addSysCarFault', method: 'post', data:data }) @@ -19,7 +19,7 @@ export function addSysCarFault(data) { //修改车辆故障码 export function updateSysCarFault(data) { return request({ - url: '/breakdown/car/fault/updateSysCarFault', + url: '/vehicleManagement/car/fault/updateSysCarFault', method: 'post', data:data }) @@ -27,14 +27,14 @@ export function updateSysCarFault(data) { //删除车辆故障码 export function deleteSysCarFaultId(id) { return request({ - url: '/breakdown/car/fault/deleteSysCarFaultId?id='+id, + url: '/vehicleManagement/car/fault/deleteSysCarFaultId?id='+id, method: 'GET' }) } //站内信消息列表 export function findMessageList(data) { return request({ - url: '/breakdown/message/findMessageList', + url: '/vehicleManagement/message/findMessageList', method: 'post', data:data }) @@ -42,7 +42,7 @@ export function findMessageList(data) { //站内信修改状态 export function updateMessage(data) { return request({ - url: '/breakdown/message/updateMessage', + url: '/vehicleManagement/message/updateMessage', method: 'post', data:data }) @@ -50,7 +50,7 @@ export function updateMessage(data) { //查询未读消息条数 export function selectStatusOne() { return request({ - url: '/breakdown/message/selectStatusOne', + url: '/vehicleManagement/message/selectStatusOne', method: 'get' }) } diff --git a/src/api/car/fault/log.js b/src/api/car/fault/log.js index 48a000c..557700c 100644 --- a/src/api/car/fault/log.js +++ b/src/api/car/fault/log.js @@ -3,7 +3,7 @@ import request from '@/utils/request' //查询故障日志列表 export function findSysFaultLogList(data) { return request({ - url: '/breakdown/list/log/findSysFaultLogList', + url: '/vehicleManagement/list/log/findSysFaultLogList', method: 'post', data:data }) @@ -12,7 +12,7 @@ export function findSysFaultLogList(data) { //删除故障日志 export function deleteSysFaultLog(id) { return request({ - url: '/breakdown/list/log/deleteSysFaultLog?id='+id, + url: '/vehicleManagement/list/log/deleteSysFaultLog?id='+id, method: 'get' }) } @@ -20,7 +20,7 @@ export function deleteSysFaultLog(id) { //修改故障日志 export function updateSysFaultLog(data) { return request({ - url: '/breakdown/list/log/updateSysFaultLog', + url: '/vehicleManagement/list/log/updateSysFaultLog', method: 'post', data:data }) diff --git a/src/api/car/fault/test.js b/src/api/car/fault/test.js index 6a04d67..6b5bebe 100644 --- a/src/api/car/fault/test.js +++ b/src/api/car/fault/test.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询消息类型列表 export function findMessageTypeList(data) { return request({ - url: '/breakdown/type/findMessageTypeList', + url: '/vehicleManagement/type/findMessageTypeList', method: 'post', data:data }) @@ -20,7 +20,7 @@ export function findMessageTypeList(data) { //规则查询列表 export function findMessageTypeCarList(data) { return request({ - url: '/breakdown/test/findMessageTypeCarList', + url: '/vehicleManagement/test/findMessageTypeCarList', method: 'post', data:data }) @@ -33,7 +33,7 @@ export function findMessageTypeCarList(data) { //测试报文故障规则 export function ruleMessageTypeCar(data) { return request({ - url: '/breakdown/test/ruleMessageTypeCar', + url: '/vehicleManagement/test/ruleMessageTypeCar', method: 'post', data:data }) @@ -41,7 +41,7 @@ export function ruleMessageTypeCar(data) { //添加规则 export function addMessageTypeCar(data) { return request({ - url: '/breakdown/test/addMessageTypeCar', + url: '/vehicleManagement/test/addMessageTypeCar', method: 'post', data:data }) @@ -49,28 +49,28 @@ export function addMessageTypeCar(data) { //VIN下拉框 export function findSysCarList() { return request({ - url: '/breakdown/test/findSysCarList', + url: '/vehicleManagement/test/findSysCarList', method: 'get' }) } //报文名称下拉框 export function findSysMessageTypeList() { return request({ - url: '/breakdown/test/findSysMessageTypeList', + url: '/vehicleManagement/test/findSysMessageTypeList', method: 'get' }) } //删除报文规则 export function deleteMessageTypeCarId(id) { return request({ - url: '/breakdown/test/deleteMessageTypeCarId?id='+id, + url: '/vehicleManagement/test/deleteMessageTypeCarId?id='+id, method: 'get' }) } //修改报文规则 -export function updateMessageTypoeCar(data) { +export function updateMessageTypeCar(data) { return request({ - url: '/breakdown/test/updateMessageTypoeCar', + url: '/vehicleManagement/test/updateMessageTypeCar', method: 'post', data:data }) diff --git a/src/api/firm/enter/index.js b/src/api/firm/enter/index.js new file mode 100644 index 0000000..8e78f63 --- /dev/null +++ b/src/api/firm/enter/index.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' + +/** + * 企业入驻列表 + * @param data + * @returns {AxiosPromise} + */ +export function findEnterpriseList(data) { + return request({ + url: '/vehicleManagement/firm/findEnterpriseList', + method: 'post', + data:data + }) +} diff --git a/src/api/login.js b/src/api/login.js index 3691abe..22ba316 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -13,7 +13,7 @@ export function login(username, password, code, uuid) { }) } -// 注册方法 +// 方法 export function register(data) { return request({ url: '/auth/register', diff --git a/src/views/car/fault/index.vue b/src/views/car/fault/index.vue index 744394d..c175890 100644 --- a/src/views/car/fault/index.vue +++ b/src/views/car/fault/index.vue @@ -89,7 +89,7 @@ width="150"> diff --git a/src/views/car/fault/log.vue b/src/views/car/fault/log.vue index 10798ca..05aab96 100644 --- a/src/views/car/fault/log.vue +++ b/src/views/car/fault/log.vue @@ -98,7 +98,7 @@ label="车辆故障类型" width="180"> @@ -121,7 +121,7 @@ - diff --git a/src/views/car/fault/test.vue b/src/views/car/fault/test.vue index f761a61..3750339 100644 --- a/src/views/car/fault/test.vue +++ b/src/views/car/fault/test.vue @@ -131,6 +131,18 @@ + + + + + + + + + + + +
确 定 @@ -148,7 +160,6 @@ import {addMessageTypeCar} from "@/api/car/fault/test"; import {findSysCarList} from "@/api/car/fault/test"; import {findSysMessageTypeList} from "@/api/car/fault/test"; import {deleteMessageTypeCarId} from "@/api/car/fault/test"; -import {updateMessageTypoeCar} from "@/api/car/fault/test"; export default { //import引入的组件需要注入到对象中才能使用" components: {}, diff --git a/src/views/firm/enter/index.vue b/src/views/firm/enter/index.vue new file mode 100644 index 0000000..7ef6fd4 --- /dev/null +++ b/src/views/firm/enter/index.vue @@ -0,0 +1,147 @@ + + + + diff --git a/src/views/register.vue b/src/views/register.vue index 9b4dc96..4a8c075 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -2,6 +2,17 @@

若依后台管理系统

+ + + + + @@ -29,20 +40,20 @@ - - - - -
- -
- + + + + + + + + + + + + + + + + + + + + +
确 定 diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index a5014a8..e86c1ee 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -227,7 +227,7 @@ - + From e62b1647c719f39750ae9336b30118b9629ca186 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Fri, 11 Oct 2024 14:57:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BC=81=E4=B8=9A=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/firm/enter/index.js | 13 ++++ src/api/login.js | 14 ++++- src/views/firm/enter/index.vue | 111 +++++++++++++++++++++++++++------ src/views/register.vue | 42 ++++++------- 4 files changed, 136 insertions(+), 44 deletions(-) diff --git a/src/api/firm/enter/index.js b/src/api/firm/enter/index.js index 8e78f63..596d090 100644 --- a/src/api/firm/enter/index.js +++ b/src/api/firm/enter/index.js @@ -12,3 +12,16 @@ export function findEnterpriseList(data) { data:data }) } + +/** + * 添加企业入驻 + * @param data + * @returns {*} + */ +export function enterpriseAdd(data) { + return request({ + url: '/vehicleManagement/firm/enterpriseAdd', + method: 'post', + data:data + }) +} diff --git a/src/api/login.js b/src/api/login.js index 22ba316..3a8ef72 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -13,7 +13,7 @@ export function login(username, password, code, uuid) { }) } -// 方法 +// 注册方法 export function register(data) { return request({ url: '/auth/register', @@ -60,3 +60,15 @@ export function getCodeImg() { timeout: 20000 }) } + +/** + * 企业下拉框 + * @param data + * @returns {*} + */ +export function firmList() { + return request({ + url: '/system/user/firmList', + method: 'get' + }) +} diff --git a/src/views/firm/enter/index.vue b/src/views/firm/enter/index.vue index 7ef6fd4..7706df5 100644 --- a/src/views/firm/enter/index.vue +++ b/src/views/firm/enter/index.vue @@ -1,5 +1,16 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 +
+
@@ -95,6 +153,7 @@ //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //例如：import 《组件名称》 from '《组件路径》, import {findEnterpriseList} from "@/api/firm/enter"; +import {enterpriseAdd} from "@/api/firm/enter"; export default { //import引入的组件需要注入到对象中才能使用" components: {}, @@ -103,8 +162,12 @@ export default { //这里存放数据" return { + //企业入驻列表 tableData:[], enterpriseForm:{}, + //新增对话框 + dialogFormVisible:false, + form:{}, }; }, //计算属性 类似于data概念", @@ -113,6 +176,16 @@ export default { watch: {}, //方法集合", methods: { + enterpriseAdd(){ + enterpriseAdd(this.form).then((res)=>{ + alert(res.msg); + if (200==res.code){ + this.findEnterpriseList(); + this.dialogFormVisible=false; + } + }) + }, + //企业列表 findEnterpriseList(){ findEnterpriseList(this.enterpriseForm).then((res)=>{ this.tableData=res.data; diff --git a/src/views/register.vue b/src/views/register.vue index 4a8c075..59e110f 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -2,16 +2,10 @@

若依后台管理系统

- - - - + + + + @@ -40,20 +34,6 @@ - - - - - - - - - - - - - - import {getCodeImg, register} from "@/api/login"; +import {firmList} from "@/api/login"; export default { name: "Register", @@ -91,6 +72,7 @@ export default { } }; return { + firm:[], codeUrl: "", registerForm: { username: "", @@ -123,8 +105,19 @@ export default { }, created() { this.getCode(); + this.firmList(); }, methods: { + firmList(){ + firmList().then((res)=>{ + this.firm = res.data; + }) + }, + + man(a){ + alert("aaaa"+a) + }, + getCode() { getCodeImg().then(res => { this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled; @@ -138,6 +131,7 @@ export default { this.$refs.registerForm.validate(valid => { if (valid) { this.loading = true; + console.log(this.registerForm) register(this.registerForm).then(res => { const username = this.registerForm.username; this.$alert("恭喜你，您的账号 " + username + " 注册成功！", '系统提示', {