zc

src/assets/styles/button.scss

@@ -354,10 +354,6 @@
   }
 }
 .cell{
-  //.button-box{
-  //  display: flex;
-  //  margin:0 auto;
-  //}
   .table-min-button{
     //flex:1;
     height:23px;

src/assets/styles/commonality.scss

@@ -21,6 +21,9 @@
   background: #fff;
 }
 /*************************表单表格样式*************************/
+.el-form-item{
+  margin-bottom:20px;
+}
 .el-form-item--medium .el-form-item__label{
   color:#333;
   font-weight:500;

src/assets/styles/dialog.scss

@@ -872,83 +872,6 @@
     cursor:pointer;
   }
 }
-//教职工管理
-.teacher {
-  .el-input--small{
-    width:150px!important;
-  }
-  .el-select{
-    //width:150px!important;
-  }
-  .table-for-max-box{
-    .el-select{
-      width:210px!important;
-    }
-  }
-  .pagination-container{
-    margin: 0 !important;
-    padding: 0!important;
-  }
-
-  .colorA{
-    border:2px solid $lv1Danger;
-    color:$lv1Danger;
-  }
-  .colorB{
-    border:2px solid $lv2Danger;
-    color:$lv2Danger;
-  }
-  .colorC{
-    border:2px solid $lv3Danger;
-    color:$lv3Danger;
-  }
-  .colorD{
-    border:2px solid $lv4Danger;
-    color:$lv4Danger;
-  }
-
-  /*==========树结构开始==========*/
-  .el-tree-node__expand-icon.expanded {
-    -webkit-transform: rotate(0deg)!important;
-    transform: rotate(0deg)!important;
-  }
-  //未展开
-  .el-icon-caret-right:before {
-    content:"\e6d9";
-    color:#999;
-    font-size: 12px;
-    border: 1px solid #999;;
-    border-radius: 2px;
-  }
-  //展开
-  .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{
-    content:"\e6d8";
-    color:#999;
-    font-size: 12px;
-    border: 1px solid #999;;
-    border-radius: 2px;
-  }
-  .el-tree-node__expand-icon.is-leaf:before{
-    color: transparent!important;
-    border: none;
-    cursor: default;
-  }
-  .el-tree .el-tree-node__label{
-    font-size:14px;
-    color:#333333;
-  }
-  .el-tree .el-tree-node__children .el-tree-node__label{
-    font-size: 14px!important;
-  }
-  .el-tree .el-tree-node__children .el-tree-node__children .el-tree-node__label{
-    color:#333333;
-    font-size: 14px!important;
-  }
-  .el-tree-node__content{
-    height:37px;
-  }
-  /*==========树结构结束==========*/
-}
 //实验室配置
 .subject{
   .el-form-item{
@@ -2347,6 +2270,50 @@
     white-space:nowrap;
   }
 }
+.el-course,.el-resources{
+  /*==========树结构开始==========*/
+  .el-tree-node__expand-icon.expanded {
+    -webkit-transform: rotate(0deg)!important;
+    transform: rotate(0deg)!important;
+  }
+  //未展开
+  .el-icon-caret-right:before {
+    content:"\e6d9";
+    color:#999;
+    font-size: 12px;
+    border: 1px solid #999;;
+    border-radius: 2px;
+  }
+  //展开
+  .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{
+    content:"\e6d8";
+    color:#999;
+    font-size: 12px;
+    border: 1px solid #999;;
+    border-radius: 2px;
+  }
+  .el-tree-node__expand-icon.is-leaf:before{
+    color: transparent!important;
+    border: none;
+    cursor: default;
+  }
+  .el-tree .el-tree-node__label{
+    font-size:14px;
+    color:#333333;
+    font-weight:700;
+  }
+  .el-tree .el-tree-node__children .el-tree-node__label{
+    font-size: 14px!important;
+  }
+  .el-tree .el-tree-node__children .el-tree-node__children .el-tree-node__label{
+    //color:#999999;
+    font-size: 14px!important;
+  }
+  .el-tree-node__content{
+    height:37px;
+  }
+  /*==========树结构结束==========*/
+}
 .el-check-box{
   .el-radio__input.is-disabled + span.el-radio__label{
     color:#333;

src/assets/styles/index.scss

@@ -412,50 +412,6 @@ aside {
 .edui-default .edui-editor-bottomContainer{
   display: none;
 }
-/*************************树结构*************************/
-.el-course,.el-resources{
-  /*==========树结构开始==========*/
-  .el-tree-node__expand-icon.expanded {
-    -webkit-transform: rotate(0deg)!important;
-    transform: rotate(0deg)!important;
-  }
-  //未展开
-  .el-icon-caret-right:before {
-    content:"\e6d9";
-    color:#999;
-    font-size: 12px;
-    border: 1px solid #999;;
-    border-radius: 2px;
-  }
-  //展开
-  .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{
-    content:"\e6d8";
-    color:#999;
-    font-size: 12px;
-    border: 1px solid #999;;
-    border-radius: 2px;
-  }
-  .el-tree-node__expand-icon.is-leaf:before{
-    color: transparent!important;
-    border: none;
-    cursor: default;
-  }
-  .el-tree .el-tree-node__label{
-    font-size:14px;
-    color:#333333;
-  }
-  .el-tree .el-tree-node__children .el-tree-node__label{
-    font-size: 14px!important;
-  }
-  .el-tree .el-tree-node__children .el-tree-node__children .el-tree-node__label{
-    //color:#999999;
-    font-size: 14px!important;
-  }
-  .el-tree-node__content{
-    height:37px;
-  }
-  /*==========树结构结束==========*/
-}
 /*************************公共滚动条样式*************************/
 //竖向
 .scrollbar-box{
@@ -544,3 +500,7 @@ aside {
     pointer-events :none;//点击禁用
   }
 }
+//input-number 按钮尺寸
+.el-input-number.is-controls-right .el-input-number__increase, .el-input-number.is-controls-right .el-input-number__decrease{
+  line-height:19px!important;
+}

src/views/laboratoryManagement/personnelManage/teacherInfo/index.vue

@@ -1439,9 +1439,70 @@
         }
       }
     }
