wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

省厅修改

This commit is contained in:
wuhongjian 2022-11-01 15:36:50 +08:00
parent abc8bf3dd5
commit c6c2fa57cc
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
back/public/config/basicConfig.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49 * @Date: 2022-08-25 14:37:49
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-31 14:22:11 * @LastEditTime: 2022-11-01 09:22:02
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
var _global = {} var _global = {}
@ -17,34 +17,34 @@ var CONFIGITEM = {
// 青岛市大数据局 // 青岛市大数据局
qingdao: { qingdao: {
previewUrl: 'http://15.72.183.90:7008/', previewUrl: 'http://15.72.183.90:7008/',
apiURL: 'http://15.72.183.90:8000/renren-admin', apiURL: 'http://15.72.183.90:8000/ucs-admin',
websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket' websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
}, },
// 西海岸大数据局 // 西海岸大数据局
xihaian: { xihaian: {
previewUrl: 'http://10.134.135.9:9796/', previewUrl: 'http://10.134.135.9:9796/',
// apiURL: 'http://10.134.135.9:8888/renren-admin', // apiURL: 'http://10.134.135.9:8888/ucs-admin',
// apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发 // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
apiURL: 'http://192.168.124.236:8888/renren-admin', apiURL: 'http://192.168.124.236:8888/ucs-admin',
// apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄 // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket' websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
}, },
// 测试 // 测试
test: { test: {
previewUrl: 'http://192.168.124.243:9796/', previewUrl: 'http://192.168.124.243:9796/',
apiURL: 'http://192.168.124.243:8888/renren-admin', apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket' websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
}, },
// 内网穿透 // 内网穿透
frp: { frp: {
previewUrl: 'http://124.222.94.39:9796/', previewUrl: 'http://124.222.94.39:9796/',
apiURL: 'http://124.222.94.39:8888/renren-admin', apiURL: 'http://124.222.94.39:8888/ucs-admin',
websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket' websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
}, },
dev: { dev: {
previewUrl: 'http://localhost:8080/', previewUrl: 'http://localhost:8080/',
apiURL: 'http://192.168.124.243:8888/renren-admin', apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: 'ws://192.168.243.243:8888/renren-admin/websocket' websocketURL: 'ws://192.168.243.243:8888/ucs-admin/websocket'
} }
} }
} }

2
back/src/utils/request.js
View File

@ -14,7 +14,7 @@ import isPlainObject from 'lodash/isPlainObject'
const http = axios.create({ const http = axios.create({
baseURL: window.SITE_CONFIG.apiURL, baseURL: window.SITE_CONFIG.apiURL,
// baseURL: 'http://15.2.21.238:8888/renren-admin/', // baseURL: 'http://15.2.21.238:8888/ucs-admin/',
timeout: 1000 * 180, timeout: 1000 * 180,
withCredentials: true withCredentials: true
}) })

6
back/src/views/modules/sys/log-data-modification-log.vue
View File

@ -52,15 +52,15 @@
> >
<el-option <el-option
label="增加" label="增加"
value="/renren-admin/resource%/insert" value="/ucs-admin/resource%/insert"
></el-option> ></el-option>
<el-option <el-option
label="更新" label="更新"
value="/renren-admin/resource%/update" value="/ucs-admin/resource%/update"
></el-option> ></el-option>
<el-option <el-option
label="删除" label="删除"
value="/renren-admin/resource%/delete" value="/ucs-admin/resource%/delete"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

2
front/src/api/file.js
View File

@ -128,7 +128,7 @@ export function initiateMeet(data) {
// data: data, // data: data,
// }) // })
return axios.post( return axios.post(
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet', 'http://10.134.135.92:8888/ucs-admin/enke/initiateMeet',
data, data,
config2 config2
) )

6
front/src/config/default/setting.config.js
View File

@ -23,9 +23,9 @@ const setting = {
// baseURL: 'mock-server', // baseURL: 'mock-server',
// 请求接口 // 请求接口
// 丁港 // 丁港
baseURL: 'http://15.72.183.90:8000/renren-admin', baseURL: 'http://15.72.183.90:8000/ucs-admin',
// : 'http://15.2.21.238:8888/renren-admin/', // : 'http://15.2.21.238:8888/ucs-admin/',
// 'http://15.72.183.90:8000/renren-admin', // 'http://15.72.183.90:8000/ucs-admin',
// 黄工 // 黄工
// baseURL: // baseURL:
// process.env.NODE_ENV === 'development' // process.env.NODE_ENV === 'development'

4
front/vue.config.js
View File

@ -74,12 +74,12 @@ module.exports = {
// // }, // // },
// // 注释掉的地方是前端配置代理访问后端的示例 // // 注释掉的地方是前端配置代理访问后端的示例
// proxy: { // proxy: {
// '/renren-admin': { // '/ucs-admin': {
// target: `http://15.2.21.238:8888`, // target: `http://15.2.21.238:8888`,
// // ws: true, // // ws: true,
// changeOrigin: true, // changeOrigin: true,
// // pathRewrite: { // // pathRewrite: {
// // '^/': '/renren-admin/', // // '^/': '/ucs-admin/',
// // }, // // },
// }, // },
// }, // },