diff --git a/CHANGELOG.md b/CHANGELOG.md
index a30a6e7..c1b53f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-12-31)
+# 0.1.0 (2022-01-19)
### 🌟 新功能
范围|描述|commitId
@@ -168,6 +168,7 @@
- | 修改角色栏组件 | [a54c601](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/a54c601)
- | 修改角色栏骨架屏 | [c18efb3](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/c18efb3)
- | 修改试题查询判断 | [4128f3d](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/4128f3d)
+ 修改部分bug | 修改部分bug | [92bdab1](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/92bdab1)
- | 修改长者信息回显bug | [ef1b4bf](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/ef1b4bf)
- | 切换到默认项目角色没有激活状态的bug | [438d448](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/438d448)
- | 切换日历时查询小红点 | [7091789](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/7091789)
diff --git a/src/components/Wifi/Wifi.vue b/src/components/Wifi/Wifi.vue
new file mode 100644
index 0000000..f119302
--- /dev/null
+++ b/src/components/Wifi/Wifi.vue
@@ -0,0 +1,79 @@
+
+
+
+
+ 发送TCP
+
+
+
+
+
+
+
+
diff --git a/src/mixins/tool.js b/src/mixins/tool.js
index 87945af..c486534 100644
--- a/src/mixins/tool.js
+++ b/src/mixins/tool.js
@@ -153,6 +153,7 @@ export default {
* @param { array } keyUserIds 老人id
*/
async applyFamily() {
+ console.log('申请成为家属');
try {
let params = {};
if (this.applyFamilyInfo && this.applyFamilyInfo.name) {
@@ -160,6 +161,7 @@ export default {
} else {
params = { keyUserIds: this.keyUserIds };
}
+ console.log('params', params);
await this.$u.api.applyFamily(params);
this.transferContent = '申请已提交,请等待审核';
this.$t.page.openPage(`/pagesYanyuan/transfer-page/transfer-page?type=jiashu&msg=${this.transferContent}`);
diff --git a/src/pagesProject/project/components/Evaluated/components/ProcessRestore - 副本.vue b/src/pagesProject/project/components/Evaluated/components/ProcessRestore - 副本.vue
new file mode 100644
index 0000000..93703c8
--- /dev/null
+++ b/src/pagesProject/project/components/Evaluated/components/ProcessRestore - 副本.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue b/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue
index 93703c8..56d0d16 100644
--- a/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue
+++ b/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue
@@ -55,7 +55,7 @@ export default {
// 绘制图片
drawImage(width) {
const { context } = this;
- const { cardUrl, lines } = this.trainResult;
+ const { cardUrl, points } = this.trainResult;
let that = this;
uni.downloadFile({
@@ -64,9 +64,10 @@ export default {
context.drawImage(res.tempFilePath, 0, 0, width, 450);
context.draw(true);
// 绘制路径
- lines.forEach(item => {
- that.drawPath(item, width);
- });
+ // points.forEach(item => {
+ // that.drawPath(item, width);
+ // });
+ that.drawPath(points, width);
},
fail(error) {
console.error('图片加载失败:', error);
@@ -84,7 +85,7 @@ export default {
this.timers.push(
setTimeout(() => {
- if (!this.trainResult.lines || this.trainResult.lines.length === 0) {
+ if (!this.trainResult.points || this.trainResult.points.length === 0) {
return;
}
ctx.beginPath();
@@ -102,10 +103,10 @@ export default {
);
for (let i = 1, len = data.length; i < len; i++) {
- if (!this.trainResult.lines || this.trainResult.lines.length === 0) return;
+ if (!this.trainResult.points || this.trainResult.points.length === 0) return;
this.timers.push(
setTimeout(() => {
- if (!this.trainResult.lines || this.trainResult.lines.length === 0) {
+ if (!this.trainResult.points || this.trainResult.points.length === 0) {
return;
}
@@ -150,9 +151,9 @@ export default {
* 时间 = (当前线条的操作时间 - 第一条线的操作时间)+ (当前点的时间-同一条线的第一个点的时间)
*/
getIntervalTime(pointTime, operateTime, firstPointTime) {
- const { lines } = this.trainResult;
+ const { points } = this.trainResult;
let time = 0;
- time = operateTime - lines[0].operateTime + (pointTime - firstPointTime);
+ time = operateTime - points[0].operateTime + (pointTime - firstPointTime);
return time;
},
@@ -162,10 +163,14 @@ export default {
* @return {array} result [[x,y,time]]
*/
generatePathData(str) {
- if (!str || !str.line) return;
+ if (!str || !str.length) return;
let result = [];
- str.line.split(';').forEach(point => {
- result.push(point.split(','));
+ str.forEach(point => {
+ let arr = [];
+ for (let i in point) {
+ arr.push(point[i]);
+ }
+ result.push(arr);
});
return result;
},
diff --git a/src/pagesYanyuan/family-info/family-info.vue b/src/pagesYanyuan/family-info/family-info.vue
index 38df5f8..daa1cda 100644
--- a/src/pagesYanyuan/family-info/family-info.vue
+++ b/src/pagesYanyuan/family-info/family-info.vue
@@ -38,16 +38,17 @@ export default {
/**
* 申请成为家属
*/
- submit() {
+ async submit() {
if (!this.validationRequired()) return;
this.params.keyUserIds = this.keyUserIds;
this.setApplyFamilyInfo(this.params);
- this.$refs.uTips.show({
- title: '用户信息添加成功, 即将申请成为家属',
- type: 'success',
- duration: '2000',
- });
- this.$t.page.openPage('/pagesYanyuan/transfer-page/transfer-page?type=jiashu');
+ await this.applyFamily();
+ // this.$refs.uTips.show({
+ // title: '用户信息添加成功, 即将申请成为家属',
+ // type: 'success',
+ // duration: '2000',
+ // });
+ // this.$t.page.openPage('/pagesYanyuan/transfer-page/transfer-page?type=jiashu');
},
// 验证必填
diff --git a/src/pagesYanyuan/hold-all/hold-all.vue b/src/pagesYanyuan/hold-all/hold-all.vue
index 30ba859..2857719 100644
--- a/src/pagesYanyuan/hold-all/hold-all.vue
+++ b/src/pagesYanyuan/hold-all/hold-all.vue
@@ -1,19 +1,21 @@
-
+
+
+ 添加WiFi
+
+
-
+ " -->
+
{{ item.code }}
-
+ " -->
+
-
+
{{ item.electricQuantity }}
@@ -94,15 +93,16 @@ export default {
methods: {
openBinding() {
- uni.navigateToMiniProgram({
- appId: 'wx1989853133e3da70',
- path: '',
- extraData: {},
- success(res) {
- // 打开成功
- console.log('打开成功res: ', res);
- },
- });
+ // uni.navigateToMiniProgram({
+ // appId: 'wx1989853133e3da70',
+ // path: '',
+ // extraData: {},
+ // success(res) {
+ // // 打开成功
+ // console.log('打开成功res: ', res);
+ // },
+ // });
+ this.$t.page.openPage('/pagesYanyuan/wifi-binding/wifi-binding');
},
setWidth(res) {
diff --git a/src/pagesYanyuan/wifi-binding/wifi-binding.vue b/src/pagesYanyuan/wifi-binding/wifi-binding.vue
index 53499ed..ad84b38 100644
--- a/src/pagesYanyuan/wifi-binding/wifi-binding.vue
+++ b/src/pagesYanyuan/wifi-binding/wifi-binding.vue
@@ -4,12 +4,16 @@
ccsens_5G
+
+ WIFI名称
+
+
WIFI密码
-
+
- 绑定
+
@@ -17,7 +21,7 @@