Commit 47355758 by kingboy_xin

签约管理代码整理

parent 1b568fce
...@@ -2923,6 +2923,11 @@ ...@@ -2923,6 +2923,11 @@
} }
} }
}, },
"claygl": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
"integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
},
"clean-css": { "clean-css": {
"version": "4.2.3", "version": "4.2.3",
"resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclean-css%2Fdownload%2Fclean-css-4.2.3.tgz", "resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclean-css%2Fdownload%2Fclean-css-4.2.3.tgz",
...@@ -4247,6 +4252,15 @@ ...@@ -4247,6 +4252,15 @@
"zrender": "4.3.1" "zrender": "4.3.1"
} }
}, },
"echarts-gl": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-1.1.1.tgz",
"integrity": "sha512-cRSTU9H+Ay+qCUFowm+2XcxYqCfi/OLK805NISeJunKgJa5p+7p7tnHZoI0qKebjtHu8VbFSOBk9UvWZ01adng==",
"requires": {
"claygl": "^1.2.1",
"zrender": "^4.0.4"
}
},
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
...@@ -4259,6 +4273,23 @@ ...@@ -4259,6 +4273,23 @@
"integrity": "sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=", "integrity": "sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=",
"dev": true "dev": true
}, },
"el-table-infinite-scroll": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/el-table-infinite-scroll/-/el-table-infinite-scroll-1.0.10.tgz",
"integrity": "sha512-O7gcfcF9wOec/weeygMlJKQ8626jF5hIY6zABYKYqY96yxXZRrvPqEZW65Vb+C0D5d+8B8EgU9ax7mlA4K1x4A==",
"requires": {
"core-js": "^2.6.5",
"element-ui": "^2.12.0",
"vue": "^2.6.10"
},
"dependencies": {
"core-js": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
"integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
}
}
},
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.499", "version": "1.3.499",
"resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.499.tgz?cache=0&sync_timestamp=1594959047268&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.499.tgz", "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.499.tgz?cache=0&sync_timestamp=1594959047268&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.499.tgz",
...@@ -6059,6 +6090,11 @@ ...@@ -6059,6 +6090,11 @@
} }
} }
}, },
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"js-message": { "js-message": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz",
...@@ -7149,6 +7185,11 @@ ...@@ -7149,6 +7185,11 @@
"integrity": "sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8=", "integrity": "sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8=",
"dev": true "dev": true
}, },
"papaparse": {
"version": "4.6.3",
"resolved": "https://registry.npmjs.org/papaparse/-/papaparse-4.6.3.tgz",
"integrity": "sha512-LRq7BrHC2kHPBYSD50aKuw/B/dGcg29omyJbKWY3KsYUZU69RKwaBHu13jGmCYBtOc4odsLCrFyk6imfyNubJQ=="
},
"parallel-transform": { "parallel-transform": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.2.0.tgz", "resolved": "https://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.2.0.tgz",
...@@ -10000,6 +10041,15 @@ ...@@ -10000,6 +10041,15 @@
} }
} }
}, },
"vue-papa-parse": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/vue-papa-parse/-/vue-papa-parse-1.3.0.tgz",
"integrity": "sha512-+nn4Yh8/GFcMaEdg8VuQNE/UV0U9xz4LPasjNAqCcjAwVNHolW4A9mPhfTKJ8zkS6gvJGDc7qWUEZsFx6az3Aw==",
"requires": {
"papaparse": "^4.6.3",
"vue": "^2.6.10"
}
},
"vue-router": { "vue-router": {
"version": "3.3.4", "version": "3.3.4",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.3.4.tgz?cache=0&sync_timestamp=1594139127797&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.3.4.tgz", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.3.4.tgz?cache=0&sync_timestamp=1594139127797&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.3.4.tgz",
......
...@@ -10,9 +10,13 @@ ...@@ -10,9 +10,13 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"echarts": "^4.8.0", "echarts": "^4.8.0",
"echarts-gl": "^1.1.1",
"el-table-infinite-scroll": "^1.0.10",
"element-ui": "^2.13.2", "element-ui": "^2.13.2",
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"jquery": "^3.5.1",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-papa-parse": "^1.3.0",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vuex": "^3.4.0", "vuex": "^3.4.0",
"xlsx": "^0.16.4" "xlsx": "^0.16.4"
......
@import "./normalize.css"; @import "./normalize.css";
@font-face {
font-family:DINPro;
src:url('../font/DINPro-CondBold.otf');
}
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -48,6 +43,21 @@ ul{list-style-type:none;} ...@@ -48,6 +43,21 @@ ul{list-style-type:none;}
ol{list-style-type:none;} ol{list-style-type:none;}
*{margin:0px;padding:0px;} *{margin:0px;padding:0px;}
img{ border:0px;} img{ border:0px;}
@font-face {
font-family:DINPro;
src:url('../font/DINPro-CondBold.otf'),
url('../font/DINPro-CondBold.otf'),
url('../font/DINPro-CondBold.otf');
}
input::-webkit-input-placeholder { color: #BDCADA; }
::-webkit-scrollbar{width:0px;height: 0px; background: #020c25;}
::-webkit-scrollbar:hover{cursor: pointer; background: #124a61;}
::-webkit-scrollbar-track{-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);}
::-webkit-scrollbar-thumb{border-radius: 0px;-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,1);}
.container { .container {
background: -webkit-linear-gradient(top,#272e52,#171c30); background: -webkit-linear-gradient(top,#272e52,#171c30);
height: 100%; height: 100%;
...@@ -69,7 +79,7 @@ img{ border:0px;} ...@@ -69,7 +79,7 @@ img{ border:0px;}
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
} }
.card .card-content{ .card .card-content{
padding: 15px; padding: 5px;
background: -webkit-gradient(linear,left top,left bottom,from(#36436f),color-stop(14%,#36436f),to(#30385a)); background: -webkit-gradient(linear,left top,left bottom,from(#36436f),color-stop(14%,#36436f),to(#30385a));
background: linear-gradient(180deg,#36436f,#36436f 14%,#30385a); background: linear-gradient(180deg,#36436f,#36436f 14%,#30385a);
} }
......
/* 签约 */ /*签约管理*/
.cttxt{ float: left; height: 145px; padding-left: 15px;}
.cttxt3{ float: left; height: auto; padding-left: 10px;}
.cttxt2{ height: 35px; padding-left: 10px;}
.cttxt .ctline{ height: 22px; position: relative; color: #334b84; font-size: 8px;text-align: left; clear: both;}
.cttxt .ctline i.i01{ height: 12px; width: 2px; color: #2680FF; background: #2680FF; position: absolute; left: 0; top:5px;}
.cttxt .ctline i.i02{ height: 12px; width: 2px; color: #55FFE8; background: #55FFE8; position: absolute; left: 0; top:5px;}
.cttxt .ctline span{ color: #AAB1D2; font-size: 12px; padding: 0 10px; line-height: 22px;}
.cttxt .ctline span.clk{ text-decoration: underline;}
.cttxt .ctline span.zanbi{ color: #5492FF; font-size: 12px; padding: 0 10px; border: 1px solid #5492FF; padding: 0 1px; border-radius: 3px; line-height: 20px;}
.cttxt .ctline span.zbbfb{ /**color: #54DD44;**/ font-size: 16px; padding: 0; padding-left:4px;}
.cttxt .ctline span.zbbfbh{ /**color: #54DD44;**/ font-size: 12px; padding: 0 3px;}
.cttxtwo{ clear: both; height: 65px; text-align: center; line-height: 65px; color: #fff; font-size: 24px; margin-bottom: 20px;}
.cttxtwo2{ clear: both; height: 95px; text-align: center; line-height: 95px; color: #fff; font-size: 24px; margin-bottom: 20px;}
.cttxtwo .span01{ font-size: 12px; color: rgba(170,177,210,1);}
.cttxtwo .span02{ font-size: 12px; color: rgba(38,128,255,1); font-size: 16px; padding: 0 5px 0 10px;}
.cttxthr{ clear: both; height: 45px; color: #AAB1D2; font-size: 12px; text-align: left; padding-left: 10px;}
.cttxthr span{ padding: 0 5px; color: #fff; font-size: 16px;}
.cttxthr code{ padding: 0 5px; color: #42CCFF; font-style: normal; text-decoration: underline; font-size: 12px;}
.cttxtwo span.i{ padding-left: 10px; padding-right: 5px;}
.cttxtwo span.i2{ padding-left: 2px; color: #8891BE; font-size: 12px;}
.cttxtwo span.i3{ padding-right: 5px;color: #8891BE; font-size: 10px;}
.cttxtwo i{ font-style: normal; color: #5492FF; border: 1px solid #5492FF; font-size: 12px; border-radius: 3px; padding: 0 1px;}
.cttxt .ctp{ height: 50px; line-height: 50px; text-align: left; clear: both;}
.cttxt .ctp span{ color: #fff; font-size: 24px; padding: 0 4px; font-family: DINPro;}
.cttxt .ctp span.span01{ font-size: 18px;}
.cttxt .ctp span.span02{ color: #2680FF; font-size: 14px; padding: 0 2px;}
.cttxt .ctp span.span03{ color: #8891BE; font-size: 14px;}
.tong{ color: #5492FF; border: 1px solid #5492FF; border-radius: 1px; margin-left: 3px; padding:0 1px; line-height: 16px; height: 16px; display:inline-block; transform:scale(0.8); -webkit-transform-origin-x: 0; -webkit-transform: scale(0.8);}
.pian{ color: #FF5C5C; border: 1px solid #FF5C5C; border-radius: 1px; margin-left: 3px; padding:0 1px; line-height: 16px; height: 16px; display:inline-block; transform:scale(0.8); -webkit-transform-origin-x: 0; -webkit-transform: scale(0.8);}
#ctpie1{ width: 145px; height: 145px; float: right; position: relative;}
#ctpie2{ width: 145px; height: 145px; float: right; position: relative;}
.pieline{ height: 4px; width: 100px; position: absolute; bottom: 13px; left: 303px;}
.pieline span{ display: block; float: left; width: 20px; height: 4px;}
.pieline span.span01{ background:rgba(159,199,255,1);}
.pieline span.span02{ background:rgba(106,168,255,1);}
.pieline span.span03{ background:rgba(38,128,255,1);}
.pieline span.span04{ background:rgba(21,87,255,1);}
.pieline span.span05{ background:rgba(18,47,219,1);}
.pieline2{ height: 4px; width: 100px; position: absolute; bottom: 13px; right: 33px;}
.pieline2 span{ display: block; float: left; width: 20px; height: 4px;}
.pieline2 span.span01{ background:rgba(159,199,255,1);}
.pieline2 span.span02{ background:rgba(106,168,255,1);}
.pieline2 span.span03{ background:rgba(38,128,255,1);}
.pieline2 span.span04{ background:rgba(21,87,255,1);}
.pieline2 span.span05{ background:rgba(18,47,219,1);}
.tag-circle{color: #5492FF; border: 1px solid #5492FF; margin-right: 10px; line-height: 18px; border-radius: 3px; font-size: 12px; padding: 0 1px;}
.el-icon-bottom{ color: #099023;}
.ectabletitle{font-size:12px;color:#FFFFFF;text-align:left}
.ectable01{display:flex;text-align:left;font-size:10px;color:#FFFFFF;text-align:left}
.ectable01 li{ float: left; margin-bottom: 3px;}
.ectable01 li.li01{ float: left; width: 45px;}
.ectable01 li.li02{ float: left; width: 90px;}
.ectable01 li.li03{ float: left; width: 120px;}
.ectable01 li.li05{ float: left; width: 150px;}
.tabletitle{ height: 32px; padding-top: 5px;padding-bottom: 5px; text-align: left; position: relative;background: linear-gradient(180deg,#36436f,#36436f 14%,#30385a);}
.tabletitle span{ line-height: 20px; padding: 0 10px; background: none; border-radius: 1px; border: 1px solid #626D92; color: #AAB1D2; display: block; float: left; margin-right: 5px;}
.tabletitle span.clk{ background: #2680FF; border: 1px solid #2680FF; color: #fff;}
.tabletitle span.nclk{ background:none; border: 0px solid #2680FF; color: #A6AED6; font-size: 14px;}
.tabletitle img{ position: absolute; right: 3px; bottom: -23px; height: 13px; width: 13px; z-index: 999;}
.yytable{ position: absolute; right: 18px; top: 40px; padding: 10px; border-radius:4px; height: 250px; background: rgba(23,26,40,0.9); width: 300px;}
.yytable h3{ clear: both; height: 26px; border-bottom: 1px solid #424966; color: #fff; text-align: left; margin-bottom: 5px;}
.yytable h3 span{ float: right; padding:0 5px;}
.yytable .pline{ clear: both; overflow: hidden; text-align: left; margin-bottom: 5px;}
.yytable .pline .pl01{ float: left; width: 70px; color: #0097FD; line-height: 20px;}
.yytable .pline .pl02{ float: left; width: 210px; color: #fff; line-height: 20px; line-height: 16px;}
/********制作icon*********/
.el-icon-my-down{background:url(../img/common/arrowdown.png);background-size: cover; width: 8px; height: 8px; position: relative;}
.el-icon-my-down:before{content:"下"; font-size: 12px; visibility: hidden; vertical-align: middle; position: absolute;bottom: 0;}
.el-icon-my-up{background:url(../img/common/arrowup.png);background-size: cover; width: 8px; height: 8px; position: relative;}
.el-icon-my-up:before{content:"下"; font-size: 12px; visibility: hidden; vertical-align: middle; position: absolute;bottom: 0;}
.el-icon-my-green{background:url(../img/common/icon-maingreen.png);background-size: cover; width: 12px; height: 12px; position: relative;}
.el-icon-my-green:before{content:"下"; font-size: 12px; visibility: hidden; vertical-align: middle; position: absolute;bottom: 0;}
.el-icon-my-mainred{background:url(../img/common/icon-mainred.png);background-size: cover; width: 12px; height: 12px; position: relative;}
.el-icon-my-mainred:before{content:"下"; font-size: 12px; visibility: hidden; vertical-align: middle; position: absolute;bottom: 0;}
/* 费用管理-签约 */
.qycontent{float: left; height: 145px; padding-left: 10px;} .qycontent{float: left; height: 145px; padding-left: 10px;}
.qycontent .qycontentline{height: 22px; position: relative; color: #334b84; font-size: 8px;text-align: left; clear: both;} .qycontent .qycontentline{height: 22px; position: relative; color: #334b84; font-size: 8px;text-align: left; clear: both;}
.qycontent .qycontentline i.i01{ height: 12px; width: 2px; color: #2680FF; background: #2680FF; position: absolute; left: 0; top: 3px;} .qycontent .qycontentline i.i01{ height: 12px; width: 2px; color: #2680FF; background: #2680FF; position: absolute; left: 0; top: 3px;}
......
.header{ height: 56px; background: #2e375c; margin-bottom: 20px;} #header{ height: 56px; background: #2e375c; margin-bottom: 20px;}
.con-main{ height: 500px;} .con-main{ height: 500px;}
.nav{ width: 70px; float: left; height: 36px; background: #35406b; text-align: center; padding-top: 20px;} .nav{ width: 70px; float: left; height: 36px; background: #35406b; text-align: center;}
.nav img{ width: 16px; height: 16px;} .nav img{ width: 16px; height: 16px;}
.headeright{ float: right; width: 90.625%;} .headeright{ float: right; width: 90.625%;}
.headeright2{ float: right; width: 90.625%; height: 56px;} .headeright2{ float: right; width: 90.625%; height: 56px;}
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.leftPopup{position: absolute;top:50%;left:15px;transform: translate(-50%,-50%);} .leftPopup{position: absolute;top:50%;left:15px;transform: translate(-50%,-50%);}
.leftPopup img{width: 30px;height: 90px;background-size: 100% 100%;} .leftPopup img{width: 30px;height: 90px;background-size: 100% 100%;}
.leftappcode{position: absolute;top:50%;left:74px;transform: translate(-50%,-50%);width: 75px; height: 75px; border: 1px solid #2C7CEC; border-radius:5px} .leftappcode{position: absolute;top:50%;left:74px;transform: translate(-50%,-50%);width: 75px; height: 75px; border: 1px solid #2C7CEC; border-radius:5px}
.leftappcode img{max-width: 65px;max-height: 65px;padding: 5px;} .leftappcode img{max-width: 73px;max-height: 73px;padding: 5px;}
.loginmessage{width: 640px; padding: 0 40px; height: 350px;margin: 80px auto 0;background:linear-gradient(180deg,rgba(75,95,153,0.5) 0%,rgba(63,74,113,0.5) 100%);box-shadow:0px 1px 10px 0px rgba(47,138,255,0.5);} .loginmessage{width: 640px; padding: 0 40px; height: 350px;margin: 80px auto 0;background:linear-gradient(180deg,rgba(75,95,153,0.5) 0%,rgba(63,74,113,0.5) 100%);box-shadow:0px 1px 10px 0px rgba(47,138,255,0.5);}
.loginmessageleft{float:left;width: 260px;height: 350px;} .loginmessageleft{float:left;width: 260px;height: 350px;}
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
/* 修改密码 */ /* 修改密码 */
.updatebox{width: 640px; padding: 0 40px; height: 350px;margin: 80px auto 0;background:linear-gradient(180deg,rgba(75,95,153,0.5) 0%,rgba(63,74,113,0.5) 100%);box-shadow:0px 1px 10px 0px rgba(47,138,255,0.5);} .updatebox{width: 640px; padding: 0 40px; height: 350px;margin: 80px auto 0;background:linear-gradient(180deg,rgba(75,95,153,0.5) 0%,rgba(63,74,113,0.5) 100%);box-shadow:0px 1px 10px 0px rgba(47,138,255,0.5);}
.updateboxtitle{height: 40px;width: 300px; padding-top: 20px; margin: 0px auto;} .updateboxtitle{height: 60px;width: 300px; padding-top: 20px; margin: 0px auto;}
.updateboxtitle h1{font-weight:500;color:#AAB1D2;} .updateboxtitle h1{font-weight:500;color:#AAB1D2;text-align: center;}
.updateboxmassage{height: 300px; width: 300px;margin: 0 auto;padding-top: 10px;} .updateboxmassage{height: 300px; width: 300px;margin: 0 auto;padding-top: 10px;}
.updateboxmassage .el-button{width: 140px;} .updateboxmassage .el-button{width: 140px;}
.updateboxfix{float: left;} .updateboxfix{float: left;}
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
.jnlogmibox-item p{margin: 20px auto 0;width: 100%;height: 20px;font-size: 13px;color: #ddd;} .jnlogmibox-item p{margin: 20px auto 0;width: 100%;height: 20px;font-size: 13px;color: #ddd;}
#wktimg{ position: absolute; top: 12px; right:0px; text-align: right; width: 62px;} #wktimg{ position: absolute; top: 12px; right:0px; text-align: right; width: 62px;}
#wktimg img{ width: 62px; height: 62px;} #wktimg img{ width: 62px; height: 62px;}
.bottomBox{position:fixed;right: 10px;bottom: 10px;height: 168px;width: 300px;padding:10px;background: #0C2F63;background: url('~assets/img/login/bg.png');background-size: 100% 100%;z-index:999} .bottomBox{position:fixed;right: 10px;bottom: 10px;height: 168px;width: 320px;padding:10px;background: #0C2F63;background: url('~assets/img/login/bg.png');background-size: 100% 100%;z-index:999}
.topArrow{width: 100%;height: 30px;margin-bottom: 10px;} .topArrow{width: 100%;height: 30px;margin-bottom: 5px;}
.Arrowitem{width: 25px;height: 25px;float: left;} .Arrowitem{width: 25px;height: 25px;float: left;}
.Arrowl1{background: url('~assets/img/login/left.png');background-size: 100% 100%;margin-right:5px ;} .Arrowl1{background: url('~assets/img/login/left.png');background-size: 100% 100%;margin-right:5px ;}
.Arrowl2{background: url('~assets/img/login/right.png');background-size: 100% 100%;} .Arrowl2{background: url('~assets/img/login/right.png');background-size: 100% 100%;}
......
...@@ -49,15 +49,13 @@ export function checkIsNull(val) { ...@@ -49,15 +49,13 @@ export function checkIsNull(val) {
* @returns {string} * @returns {string}
*/ */
export function getActiveNum(str) { export function getActiveNum(str) {
//转化float,后面全是四舍五入 //转化float,后面全是四舍五入
if (checkIsNull(str) || str == "NaN" || str == "Infinity" || str == "-" || isNaN(str)) { if (checkIsNull(str) || str == "NaN" || str == "Infinity" || str == "-" || isNaN(str)) {
return "-"; return "-";
} else { } else {
var num = parseFloat(str); var num = parseFloat(str);
// if (Math.abs(num) < 0.004) { //处理绝对值小于0.01的
// num = num.toPrecision(1);
// } else
if (Math.abs(num) < 0.1) { //处理绝对值小于0.1的 if (Math.abs(num) < 0.1) { //处理绝对值小于0.1的
num = num.toFixed(2); num = num.toFixed(2);
} else if ((Math.abs(num) >= 0.1) && (Math.abs(num) <= 0.995)) { //处理绝对值大于等于0.1小于等于0.995的 } else if ((Math.abs(num) >= 0.1) && (Math.abs(num) <= 0.995)) { //处理绝对值大于等于0.1小于等于0.995的
...@@ -67,6 +65,6 @@ export function getActiveNum(str) { ...@@ -67,6 +65,6 @@ export function getActiveNum(str) {
} else { } else {
num = num.toPrecision(3); num = num.toPrecision(3);
} }
return num; return Math.abs(num);
} }
} }
...@@ -4,12 +4,14 @@ ...@@ -4,12 +4,14 @@
<div><span class="title">上海市社区家庭医生签约服务费云管理</span><span class="subtitle">(<span>{{subtitle}}</span>)</span></div> <div><span class="title">上海市社区家庭医生签约服务费云管理</span><span class="subtitle">(<span>{{subtitle}}</span>)</span></div>
<div class="header-right"> <div class="header-right">
<div>
<img @click="openCame()" src="~assets/img/header/icon-mainsaoma.png">
</div>
<div class="search"> <div class="search">
<searchCell/> <searchCell/>
</div> </div>
<div> <div>
<img src="~assets/img/header/icon-main-user.png">{{userName}},截止于{{$store.getters.getCxsj}} <img src="~assets/img/header/icon-main-user.png">{{userName}},截止于{{$store.getters.getCxsj}}
<img @click="openCame()" src="~assets/img/header/icon-mainsaoma.png">
<img src="~assets/img/header/icon-mainfilter.png"> <img src="~assets/img/header/icon-mainfilter.png">
<div class="el-date-editor"> <div class="el-date-editor">
<el-date-picker v-model="cxsj" @change="cxsjChange" type="month" placeholder=""></el-date-picker> <el-date-picker v-model="cxsj" @change="cxsjChange" type="month" placeholder=""></el-date-picker>
...@@ -48,6 +50,13 @@ ...@@ -48,6 +50,13 @@
cxsjChange(){ cxsjChange(){
}, },
openCame(){
if(false){
}else{
this.$message.error('移动APP打开扫一扫');
}
},
getHeadRightInfo(){ getHeadRightInfo(){
this.userName = JSON.parse(sessionStorage.getItem('userinfo')).userName; this.userName = JSON.parse(sessionStorage.getItem('userinfo')).userName;
this.cxsj = this.$store.getters.getCxsj; this.cxsj = this.$store.getters.getCxsj;
...@@ -85,8 +94,8 @@ ...@@ -85,8 +94,8 @@
text-align: center; text-align: center;
} }
#header .nav img{ #header .nav img{
width: 11px; width: 16px;
height: 11px; height: 16px;
vertical-align: middle; vertical-align: middle;
} }
...@@ -125,7 +134,7 @@ ...@@ -125,7 +134,7 @@
} }
#header .header-right img { #header .header-right img {
width: 15px; width: 15px;
height: 14px; height: 15px;
margin: 0 8px; margin: 0 8px;
vertical-align: middle; vertical-align: middle;
} }
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
border-bottom: 1px solid #2A3353; border-bottom: 1px solid #2A3353;
} }
#sideNavbarItem img{ #sideNavbarItem img{
width: 17px; width: 19px;
height: 19px; height: 19px;
margin: 22px 27px 5px 25px; margin: 22px 27px 5px 25px;
} }
......
import Vue from 'vue' import Vue from 'vue'
import App from './App.vue' import App from './App'
import router from './router' import router from './router'
import store from './store' import store from './store'
import echarts from 'echarts'
import echartsGL from 'echarts-gl'
import parse from 'vue-papa-parse'
import axios from 'axios'
import '@/assets/css/base.css'
import '@/assets/css/contract.css'
import '@/assets/css/header.css'
import '@/assets/css/login.css'
import '@/assets/css/navMenu.css'
import '@/assets/css/normalize.css'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' import 'element-ui/lib/theme-chalk/index.css'
import * as ConmonJs from 'assets/js/common.js'; import * as ConmonJs from 'assets/js/common.js';
import echarts from 'echarts' import 'jquery'
import elTableInfiniteScroll from 'el-table-infinite-scroll'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.commonJs = ConmonJs Vue.prototype.commonJs = ConmonJs
Vue.prototype.$echarts = echarts; Vue.prototype.$echarts = echarts;
Vue.prototype.$ajax = axios;
Vue.use(ElementUI); Vue.use(ElementUI);
Vue.use(parse);
Vue.use(elTableInfiniteScroll);
Vue.directive('loadmore', {
bind(el, binding) {
const selectWrap = el.querySelector('.el-table__body-wrapper');
selectWrap.addEventListener('scroll', function() {
let sign = 0;
const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight;
if (scrollDistance <= sign) {
binding.value()
}
})
}
});
new Vue({ new Vue({
components:{
},
router, router,
store, store,
render: h => h(App) render: h => h(App)
}).$mount('#app') }).$mount('#app')
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<h1>签约服务费用管理平台</h1> <h1>签约服务费用管理平台</h1>
<div class="chart20"></div> <div class="chart20"></div>
<div class="loginmessageinput"> <div class="loginmessageinput">
<el-input v-model="loginName" placeholder="账 号" clearable size="small"><i slot="prefix" <el-input v-model="loginName" placeholder="账 号" clearable size="small">
class="el-input__icon el-icon-user"></i> <i slot="prefix" class="el-input__icon el-icon-user"></i>
</el-input> </el-input>
<el-input v-model="password" placeholder="密 码" show-password size="small"><i slot="prefix" <el-input v-model="password" placeholder="密 码" show-password size="small">
class="el-input__icon el-icon-lock"></i> <i slot="prefix" class="el-input__icon el-icon-lock"></i>
</el-input> </el-input>
<el-input v-model="MACIP" value="MAC:35:38:33:33:31:30" class="macip" :disabled="true" size="small"><i <el-input v-model="MACIP" value="MAC:35:38:33:33:31:30" class="macip" :disabled="true" size="small"><i
slot="prefix"></i></el-input> slot="prefix"></i></el-input>
...@@ -119,7 +119,6 @@ ...@@ -119,7 +119,6 @@
sessionStorage.setItem('token', res.data.token); sessionStorage.setItem('token', res.data.token);
sessionStorage.setItem('userinfo', JSON.stringify(res.data.user)); sessionStorage.setItem('userinfo', JSON.stringify(res.data.user));
} }
this.token = res.data.token; this.token = res.data.token;
let user = res.data.user; let user = res.data.user;
this.PersonName = user.userName; this.PersonName = user.userName;
......
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
this.token = sessionStorage.getItem('token') this.token = sessionStorage.getItem('token')
this.loginMsg = JSON.parse(sessionStorage.getItem('userinfo')) this.loginMsg = JSON.parse(sessionStorage.getItem('userinfo'))
console.log('家医数据信息:') // console.log('家医数据信息:')
console.log(this.loginMsg) // console.log(this.loginMsg)
this.loginMsg.gpNumber = sessionStorage.getItem('ygh') this.loginMsg.gpNumber = sessionStorage.getItem('ygh')
this.cxsj = sessionStorage.getItem("cxsj") this.cxsj = sessionStorage.getItem("cxsj")
this.Loginhome() this.Loginhome()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment