diff --git a/common/api/message.js b/common/api/message.js new file mode 100644 index 0000000..5dd92ed --- /dev/null +++ b/common/api/message.js @@ -0,0 +1,19 @@ +import request from '../js/request'; +import config from '../js/config'; + +/** + * 已读暂态 + * @returns {*} + */ +export function updateStatus(eventIds) { + return request({ + url: 'cs-harmonic-boot/eventUser/updateStatus', + method: 'post', + header: { + 'Content-Type': 'application/json', + }, + data: { + eventIds + }, + }) +} diff --git a/common/js/list.js b/common/js/list.js index 358d941..01bc7ce 100644 --- a/common/js/list.js +++ b/common/js/list.js @@ -30,7 +30,7 @@ export default { pageNum: 1, pageSize: 20, }, - timer:null, + timer: null, callBack: null, firstCallBack: null, loadedCallback: null, @@ -56,7 +56,7 @@ export default { method: 'POST', }).then((res) => { console.warn(res) - let resultData = res.data?.list || res.data?.records || [] + let resultData = res.data?.list || res.data?.records || res.data || [] if (this.params.pageNum == 1) { this.data = resultData if (resultData.length == 0 || resultData == 0) { diff --git a/common/js/util.js b/common/js/util.js index 53cb8cd..dbd61bf 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -267,6 +267,13 @@ const decodeToken = (token) => { return obj } +const getDictData = (key) => { + let dictData = uni.getStorageSync(cacheKey.dictData) + if (dictData) { + return dictData.filter((item) => item.code === key)[0]?.children || [] + } +} + export default { validatePhoneNumber, toast, @@ -278,4 +285,5 @@ export default { prePage, loginSuccess, refreshPrePage, + getDictData } diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue index cfa6ba9..915a38c 100644 --- a/pages/device/APF/detail.vue +++ b/pages/device/APF/detail.vue @@ -133,7 +133,7 @@ export default { // text: '波形', // }, { - text: 'I/O', + text: '其他', }, ], content: [ diff --git a/pages/engineering/new.vue b/pages/engineering/new.vue index d23641e..0526515 100644 --- a/pages/engineering/new.vue +++ b/pages/engineering/new.vue @@ -72,7 +72,7 @@ export default { this.formData.id = this.engineering.id uni.setNavigationBarTitle({title: '工程编辑'}) } - if(options.from === 'index'){ + if (options.from === 'index') { this.$util.toast('请先创建一个工程') } // console.log(area); @@ -129,7 +129,7 @@ export default { if (this.options.from === 'index') { uni.setStorageSync('engineering', res.data) uni.redirectTo({ - url: '/pages/device/new', + url: '/pages/device/new?type=' + this.options.type, }) return } else { diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue index 80c640b..7cdc2bd 100644 --- a/pages/index/comp/indexGongCheng.vue +++ b/pages/index/comp/indexGongCheng.vue @@ -39,7 +39,9 @@ 常用功能 - + + + @@ -63,7 +65,7 @@ export default { submitFeedBack() { uni.navigateTo({url: '/pages/home/feedback'}) }, - registerDevice() { + registerDevice(type) { uni.showModal({ title: '提示', content: '请选择设备类型', @@ -74,11 +76,11 @@ export default { if (confirm) { if (this.devCount.engineeringListLength > 0) { uni.navigateTo({ - url: '/pages/device/new', + url: '/pages/device/new?type=' + type, }) } else { uni.navigateTo({ - url: '/pages/engineering/new?from=index' + url: '/pages/engineering/new?from=index&type=' + type }) } diff --git a/pages/index/mine.vue b/pages/index/mine.vue index ebe7c8c..8f85d0c 100644 --- a/pages/index/mine.vue +++ b/pages/index/mine.vue @@ -46,15 +46,7 @@ 工程列表 - - - 关注工程配置 - - + 项目列表 @@ -79,6 +71,20 @@ 消息配置 + + + 关注工程配置 + + + + + 服务内容配置 + + 设置 diff --git a/pages/message/incident.vue b/pages/message/incident.vue index b375661..aa6e018 100644 --- a/pages/message/incident.vue +++ b/pages/message/incident.vue @@ -1,71 +1,55 @@