App/app-govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

反馈修改

Browse Source
This commit is contained in:
仲么了
2023-10-09 16:12:27 +08:00
parent 9c8dc2cd0a
commit bd8e137c26
20 changed files with 167 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/api/message.js
View File

@@ -5,15 +5,13 @@ import config from '../js/config';
* 已读暂态
* @returns {*}
*/
export function updateStatus(eventIds) {
export function updateStatus(params) {
return request({
url: '/cs-harmonic-boot/eventUser/updateStatus',
method: 'post',
header: {
'Content-Type': 'application/json',
},
data: {
eventIds
},
data: params,
})
}

2
components/Cn-device-card/Cn-device-card.vue
View File

@@ -2,7 +2,7 @@
<uni-card
:title="device.equipmentName"
:sub-title="device.mac"
:extra="device.isPrimaryUser ? '主用户' : '子用户'"
:extra="device.isPrimaryUser == 1 ? '主用户' : '子用户'"
padding="0"
@click="jump(device)"
:thumbnail="deviceIcon(device.runStatus)"

76
pages.json
View File

@@ -190,7 +190,24 @@
{
"path": "pages/message/transient",
"style": {
"navigationBarTitleText": "暂态事件"
"app-plus": {
"bounce": "none",
//关闭窗口回弹效果
"titleNView": {
"titleText": "暂态事件",
// 窗口的标题
"titleAlign": "center",
"padding-right": "20rpx",
"buttons": [
{
"text": "一键已读",
"fontSize": "28rpx",
"select": false,
"width": "auto"
}
]
}
}
}
},
{
@@ -202,7 +219,24 @@
{
"path": "pages/message/report",
"style": {
"navigationBarTitleText": "设备告警"
"app-plus": {
"bounce": "none",
//关闭窗口回弹效果
"titleNView": {
"titleText": "设备告警",
// 窗口的标题
"titleAlign": "center",
"padding-right": "20rpx",
"buttons": [
{
"text": "一键已读",
"fontSize": "28rpx",
"select": false,
"width": "auto"
}
]
}
}
}
},
{
@@ -220,13 +254,47 @@
{
"path": "pages/message/steady",
"style": {
"navigationBarTitleText": "稳态越限"
"app-plus": {
"bounce": "none",
//关闭窗口回弹效果
"titleNView": {
"titleText": "稳态越限",
// 窗口的标题
"titleAlign": "center",
"padding-right": "20rpx",
"buttons": [
{
"text": "一键已读",
"fontSize": "28rpx",
"select": false,
"width": "auto"
}
]
}
}
}
},
{
"path": "pages/message/run",
"style": {
"navigationBarTitleText": "运行事件"
"app-plus": {
"bounce": "none",
//关闭窗口回弹效果
"titleNView": {
"titleText": "运行事件",
// 窗口的标题
"titleAlign": "center",
"padding-right": "20rpx",
"buttons": [
{
"text": "一键已读",
"fontSize": "28rpx",
"select": false,
"width": "auto"
}
]
}
}
}
},
{

3
pages/device/APF/comp/basic.vue
View File

@@ -140,7 +140,8 @@ export default {
immediate: true,
},
},
methods: {},
methods: {
},
}
</script>
<style lang="scss">

4
pages/device/APF/detail.vue
View File

@@ -249,10 +249,6 @@ export default {
this.$refs.inputDialog.close()
},
dialogInputConfirm(val) {
if (!val) {
this.$util.toast('请输入备注')
return
}
if (this.dialogType == '取消调试') {
cancelDebug({
deviceId: this.devId,

4
pages/device/edit.vue
View File

@@ -30,7 +30,7 @@
:localdata="projectRange"
@change="queryTopologyDiagramPage"
disabled
:clearable="false"
:clear="false"
></uni-data-select>
</uni-forms-item>
<!-- <uni-forms-item label="型号">
@@ -114,6 +114,8 @@
v-model="point.linePostion"
:localdata="positionList"
@change="positionChange"
:clear="false"
disabled
></uni-data-select>
<uni-easyinput
:clearable="false"

3
pages/device/new.vue
View File

@@ -30,6 +30,7 @@
v-model="formData.projectId"
:localdata="projectRange"
@change="queryTopologyDiagramPage"
:clear="false"
></uni-data-select>
<uni-icons
type="plusempty"
@@ -142,6 +143,8 @@
v-model="point.position"
:localdata="positionList"
@change="positionChange"
disabled
:clear="false"
></uni-data-select>
<uni-easyinput
:clearable="false"

2
pages/index/comp/indexZhuYongHu.vue
View File

@@ -74,7 +74,7 @@ export default {
if (confirm) {
if (this.devCount.engineeringListLength > 0) {
uni.navigateTo({
url: '/pages/device/new',
url: '/pages/device/new?type=',
})
} else {
uni.navigateTo({

4
pages/index/mine.vue
View File

@@ -43,13 +43,13 @@
</view>
<view class="mine-nav" @click="jump('engineering')">
<image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
<view class="mine-nav-label">工程列表</view>
<view class="mine-nav-label">工程管理</view>
<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view>
<view class="mine-nav" @click="jump('project')">
<image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
<view class="mine-nav-label">项目列表</view>
<view class="mine-nav-label">项目管理</view>
<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
</view>
<view class="mine-nav" @click="jump('feedback')">

17
pages/message/report.vue
View File

@@ -22,6 +22,7 @@
<script>
import list from '@/common/js/list'
import { updateStatus } from '@/common/api/message'
export default {
mixins: [list],
@@ -33,6 +34,22 @@ export default {
onShow() {
this.init()
},
onNavigationBarButtonTap(e) {
uni.showModal({
title: '提示',
content: '确定要全部标记为已读吗？',
success: (res) => {
if (res.confirm) {
updateStatus({
type: 3,
eventIds:[]
}).then(() => {
this.store.reload()
})
}
},
})
},
methods: {
async init() {
let dictData = await this.$util.getDictData('app_event')

4
pages/message/reportDetail.vue
View File

@@ -33,7 +33,9 @@ export default {
this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
this.loading = false
if (this.detail.status != 1) {
updateStatus([this.detail.id])
updateStatus({
eventIds: [this.detail.id],
})
}
},
methods: {},

17
pages/message/run.vue
View File

@@ -21,6 +21,7 @@
</template>
<script>
import list from '@/common/js/list'
import { updateStatus } from '@/common/api/message'
export default {
mixins: [list],
@@ -32,6 +33,22 @@ export default {
onShow() {
this.init()
},
onNavigationBarButtonTap(e) {
uni.showModal({
title: '提示',
content: '确定要全部标记为已读吗？',
success: (res) => {
if (res.confirm) {
updateStatus({
type: 2,
eventIds:[]
}).then(() => {
this.store.reload()
})
}
},
})
},
methods: {
async init() {
let dictData = await this.$util.getDictData('app_event')

4
pages/message/runDetail.vue
View File

@@ -33,7 +33,9 @@ export default {
this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
this.loading = false
if (this.detail.status != 1) {
updateStatus([this.detail.id])
updateStatus({
eventIds: [this.detail.id],
})
}
},
methods: {},

17
pages/message/steady.vue
View File

@@ -22,6 +22,7 @@
<script>
import list from '@/common/js/list'
import { updateStatus } from '@/common/api/message'
export default {
mixins: [list],
@@ -33,6 +34,22 @@ export default {
onShow() {
this.init()
},
onNavigationBarButtonTap(e) {
uni.showModal({
title: '提示',
content: '确定要全部标记为已读吗？',
success: (res) => {
if (res.confirm) {
updateStatus({
type: 1,
eventIds:[]
}).then(() => {
this.store.reload()
})
}
},
})
},
methods: {
async init() {
let dictData = await this.$util.getDictData('app_event')

4
pages/message/steadyDetail.vue
View File

@@ -33,7 +33,9 @@ export default {
this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%'))
this.loading = false
if (this.detail.status != 1) {
updateStatus([this.detail.id])
updateStatus({
eventIds: [this.detail.id],
})
}
},
methods: {},

21
pages/message/transient.vue
View File

@@ -11,9 +11,7 @@
>
<view class="term-list-bottom">
<view class="term-list-bottom-item" v-for="(item2, textIndex) in item.dataSet" :key="textIndex">
{{
item2.showName + ':' + (item2.value == 3.1415926 ? '-' : item2.value) + (item2.unit || '')
}}
{{ item2.showName + ':' + (item2.value == 3.1415926 ? '-' : item2.value) + (item2.unit || '') }}
</view>
</view>
</uni-card>
@@ -25,6 +23,7 @@
<script>
import list from '@/common/js/list'
import { updateStatus } from '@/common/api/message'
export default {
mixins: [list],
@@ -36,6 +35,22 @@ export default {
onShow() {
this.init()
},
onNavigationBarButtonTap(e) {
uni.showModal({
title: '提示',
content: '确定要全部标记为已读吗？',
success: (res) => {
if (res.confirm) {
updateStatus({
type: 0,
eventIds:[]
}).then(() => {
this.store.reload()
})
}
},
})
},
methods: {
async init() {
let dictData = await this.$util.getDictData('app_event')

4
pages/message/transientDetail.vue
View File

@@ -57,7 +57,9 @@ export default {
this.detail.instantPics && (this.detail.instantPics = this.$config.static + this.detail.instantPics)
this.loading = false
if (this.detail.status != 1) {
updateStatus([this.detail.id])
updateStatus({
eventIds: [this.detail.id],
})
}
},
methods: {

BIN
static/logo_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 187 KiB

BIN
static/logo_216的副本.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/logo_216的副本2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB