From 8fe7970b817fab69c976cccbb48c314da5a856bf Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 13 Jun 2022 09:40:10 +0800 Subject: [PATCH 1/8] 30156 --- packages/work/AppHelpedResident/hrAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/work/AppHelpedResident/hrAdd.vue b/packages/work/AppHelpedResident/hrAdd.vue index 2d29e867..02f227da 100644 --- a/packages/work/AppHelpedResident/hrAdd.vue +++ b/packages/work/AppHelpedResident/hrAdd.vue @@ -37,7 +37,7 @@ --> - + From ea85e1c82bc109bc7efc23be0521feb1d872f888 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 13 Jun 2022 09:56:13 +0800 Subject: [PATCH 2/8] 30155 --- .../device/AppMediaManage/components/Play.vue | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/device/AppMediaManage/components/Play.vue b/packages/device/AppMediaManage/components/Play.vue index e94fc088..8ef2a71a 100644 --- a/packages/device/AppMediaManage/components/Play.vue +++ b/packages/device/AppMediaManage/components/Play.vue @@ -58,7 +58,7 @@ :picker-options="{ start: formData.startTime, minTime: formData.startTime}" value-format="HH:mm:ss"> - + @@ -171,6 +171,7 @@ export default { serialNoList: [], areaId: '', areaName: '', + userAreaId: '', } }, computed: { @@ -183,15 +184,26 @@ export default { var myDate = new Date(); return myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds() }, - areaRoot() { - return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("") - } + // areaRoot() { + // return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("") + // } }, + + watch: { + userAreaId: { + handler: function(v) { + this.areaRootId = [v.substr(0,6),'000000'].join("") + }, + deep: true + } + }, + created() { this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType') Promise.all([this.getEquipmentList(), this.getMediaList()]).then(() => { this.formData.mediaId = this.params.id + this.userAreaId = this.user.info.areaId }) }, methods: { From b25222b93e809131cf3bdfcef516851a2ad17e90 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 13 Jun 2022 10:04:01 +0800 Subject: [PATCH 3/8] 30161 --- packages/device/AppBroadcast/components/Detail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/device/AppBroadcast/components/Detail.vue b/packages/device/AppBroadcast/components/Detail.vue index f5649a2e..10bf936d 100644 --- a/packages/device/AppBroadcast/components/Detail.vue +++ b/packages/device/AppBroadcast/components/Detail.vue @@ -11,7 +11,8 @@ @@ -187,17 +187,16 @@ export default { // areaRoot() { // return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("") // } - }, - watch: { - userAreaId: { - handler: function(v) { - this.areaRootId = [v.substr(0,6),'000000'].join("") - }, - deep: true - } - }, + // watch: { + // userAreaId: { + // handler: function(v) { + // this.areaRootId = [v?.substr(0,6),'000000'].join("") + // }, + // deep: true + // } + // }, created() { this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType') @@ -230,7 +229,7 @@ export default { }) }, // 地区选择 - handleAreaSelect() { + handleAreaSelect(v) { this.areaName = v?.[0]?.label }, From 41687a386bfec27538ebd3aec0fdd4a7dd8c6382 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 13 Jun 2022 10:26:14 +0800 Subject: [PATCH 5/8] 30163 --- packages/device/AppBroadcast/components/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/device/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue index f4ff8d12..bbfc1495 100644 --- a/packages/device/AppBroadcast/components/List.vue +++ b/packages/device/AppBroadcast/components/List.vue @@ -79,7 +79,7 @@ export default { return h('span', null, (row.taskType == 1? '定时播放':'立即播放'))}, }, {prop: 'startTime', label: '开始时间', align: 'center', width: 180}, - // {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"}, + {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"}, {prop: 'areaName', label: '地区', align: 'center'}, {prop: 'createUserName', label: '创建人', align: 'center'}, {slot: 'options'}, From 2062bc6160097500b28a2449de589640e8c45fa6 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 13 Jun 2022 10:30:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/device/AppBroadcast/components/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/device/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue index bbfc1495..d134dd80 100644 --- a/packages/device/AppBroadcast/components/List.vue +++ b/packages/device/AppBroadcast/components/List.vue @@ -33,7 +33,7 @@ 详情 撤回 + v-if="info.taskType == 1">撤回 From 241395d610a109607d28aae0296d68d160be99ae Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 13 Jun 2022 10:34:12 +0800 Subject: [PATCH 7/8] 30164 --- packages/device/AppEquipmentManage/components/taskList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/device/AppEquipmentManage/components/taskList.vue b/packages/device/AppEquipmentManage/components/taskList.vue index 58765e73..0d14d8df 100644 --- a/packages/device/AppEquipmentManage/components/taskList.vue +++ b/packages/device/AppEquipmentManage/components/taskList.vue @@ -14,7 +14,7 @@ :current.sync="page.current" :size.sync="page.size" @getList="getList" @selection-change="(v) => (ids = v.map((e) => e.id))"> -