凉纪 2 жил өмнө
parent
commit
a648e87dbe

+ 2 - 2
src/App.vue

@@ -22,8 +22,8 @@ export default {
 };
 </script>
 <style scoped>
-#app{
-  font-size: 14px;
+#app {
+  font-size: 16px;
 }
 #app .theme-picker {
   display: none;

BIN
src/assets/fonts/SourceHanSansCN-Light.otf → src/assets/fonts/SourceHanSansCN-Bold.otf


BIN
src/assets/fonts/SourceHanSansCN-ExtraLight.otf → src/assets/fonts/SourceHanSansCN-Heavy.otf


BIN
src/assets/fonts/SourceHanSansCN-VF.ttf


+ 23 - 22
src/assets/styles/index.scss

@@ -8,28 +8,27 @@
 //@font-face {
 //  font-family: SYExtraLight;
 //  font-style: normal;
-//  font-weight: 300;
 //  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-VF.ttf");
 //}
 
-//@font-face {
-//  font-family: SYExtraLight;
-//  font-style: normal;
-//  font-weight: 300;
-//  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-ExtraLight.otf");
-//}
-//
-//@font-face {
-//  font-family: SYLight;
-//  font-style: normal;
-//  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Light.otf");
-//}
-//
-//@font-face {
-//  font-family: SYNormal;
-//  font-style: normal;
-//  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
-//}
+@font-face {
+  font-family: SYBold;
+  font-style: normal;
+  font-weight: 300;
+  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-Bold.otf");
+}
+
+@font-face {
+  font-family: SYHeavy;
+  font-style: normal;
+  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Heavy.otf");
+}
+
+@font-face {
+  font-family: SYNormal;
+  font-style: normal;
+  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
+}
 
 body {
   height: 100%;
@@ -37,7 +36,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   color: #000;
-  //font-family: SYExtraLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
   /*框架自带字体*/
   //font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
   //  Microsoft YaHei, Arial, sans-serif;
@@ -45,9 +44,11 @@ body {
 
 .el-button{
   //font-weight: 400;
-  //font-family: SYLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: SYBold,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+.el-button--text{
+  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
-
 .el-table__header-wrapper{
   //font-weight: normal;
   //font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;

+ 27 - 6
src/assets/styles/ruoyi.scss

@@ -289,21 +289,42 @@
    font-size: 12px;
  }
  .el-button--mini{
-   font-size: 13px!important;
+   font-size: 16px!important;
+ }
+ .el-table--small{
+    font-size: 16px!important;
  }
 .el-table thead{
   >tr{
     >th{
+      font-family: SYHeavy,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+      font-size: 16px!important;
       background-color: #d1e0f1 !important;
     }
   }
 }
 .el-tree-node__content{
-    font-size: 13px;
-    height: 32px!important;
-  }
- .el-submenu__title,.el-menu-item{
-   font-size: 13px!important;
+   font-size: 16px;
+  height: 36px!important;
+  line-height: 36px!important;
+}
+.el-submenu__title,.el-menu-item{
+   font-size: 16px!important;
    height: 42px!important;
    line-height: 42px!important;
+}
+
+ .el-form-item__label{
+    font-size: 16px!important;
+ }
+
+ .tags-view-item{
+   line-height: 23px!important;
+   font-size: 16px!important;
  }
+ .el-pagination button, .el-pagination span:not([class*=suffix]){
+   font-size: 16px!important;
+ }
+.el-checkbox__label{
+  font-size: 16px!important;
+}

+ 25 - 8
src/views/system/dept/index.vue

@@ -67,7 +67,21 @@
                    />
                  </el-select>
                </el-form-item>
-               <el-form-item>
+<!--               <el-form-item>-->
+<!--                 <el-button-->
+<!--                   type="primary"-->
+<!--                   icon="el-icon-search"-->
+<!--                   size="mini"-->
+<!--                   @click="handleQuery"-->
+<!--                 >搜索</el-button-->
+<!--                 >-->
+<!--                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"-->
+<!--                 >重置</el-button-->
+<!--                 >-->
+<!--               </el-form-item>-->
+             </el-form>
+             <el-row :gutter="10">
+               <el-col :span="1.5">
                  <el-button
                    type="primary"
                    icon="el-icon-search"
@@ -75,12 +89,16 @@
                    @click="handleQuery"
                  >搜索</el-button
                  >
-                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+               </el-col>
+               <el-col :span="1.5">
+                 <el-button
+                   type="primary"
+                   icon="el-icon-refresh"
+                   size="mini"
+                   @click="resetQuery"
                  >重置</el-button
                  >
-               </el-form-item>
-             </el-form>
-             <el-row :gutter="10">
+               </el-col>
                <el-col :span="1.5">
                  <el-button
                    type="primary"
@@ -169,7 +187,7 @@
              <el-table-column
                label="操作"
                align="left"
-               width="220"
+               width="280"
                class-name="small-padding fixed-width"
              >
                <template slot-scope="scope">
@@ -190,7 +208,7 @@
                    @click="handleReplenish(scope.row.id)"
                  >补充信息</el-button
                  >
-                 <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
+                 <span v-else style="display: inline-block;width: 85px;height: 20px;"></span>
                  <!-- </router-link> -->
                  <el-divider direction="vertical"></el-divider>
                  <el-button
@@ -214,7 +232,6 @@
              </el-table-column>
            </el-table>
            <pagination
-             v-show="total > 0"
              :total="total"
              :page.sync="queryParams.pageNum"
              :limit.sync="queryParams.pageSize"

+ 0 - 1
src/views/system/device/index.vue

@@ -171,7 +171,6 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="total > 0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"

+ 4 - 3
src/views/system/user/index.vue

@@ -194,6 +194,7 @@
               prop="username"
               width="120"
               v-if="columns[0].visible"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
               label="姓名"
@@ -255,7 +256,7 @@
                 />
               </template>
             </el-table-column>
-            
+
             <el-table-column
               label="登录IP"
               align="center"
@@ -363,7 +364,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination            
+          <pagination
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -653,7 +654,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         username: null,
         phone: null,
         status: null,