qiaocl
/
examTeamApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序兼容

This commit is contained in:
qiaocl 2024-10-11 10:04:19 +08:00
parent a745ec7aea
commit 73cfd5140b
368 changed files with 27646 additions and 26452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hbuilderx/launch.json
View File

@ -2,7 +2,7 @@
"version" : "1.0", "version" : "1.0",
"configurations" : [ "configurations" : [
{ {
"playground" : "custom", "playground" : "standard",
"type" : "uni-app:app-android" "type" : "uni-app:app-android"
}, },
{ {

32
App.vue
View File

@ -9,6 +9,7 @@
onLaunch: function() { onLaunch: function() {
let that = this let that = this
// 返回的是apk包信息 // 返回的是apk包信息
// #ifdef APP-PLUS
uni.getSystemInfo({ uni.getSystemInfo({
success(e) { success(e) {
platform = e.platform platform = e.platform
@ -23,16 +24,15 @@
uni.onNetworkStatusChange(function(res) { uni.onNetworkStatusChange(function(res) {
if (res.isConnected == true) { if (res.isConnected == true) {
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/login' url: '/pageTwo/login/login'
}) })
console.log("有网络连接", res.isConnected) console.log("有网络连接", res.isConnected)
} }
}); });
} }
that.checkForUpdates() that.checkForUpdates()
uni.switchTab({ // #endif
url: "/pages/home/home" that.handleoginversion()
})
console.log('App Launch') console.log('App Launch')
}, },
onShow: function() { onShow: function() {
@ -40,9 +40,11 @@
}, },
onHide: function() { onHide: function() {
console.log('App Hide') console.log('App Hide')
// #ifdef APP-PLUS
uni.offNetworkStatusChange(function(res) { uni.offNetworkStatusChange(function(res) {
console.log("取消网络监听") console.log("取消网络监听")
}) })
// #endif
}, },
methods: { methods: {
// 版本信息监测 // 版本信息监测
@ -60,13 +62,15 @@
// 版本信息 // 版本信息
handleoginversion(info) { handleoginversion(info) {
let that = this let that = this
let currentVersion = info.version;
that.$model.getloginversion({}).then(res => { that.$model.getloginversion({}).then(res => {
that.handleCancelUpdate(res.code)
// #ifdef APP-PLUS
let currentVersion = info.version;
let latestVersion = res.data.version let latestVersion = res.data.version
that.$store.commit('changePhoneInfo', { that.$store.commit('changePhoneInfo', {
versionUrl: res.data versionUrl: res.data
}) })
that.handleCancelUpdate(res.code)
// 比对版本号 // 比对版本号
let version = that.$tools.compareVersions(currentVersion, latestVersion) let version = that.$tools.compareVersions(currentVersion, latestVersion)
if (version == -1) { // 0版本号相通，1，：第一个版本号大于第二个版本号，-1：第一个版本号小于第二个版本号 if (version == -1) { // 0版本号相通，1，：第一个版本号大于第二个版本号，-1：第一个版本号小于第二个版本号
@ -122,17 +126,21 @@
} }
}); });
} }
// #endif
}) })
}, },
// 取消更新 // 取消更新
handleCancelUpdate(code) { handleCancelUpdate(code) {
let that = this let that = this
if (code == 0) { if (code == 0) {
that.handleUserList() // that.handleUserList()
uni.reLaunch({
url: "/pages/home/home?type=1"
})
} else { } else {
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/login' url: '/pageTwo/login/login'
}) })
}, 500); }, 500);
} }
@ -151,14 +159,16 @@
that.$store.commit('changeFamilay', res.data) that.$store.commit('changeFamilay', res.data)
if (res.data.length) { if (res.data.length) {
that.$store.dispatch('getUserInfo', { that.$store.dispatch('getUserInfo', {
aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[ aud_id: uni.getStorageSync('userid') ? uni.getStorageSync(
'userid') : res.data[
0].id 0].id
}) })
that.$store.dispatch("getCardList", { that.$store.dispatch("getCardList", {
aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[ aud_id: uni.getStorageSync('userid') ? uni.getStorageSync(
'userid') : res.data[
0].id 0].id
}) })
that.handleLabelList( res.data[0].id) that.handleLabelList(res.data[0].id)
that.handlePublicRecord(res.data[0].id) that.handlePublicRecord(res.data[0].id)
} }
}).catch(err => {}) }).catch(err => {})

74
element/city.vue Normal file
View File

@ -0,0 +1,74 @@
<template>
<view v-if="isCity" class="visible">
<view class="bg" @click="clear"></view>
<view @click.stop class="item">
<view class="groupBtn">
<view @click="visible=false">取消</view>
<view @click="handlesure()" class="sure">确定</view>
</view>
<picker-view @change="bindChange" :value="value" class="picker-view" :indicator-style="indicatorStyle">
<picker-view-column>
<view class="item" v-for="(item,index) in province" :key="index">{{item.name}}</view>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in city" :key="index">{{item}}</view>
</picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in area" :key="index">{{item?item:'请选择'}}</view>
</picker-view-column> -->
</picker-view>
</view>
</view>
</template>
<script>
import {
mapState
} from "vuex";
export default {
data() {
return {
value: [2, 0],
province: [], //省
city: [], //市
area: [], //区
}
},
computed: {
...mapState(["cityList", "user", "isCity"]),
},
mounted() {
let that = this
setTimeout(() => {
that.handleCityList()
console.log("1111", this.user.address, that.cityList, that.province)
}, 500);
},
methods: {
// 地区
handleCityList() {
let that = this
that.province = that.cityList
let str = that.user.address.split(',')[0]
let str2 = that.user.address.split(',')[1]
var Index0 = that.cityList.findIndex((profile) => profile.name === str);
var Index2 = that.cityList[Index0].list.findIndex((ite) => ite === str2);
that.value[0] = Index0
that.value[1] = Index2
that.city = that.cityList[Index0].list
},
}
}
</script>
<style scoped lang="scss">
.bg {
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.4);
z-index: 99;
}
</style>

2
element/drawer.vue
View File

@ -66,7 +66,7 @@
addInfo() { addInfo() {
let that = this let that = this
uni.navigateTo({ uni.navigateTo({
url: "/pages/my/userInfo" url: "/pageTwo/my/userInfo"
}) })
that.$store.commit("changeDrawe", false); that.$store.commit("changeDrawe", false);
}, },

56
element/headerIndex.vue
View File

@ -2,20 +2,20 @@
<view> <view>
<view class="header"> <view class="header">
<view class="top" v-if="userList.length"> <view class="top" v-if="userList.length">
<view class="headimg"> <view class="headimg" @click="handleAddUser(1)">
<image :src="info.head_pic"></image> <image :src="info.head_pic"></image>
</view> </view>
<view class="info"> <view class="info" @click="handleAddUser(1)">
<view class="size18 bold">{{info.nickname}}</view> <view class="size18 bold">{{info.nickname}}</view>
<view class="mt-10"> <view class="mt-10">
<text class="mr-10">性别：{{info.gender==1?'男':info.gender==2?'女':'未知'}}</text> <text class="mr-10">性别：{{info.gender==1?'男':info.gender==2?'女':'未知'}}</text>
<text class="ml-10">年龄：{{info.age}}岁</text> <text class="ml-10">年龄：{{info.age}}岁</text>
</view> </view>
<!-- <view class="mt-10">{{$t("index.birthday")}}：{{user.birthday}}</view> --> <view class="mt-10">地区：{{info.address}}</view>
</view> </view>
<text class="t-icon t-icon-qiehuan1" @click="$store.commit('changeDrawe', true)" v-if="isLeft"></text> <text class="t-icon t-icon-qiehuan1" @click="$store.commit('changeDrawe', true)" v-if="isLeft"></text>
</view> </view>
<view class="top" v-else @click="handleAddUser"> <view class="top" v-else @click="handleAddUser(2)">
<view class="info"> <view class="info">
暂无成员，请先添加~ 暂无成员，请先添加~
</view> </view>
@ -79,7 +79,7 @@
}; };
}, },
computed: { computed: {
...mapState(["user", "familayList"]), ...mapState(["user", "familayList", "cityList"]),
info() { info() {
return this.user return this.user
}, },
@ -88,7 +88,7 @@
}, },
userId() { userId() {
return this.user.id return this.user.id
} },
}, },
props: { props: {
isArea: { isArea: {
@ -105,23 +105,14 @@
setTimeout(() => { setTimeout(() => {
if (that.isArea) { if (that.isArea) {
that.handleCityList() that.handleCityList()
console.log("1111", this.user.address)
} }
}, 500); }, 1000);
}, },
watch: { watch: {
userId() { userId() {
let that = this let that = this
that.region = that.user.address that.region = that.user.address
if (that.province.length) { that.handleCityList()
let str = that.user.address.split(',')[0]
let str2 = that.user.address.split(',')[1]
var Index0 = that.province.findIndex((profile) => profile.name === str);
var Index2 = that.province[Index0].list.findIndex((ite) => ite === str2);
that.value[0] = Index0
that.value[1] = Index2
that.city = that.province[Index0].list
}
that.$emit("getAciveCity", that.region) that.$emit("getAciveCity", that.region)
}, },
}, },
@ -142,36 +133,32 @@
that.$emit("getAciveCity", that.region) that.$emit("getAciveCity", that.region)
}, },
// 添加成员 // 添加成员
handleAddUser() { handleAddUser(ind) {
let that = this
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
let index = that.userList.findIndex((profile) => profile.id == that.info.id)
uni.navigateTo({ uni.navigateTo({
url: "/pages/my/userInfo" url: ind == 1 ? "/pageTwo/my/userInfo?info=" + JSON.stringify(that.userList[index]) :
"/pageTwo/my/userInfo"
}) })
} else { } else {
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/login' url: '/pageTwo/login/login'
}) })
} }
}, },
// 地区 // 地区
handleCityList() { handleCityList() {
let that = this let that = this
that.$model.getCityList({ if (that.cityList.length) {
type: 2 that.province = that.cityList
}).then((res) => {
console.log("|全部地区", res.data, that.user.address)
if (res.code != 0) return
that.province = res.data
let str = that.user.address.split(',')[0] let str = that.user.address.split(',')[0]
let str2 = that.user.address.split(',')[1] var Index0 = that.province.findIndex((profile) => profile.name == str);
var Index0 = res.data.findIndex((profile) => profile.name === str);
var Index2 = res.data[Index0].list.findIndex((ite) => ite === str2);
that.value[0] = Index0 that.value[0] = Index0
that.value[1] = Index2 console.log("地区", str, Index0)
that.city = res.data[Index0].list that.city = that.province[Index0].list
}) }
}, },
} }
} }
</script> </script>
@ -200,6 +187,7 @@
display: flex; display: flex;
border-radius: 10px; border-radius: 10px;
justify-content: space-between; justify-content: space-between;
box-shadow: 0px 1px 5px 2px #dfe2e1fc;
} }
@ -214,7 +202,7 @@
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: 99; z-index: 9999;
background-color: rgba(0, 0, 0, 0.6); background-color: rgba(0, 0, 0, 0.6);
.groupBtn { .groupBtn {

5
element/manuallyAdd/lungAdd.vue
View File

@ -7,7 +7,7 @@
<view class="editem" @click="hideKeyboard"> <view class="editem" @click="hideKeyboard">
<view class="left">日期</view> <view class="left">日期</view>
<view class="right"> <view class="right">
<picker mode="date" :end="endDate" @change="changeLog" fields="time"> <picker mode="date" :end="endDate" @change="changeLog" :fields="fields">
<view class="uni-input">{{regTime?regTime:'请选择'}}</view> <view class="uni-input">{{regTime?regTime:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>
@ -50,7 +50,8 @@
regTime: "", regTime: "",
number1: '', number1: '',
number2: "", number2: "",
number3: "" number3: "",
fields: "",
} }
}, },
computed: { computed: {

12
element/manuallyAdd/publicAdd.vue
View File

@ -16,7 +16,7 @@
<view class="editem" @click="hideKeyboard"> <view class="editem" @click="hideKeyboard">
<view class="left">日期</view> <view class="left">日期</view>
<view class="right"> <view class="right">
<picker mode="date" :end="endDate" @change="changeLog" fields="time"> <picker mode="date" :end="endDate" @change="changeLog" :fields="fields">
<view class="uni-input">{{regTime?regTime:'请选择'}}</view> <view class="uni-input">{{regTime?regTime:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>
@ -53,6 +53,7 @@
timeList: [], timeList: [],
time_m: "", time_m: "",
time_s: "", time_s: "",
fields: "",
timesTndex: [1, 0], timesTndex: [1, 0],
lableTndex: 0, lableTndex: 0,
} }
@ -80,7 +81,14 @@
}, },
}, },
mounted() { mounted() {
this.timeList = this.$tools.gethms() let that = this
that.timeList = this.$tools.gethms()
// #ifdef APP-PLUS
that.fields = "time"
// #endif
// #ifndef APP-PLUS
that.fields = "day"
// #endif
}, },
methods: { methods: {
bindTimeChange(e) { bindTimeChange(e) {

11
element/manuallyAdd/record.vue
View File

@ -6,7 +6,7 @@
<view class="editem"> <view class="editem">
<view class="left">日期</view> <view class="left">日期</view>
<view class="right"> <view class="right">
<picker mode="date" :end="endDate" @change="changeLog" fields="time"> <picker mode="date" :end="endDate" @change="changeLog" :fields="fields">
<view class="uni-input">{{regTime?regTime:'请选择'}}</view> <view class="uni-input">{{regTime?regTime:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>
@ -118,7 +118,8 @@
timesTndex: [1, 0], timesTndex: [1, 0],
listType: null, listType: null,
describe: "", describe: "",
unit: "" unit: "",
fields: ""
} }
}, },
computed: { computed: {
@ -152,6 +153,12 @@
mounted() { mounted() {
let that = this let that = this
that.timeList = that.$tools.gethms() that.timeList = that.$tools.gethms()
// #ifdef APP-PLUS
that.fields = "time"
// #endif
// #ifndef APP-PLUS
that.fields = "day"
// #endif
}, },
methods: { methods: {
// 手动记录 // 手动记录

2
element/manuallyAdd/skipAdd.vue
View File

@ -7,7 +7,7 @@
<view class="editem" @click="hideKeyboard"> <view class="editem" @click="hideKeyboard">
<view class="left">日期</view> <view class="left">日期</view>
<view class="right"> <view class="right">
<picker mode="date" :end="endDate" @change="changeLog" fields="time"> <picker mode="date" :end="endDate" @change="changeLog" :fields="fields">
<view class="uni-input">{{regTime?regTime:'请选择'}}</view> <view class="uni-input">{{regTime?regTime:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>

2
element/manuallyAdd/weightAdd.vue
View File

@ -7,7 +7,7 @@
<view class="editem" @click="hideKeyboard"> <view class="editem" @click="hideKeyboard">
<view class="left">日期</view> <view class="left">日期</view>
<view class="right"> <view class="right">
<picker mode="date" :end="endDate" @change="changeLog" fields="time"> <picker mode="date" :end="endDate" @change="changeLog" :fields="fields">
<view class="uni-input">{{regTime?regTime:'请选择'}}</view> <view class="uni-input">{{regTime?regTime:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>

12
element/target/firstweight.vue
View File

@ -6,7 +6,7 @@
<view class="editem" @click="hideKeyboard" v-if="type!=1"> <view class="editem" @click="hideKeyboard" v-if="type!=1">
<view class="name">日期</view> <view class="name">日期</view>
<view class="right"> <view class="right">
<picker mode="date" :start="startDate" :end="endDate" @change="changeLog" fields="time"> <picker mode="date" :start="startDate" :end="endDate" @change="changeLog" :fields="fields">
<view class="uni-input">{{regTime?regTime:'请选择'}}</view> <view class="uni-input">{{regTime?regTime:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>
@ -37,6 +37,7 @@
return { return {
regTime: "", regTime: "",
weight: "", weight: "",
fields: "",
} }
}, },
computed: { computed: {
@ -48,6 +49,15 @@
return this.$tools.getDate('start'); return this.$tools.getDate('start');
} }
}, },
mounted() {
let that = this
// #ifdef APP-PLUS
that.fields = "time"
// #endif
// #ifndef APP-PLUS
that.fields = "day"
// #endif
},
methods: { methods: {
// 初始体重 // 初始体重
handleTarget() { handleTarget() {

6
manifest.json
View File

@ -125,9 +125,11 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "", "appid" : "wx9c0b7a436ada6d1e",
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false,
"postcss" : true,
"minified" : true
}, },
"usingComponents" : true "usingComponents" : true
}, },

42
pages/PublicCards/charts.vue → pageTwo/PublicCards/charts.vue
View File

@ -4,16 +4,18 @@
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="boxTime"> <view class="boxTime">
<view class="one"> <view class="one">
<picker mode="date" :end="endDate" @change="handStartTimeH" fields="time" <picker mode="date" :end="endDate" @change="handStartTimeH" :fields="fields"
:value="startTime?startTime:startDate"> :value="startTime?startTime:startDate">
<view class="uni-input mr-10">{{startTime?startTime:startDate}}</view> <view class="uni-input mr-10">{{startTime?startTime:startDate}}
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</view>
</picker> </picker>
<view class="center">~</view> <view class="center">~</view>
<picker mode="date" :end="endDate" @change="handEndTimeH" fields="time" <picker mode="date" :end="endDate" @change="handEndTimeH" :fields="fields"
:value="endTime?endTime:endDate"> :value="endTime?endTime:endDate">
<view class="uni-input mr-10">{{endTime?endTime:endDate}}</view> <view class="uni-input mr-10">{{endTime?endTime:endDate}}
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</view>
</picker> </picker>
</view> </view>
</view> </view>
@ -23,17 +25,18 @@
<view class="boxLine"> <view class="boxLine">
<view class="line" v-for="(item,index) in weightList"> <view class="line" v-for="(item,index) in weightList">
<view v-if="item.line.categories.length" class="mt-15 mb-15"> <view v-if="item.line.categories.length" class="mt-15 mb-15">
<qiunDataCharts type="area" :chartData="item.line" :canvas2d="true" :canvasId="'1025'+ index" <qiunDataCharts type="column" :chartData="item.line" :canvas2d="true" :canvasId="item.id"
:cHeight="400" :cWidth="720" :animation="false" :Width="340" :Height="250" :animation="false"
:opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" /> :opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" />
</view> </view>
<view class="nolist" v-else> <view v-else>
<image src="../../static/none.png"></image> <view class="nolist">
<text>暂无数据，请手动添加~</text> <image src="../../static/none.png"></image>
</view> <text>暂无数据，请手动添加~</text>
<view class="title"> </view>
<text :style="{'backgroundColor':item.line.series[0].color}"></text> <view class="title">
{{item.title}} {{item.title}}
</view>
</view> </view>
</view> </view>
</view> </view>
@ -45,7 +48,7 @@
import { import {
mapState mapState
} from "vuex"; } from "vuex";
import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'; import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'
export default { export default {
components: { components: {
qiunDataCharts, qiunDataCharts,
@ -68,6 +71,7 @@
active: 0, active: 0,
startTime: "", startTime: "",
endTime: "", endTime: "",
fields: "",
weightList: [], weightList: [],
}; };
}, },
@ -84,6 +88,12 @@
} }
}) })
that.handlePublicTrendList() that.handlePublicTrendList()
// #ifdef APP-PLUS
that.fields = "time"
// #endif
// #ifndef APP-PLUS
that.fields = "day"
// #endif
}, },
methods: { methods: {
handStartTimeH(e) { handStartTimeH(e) {

2
pages/PublicCards/contrast.vue → pageTwo/PublicCards/contrast.vue
View File

@ -175,7 +175,7 @@
info.after_id = that.isActive[1] info.after_id = that.isActive[1]
console.log("1111", info, that.isActive) console.log("1111", info, that.isActive)
uni.navigateTo({ uni.navigateTo({
url: "/pages/compk/pkdetail?info=" + JSON.stringify(info) url: "/pageTwo/compk/pkdetail?info=" + JSON.stringify(info)
}) })
}, },
handleActive(ite, ind) { handleActive(ite, ind) {

0
pages/PublicCards/history.vue → pageTwo/PublicCards/history.vue
View File

0
pages/PublicCards/pkdetail.vue → pageTwo/PublicCards/pkdetail.vue
View File

2
pages/business/addDevice.vue → pageTwo/business/addDevice.vue
View File

@ -33,7 +33,7 @@
handlebinging(item) { handlebinging(item) {
console.log("item", item) console.log("item", item)
uni.redirectTo({ uni.redirectTo({
url: "/pages/business/search?id=" + item.id url: "/pageTwo/business/search?id=" + item.id
}) })
} }
} }

0
pages/business/search.vue → pageTwo/business/search.vue
View File

3
pages/cardList/card.vue → pageTwo/cardList/card.vue
View File

@ -125,7 +125,7 @@
line-height: 60px; line-height: 60px;
border-radius: 5px; border-radius: 5px;
.uni-icons { .uni-icons,uni-icons {
font-size: 36rpx; font-size: 36rpx;
position: absolute; position: absolute;
top: -28px; top: -28px;
@ -133,6 +133,7 @@
} }
.info { .info {
width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

2
pages/compk/contrast.vue → pageTwo/compk/contrast.vue
View File

@ -154,7 +154,7 @@
info.after_id = that.isActive[1] info.after_id = that.isActive[1]
console.log("1111", info, that.isActive) console.log("1111", info, that.isActive)
uni.navigateTo({ uni.navigateTo({
url: "/pages/compk/pkdetail?info=" + JSON.stringify(info) url: "/pageTwo/compk/pkdetail?info=" + JSON.stringify(info)
}) })
}, },
}, },

0
pages/compk/pkdetail.vue → pageTwo/compk/pkdetail.vue
View File

0
pages/devices/G02.vue → pageTwo/devices/G02.vue
View File

14
pages/devices/PCT01.vue → pageTwo/devices/PCT01.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="content skipping"> <view class="content skipping">
<!--自由训练 --> <!--自由训练 -->
<view class="title">{{info.active==1?'自由训练':info.active==2?'定时训练':'定数训练'}}</view> <view class="title">{{info.active==1?'自由跳':info.active==2?'倒计时':'倒计数'}}</view>
<view class="skiptop"> <view class="skiptop">
<view class="item"> <view class="item">
<view class="item-ite">{{info.active==1?'自由次数':info.active==2?"个数":'目标次数'}}<text>{{weight}}</text> <view class="item-ite">{{info.active==1?'自由次数':info.active==2?"个数":'目标次数'}}<text>{{weight}}</text>
@ -108,12 +108,22 @@
that.$store.commit("changeBluetooth", res.available); that.$store.commit("changeBluetooth", res.available);
}) })
}, },
// #ifdef APP-PLUS
onBackPress(options) { onBackPress(options) {
let that = this let that = this
that.handleEnd() that.handleEnd()
innerAudioContext.stop(); innerAudioContext.stop();
console.log("页面返回onBackPress") console.log("PCT01返回onBackPress")
}, },
// #endif
// #ifndef APP-PLUS
onUnload: function() {
let that = this
that.handleEnd()
innerAudioContext.stop();
console.log("PCT01返回onUnload")
},
// #endif
watch: { watch: {
isConnected: function() { isConnected: function() {
let that = this let that = this

0
pages/devices/PCV02.vue → pageTwo/devices/PCV02.vue
View File

0
pages/devices/scss/PCT01.scss → pageTwo/devices/scss/PCT01.scss
View File

0
pages/devices/scss/PCV02.scss → pageTwo/devices/scss/PCV02.scss
View File

0
pages/devices/scss/search.scss → pageTwo/devices/scss/search.scss
View File

0
pages/devices/search.vue → pageTwo/devices/search.vue
View File

2
pages/history/history.vue → pageTwo/history/history.vue
View File

@ -114,7 +114,7 @@
let that = this let that = this
if (that.acd_id == "6") return if (that.acd_id == "6") return
uni.navigateTo({ uni.navigateTo({
url: "/pages/history/historyDetail?type=" + that.acd_id + '&id=' + item.id url: "/pageTwo/history/historyDetail?type=" + that.acd_id + '&id=' + item.id
}) })
}, },
getList(page) { getList(page) {

0
pages/history/historyDetail.vue → pageTwo/history/historyDetail.vue
View File

0
pages/login/detail.vue → pageTwo/login/detail.vue
View File

2
pages/login/forgetPassword.vue → pageTwo/login/forgetPassword.vue
View File

@ -6,7 +6,7 @@
<view class="item"> <view class="item">
<view class="text">手机号/邮箱</view> <view class="text">手机号/邮箱</view>
<view class="input"> <view class="input">
<input v-model="phone" placeholder="" /> <input v-model="phone" type="text"/>
</view> </view>
</view> </view>
<view class="item "> <view class="item ">

2
pages/login/login.vue → pageTwo/login/login.vue
View File

@ -154,7 +154,7 @@
}, },
handlePassword(text) { handlePassword(text) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/login/forgetPassword?type=" + text url: "/pageTwo/login/forgetPassword?type=" + text
}) })
}, },
handlexieyi() { handlexieyi() {

0
pages/message/list.vue → pageTwo/message/list.vue
View File

0
pages/my/about.vue → pageTwo/my/about.vue
View File

4
pages/my/manage.vue → pageTwo/my/manage.vue
View File

@ -119,13 +119,13 @@
editorInfo(item) { editorInfo(item) {
console.log("familayList", this.familayList) console.log("familayList", this.familayList)
uni.navigateTo({ uni.navigateTo({
url: "/pages/my/userInfo?info=" + JSON.stringify(item) url: "/pageTwo/my/userInfo?info=" + JSON.stringify(item)
}) })
}, },
//添加 //添加
handleAddUser() { handleAddUser() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/my/userInfo" url: "/pageTwo/my/userInfo"
}) })
}, },
} }

