From a09099de00d6c13ebdaefb97f4c119948d73a7a3 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 06 Nov 2023 17:33:47 +0800
Subject: [PATCH] fix:小程序订阅消息
---
/dev/null | 74 ------------------------
pages/login/login.vue | 6 +-
pages/actionChange/newPage/index.vue | 14 ++++
pages/actionChange/secondLevelData/index.vue | 66 +++++++++++++++++++---
pages.json | 6 -
5 files changed, 74 insertions(+), 92 deletions(-)
diff --git a/pages.json b/pages.json
index 4db1e4e..611ae1b 100644
--- a/pages.json
+++ b/pages.json
@@ -15,11 +15,9 @@
"enablePullDownRefresh": false
}
}, {
- "path": "pages/login/login"
- }, {
- "path": "pages/login/register/register",
+ "path": "pages/login/login",
"style": {
- "navigationBarTitleText": "������",
+ "navigationBarTitleText": "������",
"enablePullDownRefresh": false
}
}, {
diff --git a/pages/actionChange/newPage/index.vue b/pages/actionChange/newPage/index.vue
index 894ac12..39a7fcb 100644
--- a/pages/actionChange/newPage/index.vue
+++ b/pages/actionChange/newPage/index.vue
@@ -35,8 +35,10 @@
type="select" />
<u-icon slot="right" name="arrow-right" />
</u-form-item>
- <u-form-item border-bottom label="������������:" placeholder="���������" required>
- <u-input v-model="form.changeDay" border="none" type="number" />
+ <u-form-item border-bottom label="������������:" placeholder="���������" required
+ :disabled='Number(sumbitForm.changeType)===1'>
+ <u-input v-model="form.changeDay" border="none" type="number"
+ :disabled='Number(sumbitForm.changeType)===1' />
</u-form-item>
<u-form-item border-bottom label="������������:" prop="escalationUnitId" required @click="
showCheckBox = true;
@@ -218,6 +220,14 @@
console.log(e)
this.form[this.currentKey] = e.value[0].label
this.sumbitForm[this.currentKey] = e.value[0].id
+ console.log('this.form.changeType', this.currentKey)
+ if (Number(this.sumbitForm.changeType) !== 1) {
+ this.sumbitForm.changeDay = '0'
+ this.form.changeDay = '0'
+ } else {
+ this.sumbitForm.changeDay = ''
+ this.form.changeDay = ''
+ }
this.showCheckBox = false
},
checkTime(e) {
diff --git a/pages/actionChange/secondLevelData/index.vue b/pages/actionChange/secondLevelData/index.vue
index 69fc5ea..6a6f97d 100644
--- a/pages/actionChange/secondLevelData/index.vue
+++ b/pages/actionChange/secondLevelData/index.vue
@@ -4,16 +4,16 @@
<view class="ridoaBox">
<u-radio-group v-model="value" placement="row" :size='radioOption.size'
:labelColor='radioOption.labelColor' :labelSize='radioOption.labelSize' @change='changeSearchType'>
- <u-radio activeColor="#19be6b" label="Mac������" name="1" :labelSize='radioOption.labelSize'
+ <u-radio activeColor="#19be6b" label="Mac���/������������" name="1" :labelSize='radioOption.labelSize'
:labelColor='radioOption.labelColor'></u-radio>
- <u-radio activeColor="#19be6b" label="������������" name="0" :labelSize='radioOption.labelSize'
+ <u-radio activeColor="#19be6b" label="������" name="0" :labelSize='radioOption.labelSize'
:labelColor='radioOption.labelColor'></u-radio>
- <u-radio activeColor="#19be6b" label="������������������" name="2" :labelSize='radioOption.labelSize'
+ <u-radio activeColor="#19be6b" label="������������" name="2" :labelSize='radioOption.labelSize'
:labelColor='radioOption.labelColor'></u-radio>
</u-radio-group>
</view>
<view class="" v-if="value==='1'">
- <u-input placeholder="���������Mac���" :placeholderStyle='placeholderStyle' color="#fff"
+ <u-input placeholder="���������Mac���/������������" :placeholderStyle='placeholderStyle' color="#fff"
customStyle="margin: 0 5px;" v-model='macName'>
<template slot="suffix">
<u-button @tap="searchMacList" text="������" type="success" size="small"></u-button>
@@ -45,10 +45,17 @@
@cancel="showeEscalationTime = false"></u-picker>
</view>
</view>
- <view v-if="wsData2">
- <u-cell title="���������" :value="windDirData"></u-cell>
+ <view class="timeStyle">
+ {{currentTime}}
+ </view>
+ <view>
+ <u-cell title="������:" :value="orgMacName"></u-cell>
</view>
<view class="boxPadd">
+ <view class="windDirBox" v-if="showData.length>0">
+ <view class=""> ��������� </view>
+ <view class=""> {{windDirData}} </view>
+ </view>
<u-list v-if="showData.length>0">
<u-list-item v-for="(item, index) in showData" :key="index">
<u-row customStyle="margin-bottom: 10px">
@@ -65,18 +72,18 @@
</u-list-item>
</u-list>
</view>
- <u-toast ref="uToast"></u-toast>
<u-modal :show="showModel" title='���������Mac���' showCancelButton @cancel='showModel=false' @confirm='selectMac'>
<view class="slot-content">
<u-radio-group v-model="modeleMacSelect" iconPlacement="right" placement='column' borderBottom='true'
@change='clickMac'>
<view v-for="(item,index) in macList" :key="index" class="ridioBox">
- <u-radio activeColor="#19be6b" :label="`${item.typeName}: ${item.mac}`"
+ <u-radio activeColor="#19be6b" :label="`${item.typeName}: ${item.name} \\n Mac���:${item.mac}`"
:name="item.mac"></u-radio>
</view>
</u-radio-group>
</view>
</u-modal>
+ <u-toast ref="uToast"></u-toast>
</view>
</template>
<script>
@@ -110,6 +117,7 @@
},
placeholderStyle: 'color: #fff',
macName: '',
+ orgMacName: '',
defaultMonitorItems: [],
chartSensorKey: [],
coreMonitorItems: [],
@@ -128,6 +136,7 @@
// ������������������
alarmBg: {},
timer: '',
+ currentTime: new Date(),
isLoading: true,
specialType: '3'
}
@@ -153,6 +162,7 @@
},
created() {
this.getOrgs()
+ this.getTime()
},
onUnload() {
let that = this
@@ -161,7 +171,22 @@
that.timer = ''
},
methods: {
+ getTime() {
+ var _this = this // ������������������������Vue������this������������������������
+ this.timer = setInterval(function() {
+ _this.currentTime = // ������������date
+ _this.appendZero(new Date().getFullYear()) + '-' + _this.appendZero(new Date().getMonth() +
+ 1) + '-' + _this.appendZero(new Date().getDate()) + ' ' + _this.appendZero(new Date()
+ .getHours()) + ': ' + _this.appendZero(new Date().getMinutes()) + ': ' + _this
+ .appendZero(new Date().getSeconds())
+ }, 1000)
+ },
+ appendZero(obj) {
+ return obj < 10 ? '0' + obj : obj
+ },
clickMac(e) {
+ this.macName = ''
+ this.orgMacName = ''
this.specialType = this.macList.find(item => item.mac === e).specialType
console.log('specialType', this.specialType)
},
@@ -171,16 +196,20 @@
this.sensorLayout()
},
changeSearchType() {
- this.macName = ''
if (this.value === '2') {
this.getSpeciallist()
}
if (this.value === '0') {
this.getOrgs()
}
+ if (this.value === '1') {
+ this.macName = ''
+ }
},
selectMac() {
this.macName = this.modeleMacSelect
+ this.orgMacName = this.macList.find(item => item.mac === this.modeleMacSelect).name
+ console.log('this.orgMacName', this.orgMacName)
this.showModel = false
if (this.socketTask) {
this.socketTask.close()
@@ -192,6 +221,7 @@
mac: this.macName
}).then(res => {
this.macList = []
+ this.modeleMacSelect = ''
if (res.data && res.data.length > 0) {
this.macList = res.data
this.showModel = true
@@ -228,6 +258,7 @@
'name': name,
'id': id
}
+ this.getOrgs()
},
selectBack(e) {
if (this.selectForm.name === 'orgName') {
@@ -239,6 +270,8 @@
}
} else {
this.macName = e.value[0].mac
+ this.orgMacName = e.value[0].name
+ console.log('e', e)
if (this.socketTask) {
this.socketTask.close()
}
@@ -588,4 +621,19 @@
max-height: 300px;
overflow: auto;
}
+
+ .windDirBox {
+ display: flex;
+ justify-content: space-between;
+ padding: 5px;
+ margin-bottom: 5px;
+ border-bottom: 1px solid;
+ }
+
+ .timeStyle {
+ text-align: center;
+ margin: 5px;
+ font-size: 18px;
+ color: #ef9790;
+ }
</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9a59fea..d253f90 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -91,8 +91,9 @@
let data = await subScribeMsg()
console.log('data', data)
if (data['YNqUZ1MgMvwY3G-NENVbcmIBR5dUotSdnwcz96CWrho'] === 'accept') { // ���������������������
+ this.doRequire()
} else {
- console.log('������')
+ this.doRequire()
}
},
doRequire() {
@@ -111,7 +112,7 @@
},
submit() {
this.$refs.uForm.validate().then(res => {
- this.doRequire()
+ this.aClick()
}).catch(errors => {})
},
//������
@@ -119,7 +120,6 @@
const value = uni.getStorageSync('openId')
console.log('openId', value)
if (value) {
- this.aClick()
this.logining(value)
}
},
diff --git a/pages/login/register/register.vue b/pages/login/register/register.vue
deleted file mode 100644
index a3482e3..0000000
--- a/pages/login/register/register.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
- <view>
- <view class="imageContent">
- <image
- src="/static/logo.png"
- style="width: 267.31rpx; height: 403.85rpx"
- />
- </view>
- <view class="formContent">
- <u-form ref="uForm" label-width="70" :model="form">
- <u-form-item label="������">
- <u-input v-model="form.name" placeholder="���������������������" />
- </u-form-item>
- <u-form-item label="������">
- <u-input v-model="form.intro" placeholder="���������������" />
- </u-form-item>
- <u-form-item label="������������">
- <u-input v-model="form.intro" placeholder="���������������������" />
- </u-form-item>
- </u-form>
- <p class="tips">
- <text>���������������������������������������������������������������������������������������</text>
- </p>
- <u-button @click="submit">������</u-button>
- </view>
- </view>
-</template>
-
-<script>
-export default {
- data() {
- return {
- form: {},
- rules: {
- name: [
- {
- required: true,
- message: '���������������',
- // ���������������������������������������������������
- trigger: ['change', 'blur'],
- },
- ],
- password: [
- {
- required: true,
- message: '���������������',
- trigger: ['change', 'blur'],
- },
- ],
- },
- }
- },
- onReady() {
- this.$refs.uForm.setRules(this.rules)
- },
- methods: {},
- // ������������onReady���������������������onLoad������������������������������������������
-}
-</script>
-
-<style scoped lang="scss">
-.imageContent {
- text-align: center;
- margin: 38.46rpx 0rpx;
-}
-.formContent {
- padding: 0rpx 48.08rpx;
-}
-.tips {
- font-size: 12px;
- margin: 38.46rpx 0;
-}
-
-</style>
--
Gitblit v1.8.0