diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js index 60fb321a..94343bd5 100644 --- a/supervise-uniapp/common/request.api.js +++ b/supervise-uniapp/common/request.api.js @@ -62,10 +62,10 @@ export default { getProjectDaily: (params = {}) => request.post( "/projectdaily/getProjectDaily", params), // "/report/projectdaily/getProjectDaily", params), - + // 账户余额数据 getAccountByProjectSid: (params = {}) => request.get( - "/app/projectaccount/getAccountByProjectSidApp/"+params, params), + "/app/projectaccount/getAccountByProjectSidApp/" + params, params), // "/crm/projectAccount/getAccountByProjectSid/"+params, params), // 项目监管报表 @@ -133,8 +133,8 @@ export default { storeHouseListPage: (params = {}) => request.post("/v1/app/shstorehouse/storeHouseListPage", params), // 获取云仓详情 storeHouseDetail: (params = {}) => request.get("/v1/app/shstorehouse/fetchDetailsBySid/" + params, params), - - + + // 获取我的项目 getProjectByUserSid: (params = {}) => request.get("/v1/app/project/getProjectByUserSidApp/" + params, @@ -158,6 +158,8 @@ export default { projectListPageNew: (params = {}) => request.post("/projectdaily/selectList", params), + // 获取风险报警列表 + RiskAlertPage: (params = {}) => request.post("/RiskMessagesLog/listAllRisk", params), // 修改密码 diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json index 83804c15..623e40f3 100644 --- a/supervise-uniapp/pages.json +++ b/supervise-uniapp/pages.json @@ -271,6 +271,12 @@ "style": { "navigationBarTitleText": "云仓管理" } + }, + { + "path": "pages/index/warehouseSecurity", + "style": { + "navigationBarTitleText": "仓库安防" + } }, { "path": "pages/index/WarehouseList", @@ -388,6 +394,14 @@ "enablePullDownRefresh": false } + }, + { + "path" : "pages/index/RiskAlert", + "style" : + { + "navigationBarTitleText" : "风险警报", + "enablePullDownRefresh" : true + } } ], "lazyCodeLoading": "requiredComponents", diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue index b5e4e462..2f225f8a 100644 --- a/supervise-uniapp/pages/home/WorkFragment.vue +++ b/supervise-uniapp/pages/home/WorkFragment.vue @@ -55,31 +55,29 @@ 已阅工作 + + + + + + + + + + + + + + + + + - - - - - - + - + - + @@ -486,6 +484,12 @@ }); break; + case "6": + uni.navigateTo({ + url: '../index/warehouseSecurity' + }); + + break; default: break; } @@ -501,14 +505,14 @@ display: flex; flex-direction: column; height: 100%; - margin-left: 12px; - margin-right: 12px; - padding-bottom: 50px; .whiteBg { display: flex; background-color: white; border-radius: 20px; + padding-left: 12px; + padding-right: 12px; + height: 100%; .swiper { width: 100%; @@ -593,6 +597,36 @@ } } + .whiteBg-bom{ + margin-top: 10px; + display: flex; + flex-direction: row; + justify-content: center; + + + .whiteBg-bom-lift{ + margin-right: 8px; + flex: 0.7; + width: 100%; + height:175px; + } + .whiteBg-bom-right{ + flex: 1; + margin-left: 8px; + display: flex; + flex-direction: column; + + .whiteBg-bom-right-top{ + width: 100%; + height: 82px; + } + .whiteBg-bom-right-bom{ + margin-top: 10px; + width: 100%; + height: 82px; + } + } + } } diff --git a/supervise-uniapp/pages/index/AlreadyProcessed.vue b/supervise-uniapp/pages/index/AlreadyProcessed.vue index d0cae543..6410d9c3 100644 --- a/supervise-uniapp/pages/index/AlreadyProcessed.vue +++ b/supervise-uniapp/pages/index/AlreadyProcessed.vue @@ -228,7 +228,8 @@ /* 滚动到底部 */ scrollBottem() { console.log("滚动高度") - this.status = "nomore" + this.listQuery.current = this.listQuery.current + 1 + this.loadData(); }, onRefresh() { setTimeout(() => { @@ -362,12 +363,12 @@ async loadData(type = 'add', loading) { //没有更多直接返回 if (type === 'add') { - if (this.loadingType === 'nomore') { + if (this.status === 'nomore') { return; } - this.loadingType = 'loading'; + this.status = 'loading'; } else { - this.loadingType = 'more'; + this.status = 'more'; } var list = [] @@ -388,7 +389,7 @@ this.dataList = this.dataList.concat(list); console.log("消息列表>>>>>", this.dataList.length) //判断是否还有下一页,有是more 没有是nomore(测试数据判断大于20就没有了) - this.loadingType = this.dataList.length > list.total ? 'nomore' : 'more'; + this.status = this.dataList.length > resp.total ? 'nomore' : 'more'; if (type === 'refresh') { if (loading == 1) { uni.hideLoading(); diff --git a/supervise-uniapp/pages/index/DataAssembleList2.vue b/supervise-uniapp/pages/index/DataAssembleList2.vue index 07c3d4eb..b2977227 100644 --- a/supervise-uniapp/pages/index/DataAssembleList2.vue +++ b/supervise-uniapp/pages/index/DataAssembleList2.vue @@ -115,9 +115,12 @@ }, confirmClick(date) { console.log('confirmClick', date) - console.log('confirmClick', formatTimeTwo(parseInt(date.value), "Y-M-D")) + console.log('date.value',date.value) + console.log('getTime',(new Date(date.value)).getTime()) + + console.log('formatTimeTwo', formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D")) - this.params.orderDate = formatTimeTwo(parseInt(date.value), "Y-M-D") + this.params.orderDate = formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D") this.datetimeShow = false this.loadData() diff --git a/supervise-uniapp/pages/index/RegulatoryReporting.vue b/supervise-uniapp/pages/index/RegulatoryReporting.vue index b9dcbce7..b07f519a 100644 --- a/supervise-uniapp/pages/index/RegulatoryReporting.vue +++ b/supervise-uniapp/pages/index/RegulatoryReporting.vue @@ -154,7 +154,6 @@ formatTimeTwo, beforeDay } from "@/utils/index"; - export default { data() { @@ -278,10 +277,14 @@ }, confirmClick(date) { console.log('confirmClick', date) - console.log('confirmClick', formatTimeTwo(parseInt(date.value), "Y-M-D")) + console.log('date.value',date.value) + console.log('getTime',(new Date(date.value)).getTime()) + + + console.log('formatTimeTwo', formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D")) - this.params.orderDate = formatTimeTwo(parseInt(date.value), "Y-M-D") - this.info.orderDate = formatTimeTwo(parseInt(date.value), "Y-M-D") + this.params.orderDate = formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D") + this.info.orderDate = formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D") this.datetimeShow = false this.getServerData() diff --git a/supervise-uniapp/pages/index/RiskAlert.vue b/supervise-uniapp/pages/index/RiskAlert.vue new file mode 100644 index 00000000..3ac5641a --- /dev/null +++ b/supervise-uniapp/pages/index/RiskAlert.vue @@ -0,0 +1,814 @@ + + + + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/WaitingProcessed.vue b/supervise-uniapp/pages/index/WaitingProcessed.vue index 11073706..88dceceb 100644 --- a/supervise-uniapp/pages/index/WaitingProcessed.vue +++ b/supervise-uniapp/pages/index/WaitingProcessed.vue @@ -235,7 +235,8 @@ /* 滚动到底部 */ scrollBottem() { console.log("滚动高度") - this.status = "nomore" + this.listQuery.current = this.listQuery.current + 1 + this.loadData(); }, onRefresh() { setTimeout(() => { @@ -375,12 +376,12 @@ async loadData(type = 'add', loading) { //没有更多直接返回 if (type === 'add') { - if (this.loadingType === 'nomore') { + if (this.status === 'nomore') { return; } - this.loadingType = 'loading'; + this.status = 'loading'; } else { - this.loadingType = 'more'; + this.status = 'more'; } var list = [] @@ -408,7 +409,7 @@ this.dataList = this.dataList.concat(list); console.log("消息列表>>>>>", this.dataList.length) //判断是否还有下一页,有是more 没有是nomore(测试数据判断大于20就没有了) - this.loadingType = this.dataList.length > list.total ? 'nomore' : 'more'; + this.status = this.dataList.length > resp.total ? 'nomore' : 'more'; if (type === 'refresh') { if (loading == 1) { uni.hideLoading(); diff --git a/supervise-uniapp/pages/index/warehouseSecurity.vue b/supervise-uniapp/pages/index/warehouseSecurity.vue new file mode 100644 index 00000000..79e48cdd --- /dev/null +++ b/supervise-uniapp/pages/index/warehouseSecurity.vue @@ -0,0 +1,131 @@ + + + + + \ No newline at end of file diff --git a/yxt-portal-ui/.env.development b/yxt-portal-ui/.env.development index e3c81ca6..4666716e 100644 --- a/yxt-portal-ui/.env.development +++ b/yxt-portal-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.1.107:8112" +VUE_APP_URL = "http://192.168.1.104:7008" #VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/yxt-portal-ui/.env.production b/yxt-portal-ui/.env.production index 384d0949..61f8587b 100644 --- a/yxt-portal-ui/.env.production +++ b/yxt-portal-ui/.env.production @@ -2,7 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/api' +VUE_APP_BASE_API = '/api/portal' ## 配置 正式接口地址 VUE_APP_URL = "http://jianguan.yyundong.com/" diff --git a/yxt-portal-ui/src/api/User/login.js b/yxt-portal-ui/src/api/User/login.js index 80149639..298a8f81 100644 --- a/yxt-portal-ui/src/api/User/login.js +++ b/yxt-portal-ui/src/api/User/login.js @@ -12,7 +12,7 @@ class user { logout(data) { // 退出 return request({ - url: '/portal/v1/sysuser/signOut', + url: '/v1/sysuser/signOut', method: 'post', data: qs.stringify(data) }) @@ -20,7 +20,7 @@ class user { updatePassword(data) { // 退出修改密码 return request({ - url: '/portal/v1/sysuser/updatePassword', + url: '/v1/sysuser/updatePassword', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -29,7 +29,7 @@ class user { reGetPwd(data) { return request({ - url: '/portal/v1/sysuser/reGetPwd', + url: '/v1/sysuser/reGetPwd', method: 'post', params: data, headers: { @@ -39,13 +39,13 @@ class user { } selectPasswordByUserSid(data) { return request({ - url: '/portal/v1/sysuser/selectPasswordByUserSid/' + data, + url: '/v1/sysuser/selectPasswordByUserSid/' + data, method: 'get' }) } getOrgListByUserSid(data) { return request({ - url: '/portal/v1/sysuser/getOrgListByUserSid', + url: '/v1/sysuser/getOrgListByUserSid', method: 'get', params: data }) diff --git a/yxt-portal-ui/src/api/flow/todo.js b/yxt-portal-ui/src/api/flow/todo.js index 417d96f7..db917a12 100644 --- a/yxt-portal-ui/src/api/flow/todo.js +++ b/yxt-portal-ui/src/api/flow/todo.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 读取xml文件 export function readXml(deployId, token) { return request({ - url: '/portal/v1/flow/readXml/' + deployId, + url: '/v1/flow/readXml/' + deployId, method: 'get', params: token }) @@ -11,7 +11,7 @@ export function readXml(deployId, token) { // 读取image文件 export function getFlowViewer(procInsId, token) { return request({ - url: '/portal/v1/flow/flowViewer/' + procInsId, + url: '/v1/flow/flowViewer/' + procInsId, method: 'get', params: token }) @@ -19,7 +19,7 @@ export function getFlowViewer(procInsId, token) { // 查看总代办列表 export function pagerList(params) { return request({ - url: '/portal/v1/flow/todoAllTaskList/' + params.params.userSid, + url: '/v1/flow/todoAllTaskList/' + params.params.userSid, method: 'post', data: params, headers: { @@ -31,7 +31,7 @@ export function pagerList(params) { // 查看总已办列表 export function getList(params) { return request({ - url: '/portal/v1/flow/doneAllTaskList/' + params.params.userSid, + url: '/v1/flow/doneAllTaskList/' + params.params.userSid, method: 'post', data: params, headers: { @@ -43,7 +43,7 @@ export function getList(params) { // 代办任务同意办理 export function businessAgree(params) { return request({ - url: '/portal/v1/flow/complete', + url: '/v1/flow/complete', method: 'post', data: params, headers: { @@ -55,7 +55,7 @@ export function businessAgree(params) { // 代办任务驳回任务 export function rejectTask(params) { return request({ - url: '/portal/v1/flow/reject/' + params.businessSid, + url: '/v1/flow/reject/' + params.businessSid, method: 'post', data: params, headers: { @@ -67,7 +67,7 @@ export function rejectTask(params) { // 代办任务终止任务 export function breakTask(params) { return request({ - url: '/portal/v1/flow/breakProcess/' + params.businessSid, + url: '/v1/flow/breakProcess/' + params.businessSid, method: 'post', data: params, headers: { @@ -79,7 +79,7 @@ export function breakTask(params) { // 代办任务撤回任务 export function revokeTask(params) { return request({ - url: '/portal/v1/flow/revokeProcess/' + params.userSid + '/' + params.businessSid, + url: '/v1/flow/revokeProcess/' + params.userSid + '/' + params.businessSid, method: 'post', data: params, headers: { diff --git a/yxt-portal-ui/src/api/flow/todoForBusiness.js b/yxt-portal-ui/src/api/flow/todoForBusiness.js index 45727fc8..45d1c5e4 100644 --- a/yxt-portal-ui/src/api/flow/todoForBusiness.js +++ b/yxt-portal-ui/src/api/flow/todoForBusiness.js @@ -3,21 +3,21 @@ import qs from 'qs' // 读取xml文件 export function readXml (deployId) { return request({ - url: '/portal/v1/flow/readXml/' + deployId, + url: '/v1/flow/readXml/' + deployId, method: 'get' }) } // 读取image文件 export function getFlowViewer (procInsId) { return request({ - url: '/portal/v1/flow/flowViewer/' + procInsId, + url: '/v1/flow/flowViewer/' + procInsId, method: 'get' }) } // 任务流转记录 export function flowRecord(query) { return request({ - url: '/portal/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId, + url: '/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId, method: 'get', params: query }) diff --git a/yxt-portal-ui/src/api/system/Role/role.js b/yxt-portal-ui/src/api/system/Role/role.js index 0fe3e00f..4a84749a 100644 --- a/yxt-portal-ui/src/api/system/Role/role.js +++ b/yxt-portal-ui/src/api/system/Role/role.js @@ -13,7 +13,7 @@ export function rolemenus(data) { // 获取左侧菜单 export function getrolemenus(data) { return request({ - url: '/portal/v1/sysmenu/sourcemenutree', + url: '/v1/sysmenu/sourcemenutree', method: 'POST', async: false, data: data, diff --git a/yxt-portal-ui/src/api/system/advertising.js b/yxt-portal-ui/src/api/system/advertising.js new file mode 100644 index 00000000..e69de29b diff --git a/yxt-portal-ui/src/api/system/datamapping/datamapping.js b/yxt-portal-ui/src/api/system/datamapping/datamapping.js index 7c6831dd..0ea3fba9 100644 --- a/yxt-portal-ui/src/api/system/datamapping/datamapping.js +++ b/yxt-portal-ui/src/api/system/datamapping/datamapping.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function listPage(data) { return request({ - url: '/portal/v1/sysmapping/listPage', + url: '/v1/sysmapping/listPage', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-portal-ui/src/api/system/departments/departments.js b/yxt-portal-ui/src/api/system/departments/departments.js index bc377a68..d13dffa3 100644 --- a/yxt-portal-ui/src/api/system/departments/departments.js +++ b/yxt-portal-ui/src/api/system/departments/departments.js @@ -6,7 +6,7 @@ let tokens = window.sessionStorage.getItem('token') // 获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/sysorganization/listPage', + url: '/v1/sysorganization/listPage', method: 'POST', data: data, headers: { @@ -18,7 +18,7 @@ export function pageList(data) { // 查询左侧部门列表 export function orgList(data) { return request({ - url: '/portal/v1/sysorganization/list', + url: '/v1/sysorganization/list', method: 'get', data: data, headers: { @@ -30,7 +30,7 @@ export function orgList(data) { // 编辑部门信息 export function postOrgtree(data) { return request({ - url: '/portal/v1/sysorganization/update/' + data.sid, + url: '/v1/sysorganization/update/' + data.sid, method: 'POST', data: data, headers: { @@ -42,7 +42,7 @@ export function postOrgtree(data) { // 获取 机构分页列表(编辑部门信息) export function putOrgtree(data) { return request({ - url: '/portal/v1/sysorganization/update/' + data.sid, + url: '/v1/sysorganization/update/' + data.sid, method: 'POST', data: data, headers: { @@ -55,7 +55,7 @@ export function putOrgtree(data) { // 新增部门信息 export function addOrgTree(data) { return request({ - url: '/portal/v1/sysorganization/save', + url: '/v1/sysorganization/save', method: 'POST', data: data, headers: { @@ -67,7 +67,7 @@ export function addOrgTree(data) { // 回显 export function selectBySid(data) { return request({ - url: 'portal/v1/sysorganization/fetchBySid/' + data, + url: '/v1/sysorganization/fetchBySid/' + data, method: 'get', data: data, headers: { @@ -79,7 +79,7 @@ export function selectBySid(data) { // 树 节点名称 删除 export function delOrgtree(data) { return request({ - url: `/portal/v1/sysorganization/delBySid/` + data.sid, + url: `/v1/sysorganization/delBySid/` + data.sid, method: 'get', data: qs.stringify(data), headers: { @@ -88,10 +88,10 @@ export function delOrgtree(data) { } }) } -// 查询主管人员 旧的:/portal/v1/sysstafforg/staffinfoList +// 查询主管人员 旧的:/v1/sysstafforg/staffinfoList export function getStaff(data) { return request({ - url: 'portal/v1/sysstaffinfo/getStaffNameByDeptSid', + url: '/v1/sysstaffinfo/getStaffNameByDeptSid', method: 'get', params: data, headers: { @@ -103,7 +103,7 @@ export function getStaff(data) { // 查询分管人员 export function getStaffName(params) { return request({ - url: '/portal/v1/sysstaffinfo/getStaffName', + url: '/v1/sysstaffinfo/getStaffName', method: 'get', params: params, headers: { @@ -115,7 +115,7 @@ export function getStaffName(params) { // 查看二维码 export function getQrCode(data) { return request({ - url: '/portal/v1/sysorganization/getQrCode/' + data.sid, + url: '/v1/sysorganization/getQrCode/' + data.sid, method: 'post', data: data, headers: { diff --git a/yxt-portal-ui/src/api/system/dictType/dictCommon.js b/yxt-portal-ui/src/api/system/dictType/dictCommon.js index 1c759e2d..d4b47293 100644 --- a/yxt-portal-ui/src/api/system/dictType/dictCommon.js +++ b/yxt-portal-ui/src/api/system/dictType/dictCommon.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取字典子集 分页列表 export function dictCommonList(data) { return request({ - url: '/portal/v1/dictcommon/pageList', + url: '/v1/dictcommon/pageList', method: 'post', data: data, headers: {'Content-Type': 'application/json'} @@ -15,7 +15,7 @@ export function dictCommonList(data) { //保存 字典子级 export function savedictCommon(data) { return request({ - url: '/portal/v1/dictcommon/save', + url: '/v1/dictcommon/save', method: 'POST', data: data , headers: {'Content-Type': 'application/json', @@ -36,7 +36,7 @@ export function getRoleInfo(data) { //根据sid 修改 数据字典 export function putdictCommon(data) { return request({ - url: '/portal/v1/dictcommon/update/' + data.sid, + url: '/v1/dictcommon/update/' + data.sid, method: 'POST', data: data , headers: {'Content-Type': 'application/json', @@ -48,7 +48,7 @@ export function putdictCommon(data) { //根据sid 删除菜单 信息 export function deldictCommon(data) { return request({ - url: '/portal/v1/dictcommon/delete/' + data.sid, + url: '/v1/dictcommon/delete/' + data.sid, method: 'DELETE', data: data, headers: {'Content-Type': 'application/json', diff --git a/yxt-portal-ui/src/api/system/dictType/index.js b/yxt-portal-ui/src/api/system/dictType/index.js index a5ac0ec4..af948a80 100644 --- a/yxt-portal-ui/src/api/system/dictType/index.js +++ b/yxt-portal-ui/src/api/system/dictType/index.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token') // 获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/dicttype/pageList', + url: '/v1/dicttype/pageList', method: 'POST', data: data, headers: { @@ -18,7 +18,7 @@ export function pageList(data) { // 根据sid 修改 export function putDictType(data) { return request({ - url: '/portal/v1/dicttypes/update/' + data.sid, + url: '/v1/dicttypes/update/' + data.sid, method: 'POST', data: qs.stringify(data) }) @@ -27,7 +27,7 @@ export function putDictType(data) { // 保存 角色信息 export function saveDictType(data) { return request({ - url: '/portal/v1/dicttypes/save', + url: '/v1/dicttypes/save', method: 'POST', data: data, headers: { 'Content-Type': 'application/json', 'token': tokens } @@ -46,7 +46,7 @@ export function getRoleInfo(data) { // 数据字段--映射管理保存 export function saveMappingList(data) { return request({ - url: '/portal/v1/sysmapping/saveMappingList', + url: '/v1/sysmapping/saveMappingList', method: 'POST', data: data, headers: { 'Content-Type': 'application/json', 'token': tokens } @@ -56,7 +56,7 @@ export function saveMappingList(data) { // 数据字段--映射管理保存 export function selectMappingListInfo(data) { return request({ - url: '/portal/v1/sysmapping/selectMappingListInfo', + url: '/v1/sysmapping/selectMappingListInfo', method: 'post', data: data, headers: { 'Content-Type': 'application/json', 'token': tokens } @@ -66,7 +66,7 @@ export function selectMappingListInfo(data) { // 根据sid 删除菜单 信息 export function delDictType(data) { return request({ - url: '/portal/v1/dicttypes/delete/' + data.sid, + url: '/v1/dicttypes/delete/' + data.sid, method: 'DELETE', data: data, headers: { 'Content-Type': 'application/json', 'token': tokens } diff --git a/yxt-portal-ui/src/api/system/functional/functional.js b/yxt-portal-ui/src/api/system/functional/functional.js index daae8a69..047abcdd 100644 --- a/yxt-portal-ui/src/api/system/functional/functional.js +++ b/yxt-portal-ui/src/api/system/functional/functional.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/sysfunction/listAllVoForSource', + url: '/v1/sysfunction/listAllVoForSource', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -17,7 +17,7 @@ export function pageList(data) { //新增 export function savePost(data) { return request({ - url: '/portal/v1/sysfunction/save', + url: '/v1/sysfunction/save', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -29,7 +29,7 @@ export function savePost(data) { //模块名称 export function sourceList(data) { return request({ - url: '/portal/v1/syssource/listAll', + url: '/v1/syssource/listAll', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -40,7 +40,7 @@ export function sourceList(data) { // 删除 export function delOrgroles(data) { return request({ - url: '/portal/v1/sysfunction/delBySids/'+ data.sid, + url: '/v1/sysfunction/delBySids/'+ data.sid, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -52,7 +52,7 @@ export function delOrgroles(data) { // 修改 export function getSingleData(data){ return request({ - url: '/portal/v1/sysfunction/fetchBySid/'+data.id, + url: '/v1/sysfunction/fetchBySid/'+data.id, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -62,7 +62,7 @@ export function getSingleData(data){ } export function putOrgroles(data){ return request({ - url: '/portal/v1/sysfunction/update/' +data.sid, + url: '/v1/sysfunction/update/' +data.sid, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -74,7 +74,7 @@ export function putOrgroles(data){ // 功能是否可用状态 export function IsEnable(data){ return request({ - url: '/portal/v1/sysfunction/updateIsEnable/' +data.sid+'/'+data.isEnable, + url: '/v1/sysfunction/updateIsEnable/' +data.sid+'/'+data.isEnable, method: 'POST', data: data, headers: {'Content-Type': 'application/json', diff --git a/yxt-portal-ui/src/api/system/home/home.js b/yxt-portal-ui/src/api/system/home/home.js index ac525413..f9e1a914 100644 --- a/yxt-portal-ui/src/api/system/home/home.js +++ b/yxt-portal-ui/src/api/system/home/home.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取当前用户的待办数量 export function getTodoNum(data) { return request({ - url: '/portal/v1/flow/getTodoNum/' + data, + url: '/v1/flow/getTodoNum/' + data, method: 'get' }) } diff --git a/yxt-portal-ui/src/api/system/liuchengchaosong/liuchengchaosong.js b/yxt-portal-ui/src/api/system/liuchengchaosong/liuchengchaosong.js index 7b9305ef..9ec0d428 100644 --- a/yxt-portal-ui/src/api/system/liuchengchaosong/liuchengchaosong.js +++ b/yxt-portal-ui/src/api/system/liuchengchaosong/liuchengchaosong.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/sysflowcc/listPage', + url: '/v1/sysflowcc/listPage', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -13,7 +13,7 @@ export function pageList(data) { // 新增 export function save(data) { return request({ - url: '/portal/v1/sysflowcc/save', + url: '/v1/sysflowcc/save', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -23,7 +23,7 @@ export function save(data) { // 初始化应用 export function fetchSid(data) { return request({ - url: '/portal/v1/sysflowcc/fetchDetailsBySid/' + data, + url: '/v1/sysflowcc/fetchDetailsBySid/' + data, method: 'get' }) } @@ -31,7 +31,7 @@ export function fetchSid(data) { // 删除 export function delBySids(data) { return request({ - url: '/portal/v1/sysflowcc/delBySids', + url: '/v1/sysflowcc/delBySids', method: 'DELETE', data: data, headers: { 'Content-Type': 'application/json' } @@ -41,7 +41,7 @@ export function delBySids(data) { // 查询角色列表 export function roleList(data){ return request({ - url: '/portal/v1/sysrole/listAll', + url: '/v1/sysrole/listAll', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-portal-ui/src/api/system/log/index.js b/yxt-portal-ui/src/api/system/log/index.js index a4dfd397..ffb4d031 100644 --- a/yxt-portal-ui/src/api/system/log/index.js +++ b/yxt-portal-ui/src/api/system/log/index.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function logPageList(data) { return request({ - url: '/portal/v1/systemlog/listPage', + url: '/v1/systemlog/listPage', method: 'POST', data: data, headers: {'Content-Type': 'application/json', diff --git a/yxt-portal-ui/src/api/system/menu/index.js b/yxt-portal-ui/src/api/system/menu/index.js index 9348efe5..47f91b07 100644 --- a/yxt-portal-ui/src/api/system/menu/index.js +++ b/yxt-portal-ui/src/api/system/menu/index.js @@ -7,7 +7,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/sysmenu/listAllVoForSource', + url: '/v1/sysmenu/listAllVoForSource', method: 'POST', data: data, headers: { @@ -20,7 +20,7 @@ export function pageList(data) { // 新增保存 菜单信息 export function saveMenusInfo(data) { return request({ - url: '/portal/v1/sysmenu/save', + url: '/v1/sysmenu/save', method: 'POST', data: data, headers: {'Content-Type': 'application/json'} @@ -30,7 +30,7 @@ export function saveMenusInfo(data) { // 修改保存 菜单信息 export function putMenusInfo(data) { return request({ - url: '/portal/v1/sysmenu/update/' + data.sid, + url: '/v1/sysmenu/update/' + data.sid, method: 'POST', data: data, headers: {'Content-Type': 'application/json'} @@ -40,7 +40,7 @@ export function putMenusInfo(data) { //根据sid 删除单个 资源信息 export function delMenus(data) { return request({ - url: '/portal/v1/sysmenu/delBySids/' + data.sid, + url: '/v1/sysmenu/delBySids/' + data.sid, method: 'get', data: qs.stringify(data), headers: { @@ -53,7 +53,7 @@ export function delMenus(data) { // 修改状态 export function IsEnable(data) { return request({ - url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable, + url: '/v1/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable, method: 'POST', /* data: qs.stringify(data),*/ headers: { diff --git a/yxt-portal-ui/src/api/system/mobileterminal/mobileterminal.js b/yxt-portal-ui/src/api/system/mobileterminal/mobileterminal.js index ceb9385e..8139b5a6 100644 --- a/yxt-portal-ui/src/api/system/mobileterminal/mobileterminal.js +++ b/yxt-portal-ui/src/api/system/mobileterminal/mobileterminal.js @@ -4,7 +4,7 @@ import qs from 'qs' // 获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/sysmobilemenu/list', + url: '/v1/sysmobilemenu/list', method: 'get', data }) @@ -13,7 +13,7 @@ export function pageList(data) { // 新增插件 export function save(data) { return request({ - url: '/portal/v1/appsubsetversion/save', + url: '/v1/appsubsetversion/save', method: 'get', data: data }) @@ -22,7 +22,7 @@ export function save(data) { // 更新插件 export function putMenusInfo(data) { return request({ - url: '/portal/v1/sysmenu/update/' + data.sid, + url: '/v1/sysmenu/update/' + data.sid, method: 'POST', data: data, headers: { 'Content-Type': 'application/json' } @@ -32,7 +32,7 @@ export function putMenusInfo(data) { // 新增/编辑应用 export function saveOrUpdate(data) { return request({ - url: '/portal/v1/sysmobilemenu/saveOrUpdate', + url: '/v1/sysmobilemenu/saveOrUpdate', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -42,7 +42,7 @@ export function saveOrUpdate(data) { // 初始化应用 export function details(data) { return request({ - url: '/portal/v1/sysmobilemenu/details', + url: '/v1/sysmobilemenu/details', method: 'get', params: data }) @@ -51,7 +51,7 @@ export function details(data) { // 根据sid应用 export function deleteMenu(data) { return request({ - url: '/portal/v1/sysmobilemenu/deleteMenu', + url: '/v1/sysmobilemenu/deleteMenu', method: 'DELETE', params: data }) diff --git a/yxt-portal-ui/src/api/system/personalization/personalization.js b/yxt-portal-ui/src/api/system/personalization/personalization.js index 84a26082..c09eca06 100644 --- a/yxt-portal-ui/src/api/system/personalization/personalization.js +++ b/yxt-portal-ui/src/api/system/personalization/personalization.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取菜单 分页列表 export function getList(data) { return request({ - url: '/portal/v1/sysuserdefaultorg/getList', + url: '/v1/sysuserdefaultorg/getList', method: 'get', params: data }) @@ -12,7 +12,7 @@ export function getList(data) { // 新增插件 export function saveOrUpdate(data) { return request({ - url: '/portal/v1/sysuserdefaultorg/saveOrUpdate', + url: '/v1/sysuserdefaultorg/saveOrUpdate', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-portal-ui/src/api/system/postManage/index.js b/yxt-portal-ui/src/api/system/postManage/index.js index 1935cad9..e3ca8991 100644 --- a/yxt-portal-ui/src/api/system/postManage/index.js +++ b/yxt-portal-ui/src/api/system/postManage/index.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/syspost/listPage', + url: '/v1/syspost/listPage', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -17,7 +17,7 @@ export function pageList(data) { // 查询部门列表 export function orgList(data){ return request({ - url: '/portal/v1/sysorganization/list', + url: '/v1/sysorganization/list', method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -28,7 +28,7 @@ export function orgList(data){ // 新增 export function savePost(data){ return request({ - url: '/portal/v1/syspost/save', + url: '/v1/syspost/save', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -39,7 +39,7 @@ export function savePost(data){ // 修改 export function putOrgroles(data){ return request({ - url: '/portal/v1/syspost/update/' +data.sid, + url: '/v1/syspost/update/' +data.sid, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -51,7 +51,7 @@ export function putOrgroles(data){ // 删除 export function delOrgroles(data){ return request({ - url: '/portal/v1/syspost/delBySids/' + data.sids, + url: '/v1/syspost/delBySids/' + data.sids, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -62,7 +62,7 @@ export function delOrgroles(data){ export function pullDown(data){ return request({ - url: '/portal/v1/dictcommon/typeValues', + url: '/v1/dictcommon/typeValues', method: 'get', params: data }) @@ -71,7 +71,7 @@ export function pullDown(data){ // 查询岗位列表 export function selectList(data){ return request({ - url: '/portal/v1/syspost/selectList', + url: '/v1/syspost/selectList', method: 'get', params: data }) diff --git a/yxt-portal-ui/src/api/system/region/region.js b/yxt-portal-ui/src/api/system/region/region.js index 005192a1..3bbf3147 100644 --- a/yxt-portal-ui/src/api/system/region/region.js +++ b/yxt-portal-ui/src/api/system/region/region.js @@ -5,7 +5,7 @@ export default { // 分页列表 pagerList: function (params) { return request({ - url: '/portal/v1/regions/pagerList', + url: '/v1/regions/pagerList', method: 'post', data: params, headers: { @@ -17,7 +17,7 @@ export default { // 新增保存 save: function (regionDto) { return request({ - url: '/portal/v1/regions/save', + url: '/v1/regions/save', method: 'post', data: regionDto, headers: { @@ -29,7 +29,7 @@ export default { // // 根据省sid获取该省的所有市 // getCity: function (sid) { // return request({ - // url: '/portal/v1/regions/getCity', + // url: '/v1/regions/getCity', // method: 'get', // params: { // sid @@ -40,7 +40,7 @@ export default { // // 根据市sid获取该省的所有县区 // getCounty: function (sid) { // return request({ - // url: '/portal/v1/regions/getCounty', + // url: '/v1/regions/getCounty', // method: 'get', // params: { // sid @@ -51,7 +51,7 @@ export default { // 删除 delete: function (sid) { return request({ - url: '/portal/v1/regions/delete/' + sid, + url: '/v1/regions/delete/' + sid, method: 'delete', data: sid }) @@ -60,7 +60,7 @@ export default { //点击修改回显数据 updateEcho: function (sid) { return request({ - url: '/portal/v1/regions/getOne/' + sid, + url: '/v1/regions/getOne/' + sid, method: 'post', params: { sid @@ -72,7 +72,7 @@ export default { // system/region/update/{sid} update: function (params,sid) { return request({ - url: '/portal/v1/regions/update/' + sid, + url: '/v1/regions/update/' + sid, method: 'post', data: params, headers: { diff --git a/yxt-portal-ui/src/api/system/roleAdminister/index.js b/yxt-portal-ui/src/api/system/roleAdminister/index.js index c0199867..d48fbe46 100644 --- a/yxt-portal-ui/src/api/system/roleAdminister/index.js +++ b/yxt-portal-ui/src/api/system/roleAdminister/index.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); // 业务角色 列表 export function roleOrgList(data){ return request({ - url: '/portal/v1/sysrole/listPage', + url: '/v1/sysrole/listPage', method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -16,7 +16,7 @@ export function roleOrgList(data){ export function postList(data){ return request({ - url: '/portal/v1/syspost/list', + url: '/v1/syspost/list', method: 'get', data: data, headers: {'Content-Type': 'application/json'} @@ -26,7 +26,7 @@ export function postList(data){ // 获取数据字典下拉列表 export function typeValues(data) { return request({ - url: '/portal/v1/dictcommon/typeValues', + url: '/v1/dictcommon/typeValues', method: 'get', params: data }) @@ -35,7 +35,7 @@ export function typeValues(data) { // 设置是否可用:isEnable:1可用,0不可用 export function setRoleEnable(data) { return request({ - url: '/portal/v1/sysrole/setIsEnable/' + data.sid + '/' + data.isEnable, + url: '/v1/sysrole/setIsEnable/' + data.sid + '/' + data.isEnable, method: 'POST', data: data, headers: { @@ -52,7 +52,7 @@ export function setRoleEnable(data) { * */ export function saveOrgroles(data) { return request({ - url: '/portal/v1/sysrole/save', + url: '/v1/sysrole/save', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -69,7 +69,7 @@ export function saveOrgroles(data) { * */ export function putOrgroles(data) { return request({ - url: `/portal/v1/sysrole/update/${data.sid}`, + url: `/v1/sysrole/update/${data.sid}`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -84,7 +84,7 @@ export function putOrgroles(data) { * */ export function delOrgroles(data) { return request({ - url: `/portal/v1/sysrole/delBySids/${data.sid}`, + url: `/v1/sysrole/delBySids/${data.sid}`, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -95,7 +95,7 @@ export function delOrgroles(data) { // 移动端授权 export function getRoleMenuList(data) { return request({ - url: '/portal/v1/sysmobilemenurole/getRoleMenuList', + url: '/v1/sysmobilemenurole/getRoleMenuList', method: 'post', params: { roleSid: data } }) @@ -104,7 +104,7 @@ export function getRoleMenuList(data) { // 菜单授权保存 export function saveRoleMenuList(data) { return request({ - url: `/portal/v1/sysmobilemenurole/saveRoleMenuList`, + url: `/v1/sysmobilemenurole/saveRoleMenuList`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -116,7 +116,7 @@ export function saveRoleMenuList(data) { // 菜单授权 export function roleMenuTree(data) { return request({ - url: `/portal/v1/sysmenu/listAllByRoleSid`, + url: `/v1/sysmenu/listAllByRoleSid`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -128,7 +128,7 @@ export function roleMenuTree(data) { // 菜单授权保存 export function saveorgrolemenus(data) { return request({ - url: `/portal/v1/sysmenurole/updateRoleAndMenu`, + url: `/v1/sysmenurole/updateRoleAndMenu`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -139,7 +139,7 @@ export function saveorgrolemenus(data) { // 资源授权 export function sourceMenuTree(data) { return request({ - url: `/portal/v1/syssource/listAllByRoleSid`, + url: `/v1/syssource/listAllByRoleSid`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -150,7 +150,7 @@ export function sourceMenuTree(data) { // 资源授权保存 export function saveSource(data) { return request({ - url: `/portal/v1/syssourcerole/updateRoleAndSource`, + url: `/v1/syssourcerole/updateRoleAndSource`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -161,7 +161,7 @@ export function saveSource(data) { // 功能授权 export function funMenuTree(data) { return request({ - url: `/portal/v1/sysfunction/listAllByRoleSid`, + url: `/v1/sysfunction/listAllByRoleSid`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -172,7 +172,7 @@ export function funMenuTree(data) { // 功能授权保存 export function savefunMenu(data) { return request({ - url: `/portal/v1/sysrolefunction/updateRoleAndFunction`, + url: `/v1/sysrolefunction/updateRoleAndFunction`, method: 'POST', data: data, headers: {'Content-Type': 'application/json', diff --git a/yxt-portal-ui/src/api/system/sources/index.js b/yxt-portal-ui/src/api/system/sources/index.js index f94cac0c..201ebf0d 100644 --- a/yxt-portal-ui/src/api/system/sources/index.js +++ b/yxt-portal-ui/src/api/system/sources/index.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/syssource/listPage', + url: '/v1/syssource/listPage', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -16,7 +16,7 @@ export function pageList(data) { //保存 资源信息 export function saveSourcesInfo(data) { return request({ - url: '/portal/v1/syssource/save', + url: '/v1/syssource/save', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -27,7 +27,7 @@ export function saveSourcesInfo(data) { // 修改 保存 资源信息 export function putSourcesInfo(data) { return request({ - url: '/portal/v1/syssource/update/' + data.sid, + url: '/v1/syssource/update/' + data.sid, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -38,7 +38,7 @@ export function putSourcesInfo(data) { //根据sid 删除单个 资源信息 export function delSources(data) { return request({ - url: '/portal/v1/syssource/delBySids/' + data.sid, + url: '/v1/syssource/delBySids/' + data.sid, method: 'get', data: qs.stringify(data), headers: {'Content-Type': 'application/json', @@ -49,7 +49,7 @@ export function delSources(data) { // 获取获取资源类别 export function getZzylb(data) { return request({ - url: '/portal/v1/syssource/listAll', + url: '/v1/syssource/listAll', method: 'post', headers: {'Content-Type': 'application/json'} }) diff --git a/yxt-portal-ui/src/api/system/user/login.js b/yxt-portal-ui/src/api/system/user/login.js index 250edd27..072618c3 100644 --- a/yxt-portal-ui/src/api/system/user/login.js +++ b/yxt-portal-ui/src/api/system/user/login.js @@ -5,7 +5,7 @@ import qs from 'qs' //获取菜单 分页列表 export function login1(data) { return request({ - url: '/portal/v1/sysuser/login', + url: '/v1/sysuser/login', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -21,7 +21,7 @@ export function login1(data) { class user { login(data) { // 登录 return request({ - url: '/portal/v1/sysuser/login', + url: '/v1/sysuser/login', method: 'post', data }) diff --git a/yxt-portal-ui/src/api/system/userManage/index.js b/yxt-portal-ui/src/api/system/userManage/index.js index 583b8aaf..46cbe81b 100644 --- a/yxt-portal-ui/src/api/system/userManage/index.js +++ b/yxt-portal-ui/src/api/system/userManage/index.js @@ -7,7 +7,7 @@ let tokens = window.sessionStorage.getItem('token'); // 修改用户 微信公众号OpenId export function saveOpenId(data) { return request({ - url: '/portal/v1/sysuser/saveOpenId', + url: '/v1/sysuser/saveOpenId', method: 'post', data: data, headers: { @@ -19,7 +19,7 @@ export function saveOpenId(data) { export function userList(data) { return request({ - url: '/portal/v1/sysuser/listPage', + url: '/v1/sysuser/listPage', method: 'post', data: data, headers: { @@ -31,7 +31,7 @@ export function userList(data) { // 新增 export function userAdd(data) { return request({ - url: '/portal/v1/sysuser/save', + url: '/v1/sysuser/save', method: 'post', data: data, headers: { @@ -43,7 +43,7 @@ export function userAdd(data) { // 更新 export function userUpdata(data) { return request({ - url: '/portal/v1/sysuser/update/' + data.sid, + url: '/v1/sysuser/update/' + data.sid, method: 'post', data: data, headers: { @@ -56,7 +56,7 @@ export function userUpdata(data) { // 删除 export function delUser(data) { return request({ - url: '/portal/v1/sysuser/delBySid/' + data.sid, + url: '/v1/sysuser/delBySid/' + data.sid, method: 'get', data: data, headers: { @@ -68,7 +68,7 @@ export function delUser(data) { // 初始化密码 export function initPwd(data) { return request({ - url: '/portal/v1/sysuser/initPwd/' + data.sid, + url: '/v1/sysuser/initPwd/' + data.sid, method: 'post', data: data, headers: { @@ -80,7 +80,7 @@ export function initPwd(data) { // 根据sid查询一条信息 export function userSingle(data) { return request({ - url: '/portal/v1/sysuser/fetchBySid/' + data.sid, + url: '/v1/sysuser/fetchBySid/' + data.sid, method: 'get', data: data, headers: { @@ -92,7 +92,7 @@ export function userSingle(data) { // 单条用户的角色列表 export function setRole(data) { return request({ - url: '/portal/v1/sysrole/listAllByUserSid/' + data.sid, + url: '/v1/sysrole/listAllByUserSid/' + data.sid, method: 'post', data: data, headers: { @@ -104,7 +104,7 @@ export function setRole(data) { // 角色列表 export function saveOrgRole(data) { return request({ - url: '/portal/v1/sysuserrole/update', + url: '/v1/sysuserrole/update', method: 'post', data: data, headers: { @@ -116,7 +116,7 @@ export function saveOrgRole(data) { // 查询角色列表 export function roleList(data) { return request({ - url: '/portal/v1/sysrole/listAll', + url: '/v1/sysrole/listAll', method: 'post', data: data, headers: { @@ -128,7 +128,7 @@ export function roleList(data) { // 查询部门列表 export function orgList(data) { return request({ - url: '/portal/v1/sysorganization/list', + url: '/v1/sysorganization/list', method: 'get', data: data, headers: { @@ -140,7 +140,7 @@ export function orgList(data) { // 查询岗位列表 export function postList(data) { return request({ - url: '/portal/v1/syspost/fetchByOrgSid/' + data.sid, + url: '/v1/syspost/fetchByOrgSid/' + data.sid, method: 'get', data: data, headers: { @@ -153,7 +153,7 @@ export function postList(data) { // 获取验证码 export function getCode(data) { return request({ - url: '/portal/v1/sysuser/sendMessageCode/' + data.phone, + url: '/v1/sysuser/sendMessageCode/' + data.phone, method: 'get', data: data, headers: { @@ -166,7 +166,7 @@ export function getCode(data) { // 设置是否可用:isEnable:1可用,0不可用 export function setRoleEnable(data) { return request({ - url: '/portal/v1/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable, + url: '/v1/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable, method: 'post', data: data, headers: { diff --git a/yxt-portal-ui/src/api/user.js b/yxt-portal-ui/src/api/user.js index c9ad6e8d..c91b2e8d 100644 --- a/yxt-portal-ui/src/api/user.js +++ b/yxt-portal-ui/src/api/user.js @@ -1,7 +1,7 @@ import request from '@/utils/request' export function login(data) { return request({ - url: '/portal/v1/sysuser/login', + url: '/v1/sysuser/login', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -47,7 +47,7 @@ export function getInfo(token) { // 根据token值获取登录后的用户信息 export function loginDetails(data) { return request({ - url: '/portal/v1/sysuser/loginDetails', + url: '/v1/sysuser/loginDetails', method: 'post', data: data, headers: { diff --git a/yxt-portal-ui/src/api/workflow/finished.js b/yxt-portal-ui/src/api/workflow/finished.js index d6d23d7d..49ad415e 100644 --- a/yxt-portal-ui/src/api/workflow/finished.js +++ b/yxt-portal-ui/src/api/workflow/finished.js @@ -15,7 +15,7 @@ export function finishedList(query) { // 任务流转记录 export function flowRecord(query) { return request({ - url: '/portal/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId, + url: '/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId, method: 'get', params: query }) @@ -25,7 +25,7 @@ export function flowRecord(query) { export function revokeProcess(data) { const userSid = data.userSid; return request({ - url: '/portal/v1/flow/task/revokeProcess/' + userSid, + url: '/v1/flow/task/revokeProcess/' + userSid, method: 'post', data: data, headers: { diff --git a/yxt-portal-ui/src/api/workflow/flow.js b/yxt-portal-ui/src/api/workflow/flow.js index 5c69fa80..17de9348 100644 --- a/yxt-portal-ui/src/api/workflow/flow.js +++ b/yxt-portal-ui/src/api/workflow/flow.js @@ -6,7 +6,7 @@ export default { // 查询待办任务列表 getNextNodes: function (query) { return request({ - url: '/portal/v1/flow/getNextTasks/'+query.taskId, + url: '/v1/flow/getNextTasks/'+query.taskId, method: 'post', headers: { 'Content-Type': 'application/json', @@ -19,7 +19,7 @@ export default { const userSid = params.userSid const variables = params.variables return request({ - url: '/portal/v1/flow/businessStart/' + procDefId + '/' + userSid, + url: '/v1/flow/businessStart/' + procDefId + '/' + userSid, method: 'POST', data: variables, headers: { @@ -32,7 +32,7 @@ export default { const pageNum = params.current const pageSize = params.size return request({ - url: '/portal/v1/flow/processPagerList', + url: '/v1/flow/processPagerList', method: 'POST', data: { pageNum: pageNum, @@ -43,7 +43,7 @@ export default { myProcessList: function(params) { let userSid=params.params.userSid; return request({ - url: '/portal/v1/flow/myprocess/'+userSid, + url: '/v1/flow/myprocess/'+userSid, method: 'POST', data: params, headers: { @@ -55,7 +55,7 @@ export default { todoTaskList: function(params) { let userSid=params.params.userSid; return request({ - url: '/portal/v1/flow/todoTaskList/'+userSid, + url: '/v1/flow/todoTaskList/'+userSid, method: 'POST', data: params, headers: { @@ -67,7 +67,7 @@ export default { doneTaskList: function(params) { let userSid=params.params.userSid; return request({ - url: '/portal/v1/flow/doneTaskList/'+userSid, + url: '/v1/flow/doneTaskList/'+userSid, method: 'POST', data: params, headers: { @@ -81,7 +81,7 @@ export default { // 任务流转记录 export function complete(data) { return request({ - url: '/portal/v1/flow/complete', + url: '/v1/flow/complete', method: 'post', data: data, headers: { diff --git a/yxt-portal-ui/src/router/index.js b/yxt-portal-ui/src/router/index.js index 6314f249..5ecee06c 100644 --- a/yxt-portal-ui/src/router/index.js +++ b/yxt-portal-ui/src/router/index.js @@ -228,6 +228,19 @@ export const constantRoutes = [ title: '组织管理' } }] + }, { + path: '/Advertising', + component: Layout, + redirect: '/Advertising', + children: [{ + path: '/Advertising', + component: () => + import('@/views/Advertising/AdvertisingIndex.vue'), + name: 'Advertising', + meta: { + title: '广告列表' + } + }] }, // 工作流 { diff --git a/yxt-portal-ui/src/views/Advertising/AdvertisingIndex.vue b/yxt-portal-ui/src/views/Advertising/AdvertisingIndex.vue new file mode 100644 index 00000000..c4caf30c --- /dev/null +++ b/yxt-portal-ui/src/views/Advertising/AdvertisingIndex.vue @@ -0,0 +1,281 @@ + + + + diff --git a/yxt-portal-ui/src/views/Advertising/AdvertisingIndexAdd.vue b/yxt-portal-ui/src/views/Advertising/AdvertisingIndexAdd.vue new file mode 100644 index 00000000..bca16f3c --- /dev/null +++ b/yxt-portal-ui/src/views/Advertising/AdvertisingIndexAdd.vue @@ -0,0 +1,310 @@ + + + + diff --git a/yxt-portal-ui/src/views/Advertising/AdvertisingIndexDetail.vue b/yxt-portal-ui/src/views/Advertising/AdvertisingIndexDetail.vue new file mode 100644 index 00000000..e264f0c9 --- /dev/null +++ b/yxt-portal-ui/src/views/Advertising/AdvertisingIndexDetail.vue @@ -0,0 +1,282 @@ + + + +