223
pages/my/userInfo.vue → pageTwo/my/userInfo.vue
View File

@ -44,25 +44,67 @@
<view class="left">出生日期</view> <view class="left">出生日期</view>
<view class="right"> <view class="right">
<picker mode="date" :end="endDate" @change="maskClick" <picker mode="date" :end="endDate" @change="maskClick"
:value="memInfo.birthday?memInfo.birthday:endDate" fields="time"> :value="memInfo.birthday?memInfo.birthday:endDate" :fields="fields">
<view class="uni-input">{{memInfo.birthday?memInfo.birthday:'请选择'}}</view> <view class="uni-input">{{memInfo.birthday?memInfo.birthday:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>
<!-- <uni-datetime-picker type="date" :end="startDate" :clear-icon="false" v-model="memInfo.birthday" </view>
@change="maskClick" :border="false" /> --> </view>
<view class="lan border-bottom">
<view class="left">身份信息</view>
<view class="right">
<picker mode="selector" :range="identityList" :value="identityIndex" range-key="name"
@change="changegIdentity">
<view class="uni-input">{{identityList[identityIndex]?identityList[identityIndex].name:"请选择"}}
</view>
<icon class="iconfont icon-arrow-down-bold"></icon>
</picker>
</view>
</view>
<view class="lan border-bottom" v-if="memInfo.identity_id=='P0'">
<view class="left">自定义</view>
<view class="right">
<input name="name" type="text" v-model="identityName" placeholder="请输入身份" />
<uni-icons type="clear" color="#999" v-if="identityName" @click="identityName=''"
size="20"></uni-icons>
</view>
</view>
<view class="lan border-bottom" @click="handleCityList">
<view class="left">所属地区</view>
<view class="right">
<view class="mr-10">{{memInfo.address?memInfo.address:'请选择'}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon>
</view> </view>
</view> </view>
<view class="lan border-bottom"> <view class="lan border-bottom">
<view class="left">所在年级</view> <view class="left">所在年级</view>
<view class="right"> <view class="right">
<picker mode="selector" :range="gradeList" :value="index" range-key="name" @change="changegType"> <picker mode="selector" :range="gradeList" :value="gradeIndex" range-key="name"
<view class="uni-input">{{gradeList[index]?gradeList[index].name:"请选择"}}</view> @change="changegType">
<view class="uni-input">{{gradeList[gradeIndex]?gradeList[gradeIndex].name:"请选择"}}</view>
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</picker> </picker>
</view> </view>
</view> </view>
</view> </view>
<view class="btn" @click="confirmInfo">提交</view> <view class="btn" @click="confirmInfo">提交</view>
<!-- 地区 -->
<view v-if="visible" class="visible" @click="visible=false">
<view @click.stop class="item">
<view class="groupBtn">
<view @click="visible=false">取消</view>
<view @click="handlesure()" class="sure">确定</view>
</view>
<picker-view @change="bindChange" :value="value" class="picker-view" :indicator-style="indicatorStyle">
<picker-view-column>
<view class="item" v-for="(item,index) in province" :key="index">{{item.name}}</view>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in city" :key="index">{{item}}</view>
</picker-view-column>
</picker-view>
</view>
</view>
</view> </view>
</template> </template>
<script> <script>
@ -73,26 +115,36 @@
data() { data() {
return { return {
isEdit: false, isEdit: false,
fields: "",
sexItem: [ sexItem: [
"男", "男",
"女" "女"
], ],
memInfo: { memInfo: {
birthday: "", birthday: "",
gender: 0, gender: '',
nickname: "", nickname: "",
grade: "", grade: "",
height: "", height: "",
weight: "" weight: "",
address: '',
identity_name: "",
identity_id: "P0",
}, },
identityName: "",
visible: false,
province: [], //省
city: [], //市
area: [], //区
value: [2, 0],
headimg: "", headimg: "",
index: 0, identityIndex: 0,
gradeList: [] gradeIndex: 0,
indicatorStyle: `height: 45px;`,
}; };
}, },
computed: { computed: {
...mapState(["user", "familayList"]), ...mapState(["user", "familayList", "cityList", "gradeList", "identityList"]),
endDate() { endDate() {
return this.$tools.getDate("start") return this.$tools.getDate("start")
}, },
@ -102,29 +154,23 @@
}, },
onLoad(options) { onLoad(options) {
let that = this let that = this
this.handleGradeList() that.handleGradeList()
that.handleIdentityList()
if (options.info) { if (options.info) {
that.memInfo = JSON.parse(options.info) that.memInfo = JSON.parse(options.info)
that.gradeIndex = that.gradeList.findIndex((profile) => profile.id === that.memInfo.grade);
that.identityIndex = that.identityList.findIndex((profile) => profile.id === that.memInfo.identity_id);
that.identityName = that.memInfo.identity_id == 'P0' ? that.memInfo.identity_name : ''
that.isEdit = true that.isEdit = true
} }
console.log("1111", this.memInfo) // #ifdef APP-PLUS
that.fields = "time"
// #endif
// #ifndef APP-PLUS
that.fields = "day"
// #endif
}, },
methods: { methods: {
handleGradeList() {
let that = this
that.$model.getGradeList({}).then(res => {
console.log("年级列表", res)
if (res.code != 0) {
that.$tools.msg(res.msg)
return
}
that.gradeList = res.data
if (that.isEdit == true) {
that.index = res.data.findIndex(ite => ite.id == that.memInfo.grade)
}
that.memInfo.grade = res.data[that.index].id
}).catch(err => {})
},
// 提交 // 提交
confirmInfo() { confirmInfo() {
let that = this let that = this
@ -148,10 +194,22 @@
that.$tools.msg("请选择出生日期") that.$tools.msg("请选择出生日期")
return; return;
} }
if (!that.memInfo.identity_id) {
that.$tools.msg("请选择身份信息")
return;
}
if (!that.memInfo.address) {
that.$tools.msg("请选择所属地区")
return;
}
if (!that.memInfo.grade) { if (!that.memInfo.grade) {
that.$tools.msg("请选择所在年级") that.$tools.msg("请选择所在年级")
return; return;
} }
if (that.memInfo.identity_id == 'P0') {
that.memInfo.identity_name = that.identityName ? that.identityName : that.identityList[that
.identityIndex].name
}
let https = that.isEdit ? that.$model.getEditUser(that.memInfo) : that.$model.getAddUser(that.memInfo) let https = that.isEdit ? that.$model.getEditUser(that.memInfo) : that.$model.getAddUser(that.memInfo)
return https.then(res => { return https.then(res => {
console.log("成功", res) console.log("成功", res)
@ -189,7 +247,7 @@
aud_id: id aud_id: id
}) })
uni.redirectTo({ uni.redirectTo({
url: "/pages/cardList/card" url: "/pageTwo/cardList/card"
}) })
} else { } else {
uni.navigateBack({ uni.navigateBack({
@ -202,6 +260,7 @@
}, },
//确定年龄 //确定年龄
maskClick(e) { maskClick(e) {
console.log("出生日期", e.detail.value)
this.memInfo.birthday = e.detail.value this.memInfo.birthday = e.detail.value
}, },
//确定性别 //确定性别
@ -210,9 +269,61 @@
}, },
// 年级 // 年级
changegType(e) { changegType(e) {
this.index = e.detail.value this.gradeIndex = e.detail.value
this.memInfo.grade = this.gradeList[e.target.value].id this.memInfo.grade = this.gradeList[e.target.value].id
}, },
// 身份
changegIdentity(e) {
let that = this
that.identityIndex = e.detail.value
that.memInfo.identity_id = that.identityList[e.detail.value].id
that.memInfo.identity_name = that.identityList[e.detail.value].name
},
// 地区
bindChange: function(e) {
let that = this
if (e.detail.value[0] != that.value[0]) {
e.detail.value[1] = 0
}
that.value = e.detail.value
that.city = that.province[that.value[0]].list
},
handlesure() {
let that = this
let defaultRegion = [that.province[that.value[0]].name, that.city[that.value[1]]]
that.memInfo.address = defaultRegion.join(",");
that.visible = false
},
handleCityList() {
let that = this
that.province = that.cityList
let str = that.user.address.split(',')[0]
let str2 = that.user.address.split(',')[1]
var Index0 = that.cityList.findIndex((profile) => profile.name === str);
var Index2 = that.cityList[Index0].list.findIndex((ite) => ite === str2);
that.value[0] = Index0
that.value[1] = Index2
that.city = that.cityList[Index0].list
that.visible = true
},
// 获取年级
handleGradeList() {
let that = this
if (that.isEdit == true) {
that.gradeIndex = that.gradeList.findIndex(ite => ite.id == that.memInfo.grade)
that.memInfo.grade = that.gradeList[that.gradeIndex].id
}
},
// 获取身份
handleIdentityList() {
let that = this
if (that.isEdit == true) {
that.identityIndex = that.identityList.findIndex(ite => ite.id == that.memInfo.identity_id)
that.memInfo.identity_id = that.identityList[that.identityIndex].id
that.memInfo.identity_name = that.identityList[that.identityIndex].name
}
},
}, },
}; };
@ -303,4 +414,56 @@
margin: 40px 15px 0; margin: 40px 15px 0;
background: $btncolor !important; background: $btncolor !important;
} }
.visible {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 9999;
background-color: rgba(0, 0, 0, 0.6);
.groupBtn {
height: 50px;
line-height: 50px;
background-color: #fff;
display: flex;
justify-content: space-between;
padding: 0 15px;
border-bottom: 1px solid #dfdfdf;
position: absolute;
left: 0;
right: 0;
bottom: 45%;
z-index: 999;
view {
height: 30px;
line-height: 30px;
padding: 0 10px;
background-color: #dfdfdf;
border-radius: 5px;
margin-top: 10px;
}
.sure {
background-color: $textcolor;
color: #fff !important;
}
}
.picker-view {
width: 100%;
height: 45%;
bottom: 0;
position: absolute;
background-color: #fff;
}
.item {
line-height: 45px;
text-align: center;
}
}
</style> </style>

0
pages/notepad/addNotepad.vue → pageTwo/notepad/addNotepad.vue
View File

0
pages/notepad/notepad.vue → pageTwo/notepad/notepad.vue
View File

2
pages/score/history.vue → pageTwo/score/history.vue
View File

