Skip to content

N
national_museum_vod
Commit 0fb54293 authored by xulili's avatar xulili
Browse files
Options

conflict resolve

parents 097174d2 a0ff0c1c
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 12297 deletions
package-lock.json deleted 100644 → 0
View file @ 097174d2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/page/STB/appversion/components/addDialog.vue
View file @ 0fb54293
......@@ -3,22 +3,20 @@
class="custom-dialog"
custom-class="party-dialog"
title="上传新版安装包"
width="540px"
width="468px"
:visible.sync="formVisible"
:before-close="close"
>
<div class="dialog-content">
<el-form
:model="formItem"
class="party-form"
class="party-form version-add"
ref="formItem"
label-width="125px"
label-position="right"
label-position="top"
:rules="rules"
>
<el-form-item label="版本号：" prop="appVersion">
<el-input
size="small"
v-model="formItem.appVersion"
clearable
placeholder="请输入版本号"
......@@ -27,14 +25,12 @@
<el-form-item label="版本信息：" prop="versionInfo">
<el-input
type="textarea"
size="small"
v-model="formItem.versionInfo"
></el-input>
</el-form-item>
<el-form-item label="更新内容：" prop="updateContent">
<el-input
type="textarea"
size="small"
v-model="formItem.updateContent"
></el-input>
</el-form-item>
......@@ -55,10 +51,9 @@
</el-form>
</div>
<div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="submitForm('formItem')"
>确定</el-button
>
<el-button size="mini" @click="close">取 消</el-button>
<el-button size="mini" type="primary" @click="submitForm('formItem')">确定</el-button>
</div>
</el-dialog>
</template>
......@@ -87,10 +82,12 @@ export default {
methods: {
backFn() {
this.formVisible = true
this.formItem = {}
this.fileList = []
this.$nextTick(() => {
this.$refs.formItem.clearValidate()
});
this.formItem = {}
},
// 关闭
close() {
......@@ -164,12 +161,16 @@ export default {
<style lang="less">
@import "~@/style/dialog.less";
.text-center {
.version-add {
.el-upload-dragger {
height: 120px;
.el-icon-upload {
margin-top: 10px;
}
}
.text-center {
text-align: center;
}
.custom-dialog {
.party-form .el-input {
width: 100%;
}
}
</style>
\ No newline at end of file
src/page/STB/appversion/components/detailDialog.vue
View file @ 0fb54293
......@@ -2,54 +2,31 @@
<el-dialog
custom-class="party-dialog"
title="详情"
width="540px"
width="468px"
:visible.sync="formVisible"
:before-close="close"
>
<div class="dialog-content">
<el-form
:model="formItem"
class="party-form"
class="party-form version-detail"
ref="formItem"
label-width="180px"
label-position="right"
label-position="top"
>
<el-form-item label="上传时间：" prop="createTime">
<el-input
size="small"
v-model="formItem.createTime"
disabled
></el-input>
<span class="input-item">{{formItem.createTime}}</span>
</el-form-item>
<el-form-item label="操作者：" prop="userName">
<el-input
size="small"
v-model="formItem.userName"
disabled
></el-input>
<span class="input-item">{{formItem.userName}}</span>
</el-form-item>
<el-form-item label="是否为当前使用版本：">
<el-input
size="small"
:value="formItem.isCurrent ? '是' : '否'"
disabled
></el-input>
<span class="input-item">{{formItem.isCurrent ? '是' : '否'}}</span>
</el-form-item>
<el-form-item label="版本信息：" prop="versionInfo">
<el-input
type="textarea"
size="small"
v-model="formItem.versionInfo"
disabled
></el-input>
<span class="input-item">{{formItem.versionInfo}}</span>
</el-form-item>
<el-form-item label="更新内容：" prop="updateLog">
<el-input
type="textarea"
size="small"
v-model="formItem.updateLog"
disabled
></el-input>
<span class="input-item">{{formItem.updateLog}}</span>
</el-form-item>
</el-form>
</div>
......@@ -82,4 +59,11 @@ export default {
<style lang="less">
@import "~@/style/dialog.less";
.version-detail {
.input-item {
font-size: 16px;
color:#333;
}
}
</style>
\ No newline at end of file
src/page/STB/appversion/index.vue
View file @ 0fb54293
......@@ -41,19 +41,21 @@
type="index"
width="120"
label="序号"
align="center"
></el-table-column>
<el-table-column
label="app版本号"
prop="appVersion"
align="center"
></el-table-column>
<el-table-column label="是否为最新版本">
<el-table-column align="center" label="是否为最新版本">
<template slot-scope="scope">
<span>{{ scope.row.isCurrent ? "是" : "否" }}</span>
</template>
</el-table-column>
<el-table-column label="上传时间" prop="createTime"></el-table-column>
<el-table-column label="操作者" prop="userName"></el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<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">
<el-tooltip content="详情" placement="top">
......
src/page/STB/base/components/dialog.vue
View file @ 0fb54293
......@@ -2,7 +2,7 @@
<el-dialog
custom-class="party-dialog"
:title="title"
width="540px"
width="468px"
:visible.sync="formVisible"
:before-close="close"
>
......@@ -12,12 +12,11 @@
class="party-form"
ref="formItem"
label-width="125px"
label-position="right"
label-position="top"
:rules="rules"
>
<el-form-item label="所属单位：" prop="orgId">
<el-select
size="small"
v-model="formItem.orgId"
clearable
placeholder="请选择所属单位"
......@@ -33,7 +32,6 @@
</el-form-item>
<el-form-item label="机构地理位置：" prop="areaName">
<el-input
size="small"
v-model="formItem.areaName"
disabled
></el-input>
......@@ -41,8 +39,8 @@
</el-form>
</div>
<div slot="footer" class="dialog-footer btn-group">
<el-button type="primary" @click="submitForm('formItem')">确定</el-button>
<el-button @click="close">取 消</el-button>
<el-button type="primary" @click="submitForm('formItem')">确定</el-button>
</div>
</el-dialog>
</template>
......
src/page/STB/base/index.vue
View file @ 0fb54293
......@@ -38,22 +38,7 @@
<div class="btn-group">
<el-button type="primary" @click="addBox">新建机顶盒账号</el-button>
</div>
<div class="party-table">
<el-table
border
style="width: 100%; height: 100%"
height="100%"
:data="tableData"
>
<el-table-column
type="index"
width="120"
label="序号"
></el-table-column>
<el-table-column label="MAC地址" prop="mac"></el-table-column>
<el-table-column label="所属单位" prop="organName"></el-table-column>
</el-table>
</div>
<party-table :feildList="feildList" :list="tableData"/>
<div class="partyt-pagination" style="margin: 0 20px">
<el-pagination
background
......@@ -70,11 +55,12 @@
</template>
<script>
import { partyPagination } from "@/components/index";
import partyTable from "@/components/table.vue";
import customDialog from "./components/dialog.vue";
import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js";
export default {
components: { partyPagination, customDialog },
components: { partyPagination, customDialog,partyTable },
data() {
return {
page: {
......@@ -82,6 +68,10 @@ export default {
pageSize: 10,
total: 0
},
feildList: [
{ prop: "mac", label: "MAC地址" },
{ prop: "organName", label: "所属单位" }
],
orgOptions: [], // 单位信息
areaOptions: [], //区域信息
defaultProps: {
......
src/page/STB/interactive/index.vue
View file @ 0fb54293
......@@ -35,12 +35,10 @@
<div class="title">“北京市政府”展板互动信息汇总</div>
<div class="page-tip">
<span class="page-tip-title">页面说明:</span>
<span class="page-tips"
>可查看某个组织机构的互动信息</span
>
<span class="page-tips">可查看某个组织机构的互动信息</span>
</div>
</div>
<div class="scrollBox">
<div class="scrollBox" v-show="tableData.length">
<div
class="content-item"
v-for="(item, index) in tableData"
......@@ -48,16 +46,17 @@
>
<h5 class="title">{{ item.name }}</h5>
<p>{{ item.content }}</p>
<div class="img-box">
<div class="img-box" v-if="item.images.length">
<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">
<div>{{ item.username }}</div>
<div>{{ item.createTime }}</div>
</div>
</div>
</div>
<div class="partyt-pagination" style="margin: 0 20px">
<div class="partyt-pagination" style="margin: 0 20px" v-show="tableData.length">
<el-pagination
background
@current-change="handleCurrentChange"
......@@ -78,7 +77,7 @@ export default {
page: {
currentPage: 1,
pageSize: 10,
total: 0
total: 0,
},
treeData: [],
defaultProps: {
......@@ -96,19 +95,19 @@ export default {
},
mounted() {
// 获取全部组织机构数据
this.getOrgData()
this.onSearch()
this.getOrgData();
// this.onSearch()
},
methods: {
// 查询
onSearch() {
this.page.currentPage = 1
this.getTableData()
this.page.currentPage = 1;
this.getTableData();
},
// 获得数据接口
getTableData() {
let vm = this
vm.tableData = []
let vm = this;
vm.tableData = [];
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
......@@ -124,29 +123,31 @@ 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;
if(!vm.tableData.length){
this.$message('暂无数据')
return false
}
vm.tableData.forEach((item) => {
item.images = item.images.split(",")
item.images = item.images ? item.images.split(",") : [];
item.images.forEach((result, index) => {
if (/\.(MP4|mp4)/.test(result)) {
item.images[index] = require("@/assets/video-icon.png")
item.images[index] = require("@/assets/video-icon.png");
} else if (/\.(MP3|mp3)/.test(result)) {
item.images[index] = require("@/assets/audio-icon.png")
} else {
item.images[index] = require("@/assets/default-img.jpeg")
item.images[index] = require("@/assets/audio-icon.png");
}
})
})
});
});
vm.tableData = [...vm.tableData]
vm.tableData = [...vm.tableData];
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
})
.catch(function (err) {
console.log(err)
console.log(err);
});
},
// 获取组织机构数据
......@@ -158,13 +159,13 @@ export default {
}).then(
(res) => {
if (res.data.resultCode === "200") {
this.treeData = res.data.data
this.treeData = res.data.data;
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
},
(error) => {
console.log(error)
console.log(error);
}
);
},
......@@ -176,12 +177,12 @@ export default {
// 点击节点事件
handleNodeClick(data) {
this.selectAreaId = data.id;
this.onSearch()
this.onSearch();
},
// 分页
handleCurrentChange(val) {
this.page.currentPage = val
this.getTableData()
this.page.currentPage = val;
this.getTableData();
},
},
};
......
src/page/STB/operation/index.vue
View file @ 0fb54293
......@@ -56,14 +56,13 @@
type="index"
width="120"
label="序号"
align="center"
></el-table-column>
<el-table-column label="mac地址" prop="mac"></el-table-column>
<el-table-column label="所属单位" prop="organName"></el-table-column>
<el-table-column label="机顶盒状态" prop="status">
<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 v-if="scope.row.status === 1">待激活</span>
<span v-if="scope.row.status === 2">已激活</span>
<span v-if="scope.row.status === 3">故障</span>
<span>{{statusOptions[scope.row.status-1].label}}</span>
</template>
</el-table-column>
</el-table>
......
src/page/check/display/index.vue
View file @ 0fb54293
......@@ -556,7 +556,7 @@ export default {
this.editForm = resData;
// this.ruleForm = data;
// this.ruleForm = {
// assetCopyrightOwnerId :data.assetCopyrightOwnerId,
// videoContentCopyrightOwnerId :data.videoContentCopyrightOwnerId,
// assetId:data.assetId,
// assetTypeId:data.assetTypeId,
// boardCopyrightOwnerId:data.boardCopyrightOwnerId,
......
src/page/content/components/uploadVue/uploadFile.vue
View file @ 0fb54293
......@@ -2,7 +2,7 @@
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/video/upload"
action="http://192.168.110.67/mall/file/video/content/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
......
src/page/content/display/classify/index.vue
View file @ 0fb54293
......@@ -417,10 +417,10 @@ export default {
// }
// _this.editform= Object.assign({}, row);
_this.FormVisible1 = true;
this.getAssetTypeInfo(row.id)
this.getVideoContentCatInfo(row.id)
},
// 获取展板分类详情
getAssetTypeInfo(id){
getVideoContentCatInfo(id){
let vm = this;
vm.$https(
{
......
src/page/content/display/content/add.vue
View file @ 0fb54293
......@@ -75,7 +75,7 @@
<el-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
v-model="ruleForm.assetCopyrightOwnerId"
v-model="ruleForm.videoContentCopyrightOwnerId"
>
<el-option
v-for="item in copyrightOwner"
......@@ -88,9 +88,9 @@
<el-form-item label="请选择预设视频分类">
<el-select
placeholder="请选择预设视频分类"
@focus="getAssetTypeData"
v-model="ruleForm.assetTypeId"
@change="getAssetType"
@focus="getVideoContentCatData"
v-model="ruleForm.videoContentCatId"
@change="getVideoContentCat"
>
<el-option
v-for="item in videoContentCat"
......@@ -104,10 +104,10 @@
<el-select
placeholder="请选择视频"
@focus="getVideoData"
v-model="ruleForm.assetId"
v-model="ruleForm.videoContentId"
>
<el-option
v-for="item in assetId"
v-for="item in videoContentId"
:label="item.name"
:value="item.id"
:key="item.id"
......@@ -162,7 +162,7 @@ export default {
copyrightOwner: [],
boardCopyrightOwnerId:[],
exhibitionBoardCatId:[],
assetId:[],
videoContentId:[],
type: this.$route.query.type,
dialogVisible: false,
formLabelWidth: "100px",
......@@ -174,8 +174,8 @@ export default {
ruleForm: {
name: "",
boardCopyrightOwnerId:"",
assetCopyrightOwnerId: "",
assetTypeId: "",
videoContentCopyrightOwnerId: "",
videoContentCatId: "",
videoUrlList: []
},
videoContentCat: [
......@@ -233,7 +233,7 @@ export default {
},
// 视频版权方名称id
videoCopyright(idlist) {
this.ruleForm.assetCopyrightOwnerId = idlist;
this.ruleForm.videoContentCopyrightOwnerId = idlist;
},
// 缩略图地址
imgUrl(url) {
......@@ -248,14 +248,14 @@ export default {
videoList(list) {
this.ruleForm.videoUrlList = list;
},
getAssetType(data) {
getVideoContentCat(data) {
console.log(data);
console.log(this.ruleForm.assetTypeId);
console.log(this.ruleForm.videoContentCatId);
},
init() {
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
this.getAssetTypeData();
this.getVideoContentCatData();
this.getAssetCopyrightData();
this.getExhibitionBoardCatId();
this.getBoardCopyrightOwnerId();
......@@ -278,9 +278,9 @@ export default {
// this.ruleForm = data;
console.log(this.ruleForm)
this.ruleForm = {
assetCopyrightOwnerId :data.assetCopyrightOwnerId,
assetId:data.assetId,
assetTypeId:data.assetTypeId,
videoContentCopyrightOwnerId :data.videoContentCopyrightOwnerId,
videoContentId:data.videoContentId,
videoContentCatId:data.videoContentCatId,
boardCopyrightOwnerId:data.boardCopyrightOwnerId,
cover:data.cover,
exhibitionBoardCatId:data.exhibitionBoardCatId,
......@@ -453,7 +453,7 @@ export default {
});
},
// 获取视频分类列表
getAssetTypeData() {
getVideoContentCatData() {
let vm = this;
vm.$https({
url: "videoContentCat/getList",
......@@ -478,7 +478,7 @@ export default {
})
.then(res => {
let data = res.data.data;
this.assetId = data;
this.videoContentId = data;
})
.catch(function(err) {
console.log(err);
......
src/page/content/display/copyright/index---.vue
View file @ 0fb54293
......@@ -46,7 +46,7 @@
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="展板分类" prop="assetTypeNames"></el-table-column>
<el-table-column show-overflow-tooltip label="展板分类" prop="exhibitionBoardCatNames"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
......
src/page/content/display/copyright/index.vue
View file @ 0fb54293
......@@ -441,10 +441,10 @@ export default {
// }
// _this.editform= Object.assign({}, row);
_this.FormVisible1 = true;
this.getAssetTypeInfo(row.id)
this.getVideoContentCatInfo(row.id)
},
// 获取视频分类详情
getAssetTypeInfo(id){
getVideoContentCatInfo(id){
let vm = this;
vm.$https(
{
......
src/page/content/learn/content/add.vue
View file @ 0fb54293
<template>
<div class="info">
<!-- <audio-play></audio-play> -->
<video-dialog></video-dialog>
<!-- <video-dialog></video-dialog> -->
<div class="info-header">新建学习内容</div>
<div class="info-container">
<div class="info-wrapper">
......@@ -88,12 +88,11 @@
style="width: 100%;height:300px;overflow:auto;"
height="100%"
ref="multipleTable"
:data="tableData"
>
:data="tableData">
<el-table-column type="selection" width="55" ></el-table-column>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="展板类别" prop="assetCopyrightOwnerName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板类别" prop="exhibitionBoardCatName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
<el-table-column label="操作" width="180">
<template slot-scope="scope">
......
src/page/content/learn/content/index.vue
View file @ 0fb54293
......@@ -46,7 +46,7 @@
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="assetTypeNames"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
......
src/page/content/video/content/add.vue
View file @ 0fb54293
......@@ -45,7 +45,7 @@
<el-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
v-model="ruleForm.assetCopyrightOwnerId"
v-model="ruleForm.videoContentCopyrightOwnerId"
>
<el-option
v-for="item in copyrightOwner"
......@@ -163,7 +163,7 @@ export default {
value1: [],
ruleForm: {
name: "",
assetCopyrightOwnerId:"",
videoContentCopyrightOwnerId:"",
assetTypeId: "",
thumbnail:"",
videoUrlList:[]
......@@ -227,7 +227,7 @@ export default {
methods: {
// 视频版权方名称id
videoCopyright(idlist){
this.ruleForm.assetCopyrightOwnerId = idlist
this.ruleForm.videoContentCopyrightOwnerId = idlist
},
// 缩略图地址
imgUrl(url){
......@@ -265,7 +265,7 @@ export default {
// this.ruleForm = data;
this.ruleForm.id = data.id
this.ruleForm.name = data.name
this.ruleForm.assetCopyrightOwnerId = data.assetCopyrightOwnerId
this.ruleForm.videoContentCopyrightOwnerId = data.videoContentCopyrightOwnerId
this.ruleForm.assetTypeId = data.assetTypeId
this.ruleForm.thumbnail = data.thumbnail
this.ruleForm.videoUrlList = data.videoUrlList
......@@ -324,7 +324,7 @@ export default {
// 新增
submitForm(formName) {
this.$refs[formName].validate(valid => {
// this.ruleForm.assetCopyrightOwnerId = ["1373225989501456385"]
// this.ruleForm.videoContentCopyrightOwnerId = ["1373225989501456385"]
// this.ruleForm.assetTypeIdList = []
// this.ruleForm.videoUrlList = [
// "http://111.203.232.175:8085/group1/M00/00/39/wKhuVWBgIvaANgtZAAAAAAAAAAA947.mp4"
......
src/page/content/video/content/index.vue
View file @ 0fb54293
......@@ -47,8 +47,8 @@
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="视频名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方" prop="assetCopyrightOwnerName"></el-table-column>
<el-table-column label="视频分类" prop="assetTypeName"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
<el-table-column label="视频分类" prop="videoContentCatName"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
......
src/page/content/video/copyright/index.vue
View file @ 0fb54293
......@@ -46,7 +46,7 @@
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="assetTypeNames"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
......
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