Skip to content

N
national_museum_vod
Commit 90f5592c authored by xulili's avatar xulili
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod into dev_xll

parents 3b2aa3a6 263429fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1878 additions and 170 deletions
config/index.js
View file @ 90f5592c
...@@ -12,7 +12,7 @@ module.exports = { ...@@ -12,7 +12,7 @@ module.exports = {
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
'/mall': { '/mall': {
target: "http://192.168.110.93/chnmuseum-party/", target: "http://192.168.110.67/mall/",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/mall': '/' // 重写接口 '^/mall': '/' // 重写接口
......
src/components/end/top.vue
View file @ 90f5592c
<template> <template>
<div class="header_container" style="overflow:hidden;"> <div class="header_container" style="overflow:hidden;">
<div class="headerTitle l-float">中国国家博物馆建党百年展点播院线服务平台</div>
<el-dropdown class="adminlogo r-float H100" @command="handleCommand" trigger="click"> <el-dropdown class="adminlogo r-float H100" @command="handleCommand" trigger="click">
<div class="box"> <div class="box">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
...@@ -175,6 +176,17 @@ ...@@ -175,6 +176,17 @@
width: 100%; width: 100%;
height: 63px; height: 63px;
background-color: #dd44; background-color: #dd44;
.headerTitle {
// width: 100%;
/*height: 8%;*/
height: 63px;
line-height: 63px;
// background: #002140;
font-size: 24px;
font-weight: 600;
// color: rgba(255, 255, 255, 1);
// text-align: center;
}
.header_icon{ .header_icon{
line-height:63px; line-height:63px;
margin-right:20px; margin-right:20px;
......
src/page/content/video/content/add.vue 0 → 100644
View file @ 90f5592c
<template>
<div class="addFormBox">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="180px" class="addForm">
<el-form-item label="版权方名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方有效期" required>
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item class="addTip">
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item>
<el-form-item label="请选择预设视频分类">
<el-select placeholder="请选择预设视频分类" multiple v-model="department" @change="getSelectDep">
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option
v-for="(item, index) in departments"
:label="item.label"
:value="item.label"
:key="index"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="ruleForm.desc"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
<el-button @click="resetForm('ruleForm')">取消</el-button>
</el-form-item>
</el-form>
<!--新增弹框-->
<el-dialog
title="新建视频分类"
:modal-append-to-body="false"
class="addDialog"
:visible.sync="dialogVisible"
:before-close="close"
>
<div class="form_box">
<el-form :model="classForm" ref="classForm" :rules="rules" id="ruleo" label-position="left">
<el-form-item label="视频分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="classForm.desc"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="r-float" size="mini" type="primary" @click="save">确定</el-button>
<el-button class="r-float" size="mini" @click="close">取 消</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
dialogVisible: false,
formLabelWidth: "100px",
form: {
name: ""
},
classForm: {
menuName: "",
menuUrl: "",
parentId: "",
sort: ""
},
value1: "",
ruleForm: {
name: "",
region: "",
date1: "",
date2: "",
delivery: false,
type: [],
resource: "",
desc: ""
},
departments: [
{
value: "Beijing",
label: "北京"
},
{
value: "Shanghai",
label: "上海"
},
{
value: "Nanjing",
label: "南京"
},
{
value: "Chengdu",
label: "成都"
},
{
value: "Shenzhen",
label: "深圳"
},
{
value: "Guangzhou",
label: "广州"
}
],
checkedThing: false,
department: [],
selfstyle: {
textAlign: "right",
width: "100%",
paddingRight: "10px"
},
rules: {
name: [
{ required: true, message: "请输入版权方名称", trigger: "blur" },
{ min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
],
region: [
{ required: true, message: "请选择活动区域", trigger: "change" }
],
date1: [
{
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
],
date2: [
{
type: "date",
required: true,
message: "请选择时间",
trigger: "change"
}
],
type: [
{
type: "array",
required: true,
message: "请至少选择一个活动性质",
trigger: "change"
}
],
resource: [
{ required: true, message: "请选择活动资源", trigger: "change" }
],
desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
}
};
},
methods: {
// 新建视频分类
addVideoClass() {
this.dialogVisible = true;
},
save() {
this.dialogVisible = false;
},
// 新增关闭
close() {
this.dialogVisible = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
alert("submit!");
} else {
console.log("error submit!!");
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
history.go(-1);
},
getSelectDep(department) {
// debugger
if (department.length === this.departments.length) {
this.checkedThing = true;
} else {
this.checkedThing = false;
}
},
selectAllThing() {
// debugger
this.department = [];
if (this.checkedThing) {
this.departments.map(item => {
this.department.push(item.label);
});
} else {
this.department = [];
}
}
}
};
</script>
<style lang="less">
// @import "../../../../style/common";
.addFormBox {
height: calc(100% - 40px);
width: 100%;
position: relative;
.addForm {
position: absolute;
height: 100%;
width: 600px;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
margin: 20px;
.addTip {
height:10px;
line-height: 10px;
// background: pink;
color: red;
// position:absolute;
// right:0
// float:right;
}
}
.el-dialog {
width: 360px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.2);
border-radius: 4px;
.el-dialog__header {
padding: 15px;
border-bottom: 1px solid rgba(0, 0, 0, 0.09);
}
.el-dialog__body {
padding: 0px !important;
border: 1px solid transparent;
.form_box {
padding-bottom: 40px;
.el-form {
margin-bottom: 20px;
.el-form-item {
margin: 10px 50px 20px;
.el-form-item__content {
width: 280px;
}
}
.el-input {
width: 100%;
}
}
.dialog-footer {
// border-top: 1px solid rgba(0,0,0,0.09);
padding-top: 8px;
.el-button {
margin-right: 10px;
padding: 8px 16px;
}
}
}
}
}
}
</style>
\ No newline at end of file
src/page/content/video/content/index.vue
View file @ 90f5592c
This diff is collapsed.
src/page/content/video/copyright/add.vue
View file @ 90f5592c
<template>
<div class="addFormBox">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="180px" class="addForm">
<el-form-item label="版权方名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方有效期" required>
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item class="addTip">
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item>
<el-form-item label="请选择预设视频分类">
<el-select placeholder="请选择预设视频分类" multiple v-model="department" @change="getSelectDep">
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option
v-for="(item, index) in departments"
:label="item.label"
:value="item.label"
:key="index"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="ruleForm.desc"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
<el-button @click="resetForm('ruleForm')">取消</el-button>
</el-form-item>
</el-form>
<!--新增弹框-->
<el-dialog
title="新建视频分类"
:modal-append-to-body="false"
class="addDialog"
:visible.sync="dialogVisible"
:before-close="close"
>
<div class="form_box">
<el-form :model="classForm" ref="classForm" :rules="rules" id="ruleo" label-position="left">
<el-form-item label="视频分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="classForm.desc"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="r-float" size="mini" type="primary" @click="save">确定</el-button>
<el-button class="r-float" size="mini" @click="close">取 消</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
dialogVisible: false,
formLabelWidth: "100px",
form: {
name: ""
},
classForm: {
menuName: "",
menuUrl: "",
parentId: "",
sort: ""
},
value1: "",
ruleForm: {
name: "",
region: "",
date1: "",
date2: "",
delivery: false,
type: [],
resource: "",
desc: ""
},
departments: [
{
value: "Beijing",
label: "北京"
},
{
value: "Shanghai",
label: "上海"
},
{
value: "Nanjing",
label: "南京"
},
{
value: "Chengdu",
label: "成都"
},
{
value: "Shenzhen",
label: "深圳"
},
{
value: "Guangzhou",
label: "广州"
}
],
checkedThing: false,
department: [],
selfstyle: {
textAlign: "right",
width: "100%",
paddingRight: "10px"
},
rules: {
name: [
{ required: true, message: "请输入版权方名称", trigger: "blur" },
{ min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
],
region: [
{ required: true, message: "请选择活动区域", trigger: "change" }
],
date1: [
{
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
],
date2: [
{
type: "date",
required: true,
message: "请选择时间",
trigger: "change"
}
],
type: [
{
type: "array",
required: true,
message: "请至少选择一个活动性质",
trigger: "change"
}
],
resource: [
{ required: true, message: "请选择活动资源", trigger: "change" }
],
desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
}
};
},
methods: {
// 新建视频分类
addVideoClass() {
this.dialogVisible = true;
},
save() {
this.dialogVisible = false;
},
// 新增关闭
close() {
this.dialogVisible = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
alert("submit!");
} else {
console.log("error submit!!");
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
history.go(-1);
},
getSelectDep(department) {
// debugger
if (department.length === this.departments.length) {
this.checkedThing = true;
} else {
this.checkedThing = false;
}
},
selectAllThing() {
// debugger
this.department = [];
if (this.checkedThing) {
this.departments.map(item => {
this.department.push(item.label);
});
} else {
this.department = [];
}
}
}
};
</script>
<style lang="less">
// @import "../../../../style/common";
.addFormBox {
height: calc(100% - 40px);
width: 100%;
position: relative;
.addForm {
position: absolute;
height: 100%;
width: 600px;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
margin: 20px;
.addTip {
height:10px;
line-height: 10px;
// background: pink;
color: red;
// position:absolute;
// right:0
// float:right;
}
}
.el-dialog {
width: 360px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.2);
border-radius: 4px;
.el-dialog__header {
padding: 15px;
border-bottom: 1px solid rgba(0, 0, 0, 0.09);
}
.el-dialog__body {
padding: 0px !important;
border: 1px solid transparent;
.form_box {
padding-bottom: 40px;
.el-form {
margin-bottom: 20px;
.el-form-item {
margin: 10px 50px 20px;
.el-form-item__content {
width: 280px;
}
}
.el-input {
width: 100%;
}
}
.dialog-footer {
// border-top: 1px solid rgba(0,0,0,0.09);
padding-top: 8px;
.el-button {
margin-right: 10px;
padding: 8px 16px;
}
}
}
}
}
}
</style>
\ No newline at end of file
src/page/content/video/copyright/index.vue
View file @ 90f5592c
This diff is collapsed.
src/page/end/branchesManagePage.vue
View file @ 90f5592c
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize "_size": _this.page.pageSize
}; };
for (let key in _this.form) { for (let key in _this.form) {
......
src/page/end/callHistory.vue
View file @ 90f5592c
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'currentBankId': _this.bankBranchId 'currentBankId': _this.bankBranchId
......
src/page/end/feedbackPage.vue
View file @ 90f5592c
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-button size="mini" type="primary" class="btn_form_add r-float marl20" @click="exportExcel">下载数据</el-button> <el-button size="mini" type="primary" class="btn_form_add r-float marl20" @click="exportExcel">下载数据</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-form :inline="true" :model="form" class="search-form"> <el-form :inline="true" :model="form" class="search-form">
<el-form-item label="网点归属:" v-if="roleId != 3"> <el-form-item label="网点归属:" v-if="roleId != 3">
<el-select size="mini" v-model="form.bankBranchId" placeholder="请选择网点归属" clearable filterable @change="Search"> <el-select size="mini" v-model="form.bankBranchId" placeholder="请选择网点归属" clearable filterable @change="Search">
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<el-button size="mini" type="primary" class="btn_form_add" @click="exportExcel">下载数据</el-button> <el-button size="mini" type="primary" class="btn_form_add" @click="exportExcel">下载数据</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="scrool"> <div class="scrool">
<el-table :data="tableData" stripe style="width: 100%" @row-click="openDetails"> <el-table :data="tableData" stripe style="width: 100%" @row-click="openDetails">
<el-table-column prop="lineNumber" show-overflow-tooltip label="呼叫编号"></el-table-column> <el-table-column prop="lineNumber" show-overflow-tooltip label="呼叫编号"></el-table-column>
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'currentBankId': _this.bankBranchId 'currentBankId': _this.bankBranchId
......
src/page/end/hallDirectorPage.vue
View file @ 90f5592c
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
"employName": _this.form.name, "employName": _this.form.name,
"currBankID": _this.bankBranchId, "currBankID": _this.bankBranchId,
......
src/page/end/hotProductsPage.vue
View file @ 90f5592c
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'userId': _this.userId, 'userId': _this.userId,
......
src/page/end/hotProductsRecord.vue
View file @ 90f5592c
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'currentBankId': _this.bankBranchId 'currentBankId': _this.bankBranchId
......
src/page/end/menuManagePage.vue
View file @ 90f5592c
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize "_size": _this.page.pageSize
}; };
for (let key in _this.form) { for (let key in _this.form) {
......
src/page/end/menuRouter.vue
View file @ 90f5592c
<template> <template>
<div class="container H100 W100"> <div class="container H100 W100">
<div class="aside H100 l-float"> <div class="aside H100 l-float">
<div class="logoTitle">机荟虚拟营业厅管理端</div> <!-- <div class="logoTitle">机荟虚拟营业厅管理端</div> -->
<el-menu :default-active="defaultActive" :unique-opened="true" active-background-color="#545c64" <el-menu :default-active="defaultActive" :unique-opened="true" active-background-color="#545c64"
@open="handleOpen" @close="handleClose" router > @open="handleOpen" @close="handleClose" router >
<el-menu-item v-if="item.children.length==0" v-for="item in menuList" :key="item.label" :index="item.menuUrl" <el-menu-item v-if="item.children.length==0" v-for="item in menuList" :key="item.label" :index="item.menuUrl"
......
src/page/end/permissionsManagePage.vue
View file @ 90f5592c
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize "_size": _this.page.pageSize
}; };
for (let key in _this.form) { for (let key in _this.form) {
......
src/page/end/popularActiveRecord.vue
View file @ 90f5592c
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'currentBankId': _this.bankBranchId 'currentBankId': _this.bankBranchId
......
src/page/end/popularActivitiesPage.vue
View file @ 90f5592c
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'userId': _this.userId, 'userId': _this.userId,
......
src/page/end/roleManagePage.vue
View file @ 90f5592c
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
<el-table-column label="操作" header-align="center" align="center" width="230"> <el-table-column label="操作" header-align="center" align="center" width="230">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group > <el-button-group >
<el-button title="编辑" size="mini" :disabled="scope.row.id == '1' || scope.row.id == '2'|| scope.row.id == '3'|| scope.row.id == '4'|| scope.row.id == '5'" type="text" @click="openEdit(scope.row)">编辑&nbsp;|&nbsp;</el-button> <el-button title="编辑" size="mini" type="text" @click="openEdit(scope.row)">编辑&nbsp;|&nbsp;</el-button>
<el-button title="权限分配" :disabled="scope.row.id == '1' || scope.row.id == '2'|| scope.row.id == '3'|| scope.row.id == '4'|| scope.row.id == '5'" type="text" size="mini" @click="allocate(scope.row)">权限分配&nbsp;|&nbsp;</el-button> <el-button title="权限分配" size="mini" type="text" @click="allocate(scope.row)">权限分配&nbsp;|&nbsp;</el-button>
<el-button title="菜单分配" :disabled="scope.row.id == '1' || scope.row.id == '2'|| scope.row.id == '3'|| scope.row.id == '4'|| scope.row.id == '5'" type="text" size="mini" @click="munuAllocate(scope.row)">菜单分配&nbsp;|&nbsp;</el-button> <el-button title="菜单分配" type="text" size="mini" @click="munuAllocate(scope.row)">菜单分配&nbsp;|&nbsp;</el-button>
<el-button title="删除" :disabled="scope.row.id == '1' || scope.row.id == '2'|| scope.row.id == '3'|| scope.row.id == '4'|| scope.row.id == '5'" type="text" size="mini" @click="handleDelete(scope.row)">删除 </el-button> <el-button title="删除" type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
</el-button-group> </el-button-group>
</template> </template>
</el-table-column> </el-table-column>
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
</el-pagination> </el-pagination>
</div> </div>
<!--新建弹框--> <!--新建弹框-->
<el-dialog title="新建" :visible.sync="FormVisible2" :before-close="close2"> <el-dialog title="新建" :visible.sync="FormVisible2" :before-close="close2">
<div class="form_box"> <div class="form_box">
<el-form :model="roleform" ref="roleform" :rules="rules2" > <el-form :model="roleform" ref="roleform" :rules="rules2" >
<el-form-item label="角色名称：" prop="name" :label-width="formLabelWidth"> <el-form-item label="角色名称：" prop="name" :label-width="formLabelWidth">
<el-input v-model="roleform.name" size="small" clearable auto-complete="off" placeholder="请输入您的角色名称" <el-input v-model="roleform.name" size="small" clearable auto-complete="off" placeholder="请输入您的角色名称"
onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"></el-input> onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"></el-input>
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
let _this = this; let _this = this;
_this.page.currentPage = 1; _this.page.currentPage = 1;
let param = { let param = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
"name": _this.form.name, "name": _this.form.name,
}; };
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize "_size": _this.page.pageSize
}; };
for (let key in _this.form) { for (let key in _this.form) {
......
src/page/end/serviceDirectoryPage.vue
View file @ 90f5592c
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
"roleId": _this.roleId, "roleId": _this.roleId,
"currentBankId": _this.bankBranchId "currentBankId": _this.bankBranchId
......
src/page/end/serviceGuidePage.vue
View file @ 90f5592c
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
'roleId': _this.roleId, 'roleId': _this.roleId,
'userId': _this.userId, 'userId': _this.userId,
......
src/page/end/userManagePage.vue
View file @ 90f5592c
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<el-table-column label="操作" header-align="center" align="center" width="190"> <el-table-column label="操作" header-align="center" align="center" width="190">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
<el-button title="编辑" :disabled="scope.row.id == '1'" size="mini" type="text" @click="openEdit(scope.row)">编辑&nbsp;|&nbsp;</el-button> <el-button title="编辑" size="mini" type="text" @click="openEdit(scope.row)">编辑&nbsp;|&nbsp;</el-button>
<el-button title="删除" :disabled="scope.row.id == '1'" type="text" size="mini" @click="handleDelete(scope.row)">删除&nbsp;|&nbsp;</el-button> <el-button title="删除" size="mini" type="text" @click="handleDelete(scope.row)">删除&nbsp;|&nbsp;</el-button>
<el-button title="密码重置" type="text" size="mini" @click="resetPassWord(scope.row)">密码重置</el-button> <el-button title="密码重置" type="text" size="mini" @click="resetPassWord(scope.row)">密码重置</el-button>
</el-button-group> </el-button-group>
</template> </template>
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
getSearchQuery() { getSearchQuery() {
let _this = this; let _this = this;
let searchObj = { let searchObj = {
"_index": (_this.page.currentPage - 1) * _this.page.pageSize, "_index": _this.page.currentPage,
"_size": _this.page.pageSize, "_size": _this.page.pageSize,
"employName": _this.form.name, "employName": _this.form.name,
}; };
......
src/router/index.js
View file @ 90f5592c
...@@ -39,7 +39,13 @@ const hotProductsRecord = r => require.ensure([],()=>r(require('@/page/end/hotPr ...@@ -39,7 +39,13 @@ const hotProductsRecord = r => require.ensure([],()=>r(require('@/page/end/hotPr
const popularActiveRecord = r => require.ensure([],()=>r(require('@/page/end/popularActiveRecord')),'popularActiveRecord'); const popularActiveRecord = r => require.ensure([],()=>r(require('@/page/end/popularActiveRecord')),'popularActiveRecord');
// 内容管理 // 内容管理
const videoCopyright = r => require.ensure([],()=>r(require('@/page/content/video/copyright/add')),'videoCopyright'); const videoCopyright = r => require.ensure([],()=>r(require('@/page/content/video/copyright/index')),'videoCopyright');
const videoCopyrightAdd = r => require.ensure([],()=>r(require('@/page/content/video/copyright/add')),'videoCopyrightAdd');
const videoCopyrightUpdate = r => require.ensure([],()=>r(require('@/page/content/video/copyright/add')),'videoCopyrightUpdate');
const videoContent = r => require.ensure([],()=>r(require('@/page/content/video/content/index')),'videoContent');
const videoContentAdd = r => require.ensure([],()=>r(require('@/page/content/video/content/add')),'videoContentAdd');
const videoContentUpdate = r => require.ensure([],()=>r(require('@/page/content/video/content/add')),'videoContentUpdate');
/*跳转的页面*/ /*跳转的页面*/
// 新建服务指南 // 新建服务指南
...@@ -231,6 +237,32 @@ const router = new Router({ ...@@ -231,6 +237,32 @@ const router = new Router({
name: '视频版权方管理', name: '视频版权方管理',
component: videoCopyright component: videoCopyright
}, },
{
path: '/videoCopyrightAdd',
name: '新建版权方',
component: videoCopyrightAdd
},
{
path: '/videoCopyrightUpdate',
name: '修改版权方',
component: videoCopyrightUpdate
},
{
path: '/videoContent',
name: '视频内容管理',
component: videoContent
},
{
path: '/videoContentAdd',
name: '新建视频',
component: videoContentAdd
},
{
path: '/videoContentUpdate',
name: '修改视频',
component: videoContentUpdate
},
//新建页面 //新建页面
{ {
......
src/style/common.less
View file @ 90f5592c
...@@ -95,6 +95,15 @@ div{ ...@@ -95,6 +95,15 @@ div{
box-sizing: border-box; box-sizing: border-box;
background: #fff; background: #fff;
} }
.h678{
height: 90%;
width:100%;
//min-width: 815px;
//margin: 24px 24px 0px 24px;
padding: 24px;
box-sizing: border-box;
background: #fff;
}
.el-pagination{ .el-pagination{
text-align: right; text-align: right;
...@@ -264,6 +273,19 @@ span.el-breadcrumb__separator { ...@@ -264,6 +273,19 @@ span.el-breadcrumb__separator {
margin-right: 0; margin-right: 0;
} }
} }
.el-date-editor.el-input__inner{
width: 300px;
}
.el-date-editor .el-range__icon {
line-height: 25px;
}
.el-date-editor .el-range-separator {
padding: 0 5px;
line-height: 25px;
width: 10%;
color: #303133;
}
@media (max-width: 1200px){ @media (max-width: 1200px){
.el-date-editor.el-input, .el-date-editor.el-input,
.el-date-editor.el-input__inner, .el-date-editor.el-input__inner,
......
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