Shannon_mu vor 3 Jahren
Ursprung
Commit
600b73bb57
1 geänderte Dateien mit 12 neuen und 10 gelöschten Zeilen
  1. 12 10
      operationSupport/src/views/patrolManagement/popups/scheduling.vue

+ 12 - 10
operationSupport/src/views/patrolManagement/popups/scheduling.vue

@@ -33,7 +33,7 @@
                     </template>
                     </template>
                     <div
                     <div
                         class="pointSet"
                         class="pointSet"
-                        v-if="date.getTime() >= new Date(new Date().toLocaleDateString()).getTime() && !trueArr.includes(time)"
+                        v-if="date.getTime() >= new Date(new Date().toLocaleDateString()).getTime() && !trueArr.includes(data.day)"
                         @click="add(data)"
                         @click="add(data)"
                     >
                     >
                         点击设置
                         点击设置
@@ -119,8 +119,8 @@ export default {
         getShiftInformation(obj) {
         getShiftInformation(obj) {
             this.$http.post('/sc-community/patrolRoute/getShiftInformation', obj).then(({ data, status, msg }) => {
             this.$http.post('/sc-community/patrolRoute/getShiftInformation', obj).then(({ data, status, msg }) => {
                 if (!!data) {
                 if (!!data) {
-                    this.calendarData = [];
-                    this.trueArr = [];
+                    let calendarData = [],
+                        trueArr = [];
                     for (let inx in data) {
                     for (let inx in data) {
                         let rosterUserDtos = [];
                         let rosterUserDtos = [];
                         data[inx].map((item) => {
                         data[inx].map((item) => {
@@ -129,12 +129,14 @@ export default {
                                 partolName: item.partolName
                                 partolName: item.partolName
                             });
                             });
                         });
                         });
-                        this.trueArr.push(this.$moment(inx).format('YYYY-MM-DD'));
-                        this.calendarData.push({
+                        trueArr.push(this.$moment(inx).format('YYYY-MM-DD'));
+                        calendarData.push({
                             partrolDate: this.$moment(inx).format('YYYY-MM-DD'),
                             partrolDate: this.$moment(inx).format('YYYY-MM-DD'),
                             rosterUserDtos: rosterUserDtos
                             rosterUserDtos: rosterUserDtos
                         });
                         });
                     }
                     }
+                    this.calendarData = calendarData;
+                    this.trueArr = trueArr;
                 }
                 }
             });
             });
         }
         }
@@ -188,15 +190,15 @@ export default {
             height: 110px;
             height: 110px;
             overflow: auto;
             overflow: auto;
             &::-webkit-scrollbar {
             &::-webkit-scrollbar {
-                width: 10px;
+                width: 5px;
             }
             }
             &::-webkit-scrollbar-track {
             &::-webkit-scrollbar-track {
-                border-radius: 10px;
-                background: #c6c4c4a9;
+                border-radius: 5px;
+                background: #f4f7f9a8;
             }
             }
             &::-webkit-scrollbar-thumb {
             &::-webkit-scrollbar-thumb {
-                border-radius: 10px;
-                background: #f4f7f9a8;
+                border-radius: 5px;
+                background: #c6c4c4a9;
             }
             }
         }
         }
     }
     }