Explorar o código

Merge branch 'Inspection' into online

mo %!s(int64=4) %!d(string=hai) anos
pai
achega
e7ea6275b3

+ 3 - 0
src/views/main/api.js

@@ -103,3 +103,6 @@ export const getMusicGroupEduTeacher = data => request2({
   params: data,
   params: data,
   method: 'get'
   method: 'get'
 })
 })
+
+// 获取统计数据
+// export const

+ 1 - 1
src/views/main/baseinfo/index.vue

@@ -98,7 +98,7 @@ export default {
   methods: {
   methods: {
     reset() {
     reset() {
       this.$set(this.search, 'year', this.$helpers.dayjs())
       this.$set(this.search, 'year', this.$helpers.dayjs())
-      this.$set(this.search, 'organId', [])
+      this.$set(this.search, 'organId', null)
       this.FetchDetail()
       this.FetchDetail()
     },
     },
     async FetchDetail() {
     async FetchDetail() {

+ 2 - 2
src/views/main/teamSchedule/compontent/taskInfo.vue

@@ -26,7 +26,7 @@
           @change="changeStartTime"
           @change="changeStartTime"
           v-model="taskForm.startTimer"
           v-model="taskForm.startTimer"
           format="HH:mm"
           format="HH:mm"
-          value-format="HH:mm:ss"
+          value-format="HH:mm"
           placeholder="选择时间范围"
           placeholder="选择时间范围"
           :picker-options="{
           :picker-options="{
             selectableRange: `04:00:00-23:59:00`,
             selectableRange: `04:00:00-23:59:00`,
@@ -43,7 +43,7 @@
           style="width: 410px"
           style="width: 410px"
           v-model="taskForm.endTimer"
           v-model="taskForm.endTimer"
           format="HH:mm"
           format="HH:mm"
-          value-format="HH:mm:ss"
+          value-format="HH:mm"
           placeholder="选择时间范围"
           placeholder="选择时间范围"
           :picker-options="{
           :picker-options="{
             selectableRange: `${taskForm.startTimer}-23:59:00`,
             selectableRange: `${taskForm.startTimer}-23:59:00`,