diff --git a/src/views/tested/dashboard/components/editScheduleDialog.vue b/src/views/tested/dashboard/components/editScheduleDialog.vue index ecc7922..a518ca4 100644 --- a/src/views/tested/dashboard/components/editScheduleDialog.vue +++ b/src/views/tested/dashboard/components/editScheduleDialog.vue @@ -119,6 +119,7 @@ } getCalendarList(params).then((res) => { const response = res.data + // console.log(response, 'response') if (response.length) { // 选择的日期有日程 // for (const key in response) { type.value = 'edit' @@ -147,6 +148,7 @@ const initDialog = (time: string) => { dialogVisible.value = true form.value.date = time + form.value.markContent = '' } // 删除所有日程 const delAll = () => { diff --git a/src/views/tested/dashboard/components/editScheduleDialog.vue b/src/views/tested/dashboard/components/editScheduleDialog.vue index ecc7922..a518ca4 100644 --- a/src/views/tested/dashboard/components/editScheduleDialog.vue +++ b/src/views/tested/dashboard/components/editScheduleDialog.vue @@ -119,6 +119,7 @@ } getCalendarList(params).then((res) => { const response = res.data + // console.log(response, 'response') if (response.length) { // 选择的日期有日程 // for (const key in response) { type.value = 'edit' @@ -147,6 +148,7 @@ const initDialog = (time: string) => { dialogVisible.value = true form.value.date = time + form.value.markContent = '' } // 删除所有日程 const delAll = () => { diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue index 08855da..624f37d 100644 --- a/src/views/tested/dashboard/index.vue +++ b/src/views/tested/dashboard/index.vue @@ -78,6 +78,7 @@ } }) redCircleData.value = timeObj + // console.log(redCircleData.value, 'redCircleData.value') }) } // 点击日期 @@ -295,7 +296,7 @@ const table = scrollTable.value // 拿到表格中承载数据的div元素 const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0] - console.log(divData, 'divData') + // console.log(divData, 'divData') // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素) if (stop || list.length < 5) { // 再通过事件监听，监听到 组件销毁 后，再执行关闭计时器。 @@ -447,8 +448,8 @@ } // ------------------------------------------------------------------------------------ onMounted(async () => { - // const user = await getUserDept() - // companyId.value = user.data.id + const user = await getUserDept() + companyId.value = user.data.id // // 获取当前用户所在单位 // getDeptTreeList({ pid: user.data.id }).then((res1) => { // deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name })) diff --git a/src/views/tested/dashboard/components/editScheduleDialog.vue b/src/views/tested/dashboard/components/editScheduleDialog.vue index ecc7922..a518ca4 100644 --- a/src/views/tested/dashboard/components/editScheduleDialog.vue +++ b/src/views/tested/dashboard/components/editScheduleDialog.vue @@ -119,6 +119,7 @@ } getCalendarList(params).then((res) => { const response = res.data + // console.log(response, 'response') if (response.length) { // 选择的日期有日程 // for (const key in response) { type.value = 'edit' @@ -147,6 +148,7 @@ const initDialog = (time: string) => { dialogVisible.value = true form.value.date = time + form.value.markContent = '' } // 删除所有日程 const delAll = () => { diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue index 08855da..624f37d 100644 --- a/src/views/tested/dashboard/index.vue +++ b/src/views/tested/dashboard/index.vue @@ -78,6 +78,7 @@ } }) redCircleData.value = timeObj + // console.log(redCircleData.value, 'redCircleData.value') }) } // 点击日期 @@ -295,7 +296,7 @@ const table = scrollTable.value // 拿到表格中承载数据的div元素 const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0] - console.log(divData, 'divData') + // console.log(divData, 'divData') // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素) if (stop || list.length < 5) { // 再通过事件监听，监听到 组件销毁 后，再执行关闭计时器。 @@ -447,8 +448,8 @@ } // ------------------------------------------------------------------------------------ onMounted(async () => { - // const user = await getUserDept() - // companyId.value = user.data.id + const user = await getUserDept() + companyId.value = user.data.id // // 获取当前用户所在单位 // getDeptTreeList({ pid: user.data.id }).then((res1) => { // deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name })) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 5d34aa3..7722110 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -1064,6 +1064,11 @@ +