Skip to content

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

视频管理

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