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

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

This commit is contained in:
a0049873 2022-12-02 17:45:52 +08:00
parent dc2fe63682 cf1f925192
commit 6423153f5c
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-29 11:21:41
* @LastEditTime: 2022-12-02 16:52:28
* @Description: 系统静态参数配置
*/
var _global = {}
@ -68,7 +68,7 @@ var CONFIGITEM = {
// cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
},
backUrl: 'http://10.134.135.9:9797',
apiURL: 'http://10.134.135.92:8888/renren-admin',
apiURL: 'http://10.134.135.9:8888/renren-admin',
// apiURL: 'http://192.168.124.233:8888/ucs-admin',
// previewUrl: 'http://10.134.135.9:9796/',
// websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境

4
front/public/static/css/modal.css
View File

@ -86,6 +86,10 @@ z-index: 10010!important;
.ant-popconfirm {
z-index: 10010!important;
}
.ant-tooltip{
z-index: 10010!important;
}
.model-container .confirmChrome {
width: 140px;
height: 36px;

8
front/src/views/home/components/ApplicationTopDetails.vue
View File

@ -42,11 +42,11 @@
{{ props.dataList.description }}
</div>
</a-tooltip> -->
<div class="bottomdesc" v-if="props.dataList.description.length < 200">
<div class="bottomdesc" v-if="(props.dataList.description.length < 183)">
场景描述： {{ props.dataList.description || '--' }}
</div>
<div class="bottomdesc" v-else-if="dowmOrUp === '展开>>'">
场景描述： {{ props.dataList.description.slice(0, 200) }}...
场景描述： {{ props.dataList.description.slice(0, 183) }}...
<span
style="cursor: pointer; color: rgb(241 211 112)"
@click="showDetail(dowmOrUp)"
@ -351,12 +351,12 @@ watch(
-webkit-box-orient: vertical;
word-break: break-all;
width: 800px;
font-size: 14px;
font-size: 16px;
}
.bottomdesc1 {
overflow: auto;
width: 800px;
font-size: 14px;
font-size: 16px;
height: 200px;
}
margin-top: 0.2rem;

2
front/src/views/home/components/header.vue
View File

@ -469,7 +469,7 @@
// padding: 0 1rem;
background-color: rgba(0, 0, 25, 0.7);
position: fixed;
z-index: 10010;
z-index: 10012;
top: 0;
div {