@ -83,7 +83,7 @@
methods: { methods: {
clickItemMethod(id) { clickItemMethod(id) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/score/report?id=" + id url: "/pageTwo/score/report?id=" + id
}) })
}, },
getList(page) { getList(page) {

2
pages/score/report.vue → pageTwo/score/report.vue
View File

@ -5,7 +5,7 @@
<view class="box"> <view class="box">
<view class="title bold">本次估分成绩为</view> <view class="title bold">本次估分成绩为</view>
<view class="charts"> <view class="charts">
<qiun-data-charts type="arcbar" :chartData="chartData" /> <qiun-data-charts type="arcbar" :chartData="chartData" :Height="140" :Width="140"/>
<view class="name">{{score}}</view> <view class="name">{{score}}</view>
</view> </view>
<view class="title bold" v-if="Max_score">该地区体育总成绩为:{{Max_score}}分</view> <view class="title bold" v-if="Max_score">该地区体育总成绩为:{{Max_score}}分</view>

4
pages/setting/email.vue → pageTwo/setting/email.vue
View File

@ -5,7 +5,7 @@
<view class="item"> <view class="item">
<view class="text">邮箱</view> <view class="text">邮箱</view>
<view class="input"> <view class="input">
<input v-model="phone" placeholder="" /> <input v-model="phone" placeholder="请输入邮箱"/>
</view> </view>
</view> </view>
<view class="item "> <view class="item ">
@ -58,7 +58,7 @@
my_email: that.phone my_email: that.phone
}) })
uni.redirectTo({ uni.redirectTo({
url: "/pages/setting/setting" url: "/pageTwo/setting/setting"
}) })
} }
}).catch(err => {}) }).catch(err => {})

4
pages/setting/password.vue → pageTwo/setting/password.vue
View File

@ -5,13 +5,13 @@
<view class="item"> <view class="item">
<view class="text">密码</view> <view class="text">密码</view>
<view class="input"> <view class="input">
<input class="uni-input" v-model="password" /> <input class="uni-input" v-model="password" placeholder="请输入密码"/>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="text">确认密码</view> <view class="text">确认密码</view>
<view class="input"> <view class="input">
<input class="uni-input" v-model="password2" /> <input class="uni-input" v-model="password2" placeholder="请输入确认密码"/>
</view> </view>
</view> </view>
</view> </view>

4
pages/setting/phone.vue → pageTwo/setting/phone.vue
View File

@ -5,7 +5,7 @@
<view class="item"> <view class="item">
<view class="text">手机号</view> <view class="text">手机号</view>
<view class="input"> <view class="input">
<input v-model="phone" placeholder="" /> <input v-model="phone" placeholder="请输入手机号" />
</view> </view>
</view> </view>
<view class="item "> <view class="item ">
@ -58,7 +58,7 @@
my_tel: that.phone my_tel: that.phone
}) })
uni.redirectTo({ uni.redirectTo({
url: "/pages/setting/setting" url: "/pageTwo/setting/setting"
}) })
} }
}).catch(err => {}) }).catch(err => {})

10
pages/setting/setting.vue → pageTwo/setting/setting.vue
View File

@ -12,21 +12,21 @@
<uni-icons type="compose" color="#FEC407" @click="isEdit=true" class="ml-10" size="22"></uni-icons> <uni-icons type="compose" color="#FEC407" @click="isEdit=true" class="ml-10" size="22"></uni-icons>
</view> </view>
</view> </view>
<view class="caritem" @click="navTo('/pages/setting/phone')"> <view class="caritem" @click="navTo('/pageTwo/setting/phone')">
<view class="text">手机号</view> <view class="text">手机号</view>
<view class="text_r"> <view class="text_r">
<text>{{user.my_tel}}</text> <text>{{user.my_tel}}</text>
<uni-icons type="right"></uni-icons> <uni-icons type="right"></uni-icons>
</view> </view>
</view> </view>
<view class="caritem" @click="navTo('/pages/setting/email')"> <view class="caritem" @click="navTo('/pageTwo/setting/email')">
<view class="text">邮箱</view> <view class="text">邮箱</view>
<view class="text_r"> <view class="text_r">
<text>{{user.my_email}}</text> <text>{{user.my_email}}</text>
<uni-icons type="right"></uni-icons> <uni-icons type="right"></uni-icons>
</view> </view>
</view> </view>
<view class="caritem" @click="navTo('/pages/setting/password')"> <view class="caritem" @click="navTo('/pageTwo/setting/password')">
<view class="text">设置密码</view> <view class="text">设置密码</view>
<uni-icons type="right"></uni-icons> <uni-icons type="right"></uni-icons>
</view> </view>
@ -69,7 +69,7 @@
uni.clearStorageSync() uni.clearStorageSync()
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: "/pages/login/login" url: "/pageTwo/login/login"
}) })
}, 3000); }, 3000);
}) })
@ -120,7 +120,7 @@
width: 70%; width: 70%;
display: flex; display: flex;
align-items: center; align-items: center;
// justify-content: flex-end; justify-content: flex-end;
text { text {
width: calc(100% - 30px); width: calc(100% - 30px);

456
pages.json
View File

@ -8,55 +8,6 @@
"onReachBottomDistance": 50 "onReachBottomDistance": 50
} }
}, },
{
"path": "pages/cardList/card",
"style": {
"navigationBarTitleText": "卡片设置",
"enablePullDownRefresh": false
}
},
{
"path": "pages/body/body",
"style": {
"navigationBarTitleText": "身体数据",
"enablePullDownRefresh": true,
"onReachBottomDistance": 50
}
},
{
"path": "pages/history/history",
"style": {
"navigationBarTitleText": "历史记录",
"enablePullDownRefresh": false
}
},
{
"path": "pages/history/historyDetail",
"style": {
"navigationBarTitleText": "记录详情",
"enablePullDownRefresh": false
}
},
{
"path": "pages/compk/contrast",
"style": {
"navigationBarTitleText": "数据对比",
"enablePullDownRefresh": false
}
},
{
"path": "pages/compk/pkdetail",
"style": {
"navigationBarTitleText": "对比详情",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/skiping/skip", "path": "pages/skiping/skip",
"style": { "style": {
@ -98,21 +49,6 @@
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"onReachBottomDistance": 50 "onReachBottomDistance": 50
}
}, {
"path": "pages/my/manage",
"style": {
"navigationBarTitleText": "成员管理",
"enablePullDownRefresh": true,
"onReachBottomDistance": 50
}
},
{
"path": "pages/my/userInfo",
"style": {
"navigationBarTitleText": "资料"
} }
}, },
{ {
@ -122,84 +58,6 @@
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"onReachBottomDistance": 50 "onReachBottomDistance": 50
}
}, {
"path": "pages/score/history",
"style": {
"navigationBarTitleText": "估分历史",
"enablePullDownRefresh": false
}
}, {
"path": "pages/score/report",
"style": {
"navigationBarTitleText": "估分报告",
"enablePullDownRefresh": false
}
},
{
"path": "pages/login/forgetPassword",
"style": {
"navigationBarTitleText": "密码",
"enablePullDownRefresh": false
}
},
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/setting/setting",
"style": {
"navigationBarTitleText": "设置",
"enablePullDownRefresh": false
}
},
{
"path": "pages/setting/password",
"style": {
"navigationBarTitleText": "修改密码",
"enablePullDownRefresh": false
}
},
{
"path": "pages/setting/email",
"style": {
"navigationBarTitleText": "绑定邮箱",
"enablePullDownRefresh": false
}
},
{
"path": "pages/setting/phone",
"style": {
"navigationBarTitleText": "绑定手机号",
"enablePullDownRefresh": false
}
},
{
"path": "pages/devices/search",
"style": {
"navigationBarTitleText": "蓝牙搜索",
"enablePullDownRefresh": false
}
},
{
"path": "pages/devices/G02",
"style": {
"navigationBarTitleText": "测量",
"enablePullDownRefresh": false
} }
}, },
{ {
@ -211,96 +69,244 @@
} }
}, },
{
"path": "pages/devices/PCV02",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/business/addDevice",
"style": {
"navigationBarTitleText": "设备列表",
"enablePullDownRefresh": false
}
},
{
"path": "pages/business/search",
"style": {
"navigationBarTitleText": "搜索设备",
"enablePullDownRefresh": false
}
},
{
"path": "pages/devices/PCT01",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/my/about",
"style": {
"navigationBarTitleText": "关于我们",
"enablePullDownRefresh": false
}
},
{
"path": "pages/message/list",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/notepad/notepad",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/notepad/addNotepad",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/PublicCards/PublicCards", "path": "pages/PublicCards/PublicCards",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/PublicCards/charts",
"style": {
"navigationBarTitleText": "运动曲线"
}
},
{
"path": "pages/PublicCards/history",
"style": {
"navigationBarTitleText": "历史记录"
}
},
{
"path": "pages/PublicCards/contrast",
"style": {
"navigationBarTitleText": "数据对比"
}
},
{
"path": "pages/PublicCards/pkdetail",
"style": { "style": {
"navigationBarTitleText": "对比详情" "navigationBarTitleText": "对比详情"
} }
},
{
"path": "pages/body/body",
"style": {
"navigationBarTitleText": "身体数据",
"enablePullDownRefresh": true,
"onReachBottomDistance": 50
}
} }
], ],
"subPackages": [{
"root": "pageTwo",
"pages": [{
"path": "history/history",
"style": {
"navigationBarTitleText": "历史记录",
"enablePullDownRefresh": false
}
},
{
"path": "history/historyDetail",
"style": {
"navigationBarTitleText": "记录详情",
"enablePullDownRefresh": false
}
},
{
"path": "compk/contrast",
"style": {
"navigationBarTitleText": "数据对比",
"enablePullDownRefresh": false
}
},
{
"path": "compk/pkdetail",
"style": {
"navigationBarTitleText": "对比详情",
"enablePullDownRefresh": false
}
}, {
"path": "cardList/card",
"style": {
"navigationBarTitleText": "卡片设置",
"enablePullDownRefresh": false
}
}, {
"path": "business/addDevice",
"style": {
"navigationBarTitleText": "设备列表",
"enablePullDownRefresh": false
}
},
{
"path": "business/search",
"style": {
"navigationBarTitleText": "搜索设备",
"enablePullDownRefresh": false
}
},
{
"path": "score/history",
"style": {
"navigationBarTitleText": "估分历史",
"enablePullDownRefresh": false
}
}, {
"path": "score/report",
"style": {
"navigationBarTitleText": "估分报告",
"enablePullDownRefresh": false
}
},
{
"path": "my/manage",
"style": {
"navigationBarTitleText": "成员管理",
"enablePullDownRefresh": true,
"onReachBottomDistance": 50
}
},
{
"path": "message/list",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "my/userInfo",
"style": {
"navigationBarTitleText": "资料"
}
},
{
"path": "login/forgetPassword",
"style": {
"navigationBarTitleText": "密码",
"enablePullDownRefresh": false
}
},
{
"path": "login/login",
"style": {
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "my/about",
"style": {
"navigationBarTitleText": "关于我们",
"enablePullDownRefresh": false
}
},
{
"path": "setting/setting",
"style": {
"navigationBarTitleText": "设置",
"enablePullDownRefresh": false
}
},
{
"path": "setting/password",
"style": {
"navigationBarTitleText": "修改密码",
"enablePullDownRefresh": false
}
},
{
"path": "setting/email",
"style": {
"navigationBarTitleText": "绑定邮箱",
"enablePullDownRefresh": false
}
},
{
"path": "setting/phone",
"style": {
"navigationBarTitleText": "绑定手机号",
"enablePullDownRefresh": false
}
},
{
"path": "devices/search",
"style": {
"navigationBarTitleText": "蓝牙搜索",
"enablePullDownRefresh": false
}
},
{
"path": "devices/G02",
"style": {
"navigationBarTitleText": "测量",
"enablePullDownRefresh": false
}
},
{
"path": "devices/PCV02",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "devices/PCT01",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "notepad/notepad",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "notepad/addNotepad",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "PublicCards/charts",
"style": {
"navigationBarTitleText": "运动曲线"
}
},
{
"path": "PublicCards/history",
"style": {
"navigationBarTitleText": "历史记录"
}
},
{
"path": "PublicCards/contrast",
"style": {
"navigationBarTitleText": "数据对比"
}
},
{
"path": "PublicCards/pkdetail",
"style": {
"navigationBarTitleText": "对比详情"
}
}
]
}],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarTitleText": "", "navigationBarTitleText": "",

38
pages/PublicCards/PublicCards.vue
View File

@ -25,7 +25,10 @@
<!-- --> <!-- -->
<view v-for="(ite,ind) in label_data" v-if="active == ind"> <view v-for="(ite,ind) in label_data" v-if="active == ind">
<view class="info"> <view class="info">
<view class="time">{{ite.record_time}}</view> <view class="table">
<text class="time">{{ite.record_time}}</text>
<text class="name2">训练成绩为</text>
</view>
<view class="left"> <view class="left">
<view class="left_view"> <view class="left_view">
<view class="title">{{ite.this_time_title}}:</view> <view class="title">{{ite.this_time_title}}:</view>
@ -64,9 +67,8 @@
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<view class="title bold">训练成绩为</view>
<view class="charts"> <view class="charts">
<qiun-data-charts type="arcbar" :chartData="chartData" /> <qiun-data-charts type="arcbar" :chartData="chartData" :Height="140" :Width="140" />
<view class="name">{{ite.score?ite.score:'-'}}</view> <view class="name">{{ite.score?ite.score:'-'}}</view>
</view> </view>
<view class="standard" v-if="ite.standard"> <view class="standard" v-if="ite.standard">
@ -83,19 +85,19 @@
<!-- --> <!-- -->
<view class="gridList"> <view class="gridList">
<view class="data"> <view class="data">
<view class="item" @click="navTo('/pages/PublicCards/charts?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/PublicCards/charts?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="@/static/charts.png"></image> <image src="@/static/charts.png"></image>
</view> </view>
<view class="name">运动曲线</view> <view class="name">运动曲线</view>
</view> </view>
<view class="item" @click="navTo('/pages/PublicCards/history?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/PublicCards/history?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="@/static/add.png"></image> <image src="@/static/add.png"></image>
</view> </view>
<view class="name">历史记录</view> <view class="name">历史记录</view>
</view> </view>
<view class="item" @click="navTo('/pages/PublicCards/contrast?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/PublicCards/contrast?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="@/static/pk.png"></image> <image src="@/static/pk.png"></image>
</view> </view>
@ -150,6 +152,7 @@
that.labelName = that.PublicContent.label_list[0] that.labelName = that.PublicContent.label_list[0]
that.lineList = that.PublicContent.line_list that.lineList = that.PublicContent.line_list
that.label_data = that.PublicContent.label_data that.label_data = that.PublicContent.label_data
that.chartData.series[0].data = Number(that.PublicContent.label_data[0].offset) / 100
that.offset = that.PublicContent.label_data[0].offset that.offset = that.PublicContent.label_data[0].offset
} }
return that.PublicContent ? that.PublicContent.label_list : [] return that.PublicContent ? that.PublicContent.label_list : []
@ -169,6 +172,7 @@
that.active = ind that.active = ind
that.labelName = ite that.labelName = ite
that.offset = that.label_data[ind].offset that.offset = that.label_data[ind].offset
that.chartData.series[0].data = Number(that.label_data[ind].offset) / 100
}, },
// 历史数据删除时重新加载接口 // 历史数据删除时重新加载接口
reload() { reload() {
@ -312,11 +316,25 @@
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.time { .table {
width: 100%; width: 100%;
color: #999; display: flex;
font-size: 32rpx; flex-wrap: wrap;
margin-bottom: 5px;
.name2 {
width: 260rpx;
text-align: center;
font-weight: bold;
font-size: 36rpx;
}
.time {
width: calc(100% - 260rpx);
color: #999;
font-size: 32rpx;
margin-bottom: 5px;
display: inline-block;
}
} }
.left { .left {

40
pages/body/body.vue
View File

@ -115,7 +115,7 @@
</view> </view>
<!-- 成长建议 --> <!-- 成长建议 -->
<view v-if="info&&cplist&&(cplist.sleeplist.lengt||cplist.nutritionlist.length)"> <view v-if="info&&cplist&&(cplist.sleeplist.lengt||cplist.nutritionlist.length)">
<view class="bold mt-10" >成长建议</view> <view class="bold mt-10">成长建议</view>
<view class="jianyi_box"> <view class="jianyi_box">
<view class="jianyi"> <view class="jianyi">
<view @click="proposalnd=1" :class="{active:proposalnd==1}"> <view @click="proposalnd=1" :class="{active:proposalnd==1}">
@ -160,16 +160,19 @@
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="boxTime"> <view class="boxTime">
<view class="one"> <view class="one">
<picker mode="date" :end="endDate" @change="handStartTimeH" fields="time" <picker mode="date" :end="endDate" @change="handStartTimeH" :fields="fields"
:value="startTime?startTime:startDate"> :value="startTime?startTime:startDate">
<view class="uni-input mr-10">{{startTime?startTime:startDate}}</view> <view class="uni-input mr-10">{{startTime?startTime:startDate}}
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</view>
</picker> </picker>
<view class="center">~</view> <view class="center">~</view>
<picker mode="date" :end="endDate" @change="handEndTimeH" fields="time" <picker mode="date" :end="endDate" @change="handEndTimeH" :fields="fields"
:value="endTime?endTime:endDate"> :value="endTime?endTime:endDate">
<view class="uni-input mr-10">{{endTime?endTime:endDate}}</view> <view class="uni-input mr-10">{{endTime?endTime:endDate}}
<icon class="iconfont icon-arrow-down-bold"></icon> <icon class="iconfont icon-arrow-down-bold"></icon>
</view>
</picker> </picker>
</view> </view>
</view> </view>
@ -184,7 +187,7 @@
<view class="blockC"> <view class="blockC">
<view v-if="handTrue"> <view v-if="handTrue">
<qiunDataCharts type="area" :chartData="lineData" :canvas2d="true" canvasId="charts09" <qiunDataCharts type="area" :chartData="lineData" :canvas2d="true" canvasId="charts09"
:cHeight="480" :cWidth="680" :animation="false" :animation="false" :Width="340" :Height="250"
:opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" /> :opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" />
</view> </view>
</view> </view>
@ -199,11 +202,11 @@
<!-- 目标--> <!-- 目标-->
<view class="gridList"> <view class="gridList">
<view class="info"> <view class="info">
<view class="item" @click="navTo('/pages/history/history?acd_id='+ acd_id)"> <view class="item" @click="navTo('/pageTwo/history/history?acd_id='+ acd_id)">
<text class="t-icon-lishi t-icon"></text> <text class="t-icon-lishi t-icon"></text>
<view>历史记录</view> <view>历史记录</view>
</view> </view>
<view class="item" @click="navTo('/pages/compk/contrast?acd_id='+ acd_id)"> <view class="item" @click="navTo('/pageTwo/compk/contrast?acd_id='+ acd_id)">
<text class="t-icon-renshiduibifenxi t-icon"></text> <text class="t-icon-renshiduibifenxi t-icon"></text>
<view>数据对比</view> <view>数据对比</view>
</view> </view>
@ -250,10 +253,11 @@
} from "vuex"; } from "vuex";
import record from '@/element/manuallyAdd/record.vue'; import record from '@/element/manuallyAdd/record.vue';
import firstweight from '@/element/target/firstweight.vue'; import firstweight from '@/element/target/firstweight.vue';
import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'; import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'
export default { export default {
data() { data() {
return { return {
fields: "",
active: 1, active: 1,
acd_id: 2, acd_id: 2,
isDevice: 0, isDevice: 0,
@ -314,7 +318,12 @@
s_time: that.startDate, s_time: that.startDate,
e_time: that.endDate e_time: that.endDate
}) })
console.log("11111", options) // #ifdef APP-PLUS
that.fields = "time"
// #endif
// #ifndef APP-PLUS
that.fields = "day"
// #endif
}, },
onBackPress(options) { onBackPress(options) {
let that = this let that = this
@ -350,7 +359,7 @@
success: e => { success: e => {
that.$store.commit("changeBluetooth", true); that.$store.commit("changeBluetooth", true);
uni.navigateTo({ uni.navigateTo({
url: "/pages/devices/search?id=" + that.acd_id url: "/pageTwo/devices/search?id=" + that.acd_id
}) })
console.log('初始化蓝牙成功:' + e.errMsg); console.log('初始化蓝牙成功:' + e.errMsg);
}, },
@ -468,4 +477,9 @@
background-color: #F5F6FA; background-color: #F5F6FA;
min-height: 100vh; min-height: 100vh;
} }
.listC {
margin: 0;
width: 100%;
}
</style> </style>

6
pages/business/business.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="content"> <view class="content">
<view class="add" @click="handleAddDevice()">添加设备</view> <view class="add" @click="handleAddDevice()">添加设备</view>
<view class="list" v-if="list.length"> <view class="list">
<view class="item" v-for="(item,index) in list" @click="handleunbind(item,index)"> <view class="item" v-for="(item,index) in list" @click="handleunbind(item,index)">
<view class="left"> <view class="left">
<image :src="item.pic"></image> <image :src="item.pic"></image>
@ -29,7 +29,7 @@
computed: { computed: {
...mapState(["user", "userDeviceList"]), ...mapState(["user", "userDeviceList"]),
list() { list() {
return this.userDeviceList return this.userDeviceList
} }
}, },
onLoad() { onLoad() {
@ -72,7 +72,7 @@
}, },
handleAddDevice() { handleAddDevice() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/business/addDevice" url: "/pageTwo/business/addDevice"
}) })
}, },
} }

