diff --git a/App.vue b/App.vue index d6a28f2..b0912de 100644 --- a/App.vue +++ b/App.vue @@ -124,5 +124,10 @@ body{ background: #f7f8fa !important; - } + } + + \ No newline at end of file diff --git a/common/css/common.scss b/common/css/common.scss new file mode 100644 index 0000000..873efe8 --- /dev/null +++ b/common/css/common.scss @@ -0,0 +1,18 @@ +.flx{ + display: flex; +} +.flx_sb{ + justify-content: space-between; +} +.flx_start{ + justify-content: start; +} +.flx_ac{ + align-items: center; +} +.flx_jc{ + justify-content: center; +} +.flx_wp{ + flex-wrap: wrap; +} \ No newline at end of file diff --git a/components/watch-login/watch-input.vue b/components/watch-login/watch-input.vue index 82e513a..51c9c8a 100644 --- a/components/watch-login/watch-input.vue +++ b/components/watch-login/watch-input.vue @@ -39,7 +39,9 @@ + + \ No newline at end of file diff --git a/config/request.js b/config/request.js index 3e8bfa2..2b8bbc4 100644 --- a/config/request.js +++ b/config/request.js @@ -71,6 +71,8 @@ export default () => { title: data.msg, icon: 'none' }) + }else if (data.code === 7776) { + store.commit('api/setActiceDevice', {}) } if (custom.toast !== false) { diff --git a/pages.json b/pages.json index da10df7..2d2b7c2 100644 --- a/pages.json +++ b/pages.json @@ -42,6 +42,41 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/only_test/only_test", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/only_test/ot1", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/only_test/ot2", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/index/detail_info", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/only_test/ot3", + "style" : + { + "navigationBarTitleText" : "" + } } ], // "tabBar": { diff --git a/pages/index/detail.vue b/pages/index/detail.vue index 9183b55..0076821 100644 --- a/pages/index/detail.vue +++ b/pages/index/detail.vue @@ -11,8 +11,8 @@ - - + + @@ -56,6 +56,11 @@ 高密度脂蛋白:{{item.data_msg.highDensity/100}} 低胆固醇：{{item.data_msg.lowDensity/100}} + + 心率:{{item.data_msg.meanHeartRate}} 次/分 + HRV：{{item.data_msg.averageHRV}} 毫秒 + QTc：{{item.data_msg.averageTimeInterval}} 毫秒 + @@ -79,6 +84,7 @@ export default { data() { return { + type: '', desc: '', dataList: [], @@ -94,6 +100,7 @@ // pulseReat: '脉率', updataDate: '更新时间', bodyTemperature: '体温', + ECGData: '心电图', step: '步数' }, time: new Date().toISOString().substring(0, 10), @@ -147,6 +154,26 @@ }, methods: { + goInfo(idx){ + if(this.type == 'ECGData'){ + uni.showLoading({ + + }) + uni.setStorageSync('infoData', JSON.stringify(this.dataList[idx])); + uni.navigateTo({ + url:'/pages/index/detail_info?index='+idx, + fail(e) { + console.log(e) + }, + complete() { + uni.hideLoading({ + + }) + } + }) + } + + }, getArrMaxValue, queryList() { this.$store.dispatch('api/getDeviceListDays', { @@ -247,4 +274,5 @@ } } } + \ No newline at end of file diff --git a/pages/index/detail_info.vue b/pages/index/detail_info.vue new file mode 100644 index 0000000..1855211 --- /dev/null +++ b/pages/index/detail_info.vue @@ -0,0 +1,380 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index fe0ac77..1e66126 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -155,6 +155,27 @@ + + + 心电图 + + + {{dataListsNew.ECGData.data_msg? dataListsNew.ECGData.device_real_time + '更新' : '--'}} + + + + + {{dataListsNew.ECGData.data_msg? (dataListsNew.ECGData.data_msg.meanHeartRate ) : '--'}} + + + 次/分 + + + + + + + {{getNameByKey('bloodLiquid')}} @@ -242,10 +263,13 @@ - + + + + @@ -281,7 +305,8 @@ bloodGlucose:{}, meiTuo:{}, bodyTemperature:{}, - bloodLiquid:{} + bloodLiquid:{}, + ECGData:{} } // dataListsNew:{ // stepIndex:{ @@ -319,7 +344,20 @@ methods: { getArrMaxValue, onRefresh(pageNo, pageSize) { - this.$store.dispatch('api/getIndexData', { device_id: this.getActiceDevice.device_id }).then(res => { + this.$store.dispatch('api/getIndexData', { + device_id: this.getActiceDevice.device_id , + need_arr :[ + 'pulseReat', + 'bloodOxygen', + 'bloodPressure', + 'bloodGlucose', + 'meiTuo', + 'bodyTemperature', + 'bloodLiquid', + 'stepIndex', + 'ECGData' + ], + }).then(res => { for(let i = 0;i - + + diff --git a/pages/only_test/only_test.vue b/pages/only_test/only_test.vue new file mode 100644 index 0000000..83280b0 --- /dev/null +++ b/pages/only_test/only_test.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/pages/only_test/ot1.vue b/pages/only_test/ot1.vue new file mode 100644 index 0000000..edd2c5e --- /dev/null +++ b/pages/only_test/ot1.vue @@ -0,0 +1,13485 @@ + + + + + diff --git a/pages/only_test/ot2.vue b/pages/only_test/ot2.vue new file mode 100644 index 0000000..6bf8acf --- /dev/null +++ b/pages/only_test/ot2.vue @@ -0,0 +1,156 @@ + + + + \ No newline at end of file diff --git a/pages/only_test/ot3.vue b/pages/only_test/ot3.vue new file mode 100644 index 0000000..1438282 --- /dev/null +++ b/pages/only_test/ot3.vue @@ -0,0 +1,65 @@ + + + \ No newline at end of file diff --git a/static/icon/niaosuan.png b/static/icon/niaosuan.png new file mode 100644 index 0000000..e9054f4 Binary files /dev/null and b/static/icon/niaosuan.png differ diff --git a/static/icon/tan.png b/static/icon/tan.png new file mode 100644 index 0000000..1703ac6 Binary files /dev/null and b/static/icon/tan.png differ diff --git a/static/icon/xindiantu.png b/static/icon/xindiantu.png new file mode 100644 index 0000000..478299c Binary files /dev/null and b/static/icon/xindiantu.png differ diff --git a/static/icon/xinlv-small.png b/static/icon/xinlv-small.png new file mode 100644 index 0000000..bf7fde9 Binary files /dev/null and b/static/icon/xinlv-small.png differ