Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-admin-consultation
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-admin-consultation
提交
7d235dd2
提交
7d235dd2
编写于
3月 21, 2019
作者:
huangwensu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加自适应高度
上级
8a2481c3
变更
9
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
51 行增加
和
18 行删除
+51
-18
common.scss
src/style/common.scss
+2
-2
fetch.js
src/utils/fetch.js
+1
-1
mixins.js
src/utils/mixins.js
+2
-2
utils.js
src/utils/utils.js
+14
-0
blank.vue
src/views/blank.vue
+11
-2
create-component.vue
src/views/education/create-component.vue
+7
-7
item-component.vue
src/views/education/item-component.vue
+7
-2
home.vue
src/views/home.vue
+6
-1
slidebar.vue
src/views/layout/slidebar.vue
+1
-1
未找到文件。
src/style/common.scss
浏览文件 @
7d235dd2
...
@@ -125,7 +125,7 @@ html,body{
...
@@ -125,7 +125,7 @@ html,body{
.screenSet
{
.screenSet
{
// width: 163vh !important;
// width: 163vh !important;
// height: 66vh !important;
// height: 66vh !important;
height
:
430px
!
important
;
//
height: 430px !important;
margin
:
88px
30px
0px
;
margin
:
88px
30px
0px
;
overflow
:
auto
;
overflow
:
auto
;
}
}
...
@@ -134,7 +134,7 @@ html,body{
...
@@ -134,7 +134,7 @@ html,body{
.screenSet
{
.screenSet
{
// width: 166vh !important;
// width: 166vh !important;
// height: 78vh !important;
// height: 78vh !important;
height
:
800px
!
important
;
//
height: 800px !important;
overflow
:
auto
;
overflow
:
auto
;
margin
:
88px
30px
0px
;
margin
:
88px
30px
0px
;
}
}
...
...
src/utils/fetch.js
浏览文件 @
7d235dd2
...
@@ -36,7 +36,7 @@ service.interceptors.response.use(
...
@@ -36,7 +36,7 @@ service.interceptors.response.use(
baseUrl时,返回000000为成功
baseUrl时,返回000000为成功
apiUrl时,返回200为成功
apiUrl时,返回200为成功
*/
*/
if
(
res
.
code
!==
'000000'
&&
response
.
respCode
===
200
)
{
if
(
res
.
code
!==
'000000'
)
{
return
Promise
.
reject
(
'error'
)
return
Promise
.
reject
(
'error'
)
}
else
{
}
else
{
return
response
.
data
return
response
.
data
...
...
src/utils/mixins.js
浏览文件 @
7d235dd2
...
@@ -12,8 +12,8 @@ module.exports = {
...
@@ -12,8 +12,8 @@ module.exports = {
// this.token = this.getUrlSearch(location.href, 'token') || (query && query.token) || null
// this.token = this.getUrlSearch(location.href, 'token') || (query && query.token) || null
// this.token = this.getUrlKey('token') || (query && query.token) || null
// this.token = this.getUrlKey('token') || (query && query.token) || null
},
},
mounted
()
{
mounted
:
function
()
{
},
},
methods
:
{
methods
:
{
getUrlPara
(
obj
)
{
getUrlPara
(
obj
)
{
...
...
src/utils/utils.js
浏览文件 @
7d235dd2
...
@@ -4,6 +4,20 @@ export const containObject = function(...obj1) {
...
@@ -4,6 +4,20 @@ export const containObject = function(...obj1) {
let
obj
=
Object
.
assign
(...
obj1
)
let
obj
=
Object
.
assign
(...
obj1
)
return
obj
return
obj
}
}
// 获取页面自适应高度
export
function
resizeHeight
(
cMinusHeight
=
152
,
iMinuxHeight
=
210
,
refHeightId
=
'slidebar-container'
,
containerHeightId
=
'screenSet'
){
let
containerHeight
=
p_getElm
(
refHeightId
).
getBoundingClientRect
().
height
-
15
p_getElm
(
containerHeightId
).
style
.
height
=
containerHeight
-
cMinusHeight
+
'px'
window
.
onresize
=
function
()
{
containerHeight
=
p_getElm
(
refHeightId
).
getBoundingClientRect
().
height
-
15
p_getElm
(
containerHeightId
).
style
.
height
=
containerHeight
-
cMinusHeight
+
'px'
}
}
function
p_getElm
(
elmId
){
return
document
.
getElementById
(
elmId
)
}
//共通函数
//共通函数
Array
.
prototype
.
contains
=
function
(
obj
)
{
Array
.
prototype
.
contains
=
function
(
obj
)
{
if
(
this
.
length
>
0
)
{
if
(
this
.
length
>
0
)
{
...
...
src/views/blank.vue
浏览文件 @
7d235dd2
<
template
>
<
template
>
<div
class=
"blank-wrap screenSet"
>
<div
id=
"screenSet"
class=
"blank-wrap screenSet"
>
<div
class=
"blank-content"
>
<div
class=
"blank-content"
>
<img
src=
"../assets/image/no-content.png"
/>
<img
src=
"../assets/image/no-content.png"
/>
<p>
很抱歉,您暂时还没开通工作站功能
</p>
<p>
很抱歉,您暂时还没开通工作站功能
</p>
...
@@ -7,8 +7,17 @@
...
@@ -7,8 +7,17 @@
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
*
as
commonUtil
from
'../utils/utils'
export
default
{
export
default
{
data
()
{
return
{
}
},
// 挂载到Dom完成时
mounted
:
function
()
{
commonUtil
.
resizeHeight
(
100
)
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
...
...
src/views/education/create-component.vue
浏览文件 @
7d235dd2
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
:curmbThird=
"curmbThird"
:curmbThird=
"curmbThird"
:jumPathThird=
"jumPathThird"
>
:jumPathThird=
"jumPathThird"
>
</bread-crumb>
</bread-crumb>
<div
class=
"create-content screenSet"
>
<div
class=
"create-content screenSet"
id=
"screenSet"
>
<div
class=
"step-content"
>
<div
class=
"step-content"
>
<el-steps
:active=
"stepNum"
simple
>
<el-steps
:active=
"stepNum"
simple
>
<span
class=
"step-one"
:class=
"stepNum == 1 ? 'class-1' : 'class-2'"
>
1
</span>
<span
class=
"step-one"
:class=
"stepNum == 1 ? 'class-1' : 'class-2'"
>
1
</span>
...
@@ -287,15 +287,11 @@ import BreadCrumb from '../../components/breadcrumb.vue'
...
@@ -287,15 +287,11 @@ import BreadCrumb from '../../components/breadcrumb.vue'
import
{
doUpload
,
getFilePath
}
from
"../../utils/qiniu-util"
import
{
doUpload
,
getFilePath
}
from
"../../utils/qiniu-util"
import
{
validateWord150
}
from
"../../utils/validate.js"
import
{
validateWord150
}
from
"../../utils/validate.js"
import
{
mapGetters
}
from
'vuex'
import
{
mapGetters
}
from
'vuex'
import
{
openLoading
,
closeLoading
,
isNotEmptyUtils
,
isEmptyList
}
from
'../../utils/utils'
;
import
{
openLoading
,
closeLoading
,
isNotEmptyUtils
,
isEmptyList
}
from
'../../utils/utils'
import
*
as
commonUtil
from
'../../utils/utils'
let
vm
=
null
let
vm
=
null
// 判断组件是否重名
// 判断组件是否重名
let
validateRepeatWord
=
function
(
rule
,
value
,
callback
,
message
)
{
let
validateRepeatWord
=
function
(
rule
,
value
,
callback
,
message
)
{
// const reg = /^[\u4e00-\u9fa5]{2,20}$/
// if(!reg.test(value)) {
// callback(new Error(message))
// return
// }
let
req
=
{
let
req
=
{
token
:
vm
.
_token
,
token
:
vm
.
_token
,
name
:
value
,
name
:
value
,
...
@@ -468,6 +464,10 @@ export default {
...
@@ -468,6 +464,10 @@ export default {
vm
.
conditionAnd
=
vm
.
resultFlag
==
1
&&
vm
.
componentStatus
!=
3
&&
vm
.
componentStatus
!=
4
vm
.
conditionAnd
=
vm
.
resultFlag
==
1
&&
vm
.
componentStatus
!=
3
&&
vm
.
componentStatus
!=
4
}
}
},
},
// 挂载到Dom完成时
mounted
:
function
()
{
commonUtil
.
resizeHeight
()
},
methods
:
{
methods
:
{
// 根据ID查询组件基本信息
// 根据ID查询组件基本信息
componentBasicInfo
()
{
componentBasicInfo
()
{
...
...
src/views/education/item-component.vue
浏览文件 @
7d235dd2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
:curmbFirst=
"curmbFirst"
:curmbFirst=
"curmbFirst"
:curmbSecond=
"curmbSecond"
>
:curmbSecond=
"curmbSecond"
>
</bread-crumb>
</bread-crumb>
<div
class=
"component-content screenSet"
>
<div
class=
"component-content screenSet"
id=
"screenSet"
>
<div
class=
"search-title"
>
查询条件
</div>
<div
class=
"search-title"
>
查询条件
</div>
<el-row
:gutter=
"30"
class=
"row"
type=
"flex"
style=
"margin-top: 10px;"
>
<el-row
:gutter=
"30"
class=
"row"
type=
"flex"
style=
"margin-top: 10px;"
>
<el-form
ref=
"serchForm"
:model=
"searchParam"
label-width=
"75px"
style=
"width:100%;"
>
<el-form
ref=
"serchForm"
:model=
"searchParam"
label-width=
"75px"
style=
"width:100%;"
>
...
@@ -81,7 +81,8 @@ import BreadCrumb from '../../components/breadcrumb.vue'
...
@@ -81,7 +81,8 @@ import BreadCrumb from '../../components/breadcrumb.vue'
import
{
doUpload
,
getFilePath
}
from
"../../utils/qiniu-util"
import
{
doUpload
,
getFilePath
}
from
"../../utils/qiniu-util"
import
{
validateWord
}
from
"../../utils/validate.js"
import
{
validateWord
}
from
"../../utils/validate.js"
import
{
mapGetters
}
from
'vuex'
import
{
mapGetters
}
from
'vuex'
import
{
openLoading
,
closeLoading
}
from
'../../utils/utils'
;
import
{
openLoading
,
closeLoading
}
from
'../../utils/utils'
import
*
as
commonUtil
from
'../../utils/utils'
let
vm
=
null
let
vm
=
null
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -141,6 +142,10 @@ export default {
...
@@ -141,6 +142,10 @@ export default {
vm
=
this
vm
=
this
vm
.
search
()
vm
.
search
()
},
},
// 挂载到Dom完成时
mounted
:
function
()
{
commonUtil
.
resizeHeight
()
},
methods
:
{
methods
:
{
// 列表查询
// 列表查询
search
()
{
search
()
{
...
...
src/views/home.vue
浏览文件 @
7d235dd2
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
</el-table>
</el-table>
</div>
</div>
</el-col>
</el-col>
<el-col
class=
"message screenSet"
:span=
"24"
>
<el-col
class=
"message screenSet"
:span=
"24"
id=
"screenSet"
>
<div
class=
"message-title"
>
系统消息
<span>
今日消息:
{{
count
}}
条
</span></div>
<div
class=
"message-title"
>
系统消息
<span>
今日消息:
{{
count
}}
条
</span></div>
<div
class=
"message-info"
v-if=
"messageList.length > 0"
>
<div
class=
"message-info"
v-if=
"messageList.length > 0"
>
<div
class=
"message-item"
v-for=
"(item,index) in messageList"
:key=
"index"
>
<div
class=
"message-item"
v-for=
"(item,index) in messageList"
:key=
"index"
>
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
import
BreadCrumb
from
'../components/breadcrumb.vue'
import
BreadCrumb
from
'../components/breadcrumb.vue'
import
{
setTimeout
,
setInterval
}
from
'timers'
import
{
setTimeout
,
setInterval
}
from
'timers'
import
{
mapGetters
}
from
'vuex'
import
{
mapGetters
}
from
'vuex'
import
*
as
commonUtil
from
'../utils/utils'
let
vm
=
null
let
vm
=
null
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -71,6 +72,10 @@ export default {
...
@@ -71,6 +72,10 @@ export default {
'_token'
'_token'
])
])
},
},
// 挂载到Dom完成时
mounted
:
function
()
{
commonUtil
.
resizeHeight
()
},
methods
:
{
methods
:
{
// 查看更多
// 查看更多
lookMore
()
{
lookMore
()
{
...
...
src/views/layout/slidebar.vue
浏览文件 @
7d235dd2
<
template
>
<
template
>
<div
class=
"slidebar-container"
>
<div
id=
"slidebar-container"
class=
"slidebar-container"
>
<el-menu
:default-active=
"onRoutes"
class=
"el-menu-vertical-demo"
theme=
"dark"
unique-opened
router
>
<el-menu
:default-active=
"onRoutes"
class=
"el-menu-vertical-demo"
theme=
"dark"
unique-opened
router
>
<template
v-for=
"(item,_index) in items"
>
<template
v-for=
"(item,_index) in items"
>
<template
v-if=
"item.subs"
>
<template
v-if=
"item.subs"
>
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录