Browse Source

修复二维表测试问题

lulihong 6 years ago
parent
commit
19caadcbb2

+ 1 - 1
component/chart/map-chart.js

@ -61,7 +61,7 @@
					         textStyle: {
                                color: '#b5e1fc'
                            },
//					        pieces: piceArr,
					        pieces: piceArr,
					        left: '50',
					        bottom:'20'
                        }

+ 15 - 0
page/bigData/css/medical.css

@ -178,6 +178,9 @@ th {
	background: url(../images/mjzfwqktoubukuang.png) no-repeat;
	background-size: 100% 100%;
}
.c-pr{
	position: relative;
}
td img {
	/*margin-right: .026042rem;*/
@ -188,10 +191,22 @@ td img {
	width: .3125rem
}
.w40{
	width:0.2083rem
}
.w193 {
	width: 1.005208rem
}
.w-90{
	width: 0.46875rem;
}
.w-115{
	width: 0.5989583rem;
}
.w188 {
	width: .979167rem
}

+ 22 - 33
page/bigData/html/medical.html

@ -217,40 +217,35 @@
	                        </div>
							<table v-show="hasData3">
								<tr>
									<th class="w60">
									<th class="w40">
										<div>月份</div>
									</th>
									<th class="w193" colspan="3">
										<div>门急诊总费用</div>
									<th colspan="3" class="c-pr">
										<div class="w-115" style="display: inline-block;position: absolute;left: 0;top:0;">门急诊总费用</div>
										<div class="w-90" style="display: inline-block;position: absolute;right: 15px;top:0;">环比</div>
									</th>
									<th class="w188" colspan="3">
										<div>门急诊次均费用</div>
									<th colspan="3" class="c-pr">
										<div class="w-115" style="display: inline-block;position: absolute;left: 0;top:0;">门急诊次均费用</div>
										<div class="w-90" style="display: inline-block;position: absolute;right: 15px;top:0;">环比</div>
									</th>
								</tr>
								<tr v-for="(item,index) in tableData1">
									<td style="border: 1px solid #019dff;">
										<div>{{item.month}}</div>
									</td>
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;" class="w-115" colspan="2">
										<span class="ml5">{{item.HC_05_1001 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
									</td>
									<td style="width:0.27rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;text-align: left;padding-left: 10px;" class="w-90">
										<img v-show="item.HC_14_1025=='--' || item.HC_14_1025>=0" src="../images/zengzhang.png">
										<span v-show="item.HC_14_1025=='--'">{{item.HC_14_1025}}</span>
										<img v-show="item.HC_14_1025!='--' && item.HC_14_1025<0" src="../images/xiajiang.png">
										<span v-show="item.HC_14_1025!='--'">{{item.HC_14_1025}}%</span>
									</td>
									
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;border-left: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;border-left: 1px solid #019dff;" class="w-115" colspan="2">
										<span class="ml5">{{item.HC_05_1003 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
									</td>
									<td style="width:0.27rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;text-align: left;padding-left: 10px;" class="w-90">
										<img v-show="item.HC_14_1026=='--' || item.HC_14_1026>=0" src="../images/zengzhang.png">
										<span v-show="item.HC_14_1026=='--'">{{item.HC_14_1026}}</span>
										<img v-show="item.HC_14_1026!='--' && item.HC_14_1026<0" src="../images/xiajiang.png">
@ -283,46 +278,40 @@
	                        </div>
							<table v-show="hasData5">
								<tr>
									<th class="w60">
									<th class="w40">
										<div>月份</div>
									</th>
									<th class="w193" colspan="3">
										<div>住院总费用</div>
									<th colspan="3" class="c-pr">
										<div class="w-115" style="display: inline-block;position: absolute;left: 0;top:0;">住院总费用</div>
										<div class="w-90" style="display: inline-block;position: absolute;right: 15px;top:0;">环比</div>
									</th>
									<th class="w188" colspan="3">
										<div>住院次均费用</div>
									<th colspan="3" class="c-pr">
										<div class="w-115" style="display: inline-block;position: absolute;left: 0;top:0;">住院次均费用</div>
										<div class="w-90" style="display: inline-block;position: absolute;right: 15px;top:0;">环比</div>
									</th>
								</tr>
								<tr v-for="(item,index) in tableData2">
									<td style="border: 1px solid #019dff;">
										<div>{{item.month}}</div>
									</td>
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;" class="w-115" colspan="2">
										<span class="ml5">{{item.HC_06_1014 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
									</td>
									<td style="width:0.27rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;text-align: left;padding-left: 10px;" class="w-90">
										<img v-show="item.HC_14_1027=='--' || item.HC_14_1027>=0" src="../images/zengzhang.png">
										<span v-show="item.HC_14_1027=='--'">{{item.HC_14_1027}}</span>
										<img v-show="item.HC_14_1027!='--' && item.HC_14_1027<0" src="../images/xiajiang.png">
										<span v-show="item.HC_14_1027!='--'">{{item.HC_14_1027}}%</span>
									</td>
									
									<td style="width:0.365rem;text-align: left;border-bottom: 1px solid #019dff;border-left: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;border-left: 1px solid #019dff;" class="w-115" colspan="2">
										<span class="ml5">{{item.HC_06_1022 | formatData}}元</span>
									</td>
									<td style="width:0.15625rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
										<span class="">环比</span>
									</td>
									<td style="width:0.27rem;text-align: left;border-bottom: 1px solid #019dff;" class="">
									<td style="border-bottom: 1px solid #019dff;text-align: left;padding-left: 10px;" class="w-90">
										<img v-show="item.HC_14_1028=='--' || item.HC_14_1028>=0" src="../images/zengzhang.png">
										<span v-show="item.HC_14_1028=='--'">{{item.HC_14_1028}}</span>
										<img v-show="item.HC_14_1028!='--' && item.HC_14_1028<0" src="../images/xiajiang.png">
										<span v-show="item.HC_14_1028!='--'">{{item.HC_14_1028}}%</span>
									</td>
									
								</tr>
							</table>
						</div>

+ 5 - 2
page/bigData/js/medical.js

@ -35,7 +35,11 @@ new Vue({
	filters:{
		formatData:function(value){
			if(value>100000){
				return (value/10000).toFixed(2)+"万"
				if(value>1000000000){
					return (value/100000000).toFixed(2)+"亿"
				}else{
					return (value/10000).toFixed(2)+"万"
				}
			}else{
				return value
			}
@ -82,7 +86,6 @@ new Vue({
						  {url:bigDataAPI.getMapJingWeiDuInfo,reqType: 'get',data:{}},//上饶地图经纬度数据
						  ];
			httpRequest.getReqPromises(reqUrl).then(function(datas) {
				debugger
				vm.town = [{
					"name": "上饶市",
					"id": "0"