凉纪 1 rok pred
rodič
commit
7fceca208e

+ 3 - 1
src/components/Calendar/index.vue

@@ -110,13 +110,14 @@ export default {
     },
     //获取工作时间列表
     getWorkTimeList(data){
+      this.attrs = [];
       workTimeList(data).then(res=>{
         let list = res.data.map(v=>{
           if(v.ymdDate == dayjs( new Date()).format('YYYY-MM-DD')){
             this.$emit('change',v)
           }
           return{
-            key:v.id,
+            key:v.id || ,
             customData: v,
             highlight: {
               color: v.isEnable == 1 ? 'green' : v.isEnable == 0 ? 'yellow' : v.isEnable == null ? 'red' : 'indigo',
@@ -126,6 +127,7 @@ export default {
             dates: dayjs(v.ymdDate).format('YYYY-MM-DD'),
           }
         });
+        console.log(list,'list')
         this.attrs = list;
         this.date = new Date();
       })

+ 1 - 1
src/views/menu/problemItem/edit.vue

@@ -286,7 +286,7 @@ export default {
     //页面跳转逻辑
     toPagesFcn(){
       this.getRouter();
-      if(this.fromPage.name === "works"){
+      if(this.fromPages.name === "works"){
         this.$router.go(-1)
       }else {
         this.$router.replace({

+ 1 - 1
src/views/menu/securityCheckRegister/add.vue

@@ -530,7 +530,7 @@ export default {
     //页面跳转逻辑
     toPagesFcn(){
       this.getRouter();
-      if(this.fromPage.name === "works"){
+      if(this.fromPages.name === "works"){
         this.$router.go(-1)
       }else {
         this.$router.replace({

+ 1 - 1
src/views/menu/visitCheck/detail.vue

@@ -128,7 +128,7 @@ export default {
     //页面跳转逻辑
     toPagesFcn(){
       this.getRouter();
-      if(this.fromPage.name === "works"){
+      if(this.fromPages.name === "works"){
         this.$router.go(-1)
       }else {
         this.$router.replace({