diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index e85c342..58959c0 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -13,6 +13,7 @@
 import { wellCountByBfzt } from '@/api/well/well'
 import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
 import { jobCountByStatus } from '@/api/alarm/job'
+import { isOperation } from '@/utils/permission'
 export default {
   components: {
     Card
@@ -84,7 +85,13 @@
       })
     },
     getAlarmCount() {
-      alarmNowStatic().then(response => {
+      const param = {
+        alarmType: ''
+      }
+      if (!isOperation()) { // 如果不是管理员和运维人员
+        param.alarmType = '1'
+      }
+      alarmNowStatic(param).then(response => {
         this.dataGroup[2].context = response.data.total
       })
     },

diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index e85c342..58959c0 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -13,6 +13,7 @@
 import { wellCountByBfzt } from '@/api/well/well'
 import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
 import { jobCountByStatus } from '@/api/alarm/job'
+import { isOperation } from '@/utils/permission'
 export default {
   components: {
     Card
@@ -84,7 +85,13 @@
       })
     },
     getAlarmCount() {
-      alarmNowStatic().then(response => {
+      const param = {
+        alarmType: ''
+      }
+      if (!isOperation()) { // 如果不是管理员和运维人员
+        param.alarmType = '1'
+      }
+      alarmNowStatic(param).then(response => {
         this.dataGroup[2].context = response.data.total
       })
     },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index f2801c2..633049a 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -113,8 +113,7 @@
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度', value: 'data', align: 'center', unitFilter: true },
         { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
-        { text: '权属单位', value: 'companyName', align: 'center' },
-        { text: '使用单位', value: 'deptName', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
       // multipleSelection: [], // 多选选中项

diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index e85c342..58959c0 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -13,6 +13,7 @@
 import { wellCountByBfzt } from '@/api/well/well'
 import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
 import { jobCountByStatus } from '@/api/alarm/job'
+import { isOperation } from '@/utils/permission'
 export default {
   components: {
     Card
@@ -84,7 +85,13 @@
       })
     },
     getAlarmCount() {
-      alarmNowStatic().then(response => {
+      const param = {
+        alarmType: ''
+      }
+      if (!isOperation()) { // 如果不是管理员和运维人员
+        param.alarmType = '1'
+      }
+      alarmNowStatic(param).then(response => {
         this.dataGroup[2].context = response.data.total
       })
     },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index f2801c2..633049a 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -113,8 +113,7 @@
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度', value: 'data', align: 'center', unitFilter: true },
         { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
-        { text: '权属单位', value: 'companyName', align: 'center' },
-        { text: '使用单位', value: 'deptName', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
       // multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d6face5..1d3601d 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -57,7 +57,7 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-        <el-col v-show="deviceForm.deviceType=='2'" :span="12">
+        <el-col v-if="deviceForm.deviceType=='2'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>