修改作息

src/assets/styles/ruoyi.scss

@@ -73,7 +73,7 @@
 	overflow-x: hidden;
 	max-height: 70vh;
 	padding: 10px 20px 0;
-	
+
 }
 
 .el-dialog__body{
@@ -342,4 +342,12 @@
 
 .el-descriptions{
 	font-size: 16px !important;
-}
+}
+
+ .el-button--text{
+   padding: 0!important;
+ }
+
+ .el-table--small .el-table__cell{
+   padding: 10px 0!important;
+ }

src/views/system/workTimeSet/index.vue

@@ -3,13 +3,17 @@
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="作息配置" name="作息配置">
-        <work-time></work-time>
+
       </el-tab-pane>
-      <el-tab-pane v-hasPermi="['system:time:week']" label="模板配置作息" name="按周配置作息">
-        <work-time-week ></work-time-week>
+      <el-tab-pane v-hasPermi="['system:time:week']" label="模板配置作息" name="模板配置作息">
+
       </el-tab-pane>
     </el-tabs>
 
+    <work-time v-if="activeName==='作息配置'"></work-time>
+    <div v-hasPermi="['system:time:kkk']">
+      <work-time-week  v-if="activeName==='模板配置作息'"></work-time-week>
+    </div>
   </div>
 </template>
 
@@ -40,10 +44,14 @@ export default {
     background-color: #fff;
     padding: 0 10px;
     box-shadow: 0 2px 8px #eee;
+
   }
   .el-tabs__nav-wrap::after{
     background-color: #fff;
   }
+  .el-tabs__item{
+    font-size: 16px;
+  }
 }
 </style>
 <style lang="scss" scoped>

src/views/system/workTimeSet/workTime.vue

@@ -147,6 +147,7 @@
             width="100">
             <template slot-scope="r">
               <el-button
+                size="mini"
                 icon="el-icon-edit-outline"
                 type="text"
                 v-if="hideEdit(r.row)"

src/views/system/workTimeSet/workTimeWeek.vue

@@ -71,7 +71,7 @@
   <!--                <el-button type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>-->
   <!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->
   <!--                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="lookItem(r.row)">查看</el-button>-->
-                  <el-button type="text" @click="lookItem(r.row)">查看</el-button>
+                  <el-button size="mini" type="text" @click="lookItem(r.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -194,6 +194,7 @@ export default {
     },
     /** 查询列表 */
     getList() {
+      this.loading = true;
       weekTableList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.tableList = response.data.records;
           this.total = response.data.total;