Skip to content

N
national_museum_vod
Commit 717589fb authored by xulili's avatar xulili
Browse files
Options

Merge branch 'dev_xll' into 'master' 

Dev xll

See merge request !14
parents aa1aa971 3cb268bd
Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 167 deletions
src/config/menu.js
View file @ 717589fb
...@@ -62,14 +62,14 @@ export const menuList = [ ...@@ -62,14 +62,14 @@ export const menuList = [
children: [ children: [
{ name: '视频审核', icon: 'icon-video', color: 'index-blue', url: '/checkVideo' }, { name: '视频审核', icon: 'icon-video', color: 'index-blue', url: '/checkVideo' },
{ name: '展板审核', icon: 'icon-screen', color: 'index-green', url: '/checkDisplay' }, { name: '展板审核', icon: 'icon-screen', color: 'index-green', url: '/checkDisplay' },
{ name: '平台学习内容审核', icon: 'icon-magnifier', color: 'index-pink', url: '/checkLearn' }, { name: '学习内容审核', icon: 'icon-magnifier', color: 'index-pink', url: '/checkLearn' },
{ name: '账号禁用审核', icon: 'icon-disable', color: 'index-red', url: '/checkLearn' } { name: '账号禁用审核', icon: 'icon-disable', color: 'index-red', url: '/checkLearn' }
] ]
} }
] ]
}, },
{ {
title: '单位用户管理', name: '单位用户管理',
icon: 'icon-headUser', icon: 'icon-headUser',
avatar: 'user_head_picture.png', avatar: 'user_head_picture.png',
color: '', color: '',
...@@ -82,7 +82,7 @@ export const menuList = [ ...@@ -82,7 +82,7 @@ export const menuList = [
color: '', color: '',
url: '', url: '',
children: [ children: [
{ label: '互动管理', icon: 'icon-interaction', color: 'index-purple', url: '/interactive' } { name: '互动管理', icon: 'icon-interaction', color: 'index-purple', url: '/interactive' }
] ]
}, },
{ {
...@@ -92,7 +92,7 @@ export const menuList = [ ...@@ -92,7 +92,7 @@ export const menuList = [
color: '', color: '',
url: '', url: '',
children: [ children: [
{ label: '账号管理', icon: 'icon-account', color: 'index-blue', url: '/unitAdmin' } { name: '账号管理', icon: 'icon-account', color: 'index-blue', url: '/unitAdmin' }
] ]
} }
] ]
...@@ -135,7 +135,7 @@ export const menuList = [ ...@@ -135,7 +135,7 @@ export const menuList = [
avatar: 'statistics_head_picture.png', avatar: 'statistics_head_picture.png',
color: '', color: '',
url: '', url: '',
menu: [ children: [
{ {
name: '统计图表', name: '统计图表',
icon: '', icon: '',
...@@ -166,7 +166,7 @@ export const menuList = [ ...@@ -166,7 +166,7 @@ export const menuList = [
avatar: 'system_head_picture.png', avatar: 'system_head_picture.png',
color: '', color: '',
url: '', url: '',
menu: [ children: [
{ {
name: '机构及信息管理', name: '机构及信息管理',
icon: '', icon: '',
......
src/page/accounts/statistical.vue
View file @ 717589fb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-form :inline="true" :model="form"> <el-form :inline="true" :model="form">
<el-form-item> <el-form-item>
<el-input <el-input
v-model="form.user" v-model="form.userName"
placeholder="请输入用户名" placeholder="请输入用户名"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
></el-input> ></el-input>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
clearable clearable
> >
<el-option <el-option
v-for="item in options" v-for="item in statusOption"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -33,93 +33,236 @@ ...@@ -33,93 +33,236 @@
</el-form> </el-form>
<div class="page-tip"> <div class="page-tip">
<span class="page-tip-title">页面说明:</span> <span class="page-tip-title">页面说明:</span>
<span class="page-tips">可按按照用户名及账号状态进行信息筛选。可新增统计账号，“*”为必填项。</span> <span class="page-tips"
>可按按照用户名及账号状态进行信息筛选。可新增统计账号，“*”为必填项。</span
>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
<div class="btn-group"> <div class="btn-group">
<el-button type="primary">新建统计账户</el-button> <el-button type="primary">新建统计账户</el-button>
</div> </div>
<!-- <party-table :feildList="feildList" :list="list"></party-table> -->
<account-table <account-table
:feildList="feildList" :feildList="feildList"
:list="list" :list="list"
@action="handleAction" @action="handleAction"
/> />
<party-pagination/> <party-pagination :page="page" @changePage="handleChangeCurrent" />
</div> </div>
<!-- <user-dialog/> -->
</div> </div>
</template> </template>
<script> <script>
import { partyPagination } from '@/components/index' import { partyPagination } from "@/components/index";
import accountTable from './components/accountTable' import accountTable from "./components/accountTable";
// import userDialog from './userDialog/index' import msgDialog from "./msgDialog.vue";
export default { export default {
data(){ data() {
return{ return {
form:{ form: {
user:'', userName: "",
status:'' status: "",
}, type: 5, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
addForm:{ },
statusOption: [
}, { label: "活跃", value: 1 },
options:[ { label: "禁用", value: 2 },
{label:'待激活',value:0}, { label: "待审核", value: 3 },
{label:'活跃',value:1},
{label:'禁用待审核',value:2},
{label:'禁用',value:3},
], ],
feildList:[ feildList: [
{prop:'username',label:'平台用户名'}, { prop: "username", label: "统计用户名" },
{prop:'org',label:'所在机构'}, { prop: "org", label: "所属单位" },
{prop:'endTime',label:'到期时间'}, { prop: "exiredDate", label: "到期时间" },
{prop:'type',label:'账号类型'}, { prop: "statusName", label: "账号状态" },
{prop:'status',label:'账号状态'}, { prop: "", label: "操作", isEdit: true, width: 280 },
{prop:'',label:'操作',isEdit:true, width:280},
], ],
list: [ list: [],
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, page: {
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, _index: 1,
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, _size: 10,
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, total: 0,
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, },
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, activeRow: {},
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, msgInfo: {},
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, };
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, },
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, components: {
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, partyPagination,
{ username: '丁晓晓', org:'北京市政府',type:'系统管理员',endTime:'永久有效', status:'活跃'}, accountTable,
] // addDialog,
// editDialog,
msgDialog,
},
mounted() {
this.getFirstPageList();
},
methods: {
handleSubmit() {
this.getFirstPageList();
},
handleReset() {
this.form.userName = "";
this.form.user = "";
this.getFirstPageList();
},
getFirstPageList() {
this.page._index = 1;
this.getPageList();
},
getPageList() {
let requestParams = {};
requestParams._index = this.page._index;
requestParams._size = this.page._size;
requestParams.type = this.form.type;
if (this.form.userName) {
requestParams.userName = this.form.userName;
} }
if (this.form.status) {
requestParams.status = this.form.status;
}
this.$https(
{
method: "get",
url: "tUser/getPageList",
authType: this.backToken,
},
requestParams
)
.then((res) => {
if (res.status != 200) {
this.getResWithOutData();
} else {
if (res.data.resultCode == 200) {
this.list = res.data.data.records;
this.page._size = res.data.data.size;
this.page.total = res.data.data.total;
} else {
this.getResWithOutData();
}
}
})
.catch((err) => {
console.log(err);
});
}, },
components:{ partyPagination, accountTable}, // 新增账号
mounted(){ handleAdd() {
this.$refs.addDialog.dialogVisible = true;
}, },
methods:{ // 编辑
handleSubmit(){ handleEdit() {
this.$refs.editDialog.id = this.activeRow.id;
this.$refs.editDialog.getDetailById();
this.$refs.editDialog.dialogVisible = true;
}, },
handleReset(){ // 重置密码
this.form.user = '' handleResetPwd() {
let _this = this;
this.$https({
method: "put",
url: `tUser/resetPassword?userId=${this.activeRow.id}`,
authType: this.backToken,
})
.then((res) => {
if (res.status != 200) {
_this.$message.error(res.data.message);
} else {
if (res.data.resultCode == 200) {
_this.msgInfo = {
type: "success",
des: `用户${this.activeRow.userName}密码已重置！`,
};
_this.$refs.msgDilaog.dialogVisible = true;
} else {
_this.$message.error(res.data.message);
}
}
})
.catch((err) => {
console.log(err);
});
}, },
// 弹窗关闭 // 禁用
handleClose(){ handleDisable() {
this.$confirm('确认关闭？') let _this = this;
.then(_ => { this.$https({
done(); method: "put",
url: `tUser/disable?userId=${this.activeRow.id}`,
authType: this.backToken,
})
.then((res) => {
if (res.status != 200) {
_this.$message.error(res.data.message);
} else {
if (res.data.resultCode == 200) {
_this.msgInfo = {
type: "wait",
des: `${this.activeRow.userName}账号禁用申请已提交，待审核…`,
};
_this.$refs.msgDilaog.dialogVisible = true;
_this.getPageList();
} else {
_this.$message.error(res.data.message);
}
}
}) })
.catch(_ => {}); .catch((err) => {
console.log(err);
});
}, },
handleAction(params){ // 激活
console.log(params.type) handleActive() {
let _this = this;
this.$https({
method: "put",
url: `tUser/disable?userId=${this.activeRow.id}`,
authType: this.backToken,
})
.then((res) => {
if (res.status != 200) {
_this.$message.error(res.data.message);
} else {
if (res.data.resultCode == 200) {
_this.msgInfo = {
type: "success",
des: `用户${this.activeRow.userName}账号激活成功！`,
};
_this.$refs.msgDilaog.dialogVisible = true;
_this.getPageList();
} else {
this.$message.error(res.data.message);
}
} }
})
.catch((err) => {
console.log(err);
});
},
handleAction(params) {
this.activeRow = params.row;
switch (params.type) {
case "enable":
this.handleActive();
break;
case "disable":
this.handleDisable();
break;
case "reset":
this.handleResetPwd();
break;
case "edit":
this.handleEdit();
break;
default:
break;
} }
} },
// 翻页
handleChangeCurrent() {
this.page._index = val;
this.getPageList();
},
},
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
</style> </style>
\ No newline at end of file
src/page/accounts/users.vue
View file @ 717589fb
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
return { return {
form: { form: {
userName: "", userName: "",
type: 1, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 type: 1, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
}, },
feildList: [ feildList: [
{ prop: "userName", label: "平台用户名" }, { prop: "userName", label: "平台用户名" },
......
src/page/index/index.vue
View file @ 717589fb
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
<span class="panel-box-sub-title_name">{{subItem.name}}</span> <span class="panel-box-sub-title_name">{{subItem.name}}</span>
</div> </div>
<ul > <ul >
<li v-for="(menu,mIndex) in subItem.children" :key="mIndex" @click="goPage(menu.url)" :class="menu.color"> <li v-for="(menu,mIndex) in subItem.children" :key="mIndex" @click="goPage(menu.url)" >
<div :class="menu.color" class="icon-div">
<i :class="menu.icon" class="icon-memu"></i> <i :class="menu.icon" class="icon-memu"></i>
</div>
<span class="menu-label">{{menu.name}}</span> <span class="menu-label">{{menu.name}}</span>
</li> </li>
</ul> </ul>
...@@ -54,37 +55,13 @@ export default{ ...@@ -54,37 +55,13 @@ export default{
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/style/menu.less'; @import '~@/style/menu.less';
@media screen and (max-width: 1440px) { @media screen and (max-width: 1440px) {
.index-container{ .index-container{ width: 100%; }
width: 100%;
}
.panel-sub-box ul li{
padding:1.25vw 10px;
.menu-label{
font-size: 14px;
}
}
} }
@media (min-width:1441px) and (max-width:1680px) { @media (min-width:1441px) and (max-width:1680px) {
.index-container{ .index-container{ width: 96%; }
width: 96%;
}
.panel-sub-box ul li{
padding:1.25vw 20px;
.menu-label{
font-size: 14px;
}
}
} }
@media (min-width:1681px){ @media (min-width:1681px){
.index-container{ .index-container{ width: 92%; }
width: 92%;
}
.panel-sub-box ul li{
padding:1.25vw;
.menu-label{
font-size: 16px;
}
}
} }
.index-container{ .index-container{
margin: 0 auto; margin: 0 auto;
...@@ -163,6 +140,7 @@ export default{ ...@@ -163,6 +140,7 @@ export default{
ul{ ul{
display: flex; display: flex;
padding-top: 20px; padding-top: 20px;
margin-left: -20px;
li{ li{
width: 6.67vw; width: 6.67vw;
height:8.33vw ; height:8.33vw ;
...@@ -171,26 +149,22 @@ export default{ ...@@ -171,26 +149,22 @@ export default{
text-align: center; text-align: center;
border-radius: 8px; border-radius: 8px;
color: @font-color; color: @font-color;
cursor: pointer;
&:not(:first-child){ &:not(:first-child){
margin-left: 20px; margin-left: 20px;
} }
&.active,&:hover{ .icon-div{
background: @party-red; padding-top: 0.94vw;
box-shadow: 0 8px 4px -4px rgba(155,30,35,0.40); height: 4.79vw;
border-radius: 8px; width: 4.79vw;
border-radius: 8px; border-radius: 16px;
color: @party-white; margin: 0 auto 0.8vw ;
cursor: pointer;
color:@party-white;
} }
.icon-memu{ .icon-memu{
display: block; display: block;
width: 2.08vw; margin: 0 auto;
height: 2.08vw; width: 2.91vw;
border-radius:50%; height: 2.91vw;
margin: 0 auto 0.83vw;
background-image: linear-gradient(180deg, #FFF7E8 0%, #FFEDCC 100%);
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.20);
} }
.menu-label{ .menu-label{
line-height: 24px; line-height: 24px;
......
src/style/menu.less
View file @ 717589fb
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
@party-pink:#CF6BA4; @party-pink:#CF6BA4;
@party-blue:#5E8DE5; @party-blue:#5E8DE5;
@party-green:#3DD0C6; @party-green:#3DD0C6;
@colors: purple, pink, blue, green,red; @party-red:#B93838;
@colors: @party-purple, @party-pink, @party-blue, @party-green,@party-red;
@colorName:-purple,-pink,-blue,-green,-red;
@iconList:headContent,copyrights,classify,content,plane, @iconList:headContent,copyrights,classify,content,plane,
pen,data,headAudit,video,screen,magnifier,disable,headUser,interaction, pen,data,headAudit,video,screen,magnifier,disable,headUser,interaction,
account,headStb,radio,message,gear,appversion,interface,headStatistics,overview,tend, account,headStb,radio,message,gear,appversion,interface,headStatistics,overview,tend,
...@@ -16,9 +18,8 @@ ...@@ -16,9 +18,8 @@
} }
}); });
each(@colors, { each(@colorName, {
// .index-@{value}{ .index@{value}{
// background-color: @{party-@{value}} background-color: extract(@colors, @index);
// } }
}); });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment