Merge branch 'master' into contentManagerTemp

src/views/serverDetail/index.vue

@@ -69,7 +69,7 @@
             v-model.trim="searchForm.operatorId"
           />
         </el-form-item>
-        <el-form-item prop="jobNature">
+        <el-form-item>
           <el-select
             v-model.trim="searchForm.jobNature"
             filterable
@@ -355,6 +355,7 @@ export default {
         getNowDateAndMonday(lastWeek),
         getNowDateAndSunday(nowDate),
       ];
+      this.searchForm.jobNature = 'FULL_TIME'
     },
     changeWeek(val) {
       if (val) {