+    ::v-deep .bottom-button-max-box{
+      /*==========树结构开始==========*/
+      .el-tree-node__expand-icon.expanded {
+        -webkit-transform: rotate(0deg)!important;
+        transform: rotate(0deg)!important;
+      }
+      //未展开
+      .el-icon-caret-right:before {
+        content:"\e6d9";
+        color:#999;
+        font-size: 12px;
+        border: 1px solid #999;;
+        border-radius: 2px;
+      }
+      //展开
+      .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{
+        content:"\e6d8";
+        color:#999;
+        font-size: 12px;
+        border: 1px solid #999;;
+        border-radius: 2px;
+      }
+      .el-tree-node__expand-icon.is-leaf:before{
+        color: transparent!important;
+        border: none;
+        cursor: default;
+      }
+      .el-tree .el-tree-node__label{
+        font-size:14px;
+        color:#333333;
+        font-weight:700;
+      }
+      .el-tree .el-tree-node__children .el-tree-node__label{
+        font-size: 14px!important;
+      }
+      .el-tree .el-tree-node__children .el-tree-node__children .el-tree-node__label{
+        color:#333333;
+        font-size: 14px!important;
+      }
+      .el-tree-node__content{
+        height:37px;
+      }
+      /*==========树结构结束==========*/
+    }
   }
 </style>
 <style lang="scss">
