From 96be55b0beb30d1dd2b06ff2fc1cd69d57a200e7 Mon Sep 17 00:00:00 2001 From: liuning <807852472@qq.com> Date: Fri, 6 Mar 2026 18:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E3=80=81=E9=A3=8E=E6=A0=BC=E4=BF=AE=E6=94=B9=E3=80=81=E7=AD=BE?= =?UTF-8?q?=E5=AD=97=E5=8A=9F=E8=83=BD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 3 + pages/basics/home.vue | 298 +++++++++++++++----- pages/component/home.vue | 4 +- pages/component/traceDetailsByBox.vue | 6 +- pages/component/traceDetailsByDept.vue | 2 +- pages/component/traceDetailsByMedical.vue | 6 +- pages/index/index.vue | 17 +- pages/main/inventory.vue | 190 +++++++++++-- pages/plugin/handList.vue | 326 ++++++++++++++++++++-- pages/plugin/home.vue | 204 +++++++++++--- pages/plugin/personalInformation.vue | 5 +- pages/plugin/sign.vue | 228 +++++++++++++++ pages/register/login.vue | 70 ++++- 13 files changed, 1173 insertions(+), 186 deletions(-) create mode 100644 pages/plugin/sign.vue 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 @@ @@ -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 @@