Merge remote-tracking branch 'origin/master' into master

frontend_web/src/views/class/index.vue

@@ -95,7 +95,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>
@@ -117,7 +117,6 @@ export default {
       dialogvisible: false,
       name: '',
       details: false,
-      totalsize: 0,
       currpage: 1,
       size: 10,
       classificationlist: [],
@@ -133,7 +132,12 @@ export default {
       search: {
         Name: '',
         Year: '',
-        classification: ''
+        classification: '',
+        page: {
+          total: 0,
+          current: 1,
+          size: 10
+        }
       },
       // 列表排序
       Column: {
@@ -188,6 +192,7 @@ export default {
       ClassApi.getAllClass(params)
         .then(res => {
           _this.activities = res.records
+          _this.search.page.total = res.total
         })
     },
     handleSizeChange (val) {

frontend_web/src/views/duty/detail/index.vue

@@ -39,8 +39,9 @@
                           size="mini"
                           label-width="120px">
               <el-checkbox-group v-model="selectLocal">
-                <el-checkbox v-for="item in LocalList"
+                <el-checkbox v-for="(item,index) in LocalList"
                              :label="item.ItemValue"
+                             @change="getDetailData(index,item)"
                              :key="item.ItemValue">{{item.ItemName}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
@@ -81,20 +82,6 @@
               @header-click="headclick"
               :cell-class-name="cellBg"
               :key="refresh">
-      <el-table-column label="操作"
-                       width="180px"
-                       align="center"
-                       fixed='right'>
-        <template slot-scope="scope">
-          <el-button size="mini"
-                     type="danger"
-                     title="删除"
-                     @click="deleteRow(scope.row.Id)"
-                     style="margin-left:5px;"
-                     icon="el-icon-delete"
-                     circle></el-button>
-        </template>
-      </el-table-column>
       <el-table-column fit
                        prop="Local"
                        min-width="160px"
@@ -150,6 +137,19 @@
                        min-width="120px"
                        show-overflow-tooltip
                        :formatter="formatPerson"></el-table-column>
+      <el-table-column label="操作"
+                       width="80px"
+                       align="center">
+        <template slot-scope="scope">
+          <el-button size="mini"
+                     type="danger"
+                     title="删除"
+                     @click="deleteRow(scope.$index,list)"
+                     style="margin-left:3px;"
+                     icon="el-icon-delete"
+                     circle></el-button>
+        </template>
+      </el-table-column>
     </el-table>
   </d2-container>
 </template>
@@ -269,18 +269,8 @@ export default {
       }
     },
     // 删除一行
-    deleteRow () {
-      let val = this.selectcell
-      if (val) {
-        val.forEach((val, index) => {
-          this.list.forEach((v, i) => {
-            if (val.index === v.index) {
-              this.list.splice(i, 1)
-            }
-          })
-        })
-      }
-
+    deleteRow (index, rows) {
+      rows.splice(index, 1);
     },
     // 获取字典表地点
     getLocal () {
@@ -292,6 +282,10 @@ export default {
         .catch(err => {
           console.error(err)
         })
+    },
+    // 多选框回显
+    change (index, item) {
+
     },
     // 获取字典表值班人员
     getPeople () {
@@ -332,6 +326,10 @@ export default {
     cellclick (row, column, cell, event) {
       // 第3列开始可以选中
       // 单击单元格选中
+      // 取消操作行选中
+      if (cell.cellIndex >= columnNum) {
+        return
+      }
       if (cell.cellIndex >= fixRowHeadNum) {
         if (this.selectcell.get(row.Local + '_' + row.Time + '_' + column.property)) {
           this.selectcell.set(row.Local + '_' + row.Time + '_' + column.property, false)
@@ -361,6 +359,10 @@ export default {
     // 列选中
     headclick (column, event) {
       // 判断是否为可选列
+      // 取消操作列选中
+      if (column.index >= columnNum) {
+        return
+      }
       if (column.index > fixRowHeadNum - 1) {
         for (var i = 0; i < this.list.length; i++) {
           if (this.selectcell.get(this.list[i].Local + '_' + this.list[i].Time + '_' + column.property)) {