diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index 27bdac1..e6991bc 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -51,11 +51,11 @@ onBeforeMount(() => {
})
const init = async () => {
- await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
- dictData.state.area = res[0].data
- dictData.state.basic = res[1].data
+ await Promise.all([ dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
+ // dictData.state.area = res[0].data
+ dictData.state.basic = res[0].data
// dictData.state.userList=res[4].data
- adminInfo.dataFill(res[2].data)
+ adminInfo.dataFill(res[1].data)
// dictData.state.areaTree = res[3].data
})
/**
diff --git a/src/views/govern/alarm/steadyStateEvent/index.vue b/src/views/govern/alarm/steadyStateEvent/index.vue
index ccf5587..c8f8833 100644
--- a/src/views/govern/alarm/steadyStateEvent/index.vue
+++ b/src/views/govern/alarm/steadyStateEvent/index.vue
@@ -386,6 +386,7 @@ const saveIndicator = () => {
.then((res: any) => {
ElMessage.success(`保存成功`)
loading.value = false
+ tableStore.index()
})
.catch(() => {
loading.value = false
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index 3c04ded..bf96799 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -2710,7 +2710,7 @@ const volGradeChange = (e, row) => {
capacity = 750
break
case '35':
- capacity = 259
+ capacity = 250
break
case '10':
capacity = 100
@@ -2730,9 +2730,7 @@ const volGradeChange = (e, row) => {
case '750':
capacity = 7000
break
- case '800':
- capacity = 7000
- break
+
case '1000':
capacity = 9000
break
diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index 48342ed..f4e5183 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -182,7 +182,7 @@ const tableStore: any = new TableStore({
icon: 'el-icon-Check',
render: 'basicButton',
disabled: row => {
- return !(props.deviceType === '2' && row.wavePath) || row.showName === '未知'
+ return !(props.deviceType == '2' && row.wavePath == null)
},
click: row => {
getFileByEventId(row.id).then(res => {
@@ -219,6 +219,8 @@ const handleBack = async () => {
}
defineExpose({ getTableParams })
onMounted(() => {
+ console.log('🚀 ~ props.deviceType:', props.deviceType)
+
tableStore.index()
})
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index e292a6a..92f319c 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -3,8 +3,12 @@