diff --git a/pages.json b/pages.json
index 7c4d9f1..a4c8f8a 100644
--- a/pages.json
+++ b/pages.json
@@ -69,6 +69,9 @@
}, {
"path": "pages/plugin/handCardCode",
"style": {}
+ }, {
+ "path": "pages/plugin/sign",
+ "style": {}
}
],
"globalStyle": {
diff --git a/pages/basics/home.vue b/pages/basics/home.vue
index d83e13e..6dd344d 100644
--- a/pages/basics/home.vue
+++ b/pages/basics/home.vue
@@ -1,82 +1,71 @@
- 首页
-
-
-
- 医院基本信息
+ 首页
+
+
-
-
-
-
-
- {{hospitalBasisInfo.today_collection}}kg
- 今日收集
+
+
+
+ 📅
+ {{hospitalBasisInfo.today_collection || 0}}
+ kg
+ 今日收集
+
+
+ 📊
+ {{hospitalBasisInfo.week_collection || 0}}
+ kg
+ 本周收集
+
+
+ 📈
+ {{hospitalBasisInfo.month_collection || 0}}
+ kg
+ 本月收集
-
-
- {{hospitalBasisInfo.week_collection}}kg
- 本周收集
-
+
-
-
- {{hospitalBasisInfo.month_collection}}kg
- 本月收集
-
-
-
-
-
-
- 一周数据变化图
-
-
-
-
-
- 医废库存
+
-
-
-
-
- {{stockBasisInfo.now_stock}}kg
- 当前库存
+
+
+
+ 📥
+ {{stockBasisInfo.today_in_ware || 0}}
+ kg
+ 今日入库
+
+
+ 📤
+ {{stockBasisInfo.today_out_ware || 0}}
+ kg
+ 今日出库
-
-
- {{stockBasisInfo.today_in_ware}}kg
- 今日入库
-
+
-
-
- {{stockBasisInfo.today_out_ware}}kg
- 今日出库
-
-
-
-
-
-
- 科室排行
-
-
-
+
+
@@ -121,11 +110,11 @@
}
});
//#endif
- // if(getApp().globalData.openid == '' || getApp().globalData.openid == undefined){
- // uni.reLaunch({
- // url: '/pages/register/registerRegulatory'
- // })
- // }
+ if(getApp().globalData.hospital == '' || getApp().globalData.hospital == undefined){
+ uni.reLaunch({
+ url: '/pages/register/login'
+ })
+ }
this.cWidth=uni.upx2px(750);
this.cHeight=uni.upx2px(500);
this.hospital = getApp().globalData.hospital;
@@ -175,7 +164,7 @@
$this:_self,
canvasId: canvasId,
type: 'line',
- colors:['#f04864', '#facc14', '#8543e0', '#90ed7d'],
+ colors:['#4a90e2', '#1abc9c', '#e67e22', '#9b59b6'],
fontSize:11,
padding:[15,15,0,15],
legend:{
@@ -193,13 +182,13 @@
animation: true,
xAxis: {
type:'grid',
- gridColor:'#CCCCCC',
+ gridColor:'#E8F4F8',
gridType:'dash',
dashLength:8
},
yAxis: {
gridType:'dash',
- gridColor:'#CCCCCC',
+ gridColor:'#E8F4F8',
dashLength:8,
format:(val)=>{return val.toFixed(0)}
},
@@ -207,7 +196,8 @@
height: _self.cHeight*_self.pixelRatio,
extra: {
line:{
- type: 'straight'
+ type: 'curve',
+ width: 3
}
}
});
@@ -313,9 +303,11 @@
disableGrid:true,
},
yAxis: {
- //disabled:true
+ gridColor:'#E8F4F8',
+ gridType:'dash',
+ dashLength:8,
splitLine: {
- show: false
+ show: true
},
format:(val)=>{return val.toFixed(0)}
},
@@ -325,7 +317,10 @@
extra: {
column: {
type:'group',
- width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
+ width: _self.cWidth*_self.pixelRatio*0.5/chartData.categories.length,
+ linearType:'custom',
+ linearOpacity:0.8,
+ customColor:[['#4a90e2', '#357abd']]
}
}
});
@@ -379,34 +374,189 @@
diff --git a/pages/component/home.vue b/pages/component/home.vue
index 05d278c..1915876 100644
--- a/pages/component/home.vue
+++ b/pages/component/home.vue
@@ -1,7 +1,7 @@
- 追溯
+ 追溯
@@ -11,7 +11,7 @@
请扫描医废袋条码或者科室汇总条码实时追溯
-
+
diff --git a/pages/component/traceDetailsByBox.vue b/pages/component/traceDetailsByBox.vue
index 1092f33..72ffefd 100644
--- a/pages/component/traceDetailsByBox.vue
+++ b/pages/component/traceDetailsByBox.vue
@@ -1,11 +1,11 @@
- 返回追溯详情(按周转箱)
+ 返回追溯详情(按周转箱)
{{value.date}}
-
-
+
+
{{val.data}}
diff --git a/pages/component/traceDetailsByDept.vue b/pages/component/traceDetailsByDept.vue
index 5fd0f4c..066613c 100644
--- a/pages/component/traceDetailsByDept.vue
+++ b/pages/component/traceDetailsByDept.vue
@@ -1,7 +1,7 @@
- 返回追溯详情(按科室汇总)
+ 返回追溯详情(按科室汇总)