From 541a1cabe4b49a1f0171f648c205228393bd9866 Mon Sep 17 00:00:00 2001 From: lVAL Date: Fri, 16 Oct 2020 13:07:31 +0800 Subject: [PATCH 001/225] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=98=E5=9B=BE?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/rpTools.js | 10 +++ .../{planConvert-.js => planConvert--.js} | 84 +++++++------------ src/jmapNew/theme/aus_00/planConvert.js | 74 ++++++++++------ src/views/planMonitor/editToolAUS/monitor.js | 57 +++++-------- .../planMonitor/editToolAUS/schedule.vue | 40 +++++++-- 5 files changed, 143 insertions(+), 122 deletions(-) rename src/jmapNew/theme/aus_00/{planConvert-.js => planConvert--.js} (54%) diff --git a/src/api/rpTools.js b/src/api/rpTools.js index 12eff69fe..cb1bdbccf 100644 --- a/src/api/rpTools.js +++ b/src/api/rpTools.js @@ -10,6 +10,16 @@ export function getRpTools() { }); } +/** + * 清除运行图 + */ +export function clearRpPlan() { + return request({ + url: `/api/rpTools/clear`, + method: 'put' + }) +} + /** * 添加车次 */ diff --git a/src/jmapNew/theme/aus_00/planConvert-.js b/src/jmapNew/theme/aus_00/planConvert--.js similarity index 54% rename from src/jmapNew/theme/aus_00/planConvert-.js rename to src/jmapNew/theme/aus_00/planConvert--.js index 218bf41ef..686a10a81 100644 --- a/src/jmapNew/theme/aus_00/planConvert-.js +++ b/src/jmapNew/theme/aus_00/planConvert--.js @@ -1,14 +1,14 @@ -import { createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan'; +import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan'; export default { /** 边缘高度*/ - EdgeHeight: 600, + EdgeHeight: 3, /** 间隔高度*/ - CoordMultiple: 1, + CoordMultiple: 3, /** 偏移时间*/ - TranslationTime: 0, + TranslationTime: 0, /** 将后台数据解析成图表*/ convertDataToModels(tripList, stations, kmRangeCoordMap, lineStyle) { @@ -16,11 +16,11 @@ export default { /** 按车次遍历数据*/ if (tripList && tripList.length) { tripList.forEach(trip => { - const opt = { - name: `run-${trip.tripNo}`, - type: 'line', - legendHoverLink: false, - symbolSize: 6, + const opt = { + name: `run-${trip.tripNo}`, + type: 'line', + legendHoverLink: false, + symbolSize: 6, lineStyle: { color: '#000', width: 1, @@ -29,19 +29,6 @@ export default { data: [] }; - // const length = trip.stationTimeList.length; - // if (trip.tripNo && - // trip.stationTimeList.length) { - // opt.markPoint.data.push(createMartPointReverse({ - // name: `${trip.tripNo}`, - // color: '#000' || lineStyle.color, - // coord: [ - // trip.stationTimeList[0].arrivalTime, - // this.getCoordYByElem(stations, kmRangeCoordMap, trip.stationTimeList[0]) - // ] - // })); - // } - /** 计算停站点坐标集合*/ trip.stationTimeList.forEach((elem,idx) => { if (elem.arrivalTime) { @@ -58,7 +45,7 @@ export default { } return models; -}, + }, /** 更新数据并解析成图表*/ updateDataToModels(tripList, stations, kmRangeCoordMap, runPlanData, series, lineStyle) { @@ -67,71 +54,64 @@ export default { return series; }, - /** 初始化Y轴*/ - initializeYaxis(stations) { - return createMarkLineModels(stations, (elem) => { - return this.EdgeHeight + elem.kmRange * this.CoordMultiple; - }); - }, - /** 将后台数据转换为试图序列模型*/ convertStationsToMap(stations) { var map = {}; if (stations && stations.length) { - stations.forEach((elem) => { - map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple; + stations.forEach((elem, index) => { + map[`${elem.kmRange}`] = this.EdgeHeight + index * this.CoordMultiple; }); } return map; }, + /** 初始化Y轴*/ + initializeYaxis(stations) { + return createMarkLineModels(stations, (elem, index) => { + return this.EdgeHeight + index * this.CoordMultiple; + }); + }, /** 计算y轴最小值*/ - computedYaxisMinValue(stations) { - return stations[0].kmRange * this.CoordMultiple; + computedYaxisMinValue() { + return 0; }, /** 计算y轴最大值*/ computedYaxisMaxValue(stations) { - return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2; + return this.EdgeHeight * 2 + (stations.length - 1) * this.CoordMultiple; }, /** 格式化y轴数据*/ computedFormatYAxis(stations, params) { var yText = '0m'; - - stations.forEach(elem => { - if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { - yText = Math.floor(elem.kmRange) + 'm'; - } - }); - + var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple); + if (index >= 0 && index < stations.length) { + yText = Math.floor(stations[index].kmRange) + 'm'; + } return yText; }, - /** 根据是否和上一个车次是否相交,计算下一个车次的折返的高度*/ - computedReentryNumber(code) { - // return parseInt(code || 1) % 2 ? 1 : 2; - return 1; - }, - /** 根据方向计算y折返偏移量*/ - getYvalueByDirectionCode(defaultVlue, directionCode, num) { + getYvalueByDirectionCode(defaultVlue, directionCode) { if (directionCode === '1') { - defaultVlue += this.EdgeHeight / 2 * num; + defaultVlue -= this.EdgeHeight / 2; } else if (directionCode === '2') { - defaultVlue -= this.EdgeHeight / 2 * num; + defaultVlue += this.EdgeHeight / 2; } return defaultVlue; }, /** 根据elem计算y值*/ - getCoordYByElem(stations, kmRangeCoordMap, elem) { + getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial) { var defaultVlue = 0; var station = stations.find(it => { return it.code == elem.stationCode; }); if (station) { defaultVlue = kmRangeCoordMap[`${station.kmRange}`]; + if (isSpecial) { + defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode); + } } return defaultVlue; diff --git a/src/jmapNew/theme/aus_00/planConvert.js b/src/jmapNew/theme/aus_00/planConvert.js index 686a10a81..d263cb4fb 100644 --- a/src/jmapNew/theme/aus_00/planConvert.js +++ b/src/jmapNew/theme/aus_00/planConvert.js @@ -1,14 +1,14 @@ -import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan'; +import { createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan'; export default { /** 边缘高度*/ - EdgeHeight: 3, + EdgeHeight: 600, /** 间隔高度*/ - CoordMultiple: 3, + CoordMultiple: 1, /** 偏移时间*/ - TranslationTime: 0, + TranslationTime: 0, /** 将后台数据解析成图表*/ convertDataToModels(tripList, stations, kmRangeCoordMap, lineStyle) { @@ -29,6 +29,19 @@ export default { data: [] }; + // const length = trip.stationTimeList.length; + // if (trip.tripNo && + // trip.stationTimeList.length) { + // opt.markPoint.data.push(createMartPointReverse({ + // name: `${trip.tripNo}`, + // color: '#000' || lineStyle.color, + // coord: [ + // trip.stationTimeList[0].arrivalTime, + // this.getCoordYByElem(stations, kmRangeCoordMap, trip.stationTimeList[0]) + // ] + // })); + // } + /** 计算停站点坐标集合*/ trip.stationTimeList.forEach((elem,idx) => { if (elem.arrivalTime) { @@ -45,7 +58,7 @@ export default { } return models; - }, +}, /** 更新数据并解析成图表*/ updateDataToModels(tripList, stations, kmRangeCoordMap, runPlanData, series, lineStyle) { @@ -54,64 +67,71 @@ export default { return series; }, + /** 初始化Y轴*/ + initializeYaxis(stations) { + return createMarkLineModels(stations, (elem) => { + return this.EdgeHeight + elem.kmRange * this.CoordMultiple; + }); + }, + /** 将后台数据转换为试图序列模型*/ convertStationsToMap(stations) { var map = {}; if (stations && stations.length) { - stations.forEach((elem, index) => { - map[`${elem.kmRange}`] = this.EdgeHeight + index * this.CoordMultiple; + stations.forEach((elem) => { + map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple; }); } return map; }, - /** 初始化Y轴*/ - initializeYaxis(stations) { - return createMarkLineModels(stations, (elem, index) => { - return this.EdgeHeight + index * this.CoordMultiple; - }); - }, /** 计算y轴最小值*/ - computedYaxisMinValue() { - return 0; + computedYaxisMinValue(stations) { + return stations[0].kmRange * this.CoordMultiple; }, /** 计算y轴最大值*/ computedYaxisMaxValue(stations) { - return this.EdgeHeight * 2 + (stations.length - 1) * this.CoordMultiple; + return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2; }, /** 格式化y轴数据*/ computedFormatYAxis(stations, params) { var yText = '0m'; - var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple); - if (index >= 0 && index < stations.length) { - yText = Math.floor(stations[index].kmRange) + 'm'; - } + + stations.forEach(elem => { + if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { + yText = Math.floor(elem.kmRange) + 'm'; + } + }); + return yText; }, + /** 根据是否和上一个车次是否相交,计算下一个车次的折返的高度*/ + computedReentryNumber(code) { + // return parseInt(code || 1) % 2 ? 1 : 2; + return 1; + }, + /** 根据方向计算y折返偏移量*/ - getYvalueByDirectionCode(defaultVlue, directionCode) { + getYvalueByDirectionCode(defaultVlue, directionCode, num) { if (directionCode === '1') { - defaultVlue -= this.EdgeHeight / 2; + defaultVlue += this.EdgeHeight / 2 * num; } else if (directionCode === '2') { - defaultVlue += this.EdgeHeight / 2; + defaultVlue -= this.EdgeHeight / 2 * num; } return defaultVlue; }, /** 根据elem计算y值*/ - getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial) { + getCoordYByElem(stations, kmRangeCoordMap, elem) { var defaultVlue = 0; var station = stations.find(it => { return it.code == elem.stationCode; }); if (station) { defaultVlue = kmRangeCoordMap[`${station.kmRange}`]; - if (isSpecial) { - defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode); - } } return defaultVlue; diff --git a/src/views/planMonitor/editToolAUS/monitor.js b/src/views/planMonitor/editToolAUS/monitor.js index c37087877..155987fcd 100644 --- a/src/views/planMonitor/editToolAUS/monitor.js +++ b/src/views/planMonitor/editToolAUS/monitor.js @@ -23,7 +23,7 @@ export default { this.listenersOff(); }, methods: { - getStationByCoord1(stations, y) { + getStationByCoord(stations, y) { for(var i = stations.length-1; i >= 0; i--) { const station = stations[i]; const edge = this.planConvert.EdgeHeight @@ -37,7 +37,7 @@ export default { } return null; }, - getStationByCoord(stations, y) { + getStationByCoord2(stations, y) { for(var i = stations.length-1; i >= 0; i--) { const station = stations[i]; const edge = this.planConvert.EdgeHeight; @@ -96,10 +96,11 @@ export default { } }, onUpdatePosition(e) { + this.clearGraphic(); const option = this.myChart.getOption(); const elements = option.graphic[0].elements const graphic = echarts.util.map(elements, (item) => { - return { position: this.myChart.convertToPixel('grid', item.data) }; + return { position: this.myChart.convertToPixel('grid', item.point)}; }) this.myChart.setOption({graphic}); }, @@ -184,7 +185,7 @@ export default { type: 'circle', subType: 'drag', position: this.myChart.convertToPixel('grid', point), - data: [...point], + point: [...point], shape: { cx: 0, cy: 0, @@ -200,37 +201,19 @@ export default { }, createMarkPointObj(point) { return { - type: 'group', - subType: 'mark', + type: 'circle', + subType: 'mark', z: 100, position: point, - point, - children: [ - { - type: 'circle', - z: 100, - shape: { - cx: 0, - cy: 0, - r: 5 - }, - style: { - fill: 'rgba(0,0,0,0.3)' - } - }, - { - type: 'circle', - z: 100, - shape: { - cx: 0, - cy: 0, - r: 10 - }, - style: { - fill: 'rgba(0,0,0,0.3)' - } - } - ] + point: [...this.myChart.convertFromPixel('grid', point)], + shape: { + cx: 0, + cy: 0, + r: 10 + }, + style: { + fill: 'rgba(0,0,0,0.3)' + } } }, handlePopDialog({e, pointInPixel}) { @@ -334,7 +317,7 @@ export default { this.createModel.startTime = timeFormat(xVal); } else if (filters.length >= 2) { this.createModel.endStationCode = yObj.code; - this.handleCreate(this.createModel); + this.handleCreateTrip(this.createModel); } }, handleDragging({e, xVal}) { @@ -350,8 +333,10 @@ export default { }); } - if (e.target && e.target.position) { - e.target.data.x += this.selected.dx; + if (e.target && + e.target.point && + e.target.position) { + e.target.point[0] += this.selected.dx; } this.myChart.setOption(option, {notMerge: true}); diff --git a/src/views/planMonitor/editToolAUS/schedule.vue b/src/views/planMonitor/editToolAUS/schedule.vue index 6104f2357..812475694 100644 --- a/src/views/planMonitor/editToolAUS/schedule.vue +++ b/src/views/planMonitor/editToolAUS/schedule.vue @@ -1,8 +1,11 @@ From 913b1c9b71029ef553648424c35f8e0973c24322 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 16 Oct 2020 19:04:44 +0800 Subject: [PATCH 013/225] =?UTF-8?q?=E6=96=B0=E7=89=88=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=9B=BE=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=EF=BC=88=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index_Common.js | 10 +- src/views/designPlatform/demonList.vue | 5 +- src/views/planMonitor/detail.vue | 47 +- src/views/planMonitor/editTool/index.vue | 3 + .../planMonitor/editTool/menus/addTask.vue | 9 +- .../menus/modifyingStationIntervalTime.vue | 10 +- src/views/planMonitor/editTool/userindex.vue | 485 ------------------ 7 files changed, 34 insertions(+), 535 deletions(-) delete mode 100644 src/views/planMonitor/editTool/userindex.vue diff --git a/src/router/index_Common.js b/src/router/index_Common.js index f51fea47c..9ae84ae50 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -85,7 +85,6 @@ const ExamCourseDetail = () => import('@/views/exam/detail/courseDetail'); const DemonstrationDetail = () => import('@/views/demonstration/detail/index'); const PlanMonitorEditTool = () => import('@/views/planMonitor/editTool/index'); -const PlanMonitorEditUserTool = () => import('@/views/planMonitor/editTool/userindex'); const PlanMonitorEditAUSTool = () => import('@/views/planMonitor/editToolAUS/index'); const PlanMonitorDetail = () => import('@/views/planMonitor/detail'); @@ -218,8 +217,8 @@ export const constantRoutes = [ path: '/design/jlmap3d/assetmanager', component: Jlmap3dAssetManager, hidden: true - }, - { // 运行图编辑 + }, + { // 运行图编辑 path: '/AUStool', component: PlanMonitorEditAUSTool, hidden: true @@ -372,11 +371,6 @@ export const publicAsyncRoute = [ component: Jlmap3d, hidden: true }, - { // 运行图编辑 - path: '/plan/usertool', - component: PlanMonitorEditUserTool, - hidden: true - }, { // 运行图编辑 path: '/plan/tool', component: PlanMonitorEditTool, diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index 91f6a8a18..0b96fd2ac 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -104,7 +104,7 @@ export default { } case 'runPlanDesign': { setSessionStorage('designType', 'runPlanDesign'); - this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?lineCode=${obj.lineCode}` }); + this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?lineCode=${obj.lineCode}&drawWay=${obj.drawWay}` }); break; } case 'map': { @@ -178,7 +178,8 @@ export default { type: 'runPlanDesign', mapId: elem.id, lineCode: elem.lineCode, - cityCode: elem.cityCode + cityCode: elem.cityCode, + drawWay: elem.drawWay } ); if (process.env.VUE_APP_PRO !== 'local') { diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue index 15193b23d..425423edb 100644 --- a/src/views/planMonitor/detail.vue +++ b/src/views/planMonitor/detail.vue @@ -50,7 +50,7 @@ - - From f161c3215630a69fcac35219aef8ac8113b74c7f Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 16 Oct 2020 19:06:24 +0800 Subject: [PATCH 014/225] =?UTF-8?q?=E5=A2=9E=E5=8A=A0license=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/pushMessage.js | 40 +++++++ src/i18n/langs/en/router.js | 4 +- src/i18n/langs/zh/router.js | 4 +- src/permission.js | 2 +- src/router/index_Common.js | 28 ++++- src/utils/baseUrl.js | 2 +- src/utils/request.js | 6 + src/views/authorization/apply.vue | 178 ++++++++++++++++++++++++++++++ src/views/authorization/index.vue | 65 +++++++++++ src/views/authorization/list.vue | 121 ++++++++++++++++++++ 10 files changed, 443 insertions(+), 7 deletions(-) create mode 100644 src/views/authorization/apply.vue create mode 100644 src/views/authorization/index.vue create mode 100644 src/views/authorization/list.vue diff --git a/src/api/pushMessage.js b/src/api/pushMessage.js index bf435773e..0a13502d1 100644 --- a/src/api/pushMessage.js +++ b/src/api/pushMessage.js @@ -15,3 +15,43 @@ export function pushSysNotice(data) { data }); } + +export function postLicense(data) { + return request({ + url: `/api/license`, + method: 'post', + data + }); +} + +export function postLicenseValidate(data) { + return request({ + url: `/api/license/validate`, + method: 'post', + // baseURL: 'https://joylink.club/jlcloud', + data + }); +} + +export function postLicenseLocal(data) { + return request({ + url: `/api/license/local`, + method: 'post', + data + }); +} + +export function getPagingQueryList(params) { + return request({ + url: `/api/license/pagingQuery`, + method: 'get', + params + }); +} + +export function putLicenseValid(id) { + return request({ + url: `/api/license/${id}/invalidating`, + method: 'put' + }); +} diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js index 1ecff02c9..16a83c9e6 100644 --- a/src/i18n/langs/en/router.js +++ b/src/i18n/langs/en/router.js @@ -82,5 +82,7 @@ export default { practiceManage:'Practice manage', bankManage: 'Bank manage', sceneManage:'Scene manage', - companyManage: 'Company manage' + companyManage: 'Company manage', + authorApply: 'Grant application', + AuthorList: 'Authorization code list' }; diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index dc0645d33..cd19957eb 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -87,5 +87,7 @@ export default { bankManage: '题库列表', practiceManage:'实操列表', sceneManage:'场景列表', - companyManage: '单位管理' + companyManage: '单位管理', + authorApply: '授权申请', + AuthorList: '授权列表' }; diff --git a/src/permission.js b/src/permission.js index f385ac5fa..e57d4f663 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,7 @@ import localStore from 'storejs'; // return roles.some(role => permissionRoles.indexOf(role) >= 0); // } -const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/AUStool']; // 不重定向白名单 +const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/authorization', '/AUStool']; // 不重定向白名单 // const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/, /^\/practiceDisplayNew/, /^\/bigSplitScreen/]; diff --git a/src/router/index_Common.js b/src/router/index_Common.js index f51fea47c..9a767a63b 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -7,6 +7,9 @@ Vue.use(Router); /* Layout */ const Layout = () => import('@/layout'); const Login = () => import('@/views/login/index'); +const Authorization = () => import('@/views/authorization/index'); +const AuthorApply = () => import('@/views/authorization/apply'); +const AuthorList = () => import('@/views/authorization/list'); const Jlmap3dedit = () => import('@/views/jlmap3d/edit/jlmap3dedit'); const Jlmap3dAssetManager = () => import('@/views/jlmap3d/jl3dassetmanager/assetmanager'); @@ -209,6 +212,11 @@ export const constantRoutes = [ component: Login, hidden: true }, + { + path: '/authorization', + component: Authorization, + hidden: true + }, { path: '/design/jlmap3d/edit', component: Jlmap3dedit, @@ -218,8 +226,8 @@ export const constantRoutes = [ path: '/design/jlmap3d/assetmanager', component: Jlmap3dAssetManager, hidden: true - }, - { // 运行图编辑 + }, + { // 运行图编辑 path: '/AUStool', component: PlanMonitorEditAUSTool, hidden: true @@ -376,7 +384,7 @@ export const publicAsyncRoute = [ path: '/plan/usertool', component: PlanMonitorEditUserTool, hidden: true - }, + }, { // 运行图编辑 path: '/plan/tool', component: PlanMonitorEditTool, @@ -889,6 +897,20 @@ export const asyncRouter = [ meta: { i18n: 'router.releaseApplication' } + }, + {// 授权码申请 + path: 'authorApply', + component: AuthorApply, + meta: { + i18n: 'router.authorApply' + } + }, + {// 授权码列表 + path: 'AuthorList', + component: AuthorList, + meta: { + i18n: 'router.AuthorList' + } } // { // path: 'deviceManage', diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 524befeac..5c17a46dd 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -4,7 +4,7 @@ export function getBaseUrl() { // BASE_API = 'https://joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // BASE_API = 'http://192.168.3.169:9000'; // 旭强 // BASE_API = 'http://192.168.3.175:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/utils/request.js b/src/utils/request.js index 0b109b4b7..e293226ee 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,6 +8,7 @@ import { getBaseUrl } from '@/utils/baseUrl'; import { EventBus } from '@/scripts/event-bus'; import ConstConfig from '@/scripts/ConstConfig'; import Vue from 'vue'; +import router from '../router/index_APP_TARGET'; const BASE_API = getBaseUrl(); @@ -42,7 +43,12 @@ service.interceptors.response.use( response => { /** code为非200是抛错 可结合自己业务进行修改*/ const res = response.data; + console.log(res, '22222222'); if (res.code != 200) { + // 90005 无授权 90001 授权过期 + if (res.code == 90005 || res.code == 90001) { + router.push({ path: `/authorization` }); + } // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code == 40004 || res.code == 40005 || res.code == 40003) { // eslint-disable-next-line no-undef diff --git a/src/views/authorization/apply.vue b/src/views/authorization/apply.vue new file mode 100644 index 000000000..a4f35f370 --- /dev/null +++ b/src/views/authorization/apply.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/src/views/authorization/index.vue b/src/views/authorization/index.vue new file mode 100644 index 000000000..987ac11f9 --- /dev/null +++ b/src/views/authorization/index.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/authorization/list.vue b/src/views/authorization/list.vue new file mode 100644 index 000000000..690958003 --- /dev/null +++ b/src/views/authorization/list.vue @@ -0,0 +1,121 @@ + + + From faa66eac292e4194fd0926581770f7c73bdd2c75 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 16 Oct 2020 19:07:44 +0800 Subject: [PATCH 015/225] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=A7=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/displayNew/scriptDisplay/component/scriptTip.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue b/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue index 81eee8fd4..53405407e 100644 --- a/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue +++ b/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue @@ -1,5 +1,5 @@ diff --git a/src/views/system/questionsRuleManage/index.vue b/src/views/system/questionsRuleManage/index.vue new file mode 100644 index 000000000..61d1096dc --- /dev/null +++ b/src/views/system/questionsRuleManage/index.vue @@ -0,0 +1,177 @@ + + + + + From d74575bfb9d7a95602e3768d72c5b1fa0f2c1292 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 20 Oct 2020 16:57:41 +0800 Subject: [PATCH 027/225] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 +- .../system/deviceManage/editConfigGateway.vue | 120 +++++++++--------- .../system/deviceManage/editConfigIbp.vue | 70 +++++----- 3 files changed, 98 insertions(+), 96 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index ed8381fb5..5c17a46dd 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,8 +2,8 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://192.168.3.5:9000'; // 袁琪 + BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.169:9000'; // 旭强 // BASE_API = 'http://192.168.3.175:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue index 9c94331b2..a59904974 100644 --- a/src/views/system/deviceManage/editConfigGateway.vue +++ b/src/views/system/deviceManage/editConfigGateway.vue @@ -1,47 +1,47 @@