修复bug

src/views/safetyBook/index.vue

@@ -21,8 +21,6 @@
           :inline="true"
           v-show="showSearch"
         >
-          <el-row :gutter="50">
-            <el-col :span="6" :xs="14">
               <el-form-item prop="type" label="签署类型">
                 <el-select
                   prop="type"
@@ -39,8 +37,6 @@
                   />
                 </el-select>
               </el-form-item>
-            </el-col>
-            <el-col :span="6" :xs="24">
               <el-form-item label="所属年度" prop="year">
                 <el-date-picker
                   v-model="queryParams.year"
@@ -51,8 +47,6 @@
                 >
                 </el-date-picker>
               </el-form-item>
-            </el-col>
-            <el-col :span="6" :xs="24">
               <el-form-item label="签署机构" prop="orgId" class="formTreeItem">
                 <tree-select
                   v-model="queryParams.orgId"
@@ -67,11 +61,9 @@
                   noResultsText="没有搜索结果"
                 />
               </el-form-item>
-            </el-col>
-          </el-row>
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
+        <el-row :gutter="10">
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -110,7 +102,7 @@
       <!-- 表格数据 -->
       <el-table
         border
-        height="700"
+        height="646"
         size="small"
         v-loading="loading"
         :data="dataList"
@@ -119,10 +111,9 @@
         <el-table-column
           label="签署机构"
           align="left"
-          width="400"
           prop="orgName"
         />
-        <el-table-column label="签署类型" align="left" width="300" prop="type">
+        <el-table-column label="签署类型" align="left"  prop="type">
           <template slot-scope="r"
             >{{ getLabel(dict.type.safety_book_type, `${r.row.type}`) }}
           </template>
@@ -153,7 +144,6 @@
         <el-table-column
           label="操作"
           width="250"
-          fixed="right"
           align="center"
           class-name="small-padding fixed-width"
         >

src/views/system/workTimeSet/workTime.vue

@@ -133,7 +133,7 @@
             </el-table-column>
             <el-table-column align="center" label="值班打卡">
               <template slot-scope="r">{{
-                r.row.isEnable == "1" ? "是" : "否"
+                r.row.isDuty == "1" ? "是" : "否"
               }}</template>
             </el-table-column>
             <el-table-column v-if="columns[3].visible" label="上下班时间">