36
pages/home/home.vue
View File

@ -123,13 +123,16 @@
that.$store.commit('changeFamilay', res.data) that.$store.commit('changeFamilay', res.data)
if (res.data.length) { if (res.data.length) {
that.$store.dispatch('getUserInfo', { that.$store.dispatch('getUserInfo', {
aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[0].id aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[
0].id
}) })
that.$store.dispatch("getCardList", { that.$store.dispatch("getCardList", {
aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[0].id aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[
0].id
}) })
that.handleLabelList(res.data[0].id) that.handleLabelList(res.data[0].id)
that.handlePublicRecord(res.data[0].id) that.handlePublicRecord(res.data[0].id)
that.handleCityList()
} }
}).catch(err => {}) }).catch(err => {})
}, },
@ -145,6 +148,17 @@
} }
}) })
}, },
// 地区
handleCityList() {
let that = this
that.$model.getGradeList({}).then((res) => {
console.log("|全部地区", res.data)
if (res.code != 0) return
that.$store.commit('changeCityList', res.data.area_list)
that.$store.commit('changeGradeList', res.data.grade_list)
that.$store.commit('changeIdentityList', res.data.identity_list)
})
},
// 公共手动记录内容 // 公共手动记录内容
handlePublicRecord(id) { handlePublicRecord(id) {
let that = this let that = this
@ -160,7 +174,7 @@
// 设置数据页卡片 // 设置数据页卡片
handleCard() { handleCard() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/cardList/card" url: "/pageTwo/cardList/card"
}) })
}, },
// 报告页 // 报告页
@ -179,7 +193,7 @@
// 添加成员 // 添加成员
handleAddUser() { handleAddUser() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/my/userInfo" url: "/pageTwo/my/userInfo"
}) })
}, },
navTo(url) { navTo(url) {
@ -195,26 +209,20 @@
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.header { /deep/.header {
width: 100%; width: 100%;
height: 380rpx;
.top { .top {
color: #fff; color: #fff;
background: $maincolor ; background: $maincolor ;
} }
} }
.radius50 { /deep/.cityList {
width: 100%; margin-top: -36px;
height: 80px;
margin-top: -100rpx;
border-radius: 40px 40px 0 0;
background-color: #f7f7f7;
} }
.list { .list {
margin-top: -260rpx; margin-top: 0rpx;
padding: 0 10px; padding: 0;
} }
.blueBtn { .blueBtn {

6
pages/lunging/charts.vue
View File

@ -17,8 +17,8 @@
<view class="boxLine"> <view class="boxLine">
<view class="line" v-for="(item,index) in weightList"> <view class="line" v-for="(item,index) in weightList">
<view v-if="item.line.categories.length"> <view v-if="item.line.categories.length">
<qiunDataCharts type="column" :chartData="item.line" :canvas2d="true" :canvasId="item.id" <qiunDataCharts type="column" :chartData="item.line" :canvas2d="true" :canvasId="'lung'+index"
:cHeight="400" :cWidth="720" :animation="false" :Width="340" :Height="250" :animation="false"
:opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" /> :opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" />
</view> </view>
<view class="nolist" v-else> <view class="nolist" v-else>
@ -34,7 +34,7 @@
import { import {
mapState mapState
} from "vuex"; } from "vuex";
import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'; import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'
export default { export default {
components: { components: {
qiunDataCharts, qiunDataCharts,

4
pages/lunging/vitalcapacity.vue
View File

@ -40,13 +40,13 @@
</view> </view>
<view class="name">运动曲线</view> <view class="name">运动曲线</view>
</view> </view>
<view class="item" @click="navTo('/pages/history/history?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/history/history?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="../../static/add.png"></image> <image src="../../static/add.png"></image>
</view> </view>
<view class="name">历史记录</view> <view class="name">历史记录</view>
</view> </view>
<view class="item" @click="navTo('/pages/compk/contrast?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/compk/contrast?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="../../static/pk.png"></image> <image src="../../static/pk.png"></image>
</view> </view>

12
pages/my/me.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="content"> <view class="content">
<!-- 头部 --> <!-- 头部 -->
<view class="top" @click="navTo('/pages/setting/setting')"> <view class="top" @click="navTo('/pageTwo/setting/setting')">
<view class="headimg"> <view class="headimg">
<image :src="user.head_pic" class="image"></image> <image :src="user.head_pic" class="image"></image>
<view class="size20 bold">{{user.nickname}}</view> <view class="size20 bold">{{user.nickname}}</view>
@ -10,7 +10,7 @@
</view> </view>
<!-- --> <!-- -->
<view class="wxlist borderRadius"> <view class="wxlist borderRadius">
<view class="list" @click="navTo('/pages/my/manage')"> <view class="list" @click="navTo('/pageTwo/my/manage')">
<view class="item border-bottom"> <view class="item border-bottom">
<view class="left"> <view class="left">
<view class="name">成员管理</view> <view class="name">成员管理</view>
@ -30,7 +30,7 @@
</view> </view>
</view> </view>
</view> --> </view> -->
<view class="list" @click="navTo('/pages/score/history')"> <view class="list" @click="navTo('/pageTwo/score/history')">
<view class="item border-bottom"> <view class="item border-bottom">
<view class="left"> <view class="left">
<view class="name">估分历史</view> <view class="name">估分历史</view>
@ -50,7 +50,8 @@
</view> </view>
</view> </view>
</view> --> </view> -->
<view class="list" @click="navTo('/pages/my/about')"> <!-- #ifdef APP-PLUS -->
<view class="list" @click="navTo('/pageTwo/my/about')">
<view class="item border-bottom"> <view class="item border-bottom">
<view class="left"> <view class="left">
<view class="name">关于我们</view> <view class="name">关于我们</view>
@ -60,6 +61,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- #endif -->
<!-- <view class="list" @click="navTo('/pages/login/forgetPassword?type=forgetPassword')"> <!-- <view class="list" @click="navTo('/pages/login/forgetPassword?type=forgetPassword')">
<view class="item border-bottom"> <view class="item border-bottom">
<view class="left"> <view class="left">
@ -145,7 +147,7 @@
uni.setStorageSync('aan_id', null) uni.setStorageSync('aan_id', null)
uni.clearStorageSync() uni.clearStorageSync()
uni.reLaunch({ uni.reLaunch({
url: "/pages/login/login" url: "/pageTwo/login/login"
}) })
}) })
} else if (res.cancel) { } else if (res.cancel) {

9
pages/score/score.vue
View File

@ -6,10 +6,10 @@
<view class="box"> <view class="box">
<view class="title bold">本次估分成绩为</view> <view class="title bold">本次估分成绩为</view>
<view class="charts mt-15"> <view class="charts mt-15">
<qiun-data-charts type="arcbar" :chartData="chartData" /> <qiun-data-charts type="arcbar" :chartData="chartData" :Height="140" :Width="140"/>
<view class="name">{{score?score:'--'}}</view> <view class="name">{{score?score:'--'}}</view>
</view> </view>
<view class="btn history" @click="navTo('/pages/score/history')">估分历史</view> <view class="btn history" @click="navTo('/pageTwo/score/history')">估分历史</view>
<view class="title bold" v-if="Max_score">该地区体育总成绩为:{{Max_score}}分</view> <view class="title bold" v-if="Max_score">该地区体育总成绩为:{{Max_score}}分</view>
</view> </view>
<!-- --> <!-- -->
@ -19,12 +19,12 @@
<view class="indexCarList"> <view class="indexCarList">
<view class="card" v-for="(ite,ind) in item.list"> <view class="card" v-for="(ite,ind) in item.list">
<view class="title"> <view class="title">
<view class="name">{{ite.name}}</view> <view class="name ">{{ite.name}}</view>
<view class="right" v-if="ite.is_choice!=0" @click="handleHistory(ite)">选择项目</view> <view class="right" v-if="ite.is_choice!=0" @click="handleHistory(ite)">选择项目</view>
</view> </view>
<!-- 列表 --> <!-- 列表 -->
<view class="item3" v-for="(it,ik) in ite.list" :key="ik" v-if="!isresult"> <view class="item3" v-for="(it,ik) in ite.list" :key="ik" v-if="!isresult">
<view class="name">{{it.name}}<uni-icons type="info" color="#f0ad4e" size="20" <view class="name overflow">{{it.name}}<uni-icons type="info" color="#f0ad4e" size="20"
@click="handleTips(it.describe)" v-if="it.describe"></uni-icons></view> @click="handleTips(it.describe)" v-if="it.describe"></uni-icons></view>
<view class="weight"> <view class="weight">
<view class="input"> <view class="input">
@ -359,6 +359,7 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/scss/score.scss"; @import "@/scss/score.scss";
.content { .content {
min-height: 100vh; min-height: 100vh;
padding-bottom: 15px; padding-bottom: 15px;

4
pages/skiping/charts.vue
View File

@ -18,7 +18,7 @@
<view class="line" v-for="(item,index) in weightList"> <view class="line" v-for="(item,index) in weightList">
<view v-if="item.line.categories.length"> <view v-if="item.line.categories.length">
<qiunDataCharts type="column" :chartData="item.line" :canvas2d="true" :canvasId="item.id" <qiunDataCharts type="column" :chartData="item.line" :canvas2d="true" :canvasId="item.id"
:cHeight="480" :cWidth="680" :animation="false" :Width="340" :Height="250" :animation="false"
:opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" /> :opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" />
</view> </view>
<view class="line" v-else> <view class="line" v-else>
@ -36,7 +36,7 @@
import { import {
mapState mapState
} from "vuex"; } from "vuex";
import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'; import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'
export default { export default {
components: { components: {
qiunDataCharts, qiunDataCharts,

48
pages/skiping/skip.vue
View File

@ -15,9 +15,9 @@
</view> </view>
<!-- --> <!-- -->
<view class="tabbar"> <view class="tabbar">
<view @click="active=1" :class="[active==1?'active':'']">自由训练</view> <view @click="active=1" :class="[active==1?'active':'']">自由跳</view>
<view @click="active=2" :class="[active==2?'active':'']">定时训练</view> <view @click="active=3" :class="[active==3?'active':'']">倒计数</view>
<view @click="active=3" :class="[active==3?'active':'']">定数训练</view> <view @click="active=2" :class="[active==2?'active':'']">倒计时</view>
</view> </view>
<!--自由训练 --> <!--自由训练 -->
<view class="box1 box" v-if="active==1"> <view class="box1 box" v-if="active==1">
@ -89,13 +89,13 @@
</view> </view>
<view class="name">运动曲线</view> <view class="name">运动曲线</view>
</view> </view>
<view class="item" @click="navTo('/pages/history/history?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/history/history?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="@/static/add.png"></image> <image src="@/static/add.png"></image>
</view> </view>
<view class="name">历史记录</view> <view class="name">历史记录</view>
</view> </view>
<view class="item" @click="navTo('/pages/compk/contrast?acd_id='+acd_id)"> <view class="item" @click="navTo('/pageTwo/compk/contrast?acd_id='+acd_id)">
<view class="image"> <view class="image">
<image src="@/static/pk.png"></image> <image src="@/static/pk.png"></image>
</view> </view>
@ -126,6 +126,7 @@
active: 1, active: 1,
acd_id: 6, acd_id: 6,
weight: 50, weight: 50,
Unload: false,
disabled: false, disabled: false,
isDevice: 0, isDevice: 0,
isConnection: false, isConnection: false,
@ -169,6 +170,7 @@
// 跳绳页返回 // 跳绳页返回
if (options && options.info) { if (options && options.info) {
let data = JSON.parse(options.info) let data = JSON.parse(options.info)
that.Unload = true
that.active = data.active that.active = data.active
that.deviceId = data.deviceId that.deviceId = data.deviceId
that.serviceId = data.serviceId that.serviceId = data.serviceId
@ -201,11 +203,13 @@
console.log('监听到事件来自 updateData ，携带参数为：' + info); console.log('监听到事件来自 updateData ，携带参数为：' + info);
}) })
}, },
onBackPress(options) { // #ifdef APP-PLUS
onBackPress() {
let that = this let that = this
that.islink = -1 that.islink = -1
clearTimeout(myTime); clearTimeout(myTime);
that.isConnection = false that.isConnection = false
console.log("返回首页onBackPress")
that.$Bluetooth.closeBluetoothAdapter() that.$Bluetooth.closeBluetoothAdapter()
that.$Bluetooth.closeBLEConnection(that.deviceId) that.$Bluetooth.closeBLEConnection(that.deviceId)
that.$Bluetooth.stopBluetoothDevicesDiscovery() that.$Bluetooth.stopBluetoothDevicesDiscovery()
@ -216,9 +220,32 @@
url: '/pages/home/home' url: '/pages/home/home'
}) })
}, 300) }, 300)
console.log("返回首页")
return true return true
}, },
// #endif
// #ifndef APP-PLUS
onUnload: function() {
let that = this
// clearTimeout(myTime);
// that.islink = -1
// that.isConnection = false
// that.$Bluetooth.closeBluetoothAdapter()
// that.$Bluetooth.closeBLEConnection(that.deviceId)
// that.$Bluetooth.stopBluetoothDevicesDiscovery()
// that.$store.commit("changeBluetooth", false);
// that.$store.commit("changeConnected", false);
// setTimeout(() => {
uni.switchTab({
url: '/pages/home/home'
})
// }, 300)
let pages = getCurrentPages()
let prevPage = pages[pages.length - 2]
console.log("prevPage", prevPage)
uni.$off("updateData")
console.log("返回首页onUnload")
},
// #endif
watch: { watch: {
devicesList() { devicesList() {
let that = this let that = this
@ -333,6 +360,9 @@
}, },
fail: res => { fail: res => {
console.log('获取设备的UUID失败:', res) console.log('获取设备的UUID失败:', res)
that.islink = -1
clearTimeout(myTime);
that.isConnection = false
} }
}); });
}, },
@ -396,6 +426,7 @@
success(res) { success(res) {
uni.onBLECharacteristicValueChange(function(res) { uni.onBLECharacteristicValueChange(function(res) {
let value = that.$tools.ab2hex(res.value, ""); let value = that.$tools.ab2hex(res.value, "");
console.log("1111跳", value)
if (value == '5a05090169') { //模式设置成功 if (value == '5a05090169') { //模式设置成功
let info = { let info = {
active: that.active, active: that.active,
@ -408,7 +439,8 @@
} }
setTimeout(function() { setTimeout(function() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/devices/PCT01?info=" + JSON.stringify(info) url: "/pageTwo/devices/PCT01?info=" + JSON
.stringify(info)
}) })
}, 200) }, 200)
} }

