diff --git a/src/apps/AppBroadcast1/AppBroadcast1.vue b/src/apps/AppBroadcast1/AppBroadcast1.vue index 4ab3d9bb..209073ab 100644 --- a/src/apps/AppBroadcast1/AppBroadcast1.vue +++ b/src/apps/AppBroadcast1/AppBroadcast1.vue @@ -52,7 +52,7 @@ export default { { title: '音频录制', text: '音频文件的录制', - path: './addPlay?type=1', + path: './AppResourcesManage/addPlay?type=1', imgUrl: require('./img/bigHorn-icon33@2x.png'), bgClass: 'bg-E5B565' }, diff --git a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue index 9f67bc36..6f78c79e 100644 --- a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue +++ b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue @@ -9,10 +9,10 @@
-
+
-

韩红-我的祖国.mp3

-
李毅 2022-06-09 09:43:05
+

{{ item.messageName }}

+
{{item.createUserName}} {{ item.startDate }}
日常 立即播发
@@ -31,16 +31,14 @@ export default { data() { return { list: [], - currIndex: 1, current: 1, type: '0', typeList: [{label: '全部', value: '0'}, {label: '我发布的', value: '1'}], - isMore: false, keyword: '' } }, onLoad(query) { - + this.getList() }, onShow() { @@ -53,19 +51,15 @@ export default { this.getListInit() }, getListInit() { - this.isMore = false this.list = [] this.current = 1 this.getList() }, getList() { - if (this.isMore) return - - this.$http.post(`/app/appdlbresource/list`, null, { + this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecords`, null, { params: { ...this.search, - type: this.currIndex === 0 ? 1 : 3, current: this.current, size: 10 } @@ -76,16 +70,6 @@ export default { } else { this.list = res.data.records } - - uni.hideLoading() - - if (res.data.records.length < 10) { - this.isMore = true - - return false - } - - this.current = this.current + 1 } else { uni.hideLoading() } @@ -94,15 +78,13 @@ export default { }) }, toDetail(item) { - uni.navigateTo({url: `./detail`}) + uni.navigateTo({url: `./detail?id=${item.id}`}) } }, onReachBottom() { - if(this.currIndex == 1) { - this.current ++ - this.getList() - } + this.current ++ + this.getList() } } diff --git a/src/apps/AppBroadcast1/AppPlayList/detail.vue b/src/apps/AppBroadcast1/AppPlayList/detail.vue index f70b3ce2..c9c1f46e 100644 --- a/src/apps/AppBroadcast1/AppPlayList/detail.vue +++ b/src/apps/AppBroadcast1/AppPlayList/detail.vue @@ -69,11 +69,15 @@ export default { data() { return { isShow: false, - url: '' + url: '', + id: '', + info: {} } }, - onLoad(query) { - + onLoad(option) { + console.log(option) + this.id = option.id + this.getDetail() }, onShow() { @@ -88,7 +92,16 @@ export default { }, toEquipmentList() { uni.navigateTo({url: `./equipmentList`}) - } + }, + getDetail() { + this.$http.post(`/app/appzyvideobroadcast/queryDetailById?id=${this.id}`).then(res => { + if (res.code == 0) { + this.info = res.data + } + }).catch(() => { + uni.hideLoading() + }) + }, }, } diff --git a/src/apps/AppBroadcast1/addPlay.vue b/src/apps/AppBroadcast1/addPlay.vue index b31bac04..669d0952 100644 --- a/src/apps/AppBroadcast1/addPlay.vue +++ b/src/apps/AppBroadcast1/addPlay.vue @@ -106,7 +106,7 @@ export default { mediaId: '', mediaName: '请选择', serialNo: '', - serialName: '请选择', + serialName: '', messageLevel: '', messageLevelName: '请选择', taskType: '0', @@ -207,9 +207,10 @@ export default { if (!this.formData.mediaId) { return this.$u.toast('请选择播发内容') } - if (!this.formData.serialNo) { + if (!this.equipmentList.length) { return this.$u.toast('请选择播放设备') } + if (!this.formData.messageLevel) { return this.$u.toast('播发级别') } @@ -236,6 +237,11 @@ export default { if (this.formData.taskType != 0 && this.formData.cyclingType == 2) { this.formData.cyclingDate = cyclingDateList.join(',') } + var serialNoList = [] + this.equipmentList.map(item => { + serialNoList.push(item.serialNo) + }) + this.formData.serialNo = serialNoList.join(',') this.formData.coverageType = '4' this.$http.post(`/app/appzyvideobroadcast/play`, {...this.formData,}).then((res) => { if (res.code == 0) { @@ -302,38 +308,6 @@ export default { this[showType] = true this.selectList = list }, - getMediaList() { - this.$http.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => { - if (res.code == 0) { - this.mediaList = [] - if (res.data && res.data.records.length) { - res.data.records.map((item) => { - let info = { - dictName: item.name, - dictValue: item.id - } - this.mediaList.push(info) - }) - } - } - }) - }, - getEquipmentList() { - this.$http.post(`/app/appdlbquipment/getDlbDeviceList?current=1&size=10000&keyword=`).then((res) => { - if (res.code == 0) { - this.equipmentList = [] - if (res.data && res.data.records.length) { - res.data.records.map((item) => { - let info = { - dictName: item.deviceName, - dictValue: item.serialNo - } - this.equipmentList.push(info) - }) - } - } - }) - }, checkClick(index) { this.dayList[index].isCheck = !this.dayList[index].isCheck }, @@ -371,8 +345,6 @@ export default { }, created() { this.$dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType').then(() => { - this.getMediaList() - this.getEquipmentList() this.messageLevelList = this.$dict.getDict('dlbMessageUrgency') this.cyclingTypeList = this.$dict.getDict('dlbDyclingType') }) diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue index 8fa03c04..8392653e 100644 --- a/src/project/beta/AppGridManagement/SelectGird.vue +++ b/src/project/beta/AppGridManagement/SelectGird.vue @@ -94,7 +94,7 @@ export default { params: {girdId: last} }).then(res => { if (res?.data) { - this.slectList = [{girdName: '可选范围', id: ''}, res.data].flat() + this.slectList = [{girdName: '可选范围', id: ''}, res.data.filter(e => !!this.allData.find(a => a.id == e.id))].flat() this.getGridsByGridMemberAndParent({id: last}) } }) diff --git a/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue b/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue index edd21b98..d416a6ef 100644 --- a/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue +++ b/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue @@ -126,8 +126,8 @@ export default { this.$forceUpdate() }, handleGridSelect(e) { - this.gridName = e?.[0]?.girdName - this.search.girdId = e?.[0]?.id + this.gridName = e?.girdName + this.search.girdId = e?.id this.getDatas() }, areaSelect(e) { @@ -143,13 +143,7 @@ export default { params: {...this.search, type: 0, range: 0} }).then((res) => { if (res?.data) { - for (let i in res.data) { - let obj = { - label: i, - value: res.data[i], - } - this.statisticsList.push(obj) - } + this.statisticsList = Object.keys(res.data).map((label, i, arr) => ({label, value: res.data[label]})) } }) }, @@ -159,13 +153,7 @@ export default { params: {...this.search, type: 0, range: 1} }).then((res) => { if (res?.data) { - for (let i in res.data) { - let obj = { - label: i, - value: res.data[i], - } - this.statisticsListMon.push(obj) - } + this.statisticsListMon = Object.keys(res.data).map((label, i, arr) => ({label, value: res.data[label]})) } }) },