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

Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-10-22 14:29:55 +08:00
parent 49b41ce8e6 30328e575d
commit 6b1fc28b4b
3 changed files with 2273 additions and 1962 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
front/public/static/config/basicConfig.js
View File

@ -1,14 +1,14 @@
/* /*
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: Light
* @LastEditTime: 2022-10-13 21:31:09 * @LastEditTime: 2022-10-22 11:08:16
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
// version: 'qingdao', //青岛 // version: 'qingdao', //青岛
version: 'xihaian', // 西海岸 version: 'dev', // 西海岸
// version: 'qingdao', // 开发 // version: 'qingdao', // 开发
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
// version: 'qingdao', // 测试 // version: 'qingdao', // 测试
@ -86,8 +86,8 @@ var CONFIGITEM = {
userPwd: '', userPwd: '',
}, },
backUrl: 'http://localhost:8001', backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.236:9796/', previewUrl: 'http://192.168.124.243:9796/',
websocketURL: '192.168.124.233:8888/renren-admin', websocketURL: '192.168.124.243:8888/renren-admin',
// websocketURL: '10.18.1.99:8889/renren-admin', // websocketURL: '10.18.1.99:8889/renren-admin',
POI_URL: POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

11
front/src/views/cimSpecialArea/components/algorithm.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-08-19 10:00:16 * @Date: 2022-08-19 10:00:16
* @LastEditors: hisense.liangjunhua * @LastEditors: Light
* @LastEditTime: 2022-08-19 15:55:05 * @LastEditTime: 2022-10-21 17:29:46
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -42,7 +42,7 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.algorithm { .algorithm {
padding: 0.7rem 1.05rem 0.5rem; padding: 0.7rem 1.05rem 0.5rem;
.header { .header {
padding-bottom: 0.15rem; padding-bottom: 0.15rem;
@ -68,6 +68,9 @@
.name { .name {
font-size: 26px; font-size: 26px;
color: #7dbbff; color: #7dbbff;
max-height: 26px;
line-height: 26px;
overflow: hidden;
} }
.img { .img {
width: 0.57rem; width: 0.57rem;
@ -83,5 +86,5 @@
margin: 0.25rem 0.17rem -0.05rem; margin: 0.25rem 0.17rem -0.05rem;
} }
} }
} }
</style> </style>

1210
front/src/views/home/infrastructurePage.vue
View File

File diff suppressed because it is too large Load Diff