+  .teacher {
+    .el-input--small{
+      width:150px!important;
+    }
+    .el-select{
+      //width:150px!important;
+    }
+    .table-for-max-box{
+      .el-select{
+        width:210px!important;
+      }
+    }
+    .pagination-container{
+      margin: 0 !important;
+      padding: 0!important;
+    }
+  }
   .teacher-revise-dialog-box{
     .teacher-text-p{
       margin-left:110px;

src/views/systemManagement/dict/index.vue

@@ -367,9 +367,6 @@ export default {
     flex-direction: column;
     box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     padding:20px;
-    .form-box{
-      margin-top:12px;
-    }
     .button-box{
       width:340px;
       display: flex;

src/views/systemManagement/menu/index.vue

@@ -103,6 +103,7 @@
           <el-col :span="24">
             <el-form-item label="上级菜单">
               <treeselect
+                style="width:500px;"
                 v-model="form.parentId"
                 :options="menuOptions"
                 :normalizer="normalizer"
@@ -114,9 +115,10 @@
           <el-col :span="24">
             <el-form-item label="菜单类型" prop="menuType">
               <el-radio-group v-model="form.menuType" >
-                <el-radio v-for="item in menuTypeList"
-                          :disabled="item.disabled"
-                          :label="item.label">
+                <el-radio
+                  v-for="item in menuTypeList"
+                  :disabled="item.disabled"
+                  :label="item.label">
                   {{item.value}}
                 </el-radio>
               </el-radio-group>
@@ -126,12 +128,16 @@
             <el-form-item v-if="form.menuType != '2'" label="菜单图标">
               <el-popover
                 placement="bottom-start"
-                width="460"
+                width="500"
                 trigger="click"
                 @show="$refs['iconSelect'].reset()"
               >
                 <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
+                <el-input slot="reference"
+                          style="width:500px;"
+                          v-model="form.icon"
+                          placeholder="点击选择图标"
+                          readonly>
                   <svg-icon
                     v-if="form.icon"
                     slot="prefix"
@@ -146,25 +152,26 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="菜单名称" prop="menuName">
-              <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
+              <el-input v-model="form.menuName" placeholder="请输入菜单名称" style="width:200px;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0"
+                               style="width:180px;"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.menuType != '2'">
               <span slot="label">
                 <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 是否外链
               </span>
               <el-radio-group v-model="form.isFrame">
-                <el-radio :label="true">是</el-radio>
-                <el-radio :label="false">否</el-radio>
+                <el-radio :label="true" style="width:60px;">是</el-radio>
+                <el-radio :label="false" style="width:60px;">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -172,18 +179,18 @@
             <el-form-item v-if="form.menuType != '2'" prop="path">
               <span slot="label">
                 <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 路由地址
               </span>
-              <el-input v-model="form.path" placeholder="请输入路由地址" />
+              <el-input v-model="form.path" placeholder="请输入路由地址" style="width:180px;"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.menuType == '1'">
             <el-form-item prop="component">
               <span slot="label">
                 <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 组件路径
               </span>
@@ -192,10 +199,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.menuType != '0'">
-              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
+              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" style="width:200px;"/>
               <span slot="label">
                 <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 权限字符
               </span>
@@ -205,12 +212,13 @@
             <el-form-item v-if="form.menuType != '2'">
               <span slot="label">
                 <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 显示状态
               </span>
               <el-radio-group v-model="form.visible">
                 <el-radio
+                  style="width:60px;"
                   v-for="dict in visibleOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
@@ -222,12 +230,13 @@
             <el-form-item v-if="form.menuType != '2'">
               <span slot="label">
                 <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 菜单状态
               </span>
               <el-radio-group v-model="form.status">
                 <el-radio
+                  style="width:60px;"
                   v-for="dict in statusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
@@ -239,13 +248,13 @@
             <el-form-item v-if="form.menuType == '1'">
               <span slot="label">
                 <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 是否缓存
               </span>
               <el-radio-group v-model="form.isCache">
-                <el-radio :label="true">缓存</el-radio>
-                <el-radio :label="false">不缓存</el-radio>
+                <el-radio :label="true" style="width:60px;">缓存</el-radio>
+                <el-radio :label="false" style="width:60px;">不缓存</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -253,13 +262,13 @@
             <el-form-item>
               <span slot="label">
                 <el-tooltip content="选择是后在权限配置时此项为选中并且无法操作" placement="top">
-                <i class="el-icon-question"></i>
+                <i class="el-icon-question" style="color:#999;"></i>
                 </el-tooltip>
                 是否必选
               </span>
               <el-radio-group v-model="form.isRequired">
-                <el-radio :label="true">是</el-radio>
-                <el-radio :label="false">否</el-radio>
+                <el-radio :label="true" style="width:60px;">是</el-radio>
+                <el-radio :label="false" style="width:60px;">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

src/views/systemManagement/publicConfig/index.vue

@@ -84,7 +84,7 @@ export default {
   }
   .top-button-max-box{
     display: flex;
-    padding:16px 10px 0;
+    padding:7px 10px 0;
     border-bottom:1px solid #D8D8D8;
     .top-button-box{
       height:73px;

src/views/systemManagement/systemUser/index.vue

@@ -615,6 +615,50 @@ export default {
     box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     padding:20px;
   }
+  ::v-deep .head-container{
+    /*==========树结构开始==========*/
+    .el-tree-node__expand-icon.expanded {
+      -webkit-transform: rotate(0deg)!important;
+      transform: rotate(0deg)!important;
+    }
+    //未展开
+    .el-icon-caret-right:before {
+      content:"\e6d9";
+      color:#999;
+      font-size: 12px;
+      border: 1px solid #999;;
+      border-radius: 2px;
+    }
+    //展开
+    .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{
+      content:"\e6d8";
+      color:#999;
+      font-size: 12px;
+      border: 1px solid #999;;
+      border-radius: 2px;
+    }
+    .el-tree-node__expand-icon.is-leaf:before{
+      color: transparent!important;
+      border: none;
+      cursor: default;
+    }
+    .el-tree .el-tree-node__label{
+      font-size:14px;
+      color:#333333;
+      font-weight:700;
+    }
+    .el-tree .el-tree-node__children .el-tree-node__label{
+      font-size: 14px!important;
+    }
+    .el-tree .el-tree-node__children .el-tree-node__children .el-tree-node__label{
+      color:#333333;
+      font-size: 14px!important;
+    }
+    .el-tree-node__content{
+      height:37px;
+    }
+    /*==========树结构结束==========*/
+  }
   ::v-deep .min-list-box{
     .switch .el-switch__label {
       position: absolute;