diff --git a/yxt-vehfleet-ui/.env.development b/yxt-vehfleet-ui/.env.development index e36360e0c0..43a35a0453 100644 --- a/yxt-vehfleet-ui/.env.development +++ b/yxt-vehfleet-ui/.env.development @@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://26077a35f5.wicp.vip" -VUE_APP_URL = "http://192.168.0.106:8111" +VUE_APP_URL = "http://192.168.0.105:8111" diff --git a/yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js b/yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js new file mode 100644 index 0000000000..172f0f8ea8 --- /dev/null +++ b/yxt-vehfleet-ui/src/api/affiliatedCompany/affiliatedCompany.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/listPage', method: 'post', data: params, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 查询全部列表 + listAll: function() { + return request({ + url: '/vehfleet/v1/affiliatedcompany/list', method: 'post', headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 新增、保存 + saveAffiliatedcompany: function(data) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/saveOrUpdate', method: 'post', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 初始化 + initAffiliatedcompany: function(data) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/fetchSid/' + data, method: 'get' + }) + }, + + // 删除 + deleteBySids: function(data) { + return request({ + url: '/vehfleet/v1/affiliatedcompany/delBySids', method: 'DELETE', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + } + +} diff --git a/yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js b/yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js new file mode 100644 index 0000000000..62f6d7c99f --- /dev/null +++ b/yxt-vehfleet-ui/src/api/superviseFile/superviseFile.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/listPage', method: 'post', data: params, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 新增、保存 + saveRegulatorydocuments: function(data) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/saveOrUpdate', method: 'post', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 初始化 + initRegulatorydocuments: function(data) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/fetchSid/' + data, method: 'get' + }) + }, + + // 删除 + deleteBySids: function(data) { + return request({ + url: '/vehfleet/v1/regulatorydocuments/delBySids', method: 'DELETE', data: data, headers: { + 'Content-Type': 'application/json' + } + }) + } + +} diff --git a/yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js b/yxt-vehfleet-ui/src/api/vehicleAdmissionApply/vehicleAdmissionApply.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js b/yxt-vehfleet-ui/src/api/vehicleInsuranceLedger/vehicleInsuranceLedger.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js b/yxt-vehfleet-ui/src/api/vehicleLedger/vehicleLedger.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue b/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue index 01a1c5d960..701580e716 100644 --- a/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue +++ b/yxt-vehfleet-ui/src/components/uploadFile/uploadImg.vue @@ -148,6 +148,7 @@ export default { imgFiles.push(o.url) }) this.$emit('fileChange', this.files) + this.$emit('change', this.files) }, handleRemove(file, fileList) { console.log('file:' + JSON.stringify(file)) diff --git a/yxt-vehfleet-ui/src/router/index.js b/yxt-vehfleet-ui/src/router/index.js index fb34bc6a6b..9e22aab96b 100644 --- a/yxt-vehfleet-ui/src/router/index.js +++ b/yxt-vehfleet-ui/src/router/index.js @@ -1,47 +1,72 @@ import Vue from 'vue' import Router from 'vue-router' +/* Layout */ +import Layout from '@/layout' Vue.use(Router) -/* Layout */ -import Layout from '@/layout' /* 所有角色可以访问/没有权限要求的基页 */ export const constantRoutes = [{ - path: '/redirect', - component: Layout, - hidden: true, - children: [{ - path: '/redirect/:path(.*)', - component: () => import('@/views/redirect/index.vue') - }] - }, - { - path: '/', - redirect: 'index' - }, - { - path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] - }, - { - path: '/404', - component: () => - import('@/views/404'), - hidden: true - } + path: '/redirect', component: Layout, hidden: true, children: [{ + path: '/redirect/:path(.*)', component: () => import('@/views/redirect/index.vue') + }] +}, { + path: '/', redirect: 'index' +}, { + path: '/index', component: Layout, redirect: '/index', children: [{ + path: '/index', component: () => import('@/views/index.vue'), name: 'index', meta: { + title: '主页', noCache: true, affix: true + } + }] +}, { + path: '/vehicleAdmissionApply', component: Layout, redirect: '/vehicleAdmissionApply', children: [{ + path: '/vehicleAdmissionApply', + component: () => import('@/views/vehicleAdmissionApply/vehicleAdmissionApply.vue'), + name: 'VehicleAdmissionApply', + meta: { + title: '车辆准入申请管理' + } + }] +}, { + path: '/vehicleLedger', component: Layout, redirect: '/vehicleLedger', children: [{ + path: '/vehicleLedger', + component: () => import('@/views/vehicleLedger/vehicleLedger.vue'), + name: 'VehicleLedger', + meta: { + title: '挂靠车辆台账管理' + } + }] +}, { + path: '/affiliatedCompany', component: Layout, redirect: '/affiliatedCompany', children: [{ + path: '/affiliatedCompany', + component: () => import('@/views/affiliatedCompany/affiliatedCompany.vue'), + name: 'AffiliatedCompany', + meta: { + title: '挂靠公司管理' + } + }] +}, { + path: '/vehicleInsuranceLedger', component: Layout, redirect: '/vehicleInsuranceLedger', children: [{ + path: '/vehicleInsuranceLedger', + component: () => import('@/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue'), + name: 'VehicleInsuranceLedger', + meta: { + title: '车辆保险台账管理' + } + }] +}, { + path: '/superviseFile', component: Layout, redirect: '/superviseFile', children: [{ + path: '/superviseFile', + component: () => import('@/views/superviseFile/superviseFile.vue'), + name: 'SuperviseFile', + meta: { + title: '监管部门文件管理' + } + }] +}, { + path: '/404', component: () => import('@/views/404'), hidden: true +} // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] @@ -50,8 +75,7 @@ const createRouter = () => new Router({ // mode: 'history', // require service support scrollBehavior: () => ({ y: 0 - }), - routes: constantRoutes + }), routes: constantRoutes }) const router = createRouter() diff --git a/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue new file mode 100644 index 0000000000..fdb0d68e5e --- /dev/null +++ b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompany.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue new file mode 100644 index 0000000000..e0dc1fc3f4 --- /dev/null +++ b/yxt-vehfleet-ui/src/views/affiliatedCompany/affiliatedCompanyAdd.vue @@ -0,0 +1,177 @@ + + + + diff --git a/yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue b/yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue new file mode 100644 index 0000000000..83f5baeb6a --- /dev/null +++ b/yxt-vehfleet-ui/src/views/superviseFile/superviseFile.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue b/yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue new file mode 100644 index 0000000000..47898e6817 --- /dev/null +++ b/yxt-vehfleet-ui/src/views/superviseFile/superviseFileAdd.vue @@ -0,0 +1,296 @@ + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue b/yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue new file mode 100644 index 0000000000..51760449ae --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleAdmissionApply/vehicleAdmissionApply.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue new file mode 100644 index 0000000000..d22ba001f4 --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedger.vue @@ -0,0 +1,302 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue new file mode 100644 index 0000000000..51760449ae --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleInsuranceLedger/vehicleInsuranceLedgerAdd.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue b/yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue new file mode 100644 index 0000000000..51760449ae --- /dev/null +++ b/yxt-vehfleet-ui/src/views/vehicleLedger/vehicleLedger.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/yxt-vehfleet-ui/vue.config.js b/yxt-vehfleet-ui/vue.config.js index 9cb6faeadf..e29794d36b 100644 --- a/yxt-vehfleet-ui/vue.config.js +++ b/yxt-vehfleet-ui/vue.config.js @@ -24,7 +24,7 @@ module.exports = { *在大多数情况下,请使用“/”!!! *详细信息:https://cli.vuejs.org/config/#publicpath */ - publicPath: process.env.NODE_ENV === 'production' ? '/riskcenter/' : '/', + publicPath: process.env.NODE_ENV === 'production' ? '/vehfleet/' : '/', outputDir: 'System', assetsDir: 'static', lintOnSave: process.env.NODE_ENV === 'development', @@ -41,6 +41,7 @@ module.exports = { proxy: { '/api': { // 匹配所有以 '/api'开头的请求路径 // target: 'http://127.0.0.1:8111/', + // target: 'http://192.168.0.105:8111/vehfleet', target: process.env.VUE_APP_URL, // 代理目标的基础路径 changeOrigin: true, // 支持跨域 pathRewrite: { // 重写路径: 去掉路径中开头的'/api' @@ -49,6 +50,7 @@ module.exports = { }, '/upload': { // 匹配所有以 '/api'开头的请求路径 // target: 'http://4424790b0u.qicp.vip/', + // target: 'http://192.168.0.105:8111/vehfleet', target: process.env.VUE_APP_URL, // 代理目标的基础路径 changeOrigin: true, // 支持跨域 pathRewrite: { // 重写路径: 去掉路径中开头的'/api'