51
scss/common.scss
View File

@ -451,6 +451,53 @@
} }
} }
} }
.visible {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 99;
background-color: rgba(0, 0, 0, 0.6);
.groupBtn {
height: 50px;
line-height: 50px;
background-color: #fff;
display: flex;
justify-content: space-between;
padding: 0 15px;
border-bottom: 1px solid #dfdfdf;
position: absolute;
left: 0;
right: 0;
bottom: 45%;
z-index: 999;
view {
height: 30px;
line-height: 30px;
padding: 0 10px;
background-color: #dfdfdf;
border-radius: 5px;
margin-top: 10px;
}
.sure {
background-color: $textcolor;
color: #fff !important;
}
}
.picker-view {
width: 100%;
height: 45%;
bottom: 0;
position: absolute;
background-color: #fff;
}
}
.header { .header {
width: 100%; width: 100%;
height: 240rpx; height: 240rpx;
@ -734,18 +781,16 @@
font-size: 28rpx; font-size: 28rpx;
align-items: center; align-items: center;
} }
.name2 { .name2 {
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
color: #333; color: #333;
} }
} }
.item { .item {
padding: 15px 0; padding: 7px 0;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
text-align: center; text-align: center;

BIN
static/Fill0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
static/Fill1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
static/Fill2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

2
store/actions.js
View File

@ -135,7 +135,7 @@ export default {
}) { }) {
return model.getUserDeviceList({}).then(res => { return model.getUserDeviceList({}).then(res => {
console.log("用户设备", res) console.log("用户设备", res)
if (res.data && res.data.list.length) { if (res.data) {
commit('changeUserDeviceList', res.data.list) commit('changeUserDeviceList', res.data.list)
} else { } else {
commit('changeUserDeviceList', []) commit('changeUserDeviceList', [])

17
store/index.js
View File

@ -57,7 +57,9 @@ export default new Vuex.Store({
versionUrl: null, versionUrl: null,
platform: "" platform: ""
}, },
cityList: [],
gradeList: [],
identityList: []
}, },
// mutations: Store中更改state数据状态的唯一方法(必须是同步函数) // mutations: Store中更改state数据状态的唯一方法(必须是同步函数)
mutations: { mutations: {
@ -162,8 +164,17 @@ export default new Vuex.Store({
// 公共卡片 // 公共卡片
changeLabelList(state, newData) { changeLabelList(state, newData) {
state.labelList = newData state.labelList = newData
} },
// 城市
changeCityList(state, newData) {
state.cityList = newData
},
changeGradeList(state, newData) {
state.gradeList = newData
},
changeIdentityList(state, newData) {
state.identityList = newData
},
}, },
// 模块化vuex // 模块化vuex
modules: {}, modules: {},

2
toolJs/Bluetooth.js
View File

@ -140,7 +140,7 @@ function handleDevicesMac(device, acd_id) {
success: e => { success: e => {
$store.commit("changeBluetooth", true); $store.commit("changeBluetooth", true);
uni.navigateTo({ uni.navigateTo({
url: "/pages/devices/search?id=" + acd_id + '&device=' + device url: "/pageTwo/devices/search?id=" + acd_id + '&device=' + device
}) })
console.log('初始化蓝牙成功:' + e.errMsg); console.log('初始化蓝牙成功:' + e.errMsg);
}, },

4
toolJs/https.js
View File

@ -1,7 +1,7 @@
import tools from '@/toolJs/tools.js' import tools from '@/toolJs/tools.js'
import store from '../store' import store from '../store'
// let baseUrl = "http://tc.pcxbc.com" // let baseUrl = "http://tc.pcxbc.com"
let baseUrl = "http://tc.pcxbc.com/testedition" let baseUrl = "https://tc.pcxbc.com/testedition"
const httpRequest = (url, method = "get", data) => { const httpRequest = (url, method = "get", data) => {
data.token = uni.getStorageSync('token') data.token = uni.getStorageSync('token')
data.aan_id = uni.getStorageSync('aan_id') data.aan_id = uni.getStorageSync('aan_id')
@ -25,7 +25,7 @@ const httpRequest = (url, method = "get", data) => {
uni.setStorageSync('aan_id', null) uni.setStorageSync('aan_id', null)
setTimeout(function() { setTimeout(function() {
uni.reLaunch({ uni.reLaunch({
url: "/pages/login/login" url: "/pageTwo/login/login"
}) })
}, 2000) }, 2000)
return return

2
toolJs/model.js
View File

@ -97,7 +97,7 @@ export default {
return res return res
}) })
}, },
getGradeList(param) { // 获取年级列表 getGradeList(param) { // 获取年级、身份、地区列表
return http.post("/get_grade_list", param).then(res => { return http.post("/get_grade_list", param).then(res => {
return res return res
}) })

3380
uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
View File

File diff suppressed because it is too large Load Diff

864
uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
View File

@ -16,563 +16,407 @@
* *
*/ */
// 通用配置项
// 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性 // 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc']; const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
//事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改 const cfe = {
const formatDateTime = (timeStamp, returnType) => { //demotype为自定义图表类型
var date = new Date(); "type": ["pie", "ring", "rose", "funnel", "line", "column", "area", "radar", "gauge","candle","demotype"],
date.setTime(timeStamp * 1000); //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型例如最后的"demotype"
var y = date.getFullYear(); "categories": ["line", "column", "area", "radar", "gauge", "candle","demotype"],
var m = date.getMonth() + 1; //instance为实例变量承载属性，option为eopts承载属性，不要删除
m = m < 10 ? ('0' + m) : m;
var d = date.getDate();
d = d < 10 ? ('0' + d) : d;
var h = date.getHours();
h = h < 10 ? ('0' + h) : h;
var minute = date.getMinutes();
var second = date.getSeconds();
minute = minute < 10 ? ('0' + minute) : minute;
second = second < 10 ? ('0' + second) : second;
if (returnType == 'full') {
return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
}
if (returnType == 'y-m-d') {
return y + '-' + m + '-' + d;
}
if (returnType == 'h:m') {
return h + ':' + minute;
}
if (returnType == 'h:m:s') {
return h + ':' + minute + ':' + second;
}
return [y, m, d, h, minute, second];
}
module.exports = {
//demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
"type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "area", "radar", "gauge",
"candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype"
],
"range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "区域图", "雷达图", "仪表盘", "K线图", "混合图",
"时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型"
],
//增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
//自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
"categories": ["line", "column", "area", "radar", "gauge", "candle", "mix", "demotype"],
//instance为实例变量承载属性，不要删除
"instance": {}, "instance": {},
//option为opts及eopts承载属性，不要删除
"option": {}, "option": {},
//下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换 //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
"formatter": { "formatter":{
"yAxisDemo1": function(val) { "tooltipDemo1":function(res){
return val + '元' let result = ''
}, for (let i in res) {
"yAxisDemo2": function(val) { if (i == 0) {
return val.toFixed(2) result += res[i].axisValueLabel + '年销售额'
}, }
"xAxisDemo1": function(val) { let value = '--'
return val + '年' if (res[i].data !== null) {
}, value = res[i].data
"xAxisDemo2": function(val) { }
return formatDateTime(val, 'h:m') // #ifdef H5
}, result += '\n' + res[i].seriesName + '：' + value + ' 万元'
"seriesDemo1": function(val) { // #endif
return val + '元'
}, // #ifdef APP-PLUS
"tooltipDemo1": function(item, category, index, opts) { result += '<br/>' + res[i].marker + res[i].seriesName + '：' + value + ' 万元'
if (index == 0) { // #endif
return '随便用' + item.data + '年' }
} else { return result;
return '其他我没改' + item.data + '天' },
} legendFormat:function(name){
}, return "自定义图例+"+name;
"pieDemo": function(val, index, series) { },
if (index !== undefined) { yAxisFormatDemo:function (value, index) {
return series[index].name + '：' + series[index].data + '元' return value + '元';
} },
}, seriesFormatDemo:function(res){
}, return res.name + '年' + res.value + '元';
//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。 }
"demotype": { },
//我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置 //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在eopts参数，会将demotype与eopts中option合并后渲染图表。
"type": "line", "demotype":{
"color": color,
//在这里填写echarts的option即可
},
//下面是自定义配置，请添加项目所需的通用配置
"column": {
"color": color, "color": color,
"padding": [15, 10, 0, 15], "title": {
"text": ''
},
"tooltip": {
"trigger": 'axis'
},
"grid": {
"top": 30,
"bottom": 50,
"right": 15,
"left": 40
},
"legend": {
"bottom": 'left',
},
"toolbox": {
"show": false,
},
"xAxis": { "xAxis": {
"disableGrid": true, "type": 'category',
"axisLabel": {
"color": '#666666'
},
"axisLine": {
"lineStyle": {
"color": '#CCCCCC'
}
},
"boundaryGap": true,
"data": []
}, },
"yAxis": { "yAxis": {
"gridType": "dash", "type": 'value',
"dashLength": 2, "axisTick": {
"show": false,
},
"axisLabel": {
"color": '#666666'
},
"axisLine": {
"lineStyle": {
"color": '#CCCCCC'
}
},
}, },
"legend": {}, "seriesTemplate": {
"extra": { "name": '',
"line": { "type": 'bar',
"type": "curve", "data": [],
"width": 2 "barwidth": 20,
"label": {
"show": true,
"color": "#666666",
"position": 'top',
}, },
} },
}, },
//下面是自定义配置，请添加项目所需的通用配置 "line": {
"pie": {
"type": "pie",
"color": color, "color": color,
"padding": [5, 5, 5, 5], "title": {
"extra": { "text": ''
"pie": { },
"activeOpacity": 0.5, "tooltip": {
"activeRadius": 10, "trigger": 'axis'
"offsetAngle": 0, },
"labelWidth": 15, "grid": {
"border": true, "top": 30,
"borderWidth": 3, "bottom": 50,
"borderColor": "#FFFFFF" "right": 15,
"left": 40
},
"legend": {
"bottom": 'left',
},
"toolbox": {
"show": false,
},
"xAxis": {
"type": 'category',
"axisLabel": {
"color": '#666666'
}, },
} "axisLine": {
"lineStyle": {
"color": '#CCCCCC'
}
},
"boundaryGap": true,
"data": []
},
"yAxis": {
"type": 'value',
"axisTick": {
"show": false,
},
"axisLabel": {
"color": '#666666'
},
"axisLine": {
"lineStyle": {
"color": '#CCCCCC'
}
},
},
"seriesTemplate": {
"name": '',
"type": 'line',
"data": [],
"barwidth": 20,
"label": {
"show": true,
"color": "#666666",
"position": 'top',
},
},
},
"area": {
"color": color,
"title": {
"text": ''
},
"tooltip": {
"trigger": 'axis'
},
"grid": {
"top": 30,
"bottom": 50,
"right": 15,
"left": 40
},
"legend": {
"bottom": 'left',
},
"toolbox": {
"show": false,
},
"xAxis": {
"type": 'category',
"axisLabel": {
"color": '#666666'
},
"axisLine": {
"lineStyle": {
"color": '#CCCCCC'
}
},
"boundaryGap": true,
"data": []
},
"yAxis": {
"type": 'value',
"axisTick": {
"show": false,
},
"axisLabel": {
"color": '#666666'
},
"axisLine": {
"lineStyle": {
"color": '#CCCCCC'
}
},
},
"seriesTemplate": {
"name": '',
"type": 'line',
"data": [],
"areaStyle": {},
"label": {
"show": true,
"color": "#666666",
"position": 'top',
},
},
},
"pie": {
"color": color,
"title": {
"text": ''
},
"tooltip": {
"trigger": 'item'
},
"grid": {
"top": 40,
"bottom": 30,
"right": 15,
"left": 15
},
"legend": {
"bottom": 'left',
},
"seriesTemplate": {
"name": '',
"type": 'pie',
"data": [],
"radius": '50%',
"label": {
"show": true,
"color": "#666666",
"position": 'top',
},
},
}, },
"ring": { "ring": {
"type": "ring",
"color": color, "color": color,
"padding": [5, 5, 5, 5],
"rotate": false,
"dataLabel": true,
"legend": {
"show": true,
"position": "right",
"lineHeight": 25,
},
"title": { "title": {
"name": "收益率", "text": ''
"fontSize": 15,
"color": "#666666"
}, },
"subtitle": { "tooltip": {
"name": "70%", "trigger": 'item'
"fontSize": 25,
"color": "#7cb5ec"
}, },
"extra": { "grid": {
"ring": { "top": 40,
"ringWidth": 30, "bottom": 30,
"activeOpacity": 0.5, "right": 15,
"activeRadius": 10, "left": 15
"offsetAngle": 0, },
"labelWidth": 15, "legend": {
"border": true, "bottom": 'left',
"borderWidth": 3, },
"borderColor": "#FFFFFF" "seriesTemplate": {
"name": '',
"type": 'pie',
"data": [],
"radius": ['40%', '70%'],
"avoidLabelOverlap": false,
"label": {
"show": true,
"color": "#666666",
"position": 'top',
},
"labelLine": {
"show": true
}, },
}, },
}, },
"rose": { "rose": {
"type": "rose",
"color": color, "color": color,
"padding": [5, 5, 5, 5], "title": {
"legend": { "text": ''
"show": true, },
"position": "left", "tooltip": {
"lineHeight": 25, "trigger": 'item'
},
"legend": {
"top": 'bottom'
},
"seriesTemplate": {
"name": '',
"type": 'pie',
"data": [],
"radius": "55%",
"center": ['50%', '50%'],
"roseType": 'area',
}, },
"extra": {
"rose": {
"type": "area",
"minRadius": 50,
"activeOpacity": 0.5,
"activeRadius": 10,
"offsetAngle": 0,
"labelWidth": 15,
"border": false,
"borderWidth": 2,
"borderColor": "#FFFFFF"
},
}
},
"word": {
"type": "word",
"color": color,
"extra": {
"word": {
"type": "normal",
"autoColors": false
}
}
}, },
"funnel": { "funnel": {
"type": "funnel",
"color": color,
"padding": [15, 15, 0, 15],
"extra": {
"funnel": {
"activeOpacity": 0.3,
"activeWidth": 10,
"border": true,
"borderWidth": 2,
"borderColor": "#FFFFFF",
"fillOpacity": 1,
"labelAlign": "right"
},
}
},
"map": {
"type": "map",
"color": color,
"padding": [0, 0, 0, 0],
"dataLabel": true,
"extra": {
"map": {
"border": true,
"borderWidth": 1,
"borderColor": "#666666",
"fillOpacity": 0.6,
"activeBorderColor": "#F04864",
"activeFillColor": "#FACC14",
"activeFillOpacity": 1
},
}
},
"arcbar": {
"type": "arcbar",
"color": color, "color": color,
"title": { "title": {
"name": "百分比", "text": ''
"fontSize": 25,
"color": "#00FF00"
}, },
"subtitle": { "tooltip": {
"name": "默认标题", "trigger": 'item',
"fontSize": 15, "formatter": "{b} : {c}%"
"color": "#666666"
},
"extra": {
"arcbar": {
"type": "default",
"width": 12,
"backgroundColor": "#E9E9E9",
"startAngle": 0.75,
"endAngle": 0.25,
"gap": 2
}
}
},
"line": {
"type": "line",
"color": color,
"padding": [15, 10, 0, 15],
"xAxis": {
"disableGrid": true,
},
"yAxis": {
"gridType": "dash",
"dashLength": 2,
},
"legend": {},
"extra": {
"line": {
"type": "straight",
"width": 2
},
}
},
"tline": {
"type": "line",
"color": color,
"padding": [15, 10, 0, 15],
"xAxis": {
"disableGrid": false,
"boundaryGap": "justify",
},
"yAxis": {
"gridType": "dash",
"dashLength": 2,
"data": [{
"min": 0,
"max": 80
}]
},
"legend": {},
"extra": {
"line": {
"type": "curve",
"width": 2
},
}
},
"tarea": {
"type": "area",
"color": color,
"padding": [0, 15, 15, 5],
"xAxis": {
"disableGrid": true,
"boundaryGap": "justify",
},
"yAxis": {
"gridType": "dash",
"dashLength": 2,
"data": [{
"min": 0,
"max": 80
}]
},
"legend": {},
"extra": {
"area": {
"type": "curve",
"opacity": 0.2,
"addLine": true,
"width": 2,
"gradient": true
},
}
},
"column": {
"type": "column",
"color": color,
"padding": [15, 15, 0, 5],
"xAxis": {
"disableGrid": true,
},
"yAxis": {
"gridType": "dash",
"disableGrid": true,
"gridColor": '#ffffff',
"data": [{
"tofix": 1,
"min": 0
}],
},
"legend": {},
"extra": {
"column": {
"type": "group",
"width": 20,
"seriesGap": 5,
"meterFillColor": "#FFFFFF",
"activeBgColor": "#000000",
"activeBgOpacity": 0.5,
"barBorderCircle": true,
"linearType": "opacity",
// "customColor": "#ff9f40",
"linearOpacity": 1,
},
}
},
"area": {
"type": "area",
"color": color,
"padding": [20, 15, 5, 10],
"xAxis": {
"disableGrid": true,
},
"yAxis": {
"gridType": "dash",
"disableGrid": true,
"gridColor": '#ffffff',
"data": [{
"tofix": 1,
"min": 0
}],
}, },
"legend": { "legend": {
"show": false, "top": 'bottom'
}, },
"extra": { "seriesTemplate": {
"area": { "name": '',
"type": "curve", "type": 'funnel',
"opacity": 0.2, "left": '10%',
"addLine": true, "top": 60,
"width": 1, "bottom": 60,
"gradient": true "width": '80%',
"min": 0,
"max": 100,
"minSize": '0%',
"maxSize": '100%',
"sort": 'descending',
"gap": 2,
"label": {
"show": true,
"position": 'inside'
}, },
} "labelLine": {
}, "length": 10,
"radar": { "lineStyle": {
"type": "radar", "width": 1,
"color": color, "type": 'solid'
"padding": [5, 5, 5, 5], }
"legend": { },
"show": true, "itemStyle": {
"position": "right", "bordercolor": '#fff',
"lineHeight": 25, "borderwidth": 1
},
"emphasis": {
"label": {
"fontSize": 20
}
},
"data": [],
}, },
"extra": {
"radar": {
"gridType": "radar",
"gridColor": "#CCCCCC",
"gridCount": 3,
"opacity": 0.2,
"max": 200
},
}
}, },
"gauge": { "gauge": {
"type": "gauge",
"color": color, "color": color,
"title": { "tooltip": {
"name": "66Km/H", "formatter": '{a} <br/>{b} : {c}%'
"fontSize": 25, },
"color": "#2fc25b", "seriesTemplate": {
"offsetY": 50 "name": '业务指标',
"type": 'gauge',
"detail": {"formatter": '{value}%'},
"data": [{"value": 50, "name": '完成率'}]
}, },
"subtitle": {
"name": "实时速度",
"fontSize": 15,
"color": "#1890ff",
"offsetY": -50
},
"extra": {
"gauge": {
"type": "default",
"width": 30,
"labelColor": "#666666",
"startAngle": 0.75,
"endAngle": 0.25,
"startNumber": 0,
"endNumber": 100,
"labelFormat": "",
"splitLine": {
"fixRadius": 0,
"splitNumber": 10,
"width": 30,
"color": "#FFFFFF",
"childNumber": 5,
"childWidth": 12
},
"pointer": {
"width": 24,
"color": "auto"
}
}
}
}, },
"candle": { "candle": {
"type": "candle",
"color": color,
"padding": [15, 15, 0, 15],
"enableScroll": true,
"enableMarkLine": true,
"dataLabel": false,
"xAxis": { "xAxis": {
"labelCount": 4,
"itemCount": 40,
"disableGrid": true,
"gridColor": "#CCCCCC",
"gridType": "solid",
"dashLength": 4,
"scrollShow": true,
"scrollAlign": "left",
"scrollColor": "#A6A6A6",
"scrollBackgroundColor": "#EFEBEF"
},
"yAxis": {},
"legend": {},
"extra": {
"candle": {
"color": {
"upLine": "#f04864",
"upFill": "#f04864",
"downLine": "#2fc25b",
"downFill": "#2fc25b"
},
"average": {
"show": true,
"name": ["MA5", "MA10", "MA30"],
"day": [5, 10, 20],
"color": ["#1890ff", "#2fc25b", "#facc14"]
}
},
"markLine": {
"type": "dash",
"dashLength": 5,
"data": [{
"value": 2150,
"lineColor": "#f04864",
"showLabel": true
},
{
"value": 2350,
"lineColor": "#f04864",
"showLabel": true
}
]
}
}
},
"mix": {
"type": "mix",
"color": color,
"padding": [15, 15, 0, 15],
"xAxis": {
"disableGrid": true,
},
"yAxis": {
"disabled": false,
"disableGrid": false,
"splitNumber": 5,
"gridType": "dash",
"dashLength": 4,
"gridColor": "#CCCCCC",
"padding": 10,
"showTitle": true,
"data": [] "data": []
}, },
"legend": {}, "yAxis": {},
"extra": {
"mix": {
"column": {
"width": 20
}
},
}
},
"scatter": {
"type": "scatter",
"color": color, "color": color,
"padding": [15, 15, 0, 15], "title": {
"dataLabel": false, "text": ''
"xAxis": {
"disableGrid": false,
"gridType": "dash",
"splitNumber": 5,
"boundaryGap": "justify",
"min": 0
}, },
"yAxis": { "dataZoom": [{
"disableGrid": false, "type": 'inside',
"gridType": "dash", "xAxisIndex": [0, 1],
}, "start": 10,
"legend": {}, "end": 100
"extra": {
"scatter": {},
}
},
"bubble": {
"type": "bubble",
"color": color,
"padding": [15, 15, 0, 15],
"xAxis": {
"disableGrid": false,
"gridType": "dash",
"splitNumber": 5,
"boundaryGap": "justify",
"min": 0,
"max": 250
},
"yAxis": {
"disableGrid": false,
"gridType": "dash",
"data": [{
"min": 0,
"max": 150
}]
},
"legend": {},
"extra": {
"bubble": {
"border": 2,
"opacity": 0.5,
}, },
} {
"show": true,
"xAxisIndex": [0, 1],
"type": 'slider',
"bottom": 10,
"start": 10,
"end": 100
}
],
"seriesTemplate": {
"name": '',
"type": 'k',
"data": [],
},
} }
} }
export default cfe;

28
uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
View File

@ -237,13 +237,13 @@ const cfu = {
"color": color, "color": color,
"title": { "title": {
"name": "", "name": "",
"fontSize": 22, "fontSize": 25,
"color": "#00FF00" "color": ""
}, },
"subtitle": { "subtitle": {
"name": "", "name": "",
"fontSize": 15, "fontSize": 15,
"color": "#666666" "color": ""
}, },
"extra": { "extra": {
"arcbar": { "arcbar": {
@ -340,17 +340,27 @@ const cfu = {
"gridType": "dash", "gridType": "dash",
"disableGrid": true, "disableGrid": true,
"gridColor": '#ffffff', "gridColor": '#ffffff',
"data": [{
"tofix": 1,
"min": 0
}],
"data": [{ "data": [{
"min": 0 "min": 0
}] }]
}, },
"legend": {},
"extra": { "extra": {
"column": { "column": {
"type": "group", "type": "group",
"width": 30, "width": 20,
"seriesGap": 5,
"meterFillColor": "#FFFFFF",
"activeBgColor": "#000000", "activeBgColor": "#000000",
"activeBgOpacity": 0.08 "activeBgOpacity": 0.5,
"barBorderCircle": true,
"linearType": "opacity",
// "customColor": "#ff9f40",
"linearOpacity": 1,
}, },
} }
}, },
@ -400,7 +410,7 @@ const cfu = {
"area": { "area": {
"type": "area", "type": "area",
"color": color, "color": color,
"padding": [15, 15, 0, 15], "padding": [20, 15, 5, 10],
"xAxis": { "xAxis": {
"disableGrid": true, "disableGrid": true,
}, },
@ -421,8 +431,8 @@ const cfu = {
"type": "curve", "type": "curve",
"opacity": 0.2, "opacity": 0.2,
"addLine": true, "addLine": true,
"width": 2, "width": 1,
"gradient": false, "gradient": true,
"activeType": "hollow" "activeType": "hollow"
}, },
} }

2
uni_modules/qiun-data-charts/static/app-plus/echarts.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
uni_modules/qiun-data-charts/static/h5/echarts.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/body/body.js.map vendored Normal file
View File

@ -0,0 +1 @@
{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,aAAI,CAAC,C","file":"body/body.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './body/body.vue'\ncreatePage(Page)"],"sourceRoot":""}

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/element/drawer.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/element/headerIndex.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/element/manuallyAdd/record.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/element/ren-calendar/ren-calendar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/element/slider-fraction.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/element/target/firstweight.js.map vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/PublicCards/PublicCards.js.map vendored Normal file
View File

@ -0,0 +1 @@
{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,oBAAI,CAAC,C","file":"pageTwo/PublicCards/PublicCards.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pageTwo/PublicCards/PublicCards.vue'\ncreatePage(Page)"],"sourceRoot":""}

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/PublicCards/charts.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/PublicCards/contrast.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/PublicCards/history.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/PublicCards/pkdetail.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/body/body.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/business/addDevice.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/business/search.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/cardList/card.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/compk/contrast.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/compk/pkdetail.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/devices/G02.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/devices/PCT01.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/devices/PCV02.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/devices/search.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/history/history.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/history/historyDetail.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/login/forgetPassword.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/login/login.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/message/list.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More