|
@@ -645,9 +645,9 @@ export default defineComponent({
|
|
/**
|
|
/**
|
|
* 关闭加班
|
|
* 关闭加班
|
|
*/
|
|
*/
|
|
- closeWork(){
|
|
|
|
|
|
+ closeWork() {
|
|
proxyData.isShowWork = false;
|
|
proxyData.isShowWork = false;
|
|
- console.log("关闭加班功能---")
|
|
|
|
|
|
+ console.log("关闭加班功能---");
|
|
},
|
|
},
|
|
// /**
|
|
// /**
|
|
// * 修改空间id
|
|
// * 修改空间id
|
|
@@ -1462,9 +1462,27 @@ export default defineComponent({
|
|
queryCustomAndScence(str).then((res) => {
|
|
queryCustomAndScence(str).then((res) => {
|
|
let resData: any = res?.data ?? [];
|
|
let resData: any = res?.data ?? [];
|
|
proxyData.workkArr = resData;
|
|
proxyData.workkArr = resData;
|
|
|
|
+ for (let i = 0; i < proxyData.workkArr.length; i++) {
|
|
|
|
+ let customSceneList: any =
|
|
|
|
+ proxyData.workkArr[i]?.customSceneList ?? [];
|
|
|
|
+ customSceneList=customSceneList.sort(proxyData.compare)
|
|
|
|
+ }
|
|
|
|
+
|
|
proxyData.queryCustomAndScenceTimer(5000);
|
|
proxyData.queryCustomAndScenceTimer(5000);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
+ // 数组排序
|
|
|
|
+ compare(obj1:any, obj2:any) {
|
|
|
|
+ var val1 = obj1.startTime;
|
|
|
|
+ var val2 = obj2.startTime;
|
|
|
|
+ if (val1 < val2) {
|
|
|
|
+ return -1;
|
|
|
|
+ } else if (val1 > val2) {
|
|
|
|
+ return 1;
|
|
|
|
+ } else {
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ },
|
|
// 格式化当前页面展示的时间
|
|
// 格式化当前页面展示的时间
|
|
formateWorkTime() {},
|
|
formateWorkTime() {},
|
|
/**
|
|
/**
|