From deecff9904b68b4f7135e50e6868cc16aaf205dc Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 10 Jun 2022 11:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=96=87=E5=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEquipment/AppEquipment.vue | 46 +++--- .../AppBroadcast1/AppEquipment/detail.vue | 99 +++++++++++-- .../AppResourcesManage/AppResourcesManage.vue | 139 +++++++++++------- .../AppResourcesManage/detail.vue | 50 ++++++- src/apps/AppBroadcast1/addPlay.vue | 14 +- src/apps/AppBroadcast1/selectEquipment.vue | 69 ++++++--- src/apps/AppBroadcast1/selectMedia.vue | 9 +- 7 files changed, 320 insertions(+), 106 deletions(-) diff --git a/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue b/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue index 2700297a..46de0fd2 100644 --- a/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue +++ b/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue @@ -13,24 +13,14 @@
-
+
-

村头大喇叭

- 刘家河居委会 +

{{item.deviceName}}

+ {{item.orgName}}
-
在线
-
-
-
- -
-
-

村头大喇叭

- 刘家河居委会 -
-
在线
+
{{item.devStatus}}
@@ -42,24 +32,46 @@ export default { name: "AppEquipment", data() { return { + current: 1, areaId: '', areaName: '', - keyword: '' + keyword: '', + list: [] } }, computed: { ...mapState(['user']) }, - onLoad(option) { + onLoad() { this.areaId = this.user.areaId this.areaName = this.user.areaName + this.getList() }, methods: { areaSelect(e) { this.areaId = e - // this.getList() + this.getListInit() + }, + getListInit() { + this.list = [] + this.current = 1 + this.getList() + }, + getList() { + this.$http.post(`/app/appdlbquipment/getDlbDeviceList?current=1&size=20&keyword=${this.keyword}`).then((res) => { + if (res.code == 0) { + if (this.current > 1) { + this.list = [...this.list, ...res.data.records] + } else { + this.list = res.data.records + } + } + }) }, toDetail(item) { uni.navigateTo({url: `./detail`}) } + }, + onReachBottom() { + } } diff --git a/src/apps/AppBroadcast1/AppEquipment/detail.vue b/src/apps/AppBroadcast1/AppEquipment/detail.vue index db845462..8b0c24fb 100644 --- a/src/apps/AppBroadcast1/AppEquipment/detail.vue +++ b/src/apps/AppBroadcast1/AppEquipment/detail.vue @@ -7,26 +7,26 @@
-

村头大喇叭

+

{{info.deviceName}}

设备编号 - 121312312312 + {{info.serialNo}}
设备状态 - 在线 + {{info.devStatus}}
信号强度 - 一般 + {{info.network}}
音量 - + {{info.volume}}
所属区划 - + {{info.areaName}}
@@ -47,9 +47,26 @@
-
设置音量
- - +
设置音量
+ +
+ 取消 +

设置音量

+ 保存 +
+
+ 1 +
+ + + + {{volume}} + + + +
+ 100 +
@@ -65,6 +82,8 @@ export default { currIndex: 1, current: 1, isShow: false, + volume: 10, + info: {} } }, onLoad(query) { @@ -78,10 +97,21 @@ export default { methods: { change(index) { this.currIndex = index - this.getListInit() }, toTaskDetail(item) { uni.navigateTo({url: `./taskDetail`}) + }, + setVolume() { + this.isShow = true + this.volume = this.info.volume * 10 || 10 + }, + confirmAdd() { + this.$http.post(`/app/appdlbquipment/volumeControl?deviceId=${this.info.deviceId}&volume=${this.volume}`).then((res) => { + if (res.code == 0) { + this.getDetail() + this.$u.toast('音量设置成功') + } + }) } }, @@ -208,5 +238,54 @@ export default { font-weight: 500; color: #FFFFFF; } + .popup{ + background-color: #fff; + .title{ + padding: 24px 0; + line-height: 48px; + text-align: center; + span{ + display: inline-block; + width: 120px; + font-size: 28px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #5297FF; + + } + p{ + display: inline-block; + width: calc(100% - 240px); + font-size: 36px; + font-family: PingFangSC-Regular, PingFang SC; + color: #0F1826; + } + } + .slider-content{ + padding: 56px 44px 120px; + display: flex; + span{ + display: inline-block; + font-size: 40px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #666; + line-height: 56px; + } + .slider{ + display: inline-block; + flex: 1; + margin: 26px 30px 0; + } + } + } + + ::v-deep .u-slider__button-wrap{ + margin-top: -40px; + font-size: 44px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #666; + } } diff --git a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue index 6d3e2bc7..f5efd3a4 100644 --- a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue +++ b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue @@ -16,13 +16,18 @@

{{ item.name ? item.name.split('.')[0] : '-' }}

+
{{ item.createUserName }}{{ item.createTime }}
+
发布
-
{{ item.name }}
-

{{ item.content }}

+
+
{{ item.name }}
+

{{ item.content }}

+
+
发布
@@ -57,8 +62,7 @@ export default { typeList: [{label: '全部', value: '0'}, {label: '我创建的', value: '1'},] } }, - onLoad(query) { - this.isChoose = !!query.isChoose + onLoad() { this.getList() uni.$on('getList', () => { this.isMore = false @@ -92,21 +96,8 @@ export default { }, choose(item) { - if (!this.isChoose) { - console.log(item.url) - this.url = item.url - this.isShow = true - - return false - } - - uni.$emit('choose', { - mediaId: item.id, - mediaName: item.name - }) - uni.navigateBack({ - delta: 1 - }) + this.url = item.url + this.isShow = true }, handerClear() { @@ -207,7 +198,7 @@ export default { } .info { - width: calc(100% - 70px); + width: calc(100% - 256px); line-height: 44px; font-size: 34px; font-family: PingFang-SC-Medium, PingFang-SC; @@ -220,6 +211,30 @@ export default { white-space: nowrap; word-break: break-all; } + + div{ + font-size: 26px; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #999; + line-height: 36px; + } + } + .btn{ + width: 154px; + height: 60px; + line-height: 60px; + text-align: center; + background: #3975C6; + border-radius: 8px; + font-size: 30px; + font-family: PingFang-SC-Medium, PingFang-SC; + font-weight: 500; + color: #FFF; + margin-left: 32px; + } + .bg-AFD0FC{ + background-color: #AFD0FC; } } } @@ -233,43 +248,63 @@ export default { padding: 32px 30px; box-sizing: border-box; font-size: 30px; + display: flex; + justify-content: space-between; + .info{ + width: calc(100% - 190px); + div { + font-size: 30px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #333; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-bottom: 12px; - div { + .color-0063E5 { + color: #0063E5; + } + + .color-FF8100 { + color: #FF8100; + } + + .color-FF4466 { + color: #FF4466; + } + } + + p { + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #666; + line-height: 40px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + line-clamp: 2; + word-break: break-all; + -webkit-box-orient: vertical; + } + } + .btn{ + width: 154px; + height: 60px; + line-height: 60px; + text-align: center; + background: #3975C6; + border-radius: 8px; font-size: 30px; - font-family: PingFangSC-Medium, PingFang SC; + font-family: PingFang-SC-Medium, PingFang-SC; font-weight: 500; - color: #333; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - margin-bottom: 12px; - - .color-0063E5 { - color: #0063E5; - } - - .color-FF8100 { - color: #FF8100; - } - - .color-FF4466 { - color: #FF4466; - } + color: #FFF; } - - p { - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #666; - line-height: 40px; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - word-break: break-all; - -webkit-box-orient: vertical; + .bg-AFD0FC{ + background-color: #AFD0FC; } + } } diff --git a/src/apps/AppBroadcast1/AppResourcesManage/detail.vue b/src/apps/AppBroadcast1/AppResourcesManage/detail.vue index 60a7df98..f0a2f8b0 100644 --- a/src/apps/AppBroadcast1/AppResourcesManage/detail.vue +++ b/src/apps/AppBroadcast1/AppResourcesManage/detail.vue @@ -3,21 +3,59 @@
-

五一活动唱红歌.mp3

-

2022-06-09 09:43:45

+

{{info.name}}.mp3

+

{{info.createTime}}

-
+
{{info.content}}
-
删除素材
-
发布广播
+
删除素材
+
发布广播