Merge branch 'develop/0.0.2(样式修改)' into test

src/views/content/setting/detail.vue

@@ -177,7 +177,7 @@ const data = reactive({
   form: {
     audioList: [],
     listDate: [],
-    tpresetContentInfoReq: []
+    tpresetContentInfoReq: [{}]
   },
   // 时间段
   dateList: [[]],
@@ -241,12 +241,6 @@ const getAudioList = () => {
       categoryId: e.sceneId,
       type: e.type,
     })
-    data.form.tpresetContentInfoReq.push({
-      tenantId: e.tenantId,
-      storeId: e.storeId,
-      deviceType: e.deviceIds
-    })
-    console.log(e.deviceIds);
     getPushTime(e)
   }
 }
@@ -364,12 +358,6 @@ const handleChooseAudio = (e) => {
     categoryId: e.sceneId,
     type: e.type
   })
-  data.form.tpresetContentInfoReq = []
-  data.form.tpresetContentInfoReq.push({
-    tenantId: e.tenantId,
-    storeId: e.storeId,
-    deviceType: e.deviceIds
-  })
   getPushTime(e)
   proxy.$modal.msgSuccess('选择成功！')
   dialogVisible.value = false

src/views/insert/insertContent/detail.vue

@@ -325,6 +325,7 @@ const handleSelectAllChange = (e) => {
 // 选择时段
 const handleCheckTime = (e) => {
   data.form.timeId = e.timeId
+  data.form.contentPlayId = e.contentPlayId
   data.form.name = e.name
   data.disabledDate = [e.startTime, e.endTime]
   proxy.$modal.msgSuccess('选择成功！')

src/views/system/role/index.vue

@@ -347,21 +347,20 @@ function handleAdd() {
   title.value = "添加角色";
 }
 /** 修改角色 */
-function handleUpdate(row) {
+const menu = ref({})
+async function handleUpdate(row) {
   reset();
   const roleId = row.roleId || ids.value;
-  const roleMenu = getRoleMenuTreeselect(roleId, row.roleType);
+  await getRoleMenuTreeselect(roleId, row.roleType)
   getRole(roleId).then(response => {
     form.value = response.data;
     form.value.roleSort = Number(form.value.roleSort);
     open.value = true;
     nextTick(() => {
-      roleMenu.then((res) => {
-        let checkedKeys = res.checkedKeys;
-        checkedKeys.forEach((v) => {
-          nextTick(() => {
-            menuRef.value.setChecked(v, true, false);
-          });
+      let checkedKeys = menu.value.checkedKeys;
+      checkedKeys.forEach((v) => {
+        nextTick(() => {
+          menuRef.value.setChecked(v, true, false);
         });
       });
     });
@@ -369,11 +368,11 @@ function handleUpdate(row) {
   });
 }
 /** 根据角色ID查询菜单树结构 */
-function getRoleMenuTreeselect(roleId, roleType) {
-  return roleMenuTreeselect(roleId, { roleType: roleType }).then(response => {
-    menuOptions.value = response.menus;
-    return response;
-  });
+async function getRoleMenuTreeselect(roleId, roleType) {
+  await roleMenuTreeselect(roleId, { roleType: roleType }).then(res => {
+    menuOptions.value = res.menus;
+    menu.value = res
+  })
 }
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {