Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/layout/main/defaults.vue

@@ -33,7 +33,7 @@ export default defineComponent({
 		watch(
 			() => route.path,
 			() => {
-				proxy.$refs.layoutDefaultsScrollbarRef.wrap$.scrollTop = 0;
+				proxy.$refs.layoutDefaultsScrollbarRef.wrap$ && (proxy.$refs.layoutDefaultsScrollbarRef.wrap$.scrollTop = 0)
 			}
 		);
 		return {

src/layout/navBars/tagsView/tagsView.vue

@@ -390,6 +390,9 @@ export default defineComponent({
 				let liLast: any = tagsRefs.value[tagsRefs.value.length - 1];
 				// 当前滚动条的值
 				let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrap$;
+
+				if (!scrollRefs) return
+				
 				// 当前滚动条滚动宽度
 				let scrollS = scrollRefs.scrollWidth;
 				// 当前滚动条偏移宽度

src/views/heating/home/index.vue

@@ -580,7 +580,6 @@ export default defineComponent({
       () => store.state.themeConfig.themeConfig.isIsDark,
       (isIsDark) => {
         nextTick(() => {
-          console.log(isIsDark)
           // if(!isIsDark) return
           state.charts.theme = isIsDark ? 'transparent' : '';
           state.charts.bgColor = isIsDark ? 'transparent' : '';

src/views/iot/iotmanager/dashboard.vue

@@ -374,7 +374,6 @@ export default defineComponent({
 		};
 		const getOverviewData = () => {
 			api.iotManage.getOverviewData().then((res:any) => {
-				console.log(res)
 				const { overview, device, alarmLevel } = res;
 				// overview
 					// "deviceTotal": 8, //设备总量
@@ -419,7 +418,6 @@ export default defineComponent({
 		};
 		const getAlarmList = () => {
 			api.iotManage.getAlarmList(state.tableData.param).then((res: any) => {
-				console.log(res)
 				state.tableData.data = res.list;
 				state.tableData.total = res.Total;
 			})