From 72f553661a74b225c89310d3fb3d78f3ebe35f82 Mon Sep 17 00:00:00 2001 From: hanbaoshan <hanbaoshan@aiotlink.com> Date: 星期日, 28 二月 2021 10:45:04 +0800 Subject: [PATCH] m朔黄首页模拟数据更新 --- src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 342 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 177 insertions(+), 165 deletions(-) diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue index 23901ef..0b904a2 100644 --- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue +++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue @@ -26,15 +26,9 @@ v-show="!checkedConfigs.length" class="tip" style="padding-left: 5px; margin-top: 3px" - >杩樻湭閫夋嫨绛涢�夋潯浠�</span - > - <div - class="config-item" - v-for="(config, index) in checkedConfigs" - :key="index" - > - <span class="title">{{ config.title }}</span - > : + >杩樻湭閫夋嫨绛涢�夋潯浠�</span> + <div class="config-item" v-for="(config, index) in checkedConfigs" :key="index"> + <span class="title">{{ config.title }}</span> : <span class="val" v-for="option in config.data" :key="option.id"> <!-- <template> <div> @@ -46,25 +40,17 @@ <i>銆�</i> </span> </span> - <i - class="el-icon-close remove" - @click="removeCheckedConfig(config)" - ></i> + <i class="el-icon-close remove" @click="removeCheckedConfig(config)"></i> </div> <el-button class="clear-config-btn" v-if="checkedConfigs.length" size="mini" @click="clearCheckedConfigs" - >鍙栨秷閫夋嫨</el-button - > + >鍙栨秷閫夋嫨</el-button> </div> <div class="optional-config"> - <div - class="config" - v-for="(config, index) in optionalConfigs" - :key="index" - > + <div class="config" v-for="(config, index) in optionalConfigs" :key="index"> <template v-if="config.isShow"> <div class="title">{{ config.title }}</div> <div class="options-wrap"> @@ -73,41 +59,23 @@ :ref="'options' + config.id" :style="{ height: fixedOneLineHeight + 'px' }" > - <div - class="option" - v-for="(option, index) in config.data" - :key="index" - > + <div class="option" v-for="(option, index) in config.data" :key="index"> <div v-show="config.isMultCheck"> <el-checkbox v-model="option.isChecked"></el-checkbox> <span>{{ option.name }}</span> </div> - <div - v-show="!config.isMultCheck" - @click="checkOption(config, option)" - > + <div v-show="!config.isMultCheck" @click="checkOption(config, option)"> <span>{{ option.name }}</span> </div> </div> </div> <div class="btns text-center" v-show="config.isMultCheck"> - <el-button size="mini" @click="cancleMultCheck(config)" - >鍙栨秷</el-button - > - <el-button - size="mini" - type="primary" - @click="checkOption(config)" - >纭畾</el-button - > + <el-button size="mini" @click="cancleMultCheck(config)">鍙栨秷</el-button> + <el-button size="mini" type="primary" @click="checkOption(config)">纭畾</el-button> </div> </div> <div class="right-btns"> - <div - class="more" - v-if="config.showMore" - @click="showMore(config)" - > + <div class="more" v-if="config.showMore" @click="showMore(config)"> <span>鏇村</span> <i :class=" @@ -130,11 +98,7 @@ <div class="config" v-if="showAdvance"> <div class="title">楂樼骇閫夐」</div> <div> - <el-menu - class="el-menu-demo" - mode="horizontal" - @select="handleSelect" - > + <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect"> <el-submenu class="config-submenu" :popper-append-to-body="false" @@ -148,8 +112,8 @@ :key="ind" :index="index + '-' + ind" @click="checkOption(config, option)" - >{{ option.name }}</el-menu-item - > + class="highlevel-option" + >{{ option.name }}</el-menu-item> </el-submenu> </el-menu> </div> @@ -160,22 +124,14 @@ <div class="header-bar clearfix"> <div class="left"> <div> - <el-select - v-model="IsFollow" - size="mini" - @change="filterSearchData" - > + <el-select v-model="IsFollow" size="mini" @change="filterSearchData"> <el-option value label="鍏ㄩ儴"></el-option> <el-option :value="false" label="鏈叧娉�"></el-option> <el-option :value="true" label="宸插叧娉�"></el-option> </el-select> </div> <div> - <el-select - v-model="IsOperate" - size="mini" - @change="filterSearchData" - > + <el-select v-model="IsOperate" size="mini" @change="filterSearchData"> <el-option value label="鍏ㄩ儴"></el-option> <el-option value="0" label="鏈鐞�"></el-option> <el-option value="1" label="宸插鐞�"></el-option> @@ -191,26 +147,15 @@ > <i class="el-icon-menu"></i> </div> - <div - class="type" - :class="{ current: showType == 'list' }" - @click="checkType('list')" - > + <div class="type" :class="{ current: showType == 'list' }" @click="checkType('list')"> <i class="el-icon-s-operation"></i> </div> </div> </div> </div> <div class="content" v-show="showType == 'menu'"> - <el-row :gutter="20"> - <el-col - :xs="8" - :sm="6" - :md="6" - :lg="6" - v-for="data in tabData" - :key="data.id" - > + <el-row :gutter="20" > + <el-col :xs="8" :sm="6" :md="6" :lg="6" v-for="data in tabData" :key="data.id"> <div class="card"> <div class="video-wrap" @click="checkVideoDetail(data)"> <img :src="data.VideoCover" alt /> @@ -235,47 +180,33 @@ </div> </div> <div class="mark-info"> - <div - class="abnormal" - v-if="data.LableLst && data.LableLst.length" - > + <div class="abnormal" v-if="data.LableLst && data.LableLst.length"> <span + class="abnormal-label" v-for="(label, index) in data.LableLst" :key="index" - >{{ label.Desc +(index==data.LableLst.length-1?"":"锛�")}}</span - > + >{{ label.Desc +(index==data.LableLst.length-1?"":"锛�")}}</span> </div> - <div v-else > + <div v-else> <span>鏃犲紓甯�</span> </div> - <div - class="event-tag" - v-if="data.EventLst && data.EventLst.length" - > + <div class="event-tag" v-if="data.EventLst && data.EventLst.length"> <el-tag size="mini" type="info" v-for="(label, index) in data.EventLst" :key="index" style="margin-right:5px;margin-bottom:5px" - >{{ label.Event }}</el-tag - > + @click="checkEventVideo(label)" + >{{ label.Event }}</el-tag> </div> </div> <div class="tag-info"> - <div - class="tag" - v-for="(tag, index) in data.tags" - :key="index" - > - {{ tag }} - </div> + <div class="tag" v-for="(tag, index) in data.tags" :key="index">{{ tag }}</div> </div> </div> <div class="star" @click="toggleFollow(data)"> - <i - :class="[data.IsFollow ? 'follow' : '', 'el-icon-star-off']" - ></i> + <i class="iconfont" :class="[data.IsFollow ? 'follow' : '', 'iconguanzhu']"></i> </div> </div> </el-col> @@ -296,33 +227,24 @@ <el-table :data="tableData" fit ref="elTable"> <el-table-column label="鍚嶇О" prop="VideoName" sortable width="500"> <template slot-scope="scope"> - <div style="cursor: pointer" @click="checkVideoDetail(scope.row)"> - {{ scope.row.VideoName }} - </div> + <div + style="cursor: pointer" + @click="checkVideoDetail(scope.row)" + >{{ scope.row.VideoName }}</div> </template> </el-table-column> - <el-table-column - label="澶у皬" - prop="VideoSize" - sortable - ></el-table-column> - <el-table-column - label="淇敼鏃ユ湡" - prop="UpdatedAt" - sortable - ></el-table-column> - <el-table-column - label="鍒涘缓鏃ユ湡" - prop="CreatedAt" - sortable - ></el-table-column> + + <el-table-column label="澶у皬" prop="VideoSize" sortable></el-table-column> + <el-table-column label="淇敼鏃ユ湡" prop="VideoUpdateDate" sortable></el-table-column> + <el-table-column label="鍒涘缓鏃ユ湡" prop="VideoCreateDate" sortable></el-table-column> + <el-table-column label="鎿嶄綔"> <template slot-scope="scope"> <div class="operation"> - <i - class="el-icon-star-off" - @click="toggleFollow(scope.row)" - ></i> + <div class="star" @click="toggleFollow(scope.row)"> + <i class="iconfont" :class="[scope.row.IsFollow ? 'follow' : '', 'iconguanzhu']"></i> + </div> + <!-- <i class="el-icon-star-off" @click="toggleFollow(scope.row)"></i> --> </div> </template> </el-table-column> @@ -351,6 +273,17 @@ </div> <video-analyze :videoDetails="selectedVideo" /> </el-dialog> + <el-dialog + class="dialog-event" + :visible="eventDialogVisible" + @close="eventDialogVisible = false" + > + <div class="title" slot="title"> + <i class="el-icon-connection"></i> + <span>{{curEvName}}瑙嗛</span> + </div> + <event-videos :eventVideoArr="eventVideoArr"></event-videos> + </el-dialog> </div> </div> </template> @@ -364,15 +297,17 @@ getLabelMap, delLabel, editLabel, + getEventVideo } from "@/api/shuohuang"; import VideoAnalyze from "./videoAnalyze"; - +import EventVideos from "./eventVideos"; export default { name: "SearchMain", components: { VideoAnalyze, + EventVideos }, - data() { + data () { return { CLIP: "http://", keyword: "", @@ -385,7 +320,7 @@ curTabPage: 1, curTablePage: 1, tabPageSize: 8, - pageSizes: [2, 8, 12, 24], + pageSizes: [ 8, 12, 24], tabTotal: 0, tablePageSize: 8, tableTotal: 0, @@ -394,7 +329,7 @@ shortcuts: [ { text: "浠婂ぉ", - onClick(picker) { + onClick (picker) { const end = new Date(); const start = new Date(); start.setHours(0, 0, 0); @@ -403,7 +338,7 @@ }, { text: "鏄ㄥぉ", - onClick(picker) { + onClick (picker) { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24); @@ -415,7 +350,7 @@ }, { text: "杩戜笁澶�", - onClick(picker) { + onClick (picker) { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); @@ -424,7 +359,7 @@ }, { text: "杩戜竴鍛�", - onClick(picker) { + onClick (picker) { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); @@ -484,33 +419,45 @@ hiddenDanger: 1, labelDialogVisible: false, selectedVideo: {}, + eventDialogVisible: false, + curEvName: '', + eventVideoArr: [] }; }, watch: { checkedConfigs: { - handler(n, o) { + handler (n, o) { this.filterSearchData(); }, deep: true, }, }, - mounted() { + mounted () { this.init(); }, methods: { - handleTabSizeChange(size) { + checkEventVideo (label) { + this.eventDialogVisible = true; + this.curEventDetail = label; + let _this = this; + getEventVideo({ Event: label.Event, LkgID: label.ParentID }).then(res => { + _this.eventVideoArr = res.data; + _this.curEvName = label.Event; + }) + }, + handleTabSizeChange (size) { this.tabPageSize = size; this.filterSearchData(); }, - handleTableSizeChange(size) { + handleTableSizeChange (size) { this.tablePageSize = size; this.filterSearchData(); }, - handleCurrentChange() { + handleCurrentChange () { this.filterSearchData(); }, //浜岀骇鏌ヨ - filterSearchData() { + filterSearchData () { let _this = this; let isFollow = ""; if (this.IsFollow === "") { @@ -552,12 +499,25 @@ } else { _this.tabTotal = res.total; _this.tabData = res.data; - + _this.tabData = _this.tabData.map(function (item) { + const set = new Set() + item.LableLst.forEach(function (label) { + label.Desc.split("锛�").forEach(function (d) { + set.add(d) + }) + }) + const lblst = [] + set.forEach(function (d) { + lblst.push({ Desc: d }) + }) + item.LableLst = lblst + return item + }) } }); }, //涓�绾ф煡璇� - init() { + init () { let _this = this; let query = { KeyWord: this.keyword, @@ -580,9 +540,8 @@ } else { _this.tabTotal = res.total; _this.tabData = res.data; - // debugger - _this.tabData = _this.tabData.map(function (item) { - const set =new Set() + _this.tabData = _this.tabData.map(function (item) { + const set = new Set() item.LableLst.forEach(function (label) { label.Desc.split("锛�").forEach(function (d) { set.add(d) @@ -590,9 +549,9 @@ }) const lblst = [] set.forEach(function (d) { - lblst.push({Desc:d}) + lblst.push({ Desc: d }) }) - item.LableLst=lblst + item.LableLst = lblst return item }) } @@ -640,7 +599,7 @@ }); }); }, - toggleFollow(data) { + toggleFollow (data) { data.IsFollow = !data.IsFollow; this.updataVideo(data); if (data.IsFollow) { @@ -650,24 +609,24 @@ }); } }, - updataVideo(data) { + updataVideo (data) { let _this = this; updateVideoAnalyze(data).then((res) => { //浜岀骇鏌ヨ }); }, - checkVideoDetail(data) { + checkVideoDetail (data) { let _this = this; _this.selectedVideo = data; _this.videoDialogVisible = true; }, - checkFollow() {}, - checkType(type) { + checkFollow () { }, + checkType (type) { this.showType = type; this.filterSearchData(); }, - clearCheckedConfigs() { + clearCheckedConfigs () { this.checkedConfigs.forEach((config) => { config.isShow = true; config.data.forEach((d) => { @@ -677,7 +636,7 @@ this.checkedConfigs = []; this.showAdvance = true; }, - removeCheckedConfig(config) { + removeCheckedConfig (config) { config.isShow = true; if (config.IsAdvanced) { this.showAdvance = true; @@ -688,7 +647,7 @@ let index = this.checkedConfigs.findIndex((one) => one.id == config.id); this.checkedConfigs.splice(index, 1); }, - checkOption(config, option) { + checkOption (config, option) { if (option) { option.isChecked = true; } @@ -704,20 +663,20 @@ // }) }, - cancleMultCheck(config) { + cancleMultCheck (config) { config.isMultCheck = false; config.data.forEach((opt) => { opt.isChecked = false; }); }, - handleSelect(key, keyPath) {}, - showMore(config) { + handleSelect (key, keyPath) { }, + showMore (config) { config.isShowMore = !config.isShowMore; this.$refs[`options${config.id}`][0].style.height = config.isShowMore ? this.$refs[`options${config.id}`][0].scrollHeight + "px" : this.fixedOneLineHeight + "px"; }, - toggleMultCheck(config) { + toggleMultCheck (config) { config.isMultCheck = !config.isMultCheck; this.optionalConfigs.forEach((conf) => { if (conf.id == config.id) { @@ -726,7 +685,7 @@ conf.isMultCheck = false; }); }, - dataSearch() { + dataSearch () { console.log(this.checkedConfigs); this.$forceUpdate(); }, @@ -736,7 +695,9 @@ <style lang="scss"> .search-for-video-analyze { - padding: 20px 30px; + //padding: 20px 30px; + //鍑烘í鍚戞粴鍔ㄦ潯 + padding: 20px 40px; .flex-box { display: flex; } @@ -799,6 +760,8 @@ width: 100px; text-align: left; background: #f3f3f3; + color: rgb(133, 133, 133); + background: #ecf0fc; } .options-wrap { flex: 1; @@ -830,23 +793,25 @@ justify-content: flex-end; .more { margin-top: 6px; - padding: 0px 12px; + padding: 0px 6px; border: 1px solid #ccc; margin-right: 10px; - width: 48px; + width: 44px; height: 26px; line-height: 26px; + border-radius: 2px; &:hover { color: #6486e7; } } .multCheck { margin-top: 6px; - width: 48px; + width: 44px; height: 26px; line-height: 26px; - padding: 0px 12px; + padding: 0px 6px; border: 1px solid #ccc; + border-radius: 2px; &:hover { color: #7695ec; border-color: #7695ec; @@ -873,6 +838,8 @@ height: 40px; line-height: 40px; border: none; + color: #2c3e50; + font-size: 12px; } .el-menu--popup { display: flex; @@ -880,6 +847,13 @@ li.el-menu-item { display: inline-block; min-width: auto; + } + } + .highlevel-option { + font-size: 12px; + color: #2c3e50; + &:hover { + color: #6486e7; } } } @@ -892,8 +866,7 @@ .data-list { margin-top: 20px; .header-bar { - padding-bottom: 5px; - border-bottom: 1px solid #ddd; + padding-bottom: 10px; .left { float: left; display: flex; @@ -926,7 +899,20 @@ } } .content { - padding-top: 14px; + //padding-top: 14px; + background: #f5f5f5; + background: #fff; + margin: 0 -30px; + margin-bottom: -30px; + padding: 0; + // .el-row { + // display: flex; + // flex-wrap: wrap; + // } + .el-row { + padding-top: 20px; + background: #f5f5f5; + } .el-col { margin-bottom: 10px; } @@ -934,9 +920,13 @@ cursor: pointer; position: relative; text-align: left; - border: 1px solid #dedede; + background: #fff; border-radius: 5px; - height: 350px; + height: 360px; + margin-bottom: 10px; + &:hover { + box-shadow: 3px 2px 5px 1px rgba(0, 0, 0, 0.3); + } .video-wrap { border-radius: 3px; width: 100%; @@ -958,7 +948,7 @@ padding: 10px; .base-info { > div { - margin-bottom: 5px; + margin-bottom: 1px; } label { color: #999; @@ -970,8 +960,11 @@ color: #3d68e1; .abnormal { color: red; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } - .event-tag{ + .event-tag { margin-top: 10px; } } @@ -1005,11 +998,19 @@ } .operation { cursor: pointer; + .star{ + color: #ccc; + } + .follow{ + color: #409eff; + } } } .pagination-center { text-align: center; - margin: 10px auto; + margin: 0 -10px; + padding: 10px 0 20px; + background: #f5f5f5; } } .dialog-video { @@ -1041,6 +1042,17 @@ font-size: 18px; } } + .dialog-event { + z-index: 2096 !important; + .el-dialog { + width: 1000px; + height: 800px; + background: #efefef; + .el-dialog__body { + padding: 0; + } + } + } } } </style> \ No newline at end of file -- Gitblit v1.8.0