值班管理

frontend_web/src/api/duty.js

@@ -2,9 +2,9 @@ import request from '@/plugin/axios'
 
 export default {
    // 获取值班列表
-   getAllDuty (params) {
+   getPageList (params) {
     return request({
-      url: process.env.VUE_APP_API + 'duty/getallduty',
+      url: process.env.VUE_APP_API + 'duty/getpagelist',
       method: 'get', 
       params: params
     })

frontend_web/src/views/duty/components/dutyEdit.vue

@@ -29,8 +29,6 @@
         <el-col :span="8">
           <el-form-item label="地点"
                         label-width="120px">
-            <!-- <el-checkbox v-model="selectcites"
-                         @change="handleCheckAllChange(selectcites,cities)">全选</el-checkbox> -->
             <div style="margin: 15px 0;"></div>
             <el-checkbox-group v-model="selectcites">
               <el-checkbox v-for="city in cities"
@@ -156,6 +154,7 @@ export default {
   name: 'dutyEdit',
   data () {
     return {
+      year: '',
       edit: { year: 1 },
       cities: [{ label: '上海', value: 0 }, { label: '北京', value: 1 }, { label: '广州', value: 2 }, { label: '深圳', value: 3 }],
       times: [{ label: '8:00-12:00', value: 0 }, { label: '12:00-15:00', value: 1 }],
@@ -163,8 +162,7 @@ export default {
       checkAll: false,
       // 地点选择
       isIndeterminate: true,
-      cities: cityOptions,
-      checkedCities: [],
+      selectcites: [],
       // 时间选择
       isIndeterminateTime: true,
       schoolclass: classTime,

frontend_web/src/views/duty/index.vue

@@ -78,7 +78,7 @@
                        align="center"
                        min-width="120px"
                        show-overflow-tooltip></el-table-column>
-      <el-table-column prop="Name"
+      <el-table-column prop="Status"
                        label="状态"
                        align="center"
                        min-width="120px"
@@ -102,7 +102,7 @@
                      :page-sizes="[10, 15, 20]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
-                     :total="totalsize">
+                     :total="search.page.total">
       </el-pagination>
     </template>
   </d2-container>
@@ -128,24 +128,18 @@ export default {
       classificationlist: [],
       activities: [],
       Term: '',
-      Name: '',
       Year: '',
       Title: '',
-      Local: '',
       Time: '',
       Status: '',
-      Monday: '',
-      Tuesday: '',
-      Wednesday: '',
-      Thursday: '',
-      Friday: '',
-      Saturday: '',
-      Sunday: '',
-      CalibrationTime: [], // 录入时期
-      Remarks: '',
       search: {
         Term: '',
-        Year: ''
+        Year: '',
+        page: {
+          total: 0,
+          current: 1,
+          size: 10
+        }
       },
       statelist: [
         {
@@ -204,10 +198,10 @@ export default {
         _size: this.size,
         Year: this.search.Year,
         Term: this.search.Term,
-        Order: this.Column.Order,
-        Prop: this.Column.Prop
+        Order: this.search.Order,
+        Prop: this.search.Prop
       }
-      DutyApi.getAllDuty(params)
+      DutyApi.getPageList(params)
         .then(res => {
           _this.activities = res.records
         })