From 9ca37f388cfb7a6fefaf6e46f5eb1050d445dc9d Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Mon, 20 Jun 2022 16:37:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++ back/public/index.html | 8 +++-- front/public/index.html | 17 +++++----- front/public/static/config/footerData.js | 36 +++++++++++++++++----- front/src/config/default/setting.config.js | 4 +-- 5 files changed, 48 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 18bb8fa2..6b710ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ back/dist-西海岸-后台管理.zip front/public/index.html +front/public/index.html +back/public/index.html +back/dist-西海岸-后台管理-带配置文件.zip diff --git a/back/public/index.html b/back/public/index.html index e33d81d8..59ed843e 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-13 11:21:09 + * @LastEditTime: 2022-06-20 16:20:34 * @Description: 告诉大家这是什么 --> @@ -29,7 +29,8 @@ }; // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo'; - window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表（后台返回，未做处理） window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限（后台返回，未做处理） window.SITE_CONFIG['dynamicRoutes'] = []; // 动态路由列表 @@ -70,7 +71,8 @@ // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; + // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // WebSocket地址 window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket'; diff --git a/front/public/index.html b/front/public/index.html index 3d47b153..8eaa1360 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-19 18:35:57 + * @LastEditTime: 2022-06-20 16:14:00 * @Description: 告诉大家这是什么 --> @@ -37,12 +37,15 @@ // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/'; // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/'; // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; - - - window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/'; - window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; + // 西海岸版本 + window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; + // window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/'; + // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/public/static/config/footerData.js b/front/public/static/config/footerData.js index f03e6e35..d7683c21 100644 --- a/front/public/static/config/footerData.js +++ b/front/public/static/config/footerData.js @@ -1,15 +1,35 @@ /* * @Author: zhangfeihu * @Date: 2022-06-16 16:37:31 - * @LastEditors: 851673013@qq.com 851673013@qq.com - * @LastEditTime: 2022-06-16 17:10:48 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-20 16:18:04 * @FilePath: \qiantai\front\public\static\config\footerData.js * @Description: 底部菜单数据配置配置 */ const footerDataList = { + // 市局 + // company: { + // left: '青岛市大数据发展管理局建设', + // right: '海信网络科技股份有限公司' + // }, + // address: [ + // { + // name: '鲁IC备00000000号', + // value: '政府标识码3702000106', + // }, + // { + // name: '版权所有：青岛市大数据发展管理局', + // value: '地址：山东省青岛市香港中路17号市级机关办公楼', + // }, + // { + // name: '电话：0532-8561234', + // value: '传真：0532-2145122', + // }, + // ] + // 西海岸 company: { - left: '青岛市大数据发展管理局建设', - right: '海信网络科技股份有限公司' + left: '青岛西海岸新区大数据发展促进局建设', + right: 'v0.81' }, address: [ { @@ -17,12 +37,12 @@ const footerDataList = { value: '政府标识码3702000106', }, { - name: '版权所有：青岛市大数据发展管理局', - value: '地址：山东省青岛市香港中路17号市级机关办公楼', + name: '版权所有：青岛西海岸新区大数据发展促进局', + value: '地址：青岛市西海岸新区长江中路369号', }, { - name: '电话：0532-8561234', - value: '传真：0532-2145122', + name: '电话：0532-86986596', + value: '传真：0532-86986596', }, ] } diff --git a/front/src/config/default/setting.config.js b/front/src/config/default/setting.config.js index 8c2342f0..ee70f8b7 100644 --- a/front/src/config/default/setting.config.js +++ b/front/src/config/default/setting.config.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 17:48:03 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-15 19:40:28 + * @LastEditTime: 2022-06-20 16:10:57 * @Description: 告诉大家这是什么 */ /** @@ -50,7 +50,7 @@ const setting = { //路由模式，可选值为 history 或 hash routerMode: 'hash', //不经过token校验的路由 - routesWhiteList: ['/login', '/register', '/callback', '/404', '/403'], + routesWhiteList: ['/login', '/register', '/callback', '/404', '/403', '/capabilityCloud'], // 新增统计云图白名单 //加载时显示文字 loadingText: '正在加载中...', //token名称