Skip to content

N
national_museum_vod
Commit 78a5d931 authored by qzhxx's avatar qzhxx
Browse files
Options

视频管理

parents e6d6d4b0 3c00a481
Hide whitespace changes
Inline Side-by-side
Showing with 842 additions and 795 deletions
src/config/area.js
View file @ 78a5d931
......@@ -3,7 +3,8 @@ let getAreas = function(){
return new Promise((resolve, reject)=>{
httpServer({
method: 'get',
url: 'organ/getAreaTree'
url: 'organ/getAreaTree',
authType: "back"
}).then(res=>{
if(res.status != 200){
resolve([])
......
src/page/STB/appversion/components/addDialog.vue
View file @ 78a5d931
......@@ -160,7 +160,6 @@ export default {
</script>
<style lang="less">
@import "~@/style/dialog.less";
.version-add {
.el-upload-dragger {
height: 120px;
......
src/page/STB/appversion/components/detailDialog.vue
View file @ 78a5d931
......@@ -31,7 +31,7 @@
</el-form>
</div>
<div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="close()">确定</el-button>
<el-button size="mini" type="primary" @click="close()">关 闭</el-button>
</div>
</el-dialog>
</template>
......@@ -58,7 +58,6 @@ export default {
</script>
<style lang="less">
@import "~@/style/dialog.less";
.version-detail {
.input-item {
font-size: 16px;
......
src/page/STB/appversion/index.vue
View file @ 78a5d931
......@@ -37,12 +37,11 @@
height="100%"
:data="tableData"
>
<el-table-column
type="index"
width="120"
label="序号"
align="center"
></el-table-column>
<el-table-column type="index" width="120" label="序号" align="center">
<template slot-scope="scope">
<span>{{ (page._index - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="app版本号"
prop="appVersion"
......@@ -53,8 +52,16 @@
<span>{{ scope.row.isCurrent ? "是" : "否" }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="上传时间" prop="createTime"></el-table-column>
<el-table-column align="center" label="操作者" prop="userName"></el-table-column>
<el-table-column
align="center"
label="上传时间"
prop="createTime"
></el-table-column>
<el-table-column
align="center"
label="操作者"
prop="userName"
></el-table-column>
<el-table-column align="center" label="操作" header-align="center">
<template slot-scope="scope" width="220">
<div class="table-btn-group">
......@@ -64,7 +71,7 @@
</el-button>
</el-tooltip>
<el-tooltip content="启用" placement="top">
<el-button circle @click="ableBtn(scope.row)">
<el-button circle :disabled="!!scope.row.isCurrent" @click="ableBtn(scope.row)">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
......@@ -73,31 +80,22 @@
</el-table-column>
</el-table>
</div>
<div class="partyt-pagination">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
<party-pagination :page="page" @changePage="handleCurrentChange" />
</div>
<add-dialog ref="addDialog" @refreshFn="onSearch" />
<detail-dialog ref="detailDialog" />
</div>
</template>
<script>
import { partyPagination, partyTable } from "@/components/index";
import { partyPagination } from "@/components/index";
import { addDialog, detailDialog } from "./components/index";
export default {
data() {
return {
page: {
currentPage: 1,
pageSize: 10,
total: 0
page: {
_index: 1,
_size: 10,
total: 0,
},
form: {
dateRange: [],
......@@ -112,15 +110,15 @@ export default {
methods: {
// 查询
onSearch() {
this.page.currentPage = 1;
this.page._index = 1;
this.getTableData();
},
// 获得数据接口
getTableData() {
let vm = this
let vm = this;
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
_index: this.page._index,
_size: this.page._size,
startDate: this.form.dateRange.length ? this.form.dateRange[0] : "",
endDate: this.form.dateRange.length ? this.form.dateRange[1] : "",
};
......@@ -134,15 +132,15 @@ export default {
)
.then((res) => {
if (res.data.resultCode === "200") {
let data = res.data.data
vm.page.total = data.total
vm.tableData = data.records
let data = res.data.data;
vm.page.total = data.total;
vm.tableData = data.records;
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
})
.catch(function (err) {
console.log(err)
console.log(err);
});
},
// 新增弹框打开
......@@ -171,7 +169,7 @@ export default {
},
// 启用
updateVersion(row) {
let vm = this
let vm = this;
let param = {
id: row.id,
isCurrent: 1,
......@@ -186,14 +184,14 @@ export default {
)
.then((res) => {
if (res.data.resultCode === "200") {
this.$message.success("操作成功")
this.onSearch()
this.$message.success("操作成功");
this.onSearch();
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
})
.catch(function (err) {
console.log(err)
console.log(err);
});
},
// 重置
......@@ -201,12 +199,12 @@ export default {
this.form = {
dateRange: [],
};
this.onSearch()
this.onSearch();
},
// 分页
handleCurrentChange(val) {
this.page.currentPage = val
this.getTableData()
this.page._index = val;
this.getTableData();
},
},
};
......
src/page/STB/base/components/dialog.vue
View file @ 78a5d931
......@@ -135,5 +135,4 @@ export default {
</script>
<style lang="less">
@import "~@/style/dialog.less";
</style>
\ No newline at end of file
src/page/STB/base/index.vue
View file @ 78a5d931
......@@ -38,24 +38,14 @@
<div class="btn-group">
<el-button type="primary" @click="addBox">新建机顶盒账号</el-button>
</div>
<party-table :feildList="feildList" :list="tableData"/>
<div class="partyt-pagination" style="margin: 0 20px">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
<party-table :currentPage="page._index" :feildList="feildList" :list="tableData"/>
<party-pagination :page="page" @changePage="handleCurrentChange"/>
</div>
<custom-dialog ref="formItem" @refreshFn="onSearch" />
</div>
</template>
<script>
import { partyPagination } from "@/components/index";
import partyTable from "@/components/table.vue";
import { partyPagination,partyTable} from "@/components/index";
import customDialog from "./components/dialog.vue";
import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js";
......@@ -64,8 +54,8 @@ export default {
data() {
return {
page: {
currentPage: 1,
pageSize: 10,
_index: 1,
_size: 10,
total: 0
},
feildList: [
......@@ -103,15 +93,15 @@ export default {
},
// 查询
onSearch() {
this.page.currentPage = 1
this.page._index = 1
this.getTableData()
},
// 获得数据接口
getTableData() {
let vm = this;
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
_index: this.page._index,
_size: this.page._size,
areaId: this.form.areaId.length ? this.form.areaId[this.form.areaId.length - 1] : '',
organId: this.form.orgId
};
......@@ -150,13 +140,12 @@ export default {
},
// 分页
handleCurrentChange(val) {
this.page.currentPage = val;
this.page._index = val;
this.getTableData();
},
},
};
</script>
<style lang="less">
@import "~@/style/table.less";
@import "~@/style/pagination.less";
// @import "~@/style/table.less";
</style>
\ No newline at end of file
src/page/STB/interactive/index.vue
View file @ 78a5d931
......@@ -44,10 +44,13 @@
v-for="(item, index) in tableData"
:key="index"
>
<h5 class="title">{{ item.name }}</h5>
<p>{{ item.content }}</p>
<h5 class="title">{{ item.boardName }}</h5>
<p>{{ item.content||'暂无内容' }}</p>
<div class="img-box" v-if="item.images.length">
<img v-for="(j, idx) in item.images" :src="j" :key="idx" alt="" />
<a target="_blank" v-for="(j, idx) in item.images" :key="idx" :href="j.url">
<img :src="j.cover" alt="" />
</a>
<!-- <img v-for="(j, idx) in item.images" :src="j" :key="idx" alt="" /> -->
</div>
<div class="img-box" v-if="!item.images.length">暂无数据</div>
<div class="author">
......@@ -56,27 +59,20 @@
</div>
</div>
</div>
<div class="partyt-pagination" style="margin: 0 20px" v-show="tableData.length">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
<party-pagination v-show="tableData.length" :page="page" @changePage="handleCurrentChange"/>
</el-card>
</div>
</template>
<script>
import { partyPagination} from "@/components/index";
export default {
components: { partyPagination },
data() {
return {
filterText: "",
page: {
currentPage: 1,
pageSize: 10,
_index: 1,
_size: 10,
total: 0,
},
treeData: [],
......@@ -101,7 +97,7 @@ export default {
methods: {
// 查询
onSearch() {
this.page.currentPage = 1;
this.page._index = 1;
this.getTableData();
},
// 获得数据接口
......@@ -109,8 +105,8 @@ export default {
let vm = this;
vm.tableData = [];
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
_index: this.page._index,
_size: this.page._size,
orgId: this.selectAreaId,
};
vm.$https(
......@@ -133,14 +129,20 @@ export default {
vm.tableData.forEach((item) => {
item.images = item.images ? item.images.split(",") : [];
item.images.forEach((result, index) => {
item.images[index] = {
url:result
}
if (/\.(MP4|mp4)/.test(result)) {
item.images[index] = require("@/assets/video-icon.png");
item.images[index].cover = require("@/assets/video-icon.png");
} else if (/\.(MP3|mp3)/.test(result)) {
item.images[index] = require("@/assets/audio-icon.png");
item.images[index].cover = require("@/assets/audio-icon.png");
} else if(/\.(jpg|png|jpeg|bmp|gif)/.test(result)) {
item.images[index].cover = result;
} else{
item.images[index].cover = require("@/assets/default-img.jpeg");;
}
});
});
vm.tableData = [...vm.tableData];
} else {
this.$message.error(res.data.message);
......@@ -181,14 +183,13 @@ export default {
},
// 分页
handleCurrentChange(val) {
this.page.currentPage = val;
this.page._index = val;
this.getTableData();
},
},
};
</script>
<style lang="less">
@import "~@/style/pagination.less";
.interactive-wrapper {
display: flex;
.tree-box {
......
src/page/STB/operation/index.vue
View file @ 78a5d931
......@@ -52,43 +52,43 @@
height="100%"
:data="tableData"
>
<el-table-column type="index" width="120" label="序号" align="center">
<template slot-scope="scope">
<span>{{ (page._index - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
type="index"
width="120"
label="序号"
align="center"
label="mac地址"
prop="mac"
></el-table-column>
<el-table-column
align="center"
label="所属单位"
prop="organName"
></el-table-column>
<el-table-column align="center" label="mac地址" prop="mac"></el-table-column>
<el-table-column align="center" label="所属单位" prop="organName"></el-table-column>
<el-table-column align="center" label="机顶盒状态" prop="status">
<template slot-scope="scope">
<span>{{statusOptions[scope.row.status-1].label}}</span>
<span>{{ statusOptions[scope.row.status - 1].label }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="partyt-pagination" style="margin: 0 20px">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
<party-pagination :page="page" @changePage="handleCurrentChange" />
</div>
</div>
</template>
<script>
import { partyPagination } from "@/components/index";
import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js";
export default {
components: { partyPagination },
data() {
return {
page: {
currentPage: 1,
pageSize: 10,
_index: 1,
_size: 10,
total: 0,
},
orgOptions: [], // 单位信息
......@@ -137,15 +137,15 @@ export default {
},
// 查询
onSearch() {
this.page.currentPage = 1;
this.page._index = 1;
this.getTableData();
},
// 获得数据接口
getTableData() {
let vm = this;
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
_index: this.page._index,
_size: this.page._size,
areaId: this.form.areaId.length
? this.form.areaId[this.form.areaId.length - 1]
: "",
......@@ -184,7 +184,7 @@ export default {
},
// 分页
handleCurrentChange(val) {
this.page.currentPage = val;
this.page._index = val;
this.getTableData();
},
},
......@@ -192,5 +192,4 @@ export default {
</script>
<style lang="less">
@import "~@/style/table.less";
@import "~@/style/pagination.less";
</style>
\ No newline at end of file
src/page/STB/pageCustom/index.vue
View file @ 78a5d931
......@@ -70,8 +70,8 @@
</div>
</div>
<div class="btn-group footer-btn">
<el-button size="mini" @click="close">取 消</el-button>
<el-button size="mini" type="primary" @click="submitForm('editform')"
<el-button @click="close">取 消</el-button>
<el-button type="primary" @click="submitForm('editform')"
>确定</el-button
>
</div>
......@@ -234,8 +234,8 @@ export default {
},
// 修改当前项
submitForm() {
this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
vm.radioPage && this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
vm.radioRun && this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
},
updateCurrent(id, url) {
let vm = this;
......@@ -406,7 +406,7 @@ export default {
padding-top: 20px;
border-top: 1px solid #eee;
.el-button {
padding: 0 20px;
width: 160px;
}
}
}
......
src/page/content/components/uploadVue/uploadAudio.vue
View file @ 78a5d931
......@@ -14,11 +14,11 @@
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
</div>
</template>
<script>
......@@ -60,7 +60,7 @@ export default {
return item.id;
})
this.$emit('audioList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
......@@ -70,7 +70,7 @@ export default {
_this.$message.error(err.msg || err.message);
});
},
uploadFile(file) {
this.filedata.append('file', file.file)
......@@ -96,4 +96,4 @@ export default {
font-size: 24px;
font: #ccc;
}
</style>
\ No newline at end of file
</style>
src/page/content/components/uploadVue/uploadDatum.vue
View file @ 78a5d931
......@@ -14,11 +14,11 @@
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
</div>
</template>
<script>
......@@ -60,7 +60,7 @@ export default {
return item.id;
})
this.$emit('datumList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
......@@ -70,7 +70,7 @@ export default {
_this.$message.error(err.msg || err.message);
});
},
uploadFile(file) {
this.filedata.append('file', file.file)
......@@ -96,4 +96,4 @@ export default {
font-size: 24px;
font: #ccc;
}
</style>
\ No newline at end of file
</style>
src/page/content/components/uploadVue/uploadFile.vue
View file @ 78a5d931
......@@ -14,11 +14,11 @@
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
</div>
</template>
<script>
......@@ -60,7 +60,7 @@ export default {
return item.id;
})
this.$emit('videoList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
......@@ -70,7 +70,7 @@ export default {
_this.$message.error(err.msg || err.message);
});
},
uploadFile(file) {
this.filedata.append('file', file.file)
......@@ -136,4 +136,4 @@ export default {
font-size: 24px;
font: #ccc;
}
</style>
\ No newline at end of file
</style>
src/page/content/components/uploadVue/uploadImg.vue
View file @ 78a5d931
......@@ -32,7 +32,7 @@ export default {
methods: {
// 图片上传成功的返回值
handleAvatarSuccess(res, file) {
console.log(res)
console.log(res.data.url)
this.$emit('imgUrl', res.data.url)
......@@ -51,4 +51,4 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
</style>
src/page/content/display/content/add.vue
View file @ 78a5d931
......@@ -74,7 +74,7 @@
<el-form-item label="请选择视频版权方" class="w50">
<el-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
@focus="getVideoContentCopyrightData"
v-model="ruleForm.videoContentCopyrightOwnerId"
>
<el-option
......@@ -105,7 +105,7 @@
placeholder="请选择视频"
@focus="getVideoData"
v-model="ruleForm.videoContentId"
>
>
<el-option
v-for="item in videoContentId"
:label="item.name"
......@@ -114,12 +114,11 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item class="w50" prop="audioUrlList"></el-form-item>
<el-form-item class="w50" prop="audioIdList"></el-form-item>
<el-form-item label="导览音频" class="w50">
<!-- <upload-img @imgUrl="imgUrl"></upload-img> -->
<upload-audio @audioList="audioList"></upload-audio>
</el-form-item>
<el-form-item label="参考资料" class prop="materialUrlList">
<el-form-item label="参考资料" class prop="datumIdList">
<upload-datum @datumList="datumList"></upload-datum>
</el-form-item>
</el-form>
......@@ -163,7 +162,6 @@ export default {
boardCopyrightOwnerId:[],
exhibitionBoardCatId:[],
videoContentId:[],
type: this.$route.query.type,
dialogVisible: false,
formLabelWidth: "100px",
form: {
......@@ -176,7 +174,8 @@ export default {
boardCopyrightOwnerId:"",
videoContentCopyrightOwnerId: "",
videoContentCatId: "",
videoUrlList: []
audioIdList: [],
datumIdList: []
},
videoContentCat: [
{
......@@ -225,13 +224,12 @@ export default {
this.init()
},
methods: {
audioList(list){
this.ruleForm.audioUrlList = list;
},
datumList(list){
console.log(list,"122212fefe")
this.ruleForm.materialUrlList = list;
},
audioList(list){
this.ruleForm.audioIdList = list;
},
datumList(list){
this.ruleForm.datumIdList = list;
},
// 视频版权方名称id
videoCopyright(idlist) {
this.ruleForm.videoContentCopyrightOwnerId = idlist;
......@@ -245,11 +243,7 @@ export default {
qrcodeUrl(url){
this.ruleForm.qrcodeUrl = url
},
// 视频列表地址
videoList(list) {
this.ruleForm.videoUrlList = list;
},
getVideoContentCat(data) {
getVideoContentCat(data) {
console.log(data);
console.log(this.ruleForm.videoContentCatId);
},
......@@ -257,7 +251,7 @@ export default {
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
this.getVideoContentCatData();
this.getAssetCopyrightData();
this.getVideoContentCopyrightData();
this.getExhibitionBoardCatId();
this.getBoardCopyrightOwnerId();
this.getVideoData();
......@@ -273,8 +267,7 @@ export default {
authType: this.backToken
}
// param
)
.then(res => {
).then(res => {
let data = res.data.data;
// this.ruleForm = data;
console.log(this.ruleForm)
......@@ -285,24 +278,17 @@ export default {
boardCopyrightOwnerId:data.boardCopyrightOwnerId,
cover:data.cover,
exhibitionBoardCatId:data.exhibitionBoardCatId,
guideAudioUrl:data.guideAudioUrl,
id:data.id,
name:data.name,
qrcodeUrl:data.qrcodeUrl,
refMaterialUrl:data.refMaterialUrl,
remarks:data.remarks,
audioUrlList:data.audioUrlList,
materialUrlList:data.materialUrlList
// videoUrlList:data.videoUrlList
// 字段对不上
audioIdList:data.audioIdList,
datumIdList:data.datumIdList
}
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
});
},
// 新建视频分类
addVideoClass() {
this.dialogVisible = true;
......@@ -310,8 +296,8 @@ export default {
// 弹窗保存
save(formName) {
this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1];
this.ruleForm.expireDateStart = this.value1[0];
this.ruleForm.expireDateEnd = this.value1[1];
if (valid) {
this.$https(
{
......@@ -323,18 +309,16 @@ export default {
authType: this.backToken
},
this.classForm
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false;
})
.catch(function(err) {
}).catch(function(err) {
this.$message({
type: "fail",
message: "新增失败!" + err.response.data.msg
});
console.log(err);
});
});
} else {
console.log("error submit!!");
return false;
......@@ -344,24 +328,21 @@ export default {
// 新增
submitForm(formName) {
this.$refs[formName].validate(valid => {
console.log(this.ruleForm)
if (valid) {
this.$https(
{
url: "/exhibitionBoard/save",
url: "exhibitionBoard/save",
method: "post",
authType: this.backToken
},
// this.ruleForm
this.$qs.stringify(this.ruleForm)
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
});
} else {
console.log("error submit!!");
return false;
......@@ -379,15 +360,12 @@ export default {
authType: this.backToken
},
this.$qs.stringify(this.ruleForm)
// this.ruleForm
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "修改成功!" });
history.go(-1);
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
});
} else {
console.log("error submit!!");
return false;
......@@ -399,7 +377,7 @@ export default {
history.go(-1);
},
// 获取视频版权方
getAssetCopyrightData() {
getVideoContentCopyrightData() {
let vm = this;
vm.$https(
{
......@@ -410,8 +388,7 @@ export default {
{ copyrightOwnerType: "VIDEO_CONTENT" }
)
.then(res => {
let data = res.data.data;
this.copyrightOwner = data;
this.copyrightOwner = res.data.data;
})
.catch(function(err) {
console.log(err);
......@@ -420,22 +397,17 @@ export default {
// 获取展板版权方
getBoardCopyrightOwnerId() {
let vm = this;
vm.$https(
{
vm.$https({
url: "copyrightOwner/getList",
method: "get",
authType: this.backToken
},
{ copyrightOwnerType: "EXHIBITION_BOARD" }
)
.then(res => {
let data = res.data.data;
this.boardCopyrightOwnerId = data;
console.log(this.boardCopyrightOwnerId)
})
.catch(function(err) {
).then(res => {
this.boardCopyrightOwnerId = res.data.data;
}).catch(function(err) {
console.log(err);
});
});
},
//获取展板分类
getExhibitionBoardCatId(){
......@@ -444,14 +416,11 @@ export default {
url: "exhibitionBoardCat/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.exhibitionBoardCatId = data;
})
.catch(function(err) {
}).then(res => {
this.exhibitionBoardCatId = res.data.data;
}).catch(function(err) {
console.log(err);
});
});
},
// 获取视频分类列表
getVideoContentCatData() {
......@@ -460,14 +429,11 @@ export default {
url: "videoContentCat/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.videoContentCat = data;
})
.catch(function(err) {
}).then(res => {
this.videoContentCat = res.data.data;
}).catch(function(err) {
console.log(err);
});
});
},
// 获取视频列表
getVideoData() {
......@@ -476,16 +442,12 @@ export default {
url: "videoContent/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.videoContentId = data;
})
.catch(function(err) {
}).then(res => {
this.videoContentId = res.data.data;
}).catch(function(err) {
console.log(err);
});
});
},
close() {
history.go(-1);
},
......
src/page/content/display/content/details.vue
View file @ 78a5d931
......@@ -203,7 +203,12 @@ export default {
id: "",
activeNames: ["1", "2", "3"],
keyMap: keyMap,
contentData: {},
contentData: {
imagesList:[],
dirList:[],
videoList:[],
audioList:[]
},
reviewData: {},
};
},
......
src/page/content/video/content/add.vue
View file @ 78a5d931
......@@ -27,9 +27,9 @@
<el-form-item class="selectH100" label="请选择预设视频分类">
<el-select
placeholder="请选择预设视频分类"
@focus="getAssetTypeData"
@focus="getVideoContentCatData"
multiple
v-model="ruleForm.videoContentCatIdListList"
v-model="ruleForm.videoContentCatIdList"
@change="getSelectDep"
>
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
......@@ -49,7 +49,7 @@
<el-form-item label="请选择视频版权方" prop="videoContentCopyrightOwnerId">
<el-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
@focus="getVideoContentCopyrightData"
v-model="ruleForm.videoContentCopyrightOwnerId"
>
<el-option
......@@ -67,9 +67,9 @@
<el-form-item label="请选择视频分类" prop="videoContentCatIdList">
<el-select
placeholder="请选择预设视频分类"
@focus="getAssetTypeData"
v-model="ruleForm.videoContentCatIdList"
@change="getAssetType"
@focus="getVideoContentCatData"
v-model="ruleForm.videoContentCatId"
@change="getVideoContentCat"
>
<el-option
v-for="item in videoContentCat"
......@@ -149,7 +149,7 @@ import uploadDatum from '@/page/content/components/uploadVue/uploadDatum'
import mulDisplay from '@/page/content/components/mulClassify/mulDisplay'
import addCopyright from '@/page/content/components/dialog/addCopyright'
export default {
components:{
components:{
uploadImg,
uploadFile,
uploadDatum,
......@@ -171,8 +171,9 @@ export default {
name: "",
videoContentCopyrightOwnerId:"",
videoContentCatIdList: "",
videoContentCatId: "",
thumbnail:"",
videoUrlList:[]
videoFileIdList:[]
},
videoContentCat: [
{
......@@ -232,18 +233,18 @@ export default {
},
// 视频列表地址
videoList(list){
this.ruleForm.videoUrlList = list
this.ruleForm.videoFileIdList = list
},
init() {
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
this.getAssetTypeData()
this.getAssetCopyrightData()
this.getVideoContentCatData()
this.getVideoContentCopyrightData()
}
},
getAssetType(data){
getVideoContentCat(data){
console.log(data)
console.log(this.ruleForm.videoContentCatIdList)
console.log(this.ruleForm.videoContentCatId)
},
// 获取版权方详情
getInfo(id) {
......@@ -255,20 +256,18 @@ export default {
authType: this.backToken
}
// param
)
.then(res => {
).then(res => {
let data = res.data.data;
// this.ruleForm = data;
this.ruleForm.id = data.id
this.ruleForm.name = data.name
this.ruleForm.videoContentCopyrightOwnerId = data.videoContentCopyrightOwnerId
this.ruleForm.videoContentCatIdList = data.videoContentCatIdList
this.ruleForm.videoContentCatId = data.videoContentCatId
this.ruleForm.thumbnail = data.thumbnail
this.ruleForm.videoUrlList = data.videoUrlList
})
.catch(function(err) {
this.ruleForm.videoFileIdList = data.videoFileIdList
}).catch(function(err) {
console.log(err);
});
});
},
// 新建展板分类
addVideoCopyright(){
......@@ -293,20 +292,16 @@ export default {
// },
authType: this.backToken
},
this.$qs.stringify(this.classForm)
// this.classForm
)
.then(res => {
this.classForm
).then(res => {
this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false;
})
.catch(function(err) {
}).catch(function(err) {
this.$message({
type: "fail",
message: "新增失败!" + err.response.data.msg
});
console.log(err);
});
});
} else {
console.log("error submit!!");
return false;
......@@ -324,33 +319,20 @@ export default {
// 新增
submitForm(formName) {
this.$refs[formName].validate(valid => {
// this.ruleForm.videoContentCopyrightOwnerId = ["1373225989501456385"]
// this.ruleForm.videoContentCatIdListList = []
// this.ruleForm.videoUrlList = [
// "http://111.203.232.175:8085/group1/M00/00/39/wKhuVWBgIvaANgtZAAAAAAAAAAA947.mp4"
// ]
if (valid) {
this.$https(
{
url: "/videoContent/save",
url: "videoContent/save",
method: "post",
authType: this.backToken
},
// this.ruleForm
this.$qs.stringify(this.ruleForm)
)
.then(res => {
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增视频申请已提交，待审核!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
})
.catch(function(err) {
).then(res => {
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
}).catch(function(err) {
console.log(err);
});
});
} else {
console.log("error submit!!");
return false;
......@@ -360,7 +342,6 @@ export default {
// 修改版权方
updateForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
this.$https(
{
......@@ -369,19 +350,12 @@ export default {
authType: this.backToken
},
this.$qs.stringify(this.ruleForm)
// this.ruleForm
)
.then(res => {
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "修改视频申请已提交，待审核!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
})
.catch(function(err) {
).then(res => {
this.$message({ type: "success", message: "修改成功!" });
history.go(-1);
}).catch(function(err) {
console.log(err);
});
});
} else {
console.log("error submit!!");
return false;
......@@ -392,9 +366,8 @@ export default {
this.$refs[formName].resetFields();
history.go(-1);
},
// 获取展板分类列表
getAssetCopyrightData(){
let vm = this;
getVideoContentCopyrightData() {
let vm = this;
vm.$https({
url: "copyrightOwner/getList",
method: "get",
......@@ -410,37 +383,30 @@ export default {
});
},
// 获取视频分类列表
getAssetTypeData() {
getVideoContentCatData() {
let vm = this;
vm.$https({
url: "videoContentCat/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.videoContentCat = data;
})
.catch(function(err) {
}).then(res => {
this.videoContentCat = res.data.data;
}).catch(function(err) {
console.log(err);
});
});
},
getSelectDep(videoContentCatIdListList) {
if (videoContentCatIdListList.length === this.videoContentCat.length) {
this.checkedThing = true;
} else {
this.checkedThing = false;
}
getSelectDep(videoContentCatIdList) {
this.checkedThing = videoContentCatIdList.length === this.videoContentCat.length;
},
selectAllThing() {
// debugger
this.ruleForm.videoContentCatIdListList = [];
this.ruleForm.videoContentCatIdList = [];
if (this.checkedThing) {
this.videoContentCat.map(item => {
this.ruleForm.videoContentCatIdListList.push(item.id);
this.ruleForm.videoContentCatIdList.push(item.id);
});
} else {
this.ruleForm.videoContentCatIdListList = [];
this.ruleForm.videoContentCatIdList = [];
}
}
}
......
src/page/content/video/content/index.vue
View file @ 78a5d931
......@@ -215,8 +215,7 @@
</el-form>
</div>
<div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="close">确定</el-button>
<el-button size="mini" @click="close">取 消</el-button>
<el-button size="mini" type="primary" @click="close">关 闭</el-button>
</div>
</el-dialog>
</div>
......@@ -584,7 +583,7 @@ export default {
})
.then(
res => {
if (res.data.status == 201 || res.data.status == 200) {
if (res.data.status === 201 || res.data.status === 200) {
this.$message({
type: "success",
message: "删除成功!"
......
src/page/statistics/components/areas.vue
View file @ 78a5d931
......@@ -22,7 +22,8 @@
</ul>
</div>
<div id="area2"></div>
<div id="area3">></div>
<div id="area3"></div>
<div id="area4"></div>
</div>
</div>
</div>
......@@ -42,9 +43,6 @@ export default {
},
mounted() {
this.getList();
this.$nextTick((v) => {
this.initScroll();
});
},
methods: {
initScroll() {
......@@ -53,8 +51,10 @@ export default {
this.con1 = document.getElementById("area1");
let con2 = document.getElementById("area2");
let con3 = document.getElementById("area3");
let con4 = document.getElementById("area4");
con2.innerHTML = this.con1.innerHTML;
con3.innerHTML = this.con1.innerHTML;
con4.innerHTML = this.con1.innerHTML;
this.timer = setInterval(_this.scrollUp, _this.speed);
},
scrollUp() {
......@@ -65,6 +65,7 @@ export default {
}
},
getList() {
let _this = this;
let requestparams = {};
requestparams._index = 1;
requestparams._size = 10;
......@@ -80,6 +81,9 @@ export default {
if (res.status == 200) {
if (res.data.resultCode == 200) {
this.list = res.data.data.records;
this.$nextTick(()=>{
_this.initScroll();
})
} else {
this.list = [];
}
......
src/page/statistics/overview.vue
View file @ 78a5d931
......@@ -36,7 +36,7 @@ export default {
}
},
components:{demand, interaction , areas, top10, mapDiv, borderNums},
components:{demand, interact , areas, top10, mapDiv, borderNums},
}
</script>
<style lang="less" scoped>
......
src/page/system/changePwd.vue
View file @ 78a5d931
......@@ -46,13 +46,13 @@
</div>
</template>
<script>
import { loginOut } from "@/config/loginOut.js";
export default {
data() {
var validatePass = (rule, value, callback) => {
if (value === "") {
callback(new Error("请输入密码"));
} else {
this.$refs.ruleForm.validateField("password");
callback();
}
};
......@@ -95,7 +95,7 @@ export default {
},
handleSubmit() {
let _this = this;
this.$refs.validate((valid) => {
this.$refs.form.validate((valid) => {
if (valid) {
let requestParams = {};
requestParams.oldPassWord = _this.form.oldPassWord;
......@@ -105,8 +105,9 @@ export default {
{
method: "put",
url: "tUser/editPwd",
authType: this.backToken,
},
requestParams
_this.$qs.stringify(requestParams)
)
.then((res) => {
if (res.status != 200) {
......@@ -117,7 +118,7 @@ export default {
type: "success",
message: res.data.message,
});
_this.redirectLogin()
_this.redirectLogin();
} else {
_this.$message.error(res.data.message);
}
......@@ -132,10 +133,10 @@ export default {
}
});
},
redirectLogin(){
this.$router.push('./login')
}
redirectLogin() {
loginOut();
this.$router.push("./login");
},
},
};
</script>
......
src/style/global.less
View file @ 78a5d931
@party-red:#9B1E23;
@page-bg-white:#F9F9F9;
@party-white:#FFFFFF;
@font-color:#333333;
@party-pink:pink;
@party-border-color:#EEEEEE;
@party-black:#000000;
@party-bg-gray:#F8F8F8;
@party-btn-color:#AC9374;
@party-table-header-color:#FDFBF8;
@party-page-border-color:#DDDDDD;
@party-check-bg-color:#F5F5F5;
.f14{ font-size: 14px; }
.f16{ font-size: 14px; }
.f18{ font-size: 18px; }
.f24{ font-size: 24px; }
.f0{font-size: 0px;}
.inline-block{
display: inline-block;
}
.height100{
height: 100%;
@party-red: #9B1E23;
@page-bg-white: #F9F9F9;
@party-white: #FFFFFF;
@font-color: #333333;
@party-pink: pink;
@party-border-color: #EEEEEE;
@party-black: #000000;
@party-bg-gray: #F8F8F8;
@party-btn-color: #AC9374;
@party-table-header-color: #FDFBF8;
@party-page-border-color: #DDDDDD;
@party-check-bg-color: #F5F5F5;
.f14 {
font-size: 14px;
}
@media screen and (max-width:1600px){
.search-container{
.el-input{
width: 180px;
}
.btn-group{
.el-button{
width: 80px;
}
}
.f16 {
font-size: 14px;
}
.f18 {
font-size: 18px;
}
.f24 {
font-size: 24px;
}
.f0 {
font-size: 0px;
}
.inline-block {
display: inline-block;
}
.height100 {
height: 100%;
}
@media screen and (max-width:1600px) {
.search-container {
.el-input {
width: 180px;
}
.page-tips{
width: 365px;
.btn-group {
.el-button {
width: 80px;
}
}
}
.page-tips {
width: 365px;
}
}
@media (min-width:1601px) and (max-width:1800px){
.search-container{
.el-input{
width: 220px;
}
.btn-group{
.el-button{
width: 96px;
}
}
@media (min-width:1601px) and (max-width:1800px) {
.search-container {
.el-input {
width: 220px;
}
.page-tips{
width: 460px;
.btn-group {
.el-button {
width: 96px;
}
}
}
.page-tips {
width: 460px;
}
}
@media (min-width:1801px){
.search-container{
.el-input{
width: 280px;
}
.btn-group{
.el-button{
width: 128px;
}
}
@media (min-width:1801px) {
.search-container {
.el-input {
width: 280px;
}
.page-tips{
width: 480px;
.btn-group {
.el-button {
width: 128px;
}
}
}
.page-tips {
width: 480px;
}
}
.search-container{
background:@party-white;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.10);
border-radius: 8px;
margin-bottom: 20px;
padding: 20px 24px;
height: 80px;
display: flex;
justify-content: space-between;
.el-form{
margin-bottom: 0;
.el-input{
.el-input__inner{
border-radius: 22px;
background-color:@party-bg-gray;
border-color: @party-border-color;
}
}
.el-range-editor.el-input__inner{
width: 280px;
border-radius: 22px;
background-color: @party-bg-gray;
.el-range-separator{
width: 20px;
padding: 0 2px;
}
.el-range-input{
background-color: @party-bg-gray;
}
}
.el-input__icon{
width: 40px;
font-size: 20px;
color: @party-btn-color;
}
.btn-group{
padding-left: 15px;
.el-button{
height: 40px;
}
}
.search-container {
background: @party-white;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.10);
border-radius: 8px;
margin-bottom: 20px;
padding: 20px 24px;
height: 80px;
display: flex;
justify-content: space-between;
.el-form {
margin-bottom: 0;
.el-input {
.el-input__inner {
border-radius: 22px;
background-color: @party-bg-gray;
border-color: @party-border-color;
}
}
.page-tip{
display: flex;
font-size: 14px;
color: @font-color;
.page-tip-title{
font-weight: bold;
padding-right: 10px;
}
.el-range-editor.el-input__inner {
width: 280px;
border-radius: 22px;
background-color: @party-bg-gray;
.el-range-separator {
width: 20px;
padding: 0 2px;
}
.el-range-input {
background-color: @party-bg-gray;
}
}
}
.table-content{
height: calc(100% - 100px);
background:@party-white;
box-shadow: 0 4px 8px 0 rgb(0 0 0 / 10%);
border-radius: 8px;
padding: 20px 40px 0 40px;
.btn-group{
text-align: right;
margin-bottom: 12px;
.el-button{
min-width: 128px;
}
}
}
.btn-group{
.el-button{
height: 36px;
padding: 0;
border-radius: 28px;
span {
font-size: 16px;
}
.el-input__icon {
width: 40px;
font-size: 20px;
color: @party-btn-color;
}
.el-button--primary{
background-color: @party-btn-color;
border-color: @party-btn-color;
color:@party-white ;
.btn-group {
padding-left: 15px;
.el-button {
height: 40px;
}
}
.el-button--default{
background: rgba(172,147,116,0.10);
border: 1px solid @party-btn-color;
color:@party-btn-color;
}
.page-tip {
display: flex;
font-size: 14px;
color: @font-color;
.page-tip-title {
font-weight: bold;
padding-right: 10px;
}
}
}
// 系统form 表单样式
.party-form{
.el-input__icon{
width: 40px;
font-size: 20px;
color: @party-btn-color;
.table-content {
height: calc(100% - 100px);
background: @party-white;
box-shadow: 0 4px 8px 0 rgba(0,0,0,.3);
border-radius: 8px;
padding: 20px 40px 0 40px;
.btn-group {
text-align: right;
margin-bottom: 12px;
.el-button {
min-width: 128px;
}
.el-range-separator{
width: 20px;
padding: 0 2px;
}
}
.btn-group {
.el-button {
height: 36px;
padding: 0;
border-radius: 28px;
span {
font-size: 16px;
}
.el-input{
width: 280px;
.el-input__inner{
border-radius: 22px;
background-color: @party-bg-gray;
border: 1px solid @party-border-color;
}
}
.el-button--primary {
background-color: @party-btn-color;
border-color: @party-btn-color;
color: @party-white ;
}
.el-button--default {
background: rgba(172, 147, 116, 0.10);
border: 1px solid @party-btn-color;
color: @party-btn-color;
}
}
// 系统form 表单样式
.party-form {
.el-input__icon {
width: 40px;
font-size: 20px;
color: @party-btn-color;
}
.el-date-editor {
.el-range-separator {
width: 20px;
padding: 0 2px;
}
.el-textarea .el-textarea__inner{
background-color: @party-bg-gray;
border-radius: 8px;
}
.el-input {
width: 280px;
.el-input__inner {
border-radius: 22px;
background-color: @party-bg-gray;
border: 1px solid @party-border-color;
}
.el-range-editor.el-input__inner{
width: 280px;
border-radius: 22px;
}
.el-textarea .el-textarea__inner {
background-color: @party-bg-gray;
border-radius: 8px;
}
.el-range-editor.el-input__inner {
width: 280px;
border-radius: 22px;
}
.mt16 {
margin-top: 16px;
}
.el-radio-group {
.el-radio__inner {
width: 24px;
height: 24px;
border-color: @party-border-color;
}
.mt16{
margin-top: 16px;
.el-radio__label {
font-size: 16px;
}
.el-radio-group{
.el-radio__inner{
width: 24px;
height: 24px;
border-color: @party-border-color;
.el-radio.is-checked {
.el-radio__input.is-checked {
.el-radio__inner {
background-color: transparent;
border-color: @party-border-color;
&:after {
width: 10px;
height: 10px;
background-color: @party-btn-color;
}
}
.el-radio__label{
font-size: 16px;
}
.el-radio__label {
color: @font-color;
}
}
}
.el-checkbox-group {
.el-checkbox {
margin-right: 25px;
.el-checkbox__inner {
width: 22px;
height: 22px;
&:hover {
border-color: @party-border-color;
}
.el-radio.is-checked{
.el-radio__input.is-checked{
.el-radio__inner{
background-color: transparent;
border-color: @party-border-color;
&:after{
width: 10px;
height: 10px;
background-color: @party-btn-color;
}
}
}
.el-radio__label{
color: @font-color;
}
}
.el-checkbox__label {
color: @font-color
}
&+.el-checkbox {
margin-left: 0;
}
&.is-checked {
.el-checkbox__inner {
border-color: @party-border-color;
background-color: @party-check-bg-color;
&:after {
border: 2px solid #AC9374;
border-left: 0;
border-top: 0;
height: 11px;
left: 7px;
width: 5px;
}
}
}
.el-checkbox-group{
.el-checkbox{
margin-right: 25px;
.el-checkbox__inner{
width: 22px;
height: 22px;
&:hover{
border-color: @party-border-color;
}
}
.el-checkbox__label{
color: @font-color
}
& +.el-checkbox{
margin-left: 0;
}
&.is-checked{
.el-checkbox__inner{
border-color: @party-border-color;
background-color: @party-check-bg-color;
&:after{
border: 2px solid #AC9374;
border-left:0;
border-top: 0;
height: 11px;
left:7px;
width: 5px;
}
}
.el-checkbox__label{
color: @font-color
}
}
.el-checkbox__label {
color: @font-color
}
}
}
}
}
// 适用于修改密码 app 界面定义样式
.page-form-box{
background: @party-white;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.10);
border-radius: 8px;
height: 100%;
.page-form-box-header{
height: 64px;
line-height: 64px;
text-align: center;
border-bottom: 1px solid @party-border-color;
font-size: 20px;
color: @font-color;
text-align: center;
font-weight: bold;
}
.page-form-box-content{
height: calc(100% - 148px);
padding: 20px;
}
.page-form-box-footer{
height: 84px;
line-height: 84px;
text-align: center;
border-top: 1px solid @party-border-color;
.el-button{
width: 160px;
height: 40px;
}
.page-form-box {
background: @party-white;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.10);
border-radius: 8px;
height: 100%;
.page-form-box-header {
height: 64px;
line-height: 64px;
text-align: center;
border-bottom: 1px solid @party-border-color;
font-size: 20px;
color: @font-color;
text-align: center;
font-weight: bold;
}
.page-form-box-content {
height: calc(100% - 148px);
padding: 20px;
}
.page-form-box-footer {
height: 84px;
line-height: 84px;
text-align: center;
border-top: 1px solid @party-border-color;
.el-button {
width: 160px;
height: 40px;
}
}
}
.imgSize{
width: 160px;
height: 100px;
.imgSize {
width: 160px;
height: 100px;
}
.iconImg{
height: 32px;
width: 32px;
margin-right: 8px;
.iconImg {
height: 32px;
width: 32px;
margin-right: 8px;
}
.w50{
width: 50%;
.w50 {
width: 50%;
}
.w100{
width:100%;
.w100 {
width: 100%;
}
.selectH100{
height:100px;
overflow: auto;
.selectH100 {
height: 100px;
overflow: auto;
}
// 内容、审核详情页
.info {
height: 100%;
height: 100%;
width: 100%;
overflow: hidden;
.info-header {
font-size: 20px;
padding: 20px;
height: 68px;
width: 100%;
overflow: hidden;
.info-header {
font-size: 20px;
padding: 20px;
height: 68px;
width: 100%;
vertical-align: middle;
text-align: center;
border-bottom: 2px solid #eee;
}
.info-wrapper {
height: 100%;
width: 640px;
margin: 0 auto;
background: #fff;
.pageTips{
height: 72px;
padding:16px;
background: #F7F5F2;
border-radius: 8px;
margin:10px 0;
}
.el-collapse-item__header.is-active {
border-bottom-color: #eeeeee;
}
}
.info-container {
width: 100%;
height: calc(100% - 156px);
overflow-y: auto;
overflow-x: hidden;
}
.info-footer {
height: 88px;
border-top: 2px solid #eee;
padding: 20px;
text-align: center;
.el-button{
width: 160px;
height: 40px;
vertical-align: middle;
text-align: center;
border-bottom: 2px solid #eee;
}
.info-wrapper {
height: 100%;
width: 640px;
margin: 0 auto;
background: #fff;
.pageTips {
height: 72px;
padding: 16px;
background: #F7F5F2;
border-radius: 8px;
margin: 10px 0;
}
.el-collapse-item__header.is-active {
border-bottom-color: #eeeeee;
}
}
.info-container {
width: 100%;
height: calc(100% - 156px);
overflow-y: auto;
overflow-x: hidden;
}
.info-footer {
height: 88px;
border-top: 2px solid #eee;
padding: 20px;
text-align: center;
.el-button {
width: 160px;
height: 40px;
}
}
// 适用于统计详情样式
.overview-detail{
.ecahrts-panel-box{
height: calc(50% + 20px);
}
.rank-panel-box{
height: calc(50% - 40px);
margin-top: 20px;
}
.ecahrts-panel-box,
.rank-panel-box{
background:@party-white;
box-shadow: 0 4px 8px 0 rgba(221,221,221,0.40);
border-radius: 8px;
}
.panel-box-header{
height: 64px;
line-height: 64px;
border-bottom: 1px solid @party-border-color;
padding: 0 24px;
.title{
font-weight: bold;
font-size: 20px;
}
.tip{
float: right;
color: @font-color;
.tip-title{
font-weight: bold;
padding-right: 10px;
}
}
.el-range-editor.el-input__inner{
width: 280px;
border-radius: 22px;
background-color: @party-bg-gray;
margin-left: 40px;
padding-left:15px;
.el-range-input{
background-color: @party-bg-gray;
}
.el-range-separator{
width: 20px;
padding: 0 2px;
}
.el-icon-date{
color: @party-btn-color;
font-size: 18px;
}
}
}
.panel-box-content{
height: calc(100% - 64px);
overflow: hidden;
}
.rank-box{
width: 50%;
&.left{
padding-right: 10px;
}
&.right{
padding-left: 10px;
}
}
}
.party-icon-20{
display:inline-block;
width: 20px;
height: 20px;
background-repeat: no-repeat;
background-size: cover;
}
.party-icon-24{
display:inline-block;
width: 24px;
height: 24px;
background-repeat: no-repeat;
background-size: cover;
}
.icon-add{
background-image: url("~@/assets/icons/add.png");
}
.icon-import{
background-image: url("~@/assets/icons/import.png");
}
.icon-detail{
background-image: url("~@/assets/icons/detail.png");
}
.icon-edit{
background-image: url("~@/assets/icons/edit.png");
}
.icon-reset{
background-image: url("~@/assets/icons/reset.png");
}
.icon-enable{
background-image: url("~@/assets/icons/enable.png");
}
.icon-disable{
background-image: url("~@/assets/icons/disable.png");
}
.icon-del{
background-image: url("~@/assets/icons/del.png");
}
.icon-org{
display: inline-block;
width: 16px;
height: 16px;
background-repeat: no-repeat;
background-size: cover;
background-image: url("~@/assets/icons/org.png");
margin-right: 8px;
}
// 组织树结构样式
.org-tree{
// expand 三角icon
.el-tree-node__expand-icon{
position: absolute;
right: 10px;
top: 14px;
color: #000000;
font-size: 16px;
&.is-leaf{
color: transparent;
}
// 适用于统计详情样式
.overview-detail {
.ecahrts-panel-box {
height: calc(50% + 20px);
}
.rank-panel-box {
height: calc(50% - 40px);
margin-top: 20px;
}
.ecahrts-panel-box,
.rank-panel-box {
background: @party-white;
box-shadow: 0 4px 8px 0 rgba(221, 221, 221, 0.40);
border-radius: 8px;
}
.panel-box-header {
height: 64px;
line-height: 64px;
border-bottom: 1px solid @party-border-color;
padding: 0 24px;
.title {
font-weight: bold;
font-size: 20px;
}
.el-tree-node{
background-color: @party-white;
&.is-current{
>.el-tree-node__content{
.custom-tree-node{
background-color: @party-border-color;
}
}
}
.tip {
float: right;
color: @font-color;
.tip-title {
font-weight: bold;
padding-right: 10px;
}
}
.el-tree-node__content{
height: auto;
position: relative;
background-color: transparent !important;
&:hover{
background-color: transparent;
}
.el-range-editor.el-input__inner {
width: 280px;
border-radius: 22px;
background-color: @party-bg-gray;
margin-left: 40px;
padding-left: 15px;
.el-range-input {
background-color: @party-bg-gray;
}
.el-range-separator {
width: 20px;
padding: 0 2px;
}
.el-icon-date {
color: @party-btn-color;
font-size: 18px;
}
}
div[class*="tree-node-level"]{
width: 100%;
color: @font-color;
border-radius: 5px;
}
.panel-box-content {
height: calc(100% - 64px);
overflow: hidden;
}
.rank-box {
width: 50%;
&.left {
padding-right: 10px;
}
.tree-node-level1,
.tree-node-level2{
span{
font-size: 16px;
}
&.right {
padding-left: 10px;
}
.tree-node-level3{
span{
font-size: 14px;
}
}
}
.party-icon-20 {
display: inline-block;
width: 20px;
height: 20px;
background-repeat: no-repeat;
background-size: cover;
}
.party-icon-24 {
display: inline-block;
width: 24px;
height: 24px;
background-repeat: no-repeat;
background-size: cover;
}
.icon-add {
background-image: url("~@/assets/icons/add.png");
}
.icon-import {
background-image: url("~@/assets/icons/import.png");
}
.icon-detail {
background-image: url("~@/assets/icons/detail.png");
}
.icon-edit {
background-image: url("~@/assets/icons/edit.png");
}
.icon-reset {
background-image: url("~@/assets/icons/reset.png");
}
.icon-enable {
background-image: url("~@/assets/icons/enable.png");
}
.icon-disable {
background-image: url("~@/assets/icons/disable.png");
}
.icon-del {
background-image: url("~@/assets/icons/del.png");
}
.icon-org {
display: inline-block;
width: 16px;
height: 16px;
background-repeat: no-repeat;
background-size: cover;
background-image: url("~@/assets/icons/org.png");
margin-right: 8px;
}
// 组织树结构样式
.org-tree {
// expand 三角icon
.el-tree-node__expand-icon {
position: absolute;
right: 10px;
top: 14px;
color: #000000;
font-size: 16px;
&.is-leaf {
color: transparent;
}
.tree-node-level1{
height: 56px;
line-height: 56px;
border-bottom: 1px solid @party-border-color;
padding-left: 5px;
}
.el-tree-node {
background-color: @party-white;
&.is-current {
>.el-tree-node__content {
.custom-tree-node {
background-color: @party-border-color;
}
}
}
.tree-node-level2,
.tree-node-level3{
height: 40px;
line-height: 40px;
margin: 5px 0;
border-radius: 20px;
padding-left: 10px;
}
.el-tree-node__content {
height: auto;
position: relative;
background-color: transparent !important;
&:hover {
background-color: transparent;
}
.tree-node-level2:hover{
background-color: @party-table-header-color;
}
div[class*="tree-node-level"] {
width: 100%;
color: @font-color;
border-radius: 5px;
}
.tree-node-level1,
.tree-node-level2 {
span {
font-size: 16px;
}
.tree-node-level3:hover{
background-color: @party-border-color;
}
.tree-node-level3 {
span {
font-size: 14px;
}
}
.tree-node-level1 {
height: 56px;
line-height: 56px;
border-bottom: 1px solid @party-border-color;
padding-left: 5px;
}
.tree-node-level2,
.tree-node-level3 {
height: 40px;
line-height: 40px;
margin: 5px 0;
border-radius: 20px;
padding-left: 10px;
}
.tree-node-level2:hover {
background-color: @party-table-header-color;
}
.tree-node-level3:hover {
background-color: @party-border-color;
}
}
src/style/pagination.less
View file @ 78a5d931
......@@ -20,6 +20,9 @@
}
.el-pager{
padding-left: 20px;
li:hover {
color: @party-btn-color;
}
li.number{
width: 40px;
height: 40px;
......
src/style/table.less
View file @ 78a5d931
......@@ -26,6 +26,10 @@
.el-button{
border: none;
padding: 0;
&.is-circle{
padding: 0;
background-color: transparent;
}
}
}
.icon-table{
......
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