调整部分样式

.gitignore

@@ -15,3 +15,4 @@ selenium-debug.log
 *.ntvs*
 *.njsproj
 *.sln
+yarn.lock

src/assets/css/vxetable.css

-.vxe-table{
+.vxe-table {
     border: none!important;
-    background-color:transparent!important;
+    background-color: transparent!important;
     font-size: 12px!important;
-    font-family: '宋体';
-    color:#000000;
+    font-family: 'Microsoft YaHei';
+    color: #000000;
 }
-.vxe-table .vxe-body--column:not(.col--ellipsis), 
-.vxe-table .vxe-footer--column:not(.col--ellipsis), 
-.vxe-table .vxe-header--column:not(.col--ellipsis){
-    padding:7px 0!important;
+
+.vxe-table .vxe-body--column:not(.col--ellipsis),
+.vxe-table .vxe-footer--column:not(.col--ellipsis),
+.vxe-table .vxe-header--column:not(.col--ellipsis) {
+    padding: 7px 0!important;
 }
-.vxe-table:after, .vxe-table:before{
-    background-color:transparent!important;
 
+.vxe-table:after,
+.vxe-table:before {
+    background-color: transparent!important;
 }
-.vxe-table .vxe-body--row .vxe-body--column{
+
+.vxe-table .vxe-body--row .vxe-body--column {
     border-bottom: 1px solid #E2E4EB!important;
 }
-.vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{
-    border:none!important;
+
+.vxe-table .vxe-table--footer-wrapper,
+.vxe-table .vxe-table--header-wrapper {
+    border: none!important;
 }
-.vxe-table--header-wrapper{
+
+.vxe-table--header-wrapper {
     background: transparent!important;
 }
-.vxe-table .vxe-header--column .vxe-cell{
-    color:#000000;
+
+.vxe-table .vxe-header--column .vxe-cell {
+    color: #000000;
     font-family: "PingFangR";
 }
-.vxe-table--header-wrapper .vxe-table--repair{
+
+.vxe-table--header-wrapper .vxe-table--repair {
     height: 0!important;
 }
-.vxe-table .vxe-body--row:hover{
+
+.vxe-table .vxe-body--row:hover {
     cursor: pointer;
-    box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
-    transition: transform .2s linear;  
+    box-shadow: 0px 0 20px 0px rgba(176, 176, 176, 0.2);
+    transition: transform .2s linear;
     transform: scale(1);
     /* zoom:1.02; */
 }
-.vxe-table .vxe-cell{
+
+.vxe-table .vxe-cell {
     padding: 0 0 0 20px;
 }
+
+
 /* .vxe-table .vxe-body--row:hover td{
     border-radius:0!important;
 }
@@ -55,54 +67,73 @@
 .vxe-table .vxe-body--row:last-child td:last-child{
     border-radius:0 0 20px 0;
 } */
-.vxe-icon--menu{
-    color:#089bab!important;
+
+.vxe-icon--menu {
+    color: #089bab!important;
 }
-.vxe-toolbar .vxe-custom--setting-btn:hover{
+
+.vxe-toolbar .vxe-custom--setting-btn:hover {
     background: transparent;
 }
-.vxe-checkbox>input:checked+.vxe-checkbox--icon+.vxe-checkbox--label{
+
+.vxe-checkbox>input:checked+.vxe-checkbox--icon+.vxe-checkbox--label {
     color: #089bab!important;
 }
+
 .vxe-checkbox>input:checked+.vxe-checkbox--icon {
     background-color: #089bab!important;
     border-color: #089bab!important;
 }
-.vxe-checkbox .vxe-checkbox--label{
+
+.vxe-checkbox .vxe-checkbox--label {
     font-size: 12px!important;
-    font-family: '宋体'!important;
+    font-family: 'Microsoft YaHei'!important;
     font-weight: 100;
 }
-.vxe-table--loading .vxe-table--spinner:after, .vxe-table--loading .vxe-table--spinner:before{
+
+.vxe-table--loading .vxe-table--spinner:after,
+.vxe-table--loading .vxe-table--spinner:before {
     background-color: #089bab!important;
-    opacity:.4!important;
+    opacity: .4!important;
 }
-.vxe-table--loading{
-    background-color: rgba(255,255,255,.9)!important; 
+
+.vxe-table--loading {
+    background-color: rgba(255, 255, 255, .9)!important;
 }
-.vxe-table table{
+
+.vxe-table table {
     overflow: hidden;
 }
-.vxe-checkbox.is--indeterminate>input:not(:checked)+.vxe-checkbox--icon{
+
+.vxe-checkbox.is--indeterminate>input:not(:checked)+.vxe-checkbox--icon {
     background-color: #089bab!important;
     border-color: #089bab!important;
 }
-.vxe-toolbar.is--loading:before{
-    background-color: rgba(0,0,0,0)!important;
+
+.vxe-toolbar.is--loading:before {
+    background-color: rgba(0, 0, 0, 0)!important;
 }
-.vxe-table .vxe-table--empty-block, .vxe-table .vxe-table--empty-placeholder{
+
+.vxe-table .vxe-table--empty-block,
+.vxe-table .vxe-table--empty-placeholder {
     background: #fff!important;
     min-height: 50px!important;
 }
-.vxe-table .vxe-body--expanded-cell{
-    padding:0 20px!important;
+
+.vxe-table .vxe-body--expanded-cell {
+    padding: 0 20px!important;
 }
-.ExpandTable .vxe-table--header-wrapper{
+
+.ExpandTable .vxe-table--header-wrapper {
     background: #EFF2F8!important;
 }
-.vxe-table .vxe-body--row.row--stripe{
+
+.vxe-table .vxe-body--row.row--stripe {
     background-color: #F6F9FB;
 }
-.vxe-table .vxe-body--column, .vxe-table .vxe-footer--column, .vxe-table .vxe-header--column{
+
+.vxe-table .vxe-body--column,
+.vxe-table .vxe-footer--column,
+.vxe-table .vxe-header--column {
     line-height: inherit!important;
 }
\ No newline at end of file

src/assets/global/font.css

-@font-face{
+@font-face {
     font-family: 'pingfang';
-    src:url('../fonts/pingfang.woff2')  format('woff');
+    src: url('../fonts/pingfang.woff2') format('woff');
 }
+
 @font-face {
     font-family: "PingFangR";
-    src: url("../fonts/Semibold.eot"); /* IE9 */
+    src: url("../fonts/Semibold.eot");
+    /* IE9 */
     src: url("../fonts/Semibold.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */
     url("../fonts/Semibold.woff") format("woff"), /* chrome, firefox */
-    url("../fonts/Semibold.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+    url("../fonts/Semibold.ttf") format("truetype");
+    /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
     font-style: normal;
     font-weight: normal;
 }
+
+@font-face {
+    font-family: 'muil';
+    src: url('../fonts/MicrosoftYaHeiLight.woff') format('woff');
+}
+
+
 /* @font-face {
     font-family: "FZDBSJW";
     src: url("../fonts/FZDBSJW.woff") format("woff"),
@@ -19,11 +29,13 @@
     font-style: normal;
     font-weight: normal;
 } */
-@font-face{
+
+
+/* @font-face{
     font-family:'方正大标宋简体';
     src:url('../fonts/FZDBSJW.woff') format('woff')
 }
 @font-face{
     font-family:'方正宋三简体';
     src:url('../fonts/FZSSJ.ttf') format('truetype')
-}
\ No newline at end of file
+} */
\ No newline at end of file

src/components/Home.vue

@@ -51,7 +51,7 @@
         <span @click="goScroll(2)" :class="tabActive==2?'active':''"></span>
       </div>
     </div>
-    <div class="homeContent basefix" style="background:#F8FAFB">
+    <div class="homeContent basefix" style="background:#F1FAF1">
       <div class="left">
         <div>
             <img style="width:100%;" src="../assets/img/banner.png" alt="">
@@ -77,7 +77,7 @@
               <div style="text-align:center">
                 <el-progress class="progressDiv Zyprogress" type="circle" :percentage="SituationInfo.Norpercent" color="#089bab" :stroke-width="18" :width="150"></el-progress>
               </div>
-                <div class="f12 c11" style="padding-left:10%;margin-top:20px;border-right:1px solid #089bab">
+                <div class="f12 c11" style="text-align:center;margin-top:20px;border-right:1px solid #089bab">
                   <span class="bold" style="color:#A6C6C6">在用：</span>
                   <span class="Circle" style="background:#089bab"></span>
                   <span>金额 ￥{{SituationInfo.NorMoney}}</span>
@@ -89,7 +89,7 @@
               <div style="text-align:center">
                 <el-progress class="progressDiv Xzprogress" type="circle" :percentage="SituationInfo.Idlepercent" color="#FFA475" :stroke-width="18" :width="150"></el-progress>
               </div>
-                <div class="f12 c11" style="padding-left:10%;margin-top:20px;">
+                <div class="f12 c11" style="text-align:center;margin-top:20px;">
                   <span class="bold" style="color:#A6C6C6">闲置：</span>
                   
                   <span class="Circle" style="background:#FFA475"></span>
@@ -795,7 +795,7 @@ export default {
   position: relative;
 }
 .banner{
-  margin-top: 20px;
+  padding-top: 20px;
   position: relative;
   overflow: hidden;
   background: #fff;
@@ -820,8 +820,8 @@ export default {
   position: absolute;
   color:#fff;
   font-weight: 700;
-  top: 110px;
+  top: 77px;
   left: 54px;
-  font-family: 'PingFangR';
+  font-family: 'muil';
 }
 </style>

src/components/approval/ListAssets.vue

@@ -425,7 +425,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/approval/approvalDetails.vue

@@ -869,7 +869,7 @@ export default {
     text-align: center;
     cursor: pointer;
     font-size: 12px;
-    font-family: "宋体";
+    font-family: "Microsoft YaHei";
     background: #FFA475;
     color: #fff;
 }
@@ -983,7 +983,7 @@ export default {
     text-align: center;
     cursor: pointer;
     font-size: 12px;
-    font-family: "宋体";
+    font-family: "Microsoft YaHei";
     margin-right: 20px;
 }
 .tongguo{
@@ -1067,7 +1067,7 @@ export default {
 }
 .approvalDetails .rizhi{
     font-size:12px;
-    font-family:"宋体";
+    font-family:"Microsoft YaHei";
     font-weight:400;
     text-decoration:underline;
     color:rgba(166,198,198,1);
@@ -1086,7 +1086,7 @@ export default {
 .approvalDetails .allStep li{
     display: inline-block;
     font-size: 12px;
-    font-family: "宋体";
+    font-family: "Microsoft YaHei";
 }
 .approvalDetails .allStep .circle img{
     width: 100%;
@@ -1147,7 +1147,7 @@ export default {
     color:#fff;
     text-align: center;
     font-size: 12px;
-    font-family: "宋体";
+    font-family: "Microsoft YaHei";
 }
 .approvalDetails .StateCol .spz{
     background:rgba(114,184,255,1);

src/components/approval/assetsApply.vue

@@ -583,7 +583,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/approval/myAssets.vue

@@ -574,7 +574,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/assetsman/AssetDepreciation.vue

@@ -437,7 +437,7 @@ export default {
     margin:20px 20px 0 0;
     background: #fff;
     font-size: 12px;
-    font-family: "宋体";
+    font-family: "Microsoft YaHei";
     display: inline-block;
     width: 220px;
     height:135px;

src/components/assetsman/BulkImport.vue

@@ -257,7 +257,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/assetsman/InventoryDetails.vue

@@ -510,7 +510,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/assetsman/InventoryMan.vue

@@ -477,7 +477,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/assetsman/assetsList.vue

@@ -1167,7 +1167,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/assetsman/disposalDetails.vue

@@ -491,7 +491,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/global/Nav.vue

@@ -179,17 +179,17 @@ export default {
   color: #111111;
   font-weight: bold;
   font-size: 10px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 } */
 .HeadNav .el-submenu__title{
   color: #111111;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .HeadNav .el-menu-item{
   color: #111111;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .HeadNav .el-menu-item .menuDiv,.HeadNav .el-submenu .menuDiv{
   padding-left:25px;
@@ -198,7 +198,7 @@ export default {
 .HeadNav .el-menu-item.is-active .menuDiv{
   width:146px;
   height:34px;
-  line-height:34px;
+  line-height:35px;
   background:rgba(17,17,17,1);
   border-radius:17px;
   color:#fff;
@@ -212,7 +212,7 @@ export default {
 
 .HeadNav .el-menu-item, .HeadNav .el-submenu__title{
   height:34px!important;
-  line-height:34px!important;
+  line-height:35px!important;
   margin-bottom:15px; 
 }
 .HeadNav .itemgroup{
@@ -223,7 +223,7 @@ export default {
 }
 .HeadNav .itemgroup .el-menu-item{
   margin-bottom: 5px!important;
-  color: #83A4A5;
+  color: #089bab;
 }
 .HeadNav .itemgroup .el-menu-item span{
   padding-left: 40px;

src/components/global/index.vue

@@ -56,7 +56,7 @@ export default {
   position: relative;
   box-sizing: border-box;
   background: #EFF2F8;
-  
+  background: #f3f3f3;
 }
 .appContent .routerContent>div{
   position: relative;
@@ -70,6 +70,7 @@ export default {
   left: 0;
   height: 100%;
   z-index: 1;
+  box-shadow: #e8e6e6 5px 0 5px -4px;
 }
 
 .appContent{

src/components/report/AssetsRecord.vue

@@ -476,7 +476,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/report/Assetstatistics.vue

@@ -402,7 +402,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/report/MaturingAssets.vue

@@ -238,7 +238,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/report/StayBack.vue

@@ -366,7 +366,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;

src/components/report/assetSummary.vue

@@ -274,7 +274,7 @@ export default {
   text-align: center;
   border-radius: 50%;
   font-size: 12px;
-  font-family: "宋体";
+  font-family: "Microsoft YaHei";
 }
 .assetsList {
   width: 100%;