Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
提交
打开侧边栏
com.pica.cloud.education.frontend
pica.cloud.web-education-admin
提交
58deb30e
提交
58deb30e
编写于
3月 30, 2019
作者:
zhentian.jia
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
idType string
上级
e7ae369a
变更
2
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
12 行增加
和
10 行删除
+12
-10
operation.js
src/utils/operation.js
+1
-1
add-manager.vue
src/views/education/add-manager.vue
+11
-9
未找到文件。
src/utils/operation.js
浏览文件 @
58deb30e
...
@@ -40,7 +40,7 @@ export function getIdList(data) {
...
@@ -40,7 +40,7 @@ export function getIdList(data) {
}
}
//区域
//区域
export
function
getDivision
(
data
)
{
export
function
getDivision
(
data
)
{
if
(
data
===
null
)
{
if
(
data
===
null
||
data
==
'NaN'
)
{
let
empty
=
[];
let
empty
=
[];
return
empty
;
return
empty
;
}
}
...
...
src/views/education/add-manager.vue
浏览文件 @
58deb30e
...
@@ -145,6 +145,7 @@
...
@@ -145,6 +145,7 @@
width=
"100"
width=
"100"
controls
controls
class=
"bg-video"
class=
"bg-video"
@
mouseover
.
stop=
"imgMouseOver2=true"
>
>
<source
:src=
"formData.attachmentUrl2"
type=
"video/mp4"
>
浏览器不支持mp4
<source
:src=
"formData.attachmentUrl2"
type=
"video/mp4"
>
浏览器不支持mp4
</video>
</video>
...
@@ -193,7 +194,7 @@
...
@@ -193,7 +194,7 @@
</div>
</div>
<div
class=
"second-step"
v-else-if=
"active === 1"
>
<div
class=
"second-step"
v-else-if=
"active === 1"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClickTabs"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClickTabs"
>
<el-tab-pane
v-if=
"idType !=
=
2"
label=
"设定行政范围"
name=
"first"
>
<el-tab-pane
v-if=
"idType != 2"
label=
"设定行政范围"
name=
"first"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
class=
"rim"
:span=
"12"
>
<el-col
class=
"rim"
:span=
"12"
>
<!--
<!--
...
@@ -242,7 +243,7 @@
...
@@ -242,7 +243,7 @@
size=
"mini"
size=
"mini"
v-model=
"formOrganization.administrativeId"
v-model=
"formOrganization.administrativeId"
placeholder=
"全部地区"
placeholder=
"全部地区"
v-if=
"idType !=
=
2"
v-if=
"idType != 2"
>
>
<el-option
<el-option
v-for=
"item in organizationRegion"
v-for=
"item in organizationRegion"
...
@@ -252,7 +253,7 @@
...
@@ -252,7 +253,7 @@
></el-option>
></el-option>
</el-select>
-->
</el-select>
-->
<el-cascader
<el-cascader
v-if=
"idType !=
=
2"
v-if=
"idType != 2"
size=
"mini"
size=
"mini"
expand-trigger=
"hover"
expand-trigger=
"hover"
:options=
"organizationRegion"
:options=
"organizationRegion"
...
@@ -768,7 +769,7 @@ export default {
...
@@ -768,7 +769,7 @@ export default {
this
.
getComponentInfo
();
this
.
getComponentInfo
();
//this.editManager();
//this.editManager();
vm
.
idType
=
localStorage
.
getItem
(
'storageIdType'
);
vm
.
idType
=
localStorage
.
getItem
(
'storageIdType'
);
console
.
log
(
'this.idType:'
+
vm
.
idType
);
console
.
log
(
'this.idType:'
+
vm
.
idType
);
if
(
vm
.
idType
==
2
)
{
if
(
vm
.
idType
==
2
)
{
this
.
activeName
=
"second"
;
this
.
activeName
=
"second"
;
}
}
...
@@ -1171,7 +1172,7 @@ export default {
...
@@ -1171,7 +1172,7 @@ export default {
vm
.
uploadImgMessage2
=
false
;
vm
.
uploadImgMessage2
=
false
;
}
}
//console.log("判断移动" + removeState);
//console.log("判断移动" + removeState);
if
(
removeState
===
true
)
{
if
(
removeState
===
true
&&
vm
.
formData
.
attachmentUrl1
!=
''
&&
vm
.
formData
.
attachmentUrl2
!=
''
)
{
//校验名字
//校验名字
let
projectId
=
vm
.
getUrlSearch
(
window
.
location
.
href
,
"projectId"
);
let
projectId
=
vm
.
getUrlSearch
(
window
.
location
.
href
,
"projectId"
);
if
(
projectId
==
null
)
{
if
(
projectId
==
null
)
{
...
@@ -1395,6 +1396,7 @@ export default {
...
@@ -1395,6 +1396,7 @@ export default {
).
then
(
function
(
path
)
{
).
then
(
function
(
path
)
{
closeLoading
(
vm
);
closeLoading
(
vm
);
console
.
log
(
path
);
console
.
log
(
path
);
vm
.
uploadImgMessage2
=
false
;
vm
.
formData
.
attachmentUrl2
=
path
.
fullPath
;
vm
.
formData
.
attachmentUrl2
=
path
.
fullPath
;
vm
.
$message
.
success
(
"上传成功"
);
vm
.
$message
.
success
(
"上传成功"
);
});
});
...
@@ -1484,7 +1486,7 @@ export default {
...
@@ -1484,7 +1486,7 @@ export default {
}
else
{
}
else
{
//编辑
//编辑
this
.
listLevels
();
this
.
listLevels
();
if
(
this
.
idType
!=
=
2
)
{
if
(
this
.
idType
!=
2
)
{
this
.
getAdministrative
();
this
.
getAdministrative
();
}
else
{
}
else
{
this
.
activeName
=
"second"
;
this
.
activeName
=
"second"
;
...
@@ -1880,7 +1882,7 @@ export default {
...
@@ -1880,7 +1882,7 @@ export default {
kind
=
3
;
kind
=
3
;
}
}
//console.log('this.idTypeProject',this.idTypeProject);
//console.log('this.idTypeProject',this.idTypeProject);
if
(
this
.
idTypeProject
==
=
2
&&
this
.
tagsRegion
.
length
==
0
)
{
if
(
this
.
idTypeProject
==
2
&&
this
.
tagsRegion
.
length
==
0
)
{
kind
=
0
;
kind
=
0
;
}
}
}
else
if
(
type
==
"administrativeScope"
)
{
}
else
if
(
type
==
"administrativeScope"
)
{
...
@@ -1888,7 +1890,7 @@ export default {
...
@@ -1888,7 +1890,7 @@ export default {
if
(
this
.
tagsRegion
.
length
>
0
)
{
if
(
this
.
tagsRegion
.
length
>
0
)
{
kind
=
3
;
kind
=
3
;
}
}
if
(
this
.
idTypeProject
==
=
2
&&
this
.
tagsRegion
.
length
==
0
)
{
if
(
this
.
idTypeProject
==
2
&&
this
.
tagsRegion
.
length
==
0
)
{
kind
=
0
;
kind
=
0
;
}
}
}
else
if
(
type
==
"organization"
)
{
}
else
if
(
type
==
"organization"
)
{
...
@@ -2669,7 +2671,7 @@ export default {
...
@@ -2669,7 +2671,7 @@ export default {
}
}
.bg-video
{
.bg-video
{
float
:
left
;
float
:
left
;
width
:
100
px
;
width
:
84
px
;
height
:
100px
;
height
:
100px
;
}
}
.limit-text
{
.limit-text
{
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录