@@ -89,30 +111,30 @@
@@ -133,7 +155,7 @@
头图:
- 引导图:
- = 10 ? month : '0' + month}-${day >= 10 ? day : '0' + day} ${hour >= 10 ? hour : '0' + hour}:${minute >= 10 ? minute : '0' + minute}:${second >= 10 ? second : '0' + second}`;
+ return currentTime;
},
handleRemove(file, fileList, type) {
if (type === 'heat') {
@@ -365,6 +411,9 @@
if (newVal) {
if (this.type === 'editor') {
this.getDetail()
+ }else{
+ this.form.source = '苏州革命博物馆'
+ this.form.release_time = this.getDatetimeValue()
}
} else {
this.id = ''
diff --git a/src/views/exhibit/index.vue b/src/views/exhibit/index.vue
index 7165c88..fe40f17 100644
--- a/src/views/exhibit/index.vue
+++ b/src/views/exhibit/index.vue
@@ -65,9 +65,17 @@ export default {
},
{
label:"举办展厅",
- prop:'hall_id',
+ prop:'hall.name',
align:'center',
},
+ {
+ label:"展览类型",
+ prop:'type',
+ align:'center',
+ formatter(value){
+ return value==1?'陈列展览':'临时展览'
+ }
+ },
{
label:"开始时间",
prop:'start_time',
@@ -109,8 +117,8 @@ export default {
if(row.state===1){
return ( < div style = {
{
- background:'orange',
- padding:'5px 10px',
+ background:'#cf995a',
+ padding:'0px 10px',
borderRadius:'5px',
color:'#fff'
}
@@ -136,7 +144,10 @@ export default {
const res = await index({
page_size:this.select.pageSize,
page:this.select.pageIndex,
- title:this.select.name
+ title:this.select.name,
+ sort_name:'state',
+ sort_name_tow:'release_time',
+ sort_type:"DESC"
})
this.list = res.data
this.total = res.total
diff --git a/src/views/hall/component/addHall.vue b/src/views/hall/component/addHall.vue
index 1baf773..9c40506 100644
--- a/src/views/hall/component/addHall.vue
+++ b/src/views/hall/component/addHall.vue
@@ -70,7 +70,7 @@
头图:
- 引导图:
-
\ No newline at end of file
+
diff --git a/src/views/relic/component/addRelic.vue b/src/views/relic/component/addRelic.vue
index 6c1da22..e7553ab 100644
--- a/src/views/relic/component/addRelic.vue
+++ b/src/views/relic/component/addRelic.vue
@@ -11,6 +11,28 @@
+
+