Skip to content

C
confucius
Commit 7da1a264 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 60522ff0 aaccbfb6
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 26 deletions
src/App.vue
View file @ 7da1a264
......@@ -20,7 +20,7 @@ export default {
</script>
<style>
@import url("//at.alicdn.com/t/font_2077629_4yvj1vbqih.css");
@import url("//at.alicdn.com/t/font_2077629_spbvq8xiwk.css");
.q-scrollarea__thumb {
z-index: 999999 !important;
}
......
src/components/enterprise/material/allmaterial.vue
View file @ 7da1a264
......@@ -17,11 +17,11 @@
</template>
<template v-slot:body-cell-Content="props">
<q-td :props="props" style="max-width: 500px;white-space: normal;word-break:break-all">
<div >
<q-td :props="props" style="max-width: 500px;white-space: normal;word-break:break-all;">
<div style="display: flex;align-items: center;">
<span v-if="props.row.Type==1">{{getType(props.row,'content')}}</span>
<q-img v-if="props.row.Type==2 || props.row.Type==3 || props.row.Type==6"
:src="getType(props.row,'content')" style="width: 80px;height: 80px;border-radius: 6px;display: flex;">
:src="getType(props.row,'content')" style="width: 100px;height: 100px;border-radius: 6px;display: flex;">
</q-img>
<!-- <audio controls="controls"
......@@ -56,6 +56,18 @@
" class="iconfont icon-word"></i>
<i v-else class="iconfont icon-excel"></i>
</div>
<q-icon v-if="(props.row.Type==2 || props.row.Type==4 || props.row.Type==5 || props.row.Type==6 || props.row.Type==7)&& props.row.Media_Id && props.row.Media_Id!=''"
size="20px" name="iconfont icon-yiqueren" color="green" style="margin-left: 10px;" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
已更新
</q-tooltip>
</q-icon>
<q-icon v-if="(props.row.Type==2 || props.row.Type==4 || props.row.Type==5 || props.row.Type==6 || props.row.Type==7)&& props.row.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" style="margin-left: 10px;" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
</q-icon>
</div>
</q-td>
......
src/components/enterprise/material/appletmaterial.vue
View file @ 7da1a264
......@@ -27,6 +27,20 @@
style="padding: 0;padding: 0 5px;font-size: 12px;">
{{x.AppletModel&& x.AppletModel.Title?x.AppletModel.Title:''}}
</div>
<q-icon
v-if="x.Media_Id && x.Media_Id!=''" class="absolute all-pointer-events"
size="22px" name="iconfont icon-yiqueren" color="green" style="top: 8px; right: 8px">
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
已更新
</q-tooltip>
</q-icon>
<q-icon
v-if="x.Media_Id==''" class="absolute all-pointer-events"
size="22px" name="iconfont icon-yiquxiao" color="red" style="top: 8px; right: 8px">
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
</q-icon>
</q-img>
<div class="onetext" style="margin-top: 5px;">上传者:{{x.UpdateByName}}</div>
<div class="onetext" style="margin-top: 5px;">分钟:{{x.MediumGroupName}}</div>
......
src/components/enterprise/material/audiomaterial.vue
View file @ 7da1a264
......@@ -19,6 +19,20 @@
<div
style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
<span>{{x.UpdateTime}}</span>
<q-icon
v-if="x.Media_Id && x.Media_Id!=''"
size="20px" name="iconfont icon-yiqueren" color="green" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
已更新
</q-tooltip>
</q-icon>
<q-icon
v-if="x.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
</q-icon>
<!-- <q-btn class="q-mr-md" label="编辑" size="xs" color="accent" style="margin-right: 0;" @click.stop="goedit(x)" /> -->
<!-- <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;"
@click.stop="goedit(x)"></i> -->
......
src/components/enterprise/material/filematerial.vue
View file @ 7da1a264
......@@ -19,6 +19,20 @@
<div
style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
<span>{{x.UpdateTime}}</span>
<q-icon
v-if="x.Media_Id && x.Media_Id!=''"
size="20px" name="iconfont icon-yiqueren" color="green" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
已更新
</q-tooltip>
</q-icon>
<q-icon
v-if="x.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
</q-icon>
<!-- <q-btn class="q-mr-md" label="编辑" size="xs" color="accent" style="margin-right: 0;" @click.stop="goedit(x)" /> -->
<!-- <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;"
@click.stop="goedit(x)"></i> -->
......
src/components/enterprise/material/imgmaterial.vue
View file @ 7da1a264
......@@ -3,7 +3,7 @@
<div class="page-content">
<div>
<q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="cloud_upload" label="上传图片"
@click="goadd()"></q-btn>
<q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="delete" label="批量删除"
......@@ -11,7 +11,8 @@
<q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="edit" label="修改分组"
@click="plmove()"></q-btn>
</div>
<div style="width: 100%;display: flex;align-items: center;flex-wrap: wrap;padding: 10px 20px;" v-if="dataList.length>0">
<div style="width: 100%;display: flex;align-items: center;flex-wrap: wrap;padding: 10px 20px;"
v-if="dataList.length>0">
<q-card class="imgcard" v-for="(x,y) in dataList" :key='y'
:style="{border:x.check==true?'2px solid #91d5ff':'2px solid #FFF'}"
@click="dataList[y].check = !dataList[y].check,$forceUpdate()">
......@@ -24,28 +25,45 @@
</div>
<q-img :src="x.ImageModel && x.ImageModel.ImagePath?x.ImageModel.ImagePath:''" class="imgstyle">
<div class="absolute-bottom text-subtitle1 text-center onetext"
style="padding: 0;padding: 0 5px;font-size: 12px;" >
style="padding: 0;padding: 0 5px;font-size: 12px;">
{{x.ImageModel && x.ImageModel.ImageName ?x.ImageModel.ImageName:''}}
</div>
<q-icon
v-if="x.Media_Id && x.Media_Id!=''" class="absolute all-pointer-events"
size="20px" name="iconfont icon-yiqueren" color="green" style="top: 8px; right: 8px">
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
已更新
</q-tooltip>
</q-icon>
<q-icon
v-if="x.Media_Id==''" class="absolute all-pointer-events"
size="20px" name="iconfont icon-yiquxiao" color="red" style="top: 8px; right: 8px">
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
</q-icon>
</q-img>
<div class="onetext" style="margin-top: 5px;">上传者:{{x.UpdateByName}}</div>
<div class="onetext" style="margin-top: 5px;">分组:{{x.MediumGroupName}}</div>
</q-card-section>
</q-card>
</div>
<div style="width: 100%;height: 50px;line-height: 50px;text-align: center;" v-if="dataList.length==0">暂无数据
</div>
<div style="width: 100%;height: 50px;line-height: 50px;text-align: center;" v-if="dataList.length==0">暂无数据</div>
</div>
<div v-if="Isadd==true">
<alladdsc :allclassifyList="allclassifyList" type='2' @editsuccess="getchildren" :editobj='editobj' @getcancel='Isadd=false'></alladdsc>
<alladdsc :allclassifyList="allclassifyList" type='2' @editsuccess="getchildren" :editobj='editobj'
@getcancel='Isadd=false'></alladdsc>
</div>
</div>
</template>
<script>
import alladdsc from './allAddSC'
export default {
name: "imgmaterial",
......@@ -57,7 +75,7 @@
type: Array,
default: [],
},
allclassifyList:{
allclassifyList: {
type: Array,
default: [],
}
......@@ -66,38 +84,38 @@
return {
loading: false,
Isadd: false,
editobj:null
editobj: null
}
},
created() {
},
methods: {
goadd() {
this.Isadd = true;
this.editobj=null
this.editobj = null
},
goedit(row){
this.editobj= {}
goedit(row) {
this.editobj = {}
this.editobj.Id = row.Id;
this.editobj.MediaGroupId = row.MediaGroupId;
this.editobj.Type = row.Type;
this.editobj.ImageModel = JSON.parse(JSON.stringify(row.ImageModel)) ;
this.editobj.ImageModel = JSON.parse(JSON.stringify(row.ImageModel));
this.Isadd = true
},
getchildren(){
getchildren() {
this.$emit('editsuccess')
this.Isadd = false
},
pldelete(){
pldelete() {
this.$emit('getdelete')
},
plmove(){
plmove() {
this.$emit('getmove')
}
}
}
......@@ -170,6 +188,4 @@
text-overflow: ellipsis;
width: 208px;
}
</style>
\ No newline at end of file
src/components/enterprise/material/videomaterial.vue
View file @ 7da1a264
......@@ -18,6 +18,20 @@
<div
style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
<span>{{x.UpdateTime}}</span>
<q-icon
v-if="x.Media_Id && x.Media_Id!=''"
size="20px" name="iconfont icon-yiqueren" color="green" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
已更新
</q-tooltip>
</q-icon>
<q-icon
v-if="x.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
</q-icon>
<!-- <q-btn class="q-mr-md" label="编辑" size="xs" color="accent" style="margin-right: 0;" @click.stop="goedit(x)" /> -->
<!-- <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;"
@click.stop="goedit(x)"></i> -->
......
src/pages/enterprise/materialManage.vue
View file @ 7da1a264
......@@ -11,6 +11,16 @@
<q-input @keyup.enter.native="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Content"
label="输入搜索内容" maxlength="20" />
</div>
<div class="col-6" style="color: red;display: flex;">
注：更新为整点更新到企业微信
(<span>
<i class="iconfont icon-yiquxiao" style="font-size: 14px;color: red;"></i>
未更新
<i class="iconfont icon-yiqueren" style="font-size: 14px;color: green;"></i>
已更新
</span>)
</div>
</div>
</div>
<div class="page-content">
......
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