diff --git a/src/api/digitalScreen/index.js b/src/api/digitalScreen/index.js
index 6b8d902..f49379b 100644
--- a/src/api/digitalScreen/index.js
+++ b/src/api/digitalScreen/index.js
@@ -121,6 +121,32 @@ export function FetchDeleteScreenWelcomePromotion(parameter) {
})
}
+// 智慧大屏宣传视频列表
+export function FetchInitScreenPromotionVideo(params) {
+ return request({
+ url: 'api/screenSetting/initScreenPromotionVideo' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+// 编辑智慧大屏宣传视频
+export function FetchEditScreenPromotionVideo(parameter) {
+ return request({
+ url: 'api/screenSetting/editScreenPromotionVideo',
+ method: 'post',
+ data: parameter
+ })
+}
+
+// 删除智慧大屏宣传视频
+export function FetchDeleteScreenPromotionVideo(parameter) {
+ return request({
+ url: 'api/screenSetting/deleteScreenPromotionVideo',
+ method: 'post',
+ data: parameter
+ })
+}
+
export default {
FetchInitScreenSetting,
FetchEditScreenSetting,
@@ -135,5 +161,8 @@ export default {
FetchDeleteScreenNotice,
FetchInitScreenWelcomePromotion,
FetchEditScreenWelcomePromotion,
- FetchDeleteScreenWelcomePromotion
+ FetchDeleteScreenWelcomePromotion,
+ FetchInitScreenPromotionVideo,
+ FetchEditScreenPromotionVideo,
+ FetchDeleteScreenPromotionVideo
}
diff --git a/src/api/inquiryMachine/column.js b/src/api/inquiryMachine/column.js
new file mode 100644
index 0000000..b8afe46
--- /dev/null
+++ b/src/api/inquiryMachine/column.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+ return request({
+ url: 'api/fonds/editFonds',
+ method: 'post',
+ data
+ })
+}
+
+export function edit(data) {
+ return request({
+ url: 'api/fonds/editFonds',
+ method: 'post',
+ data
+ })
+}
+
+export function del(data) {
+ return request({
+ url: 'api/fonds/delFonds',
+ method: 'post',
+ data
+ })
+}
+
+export function FetchUpdateFondsStatus(data) {
+ return request({
+ url: 'api/fonds/updateFondsStatus',
+ method: 'post',
+ data
+ })
+}
+
+export default { add, edit, del, FetchUpdateFondsStatus }
diff --git a/src/api/inquiryMachine/content.js b/src/api/inquiryMachine/content.js
new file mode 100644
index 0000000..b8afe46
--- /dev/null
+++ b/src/api/inquiryMachine/content.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+ return request({
+ url: 'api/fonds/editFonds',
+ method: 'post',
+ data
+ })
+}
+
+export function edit(data) {
+ return request({
+ url: 'api/fonds/editFonds',
+ method: 'post',
+ data
+ })
+}
+
+export function del(data) {
+ return request({
+ url: 'api/fonds/delFonds',
+ method: 'post',
+ data
+ })
+}
+
+export function FetchUpdateFondsStatus(data) {
+ return request({
+ url: 'api/fonds/updateFondsStatus',
+ method: 'post',
+ data
+ })
+}
+
+export default { add, edit, del, FetchUpdateFondsStatus }
diff --git a/src/api/inquiryMachine/index.js b/src/api/inquiryMachine/index.js
deleted file mode 100644
index c7119e2..0000000
--- a/src/api/inquiryMachine/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import request from '@/utils/request'
-
-export function FetchInitFondsList(params) {
- return request({
- url: 'api/fonds/initFondsList',
- method: 'get',
- params
- })
-}
-
-export function add(data) {
- return request({
- url: 'api/fonds/editFonds',
- method: 'post',
- data
- })
-}
-
-export function edit(data) {
- return request({
- url: 'api/fonds/editFonds',
- method: 'post',
- data
- })
-}
-
-export function del(data) {
- return request({
- url: 'api/fonds/delFonds',
- method: 'post',
- data
- })
-}
-
-export function FetchUpdateFondsStatus(data) {
- return request({
- url: 'api/fonds/updateFondsStatus',
- method: 'post',
- data
- })
-}
-
-export function FetchDownload(params) {
- return request({
- url: 'api/fonds/download',
- method: 'get',
- params
- })
-}
-
-export function FetchFondsAll() {
- return request({
- url: 'api/fonds/getFondsAll',
- method: 'get'
- })
-}
-
-export function FetchFondsCategory(data) {
- return request({
- url: 'api/fonds/fondsCategory',
- method: 'post',
- data
- })
-}
-
-export function FetchFondsDetail(params) {
- return request({
- url: 'api/fonds/getFondsDetail',
- method: 'get',
- params
- })
-}
-
-// 根据门类和档案id获取显示全宗
-export function FetchInitFondsByCategoryIdAndArchivesId(params) {
- return request({
- url: 'api/fonds/initFondsByCategoryIdAndArchivesId',
- method: 'get',
- params
- })
-}
-
-export default { add, edit, del, FetchInitFondsList, FetchUpdateFondsStatus, FetchDownload, FetchFondsCategory, FetchFondsDetail, FetchInitFondsByCategoryIdAndArchivesId }
diff --git a/src/views/digitalScreen/index.vue b/src/views/digitalScreen/index.vue
index 0dbcb8e..1247d9a 100644
--- a/src/views/digitalScreen/index.vue
+++ b/src/views/digitalScreen/index.vue
@@ -36,14 +36,15 @@
-
- {{ item.time }}
-
+
+
+ {{ item.time }}
+
+
秒
-
@@ -330,6 +331,7 @@ import bookRecommend from './module/bookRecommend'
import areaSetting from './module/areaSetting'
import mediaSetting from './module/mediaSetting'
import advSetting from './module/advSetting'
+import { mapGetters } from 'vuex'
export default {
name: 'DigitalScreen',
@@ -432,6 +434,10 @@ export default {
}
},
computed: {
+ ...mapGetters([
+ 'baseApi',
+ 'user'
+ ]),
enabledCount() {
return this.screenItems.filter(item => item.enabled).length
},
@@ -481,7 +487,7 @@ export default {
},
// 初始化智慧大屏基本数据
initScreenSetting() {
- FetchInitScreenSetting().then(res => {
+ FetchInitScreenSetting({ 'libcode': this.user.fonds.fondsNo }).then(res => {
const showScreenItem = Object.values(res).find(item => item.code === 'show_screen')
if (showScreenItem) {
// 处理显示状态（context）
@@ -818,6 +824,9 @@ export default {
const input = this.$refs.timeInput.find(ref => ref && ref.$el)
if (input) {
input.focus()
+ setTimeout(() => {
+ input.select()
+ }, 0)
}
})
},
diff --git a/src/views/digitalScreen/module/mediaSetting.vue b/src/views/digitalScreen/module/mediaSetting.vue
index b56d14f..6211704 100644
--- a/src/views/digitalScreen/module/mediaSetting.vue
+++ b/src/views/digitalScreen/module/mediaSetting.vue
@@ -66,7 +66,7 @@
@row-click="clickVideoRowHandler"
>
-
+
@@ -162,6 +162,11 @@
placeholder="选择日期时间"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
+ :picker-options="{
+ disabledDate: (time) =>{
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ }"
/>
@@ -169,6 +174,7 @@
v-model="videoForm.endTime"
type="datetime"
placeholder="选择日期时间"
+ :picker-options="endPickerOptions"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="['23:59:59']"
@@ -196,7 +202,7 @@